diff options
129 files changed, 9503 insertions, 3366 deletions
diff --git a/.gitignore b/.gitignore index b001b6b27..fa09c4ee6 100755 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,7 @@ pageheader.html doc/SiteTOS.md # themes except for redbasic view/theme/* -! view/theme/redbasic +!view/theme/redbasic # site theme schemas view/theme/redbasic/schema/default.php # Doxygen API documentation, run 'doxygen util/Doxyfile' to generate it diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 9027b13bc..1d9fe48e6 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -336,7 +336,8 @@ class Apps { 'Profile' => t('Profile'), 'Profiles' => t('Profiles'), 'Privacy Groups' => t('Privacy Groups'), - 'Notifications' => t('Notifications') + 'Notifications' => t('Notifications'), + 'Order Apps' => t('Order Apps') ); if(array_key_exists('name',$arr)) { diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index 919c51276..d4875bbaf 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -556,7 +556,10 @@ class NativeWikiPage { '$pageHistory' => $pageHistory['history'], '$permsWrite' => $arr['permsWrite'], '$name_lbl' => t('Name'), - '$msg_label' => t('Message','wiki_history') + '$msg_label' => t('Message','wiki_history'), + '$date_lbl' => t('Date'), + '$revert_btn' => t('Revert'), + '$compare_btn' => t('Compare') )); } diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index ed78ae00b..f8a7366f8 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -325,6 +325,10 @@ class ThreadItem { $has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false); + $dropdown_extras_arr = [ 'item' => $item , 'dropdown_extras' => '' ]; + call_hooks('dropdown_extras',$dropdown_extras_arr); + $dropdown_extras = $dropdown_extras_arr['dropdown_extras']; + $tmp_item = array( 'template' => $this->get_template(), 'mode' => $mode, @@ -404,6 +408,7 @@ class ThreadItem { 'addtocal' => (($has_event) ? t('Add to Calendar') : ''), 'drop' => $drop, 'multidrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $multidrop : ''), + 'dropdown_extras' => $dropdown_extras, // end toolbar buttons 'unseen_comments' => $unseen_comments, diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 322a3933c..25ecb6a6a 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -384,6 +384,8 @@ class Wiki extends \Zotlabs\Web\Controller { '$modalerrorlist' => t('Error getting album list'), '$modalerrorlink' => t('Error getting photo link'), '$modalerroralbum' => t('Error getting album'), + '$view_lbl' => t('View'), + '$history_lbl' => t('History') )); if($p['pageMimeType'] === 'text/markdown') diff --git a/Zotlabs/Widget/Wiki_page_history.php b/Zotlabs/Widget/Wiki_page_history.php index dcec9a037..dbb322dc3 100644 --- a/Zotlabs/Widget/Wiki_page_history.php +++ b/Zotlabs/Widget/Wiki_page_history.php @@ -20,7 +20,10 @@ class Wiki_page_history { '$pageHistory' => $pageHistory['history'], '$permsWrite' => $arr['permsWrite'], '$name_lbl' => t('Name'), - '$msg_label' => t('Message','wiki_history') + '$msg_label' => t('Message','wiki_history'), + '$date_lbl' => t('Date'), + '$revert_btn' => t('Revert'), + '$compare_btn' => t('Compare') )); } diff --git a/composer.json b/composer.json index 792c08810..33bc56fa7 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,8 @@ "pear/text_languagedetect": "^1.0", "commerceguys/intl": "~0.7", "lukasreschke/id3parser": "^0.0.1", - "smarty/smarty": "~3.1" + "smarty/smarty": "~3.1", + "ramsey/uuid": "^3.8" }, "require-dev" : { "phpunit/phpunit" : "@stable", diff --git a/composer.lock b/composer.lock index 6f1af0fd7..35a024712 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ca5770d3c97cc1d0375413eeb61758ab", + "content-hash": "38911748179833a57ee1b46a0af8e518", "packages": [ { "name": "bshaffer/oauth2-server-php", @@ -157,16 +157,16 @@ }, { "name": "league/html-to-markdown", - "version": "4.6.2", + "version": "4.7.0", "source": { "type": "git", "url": "https://github.com/thephpleague/html-to-markdown.git", - "reference": "3af14d8f44838257a75822819784e83819b34e2e" + "reference": "76c076483cef89860d32a3fd25312f5a42848a8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/3af14d8f44838257a75822819784e83819b34e2e", - "reference": "3af14d8f44838257a75822819784e83819b34e2e", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/76c076483cef89860d32a3fd25312f5a42848a8c", + "reference": "76c076483cef89860d32a3fd25312f5a42848a8c", "shasum": "" }, "require": { @@ -185,7 +185,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.7-dev" + "dev-master": "4.8-dev" } }, "autoload": { @@ -217,7 +217,7 @@ "html", "markdown" ], - "time": "2018-01-07T19:45:06+00:00" + "time": "2018-05-19T23:47:12+00:00" }, { "name": "lukasreschke/id3parser", @@ -301,6 +301,51 @@ "time": "2018-01-15T00:49:33+00:00" }, { + "name": "paragonie/random_compat", + "version": "v9.99.99", + "source": { + "type": "git", + "url": "https://github.com/paragonie/random_compat.git", + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", + "shasum": "" + }, + "require": { + "php": "^7" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "keywords": [ + "csprng", + "polyfill", + "pseudorandom", + "random" + ], + "time": "2018-07-02T15:55:56+00:00" + }, + { "name": "pear/text_languagedetect", "version": "v1.0.0", "source": { @@ -392,6 +437,88 @@ "time": "2016-10-10T12:19:37+00:00" }, { + "name": "ramsey/uuid", + "version": "3.8.0", + "source": { + "type": "git", + "url": "https://github.com/ramsey/uuid.git", + "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3", + "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3", + "shasum": "" + }, + "require": { + "paragonie/random_compat": "^1.0|^2.0|9.99.99", + "php": "^5.4 || ^7.0", + "symfony/polyfill-ctype": "^1.8" + }, + "replace": { + "rhumsaa/uuid": "self.version" + }, + "require-dev": { + "codeception/aspect-mock": "^1.0 | ~2.0.0", + "doctrine/annotations": "~1.2.0", + "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0", + "ircmaxell/random-lib": "^1.1", + "jakub-onderka/php-parallel-lint": "^0.9.0", + "mockery/mockery": "^0.9.9", + "moontoast/math": "^1.1", + "php-mock/php-mock-phpunit": "^0.3|^1.1", + "phpunit/phpunit": "^4.7|^5.0|^6.5", + "squizlabs/php_codesniffer": "^2.3" + }, + "suggest": { + "ext-ctype": "Provides support for PHP Ctype functions", + "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator", + "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator", + "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter", + "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).", + "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid", + "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Ramsey\\Uuid\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marijn Huizendveld", + "email": "marijn.huizendveld@gmail.com" + }, + { + "name": "Thibaud Fabre", + "email": "thibaud@aztech.io" + }, + { + "name": "Ben Ramsey", + "email": "ben@benramsey.com", + "homepage": "https://benramsey.com" + } + ], + "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", + "homepage": "https://github.com/ramsey/uuid", + "keywords": [ + "guid", + "identifier", + "uuid" + ], + "time": "2018-07-19T23:38:55+00:00" + }, + { "name": "sabre/dav", "version": "3.2.2", "source": { @@ -800,25 +927,32 @@ }, { "name": "simplepie/simplepie", - "version": "1.5.1", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/simplepie/simplepie.git", - "reference": "db9fff27b6d49eed3d4047cd3211ec8dba2f5d6e" + "reference": "0e8fe72132dad765d25db4cabc69a91139af1263" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplepie/simplepie/zipball/db9fff27b6d49eed3d4047cd3211ec8dba2f5d6e", - "reference": "db9fff27b6d49eed3d4047cd3211ec8dba2f5d6e", + "url": "https://api.github.com/repos/simplepie/simplepie/zipball/0e8fe72132dad765d25db4cabc69a91139af1263", + "reference": "0e8fe72132dad765d25db4cabc69a91139af1263", "shasum": "" }, "require": { - "php": ">=5.3.0" + "ext-pcre": "*", + "ext-xml": "*", + "ext-xmlreader": "*", + "php": ">=5.6.0" }, "require-dev": { - "phpunit/phpunit": "~4 || ~5" + "phpunit/phpunit": "~5.4.3 || ~6.5" }, "suggest": { + "ext-curl": "", + "ext-iconv": "", + "ext-intl": "", + "ext-mbstring": "", "mf2/mf2": "Microformat module that allows for parsing HTML for microformats" }, "type": "library", @@ -827,6 +961,11 @@ "SimplePie": "library" } }, + "scripts": { + "test": [ + "phpunit" + ] + }, "license": [ "BSD-3-Clause" ], @@ -856,10 +995,10 @@ "rss" ], "support": { - "source": "https://github.com/simplepie/simplepie/tree/1.5.1", + "source": "https://github.com/simplepie/simplepie/tree/1.5.2", "issues": "https://github.com/simplepie/simplepie/issues" }, - "time": "2017-11-12T02:03:34+00:00" + "time": "2018-08-02T05:43:58+00:00" }, { "name": "smarty/smarty", @@ -913,21 +1052,79 @@ "templating" ], "time": "2018-04-24T14:53:33+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.9.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", + "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2018-08-06T14:22:27+00:00" } ], "packages-dev": [ { "name": "behat/behat", - "version": "v3.4.3", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/Behat/Behat.git", - "reference": "d60b161bff1b95ec4bb80bb8cb210ccf890314c2" + "reference": "e4bce688be0c2029dc1700e46058d86428c63cab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Behat/zipball/d60b161bff1b95ec4bb80bb8cb210ccf890314c2", - "reference": "d60b161bff1b95ec4bb80bb8cb210ccf890314c2", + "url": "https://api.github.com/repos/Behat/Behat/zipball/e4bce688be0c2029dc1700e46058d86428c63cab", + "reference": "e4bce688be0c2029dc1700e46058d86428c63cab", "shasum": "" }, "require": { @@ -937,9 +1134,9 @@ "ext-mbstring": "*", "php": ">=5.3.3", "psr/container": "^1.0", - "symfony/class-loader": "~2.1||~3.0||~4.0", + "symfony/class-loader": "~2.1||~3.0", "symfony/config": "~2.3||~3.0||~4.0", - "symfony/console": "~2.5||~3.0||~4.0", + "symfony/console": "~2.7.40||^2.8.33||~3.3.15||^3.4.3||^4.0.3", "symfony/dependency-injection": "~2.1||~3.0||~4.0", "symfony/event-dispatcher": "~2.1||~3.0||~4.0", "symfony/translation": "~2.3||~3.0||~4.0", @@ -950,18 +1147,13 @@ "phpunit/phpunit": "^4.8.36|^6.3", "symfony/process": "~2.5|~3.0|~4.0" }, - "suggest": { - "behat/mink-extension": "for integration with Mink testing framework", - "behat/symfony2-extension": "for integration with Symfony2 web framework", - "behat/yii-extension": "for integration with Yii web framework" - }, "bin": [ "bin/behat" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "3.5.x-dev" } }, "autoload": { @@ -997,7 +1189,7 @@ "symfony", "testing" ], - "time": "2017-11-27T10:37:56+00:00" + "time": "2018-08-10T18:56:51+00:00" }, { "name": "behat/gherkin", @@ -1363,32 +1555,32 @@ }, { "name": "doctrine/instantiator", - "version": "1.0.5", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -1413,20 +1605,20 @@ "constructor", "instantiate" ], - "time": "2015-06-14T21:17:01+00:00" + "time": "2017-07-22T11:58:36+00:00" }, { "name": "fabpot/goutte", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/Goutte.git", - "reference": "395f61d7c2e15a813839769553a4de16fa3b3c96" + "reference": "3f0eaf0a40181359470651f1565b3e07e3dd31b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/395f61d7c2e15a813839769553a4de16fa3b3c96", - "reference": "395f61d7c2e15a813839769553a4de16fa3b3c96", + "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/3f0eaf0a40181359470651f1565b3e07e3dd31b8", + "reference": "3f0eaf0a40181359470651f1565b3e07e3dd31b8", "shasum": "" }, "require": { @@ -1468,7 +1660,7 @@ "keywords": [ "scraper" ], - "time": "2017-11-19T08:45:40+00:00" + "time": "2018-06-29T15:13:57+00:00" }, { "name": "guzzlehttp/guzzle", @@ -1653,25 +1845,28 @@ }, { "name": "myclabs/deep-copy", - "version": "1.7.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.1" + }, + "replace": { + "myclabs/deep-copy": "self.version" }, "require-dev": { "doctrine/collections": "^1.0", "doctrine/common": "^2.6", - "phpunit/phpunit": "^4.1" + "phpunit/phpunit": "^7.1" }, "type": "library", "autoload": { @@ -1694,26 +1889,26 @@ "object", "object graph" ], - "time": "2017-10-19T19:58:43+00:00" + "time": "2018-06-11T23:09:50+00:00" }, { "name": "phar-io/manifest", - "version": "1.0.1", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0" + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0", - "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", "shasum": "" }, "require": { "ext-dom": "*", "ext-phar": "*", - "phar-io/version": "^1.0.1", + "phar-io/version": "^2.0", "php": "^5.6 || ^7.0" }, "type": "library", @@ -1749,20 +1944,20 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2017-03-05T18:14:27+00:00" + "time": "2018-07-08T19:23:20+00:00" }, { "name": "phar-io/version", - "version": "1.0.1", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/phar-io/version.git", - "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df" + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df", - "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df", + "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", "shasum": "" }, "require": { @@ -1796,7 +1991,7 @@ } ], "description": "Library for handling version information and constraints", - "time": "2017-03-05T17:38:23+00:00" + "time": "2018-07-08T19:19:57+00:00" }, { "name": "php-mock/php-mock", @@ -2022,29 +2217,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.3.2", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2" + "reference": "94fd0001232e47129dd3504189fa1c7225010d08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2", - "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", + "reference": "94fd0001232e47129dd3504189fa1c7225010d08", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0", + "php": "^7.0", "phpdocumentor/reflection-common": "^1.0.0", "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { "psr-4": { "phpDocumentor\\Reflection\\": [ @@ -2063,7 +2264,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-10T14:09:06+00:00" + "time": "2017-11-30T07:14:17+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -2114,16 +2315,16 @@ }, { "name": "phpspec/prophecy", - "version": "1.7.6", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" + "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", - "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06", + "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06", "shasum": "" }, "require": { @@ -2135,12 +2336,12 @@ }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev" + "dev-master": "1.8.x-dev" } }, "autoload": { @@ -2173,33 +2374,33 @@ "spy", "stub" ], - "time": "2018-04-18T13:57:24+00:00" + "time": "2018-08-05T17:53:17+00:00" }, { "name": "phpunit/dbunit", - "version": "3.0.3", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/dbunit.git", - "reference": "0fa4329e490480ab957fe7b1185ea0996ca11f44" + "reference": "e77b469c3962b5a563f09a2a989f1c9bd38b8615" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/0fa4329e490480ab957fe7b1185ea0996ca11f44", - "reference": "0fa4329e490480ab957fe7b1185ea0996ca11f44", + "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/e77b469c3962b5a563f09a2a989f1c9bd38b8615", + "reference": "e77b469c3962b5a563f09a2a989f1c9bd38b8615", "shasum": "" }, "require": { "ext-pdo": "*", "ext-simplexml": "*", - "php": "^7.0", - "phpunit/phpunit": "^6.0", + "php": "^7.1", + "phpunit/phpunit": "^7.0", "symfony/yaml": "^3.0 || ^4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -2225,44 +2426,44 @@ "testing", "xunit" ], - "time": "2018-01-23T13:32:26+00:00" + "time": "2018-02-07T06:47:59+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "5.3.2", + "version": "6.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "c89677919c5dd6d3b3852f230a663118762218ac" + "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac", - "reference": "c89677919c5dd6d3b3852f230a663118762218ac", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/865662550c384bc1db7e51d29aeda1c2c161d69a", + "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^7.0", - "phpunit/php-file-iterator": "^1.4.2", + "php": "^7.1", + "phpunit/php-file-iterator": "^2.0", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^2.0.1", + "phpunit/php-token-stream": "^3.0", "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.0", + "sebastian/environment": "^3.1", "sebastian/version": "^2.0.1", "theseer/tokenizer": "^1.1" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^7.0" }, "suggest": { - "ext-xdebug": "^2.5.5" + "ext-xdebug": "^2.6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.3.x-dev" + "dev-master": "6.0-dev" } }, "autoload": { @@ -2288,29 +2489,29 @@ "testing", "xunit" ], - "time": "2018-04-06T15:36:58+00:00" + "time": "2018-06-01T07:51:50+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.5", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" + "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cecbc684605bb0cc288828eb5d65d93d5c676d3c", + "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -2325,7 +2526,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -2335,7 +2536,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27T13:52:08+00:00" + "time": "2018-06-11T11:44:00+00:00" }, { "name": "phpunit/php-text-template", @@ -2380,28 +2581,28 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.9", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" + "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f", + "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2416,7 +2617,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -2425,33 +2626,33 @@ "keywords": [ "timer" ], - "time": "2017-02-26T11:10:40+00:00" + "time": "2018-02-01T13:07:23+00:00" }, { "name": "phpunit/php-token-stream", - "version": "2.0.2", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "791198a2c6254db10131eecfe8c06670700904db" + "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", - "reference": "791198a2c6254db10131eecfe8c06670700904db", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/21ad88bbba7c3d93530d93994e0a33cd45f02ace", + "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": "^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^6.2.4" + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2474,40 +2675,40 @@ "keywords": [ "tokenizer" ], - "time": "2017-11-27T05:48:46+00:00" + "time": "2018-02-01T13:16:43+00:00" }, { "name": "phpunit/phpunit", - "version": "6.5.8", + "version": "7.3.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b" + "reference": "34705f81bddc3f505b9599a2ef96e2b4315ba9b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4f21a3c6b97c42952fd5c2837bb354ec0199b97b", - "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34705f81bddc3f505b9599a2ef96e2b4315ba9b8", + "reference": "34705f81bddc3f505b9599a2ef96e2b4315ba9b8", "shasum": "" }, "require": { + "doctrine/instantiator": "^1.1", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "^1.6.1", - "phar-io/manifest": "^1.0.1", - "phar-io/version": "^1.0", - "php": "^7.0", + "myclabs/deep-copy": "^1.7", + "phar-io/manifest": "^1.0.2", + "phar-io/version": "^2.0", + "php": "^7.1", "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^5.3", - "phpunit/php-file-iterator": "^1.4.3", + "phpunit/php-code-coverage": "^6.0.7", + "phpunit/php-file-iterator": "^2.0.1", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^1.0.9", - "phpunit/phpunit-mock-objects": "^5.0.5", - "sebastian/comparator": "^2.1", - "sebastian/diff": "^2.0", + "phpunit/php-timer": "^2.0", + "sebastian/comparator": "^3.0", + "sebastian/diff": "^3.0", "sebastian/environment": "^3.1", "sebastian/exporter": "^3.1", "sebastian/global-state": "^2.0", @@ -2516,15 +2717,15 @@ "sebastian/version": "^2.0.1" }, "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2", - "phpunit/dbunit": "<3.0" + "phpunit/phpunit-mock-objects": "*" }, "require-dev": { "ext-pdo": "*" }, "suggest": { + "ext-soap": "*", "ext-xdebug": "*", - "phpunit/php-invoker": "^1.1" + "phpunit/php-invoker": "^2.0" }, "bin": [ "phpunit" @@ -2532,7 +2733,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.5.x-dev" + "dev-master": "7.3-dev" } }, "autoload": { @@ -2558,66 +2759,7 @@ "testing", "xunit" ], - "time": "2018-04-10T11:38:34+00:00" - }, - { - "name": "phpunit/phpunit-mock-objects", - "version": "5.0.6", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/33fd41a76e746b8fa96d00b49a23dadfa8334cdf", - "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.5", - "php": "^7.0", - "phpunit/php-text-template": "^1.2.1", - "sebastian/exporter": "^3.1" - }, - "conflict": { - "phpunit/phpunit": "<6.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.5" - }, - "suggest": { - "ext-soap": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ], - "time": "2018-01-06T05:45:45+00:00" + "time": "2018-08-22T06:39:21+00:00" }, { "name": "psr/container", @@ -2765,30 +2907,30 @@ }, { "name": "sebastian/comparator", - "version": "2.1.3", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9" + "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9", - "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da", + "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da", "shasum": "" }, "require": { - "php": "^7.0", - "sebastian/diff": "^2.0 || ^3.0", + "php": "^7.1", + "sebastian/diff": "^3.0", "sebastian/exporter": "^3.1" }, "require-dev": { - "phpunit/phpunit": "^6.4" + "phpunit/phpunit": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2825,32 +2967,33 @@ "compare", "equality" ], - "time": "2018-02-01T13:46:46+00:00" + "time": "2018-07-12T15:12:46+00:00" }, { "name": "sebastian/diff", - "version": "2.0.1", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd" + "reference": "366541b989927187c4ca70490a35615d3fef2dce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", - "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce", + "reference": "366541b989927187c4ca70490a35615d3fef2dce", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^6.2" + "phpunit/phpunit": "^7.0", + "symfony/process": "^2 || ^3.3 || ^4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2875,9 +3018,12 @@ "description": "Diff implementation", "homepage": "https://github.com/sebastianbergmann/diff", "keywords": [ - "diff" + "diff", + "udiff", + "unidiff", + "unified diff" ], - "time": "2017-08-03T08:09:46+00:00" + "time": "2018-06-10T07:54:39+00:00" }, { "name": "sebastian/environment", @@ -3279,25 +3425,25 @@ }, { "name": "symfony/browser-kit", - "version": "v3.4.9", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "840bb6f0d5b3701fd768b68adf7193c2d0f98f79" + "reference": "c55fe9257003b2d95c0211b3f6941e8dfd26dffd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/840bb6f0d5b3701fd768b68adf7193c2d0f98f79", - "reference": "840bb6f0d5b3701fd768b68adf7193c2d0f98f79", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/c55fe9257003b2d95c0211b3f6941e8dfd26dffd", + "reference": "c55fe9257003b2d95c0211b3f6941e8dfd26dffd", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/dom-crawler": "~2.8|~3.0|~4.0" + "php": "^7.1.3", + "symfony/dom-crawler": "~3.4|~4.0" }, "require-dev": { - "symfony/css-selector": "~2.8|~3.0|~4.0", - "symfony/process": "~2.8|~3.0|~4.0" + "symfony/css-selector": "~3.4|~4.0", + "symfony/process": "~3.4|~4.0" }, "suggest": { "symfony/process": "" @@ -3305,7 +3451,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3332,20 +3478,20 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2018-03-19T22:32:39+00:00" + "time": "2018-07-26T09:10:45+00:00" }, { "name": "symfony/class-loader", - "version": "v3.4.9", + "version": "v3.4.15", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "e63c12699822bb3b667e7216ba07fbcc3a3e203e" + "reference": "31db283fc86d3143e7ff87e922177b457d909c30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/e63c12699822bb3b667e7216ba07fbcc3a3e203e", - "reference": "e63c12699822bb3b667e7216ba07fbcc3a3e203e", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/31db283fc86d3143e7ff87e922177b457d909c30", + "reference": "31db283fc86d3143e7ff87e922177b457d909c30", "shasum": "" }, "require": { @@ -3388,35 +3534,35 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/config", - "version": "v3.4.9", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9" + "reference": "76015a3cc372b14d00040ff58e18e29f69eba717" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/7c2a9d44f4433863e9bca682e7f03609234657f9", - "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9", + "url": "https://api.github.com/repos/symfony/config/zipball/76015a3cc372b14d00040ff58e18e29f69eba717", + "reference": "76015a3cc372b14d00040ff58e18e29f69eba717", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/filesystem": "~2.8|~3.0|~4.0" + "php": "^7.1.3", + "symfony/filesystem": "~3.4|~4.0", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { - "symfony/dependency-injection": "<3.3", - "symfony/finder": "<3.3" + "symfony/finder": "<3.4" }, "require-dev": { - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/event-dispatcher": "~3.3|~4.0", - "symfony/finder": "~3.3|~4.0", - "symfony/yaml": "~3.0|~4.0" + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~3.4|~4.0", + "symfony/finder": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "symfony/yaml": "To use the yaml reference dumper" @@ -3424,7 +3570,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3451,25 +3597,24 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-03-19T22:32:39+00:00" + "time": "2018-08-08T06:37:38+00:00" }, { "name": "symfony/console", - "version": "v3.4.9", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "5b1fdfa8eb93464bcc36c34da39cedffef822cdf" + "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/5b1fdfa8eb93464bcc36c34da39cedffef822cdf", - "reference": "5b1fdfa8eb93464bcc36c34da39cedffef822cdf", + "url": "https://api.github.com/repos/symfony/console/zipball/ca80b8ced97cf07390078b29773dc384c39eee1f", + "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0|~4.0", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -3478,11 +3623,11 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.3|~4.0", + "symfony/config": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/event-dispatcher": "~3.4|~4.0", "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.3|~4.0" + "symfony/process": "~3.4|~4.0" }, "suggest": { "psr/log-implementation": "For using the console logger", @@ -3493,7 +3638,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3520,20 +3665,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-04-30T01:22:56+00:00" + "time": "2018-07-26T11:24:31+00:00" }, { "name": "symfony/css-selector", - "version": "v3.4.9", + "version": "v3.4.15", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "519a80d7c1d95c6cc0b67f686d15fe27c6910de0" + "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/519a80d7c1d95c6cc0b67f686d15fe27c6910de0", - "reference": "519a80d7c1d95c6cc0b67f686d15fe27c6910de0", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/edda5a6155000ff8c3a3f85ee5c421af93cca416", + "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416", "shasum": "" }, "require": { @@ -3573,85 +3718,29 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-03-19T22:32:39+00:00" - }, - { - "name": "symfony/debug", - "version": "v3.4.9", - "source": { - "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "1b95888cfd996484527cb41e8952d9a5eaf7454f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/1b95888cfd996484527cb41e8952d9a5eaf7454f", - "reference": "1b95888cfd996484527cb41e8952d9a5eaf7454f", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "psr/log": "~1.0" - }, - "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" - }, - "require-dev": { - "symfony/http-kernel": "~2.8|~3.0|~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Debug Component", - "homepage": "https://symfony.com", - "time": "2018-04-30T16:53:52+00:00" + "time": "2018-07-26T09:06:28+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.4.9", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "54ff9d78b56429f9a1ac12e60bfb6d169c0468e3" + "reference": "bae4983003c9d451e278504d7d9b9d7fc1846873" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/54ff9d78b56429f9a1ac12e60bfb6d169c0468e3", - "reference": "54ff9d78b56429f9a1ac12e60bfb6d169c0468e3", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/bae4983003c9d451e278504d7d9b9d7fc1846873", + "reference": "bae4983003c9d451e278504d7d9b9d7fc1846873", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": "^7.1.3", "psr/container": "^1.0" }, "conflict": { - "symfony/config": "<3.3.7", - "symfony/finder": "<3.3", + "symfony/config": "<4.1.1", + "symfony/finder": "<3.4", "symfony/proxy-manager-bridge": "<3.4", "symfony/yaml": "<3.4" }, @@ -3659,8 +3748,8 @@ "psr/container-implementation": "1.0" }, "require-dev": { - "symfony/config": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/config": "~4.1", + "symfony/expression-language": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, "suggest": { @@ -3673,7 +3762,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3700,28 +3789,29 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2018-04-29T14:04:08+00:00" + "time": "2018-08-08T11:48:58+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.4.9", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "1a4cffeb059226ff6bee9f48acb388faf674afff" + "reference": "1c4519d257e652404c3aa550207ccd8ada66b38e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1a4cffeb059226ff6bee9f48acb388faf674afff", - "reference": "1a4cffeb059226ff6bee9f48acb388faf674afff", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1c4519d257e652404c3aa550207ccd8ada66b38e", + "reference": "1c4519d257e652404c3aa550207ccd8ada66b38e", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/css-selector": "~2.8|~3.0|~4.0" + "symfony/css-selector": "~3.4|~4.0" }, "suggest": { "symfony/css-selector": "" @@ -3729,7 +3819,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3756,34 +3846,34 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2018-03-19T22:32:39+00:00" + "time": "2018-07-26T11:00:49+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.9", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8" + "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fdd5abcebd1061ec647089c6c41a07ed60af09f8", - "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bfb30c2ad377615a463ebbc875eba64a99f6aa3e", + "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0" + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/stopwatch": "~3.4|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -3792,7 +3882,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3819,29 +3909,30 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-04-06T07:35:25+00:00" + "time": "2018-07-26T09:10:45+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.9", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541" + "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/253a4490b528597aa14d2bf5aeded6f5e5e4a541", - "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e", + "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3868,20 +3959,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-02-22T10:48:49+00:00" + "time": "2018-08-18T16:52:46+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.8.0", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "3296adf6a6454a050679cde90f95350ad604b171" + "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", - "reference": "3296adf6a6454a050679cde90f95350ad604b171", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", + "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", "shasum": "" }, "require": { @@ -3893,7 +3984,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -3927,37 +4018,38 @@ "portable", "shim" ], - "time": "2018-04-26T10:06:28+00:00" + "time": "2018-08-06T14:22:27+00:00" }, { "name": "symfony/translation", - "version": "v3.4.9", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "d4af50f46cd8171fd5c1cdebdb9a8bbcd8078c6c" + "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/d4af50f46cd8171fd5c1cdebdb9a8bbcd8078c6c", - "reference": "d4af50f46cd8171fd5c1cdebdb9a8bbcd8078c6c", + "url": "https://api.github.com/repos/symfony/translation/zipball/fa2182669f7983b7aa5f1a770d053f79f0ef144f", + "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/config": "<2.8", + "symfony/config": "<3.4", "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", + "symfony/config": "~3.4|~4.0", + "symfony/console": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/intl": "^2.8.18|^3.2.5|~4.0", + "symfony/intl": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, "suggest": { @@ -3968,7 +4060,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3995,24 +4087,25 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-04-30T01:22:56+00:00" + "time": "2018-08-07T12:45:11+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.9", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "033cfa61ef06ee0847e056e530201842b6e926c3" + "reference": "b832cc289608b6d305f62149df91529a2ab3c314" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/033cfa61ef06ee0847e056e530201842b6e926c3", - "reference": "033cfa61ef06ee0847e056e530201842b6e926c3", + "url": "https://api.github.com/repos/symfony/yaml/zipball/b832cc289608b6d305f62149df91529a2ab3c314", + "reference": "b832cc289608b6d305f62149df91529a2ab3c314", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/console": "<3.4" @@ -4026,7 +4119,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -4053,7 +4146,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-04-08T08:21:29+00:00" + "time": "2018-08-18T16:52:46+00:00" }, { "name": "theseer/tokenizer", diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index dc02dfb11..95f7e0978 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -377,7 +377,7 @@ class ClassLoader $subPath = $class; while (false !== $lastPos = strrpos($subPath, '\\')) { $subPath = substr($subPath, 0, $lastPos); - $search = $subPath.'\\'; + $search = $subPath . '\\'; if (isset($this->prefixDirsPsr4[$search])) { $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1); foreach ($this->prefixDirsPsr4[$search] as $dir) { diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index dca528ad4..4a3465b9d 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -379,6 +379,52 @@ return array( 'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php', + 'Ramsey\\Uuid\\BinaryUtils' => $vendorDir . '/ramsey/uuid/src/BinaryUtils.php', + 'Ramsey\\Uuid\\Builder\\DefaultUuidBuilder' => $vendorDir . '/ramsey/uuid/src/Builder/DefaultUuidBuilder.php', + 'Ramsey\\Uuid\\Builder\\DegradedUuidBuilder' => $vendorDir . '/ramsey/uuid/src/Builder/DegradedUuidBuilder.php', + 'Ramsey\\Uuid\\Builder\\UuidBuilderInterface' => $vendorDir . '/ramsey/uuid/src/Builder/UuidBuilderInterface.php', + 'Ramsey\\Uuid\\Codec\\CodecInterface' => $vendorDir . '/ramsey/uuid/src/Codec/CodecInterface.php', + 'Ramsey\\Uuid\\Codec\\GuidStringCodec' => $vendorDir . '/ramsey/uuid/src/Codec/GuidStringCodec.php', + 'Ramsey\\Uuid\\Codec\\OrderedTimeCodec' => $vendorDir . '/ramsey/uuid/src/Codec/OrderedTimeCodec.php', + 'Ramsey\\Uuid\\Codec\\StringCodec' => $vendorDir . '/ramsey/uuid/src/Codec/StringCodec.php', + 'Ramsey\\Uuid\\Codec\\TimestampFirstCombCodec' => $vendorDir . '/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php', + 'Ramsey\\Uuid\\Codec\\TimestampLastCombCodec' => $vendorDir . '/ramsey/uuid/src/Codec/TimestampLastCombCodec.php', + 'Ramsey\\Uuid\\Converter\\NumberConverterInterface' => $vendorDir . '/ramsey/uuid/src/Converter/NumberConverterInterface.php', + 'Ramsey\\Uuid\\Converter\\Number\\BigNumberConverter' => $vendorDir . '/ramsey/uuid/src/Converter/Number/BigNumberConverter.php', + 'Ramsey\\Uuid\\Converter\\Number\\DegradedNumberConverter' => $vendorDir . '/ramsey/uuid/src/Converter/Number/DegradedNumberConverter.php', + 'Ramsey\\Uuid\\Converter\\TimeConverterInterface' => $vendorDir . '/ramsey/uuid/src/Converter/TimeConverterInterface.php', + 'Ramsey\\Uuid\\Converter\\Time\\BigNumberTimeConverter' => $vendorDir . '/ramsey/uuid/src/Converter/Time/BigNumberTimeConverter.php', + 'Ramsey\\Uuid\\Converter\\Time\\DegradedTimeConverter' => $vendorDir . '/ramsey/uuid/src/Converter/Time/DegradedTimeConverter.php', + 'Ramsey\\Uuid\\Converter\\Time\\PhpTimeConverter' => $vendorDir . '/ramsey/uuid/src/Converter/Time/PhpTimeConverter.php', + 'Ramsey\\Uuid\\DegradedUuid' => $vendorDir . '/ramsey/uuid/src/DegradedUuid.php', + 'Ramsey\\Uuid\\Exception\\InvalidUuidStringException' => $vendorDir . '/ramsey/uuid/src/Exception/InvalidUuidStringException.php', + 'Ramsey\\Uuid\\Exception\\UnsatisfiedDependencyException' => $vendorDir . '/ramsey/uuid/src/Exception/UnsatisfiedDependencyException.php', + 'Ramsey\\Uuid\\Exception\\UnsupportedOperationException' => $vendorDir . '/ramsey/uuid/src/Exception/UnsupportedOperationException.php', + 'Ramsey\\Uuid\\FeatureSet' => $vendorDir . '/ramsey/uuid/src/FeatureSet.php', + 'Ramsey\\Uuid\\Generator\\CombGenerator' => $vendorDir . '/ramsey/uuid/src/Generator/CombGenerator.php', + 'Ramsey\\Uuid\\Generator\\DefaultTimeGenerator' => $vendorDir . '/ramsey/uuid/src/Generator/DefaultTimeGenerator.php', + 'Ramsey\\Uuid\\Generator\\MtRandGenerator' => $vendorDir . '/ramsey/uuid/src/Generator/MtRandGenerator.php', + 'Ramsey\\Uuid\\Generator\\OpenSslGenerator' => $vendorDir . '/ramsey/uuid/src/Generator/OpenSslGenerator.php', + 'Ramsey\\Uuid\\Generator\\PeclUuidRandomGenerator' => $vendorDir . '/ramsey/uuid/src/Generator/PeclUuidRandomGenerator.php', + 'Ramsey\\Uuid\\Generator\\PeclUuidTimeGenerator' => $vendorDir . '/ramsey/uuid/src/Generator/PeclUuidTimeGenerator.php', + 'Ramsey\\Uuid\\Generator\\RandomBytesGenerator' => $vendorDir . '/ramsey/uuid/src/Generator/RandomBytesGenerator.php', + 'Ramsey\\Uuid\\Generator\\RandomGeneratorFactory' => $vendorDir . '/ramsey/uuid/src/Generator/RandomGeneratorFactory.php', + 'Ramsey\\Uuid\\Generator\\RandomGeneratorInterface' => $vendorDir . '/ramsey/uuid/src/Generator/RandomGeneratorInterface.php', + 'Ramsey\\Uuid\\Generator\\RandomLibAdapter' => $vendorDir . '/ramsey/uuid/src/Generator/RandomLibAdapter.php', + 'Ramsey\\Uuid\\Generator\\SodiumRandomGenerator' => $vendorDir . '/ramsey/uuid/src/Generator/SodiumRandomGenerator.php', + 'Ramsey\\Uuid\\Generator\\TimeGeneratorFactory' => $vendorDir . '/ramsey/uuid/src/Generator/TimeGeneratorFactory.php', + 'Ramsey\\Uuid\\Generator\\TimeGeneratorInterface' => $vendorDir . '/ramsey/uuid/src/Generator/TimeGeneratorInterface.php', + 'Ramsey\\Uuid\\Provider\\NodeProviderInterface' => $vendorDir . '/ramsey/uuid/src/Provider/NodeProviderInterface.php', + 'Ramsey\\Uuid\\Provider\\Node\\FallbackNodeProvider' => $vendorDir . '/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php', + 'Ramsey\\Uuid\\Provider\\Node\\RandomNodeProvider' => $vendorDir . '/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php', + 'Ramsey\\Uuid\\Provider\\Node\\SystemNodeProvider' => $vendorDir . '/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php', + 'Ramsey\\Uuid\\Provider\\TimeProviderInterface' => $vendorDir . '/ramsey/uuid/src/Provider/TimeProviderInterface.php', + 'Ramsey\\Uuid\\Provider\\Time\\FixedTimeProvider' => $vendorDir . '/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php', + 'Ramsey\\Uuid\\Provider\\Time\\SystemTimeProvider' => $vendorDir . '/ramsey/uuid/src/Provider/Time/SystemTimeProvider.php', + 'Ramsey\\Uuid\\Uuid' => $vendorDir . '/ramsey/uuid/src/Uuid.php', + 'Ramsey\\Uuid\\UuidFactory' => $vendorDir . '/ramsey/uuid/src/UuidFactory.php', + 'Ramsey\\Uuid\\UuidFactoryInterface' => $vendorDir . '/ramsey/uuid/src/UuidFactoryInterface.php', + 'Ramsey\\Uuid\\UuidInterface' => $vendorDir . '/ramsey/uuid/src/UuidInterface.php', 'Sabre\\CalDAV\\Backend\\AbstractBackend' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php', 'Sabre\\CalDAV\\Backend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/BackendInterface.php', 'Sabre\\CalDAV\\Backend\\NotificationSupport' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php', @@ -753,6 +799,7 @@ return array( 'SimplePie_Source' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Source.php', 'SimplePie_XML_Declaration_Parser' => $vendorDir . '/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php', 'SimplePie_gzdecode' => $vendorDir . '/simplepie/simplepie/library/SimplePie/gzdecode.php', + 'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php', 'Text_LanguageDetect' => $vendorDir . '/pear/text_languagedetect/Text/LanguageDetect.php', 'Text_LanguageDetect_Exception' => $vendorDir . '/pear/text_languagedetect/Text/LanguageDetect/Exception.php', 'Text_LanguageDetect_ISO639' => $vendorDir . '/pear/text_languagedetect/Text/LanguageDetect/ISO639.php', @@ -786,12 +833,15 @@ return array( 'Zotlabs\\Daemon\\Ratenotif' => $baseDir . '/Zotlabs/Daemon/Ratenotif.php', 'Zotlabs\\Daemon\\Thumbnail' => $baseDir . '/Zotlabs/Daemon/Thumbnail.php', 'Zotlabs\\Extend\\Hook' => $baseDir . '/Zotlabs/Extend/Hook.php', + 'Zotlabs\\Extend\\Route' => $baseDir . '/Zotlabs/Extend/Route.php', + 'Zotlabs\\Extend\\Widget' => $baseDir . '/Zotlabs/Extend/Widget.php', 'Zotlabs\\Identity\\BasicId\\BasicId' => $baseDir . '/Zotlabs/Identity/BasicId.php', 'Zotlabs\\Identity\\OAuth2Server' => $baseDir . '/Zotlabs/Identity/OAuth2Server.php', 'Zotlabs\\Identity\\OAuth2Storage' => $baseDir . '/Zotlabs/Identity/OAuth2Storage.php', 'Zotlabs\\Identity\\ProfilePhoto\\ProfilePhoto' => $baseDir . '/Zotlabs/Identity/ProfilePhoto.php', 'Zotlabs\\Lib\\AConfig' => $baseDir . '/Zotlabs/Lib/AConfig.php', 'Zotlabs\\Lib\\AbConfig' => $baseDir . '/Zotlabs/Lib/AbConfig.php', + 'Zotlabs\\Lib\\Activity' => $baseDir . '/Zotlabs/Lib/Activity.php', 'Zotlabs\\Lib\\ActivityStreams' => $baseDir . '/Zotlabs/Lib/ActivityStreams.php', 'Zotlabs\\Lib\\Api_router' => $baseDir . '/Zotlabs/Lib/Api_router.php', 'Zotlabs\\Lib\\Apps' => $baseDir . '/Zotlabs/Lib/Apps.php', @@ -802,10 +852,14 @@ return array( 'Zotlabs\\Lib\\DReport' => $baseDir . '/Zotlabs/Lib/DReport.php', 'Zotlabs\\Lib\\Enotify' => $baseDir . '/Zotlabs/Lib/Enotify.php', 'Zotlabs\\Lib\\ExtendedZip' => $baseDir . '/Zotlabs/Lib/ExtendedZip.php', + 'Zotlabs\\Lib\\Group' => $baseDir . '/Zotlabs/Lib/Group.php', 'Zotlabs\\Lib\\IConfig' => $baseDir . '/Zotlabs/Lib/IConfig.php', 'Zotlabs\\Lib\\Img_filesize' => $baseDir . '/Zotlabs/Lib/Img_filesize.php', 'Zotlabs\\Lib\\JSalmon' => $baseDir . '/Zotlabs/Lib/JSalmon.php', 'Zotlabs\\Lib\\LDSignatures' => $baseDir . '/Zotlabs/Lib/LDSignatures.php', + 'Zotlabs\\Lib\\Libsync' => $baseDir . '/Zotlabs/Lib/Libsync.php', + 'Zotlabs\\Lib\\Libzot' => $baseDir . '/Zotlabs/Lib/Libzot.php', + 'Zotlabs\\Lib\\Libzotdir' => $baseDir . '/Zotlabs/Lib/Libzotdir.php', 'Zotlabs\\Lib\\MarkdownSoap' => $baseDir . '/Zotlabs/Lib/MarkdownSoap.php', 'Zotlabs\\Lib\\MessageFilter' => $baseDir . '/Zotlabs/Lib/MessageFilter.php', 'Zotlabs\\Lib\\NativeWiki' => $baseDir . '/Zotlabs/Lib/NativeWiki.php', @@ -813,6 +867,7 @@ return array( 'Zotlabs\\Lib\\PConfig' => $baseDir . '/Zotlabs/Lib/PConfig.php', 'Zotlabs\\Lib\\Permcat' => $baseDir . '/Zotlabs/Lib/Permcat.php', 'Zotlabs\\Lib\\PermissionDescription' => $baseDir . '/Zotlabs/Lib/PermissionDescription.php', + 'Zotlabs\\Lib\\Queue' => $baseDir . '/Zotlabs/Lib/Queue.php', 'Zotlabs\\Lib\\SConfig' => $baseDir . '/Zotlabs/Lib/SConfig.php', 'Zotlabs\\Lib\\Share' => $baseDir . '/Zotlabs/Lib/Share.php', 'Zotlabs\\Lib\\SuperCurl' => $baseDir . '/Zotlabs/Lib/SuperCurl.php', @@ -821,7 +876,9 @@ return array( 'Zotlabs\\Lib\\ThreadItem' => $baseDir . '/Zotlabs/Lib/ThreadItem.php', 'Zotlabs\\Lib\\ThreadStream' => $baseDir . '/Zotlabs/Lib/ThreadStream.php', 'Zotlabs\\Lib\\Verify' => $baseDir . '/Zotlabs/Lib/Verify.php', + 'Zotlabs\\Lib\\Webfinger' => $baseDir . '/Zotlabs/Lib/Webfinger.php', 'Zotlabs\\Lib\\XConfig' => $baseDir . '/Zotlabs/Lib/XConfig.php', + 'Zotlabs\\Lib\\Zotfinger' => $baseDir . '/Zotlabs/Lib/Zotfinger.php', 'Zotlabs\\Module\\Achievements' => $baseDir . '/Zotlabs/Module/Achievements.php', 'Zotlabs\\Module\\Acl' => $baseDir . '/Zotlabs/Module/Acl.php', 'Zotlabs\\Module\\Admin' => $baseDir . '/Zotlabs/Module/Admin.php', @@ -1003,6 +1060,7 @@ return array( 'Zotlabs\\Module\\Token' => $baseDir . '/Zotlabs/Module/Token.php', 'Zotlabs\\Module\\Uexport' => $baseDir . '/Zotlabs/Module/Uexport.php', 'Zotlabs\\Module\\Update' => $baseDir . '/Zotlabs/Module/Update.php', + 'Zotlabs\\Module\\Userinfo' => $baseDir . '/Zotlabs/Module/Userinfo.php', 'Zotlabs\\Module\\View' => $baseDir . '/Zotlabs/Module/View.php', 'Zotlabs\\Module\\Viewconnections' => $baseDir . '/Zotlabs/Module/Viewconnections.php', 'Zotlabs\\Module\\Viewsrc' => $baseDir . '/Zotlabs/Module/Viewsrc.php', @@ -1018,6 +1076,8 @@ return array( 'Zotlabs\\Module\\Xrd' => $baseDir . '/Zotlabs/Module/Xrd.php', 'Zotlabs\\Module\\Xref' => $baseDir . '/Zotlabs/Module/Xref.php', 'Zotlabs\\Module\\Zfinger' => $baseDir . '/Zotlabs/Module/Zfinger.php', + 'Zotlabs\\Module\\Zot' => $baseDir . '/Zotlabs/Module/Zot.php', + 'Zotlabs\\Module\\Zot_probe' => $baseDir . '/Zotlabs/Module/Zot_probe.php', 'Zotlabs\\Module\\Zotfeed' => $baseDir . '/Zotlabs/Module/Zotfeed.php', 'Zotlabs\\Module\\Zping' => $baseDir . '/Zotlabs/Module/Zping.php', 'Zotlabs\\Render\\Comanche' => $baseDir . '/Zotlabs/Render/Comanche.php', @@ -1255,6 +1315,9 @@ return array( 'Zotlabs\\Update\\_1213' => $baseDir . '/Zotlabs/Update/_1213.php', 'Zotlabs\\Update\\_1214' => $baseDir . '/Zotlabs/Update/_1214.php', 'Zotlabs\\Update\\_1215' => $baseDir . '/Zotlabs/Update/_1215.php', + 'Zotlabs\\Update\\_1216' => $baseDir . '/Zotlabs/Update/_1216.php', + 'Zotlabs\\Update\\_1217' => $baseDir . '/Zotlabs/Update/_1217.php', + 'Zotlabs\\Update\\_1218' => $baseDir . '/Zotlabs/Update/_1218.php', 'Zotlabs\\Web\\CheckJS' => $baseDir . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php', @@ -1328,6 +1391,11 @@ return array( 'Zotlabs\\Widget\\Wiki_page_history' => $baseDir . '/Zotlabs/Widget/Wiki_page_history.php', 'Zotlabs\\Widget\\Wiki_pages' => $baseDir . '/Zotlabs/Widget/Wiki_pages.php', 'Zotlabs\\Widget\\Zcard' => $baseDir . '/Zotlabs/Widget/Zcard.php', + 'Zotlabs\\Zot6\\Finger' => $baseDir . '/Zotlabs/Zot6/Finger.php', + 'Zotlabs\\Zot6\\HTTPSig' => $baseDir . '/Zotlabs/Zot6/HTTPSig.php', + 'Zotlabs\\Zot6\\IHandler' => $baseDir . '/Zotlabs/Zot6/IHandler.php', + 'Zotlabs\\Zot6\\Receiver' => $baseDir . '/Zotlabs/Zot6/Receiver.php', + 'Zotlabs\\Zot6\\Zot6Handler' => $baseDir . '/Zotlabs/Zot6/Zot6Handler.php', 'Zotlabs\\Zot\\Auth' => $baseDir . '/Zotlabs/Zot/Auth.php', 'Zotlabs\\Zot\\Finger' => $baseDir . '/Zotlabs/Zot/Finger.php', 'Zotlabs\\Zot\\IHandler' => $baseDir . '/Zotlabs/Zot/IHandler.php', diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index 1fd1888f8..54054991d 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -13,6 +13,7 @@ return array( '3569eecfeed3bcf0bad3c998a494ecb8' => $vendorDir . '/sabre/xml/lib/Deserializer/functions.php', '93aa591bc4ca510c520999e34229ee79' => $vendorDir . '/sabre/xml/lib/Serializer/functions.php', 'ebdb698ed4152ae445614b69b5e4bb6a' => $vendorDir . '/sabre/http/lib/functions.php', + '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php', '2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php', 'f084d01b0a599f67676cffef638aa95b' => $vendorDir . '/smarty/smarty/libs/bootstrap.php', ); diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index e57848647..0029db7c1 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -7,6 +7,7 @@ $baseDir = dirname($vendorDir); return array( 'Zotlabs\\' => array($baseDir . '/Zotlabs'), + 'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'), 'Sabre\\Xml\\' => array($vendorDir . '/sabre/xml/lib'), 'Sabre\\VObject\\' => array($vendorDir . '/sabre/vobject/lib'), 'Sabre\\Uri\\' => array($vendorDir . '/sabre/uri/lib'), @@ -16,6 +17,7 @@ return array( 'Sabre\\DAVACL\\' => array($vendorDir . '/sabre/dav/lib/DAVACL'), 'Sabre\\CardDAV\\' => array($vendorDir . '/sabre/dav/lib/CardDAV'), 'Sabre\\CalDAV\\' => array($vendorDir . '/sabre/dav/lib/CalDAV'), + 'Ramsey\\Uuid\\' => array($vendorDir . '/ramsey/uuid/src'), 'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'), 'Michelf\\' => array($vendorDir . '/michelf/php-markdown/Michelf'), 'League\\HTMLToMarkdown\\' => array($vendorDir . '/league/html-to-markdown/src'), diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index cd4782104..1768f259e 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -14,6 +14,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d '3569eecfeed3bcf0bad3c998a494ecb8' => __DIR__ . '/..' . '/sabre/xml/lib/Deserializer/functions.php', '93aa591bc4ca510c520999e34229ee79' => __DIR__ . '/..' . '/sabre/xml/lib/Serializer/functions.php', 'ebdb698ed4152ae445614b69b5e4bb6a' => __DIR__ . '/..' . '/sabre/http/lib/functions.php', + '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', '2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php', 'f084d01b0a599f67676cffef638aa95b' => __DIR__ . '/..' . '/smarty/smarty/libs/bootstrap.php', ); @@ -25,6 +26,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d ), 'S' => array ( + 'Symfony\\Polyfill\\Ctype\\' => 23, 'Sabre\\Xml\\' => 10, 'Sabre\\VObject\\' => 14, 'Sabre\\Uri\\' => 10, @@ -35,6 +37,10 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Sabre\\CardDAV\\' => 14, 'Sabre\\CalDAV\\' => 13, ), + 'R' => + array ( + 'Ramsey\\Uuid\\' => 12, + ), 'P' => array ( 'Psr\\Log\\' => 8, @@ -66,6 +72,10 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d array ( 0 => __DIR__ . '/../..' . '/Zotlabs', ), + 'Symfony\\Polyfill\\Ctype\\' => + array ( + 0 => __DIR__ . '/..' . '/symfony/polyfill-ctype', + ), 'Sabre\\Xml\\' => array ( 0 => __DIR__ . '/..' . '/sabre/xml/lib', @@ -102,6 +112,10 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d array ( 0 => __DIR__ . '/..' . '/sabre/dav/lib/CalDAV', ), + 'Ramsey\\Uuid\\' => + array ( + 0 => __DIR__ . '/..' . '/ramsey/uuid/src', + ), 'Psr\\Log\\' => array ( 0 => __DIR__ . '/..' . '/psr/log/Psr/Log', @@ -533,6 +547,52 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php', + 'Ramsey\\Uuid\\BinaryUtils' => __DIR__ . '/..' . '/ramsey/uuid/src/BinaryUtils.php', + 'Ramsey\\Uuid\\Builder\\DefaultUuidBuilder' => __DIR__ . '/..' . '/ramsey/uuid/src/Builder/DefaultUuidBuilder.php', + 'Ramsey\\Uuid\\Builder\\DegradedUuidBuilder' => __DIR__ . '/..' . '/ramsey/uuid/src/Builder/DegradedUuidBuilder.php', + 'Ramsey\\Uuid\\Builder\\UuidBuilderInterface' => __DIR__ . '/..' . '/ramsey/uuid/src/Builder/UuidBuilderInterface.php', + 'Ramsey\\Uuid\\Codec\\CodecInterface' => __DIR__ . '/..' . '/ramsey/uuid/src/Codec/CodecInterface.php', + 'Ramsey\\Uuid\\Codec\\GuidStringCodec' => __DIR__ . '/..' . '/ramsey/uuid/src/Codec/GuidStringCodec.php', + 'Ramsey\\Uuid\\Codec\\OrderedTimeCodec' => __DIR__ . '/..' . '/ramsey/uuid/src/Codec/OrderedTimeCodec.php', + 'Ramsey\\Uuid\\Codec\\StringCodec' => __DIR__ . '/..' . '/ramsey/uuid/src/Codec/StringCodec.php', + 'Ramsey\\Uuid\\Codec\\TimestampFirstCombCodec' => __DIR__ . '/..' . '/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php', + 'Ramsey\\Uuid\\Codec\\TimestampLastCombCodec' => __DIR__ . '/..' . '/ramsey/uuid/src/Codec/TimestampLastCombCodec.php', + 'Ramsey\\Uuid\\Converter\\NumberConverterInterface' => __DIR__ . '/..' . '/ramsey/uuid/src/Converter/NumberConverterInterface.php', + 'Ramsey\\Uuid\\Converter\\Number\\BigNumberConverter' => __DIR__ . '/..' . '/ramsey/uuid/src/Converter/Number/BigNumberConverter.php', + 'Ramsey\\Uuid\\Converter\\Number\\DegradedNumberConverter' => __DIR__ . '/..' . '/ramsey/uuid/src/Converter/Number/DegradedNumberConverter.php', + 'Ramsey\\Uuid\\Converter\\TimeConverterInterface' => __DIR__ . '/..' . '/ramsey/uuid/src/Converter/TimeConverterInterface.php', + 'Ramsey\\Uuid\\Converter\\Time\\BigNumberTimeConverter' => __DIR__ . '/..' . '/ramsey/uuid/src/Converter/Time/BigNumberTimeConverter.php', + 'Ramsey\\Uuid\\Converter\\Time\\DegradedTimeConverter' => __DIR__ . '/..' . '/ramsey/uuid/src/Converter/Time/DegradedTimeConverter.php', + 'Ramsey\\Uuid\\Converter\\Time\\PhpTimeConverter' => __DIR__ . '/..' . '/ramsey/uuid/src/Converter/Time/PhpTimeConverter.php', + 'Ramsey\\Uuid\\DegradedUuid' => __DIR__ . '/..' . '/ramsey/uuid/src/DegradedUuid.php', + 'Ramsey\\Uuid\\Exception\\InvalidUuidStringException' => __DIR__ . '/..' . '/ramsey/uuid/src/Exception/InvalidUuidStringException.php', + 'Ramsey\\Uuid\\Exception\\UnsatisfiedDependencyException' => __DIR__ . '/..' . '/ramsey/uuid/src/Exception/UnsatisfiedDependencyException.php', + 'Ramsey\\Uuid\\Exception\\UnsupportedOperationException' => __DIR__ . '/..' . '/ramsey/uuid/src/Exception/UnsupportedOperationException.php', + 'Ramsey\\Uuid\\FeatureSet' => __DIR__ . '/..' . '/ramsey/uuid/src/FeatureSet.php', + 'Ramsey\\Uuid\\Generator\\CombGenerator' => __DIR__ . '/..' . '/ramsey/uuid/src/Generator/CombGenerator.php', + 'Ramsey\\Uuid\\Generator\\DefaultTimeGenerator' => __DIR__ . '/..' . '/ramsey/uuid/src/Generator/DefaultTimeGenerator.php', + 'Ramsey\\Uuid\\Generator\\MtRandGenerator' => __DIR__ . '/..' . '/ramsey/uuid/src/Generator/MtRandGenerator.php', + 'Ramsey\\Uuid\\Generator\\OpenSslGenerator' => __DIR__ . '/..' . '/ramsey/uuid/src/Generator/OpenSslGenerator.php', + 'Ramsey\\Uuid\\Generator\\PeclUuidRandomGenerator' => __DIR__ . '/..' . '/ramsey/uuid/src/Generator/PeclUuidRandomGenerator.php', + 'Ramsey\\Uuid\\Generator\\PeclUuidTimeGenerator' => __DIR__ . '/..' . '/ramsey/uuid/src/Generator/PeclUuidTimeGenerator.php', + 'Ramsey\\Uuid\\Generator\\RandomBytesGenerator' => __DIR__ . '/..' . '/ramsey/uuid/src/Generator/RandomBytesGenerator.php', + 'Ramsey\\Uuid\\Generator\\RandomGeneratorFactory' => __DIR__ . '/..' . '/ramsey/uuid/src/Generator/RandomGeneratorFactory.php', + 'Ramsey\\Uuid\\Generator\\RandomGeneratorInterface' => __DIR__ . '/..' . '/ramsey/uuid/src/Generator/RandomGeneratorInterface.php', + 'Ramsey\\Uuid\\Generator\\RandomLibAdapter' => __DIR__ . '/..' . '/ramsey/uuid/src/Generator/RandomLibAdapter.php', + 'Ramsey\\Uuid\\Generator\\SodiumRandomGenerator' => __DIR__ . '/..' . '/ramsey/uuid/src/Generator/SodiumRandomGenerator.php', + 'Ramsey\\Uuid\\Generator\\TimeGeneratorFactory' => __DIR__ . '/..' . '/ramsey/uuid/src/Generator/TimeGeneratorFactory.php', + 'Ramsey\\Uuid\\Generator\\TimeGeneratorInterface' => __DIR__ . '/..' . '/ramsey/uuid/src/Generator/TimeGeneratorInterface.php', + 'Ramsey\\Uuid\\Provider\\NodeProviderInterface' => __DIR__ . '/..' . '/ramsey/uuid/src/Provider/NodeProviderInterface.php', + 'Ramsey\\Uuid\\Provider\\Node\\FallbackNodeProvider' => __DIR__ . '/..' . '/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php', + 'Ramsey\\Uuid\\Provider\\Node\\RandomNodeProvider' => __DIR__ . '/..' . '/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php', + 'Ramsey\\Uuid\\Provider\\Node\\SystemNodeProvider' => __DIR__ . '/..' . '/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php', + 'Ramsey\\Uuid\\Provider\\TimeProviderInterface' => __DIR__ . '/..' . '/ramsey/uuid/src/Provider/TimeProviderInterface.php', + 'Ramsey\\Uuid\\Provider\\Time\\FixedTimeProvider' => __DIR__ . '/..' . '/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php', + 'Ramsey\\Uuid\\Provider\\Time\\SystemTimeProvider' => __DIR__ . '/..' . '/ramsey/uuid/src/Provider/Time/SystemTimeProvider.php', + 'Ramsey\\Uuid\\Uuid' => __DIR__ . '/..' . '/ramsey/uuid/src/Uuid.php', + 'Ramsey\\Uuid\\UuidFactory' => __DIR__ . '/..' . '/ramsey/uuid/src/UuidFactory.php', + 'Ramsey\\Uuid\\UuidFactoryInterface' => __DIR__ . '/..' . '/ramsey/uuid/src/UuidFactoryInterface.php', + 'Ramsey\\Uuid\\UuidInterface' => __DIR__ . '/..' . '/ramsey/uuid/src/UuidInterface.php', 'Sabre\\CalDAV\\Backend\\AbstractBackend' => __DIR__ . '/..' . '/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php', 'Sabre\\CalDAV\\Backend\\BackendInterface' => __DIR__ . '/..' . '/sabre/dav/lib/CalDAV/Backend/BackendInterface.php', 'Sabre\\CalDAV\\Backend\\NotificationSupport' => __DIR__ . '/..' . '/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php', @@ -907,6 +967,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'SimplePie_Source' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Source.php', 'SimplePie_XML_Declaration_Parser' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php', 'SimplePie_gzdecode' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/gzdecode.php', + 'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php', 'Text_LanguageDetect' => __DIR__ . '/..' . '/pear/text_languagedetect/Text/LanguageDetect.php', 'Text_LanguageDetect_Exception' => __DIR__ . '/..' . '/pear/text_languagedetect/Text/LanguageDetect/Exception.php', 'Text_LanguageDetect_ISO639' => __DIR__ . '/..' . '/pear/text_languagedetect/Text/LanguageDetect/ISO639.php', @@ -940,12 +1001,15 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Daemon\\Ratenotif' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Ratenotif.php', 'Zotlabs\\Daemon\\Thumbnail' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Thumbnail.php', 'Zotlabs\\Extend\\Hook' => __DIR__ . '/../..' . '/Zotlabs/Extend/Hook.php', + 'Zotlabs\\Extend\\Route' => __DIR__ . '/../..' . '/Zotlabs/Extend/Route.php', + 'Zotlabs\\Extend\\Widget' => __DIR__ . '/../..' . '/Zotlabs/Extend/Widget.php', 'Zotlabs\\Identity\\BasicId\\BasicId' => __DIR__ . '/../..' . '/Zotlabs/Identity/BasicId.php', 'Zotlabs\\Identity\\OAuth2Server' => __DIR__ . '/../..' . '/Zotlabs/Identity/OAuth2Server.php', 'Zotlabs\\Identity\\OAuth2Storage' => __DIR__ . '/../..' . '/Zotlabs/Identity/OAuth2Storage.php', 'Zotlabs\\Identity\\ProfilePhoto\\ProfilePhoto' => __DIR__ . '/../..' . '/Zotlabs/Identity/ProfilePhoto.php', 'Zotlabs\\Lib\\AConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/AConfig.php', 'Zotlabs\\Lib\\AbConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/AbConfig.php', + 'Zotlabs\\Lib\\Activity' => __DIR__ . '/../..' . '/Zotlabs/Lib/Activity.php', 'Zotlabs\\Lib\\ActivityStreams' => __DIR__ . '/../..' . '/Zotlabs/Lib/ActivityStreams.php', 'Zotlabs\\Lib\\Api_router' => __DIR__ . '/../..' . '/Zotlabs/Lib/Api_router.php', 'Zotlabs\\Lib\\Apps' => __DIR__ . '/../..' . '/Zotlabs/Lib/Apps.php', @@ -956,10 +1020,14 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Lib\\DReport' => __DIR__ . '/../..' . '/Zotlabs/Lib/DReport.php', 'Zotlabs\\Lib\\Enotify' => __DIR__ . '/../..' . '/Zotlabs/Lib/Enotify.php', 'Zotlabs\\Lib\\ExtendedZip' => __DIR__ . '/../..' . '/Zotlabs/Lib/ExtendedZip.php', + 'Zotlabs\\Lib\\Group' => __DIR__ . '/../..' . '/Zotlabs/Lib/Group.php', 'Zotlabs\\Lib\\IConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/IConfig.php', 'Zotlabs\\Lib\\Img_filesize' => __DIR__ . '/../..' . '/Zotlabs/Lib/Img_filesize.php', 'Zotlabs\\Lib\\JSalmon' => __DIR__ . '/../..' . '/Zotlabs/Lib/JSalmon.php', 'Zotlabs\\Lib\\LDSignatures' => __DIR__ . '/../..' . '/Zotlabs/Lib/LDSignatures.php', + 'Zotlabs\\Lib\\Libsync' => __DIR__ . '/../..' . '/Zotlabs/Lib/Libsync.php', + 'Zotlabs\\Lib\\Libzot' => __DIR__ . '/../..' . '/Zotlabs/Lib/Libzot.php', + 'Zotlabs\\Lib\\Libzotdir' => __DIR__ . '/../..' . '/Zotlabs/Lib/Libzotdir.php', 'Zotlabs\\Lib\\MarkdownSoap' => __DIR__ . '/../..' . '/Zotlabs/Lib/MarkdownSoap.php', 'Zotlabs\\Lib\\MessageFilter' => __DIR__ . '/../..' . '/Zotlabs/Lib/MessageFilter.php', 'Zotlabs\\Lib\\NativeWiki' => __DIR__ . '/../..' . '/Zotlabs/Lib/NativeWiki.php', @@ -967,6 +1035,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Lib\\PConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/PConfig.php', 'Zotlabs\\Lib\\Permcat' => __DIR__ . '/../..' . '/Zotlabs/Lib/Permcat.php', 'Zotlabs\\Lib\\PermissionDescription' => __DIR__ . '/../..' . '/Zotlabs/Lib/PermissionDescription.php', + 'Zotlabs\\Lib\\Queue' => __DIR__ . '/../..' . '/Zotlabs/Lib/Queue.php', 'Zotlabs\\Lib\\SConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/SConfig.php', 'Zotlabs\\Lib\\Share' => __DIR__ . '/../..' . '/Zotlabs/Lib/Share.php', 'Zotlabs\\Lib\\SuperCurl' => __DIR__ . '/../..' . '/Zotlabs/Lib/SuperCurl.php', @@ -975,7 +1044,9 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Lib\\ThreadItem' => __DIR__ . '/../..' . '/Zotlabs/Lib/ThreadItem.php', 'Zotlabs\\Lib\\ThreadStream' => __DIR__ . '/../..' . '/Zotlabs/Lib/ThreadStream.php', 'Zotlabs\\Lib\\Verify' => __DIR__ . '/../..' . '/Zotlabs/Lib/Verify.php', + 'Zotlabs\\Lib\\Webfinger' => __DIR__ . '/../..' . '/Zotlabs/Lib/Webfinger.php', 'Zotlabs\\Lib\\XConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/XConfig.php', + 'Zotlabs\\Lib\\Zotfinger' => __DIR__ . '/../..' . '/Zotlabs/Lib/Zotfinger.php', 'Zotlabs\\Module\\Achievements' => __DIR__ . '/../..' . '/Zotlabs/Module/Achievements.php', 'Zotlabs\\Module\\Acl' => __DIR__ . '/../..' . '/Zotlabs/Module/Acl.php', 'Zotlabs\\Module\\Admin' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin.php', @@ -1157,6 +1228,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Token' => __DIR__ . '/../..' . '/Zotlabs/Module/Token.php', 'Zotlabs\\Module\\Uexport' => __DIR__ . '/../..' . '/Zotlabs/Module/Uexport.php', 'Zotlabs\\Module\\Update' => __DIR__ . '/../..' . '/Zotlabs/Module/Update.php', + 'Zotlabs\\Module\\Userinfo' => __DIR__ . '/../..' . '/Zotlabs/Module/Userinfo.php', 'Zotlabs\\Module\\View' => __DIR__ . '/../..' . '/Zotlabs/Module/View.php', 'Zotlabs\\Module\\Viewconnections' => __DIR__ . '/../..' . '/Zotlabs/Module/Viewconnections.php', 'Zotlabs\\Module\\Viewsrc' => __DIR__ . '/../..' . '/Zotlabs/Module/Viewsrc.php', @@ -1172,6 +1244,8 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Xrd' => __DIR__ . '/../..' . '/Zotlabs/Module/Xrd.php', 'Zotlabs\\Module\\Xref' => __DIR__ . '/../..' . '/Zotlabs/Module/Xref.php', 'Zotlabs\\Module\\Zfinger' => __DIR__ . '/../..' . '/Zotlabs/Module/Zfinger.php', + 'Zotlabs\\Module\\Zot' => __DIR__ . '/../..' . '/Zotlabs/Module/Zot.php', + 'Zotlabs\\Module\\Zot_probe' => __DIR__ . '/../..' . '/Zotlabs/Module/Zot_probe.php', 'Zotlabs\\Module\\Zotfeed' => __DIR__ . '/../..' . '/Zotlabs/Module/Zotfeed.php', 'Zotlabs\\Module\\Zping' => __DIR__ . '/../..' . '/Zotlabs/Module/Zping.php', 'Zotlabs\\Render\\Comanche' => __DIR__ . '/../..' . '/Zotlabs/Render/Comanche.php', @@ -1409,6 +1483,9 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Update\\_1213' => __DIR__ . '/../..' . '/Zotlabs/Update/_1213.php', 'Zotlabs\\Update\\_1214' => __DIR__ . '/../..' . '/Zotlabs/Update/_1214.php', 'Zotlabs\\Update\\_1215' => __DIR__ . '/../..' . '/Zotlabs/Update/_1215.php', + 'Zotlabs\\Update\\_1216' => __DIR__ . '/../..' . '/Zotlabs/Update/_1216.php', + 'Zotlabs\\Update\\_1217' => __DIR__ . '/../..' . '/Zotlabs/Update/_1217.php', + 'Zotlabs\\Update\\_1218' => __DIR__ . '/../..' . '/Zotlabs/Update/_1218.php', 'Zotlabs\\Web\\CheckJS' => __DIR__ . '/../..' . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php', @@ -1482,6 +1559,11 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Widget\\Wiki_page_history' => __DIR__ . '/../..' . '/Zotlabs/Widget/Wiki_page_history.php', 'Zotlabs\\Widget\\Wiki_pages' => __DIR__ . '/../..' . '/Zotlabs/Widget/Wiki_pages.php', 'Zotlabs\\Widget\\Zcard' => __DIR__ . '/../..' . '/Zotlabs/Widget/Zcard.php', + 'Zotlabs\\Zot6\\Finger' => __DIR__ . '/../..' . '/Zotlabs/Zot6/Finger.php', + 'Zotlabs\\Zot6\\HTTPSig' => __DIR__ . '/../..' . '/Zotlabs/Zot6/HTTPSig.php', + 'Zotlabs\\Zot6\\IHandler' => __DIR__ . '/../..' . '/Zotlabs/Zot6/IHandler.php', + 'Zotlabs\\Zot6\\Receiver' => __DIR__ . '/../..' . '/Zotlabs/Zot6/Receiver.php', + 'Zotlabs\\Zot6\\Zot6Handler' => __DIR__ . '/../..' . '/Zotlabs/Zot6/Zot6Handler.php', 'Zotlabs\\Zot\\Auth' => __DIR__ . '/../..' . '/Zotlabs/Zot/Auth.php', 'Zotlabs\\Zot\\Finger' => __DIR__ . '/../..' . '/Zotlabs/Zot/Finger.php', 'Zotlabs\\Zot\\IHandler' => __DIR__ . '/../..' . '/Zotlabs/Zot/IHandler.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index ea47f731d..fcde8b0f0 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -156,17 +156,17 @@ }, { "name": "league/html-to-markdown", - "version": "4.6.2", - "version_normalized": "4.6.2.0", + "version": "4.7.0", + "version_normalized": "4.7.0.0", "source": { "type": "git", "url": "https://github.com/thephpleague/html-to-markdown.git", - "reference": "3af14d8f44838257a75822819784e83819b34e2e" + "reference": "76c076483cef89860d32a3fd25312f5a42848a8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/3af14d8f44838257a75822819784e83819b34e2e", - "reference": "3af14d8f44838257a75822819784e83819b34e2e", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/76c076483cef89860d32a3fd25312f5a42848a8c", + "reference": "76c076483cef89860d32a3fd25312f5a42848a8c", "shasum": "" }, "require": { @@ -179,14 +179,14 @@ "phpunit/phpunit": "4.*", "scrutinizer/ocular": "~1.1" }, - "time": "2018-01-07T19:45:06+00:00", + "time": "2018-05-19T23:47:12+00:00", "bin": [ "bin/html-to-markdown" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "4.7-dev" + "dev-master": "4.8-dev" } }, "installation-source": "dist", @@ -306,6 +306,53 @@ ] }, { + "name": "paragonie/random_compat", + "version": "v9.99.99", + "version_normalized": "9.99.99.0", + "source": { + "type": "git", + "url": "https://github.com/paragonie/random_compat.git", + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", + "shasum": "" + }, + "require": { + "php": "^7" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "time": "2018-07-02T15:55:56+00:00", + "type": "library", + "installation-source": "dist", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "keywords": [ + "csprng", + "polyfill", + "pseudorandom", + "random" + ] + }, + { "name": "pear/text_languagedetect", "version": "v1.0.0", "version_normalized": "1.0.0.0", @@ -401,6 +448,90 @@ ] }, { + "name": "ramsey/uuid", + "version": "3.8.0", + "version_normalized": "3.8.0.0", + "source": { + "type": "git", + "url": "https://github.com/ramsey/uuid.git", + "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3", + "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3", + "shasum": "" + }, + "require": { + "paragonie/random_compat": "^1.0|^2.0|9.99.99", + "php": "^5.4 || ^7.0", + "symfony/polyfill-ctype": "^1.8" + }, + "replace": { + "rhumsaa/uuid": "self.version" + }, + "require-dev": { + "codeception/aspect-mock": "^1.0 | ~2.0.0", + "doctrine/annotations": "~1.2.0", + "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0", + "ircmaxell/random-lib": "^1.1", + "jakub-onderka/php-parallel-lint": "^0.9.0", + "mockery/mockery": "^0.9.9", + "moontoast/math": "^1.1", + "php-mock/php-mock-phpunit": "^0.3|^1.1", + "phpunit/phpunit": "^4.7|^5.0|^6.5", + "squizlabs/php_codesniffer": "^2.3" + }, + "suggest": { + "ext-ctype": "Provides support for PHP Ctype functions", + "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator", + "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator", + "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter", + "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).", + "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid", + "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." + }, + "time": "2018-07-19T23:38:55+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Ramsey\\Uuid\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marijn Huizendveld", + "email": "marijn.huizendveld@gmail.com" + }, + { + "name": "Thibaud Fabre", + "email": "thibaud@aztech.io" + }, + { + "name": "Ben Ramsey", + "email": "ben@benramsey.com", + "homepage": "https://benramsey.com" + } + ], + "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", + "homepage": "https://github.com/ramsey/uuid", + "keywords": [ + "guid", + "identifier", + "uuid" + ] + }, + { "name": "sabre/dav", "version": "3.2.2", "version_normalized": "3.2.2.0", @@ -821,29 +952,36 @@ }, { "name": "simplepie/simplepie", - "version": "1.5.1", - "version_normalized": "1.5.1.0", + "version": "1.5.2", + "version_normalized": "1.5.2.0", "source": { "type": "git", "url": "https://github.com/simplepie/simplepie.git", - "reference": "db9fff27b6d49eed3d4047cd3211ec8dba2f5d6e" + "reference": "0e8fe72132dad765d25db4cabc69a91139af1263" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplepie/simplepie/zipball/db9fff27b6d49eed3d4047cd3211ec8dba2f5d6e", - "reference": "db9fff27b6d49eed3d4047cd3211ec8dba2f5d6e", + "url": "https://api.github.com/repos/simplepie/simplepie/zipball/0e8fe72132dad765d25db4cabc69a91139af1263", + "reference": "0e8fe72132dad765d25db4cabc69a91139af1263", "shasum": "" }, "require": { - "php": ">=5.3.0" + "ext-pcre": "*", + "ext-xml": "*", + "ext-xmlreader": "*", + "php": ">=5.6.0" }, "require-dev": { - "phpunit/phpunit": "~4 || ~5" + "phpunit/phpunit": "~5.4.3 || ~6.5" }, "suggest": { + "ext-curl": "", + "ext-iconv": "", + "ext-intl": "", + "ext-mbstring": "", "mf2/mf2": "Microformat module that allows for parsing HTML for microformats" }, - "time": "2017-11-12T02:03:34+00:00", + "time": "2018-08-02T05:43:58+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -851,6 +989,11 @@ "SimplePie": "library" } }, + "scripts": { + "test": [ + "phpunit" + ] + }, "license": [ "BSD-3-Clause" ], @@ -880,7 +1023,7 @@ "rss" ], "support": { - "source": "https://github.com/simplepie/simplepie/tree/1.5.1", + "source": "https://github.com/simplepie/simplepie/tree/1.5.2", "issues": "https://github.com/simplepie/simplepie/issues" } }, @@ -938,5 +1081,65 @@ "keywords": [ "templating" ] + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.9.0", + "version_normalized": "1.9.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", + "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "time": "2018-08-06T14:22:27+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ] } ] diff --git a/vendor/league/html-to-markdown/CHANGELOG.md b/vendor/league/html-to-markdown/CHANGELOG.md index c3b7bf65b..981ffd594 100644 --- a/vendor/league/html-to-markdown/CHANGELOG.md +++ b/vendor/league/html-to-markdown/CHANGELOG.md @@ -4,6 +4,16 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip ## [Unreleased][unreleased] +## [4.7.0] - 2018-05-19 +### Added + - Added `setOptions()` function for chainable calling (#149) + - Added new `list_item_style_alternate` option for converting every-other list with a different character (#155) + +### Fixed + - Fixed insufficient newlines after code blocks (#144, #148) + - Fixed trailing spaces not being preserved in link anchors (#157) + - Fixed list-like lines not being escaped inside of lists items (#159) + ## [4.6.2] ### Fixed - Fixed issue with emphasized spaces (#146) @@ -207,7 +217,8 @@ not ideally set, so this releases fixes that. Moving forwards this should reduce ### Added - Initial release -[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.6.2...master +[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.7.0...master +[4.7.0]: https://github.com/thephpleague/html-to-markdown/compare/4.6.2...4.7.0 [4.6.2]: https://github.com/thephpleague/html-to-markdown/compare/4.6.1...4.6.2 [4.6.1]: https://github.com/thephpleague/html-to-markdown/compare/4.6.0...4.6.1 [4.6.0]: https://github.com/thephpleague/html-to-markdown/compare/4.5.0...4.6.0 diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json index 8482b767c..c79230562 100644 --- a/vendor/league/html-to-markdown/composer.json +++ b/vendor/league/html-to-markdown/composer.json @@ -42,7 +42,7 @@ "bin": ["bin/html-to-markdown"], "extra": { "branch-alias": { - "dev-master": "4.7-dev" + "dev-master": "4.8-dev" } } } diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php index c8ec2c005..e536362ee 100644 --- a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php +++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php @@ -43,7 +43,7 @@ class CodeConverter implements ConverterInterface $lines = preg_split('/\r\n|\r|\n/', $code); if (count($lines) > 1) { // Multiple lines detected, adding three backticks and newlines - $markdown .= '```' . $language . "\n" . $code . "\n" . '```'; + $markdown .= '```' . $language . "\n" . $code . "\n" . '```' . "\n\n"; } else { // One line of code, wrapping it on one backtick. $markdown .= '`' . $language . $code . '`'; diff --git a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php index 37cd44e73..d079d9127 100644 --- a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php +++ b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php @@ -28,7 +28,19 @@ class HardBreakConverter implements ConverterInterface, ConfigurationAwareInterf */ public function convert(ElementInterface $element) { - return $this->config->getOption('hard_break') ? "\n" : " \n"; + $return = $this->config->getOption('hard_break') ? "\n" : " \n"; + + $next = $element->getNext(); + if ($next) { + $next_value = $next->getValue(); + if ($next_value) { + if (in_array(substr($next_value, 0, 2), array('- ', '* ', '+ '))) { + $return .= '\\'; + } + } + } + + return $return; } /** diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php index f0765f38b..74b49a778 100644 --- a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php +++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php @@ -15,7 +15,7 @@ class LinkConverter implements ConverterInterface { $href = $element->getAttribute('href'); $title = $element->getAttribute('title'); - $text = trim($element->getValue()); + $text = trim($element->getValue(), "\t\n\r\0\x0B"); if ($title !== '') { $markdown = '[' . $text . '](' . $href . ' "' . $title . '")'; diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php index f737b4e19..c56ab89cd 100644 --- a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php +++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php @@ -14,6 +14,11 @@ class ListItemConverter implements ConverterInterface, ConfigurationAwareInterfa protected $config; /** + * @var string + */ + protected $listItemStyle; + + /** * @param Configuration $config */ public function setConfig(Configuration $config) @@ -45,7 +50,16 @@ class ListItemConverter implements ConverterInterface, ConfigurationAwareInterfa if ($list_type === 'ul') { $list_item_style = $this->config->getOption('list_item_style', '-'); - return $prefix . $list_item_style . ' ' . $value . "\n"; + $list_item_style_alternate = $this->config->getOption('list_item_style_alternate'); + if (!isset($this->listItemStyle)) { + $this->listItemStyle = $list_item_style_alternate ? $list_item_style_alternate : $list_item_style; + } + + if ($list_item_style_alternate && $level == 0 && $element->getSiblingPosition() === 1) { + $this->listItemStyle = $this->listItemStyle == $list_item_style ? $list_item_style_alternate : $list_item_style; + } + + return $prefix . $this->listItemStyle . ' ' . $value . "\n"; } if ($list_type === 'ol' && $start = $element->getParent()->getAttribute('start')) { diff --git a/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php b/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php index 0bb89e90f..3b77ba10b 100644 --- a/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php +++ b/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php @@ -53,7 +53,7 @@ class PreformattedConverter implements ConverterInterface } // Use three backticks - return "```\n" . $pre_content . "```\n"; + return "```\n" . $pre_content . "```\n\n"; } /** diff --git a/vendor/league/html-to-markdown/src/HtmlConverter.php b/vendor/league/html-to-markdown/src/HtmlConverter.php index 8d8936ec5..155369f56 100644 --- a/vendor/league/html-to-markdown/src/HtmlConverter.php +++ b/vendor/league/html-to-markdown/src/HtmlConverter.php @@ -229,4 +229,23 @@ class HtmlConverter return trim($markdown, "\n\r\0\x0B"); } + + /** + * Pass a series of key-value pairs in an array; these will be passed + * through the config and set. + * The advantage of this is that it can allow for static use (IE in Laravel). + * An example being: + * + * HtmlConverter::setOptions(['strip_tags' => true])->convert('<h1>test</h1>'); + */ + public function setOptions(array $options) + { + $config = $this->getConfig(); + + foreach ($options as $key => $option) { + $config->setOption($key, $option); + } + + return $this; + } } diff --git a/vendor/paragonie/random_compat/LICENSE b/vendor/paragonie/random_compat/LICENSE new file mode 100644 index 000000000..45c7017df --- /dev/null +++ b/vendor/paragonie/random_compat/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2015 Paragon Initiative Enterprises + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/vendor/paragonie/random_compat/build-phar.sh b/vendor/paragonie/random_compat/build-phar.sh new file mode 100644 index 000000000..b4a5ba31c --- /dev/null +++ b/vendor/paragonie/random_compat/build-phar.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +basedir=$( dirname $( readlink -f ${BASH_SOURCE[0]} ) ) + +php -dphar.readonly=0 "$basedir/other/build_phar.php" $*
\ No newline at end of file diff --git a/vendor/paragonie/random_compat/composer.json b/vendor/paragonie/random_compat/composer.json new file mode 100644 index 000000000..1fa8de9f1 --- /dev/null +++ b/vendor/paragonie/random_compat/composer.json @@ -0,0 +1,34 @@ +{ + "name": "paragonie/random_compat", + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "keywords": [ + "csprng", + "random", + "polyfill", + "pseudorandom" + ], + "license": "MIT", + "type": "library", + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "support": { + "issues": "https://github.com/paragonie/random_compat/issues", + "email": "info@paragonie.com", + "source": "https://github.com/paragonie/random_compat" + }, + "require": { + "php": "^7" + }, + "require-dev": { + "vimeo/psalm": "^1", + "phpunit/phpunit": "4.*|5.*" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + } +} diff --git a/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey b/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey new file mode 100644 index 000000000..eb50ebfcd --- /dev/null +++ b/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey @@ -0,0 +1,5 @@ +-----BEGIN PUBLIC KEY----- +MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEEd+wCqJDrx5B4OldM0dQE0ZMX+lx1ZWm +pui0SUqD4G29L3NGsz9UhJ/0HjBdbnkhIK5xviT0X5vtjacF6ajgcCArbTB+ds+p ++h7Q084NuSuIpNb6YPfoUFgC/CL9kAoc +-----END PUBLIC KEY----- diff --git a/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey.asc b/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey.asc new file mode 100644 index 000000000..6a1d7f300 --- /dev/null +++ b/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (MingW32) + +iQEcBAABAgAGBQJWtW1hAAoJEGuXocKCZATaJf0H+wbZGgskK1dcRTsuVJl9IWip +QwGw/qIKI280SD6/ckoUMxKDCJiFuPR14zmqnS36k7N5UNPnpdTJTS8T11jttSpg +1LCmgpbEIpgaTah+cELDqFCav99fS+bEiAL5lWDAHBTE/XPjGVCqeehyPYref4IW +NDBIEsvnHPHPLsn6X5jq4+Yj5oUixgxaMPiR+bcO4Sh+RzOVB6i2D0upWfRXBFXA +NNnsg9/zjvoC7ZW73y9uSH+dPJTt/Vgfeiv52/v41XliyzbUyLalf02GNPY+9goV +JHG1ulEEBJOCiUD9cE1PUIJwHA/HqyhHIvV350YoEFiHl8iSwm7SiZu5kPjaq74= +=B6+8 +-----END PGP SIGNATURE----- diff --git a/vendor/paragonie/random_compat/lib/random.php b/vendor/paragonie/random_compat/lib/random.php new file mode 100644 index 000000000..c7731a56f --- /dev/null +++ b/vendor/paragonie/random_compat/lib/random.php @@ -0,0 +1,32 @@ +<?php +/** + * Random_* Compatibility Library + * for using the new PHP 7 random_* API in PHP 5 projects + * + * @version 2.99.99 + * @released 2018-06-06 + * + * The MIT License (MIT) + * + * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +// NOP diff --git a/vendor/paragonie/random_compat/other/build_phar.php b/vendor/paragonie/random_compat/other/build_phar.php new file mode 100644 index 000000000..70ef4b2ed --- /dev/null +++ b/vendor/paragonie/random_compat/other/build_phar.php @@ -0,0 +1,57 @@ +<?php +$dist = dirname(__DIR__).'/dist'; +if (!is_dir($dist)) { + mkdir($dist, 0755); +} +if (file_exists($dist.'/random_compat.phar')) { + unlink($dist.'/random_compat.phar'); +} +$phar = new Phar( + $dist.'/random_compat.phar', + FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::KEY_AS_FILENAME, + 'random_compat.phar' +); +rename( + dirname(__DIR__).'/lib/random.php', + dirname(__DIR__).'/lib/index.php' +); +$phar->buildFromDirectory(dirname(__DIR__).'/lib'); +rename( + dirname(__DIR__).'/lib/index.php', + dirname(__DIR__).'/lib/random.php' +); + +/** + * If we pass an (optional) path to a private key as a second argument, we will + * sign the Phar with OpenSSL. + * + * If you leave this out, it will produce an unsigned .phar! + */ +if ($argc > 1) { + if (!@is_readable($argv[1])) { + echo 'Could not read the private key file:', $argv[1], "\n"; + exit(255); + } + $pkeyFile = file_get_contents($argv[1]); + + $private = openssl_get_privatekey($pkeyFile); + if ($private !== false) { + $pkey = ''; + openssl_pkey_export($private, $pkey); + $phar->setSignatureAlgorithm(Phar::OPENSSL, $pkey); + + /** + * Save the corresponding public key to the file + */ + if (!@is_readable($dist.'/random_compat.phar.pubkey')) { + $details = openssl_pkey_get_details($private); + file_put_contents( + $dist.'/random_compat.phar.pubkey', + $details['key'] + ); + } + } else { + echo 'An error occurred reading the private key from OpenSSL.', "\n"; + exit(255); + } +} diff --git a/vendor/paragonie/random_compat/psalm-autoload.php b/vendor/paragonie/random_compat/psalm-autoload.php new file mode 100644 index 000000000..d71d1b818 --- /dev/null +++ b/vendor/paragonie/random_compat/psalm-autoload.php @@ -0,0 +1,9 @@ +<?php + +require_once 'lib/byte_safe_strings.php'; +require_once 'lib/cast_to_int.php'; +require_once 'lib/error_polyfill.php'; +require_once 'other/ide_stubs/libsodium.php'; +require_once 'lib/random.php'; + +$int = random_int(0, 65536); diff --git a/vendor/paragonie/random_compat/psalm.xml b/vendor/paragonie/random_compat/psalm.xml new file mode 100644 index 000000000..596d99dd6 --- /dev/null +++ b/vendor/paragonie/random_compat/psalm.xml @@ -0,0 +1,19 @@ +<?xml version="1.0"?> +<psalm + autoloader="psalm-autoload.php" + stopOnFirstError="false" + useDocblockTypes="true" +> + <projectFiles> + <directory name="lib" /> + </projectFiles> + <issueHandlers> + <RedundantConditionGivenDocblockType errorLevel="info" /> + <UnresolvableInclude errorLevel="info" /> + <DuplicateClass errorLevel="info" /> + <InvalidOperand errorLevel="info" /> + <UndefinedConstant errorLevel="info" /> + <MissingReturnType errorLevel="info" /> + <InvalidReturnType errorLevel="info" /> + </issueHandlers> +</psalm> diff --git a/vendor/ramsey/uuid/CHANGELOG.md b/vendor/ramsey/uuid/CHANGELOG.md new file mode 100644 index 000000000..3965fff27 --- /dev/null +++ b/vendor/ramsey/uuid/CHANGELOG.md @@ -0,0 +1,376 @@ +# ramsey/uuid Changelog + +## 3.8.0 + +_Released: 2018-07-19_ + + * Add support for determining MAC address on FreeBSD systems ([#212](https://github.com/ramsey/uuid/pull/212)) + * Add a polyfill for PHP ctype functions to support systems where the ctype functions are not part of the PHP build ([#223](https://github.com/ramsey/uuid/pull/223)) + * Improve validation to disallow UUIDs with a trailing newline character ([#225](https://github.com/ramsey/uuid/pull/225)) + * Add annotations for thrown exceptions for improved IDE hinting ([#232](https://github.com/ramsey/uuid/pull/232)) + * Improve documentation, testing, and project metadata (i.e. `.gitattributes`, etc.) + +## 3.7.3 + +_Released: 2018-01-19_ + + * In rare cases, when using `glob()` to find `/sys/class/net/*/address` files on Linux, `glob()` encountered errors, returning `false` instead of an empty array, causing `array_map()` to emit warnings since its second parameter was not an array; this release gracefully handles cases where `glob()` returns `false` [#203](https://github.com/ramsey/uuid/issues/203) + * Fixed an off-by-one error in `DefaultTimeGenerator` and switching to `random_int()` from `mt_rand()` for better random numbers [#206](https://github.com/ramsey/uuid/pull/206) + +## 3.7.2 + +_Released: 2018-01-13_ + + * On Linux, first check sysfs to determine node identifier; this provides a reliable way to identify the node on Docker images, etc. [#185](https://github.com/ramsey/uuid/pull/185) + +## 3.7.1 + +_Released: 2017-09-22_ + + * Use `random_bytes()` when generating random nodes + * Set the multicast bit for random nodes, according to RFC 4122, §4.5, [#170](https://github.com/ramsey/uuid/pull/170), [#171](https://github.com/ramsey/uuid/pull/171), [#182](https://github.com/ramsey/uuid/pull/182) + +## 3.7.0 + +_Released: 2017-08-04_ + + * Add UUID version constants [#173](https://github.com/ramsey/uuid/issues/173), [#177](https://github.com/ramsey/uuid/pull/177) + * `Uuid::UUID_TYPE_TIME` + * `Uuid::UUID_TYPE_IDENTIFIER` + * `Uuid::UUID_TYPE_HASH_MD5` + * `Uuid::UUID_TYPE_RANDOM` + * `Uuid::UUID_TYPE_HASH_SHA1` + +## 3.6.1 + +_Released: 2017-03-26_ + + * Optimize UUID string decoding [#164](https://github.com/ramsey/uuid/pull/164) + +## 3.6.0 + +_Released: 2017-03-18_ + + * Add `InvalidUuidStringException`, thrown when attempting to decode an invalid string UUID; this does not introduce any BC issues, since the new exception inherits from the previously used `InvalidArgumentException` [#162](https://github.com/ramsey/uuid/pull/162) + * Improve memory usage when generating large quantities of UUIDs (use `str_pad()` and `dechex()` instead of `sprintf()`) [#160](https://github.com/ramsey/uuid/pull/160) + * Minor test and documentation updates + +## 3.5.2 + +_Released: 2016-11-22_ + + * Improved test coverage. + +## 3.5.1 + +_Released: 2016-10-02_ + + * Fixed issue where same UUIDs were not treated as equal with mixed case ([#131](https://github.com/ramsey/uuid/issues/131), [#137](https://github.com/ramsey/uuid/pull/137)). + * Test cleanup. + +## 3.5.0 + +_Released: 2016-08-02_ + + * Add `OrderedTimeCodec` to store UUID in an optimized way for InnoDB ([#117](https://github.com/ramsey/uuid/issues/117), [#118](https://github.com/ramsey/uuid/pull/118)). + * Fixed `RandomNodeProvider` to prevent invalid node generation ([#129](https://github.com/ramsey/uuid/pull/129)). + * Cache failed attempt to retrieve system node to avoid multiple system calls ([#107](https://github.com/ramsey/uuid/issues/107), [#121](https://github.com/ramsey/uuid/pull/121)). + * Various test improvements. + +## 3.4.1 + +_Released: 2016-04-23_ + + * Fixed test that violated a PHP CodeSniffer rule, breaking the build. + +## 3.4.0 + +_Released: 2016-04-23_ + + * Add `TimestampFirstCombCodec` and `TimestampLastCombCodec` codecs. + * Improve logic of `CombGenerator` for COMB sequential UUIDs. + * Significantly improved test coverage. + +## 3.3.0 + +_Released: 2016-03-22_ + + * Drop the use of OpenSSL as a fallback and use [paragonie/random_compat][] to support RandomBytesGenerator in versions of PHP earlier than 7.0. This addresses and fixes the [collision issue][]. + * Improved test coverage. + * Update code to conduct to version 1.4 of the Contributor Covenant. + +## 3.2.0 + +_Released: 2016-02-17_ + + * Add random generator option for use for the PECL libsodium extension. + * Updates to test infrastructure. + +## 3.1.0 + +_Released: 2015-12-17_ + + * Uuid objects now may be properly serialized/unserialized. + * Update build environments for testing on Travis CI. + +## 3.0.1 + +_Released: 2015-10-21_ + + * Add project [Contributor Code of Conduct](https://github.com/ramsey/uuid/blob/master/CONDUCT.md) + * Modify Travis CI builds to run tests on multiple CPU architectures + * Clean up code, tests, and documentation + +## 3.0.0 + +_Released: 2015-09-28_ + +The 3.0.0 release represents a significant step for the ramsey/uuid library. While the simple and familiar API used in previous versions remains intact, this release provides greater flexibility to integrators, including the ability to inject your own number generators, UUID codecs, node and time providers, and more. + + * BREAK: The root namespace for this package has changed from "Rhumsaa" to "Ramsey." In most cases, simply making this change in your applications is the only upgrade path you will need. Everything else should work as expected. + * BREAK: The UUID [Doctrine field type](http://doctrine-dbal.readthedocs.org/en/latest/reference/types.html) has been moved to [ramsey/uuid-doctrine](https://github.com/ramsey/uuid-doctrine). + * BREAK: The `uuid` console application has been moved to [ramsey/uuid-console](https://github.com/ramsey/uuid-console). + * BREAK: The `Uuid::VERSION` package version constant has been removed. + * See also the release notes for [3.0.0-alpha1][300-alpha1], [3.0.0-alpha2][300-alpha2], [3.0.0-alpha3][300-alpha3], and [3.0.0-beta1][300-beta1]. + +[300-alpha1]: https://github.com/ramsey/uuid/blob/master/CHANGELOG.md#300-alpha1 +[300-alpha2]: https://github.com/ramsey/uuid/blob/master/CHANGELOG.md#300-alpha2 +[300-alpha3]: https://github.com/ramsey/uuid/blob/master/CHANGELOG.md#300-alpha3 +[300-beta1]: https://github.com/ramsey/uuid/blob/master/CHANGELOG.md#300-beta1 + +## 3.0.0-beta1 + +_Released: 2015-08-31_ + + * Improve GUID support to ensure that: + * On little endian (LE) architectures, the byte order of the first three fields is LE. + * On big endian (BE) architectures, it is the same as a GUID. + * String representation is always the same. + * Fix exception message for `DegradedNumberConverter::fromHex()`. + * Add Scrutinizer configuration to run code-quality builds through Scrutinizer. + * Auto-fix Scrutinizer issues. + * Fix support URLs in composer.json to point to the correct GitHub repository. + +## 3.0.0-alpha3 + +_Released: 2015-07-28_ + + * Time generator improvements: + * Enabled use of custom TimeGenerator implementations. + * BREAK: Removed now unnecessary `timeConverter` and `timeProvider` properties, setters, and getters in both `FeatureSet` and `UuidFactory` as those are now exclusively used by the default `TimeGenerator`. + * Added a `setTimeGenerator` method on `UuidFactory` to override the default time generator. + * Add option to enable `PeclUuidTimeGenerator` via `FeatureSet`. + +## 3.0.0-alpha2 + +_Released: 2015-07-28_ + + * BREAK: Removed `PeclUuidFactory` in favor of using pecl-uuid with generators. + * NEW: Refactored time-based (version 1) UUIDs into a `TimeGeneratorInterface` to allow for other sources to generate version 1 UUIDs in this library. + * NEW: Added `PeclUuidTimeGenerator` and `PeclUuidRandomGenerator` for creating version 1 or version 4 UUIDs using the pecl-uuid extension. + * NEW: Add `RandomBytesGenerator` for use with PHP 7. ramsey/uuid will default to use this generator when running on PHP 7. + * `RandomLibAdapter` now defaults to a medium-strength generator with [ircmaxell/random-lib](https://github.com/ircmaxell/RandomLib). This is configurable, so other generator strengths may be used. + * Migrated to the Travis CI container-based infrastructure for builds. + * Documentation updates and corrections. + +## 3.0.0-alpha1 + +_Released: 2015-07-16_ + + * BREAK: The root namespace for this package has changed from "Rhumsaa" to "Ramsey." In most cases, simply making this change in your applications is the only upgrade path you will need. Everything else should work as expected. + * BREAK: The UUID [Doctrine field type](http://doctrine-dbal.readthedocs.org/en/latest/reference/types.html) has been moved to [ramsey/uuid-doctrine](https://github.com/ramsey/uuid-doctrine). + * BREAK: The `uuid` console application has been moved to [ramsey/uuid-console](https://github.com/ramsey/uuid-console). + * BREAK: The `Uuid::VERSION` package version constant has been removed. + * NEW: The `Uuid` class is no longer marked as `final`. Everything is now based around interfaces and factories, allowing you to use this package as a base to implement other kinds of UUIDs with different dependencies. + * NEW: Through setting dependencies on `UuidFactory` and/or extending `FeatureSet`, you may override any package defaults, injecting your own dependencies. + * NEW: For random number generation, in addition to `OpenSslGenerator` (used if `openssl_random_pseudo_bytes()` is present) and the fallback `MtRandGenerator`, you may use the bundled `CombGenerator` for sequential UUIDs or the `RandomLibAdapter` if using [ircmaxell/random-lib](https://github.com/ircmaxell/RandomLib). + * NEW: In addition to the default UUID generation, this library also supports GUID generation by configuring a `FeatureSet` to use GUIDs. + * NEW: While the interface to create UUIDs hasn't changed, if using this package on a 32-bit system, you will now receive an object of type `DegradedUuid` (which extends `Uuid`, which implements `UuidInterface`). + * NEW: All UUIDs are now [JsonSerializable](http://php.net/JsonSerializable). + +## 2.9.0 + +_Released: 2016-03-22_ + + * Drop support for OpenSSL in favor of [paragonie/random_compat][]. This addresses and fixes the [collision issue][]. + +## 2.8.4 + +_Released: 2015-12-17_ + + * Add support for symfony/console v3. + * Update build matrix to run Travis CI tests on PHP 7 & with lowest package versions. + +## 2.8.3 + +_Released: 2015-08-31_ + + * Fix exception message in `Uuid::calculateUuidTime()`. + * Update composer.json to reflect new repository and package name. + +## 2.8.2 + +_Released: 2015-07-23_ + + * Ensure the release tag makes it into the rhumsaa/uuid package. + * Minor documentation changes. + +## 2.8.1 + +_Released: 2015-06-16_ + + * Use `passthru()` and output buffering in `getIfconfig()`. + * Cache the system node in a static variable so that we process it only once per runtime. + * Set ramsey/uuid as a replacement for rhumsaa/uuid in composer.json. + * Documentation updates and corrections. + +## 2.8.0 + +_Released: 2014-11-09_ + + * Added static `fromInteger()` method to create UUIDs from string integer or `\Moontoast\Math\BigNumber`. + * Friendlier Doctrine conversion to Uuid or string. + * Documentation fixes. + +## 2.7.4 + +_Released: 2014-10-29_ + + * Changed loop in `generateBytes()` from `foreach` to `for`; see #33 + * Use `toString()` in README examples to avoid confusion + * Exclude build/development tools from releases using .gitattributes + * Set timezone properly for tests + +## 2.7.3 + +_Released: 2014-08-27_ + + * Fixed upper range for `mt_rand` used in version 4 UUIDs + +## 2.7.2 + +_Released: 2014-07-28_ + + * Upgraded to PSR-4 autoloading + * Testing upgrades: + * Testing against PHP 5.6 + * Testing with PHPUnit 4 + * Using Coveralls.io to generate code coverage reports + * Documentation fixes + +## 2.7.1 + +_Released: 2014-02-19_ + + * Moved moontoast/math and symfony/console to require-dev; fixes #20 + * Now supporting symfony/console for 2.3 (LTS version); fixes #21 + * Updated tests to run even when dev packages are not installed (skips tests if requirements are not met) + +## 2.7.0 + +_Released: 2014-01-31_ + + * Moved UUID validation regex pattern into constant for external use (`Uuid::VALID_PATTERN`) + +## 2.6.1 + +_Released: 2014-01-27_ + + * Fixed bug where `uuid` console application could not find the Composer autoloader when installed in another project + +## 2.6.0 + +_Released: 2014-01-17_ + + * Introduced `uuid` console application for generating and decoding UUIDs from CLI (run `./bin/uuid` for details) + * Added `Uuid::getInteger()` to retrieve a Moontoast\Math\BigNumber representation of the 128-bit integer representing the UUID + * Added `Uuid::getHex()` to retrieve the hexadecimal representation of the UUID + * Now using netstat on Linux to capture the node for a version 1 UUID + * Now requiring Moontoast\Math as part of the regular package requirements, not just the dev requirements + +## 2.5.0 + +_Released: 2013-10-30_ + + * Using `openssl_random_pseudo_bytes()`, if available, to generate random bytes, by merging in PR #15 from @dfreudenberger + * Fixed test for Rhumsaa\Uuid\Doctrine\UuidType, by merging in PR #17 from @dfreudenberger + * Documentation fixes + +## 2.4.0 + +_Released: 2013-07-29_ + + * `Uuid::getVersion()` now returns null if the UUID isn't an RFC 4122 variant + * `Uuid::fromString()` now supports a 128-bit integer formatted as a hexadecimal string (UUID without dashes) + * Tests have been greatly enhanced, borrowing from the Python UUID library + +## 2.3.0 + +_Released: 2013-07-16_ + + * Added `Uuid::fromBytes()` by merging in PR #14 from @asm89 + +## 2.2.0 + +_Released: 2013-07-04_ + + * Added `Doctrine\UuidType::requiresSQLCommentHint()` method by merging in PR #13 from @zerrvox + * Removed `"minimum-stability": "dev"` from composer.json + +## 2.1.2 + +_Released: 2013-07-03_ + + * @ericthelin found cases where the system node was coming back with uppercase hexadecimal digits; this ensures that case in the node is converted to lowercase + +## 2.1.1 + +_Released: 2013-04-29_ + + * Fixed NIL bug in `Uuid::isValid()` method, reported by @ocubom in PR #11 + +## 2.1.0 + +_Released: 2013-04-15_ + + * Added static `Uuid::isValid()` method for checking whether a string is a valid UUID + +## 2.0.0 + +_Released: 2013-02-11_ + + * Break: `Uuid` class is now marked as "final" + * Break: `Uuid::getLeastSignificantBits()` no longer returns an integer on 64-bit platforms; it requires `moontoast/math` + * Break: `Uuid::getMostSignificantBits()` no longer returns an integer on 64-bit platforms; it requires `moontoast/math` + * Break: Moved `UnsupportedOperationException` to the `Exception` subnamespace + * Added support for 32-bit platforms + * Added generated API documentation to the repository + +## 1.1.2 + +_Released: 2012-11-29_ + + * Relaxed Doctrine type conversion rules + +## 1.1.1 + +_Released: 2012-08-27_ + + * Removed `final` keyword from `Uuid` class + +## 1.1.0 + +_Released: 2012-08-06_ + + * Added `Doctrine\UuidType` as a field mapping type for the Doctrine Database Abstraction Layer (DBAL) + * Improved tests and code coverage + +## 1.0.0 + +_Released: 2012-07-19_ + + * Initial release + + +[paragonie/random_compat]: https://github.com/paragonie/random_compat +[collision issue]: https://github.com/ramsey/uuid/issues/80 diff --git a/vendor/ramsey/uuid/CODE_OF_CONDUCT.md b/vendor/ramsey/uuid/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..9c207259b --- /dev/null +++ b/vendor/ramsey/uuid/CODE_OF_CONDUCT.md @@ -0,0 +1,74 @@ +# Contributor Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project maintainer at <ben@benramsey.com>. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ diff --git a/vendor/ramsey/uuid/CONTRIBUTING.md b/vendor/ramsey/uuid/CONTRIBUTING.md new file mode 100644 index 000000000..4cde9b840 --- /dev/null +++ b/vendor/ramsey/uuid/CONTRIBUTING.md @@ -0,0 +1,75 @@ +# Contributing + +Contributions are welcome. We accept pull requests on [GitHub](https://github.com/ramsey/uuid). + +This project adheres to a [Contributor Code of Conduct](https://github.com/ramsey/uuid/blob/master/CODE_OF_CONDUCT.md). By participating in this project and its community, you are expected to uphold this code. + +## Team members + +* [Ben Ramsey](https://github.com/ramsey) - original author and maintainer +* [Marijn Huizendveld](https://github.com/marijn) - contributor, author of UUID type definition for Doctrine DBAL +* [Thibaud Fabre](https://github.com/aztech-dev) - contributor, lead developer for version 3.0.0 re-architecture + +## Communication Channels + +You can find help and discussion in the following places: + +* GitHub Issues: <https://github.com/ramsey/uuid/issues> +* Wiki: <https://github.com/ramsey/uuid/wiki> + +## Reporting Bugs + +Bugs are tracked in our project's [issue tracker](https://github.com/ramsey/uuid/issues). + +When submitting a bug report, please include enough information for us to reproduce the bug. A good bug report includes the following sections: + +* Expected outcome +* Actual outcome +* Steps to reproduce, including sample code +* Any other information that will help us debug and reproduce the issue, including stack traces, system/environment information, and screenshots + +**Please do not include passwords or any personally identifiable information in your bug report and sample code.** + +## Fixing Bugs + +We welcome pull requests to fix bugs! + +If you see a bug report that you'd like to fix, please feel free to do so. Following the directions and guidelines described in the "Adding New Features" section below, you may create bugfix branches and send us pull requests. + +## Adding New Features + +If you have an idea for a new feature, it's a good idea to check out our [issues](https://github.com/ramsey/uuid/issues) or active [pull requests](https://github.com/ramsey/uuid/pulls) first to see if the feature is already being worked on. If not, feel free to submit an issue first, asking whether the feature is beneficial to the project. This will save you from doing a lot of development work only to have your feature rejected. We don't enjoy rejecting your hard work, but some features just don't fit with the goals of the project. + +When you do begin working on your feature, here are some guidelines to consider: + +* Your pull request description should clearly detail the changes you have made. We will use this description to add to our CHANGELOG. If there is no description or it does not adequately describe your feature, we will ask you to update the description. +* We following the **[PSR-2 coding standard](http://www.php-fig.org/psr/psr-2/)**. Please ensure your code does, too. +* Please **write tests** for any new features you add. +* Please **ensure that tests pass** before submitting your pull request. We have Travis CI automatically running tests for pull requests. However, running the tests locally will help save time. +* **Use topic/feature branches.** Please do not ask us to pull from your master branch. +* **Submit one feature per pull request.** If you have multiple features you wish to submit, please break them up into separate pull requests. +* **Send coherent history**. Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please squash them before submitting. + +## Running Tests + +The following tests must pass before we will accept a pull request. If any of these do not pass, it will result in a complete build failure. Before you can run these, be sure to `composer install`. + +``` +composer test +``` + +### Locally Test With Emulated MIPS Architecture + +The following commands use [Vagrant](https://www.vagrantup.com/) to start an Ubuntu VM, install necessary dependencies, and then run the `tools/run-tests.sh` script that will download a Docker image emulating the MIPS architecture. This is especially helpful for testing UUID generation in a big-endian environment. + +``` +vagrant init ubuntu/trusty64 +vagrant up +vagrant ssh +sudo apt-get install docker.io qemu-user-static php5-cli php5-curl +cd /vagrant +curl -sS https://getcomposer.org/installer | php +php composer.phar install --no-interaction --prefer-dist +mkdir -p build/logs +ARCH=mips PHP_VERSION=5.6.14 TRAVIS_BUILD_DIR=/vagrant ./tools/run-tests.sh +``` diff --git a/vendor/ramsey/uuid/LICENSE b/vendor/ramsey/uuid/LICENSE new file mode 100644 index 000000000..753a4c9c8 --- /dev/null +++ b/vendor/ramsey/uuid/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2012-2018 Ben Ramsey <ben@benramsey.com> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/vendor/ramsey/uuid/README.md b/vendor/ramsey/uuid/README.md new file mode 100644 index 000000000..b6557abbc --- /dev/null +++ b/vendor/ramsey/uuid/README.md @@ -0,0 +1,159 @@ +# ramsey/uuid + +_NOTICE: Formerly known as `rhumsaa/uuid`, The package and namespace names have changed to `ramsey/uuid` and `Ramsey\Uuid`, respectively._ + +[![Source Code][badge-source]][source] +[![Latest Version][badge-release]][release] +[![Software License][badge-license]][license] +[![Build Status][badge-build]][build] +[![Coverage Status][badge-coverage]][coverage] +[![Total Downloads][badge-downloads]][downloads] + +ramsey/uuid is a PHP 5.4+ library for generating and working with [RFC 4122][rfc4122] version 1, 3, 4, and 5 universally unique identifiers (UUID). + +This project adheres to a [Contributor Code of Conduct][conduct]. By participating in this project and its community, you are expected to uphold this code. + + +## About + +From [Wikipedia](http://en.wikipedia.org/wiki/Universally_unique_identifier): + +> The intent of UUIDs is to enable distributed systems to uniquely identify information without significant central coordination. In this context the word unique should be taken to mean "practically unique" rather than "guaranteed unique". Since the identifiers have a finite size, it is possible for two differing items to share the same identifier. The identifier size and generation process need to be selected so as to make this sufficiently improbable in practice. Anyone can create a UUID and use it to identify something with reasonable confidence that the same identifier will never be unintentionally created by anyone to identify something else. Information labeled with UUIDs can therefore be later combined into a single database without needing to resolve identifier (ID) conflicts. + +Much inspiration for this library came from the [Java][javauuid] and [Python][pyuuid] UUID libraries. + + +## Installation + +The preferred method of installation is via [Packagist][] and [Composer][]. Run the following command to install the package and add it as a requirement to your project's `composer.json`: + +```bash +composer require ramsey/uuid +``` + + +## Upgrading from 2.x to 3.x + +While we have made significant internal changes to the library, we have made every effort to ensure a seamless upgrade path from the 2.x series of this library to 3.x. + +One major breaking change is the transition from the `Rhumsaa` root namespace to `Ramsey`. In most cases, all you will need is to change the namespace to `Ramsey` in your code, and everything will "just work." + +Here are full details on the breaking changes to the public API of this library: + +1. All namespace references of `Rhumsaa` have changed to `Ramsey`. Simply change the namespace to `Ramsey` in your code and everything should work. +2. The console application has moved to [ramsey/uuid-console](https://packagist.org/packages/ramsey/uuid-console). If using the console functionality, use Composer to require `ramsey/uuid-console`. +3. The Doctrine field type mapping has moved to [ramsey/uuid-doctrine](https://packagist.org/packages/ramsey/uuid-doctrine). If using the Doctrine functionality, use Composer to require `ramsey/uuid-doctrine`. + + +## What to do if you see a "rhumsaa/uuid is abandoned" message + +When installing your project's dependencies using Composer, you might see the following message: + +``` +Package rhumsaa/uuid is abandoned, you should avoid using it. Use ramsey/uuid instead. +``` + +Don't panic. Simply execute the following commands with Composer: + +``` bash +composer remove rhumsaa/uuid +composer require ramsey/uuid=^2.9 +``` + +After doing so, you will have the latest ramsey/uuid package in the 2.x series, and there will be no need to modify any code; the namespace in the 2.x series is still `Rhumsaa`. + + +## Requirements + +Some methods in this library have requirements due to integer size restrictions on 32-bit and 64-bit builds of PHP. A 64-bit build of PHP and the [Moontoast\Math][] library are recommended. However, this library is designed to work on 32-bit builds of PHP without Moontoast\Math, with some degraded functionality. Please check the API documentation for more information. + +If a particular requirement is not present, then an `UnsatisfiedDependencyException` is thrown, allowing one to catch a bad call in an environment where the call is not supported and gracefully degrade. + + +## API documentation + +The [latest class API documentation][apidocs] is available online. + +This project uses [ApiGen](http://apigen.org/) to generate this documentation. To generate the documentation on your own, install dev dependencies and run the following command from the root of the project: + +``` +composer build-docs +``` + +This will generate documentation in the `build/apidocs/` folder. + + +## Examples + +See the [cookbook on the wiki][wiki-cookbook] for more examples and approaches to specific use-cases. + +```php +<?php +require 'vendor/autoload.php'; + +use Ramsey\Uuid\Uuid; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; + +try { + + // Generate a version 1 (time-based) UUID object + $uuid1 = Uuid::uuid1(); + echo $uuid1->toString() . "\n"; // i.e. e4eaaaf2-d142-11e1-b3e4-080027620cdd + + // Generate a version 3 (name-based and hashed with MD5) UUID object + $uuid3 = Uuid::uuid3(Uuid::NAMESPACE_DNS, 'php.net'); + echo $uuid3->toString() . "\n"; // i.e. 11a38b9a-b3da-360f-9353-a5a725514269 + + // Generate a version 4 (random) UUID object + $uuid4 = Uuid::uuid4(); + echo $uuid4->toString() . "\n"; // i.e. 25769c6c-d34d-4bfe-ba98-e0ee856f3e7a + + // Generate a version 5 (name-based and hashed with SHA1) UUID object + $uuid5 = Uuid::uuid5(Uuid::NAMESPACE_DNS, 'php.net'); + echo $uuid5->toString() . "\n"; // i.e. c4a760a8-dbcf-5254-a0d9-6a4474bd1b62 + +} catch (UnsatisfiedDependencyException $e) { + + // Some dependency was not met. Either the method cannot be called on a + // 32-bit system, or it can, but it relies on Moontoast\Math to be present. + echo 'Caught exception: ' . $e->getMessage() . "\n"; + +} +``` + + +## Contributing + +Contributions are welcome! Please read [CONTRIBUTING][] for details. + + +## Copyright and license + +The ramsey/uuid library is copyright © [Ben Ramsey](https://benramsey.com/) and licensed for use under the MIT License (MIT). Please see [LICENSE][] for more information. + + + +[rfc4122]: http://tools.ietf.org/html/rfc4122 +[conduct]: https://github.com/ramsey/uuid/blob/master/CODE_OF_CONDUCT.md +[javauuid]: http://docs.oracle.com/javase/6/docs/api/java/util/UUID.html +[pyuuid]: http://docs.python.org/3/library/uuid.html +[packagist]: https://packagist.org/packages/ramsey/uuid +[composer]: http://getcomposer.org/ +[moontoast\math]: https://packagist.org/packages/moontoast/math +[apidocs]: http://docs.benramsey.com/ramsey-uuid/latest/ +[wiki-cookbook]: https://github.com/ramsey/uuid/wiki/Ramsey%5CUuid-Cookbook +[contributing]: https://github.com/ramsey/uuid/blob/master/CONTRIBUTING.md + +[badge-source]: https://img.shields.io/badge/source-ramsey/uuid-blue.svg?style=flat-square +[badge-release]: https://img.shields.io/packagist/v/ramsey/uuid.svg?style=flat-square +[badge-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square +[badge-build]: https://img.shields.io/travis/ramsey/uuid/master.svg?style=flat-square +[badge-coverage]: https://img.shields.io/coveralls/ramsey/uuid/master.svg?style=flat-square +[badge-downloads]: https://img.shields.io/packagist/dt/ramsey/uuid.svg?style=flat-square + +[source]: https://github.com/ramsey/uuid +[release]: https://packagist.org/packages/ramsey/uuid +[license]: https://github.com/ramsey/uuid/blob/master/LICENSE +[build]: https://travis-ci.org/ramsey/uuid +[coverage]: https://coveralls.io/r/ramsey/uuid?branch=master +[downloads]: https://packagist.org/packages/ramsey/uuid diff --git a/vendor/ramsey/uuid/composer.json b/vendor/ramsey/uuid/composer.json new file mode 100644 index 000000000..952120cd4 --- /dev/null +++ b/vendor/ramsey/uuid/composer.json @@ -0,0 +1,80 @@ +{ + "name": "ramsey/uuid", + "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", + "type": "library", + "keywords": ["uuid", "identifier", "guid"], + "homepage": "https://github.com/ramsey/uuid", + "license": "MIT", + "authors": [ + { + "name": "Ben Ramsey", + "email": "ben@benramsey.com", + "homepage": "https://benramsey.com" + }, + { + "name": "Marijn Huizendveld", + "email": "marijn.huizendveld@gmail.com" + }, + { + "name": "Thibaud Fabre", + "email": "thibaud@aztech.io" + } + ], + "support": { + "issues": "https://github.com/ramsey/uuid/issues", + "source": "https://github.com/ramsey/uuid" + }, + "require": { + "php": "^5.4 || ^7.0", + "paragonie/random_compat": "^1.0|^2.0|9.99.99", + "symfony/polyfill-ctype": "^1.8" + }, + "require-dev": { + "codeception/aspect-mock": "^1.0 | ~2.0.0", + "doctrine/annotations": "~1.2.0", + "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0", + "ircmaxell/random-lib": "^1.1", + "jakub-onderka/php-parallel-lint": "^0.9.0", + "mockery/mockery": "^0.9.9", + "moontoast/math": "^1.1", + "php-mock/php-mock-phpunit": "^0.3|^1.1", + "phpunit/phpunit": "^4.7|^5.0|^6.5", + "squizlabs/php_codesniffer": "^2.3" + }, + "suggest": { + "ext-ctype": "Provides support for PHP Ctype functions", + "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter", + "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator", + "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator", + "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).", + "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type.", + "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid" + }, + "autoload": { + "psr-4": {"Ramsey\\Uuid\\": "src/"} + }, + "autoload-dev": { + "psr-4": {"Ramsey\\Uuid\\Test\\": "tests/"} + }, + "replace": { + "rhumsaa/uuid": "self.version" + }, + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "scripts": { + "lint": "parallel-lint src tests", + "phpunit": "phpunit --verbose --colors=always", + "phpcs": "phpcs src tests --standard=psr2 -sp --colors", + "test": [ + "@lint", + "@phpunit", + "@phpcs" + ] + }, + "config": { + "sort-packages": true + } +} diff --git a/vendor/ramsey/uuid/src/BinaryUtils.php b/vendor/ramsey/uuid/src/BinaryUtils.php new file mode 100644 index 000000000..f04a9d9c1 --- /dev/null +++ b/vendor/ramsey/uuid/src/BinaryUtils.php @@ -0,0 +1,43 @@ +<?php + +namespace Ramsey\Uuid; + +/** + * Provides binary math utilities + */ +class BinaryUtils +{ + /** + * Applies the RFC 4122 variant field to the `clock_seq_hi_and_reserved` field + * + * @param $clockSeqHi + * @return int The high field of the clock sequence multiplexed with the variant + * @link http://tools.ietf.org/html/rfc4122#section-4.1.1 + */ + public static function applyVariant($clockSeqHi) + { + // Set the variant to RFC 4122 + $clockSeqHi = $clockSeqHi & 0x3f; + $clockSeqHi &= ~(0xc0); + $clockSeqHi |= 0x80; + + return $clockSeqHi; + } + + /** + * Applies the RFC 4122 version number to the `time_hi_and_version` field + * + * @param string $timeHi + * @param integer $version + * @return int The high field of the timestamp multiplexed with the version number + * @link http://tools.ietf.org/html/rfc4122#section-4.1.3 + */ + public static function applyVersion($timeHi, $version) + { + $timeHi = hexdec($timeHi) & 0x0fff; + $timeHi &= ~(0xf000); + $timeHi |= $version << 12; + + return $timeHi; + } +} diff --git a/vendor/ramsey/uuid/src/Builder/DefaultUuidBuilder.php b/vendor/ramsey/uuid/src/Builder/DefaultUuidBuilder.php new file mode 100644 index 000000000..20656acdf --- /dev/null +++ b/vendor/ramsey/uuid/src/Builder/DefaultUuidBuilder.php @@ -0,0 +1,54 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Builder; + +use Ramsey\Uuid\Codec\CodecInterface; +use Ramsey\Uuid\Converter\NumberConverterInterface; +use Ramsey\Uuid\Uuid; + +/** + * DefaultUuidBuilder is the default UUID builder for ramsey/uuid; it builds + * instances of Uuid objects + */ +class DefaultUuidBuilder implements UuidBuilderInterface +{ + /** + * @var NumberConverterInterface + */ + private $converter; + + /** + * Constructs the DefaultUuidBuilder + * + * @param NumberConverterInterface $converter The number converter to use when constructing the Uuid + */ + public function __construct(NumberConverterInterface $converter) + { + $this->converter = $converter; + } + + /** + * Builds a Uuid + * + * @param CodecInterface $codec The codec to use for building this Uuid + * @param array $fields An array of fields from which to construct the Uuid; + * see {@see \Ramsey\Uuid\UuidInterface::getFieldsHex()} for array structure. + * @return Uuid + */ + public function build(CodecInterface $codec, array $fields) + { + return new Uuid($fields, $this->converter, $codec); + } +} diff --git a/vendor/ramsey/uuid/src/Builder/DegradedUuidBuilder.php b/vendor/ramsey/uuid/src/Builder/DegradedUuidBuilder.php new file mode 100644 index 000000000..7edb6deb7 --- /dev/null +++ b/vendor/ramsey/uuid/src/Builder/DegradedUuidBuilder.php @@ -0,0 +1,53 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Builder; + +use Ramsey\Uuid\Codec\CodecInterface; +use Ramsey\Uuid\Converter\NumberConverterInterface; +use Ramsey\Uuid\DegradedUuid; + +/** + * DegradedUuidBuilder builds instances of DegradedUuid + */ +class DegradedUuidBuilder implements UuidBuilderInterface +{ + /** + * @var NumberConverterInterface + */ + private $converter; + + /** + * Constructs the DegradedUuidBuilder + * + * @param NumberConverterInterface $converter The number converter to use when constructing the DegradedUuid + */ + public function __construct(NumberConverterInterface $converter) + { + $this->converter = $converter; + } + + /** + * Builds a DegradedUuid + * + * @param CodecInterface $codec The codec to use for building this DegradedUuid + * @param array $fields An array of fields from which to construct the DegradedUuid; + * see {@see \Ramsey\Uuid\UuidInterface::getFieldsHex()} for array structure. + * @return DegradedUuid + */ + public function build(CodecInterface $codec, array $fields) + { + return new DegradedUuid($fields, $this->converter, $codec); + } +} diff --git a/vendor/ramsey/uuid/src/Builder/UuidBuilderInterface.php b/vendor/ramsey/uuid/src/Builder/UuidBuilderInterface.php new file mode 100644 index 000000000..e4e990109 --- /dev/null +++ b/vendor/ramsey/uuid/src/Builder/UuidBuilderInterface.php @@ -0,0 +1,34 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Builder; + +use Ramsey\Uuid\Codec\CodecInterface; +use Ramsey\Uuid\UuidInterface; + +/** + * UuidBuilderInterface builds instances UuidInterface + */ +interface UuidBuilderInterface +{ + /** + * Builds an instance of a UuidInterface + * + * @param CodecInterface $codec The codec to use for building this UuidInterface instance + * @param array $fields An array of fields from which to construct a UuidInterface instance; + * see {@see \Ramsey\Uuid\UuidInterface::getFieldsHex()} for array structure. + * @return UuidInterface + */ + public function build(CodecInterface $codec, array $fields); +} diff --git a/vendor/ramsey/uuid/src/Codec/CodecInterface.php b/vendor/ramsey/uuid/src/Codec/CodecInterface.php new file mode 100644 index 000000000..6ea20544f --- /dev/null +++ b/vendor/ramsey/uuid/src/Codec/CodecInterface.php @@ -0,0 +1,58 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Codec; + +use Ramsey\Uuid\UuidInterface; + +/** + * CodecInterface represents a UUID coder-decoder + */ +interface CodecInterface +{ + /** + * Encodes a UuidInterface as a string representation of a UUID + * + * @param UuidInterface $uuid + * @return string Hexadecimal string representation of a UUID + */ + public function encode(UuidInterface $uuid); + + /** + * Encodes a UuidInterface as a binary representation of a UUID + * + * @param UuidInterface $uuid + * @return string Binary string representation of a UUID + */ + public function encodeBinary(UuidInterface $uuid); + + /** + * Decodes a string representation of a UUID into a UuidInterface object instance + * + * @param string $encodedUuid + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public function decode($encodedUuid); + + /** + * Decodes a binary representation of a UUID into a UuidInterface object instance + * + * @param string $bytes + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + * @throws \InvalidArgumentException if string has not 16 characters + */ + public function decodeBytes($bytes); +} diff --git a/vendor/ramsey/uuid/src/Codec/GuidStringCodec.php b/vendor/ramsey/uuid/src/Codec/GuidStringCodec.php new file mode 100644 index 000000000..864980b30 --- /dev/null +++ b/vendor/ramsey/uuid/src/Codec/GuidStringCodec.php @@ -0,0 +1,102 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Codec; + +use Ramsey\Uuid\UuidInterface; + +/** + * GuidStringCodec encodes and decodes globally unique identifiers (GUID) + * + * @link https://en.wikipedia.org/wiki/Globally_unique_identifier + */ +class GuidStringCodec extends StringCodec +{ + /** + * Encodes a UuidInterface as a string representation of a GUID + * + * @param UuidInterface $uuid + * @return string Hexadecimal string representation of a GUID + */ + public function encode(UuidInterface $uuid) + { + $components = array_values($uuid->getFieldsHex()); + + // Swap byte-order on the first three fields + $this->swapFields($components); + + return vsprintf( + '%08s-%04s-%04s-%02s%02s-%012s', + $components + ); + } + + /** + * Encodes a UuidInterface as a binary representation of a GUID + * + * @param UuidInterface $uuid + * @return string Binary string representation of a GUID + */ + public function encodeBinary(UuidInterface $uuid) + { + $components = array_values($uuid->getFieldsHex()); + + return hex2bin(implode('', $components)); + } + + /** + * Decodes a string representation of a GUID into a UuidInterface object instance + * + * @param string $encodedUuid + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public function decode($encodedUuid) + { + $components = $this->extractComponents($encodedUuid); + + $this->swapFields($components); + + return $this->getBuilder()->build($this, $this->getFields($components)); + } + + /** + * Decodes a binary representation of a GUID into a UuidInterface object instance + * + * @param string $bytes + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public function decodeBytes($bytes) + { + // Specifically call parent::decode to preserve correct byte order + return parent::decode(bin2hex($bytes)); + } + + /** + * Swaps fields to support GUID byte order + * + * @param array $components An array of UUID components (the UUID exploded on its dashes) + * @return void + */ + protected function swapFields(array &$components) + { + $hex = unpack('H*', pack('L', hexdec($components[0]))); + $components[0] = $hex[1]; + $hex = unpack('H*', pack('S', hexdec($components[1]))); + $components[1] = $hex[1]; + $hex = unpack('H*', pack('S', hexdec($components[2]))); + $components[2] = $hex[1]; + } +} diff --git a/vendor/ramsey/uuid/src/Codec/OrderedTimeCodec.php b/vendor/ramsey/uuid/src/Codec/OrderedTimeCodec.php new file mode 100644 index 000000000..3257759c9 --- /dev/null +++ b/vendor/ramsey/uuid/src/Codec/OrderedTimeCodec.php @@ -0,0 +1,68 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ +namespace Ramsey\Uuid\Codec; + +use InvalidArgumentException; +use Ramsey\Uuid\UuidInterface; + +/** + * OrderedTimeCodec optimizes the bytes to increment UUIDs when time goes by, to improve database INSERTs. + * The string value will be unchanged from StringCodec. Only works for UUID type 1. + */ +class OrderedTimeCodec extends StringCodec +{ + + /** + * Encodes a UuidInterface as an optimized binary representation of a UUID + * + * @param UuidInterface $uuid + * @return string Binary string representation of a UUID + */ + public function encodeBinary(UuidInterface $uuid) + { + $fields = $uuid->getFieldsHex(); + + $optimized = [ + $fields['time_hi_and_version'], + $fields['time_mid'], + $fields['time_low'], + $fields['clock_seq_hi_and_reserved'], + $fields['clock_seq_low'], + $fields['node'], + ]; + + return hex2bin(implode('', $optimized)); + } + + /** + * Decodes an optimized binary representation of a UUID into a UuidInterface object instance + * + * @param string $bytes + * @return UuidInterface + * @throws \InvalidArgumentException if string has not 16 characters + */ + public function decodeBytes($bytes) + { + if (strlen($bytes) !== 16) { + throw new InvalidArgumentException('$bytes string should contain 16 characters.'); + } + + $hex = unpack('H*', $bytes)[1]; + + // Rearrange the fields to their original order + $hex = substr($hex, 8, 4) . substr($hex, 12, 4) . substr($hex, 4, 4) . substr($hex, 0, 4) . substr($hex, 16); + + return $this->decode($hex); + } +} diff --git a/vendor/ramsey/uuid/src/Codec/StringCodec.php b/vendor/ramsey/uuid/src/Codec/StringCodec.php new file mode 100644 index 000000000..7f352065c --- /dev/null +++ b/vendor/ramsey/uuid/src/Codec/StringCodec.php @@ -0,0 +1,170 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Codec; + +use InvalidArgumentException; +use Ramsey\Uuid\Builder\UuidBuilderInterface; +use Ramsey\Uuid\Exception\InvalidUuidStringException; +use Ramsey\Uuid\Uuid; +use Ramsey\Uuid\UuidInterface; + +/** + * StringCodec encodes and decodes RFC 4122 UUIDs + * + * @link http://tools.ietf.org/html/rfc4122 + */ +class StringCodec implements CodecInterface +{ + /** + * @var UuidBuilderInterface + */ + private $builder; + + /** + * Constructs a StringCodec for use encoding and decoding UUIDs + * + * @param UuidBuilderInterface $builder The UUID builder to use when encoding UUIDs + */ + public function __construct(UuidBuilderInterface $builder) + { + $this->builder = $builder; + } + + /** + * Encodes a UuidInterface as a string representation of a UUID + * + * @param UuidInterface $uuid + * @return string Hexadecimal string representation of a UUID + */ + public function encode(UuidInterface $uuid) + { + $fields = array_values($uuid->getFieldsHex()); + + return vsprintf( + '%08s-%04s-%04s-%02s%02s-%012s', + $fields + ); + } + + /** + * Encodes a UuidInterface as a binary representation of a UUID + * + * @param UuidInterface $uuid + * @return string Binary string representation of a UUID + */ + public function encodeBinary(UuidInterface $uuid) + { + return hex2bin($uuid->getHex()); + } + + /** + * Decodes a string representation of a UUID into a UuidInterface object instance + * + * @param string $encodedUuid + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public function decode($encodedUuid) + { + $components = $this->extractComponents($encodedUuid); + $fields = $this->getFields($components); + + return $this->builder->build($this, $fields); + } + + /** + * Decodes a binary representation of a UUID into a UuidInterface object instance + * + * @param string $bytes + * @return UuidInterface + * @throws \InvalidArgumentException if string has not 16 characters + */ + public function decodeBytes($bytes) + { + if (strlen($bytes) !== 16) { + throw new InvalidArgumentException('$bytes string should contain 16 characters.'); + } + + $hexUuid = unpack('H*', $bytes); + + return $this->decode($hexUuid[1]); + } + + /** + * Returns the UUID builder + * + * @return UuidBuilderInterface + */ + protected function getBuilder() + { + return $this->builder; + } + + /** + * Returns an array of UUID components (the UUID exploded on its dashes) + * + * @param string $encodedUuid + * @return array + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + protected function extractComponents($encodedUuid) + { + $nameParsed = str_replace(array( + 'urn:', + 'uuid:', + '{', + '}', + '-' + ), '', $encodedUuid); + + // We have stripped out the dashes and are breaking up the string using + // substr(). In this way, we can accept a full hex value that doesn't + // contain dashes. + $components = array( + substr($nameParsed, 0, 8), + substr($nameParsed, 8, 4), + substr($nameParsed, 12, 4), + substr($nameParsed, 16, 4), + substr($nameParsed, 20) + ); + + $nameParsed = implode('-', $components); + + if (!Uuid::isValid($nameParsed)) { + throw new InvalidUuidStringException('Invalid UUID string: ' . $encodedUuid); + } + + return $components; + } + + /** + * Returns the fields that make up this UUID + * + * @see \Ramsey\Uuid\UuidInterface::getFieldsHex() + * @param array $components + * @return array + */ + protected function getFields(array $components) + { + return array( + 'time_low' => str_pad($components[0], 8, '0', STR_PAD_LEFT), + 'time_mid' => str_pad($components[1], 4, '0', STR_PAD_LEFT), + 'time_hi_and_version' => str_pad($components[2], 4, '0', STR_PAD_LEFT), + 'clock_seq_hi_and_reserved' => str_pad(substr($components[3], 0, 2), 2, '0', STR_PAD_LEFT), + 'clock_seq_low' => str_pad(substr($components[3], 2), 2, '0', STR_PAD_LEFT), + 'node' => str_pad($components[4], 12, '0', STR_PAD_LEFT) + ); + } +} diff --git a/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php b/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php new file mode 100644 index 000000000..2c4ded89e --- /dev/null +++ b/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php @@ -0,0 +1,107 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ +namespace Ramsey\Uuid\Codec; + +use Ramsey\Uuid\UuidInterface; + +/** + * TimestampLastCombCodec encodes and decodes COMB UUIDs which have the timestamp as the first 48 bits. + * To be used with MySQL, PostgreSQL, Oracle. + */ +class TimestampFirstCombCodec extends StringCodec +{ + /** + * Encodes a UuidInterface as a string representation of a timestamp first COMB UUID + * + * @param UuidInterface $uuid + * + * @return string Hexadecimal string representation of a GUID + */ + public function encode(UuidInterface $uuid) + { + $sixPieceComponents = array_values($uuid->getFieldsHex()); + + $this->swapTimestampAndRandomBits($sixPieceComponents); + + return vsprintf( + '%08s-%04s-%04s-%02s%02s-%012s', + $sixPieceComponents + ); + } + + /** + * Encodes a UuidInterface as a binary representation of timestamp first COMB UUID + * + * @param UuidInterface $uuid + * + * @return string Binary string representation of timestamp first COMB UUID + */ + public function encodeBinary(UuidInterface $uuid) + { + $stringEncoding = $this->encode($uuid); + + return hex2bin(str_replace('-', '', $stringEncoding)); + } + + /** + * Decodes a string representation of timestamp first COMB UUID into a UuidInterface object instance + * + * @param string $encodedUuid + * + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public function decode($encodedUuid) + { + $fivePieceComponents = $this->extractComponents($encodedUuid); + + $this->swapTimestampAndRandomBits($fivePieceComponents); + + return $this->getBuilder()->build($this, $this->getFields($fivePieceComponents)); + } + + /** + * Decodes a binary representation of timestamp first COMB UUID into a UuidInterface object instance + * + * @param string $bytes + * + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public function decodeBytes($bytes) + { + return $this->decode(bin2hex($bytes)); + } + + /** + * Swaps the first 48 bits with the last 48 bits + * + * @param array $components An array of UUID components (the UUID exploded on its dashes) + * + * @return void + */ + protected function swapTimestampAndRandomBits(array &$components) + { + $last48Bits = $components[4]; + if (count($components) == 6) { + $last48Bits = $components[5]; + $components[5] = $components[0] . $components[1]; + } else { + $components[4] = $components[0] . $components[1]; + } + + $components[0] = substr($last48Bits, 0, 8); + $components[1] = substr($last48Bits, 8, 4); + } +} diff --git a/vendor/ramsey/uuid/src/Codec/TimestampLastCombCodec.php b/vendor/ramsey/uuid/src/Codec/TimestampLastCombCodec.php new file mode 100644 index 000000000..0cdd009a4 --- /dev/null +++ b/vendor/ramsey/uuid/src/Codec/TimestampLastCombCodec.php @@ -0,0 +1,23 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ +namespace Ramsey\Uuid\Codec; + +/** + * TimestampLastCombCodec encodes and decodes COMB UUIDs which have the timestamp as the last 48 bits. + * To be used with MSSQL. + */ +class TimestampLastCombCodec extends StringCodec +{ + +} diff --git a/vendor/ramsey/uuid/src/Converter/Number/BigNumberConverter.php b/vendor/ramsey/uuid/src/Converter/Number/BigNumberConverter.php new file mode 100644 index 000000000..d23512256 --- /dev/null +++ b/vendor/ramsey/uuid/src/Converter/Number/BigNumberConverter.php @@ -0,0 +1,54 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Converter\Number; + +use Moontoast\Math\BigNumber; +use Ramsey\Uuid\Converter\NumberConverterInterface; + +/** + * BigNumberConverter converts UUIDs from hexadecimal characters into + * moontoast/math `BigNumber` representations of integers and vice versa + */ +class BigNumberConverter implements NumberConverterInterface +{ + /** + * Converts a hexadecimal number into a `Moontoast\Math\BigNumber` representation + * + * @param string $hex The hexadecimal string representation to convert + * @return BigNumber + */ + public function fromHex($hex) + { + $number = BigNumber::convertToBase10($hex, 16); + + return new BigNumber($number); + } + + /** + * Converts an integer or `Moontoast\Math\BigNumber` integer representation + * into a hexadecimal string representation + * + * @param int|string|BigNumber $integer An integer or `Moontoast\Math\BigNumber` + * @return string Hexadecimal string + */ + public function toHex($integer) + { + if (!$integer instanceof BigNumber) { + $integer = new BigNumber($integer); + } + + return BigNumber::convertFromBase10($integer, 16); + } +} diff --git a/vendor/ramsey/uuid/src/Converter/Number/DegradedNumberConverter.php b/vendor/ramsey/uuid/src/Converter/Number/DegradedNumberConverter.php new file mode 100644 index 000000000..96a011c65 --- /dev/null +++ b/vendor/ramsey/uuid/src/Converter/Number/DegradedNumberConverter.php @@ -0,0 +1,58 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Converter\Number; + +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; +use Ramsey\Uuid\Converter\NumberConverterInterface; + +/** + * DegradedNumberConverter throws `UnsatisfiedDependencyException` exceptions + * if attempting to use number conversion functionality in an environment that + * does not support large integers (i.e. when moontoast/math is not available) + */ +class DegradedNumberConverter implements NumberConverterInterface +{ + /** + * Throws an `UnsatisfiedDependencyException` + * + * @param string $hex The hexadecimal string representation to convert + * @return void + * @throws UnsatisfiedDependencyException + */ + public function fromHex($hex) + { + throw new UnsatisfiedDependencyException( + 'Cannot call ' . __METHOD__ . ' without support for large ' + . 'integers, since integer is an unsigned ' + . '128-bit integer; Moontoast\Math\BigNumber is required.' + ); + } + + /** + * Throws an `UnsatisfiedDependencyException` + * + * @param mixed $integer An integer representation to convert + * @return void + * @throws UnsatisfiedDependencyException + */ + public function toHex($integer) + { + throw new UnsatisfiedDependencyException( + 'Cannot call ' . __METHOD__ . ' without support for large ' + . 'integers, since integer is an unsigned ' + . '128-bit integer; Moontoast\Math\BigNumber is required. ' + ); + } +} diff --git a/vendor/ramsey/uuid/src/Converter/NumberConverterInterface.php b/vendor/ramsey/uuid/src/Converter/NumberConverterInterface.php new file mode 100644 index 000000000..9505e8c6d --- /dev/null +++ b/vendor/ramsey/uuid/src/Converter/NumberConverterInterface.php @@ -0,0 +1,46 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Converter; + +/** + * NumberConverterInterface converts UUIDs from hexadecimal characters into + * representations of integers and vice versa + */ +interface NumberConverterInterface +{ + /** + * Converts a hexadecimal number into an integer representation of the number + * + * The integer representation returned may be an object or a string + * representation of the integer, depending on the implementation. + * + * @param string $hex The hexadecimal string representation to convert + * @return mixed + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + */ + public function fromHex($hex); + + /** + * Converts an integer representation into a hexadecimal string representation + * of the number + * + * @param mixed $integer An integer representation to convert; this may be + * a true integer, a string integer, or a object representation that + * this converter can understand + * @return string Hexadecimal string + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + */ + public function toHex($integer); +} diff --git a/vendor/ramsey/uuid/src/Converter/Time/BigNumberTimeConverter.php b/vendor/ramsey/uuid/src/Converter/Time/BigNumberTimeConverter.php new file mode 100644 index 000000000..d47c80191 --- /dev/null +++ b/vendor/ramsey/uuid/src/Converter/Time/BigNumberTimeConverter.php @@ -0,0 +1,58 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Converter\Time; + +use Moontoast\Math\BigNumber; +use Ramsey\Uuid\Converter\TimeConverterInterface; + +/** + * BigNumberTimeConverter uses the moontoast/math library's `BigNumber` to + * provide facilities for converting parts of time into representations that may + * be used in UUIDs + */ +class BigNumberTimeConverter implements TimeConverterInterface +{ + /** + * Uses the provided seconds and micro-seconds to calculate the time_low, + * time_mid, and time_high fields used by RFC 4122 version 1 UUIDs + * + * @param string $seconds + * @param string $microSeconds + * @return string[] An array containing `low`, `mid`, and `high` keys + * @link http://tools.ietf.org/html/rfc4122#section-4.2.2 + */ + public function calculateTime($seconds, $microSeconds) + { + $uuidTime = new BigNumber('0'); + + $sec = new BigNumber($seconds); + $sec->multiply('10000000'); + + $usec = new BigNumber($microSeconds); + $usec->multiply('10'); + + $uuidTime->add($sec) + ->add($usec) + ->add('122192928000000000'); + + $uuidTimeHex = sprintf('%016s', $uuidTime->convertToBase(16)); + + return array( + 'low' => substr($uuidTimeHex, 8), + 'mid' => substr($uuidTimeHex, 4, 4), + 'hi' => substr($uuidTimeHex, 0, 4), + ); + } +} diff --git a/vendor/ramsey/uuid/src/Converter/Time/DegradedTimeConverter.php b/vendor/ramsey/uuid/src/Converter/Time/DegradedTimeConverter.php new file mode 100644 index 000000000..b94589cd3 --- /dev/null +++ b/vendor/ramsey/uuid/src/Converter/Time/DegradedTimeConverter.php @@ -0,0 +1,42 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Converter\Time; + +use Ramsey\Uuid\Converter\TimeConverterInterface; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; + +/** + * DegradedTimeConverter throws `UnsatisfiedDependencyException` exceptions + * if attempting to use time conversion functionality in an environment that + * does not support large integers (i.e. when moontoast/math is not available) + */ +class DegradedTimeConverter implements TimeConverterInterface +{ + /** + * Throws an `UnsatisfiedDependencyException` + * + * @param string $seconds + * @param string $microSeconds + * @return void + * @throws UnsatisfiedDependencyException if called on a 32-bit system and `Moontoast\Math\BigNumber` is not present + */ + public function calculateTime($seconds, $microSeconds) + { + throw new UnsatisfiedDependencyException( + 'When calling ' . __METHOD__ . ' on a 32-bit system, ' + . 'Moontoast\Math\BigNumber must be present.' + ); + } +} diff --git a/vendor/ramsey/uuid/src/Converter/Time/PhpTimeConverter.php b/vendor/ramsey/uuid/src/Converter/Time/PhpTimeConverter.php new file mode 100644 index 000000000..6a9da74b8 --- /dev/null +++ b/vendor/ramsey/uuid/src/Converter/Time/PhpTimeConverter.php @@ -0,0 +1,47 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Converter\Time; + +use Ramsey\Uuid\Converter\TimeConverterInterface; + +/** + * PhpTimeConverter uses built-in PHP functions and standard math operations + * available to the PHP programming language to provide facilities for + * converting parts of time into representations that may be used in UUIDs + */ +class PhpTimeConverter implements TimeConverterInterface +{ + /** + * Uses the provided seconds and micro-seconds to calculate the time_low, + * time_mid, and time_high fields used by RFC 4122 version 1 UUIDs + * + * @param string $seconds + * @param string $microSeconds + * @return string[] An array containing `low`, `mid`, and `high` keys + * @link http://tools.ietf.org/html/rfc4122#section-4.2.2 + */ + public function calculateTime($seconds, $microSeconds) + { + // 0x01b21dd213814000 is the number of 100-ns intervals between the + // UUID epoch 1582-10-15 00:00:00 and the Unix epoch 1970-01-01 00:00:00. + $uuidTime = ($seconds * 10000000) + ($microSeconds * 10) + 0x01b21dd213814000; + + return array( + 'low' => sprintf('%08x', $uuidTime & 0xffffffff), + 'mid' => sprintf('%04x', ($uuidTime >> 32) & 0xffff), + 'hi' => sprintf('%04x', ($uuidTime >> 48) & 0x0fff), + ); + } +} diff --git a/vendor/ramsey/uuid/src/Converter/TimeConverterInterface.php b/vendor/ramsey/uuid/src/Converter/TimeConverterInterface.php new file mode 100644 index 000000000..382008ac3 --- /dev/null +++ b/vendor/ramsey/uuid/src/Converter/TimeConverterInterface.php @@ -0,0 +1,35 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Converter; + +/** + * TimeConverterInterface provides facilities for converting parts of time into + * representations that may be used in UUIDs + */ +interface TimeConverterInterface +{ + /** + * Uses the provided seconds and micro-seconds to calculate the time_low, + * time_mid, and time_high fields used by RFC 4122 version 1 UUIDs + * + * @param string $seconds + * @param string $microSeconds + * @return string[] An array guaranteed to contain `low`, `mid`, and `high` keys + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and + * `Moontoast\Math\BigNumber` is not present + * @link http://tools.ietf.org/html/rfc4122#section-4.2.2 + */ + public function calculateTime($seconds, $microSeconds); +} diff --git a/vendor/ramsey/uuid/src/DegradedUuid.php b/vendor/ramsey/uuid/src/DegradedUuid.php new file mode 100644 index 000000000..bcf0be800 --- /dev/null +++ b/vendor/ramsey/uuid/src/DegradedUuid.php @@ -0,0 +1,114 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid; + +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; +use Ramsey\Uuid\Exception\UnsupportedOperationException; + +/** + * DegradedUuid represents an RFC 4122 UUID on 32-bit systems + * + * @see Uuid + */ +class DegradedUuid extends Uuid +{ + /** + * @inheritdoc + */ + public function getDateTime() + { + if ($this->getVersion() != 1) { + throw new UnsupportedOperationException('Not a time-based UUID'); + } + + $time = $this->converter->fromHex($this->getTimestampHex()); + + $ts = new \Moontoast\Math\BigNumber($time, 20); + $ts->subtract('122192928000000000'); + $ts->divide('10000000.0'); + $ts->round(); + $unixTime = $ts->getValue(); + + return new \DateTime("@{$unixTime}"); + } + + /** + * For degraded UUIDs, throws an `UnsatisfiedDependencyException` when + * called on a 32-bit system + * + * @throws UnsatisfiedDependencyException if called on a 32-bit system + */ + public function getFields() + { + throw new UnsatisfiedDependencyException( + 'Cannot call ' . __METHOD__ . ' on a 32-bit system, since some ' + . 'values overflow the system max integer value' + . '; consider calling getFieldsHex instead' + ); + } + + /** + * For degraded UUIDs, throws an `UnsatisfiedDependencyException` when + * called on a 32-bit system + * + * @throws UnsatisfiedDependencyException if called on a 32-bit system + */ + public function getNode() + { + throw new UnsatisfiedDependencyException( + 'Cannot call ' . __METHOD__ . ' on a 32-bit system, since node ' + . 'is an unsigned 48-bit integer and can overflow the system ' + . 'max integer value' + . '; consider calling getNodeHex instead' + ); + } + + /** + * For degraded UUIDs, throws an `UnsatisfiedDependencyException` when + * called on a 32-bit system + * + * @throws UnsatisfiedDependencyException if called on a 32-bit system + */ + public function getTimeLow() + { + throw new UnsatisfiedDependencyException( + 'Cannot call ' . __METHOD__ . ' on a 32-bit system, since time_low ' + . 'is an unsigned 32-bit integer and can overflow the system ' + . 'max integer value' + . '; consider calling getTimeLowHex instead' + ); + } + + /** + * For degraded UUIDs, throws an `UnsatisfiedDependencyException` when + * called on a 32-bit system + * + * @throws UnsatisfiedDependencyException if called on a 32-bit system + * @throws UnsupportedOperationException If this UUID is not a version 1 UUID + */ + public function getTimestamp() + { + if ($this->getVersion() != 1) { + throw new UnsupportedOperationException('Not a time-based UUID'); + } + + throw new UnsatisfiedDependencyException( + 'Cannot call ' . __METHOD__ . ' on a 32-bit system, since timestamp ' + . 'is an unsigned 60-bit integer and can overflow the system ' + . 'max integer value' + . '; consider calling getTimestampHex instead' + ); + } +} diff --git a/vendor/ramsey/uuid/src/Exception/InvalidUuidStringException.php b/vendor/ramsey/uuid/src/Exception/InvalidUuidStringException.php new file mode 100644 index 000000000..0e480649d --- /dev/null +++ b/vendor/ramsey/uuid/src/Exception/InvalidUuidStringException.php @@ -0,0 +1,22 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Exception; + +/** + * Thrown to indicate that the parsed UUID string is invalid. + */ +class InvalidUuidStringException extends \InvalidArgumentException +{ +} diff --git a/vendor/ramsey/uuid/src/Exception/UnsatisfiedDependencyException.php b/vendor/ramsey/uuid/src/Exception/UnsatisfiedDependencyException.php new file mode 100644 index 000000000..8b5d5d08e --- /dev/null +++ b/vendor/ramsey/uuid/src/Exception/UnsatisfiedDependencyException.php @@ -0,0 +1,23 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Exception; + +/** + * Thrown to indicate that the requested operation has dependencies that have not + * been satisfied. + */ +class UnsatisfiedDependencyException extends \RuntimeException +{ +} diff --git a/vendor/ramsey/uuid/src/Exception/UnsupportedOperationException.php b/vendor/ramsey/uuid/src/Exception/UnsupportedOperationException.php new file mode 100644 index 000000000..b371b6823 --- /dev/null +++ b/vendor/ramsey/uuid/src/Exception/UnsupportedOperationException.php @@ -0,0 +1,22 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Exception; + +/** + * Thrown to indicate that the requested operation is not supported. + */ +class UnsupportedOperationException extends \RuntimeException +{ +} diff --git a/vendor/ramsey/uuid/src/FeatureSet.php b/vendor/ramsey/uuid/src/FeatureSet.php new file mode 100644 index 000000000..56a774eab --- /dev/null +++ b/vendor/ramsey/uuid/src/FeatureSet.php @@ -0,0 +1,333 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid; + +use Ramsey\Uuid\Converter\TimeConverterInterface; +use Ramsey\Uuid\Generator\PeclUuidTimeGenerator; +use Ramsey\Uuid\Provider\Node\FallbackNodeProvider; +use Ramsey\Uuid\Provider\Node\RandomNodeProvider; +use Ramsey\Uuid\Provider\Node\SystemNodeProvider; +use Ramsey\Uuid\Converter\NumberConverterInterface; +use Ramsey\Uuid\Converter\Number\BigNumberConverter; +use Ramsey\Uuid\Converter\Number\DegradedNumberConverter; +use Ramsey\Uuid\Converter\Time\BigNumberTimeConverter; +use Ramsey\Uuid\Converter\Time\DegradedTimeConverter; +use Ramsey\Uuid\Converter\Time\PhpTimeConverter; +use Ramsey\Uuid\Provider\Time\SystemTimeProvider; +use Ramsey\Uuid\Builder\UuidBuilderInterface; +use Ramsey\Uuid\Builder\DefaultUuidBuilder; +use Ramsey\Uuid\Codec\CodecInterface; +use Ramsey\Uuid\Codec\StringCodec; +use Ramsey\Uuid\Codec\GuidStringCodec; +use Ramsey\Uuid\Builder\DegradedUuidBuilder; +use Ramsey\Uuid\Generator\RandomGeneratorFactory; +use Ramsey\Uuid\Generator\RandomGeneratorInterface; +use Ramsey\Uuid\Generator\TimeGeneratorFactory; +use Ramsey\Uuid\Generator\TimeGeneratorInterface; +use Ramsey\Uuid\Provider\TimeProviderInterface; +use Ramsey\Uuid\Provider\NodeProviderInterface; + +/** + * FeatureSet detects and exposes available features in the current environment + * (32- or 64-bit, available dependencies, etc.) + */ +class FeatureSet +{ + /** + * @var bool + */ + private $disableBigNumber = false; + + /** + * @var bool + */ + private $disable64Bit = false; + + /** + * @var bool + */ + private $ignoreSystemNode = false; + + /** + * @var bool + */ + private $enablePecl = false; + + /** + * @var UuidBuilderInterface + */ + private $builder; + + /** + * @var CodecInterface + */ + private $codec; + + /** + * @var NodeProviderInterface + */ + private $nodeProvider; + + /** + * @var NumberConverterInterface + */ + private $numberConverter; + + /** + * @var RandomGeneratorInterface + */ + private $randomGenerator; + + /** + * @var TimeGeneratorInterface + */ + private $timeGenerator; + + /** + * Constructs a `FeatureSet` for use by a `UuidFactory` to determine or set + * features available to the environment + * + * @param bool $useGuids Whether to build UUIDs using the `GuidStringCodec` + * @param bool $force32Bit Whether to force the use of 32-bit functionality + * (primarily for testing purposes) + * @param bool $forceNoBigNumber Whether to disable the use of moontoast/math + * `BigNumber` (primarily for testing purposes) + * @param bool $ignoreSystemNode Whether to disable attempts to check for + * the system host ID (primarily for testing purposes) + * @param bool $enablePecl Whether to enable the use of the `PeclUuidTimeGenerator` + * to generate version 1 UUIDs + */ + public function __construct( + $useGuids = false, + $force32Bit = false, + $forceNoBigNumber = false, + $ignoreSystemNode = false, + $enablePecl = false + ) { + $this->disableBigNumber = $forceNoBigNumber; + $this->disable64Bit = $force32Bit; + $this->ignoreSystemNode = $ignoreSystemNode; + $this->enablePecl = $enablePecl; + + $this->numberConverter = $this->buildNumberConverter(); + $this->builder = $this->buildUuidBuilder(); + $this->codec = $this->buildCodec($useGuids); + $this->nodeProvider = $this->buildNodeProvider(); + $this->randomGenerator = $this->buildRandomGenerator(); + $this->setTimeProvider(new SystemTimeProvider()); + } + + /** + * Returns the builder configured for this environment + * + * @return UuidBuilderInterface + */ + public function getBuilder() + { + return $this->builder; + } + + /** + * Returns the UUID UUID coder-decoder configured for this environment + * + * @return CodecInterface + */ + public function getCodec() + { + return $this->codec; + } + + /** + * Returns the system node ID provider configured for this environment + * + * @return NodeProviderInterface + */ + public function getNodeProvider() + { + return $this->nodeProvider; + } + + /** + * Returns the number converter configured for this environment + * + * @return NumberConverterInterface + */ + public function getNumberConverter() + { + return $this->numberConverter; + } + + /** + * Returns the random UUID generator configured for this environment + * + * @return RandomGeneratorInterface + */ + public function getRandomGenerator() + { + return $this->randomGenerator; + } + + /** + * Returns the time-based UUID generator configured for this environment + * + * @return TimeGeneratorInterface + */ + public function getTimeGenerator() + { + return $this->timeGenerator; + } + + /** + * Sets the time provider for use in this environment + * + * @param TimeProviderInterface $timeProvider + */ + public function setTimeProvider(TimeProviderInterface $timeProvider) + { + $this->timeGenerator = $this->buildTimeGenerator($timeProvider); + } + + /** + * Determines which UUID coder-decoder to use and returns the configured + * codec for this environment + * + * @param bool $useGuids Whether to build UUIDs using the `GuidStringCodec` + * @return CodecInterface + */ + protected function buildCodec($useGuids = false) + { + if ($useGuids) { + return new GuidStringCodec($this->builder); + } + + return new StringCodec($this->builder); + } + + /** + * Determines which system node ID provider to use and returns the configured + * system node ID provider for this environment + * + * @return NodeProviderInterface + */ + protected function buildNodeProvider() + { + if ($this->ignoreSystemNode) { + return new RandomNodeProvider(); + } + + return new FallbackNodeProvider([ + new SystemNodeProvider(), + new RandomNodeProvider() + ]); + } + + /** + * Determines which number converter to use and returns the configured + * number converter for this environment + * + * @return NumberConverterInterface + */ + protected function buildNumberConverter() + { + if ($this->hasBigNumber()) { + return new BigNumberConverter(); + } + + return new DegradedNumberConverter(); + } + + /** + * Determines which random UUID generator to use and returns the configured + * random UUID generator for this environment + * + * @return RandomGeneratorInterface + */ + protected function buildRandomGenerator() + { + return (new RandomGeneratorFactory())->getGenerator(); + } + + /** + * Determines which time-based UUID generator to use and returns the configured + * time-based UUID generator for this environment + * + * @param TimeProviderInterface $timeProvider + * @return TimeGeneratorInterface + */ + protected function buildTimeGenerator(TimeProviderInterface $timeProvider) + { + if ($this->enablePecl) { + return new PeclUuidTimeGenerator(); + } + + return (new TimeGeneratorFactory( + $this->nodeProvider, + $this->buildTimeConverter(), + $timeProvider + ))->getGenerator(); + } + + /** + * Determines which time converter to use and returns the configured + * time converter for this environment + * + * @return TimeConverterInterface + */ + protected function buildTimeConverter() + { + if ($this->is64BitSystem()) { + return new PhpTimeConverter(); + } elseif ($this->hasBigNumber()) { + return new BigNumberTimeConverter(); + } + + return new DegradedTimeConverter(); + } + + /** + * Determines which UUID builder to use and returns the configured UUID + * builder for this environment + * + * @return UuidBuilderInterface + */ + protected function buildUuidBuilder() + { + if ($this->is64BitSystem()) { + return new DefaultUuidBuilder($this->numberConverter); + } + + return new DegradedUuidBuilder($this->numberConverter); + } + + /** + * Returns true if the system has `Moontoast\Math\BigNumber` + * + * @return bool + */ + protected function hasBigNumber() + { + return class_exists('Moontoast\Math\BigNumber') && !$this->disableBigNumber; + } + + /** + * Returns true if the system is 64-bit, false otherwise + * + * @return bool + */ + protected function is64BitSystem() + { + return PHP_INT_SIZE == 8 && !$this->disable64Bit; + } +} diff --git a/vendor/ramsey/uuid/src/Generator/CombGenerator.php b/vendor/ramsey/uuid/src/Generator/CombGenerator.php new file mode 100644 index 000000000..7a9482318 --- /dev/null +++ b/vendor/ramsey/uuid/src/Generator/CombGenerator.php @@ -0,0 +1,88 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Generator; + +use Ramsey\Uuid\Converter\NumberConverterInterface; + +/** + * CombGenerator provides functionality to generate COMB (combined GUID/timestamp) + * sequential UUIDs + * + * @link https://en.wikipedia.org/wiki/Globally_unique_identifier#Sequential_algorithms + */ +class CombGenerator implements RandomGeneratorInterface +{ + const TIMESTAMP_BYTES = 6; + + /** + * @var RandomGeneratorInterface + */ + private $randomGenerator; + + /** + * @var NumberConverterInterface + */ + private $converter; + + /** + * Constructs a `CombGenerator` using a random-number generator and a number converter + * + * @param RandomGeneratorInterface $generator Random-number generator for the non-time part. + * @param NumberConverterInterface $numberConverter Instance of number converter. + */ + public function __construct(RandomGeneratorInterface $generator, NumberConverterInterface $numberConverter) + { + $this->converter = $numberConverter; + $this->randomGenerator = $generator; + } + + /** + * Generates a string of binary data of the specified length + * + * @param integer $length The number of bytes of random binary data to generate + * @return string A binary string + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws \InvalidArgumentException if length is not a positive integer + * @throws \Exception + */ + public function generate($length) + { + if ($length < self::TIMESTAMP_BYTES || $length < 0) { + throw new \InvalidArgumentException('Length must be a positive integer.'); + } + + $hash = ''; + + if (self::TIMESTAMP_BYTES > 0 && $length > self::TIMESTAMP_BYTES) { + $hash = $this->randomGenerator->generate($length - self::TIMESTAMP_BYTES); + } + + $lsbTime = str_pad($this->converter->toHex($this->timestamp()), self::TIMESTAMP_BYTES * 2, '0', STR_PAD_LEFT); + + return hex2bin(str_pad(bin2hex($hash), $length - self::TIMESTAMP_BYTES, '0') . $lsbTime); + } + + /** + * Returns current timestamp as integer, precise to 0.00001 seconds + * + * @return string + */ + private function timestamp() + { + $time = explode(' ', microtime(false)); + + return $time[1] . substr($time[0], 2, 5); + } +} diff --git a/vendor/ramsey/uuid/src/Generator/DefaultTimeGenerator.php b/vendor/ramsey/uuid/src/Generator/DefaultTimeGenerator.php new file mode 100644 index 000000000..c9969b3af --- /dev/null +++ b/vendor/ramsey/uuid/src/Generator/DefaultTimeGenerator.php @@ -0,0 +1,138 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Generator; + +use Ramsey\Uuid\BinaryUtils; +use Ramsey\Uuid\Converter\TimeConverterInterface; +use Ramsey\Uuid\Provider\NodeProviderInterface; +use Ramsey\Uuid\Provider\TimeProviderInterface; + +/** + * DefaultTimeGenerator provides functionality to generate strings of binary + * data for version 1 UUIDs based on a host ID, sequence number, and the current + * time + */ +class DefaultTimeGenerator implements TimeGeneratorInterface +{ + /** + * @var NodeProviderInterface + */ + private $nodeProvider; + + /** + * @var TimeConverterInterface + */ + private $timeConverter; + + /** + * @var TimeProviderInterface + */ + private $timeProvider; + + /** + * Constructs a `DefaultTimeGenerator` using a node provider, time converter, + * and time provider + * + * @param NodeProviderInterface $nodeProvider + * @param TimeConverterInterface $timeConverter + * @param TimeProviderInterface $timeProvider + */ + public function __construct( + NodeProviderInterface $nodeProvider, + TimeConverterInterface $timeConverter, + TimeProviderInterface $timeProvider + ) { + $this->nodeProvider = $nodeProvider; + $this->timeConverter = $timeConverter; + $this->timeProvider = $timeProvider; + } + + /** + * Generate a version 1 UUID from a host ID, sequence number, and the current time + * + * If $node is not given, we will attempt to obtain the local hardware + * address. If $clockSeq is given, it is used as the sequence number; + * otherwise a random 14-bit sequence number is chosen. + * + * @param int|string $node A 48-bit number representing the hardware address + * This number may be represented as an integer or a hexadecimal string. + * @param int $clockSeq A 14-bit number used to help avoid duplicates that + * could arise when the clock is set backwards in time or if the node ID + * changes. + * @return string A binary string + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and + * `Moontoast\Math\BigNumber` is not present + * @throws \InvalidArgumentException + * @throws \Exception if it was not possible to gather sufficient entropy + */ + public function generate($node = null, $clockSeq = null) + { + $node = $this->getValidNode($node); + + if ($clockSeq === null) { + // Not using "stable storage"; see RFC 4122, Section 4.2.1.1 + $clockSeq = random_int(0, 0x3fff); + } + + // Create a 60-bit time value as a count of 100-nanosecond intervals + // since 00:00:00.00, 15 October 1582 + $timeOfDay = $this->timeProvider->currentTime(); + $uuidTime = $this->timeConverter->calculateTime($timeOfDay['sec'], $timeOfDay['usec']); + + $timeHi = BinaryUtils::applyVersion($uuidTime['hi'], 1); + $clockSeqHi = BinaryUtils::applyVariant($clockSeq >> 8); + + $hex = vsprintf( + '%08s%04s%04s%02s%02s%012s', + array( + $uuidTime['low'], + $uuidTime['mid'], + sprintf('%04x', $timeHi), + sprintf('%02x', $clockSeqHi), + sprintf('%02x', $clockSeq & 0xff), + $node, + ) + ); + + return hex2bin($hex); + } + + /** + * Uses the node provider given when constructing this instance to get + * the node ID (usually a MAC address) + * + * @param string|int $node A node value that may be used to override the node provider + * @return string Hexadecimal representation of the node ID + * @throws \InvalidArgumentException + * @throws \Exception + */ + protected function getValidNode($node) + { + if ($node === null) { + $node = $this->nodeProvider->getNode(); + } + + // Convert the node to hex, if it is still an integer + if (is_int($node)) { + $node = sprintf('%012x', $node); + } + + if (!ctype_xdigit($node) || strlen($node) > 12) { + throw new \InvalidArgumentException('Invalid node value'); + } + + return strtolower(sprintf('%012s', $node)); + } +} diff --git a/vendor/ramsey/uuid/src/Generator/MtRandGenerator.php b/vendor/ramsey/uuid/src/Generator/MtRandGenerator.php new file mode 100644 index 000000000..f58b78357 --- /dev/null +++ b/vendor/ramsey/uuid/src/Generator/MtRandGenerator.php @@ -0,0 +1,41 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Generator; + +/** + * MtRandRandomGenerator provides functionality to generate strings of random + * binary data using the `mt_rand()` PHP function + * + * @link http://php.net/mt_rand + */ +class MtRandGenerator implements RandomGeneratorInterface +{ + /** + * Generates a string of random binary data of the specified length + * + * @param integer $length The number of bytes of random binary data to generate + * @return string A binary string + */ + public function generate($length) + { + $bytes = ''; + + for ($i = 1; $i <= $length; $i++) { + $bytes = chr(mt_rand(0, 255)) . $bytes; + } + + return $bytes; + } +} diff --git a/vendor/ramsey/uuid/src/Generator/OpenSslGenerator.php b/vendor/ramsey/uuid/src/Generator/OpenSslGenerator.php new file mode 100644 index 000000000..e8ec6a4d8 --- /dev/null +++ b/vendor/ramsey/uuid/src/Generator/OpenSslGenerator.php @@ -0,0 +1,38 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Generator; + +/** + * OpenSslRandomGenerator provides functionality to generate strings of random + * binary data using the `openssl_random_pseudo_bytes()` PHP function + * + * The use of this generator requires PHP to be compiled using the + * `--with-openssl` option. + * + * @link http://php.net/openssl_random_pseudo_bytes + */ +class OpenSslGenerator implements RandomGeneratorInterface +{ + /** + * Generates a string of random binary data of the specified length + * + * @param integer $length The number of bytes of random binary data to generate + * @return string A binary string + */ + public function generate($length) + { + return openssl_random_pseudo_bytes($length); + } +} diff --git a/vendor/ramsey/uuid/src/Generator/PeclUuidRandomGenerator.php b/vendor/ramsey/uuid/src/Generator/PeclUuidRandomGenerator.php new file mode 100644 index 000000000..fc2ef7e4d --- /dev/null +++ b/vendor/ramsey/uuid/src/Generator/PeclUuidRandomGenerator.php @@ -0,0 +1,37 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Generator; + +/** + * PeclUuidRandomGenerator provides functionality to generate strings of random + * binary data using the PECL UUID PHP extension + * + * @link https://pecl.php.net/package/uuid + */ +class PeclUuidRandomGenerator implements RandomGeneratorInterface +{ + /** + * Generates a string of random binary data of the specified length + * + * @param integer $length The number of bytes of random binary data to generate + * @return string A binary string + */ + public function generate($length) + { + $uuid = uuid_create(UUID_TYPE_RANDOM); + + return uuid_parse($uuid); + } +} diff --git a/vendor/ramsey/uuid/src/Generator/PeclUuidTimeGenerator.php b/vendor/ramsey/uuid/src/Generator/PeclUuidTimeGenerator.php new file mode 100644 index 000000000..7ccf16fd9 --- /dev/null +++ b/vendor/ramsey/uuid/src/Generator/PeclUuidTimeGenerator.php @@ -0,0 +1,38 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Generator; + +/** + * PeclUuidTimeGenerator provides functionality to generate strings of binary + * data for version 1 UUIDs using the PECL UUID PHP extension + * + * @link https://pecl.php.net/package/uuid + */ +class PeclUuidTimeGenerator implements TimeGeneratorInterface +{ + /** + * Generate a version 1 UUID using the PECL UUID extension + * + * @param int|string $node Not used in this context + * @param int $clockSeq Not used in this context + * @return string A binary string + */ + public function generate($node = null, $clockSeq = null) + { + $uuid = uuid_create(UUID_TYPE_TIME); + + return uuid_parse($uuid); + } +} diff --git a/vendor/ramsey/uuid/src/Generator/RandomBytesGenerator.php b/vendor/ramsey/uuid/src/Generator/RandomBytesGenerator.php new file mode 100644 index 000000000..aaa285df0 --- /dev/null +++ b/vendor/ramsey/uuid/src/Generator/RandomBytesGenerator.php @@ -0,0 +1,37 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Generator; + +/** + * RandomBytesGenerator provides functionality to generate strings of random + * binary data using `random_bytes()` function in PHP 7+ or paragonie/random_compat + * + * @link http://php.net/random_bytes + * @link https://github.com/paragonie/random_compat + */ +class RandomBytesGenerator implements RandomGeneratorInterface +{ + /** + * Generates a string of random binary data of the specified length + * + * @param integer $length The number of bytes of random binary data to generate + * @return string A binary string + * @throws \Exception if it was not possible to gather sufficient entropy + */ + public function generate($length) + { + return random_bytes($length); + } +} diff --git a/vendor/ramsey/uuid/src/Generator/RandomGeneratorFactory.php b/vendor/ramsey/uuid/src/Generator/RandomGeneratorFactory.php new file mode 100644 index 000000000..39110622f --- /dev/null +++ b/vendor/ramsey/uuid/src/Generator/RandomGeneratorFactory.php @@ -0,0 +1,31 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Generator; + +/** + * A factory for retrieving a random generator, based on the environment + */ +class RandomGeneratorFactory +{ + /** + * Returns a default random generator, based on the current environment + * + * @return RandomGeneratorInterface + */ + public static function getGenerator() + { + return new RandomBytesGenerator(); + } +} diff --git a/vendor/ramsey/uuid/src/Generator/RandomGeneratorInterface.php b/vendor/ramsey/uuid/src/Generator/RandomGeneratorInterface.php new file mode 100644 index 000000000..3a1bcae7e --- /dev/null +++ b/vendor/ramsey/uuid/src/Generator/RandomGeneratorInterface.php @@ -0,0 +1,33 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Generator; + +/** + * RandomGeneratorInterface provides functionality to generate strings of random + * binary data + */ +interface RandomGeneratorInterface +{ + /** + * Generates a string of random binary data of the specified length + * + * @param integer $length The number of bytes of random binary data to generate + * @return string A binary string + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws \InvalidArgumentException + * @throws \Exception if it was not possible to gather sufficient entropy + */ + public function generate($length); +} diff --git a/vendor/ramsey/uuid/src/Generator/RandomLibAdapter.php b/vendor/ramsey/uuid/src/Generator/RandomLibAdapter.php new file mode 100644 index 000000000..25b54a834 --- /dev/null +++ b/vendor/ramsey/uuid/src/Generator/RandomLibAdapter.php @@ -0,0 +1,62 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Generator; + +use RandomLib\Generator; +use RandomLib\Factory; + +/** + * RandomLibAdapter provides functionality to generate strings of random + * binary data using the ircmaxell/random-lib library + * + * @link https://packagist.org/packages/ircmaxell/random-lib + */ +class RandomLibAdapter implements RandomGeneratorInterface +{ + /** + * @var Generator + */ + private $generator; + + /** + * Constructs a `RandomLibAdapter` using a `RandomLib\Generator` + * + * By default, if no `Generator` is passed in, this creates a medium-strength + * generator to use when generating random binary data. + * + * @param Generator $generator An ircmaxell/random-lib `Generator` + */ + public function __construct(Generator $generator = null) + { + $this->generator = $generator; + + if ($this->generator === null) { + $factory = new Factory(); + + $this->generator = $factory->getMediumStrengthGenerator(); + } + } + + /** + * Generates a string of random binary data of the specified length + * + * @param integer $length The number of bytes of random binary data to generate + * @return string A binary string + */ + public function generate($length) + { + return $this->generator->generate($length); + } +} diff --git a/vendor/ramsey/uuid/src/Generator/SodiumRandomGenerator.php b/vendor/ramsey/uuid/src/Generator/SodiumRandomGenerator.php new file mode 100644 index 000000000..6b08f5402 --- /dev/null +++ b/vendor/ramsey/uuid/src/Generator/SodiumRandomGenerator.php @@ -0,0 +1,36 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Generator; + +/** + * SodiumRandomGenerator provides functionality to generate strings of random + * binary data using the PECL libsodium extension + * + * @link http://pecl.php.net/package/libsodium + * @link https://paragonie.com/book/pecl-libsodium + */ +class SodiumRandomGenerator implements RandomGeneratorInterface +{ + /** + * Generates a string of random binary data of the specified length + * + * @param integer $length The number of bytes of random binary data to generate + * @return string A binary string + */ + public function generate($length) + { + return \Sodium\randombytes_buf($length); + } +} diff --git a/vendor/ramsey/uuid/src/Generator/TimeGeneratorFactory.php b/vendor/ramsey/uuid/src/Generator/TimeGeneratorFactory.php new file mode 100644 index 000000000..24d501bbf --- /dev/null +++ b/vendor/ramsey/uuid/src/Generator/TimeGeneratorFactory.php @@ -0,0 +1,72 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Generator; + +use Ramsey\Uuid\Converter\TimeConverterInterface; +use Ramsey\Uuid\Provider\NodeProviderInterface; +use Ramsey\Uuid\Provider\TimeProviderInterface; + +/** + * A factory for retrieving a time generator, based on the environment + */ +class TimeGeneratorFactory +{ + /** + * @var NodeProviderInterface + */ + private $nodeProvider; + + /** + * @var TimeConverterInterface + */ + private $timeConverter; + + /** + * @var TimeProviderInterface + */ + private $timeProvider; + + /** + * Constructs a `TimeGeneratorFactory` using a node provider, time converter, + * and time provider + * + * @param NodeProviderInterface $nodeProvider + * @param TimeConverterInterface $timeConverter + * @param TimeProviderInterface $timeProvider + */ + public function __construct( + NodeProviderInterface $nodeProvider, + TimeConverterInterface $timeConverter, + TimeProviderInterface $timeProvider + ) { + $this->nodeProvider = $nodeProvider; + $this->timeConverter = $timeConverter; + $this->timeProvider = $timeProvider; + } + + /** + * Returns a default time generator, based on the current environment + * + * @return TimeGeneratorInterface + */ + public function getGenerator() + { + return new DefaultTimeGenerator( + $this->nodeProvider, + $this->timeConverter, + $this->timeProvider + ); + } +} diff --git a/vendor/ramsey/uuid/src/Generator/TimeGeneratorInterface.php b/vendor/ramsey/uuid/src/Generator/TimeGeneratorInterface.php new file mode 100644 index 000000000..cb182ea00 --- /dev/null +++ b/vendor/ramsey/uuid/src/Generator/TimeGeneratorInterface.php @@ -0,0 +1,39 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Generator; + +/** + * TimeGeneratorInterface provides functionality to generate strings of binary + * data for version 1 UUIDs based on a host ID, sequence number, and the current + * time + */ +interface TimeGeneratorInterface +{ + /** + * Generate a version 1 UUID from a host ID, sequence number, and the current time + * + * @param int|string $node A 48-bit number representing the hardware address + * This number may be represented as an integer or a hexadecimal string. + * @param int $clockSeq A 14-bit number used to help avoid duplicates that + * could arise when the clock is set backwards in time or if the node ID + * changes. + * @return string A binary string + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and + * `Moontoast\Math\BigNumber` is not present + * @throws \InvalidArgumentException + * @throws \Exception if it was not possible to gather sufficient entropy + */ + public function generate($node = null, $clockSeq = null); +} diff --git a/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php b/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php new file mode 100644 index 000000000..289fddeae --- /dev/null +++ b/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php @@ -0,0 +1,58 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Provider\Node; + +use Ramsey\Uuid\Provider\NodeProviderInterface; + +/** + * FallbackNodeProvider attempts to gain the system host ID from an array of + * providers, falling back to the next in line in the event a host ID can not be + * obtained + */ +class FallbackNodeProvider implements NodeProviderInterface +{ + /** + * @var NodeProviderInterface[] + */ + private $nodeProviders; + + /** + * Constructs a `FallbackNodeProvider` using an array of node providers + * + * @param NodeProviderInterface[] $providers Array of node providers + */ + public function __construct(array $providers) + { + $this->nodeProviders = $providers; + } + + /** + * Returns the system node ID by iterating over an array of node providers + * and returning the first non-empty value found + * + * @return string System node ID as a hexadecimal string + * @throws \Exception + */ + public function getNode() + { + foreach ($this->nodeProviders as $provider) { + if ($node = $provider->getNode()) { + return $node; + } + } + + return null; + } +} diff --git a/vendor/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php b/vendor/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php new file mode 100644 index 000000000..76c570d7f --- /dev/null +++ b/vendor/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php @@ -0,0 +1,42 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Provider\Node; + +use Ramsey\Uuid\Provider\NodeProviderInterface; + +/** + * RandomNodeProvider provides functionality to generate a random node ID, in + * the event that the node ID could not be obtained from the host system + * + * @link http://tools.ietf.org/html/rfc4122#section-4.5 + */ +class RandomNodeProvider implements NodeProviderInterface +{ + /** + * Returns the system node ID + * + * @return string System node ID as a hexadecimal string + * @throws \Exception if it was not possible to gather sufficient entropy + */ + public function getNode() + { + $node = hexdec(bin2hex(random_bytes(6))); + + // Set the multicast bit; see RFC 4122, section 4.5. + $node = $node | 0x010000000000; + + return str_pad(dechex($node), 12, '0', STR_PAD_LEFT); + } +} diff --git a/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php b/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php new file mode 100644 index 000000000..ae6a09eaa --- /dev/null +++ b/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php @@ -0,0 +1,125 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Provider\Node; + +use Ramsey\Uuid\Provider\NodeProviderInterface; + +/** + * SystemNodeProvider provides functionality to get the system node ID (MAC + * address) using external system calls + */ +class SystemNodeProvider implements NodeProviderInterface +{ + /** + * Returns the system node ID + * + * @return string|false System node ID as a hexadecimal string, or false if it is not found + */ + public function getNode() + { + static $node = null; + + if ($node !== null) { + return $node; + } + + $pattern = '/[^:]([0-9A-Fa-f]{2}([:-])[0-9A-Fa-f]{2}(\2[0-9A-Fa-f]{2}){4})[^:]/'; + $matches = array(); + + // first try a linux specific way + $node = $this->getSysfs(); + + // Search the ifconfig output for all MAC addresses and return + // the first one found + if ($node === false) { + if (preg_match_all($pattern, $this->getIfconfig(), $matches, PREG_PATTERN_ORDER)) { + $node = $matches[1][0]; + } + } + if ($node !== false) { + $node = str_replace([':', '-'], '', $node); + } + return $node; + } + + /** + * Returns the network interface configuration for the system + * + * @codeCoverageIgnore + * @return string + */ + protected function getIfconfig() + { + if (strpos(strtolower(ini_get('disable_functions')), 'passthru') !== false) { + return ''; + } + + ob_start(); + switch (strtoupper(substr(php_uname('a'), 0, 3))) { + case 'WIN': + passthru('ipconfig /all 2>&1'); + break; + case 'DAR': + passthru('ifconfig 2>&1'); + break; + case 'FRE': + passthru('netstat -i -f link 2>&1'); + break; + case 'LIN': + default: + passthru('netstat -ie 2>&1'); + break; + } + + return ob_get_clean(); + } + + /** + * Returns mac address from the first system interface via the sysfs interface + * + * @return string|bool + */ + protected function getSysfs() + { + $mac = false; + + if (strtoupper(php_uname('s')) === 'LINUX') { + $addressPaths = glob('/sys/class/net/*/address', GLOB_NOSORT); + + if (empty($addressPaths)) { + return false; + } + + array_walk($addressPaths, function ($addressPath) use (&$macs) { + $macs[] = file_get_contents($addressPath); + }); + + $macs = array_map('trim', $macs); + + // remove invalid entries + $macs = array_filter($macs, function ($mac) { + return + // localhost adapter + $mac !== '00:00:00:00:00:00' && + // must match mac adress + preg_match('/^([0-9a-f]{2}:){5}[0-9a-f]{2}$/i', $mac); + }); + + $mac = reset($macs); + } + + return $mac; + } +} diff --git a/vendor/ramsey/uuid/src/Provider/NodeProviderInterface.php b/vendor/ramsey/uuid/src/Provider/NodeProviderInterface.php new file mode 100644 index 000000000..14f747bea --- /dev/null +++ b/vendor/ramsey/uuid/src/Provider/NodeProviderInterface.php @@ -0,0 +1,30 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Provider; + +/** + * NodeProviderInterface provides functionality to get the node ID (or host ID + * in the form of the system's MAC address) from a specific type of node provider + */ +interface NodeProviderInterface +{ + /** + * Returns the system node ID + * + * @return string System node ID as a hexadecimal string + * @throws \Exception if it was not possible to gather sufficient entropy + */ + public function getNode(); +} diff --git a/vendor/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php b/vendor/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php new file mode 100644 index 000000000..a62d39c62 --- /dev/null +++ b/vendor/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php @@ -0,0 +1,76 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Provider\Time; + +use Ramsey\Uuid\Provider\TimeProviderInterface; + +/** + * FixedTimeProvider uses an previously-generated timestamp to provide the time + * + * This provider allows the use of a previously-generated timestamp, such as one + * stored in a database, when creating version 1 UUIDs. + */ +class FixedTimeProvider implements TimeProviderInterface +{ + /** + * @var int[] Array containing `sec` and `usec` components of a timestamp + */ + private $fixedTime; + + /** + * Constructs a `FixedTimeProvider` using the provided `$timestamp` + * + * @param int[] Array containing `sec` and `usec` components of a timestamp + * @throws \InvalidArgumentException if the `$timestamp` does not contain `sec` or `usec` components + */ + public function __construct(array $timestamp) + { + if (!array_key_exists('sec', $timestamp) || !array_key_exists('usec', $timestamp)) { + throw new \InvalidArgumentException('Array must contain sec and usec keys.'); + } + + $this->fixedTime = $timestamp; + } + + /** + * Sets the `usec` component of the timestamp + * + * @param int $value The `usec` value to set + */ + public function setUsec($value) + { + $this->fixedTime['usec'] = $value; + } + + /** + * Sets the `sec` component of the timestamp + * + * @param int $value The `sec` value to set + */ + public function setSec($value) + { + $this->fixedTime['sec'] = $value; + } + + /** + * Returns a timestamp array + * + * @return int[] Array containing `sec` and `usec` components of a timestamp + */ + public function currentTime() + { + return $this->fixedTime; + } +} diff --git a/vendor/ramsey/uuid/src/Provider/Time/SystemTimeProvider.php b/vendor/ramsey/uuid/src/Provider/Time/SystemTimeProvider.php new file mode 100644 index 000000000..6442985fa --- /dev/null +++ b/vendor/ramsey/uuid/src/Provider/Time/SystemTimeProvider.php @@ -0,0 +1,33 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Provider\Time; + +use Ramsey\Uuid\Provider\TimeProviderInterface; + +/** + * SystemTimeProvider uses built-in PHP functions to provide the time + */ +class SystemTimeProvider implements TimeProviderInterface +{ + /** + * Returns a timestamp array + * + * @return int[] Array containing `sec` and `usec` components of a timestamp + */ + public function currentTime() + { + return gettimeofday(); + } +} diff --git a/vendor/ramsey/uuid/src/Provider/TimeProviderInterface.php b/vendor/ramsey/uuid/src/Provider/TimeProviderInterface.php new file mode 100644 index 000000000..ef8099dd1 --- /dev/null +++ b/vendor/ramsey/uuid/src/Provider/TimeProviderInterface.php @@ -0,0 +1,29 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid\Provider; + +/** + * TimeProviderInterface provides functionality to get the time from a specific + * type of time provider + */ +interface TimeProviderInterface +{ + /** + * Returns a timestamp array + * + * @return int[] Array guaranteed to contain `sec` and `usec` components of a timestamp + */ + public function currentTime(); +} diff --git a/vendor/ramsey/uuid/src/Uuid.php b/vendor/ramsey/uuid/src/Uuid.php new file mode 100644 index 000000000..45f9fa448 --- /dev/null +++ b/vendor/ramsey/uuid/src/Uuid.php @@ -0,0 +1,740 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid; + +use Ramsey\Uuid\Converter\NumberConverterInterface; +use Ramsey\Uuid\Codec\CodecInterface; +use Ramsey\Uuid\Exception\UnsupportedOperationException; + +/** + * Represents a universally unique identifier (UUID), according to RFC 4122. + * + * This class provides immutable UUID objects (the Uuid class) and the static + * methods `uuid1()`, `uuid3()`, `uuid4()`, and `uuid5()` for generating version + * 1, 3, 4, and 5 UUIDs as specified in RFC 4122. + * + * If all you want is a unique ID, you should probably call `uuid1()` or `uuid4()`. + * Note that `uuid1()` may compromise privacy since it creates a UUID containing + * the computer’s network address. `uuid4()` creates a random UUID. + * + * @link http://tools.ietf.org/html/rfc4122 + * @link http://en.wikipedia.org/wiki/Universally_unique_identifier + * @link http://docs.python.org/3/library/uuid.html + * @link http://docs.oracle.com/javase/6/docs/api/java/util/UUID.html + */ +class Uuid implements UuidInterface +{ + /** + * When this namespace is specified, the name string is a fully-qualified domain name. + * @link http://tools.ietf.org/html/rfc4122#appendix-C + */ + const NAMESPACE_DNS = '6ba7b810-9dad-11d1-80b4-00c04fd430c8'; + + /** + * When this namespace is specified, the name string is a URL. + * @link http://tools.ietf.org/html/rfc4122#appendix-C + */ + const NAMESPACE_URL = '6ba7b811-9dad-11d1-80b4-00c04fd430c8'; + + /** + * When this namespace is specified, the name string is an ISO OID. + * @link http://tools.ietf.org/html/rfc4122#appendix-C + */ + const NAMESPACE_OID = '6ba7b812-9dad-11d1-80b4-00c04fd430c8'; + + /** + * When this namespace is specified, the name string is an X.500 DN in DER or a text output format. + * @link http://tools.ietf.org/html/rfc4122#appendix-C + */ + const NAMESPACE_X500 = '6ba7b814-9dad-11d1-80b4-00c04fd430c8'; + + /** + * The nil UUID is special form of UUID that is specified to have all 128 bits set to zero. + * @link http://tools.ietf.org/html/rfc4122#section-4.1.7 + */ + const NIL = '00000000-0000-0000-0000-000000000000'; + + /** + * Reserved for NCS compatibility. + * @link http://tools.ietf.org/html/rfc4122#section-4.1.1 + */ + const RESERVED_NCS = 0; + + /** + * Specifies the UUID layout given in RFC 4122. + * @link http://tools.ietf.org/html/rfc4122#section-4.1.1 + */ + const RFC_4122 = 2; + + /** + * Reserved for Microsoft compatibility. + * @link http://tools.ietf.org/html/rfc4122#section-4.1.1 + */ + const RESERVED_MICROSOFT = 6; + + /** + * Reserved for future definition. + * @link http://tools.ietf.org/html/rfc4122#section-4.1.1 + */ + const RESERVED_FUTURE = 7; + + /** + * Regular expression pattern for matching a valid UUID of any variant. + */ + const VALID_PATTERN = '^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$'; + + /** + * Version 1 (time-based) UUID object constant identifier + */ + const UUID_TYPE_TIME = 1; + + /** + * Version 2 (identifier-based) UUID object constant identifier + */ + const UUID_TYPE_IDENTIFIER = 2; + + /** + * Version 3 (name-based and hashed with MD5) UUID object constant identifier + */ + const UUID_TYPE_HASH_MD5 = 3; + + /** + * Version 4 (random) UUID object constant identifier + */ + const UUID_TYPE_RANDOM = 4; + + /** + * Version 5 (name-based and hashed with SHA1) UUID object constant identifier + */ + const UUID_TYPE_HASH_SHA1 = 5; + + /** + * The factory to use when creating UUIDs. + * @var UuidFactoryInterface + */ + private static $factory = null; + + /** + * The codec to use when encoding or decoding UUID strings. + * @var CodecInterface + */ + protected $codec; + + /** + * The fields that make up this UUID. + * + * This is initialized to the nil value. + * + * @var array + * @see UuidInterface::getFieldsHex() + */ + protected $fields = array( + 'time_low' => '00000000', + 'time_mid' => '0000', + 'time_hi_and_version' => '0000', + 'clock_seq_hi_and_reserved' => '00', + 'clock_seq_low' => '00', + 'node' => '000000000000', + ); + + /** + * The number converter to use for converting hex values to/from integers. + * @var NumberConverterInterface + */ + protected $converter; + + /** + * Creates a universally unique identifier (UUID) from an array of fields. + * + * Unless you're making advanced use of this library to generate identifiers + * that deviate from RFC 4122, you probably do not want to instantiate a + * UUID directly. Use the static methods, instead: + * + * ``` + * use Ramsey\Uuid\Uuid; + * + * $timeBasedUuid = Uuid::uuid1(); + * $namespaceMd5Uuid = Uuid::uuid3(Uuid::NAMESPACE_URL, 'http://php.net/'); + * $randomUuid = Uuid::uuid4(); + * $namespaceSha1Uuid = Uuid::uuid5(Uuid::NAMESPACE_URL, 'http://php.net/'); + * ``` + * + * @param array $fields An array of fields from which to construct a UUID; + * see {@see \Ramsey\Uuid\UuidInterface::getFieldsHex()} for array structure. + * @param NumberConverterInterface $converter The number converter to use + * for converting hex values to/from integers. + * @param CodecInterface $codec The codec to use when encoding or decoding + * UUID strings. + */ + public function __construct( + array $fields, + NumberConverterInterface $converter, + CodecInterface $codec + ) { + $this->fields = $fields; + $this->codec = $codec; + $this->converter = $converter; + } + + /** + * Converts this UUID object to a string when the object is used in any + * string context. + * + * @return string + * @link http://www.php.net/manual/en/language.oop5.magic.php#object.tostring + */ + public function __toString() + { + return $this->toString(); + } + + /** + * Converts this UUID object to a string when the object is serialized + * with `json_encode()` + * + * @return string + * @link http://php.net/manual/en/class.jsonserializable.php + */ + public function jsonSerialize() + { + return $this->toString(); + } + + /** + * Converts this UUID object to a string when the object is serialized + * with `serialize()` + * + * @return string + * @link http://php.net/manual/en/class.serializable.php + */ + public function serialize() + { + return $this->toString(); + } + + /** + * Re-constructs the object from its serialized form. + * + * @param string $serialized + * @link http://php.net/manual/en/class.serializable.php + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public function unserialize($serialized) + { + $uuid = self::fromString($serialized); + $this->codec = $uuid->codec; + $this->converter = $uuid->converter; + $this->fields = $uuid->fields; + } + + public function compareTo(UuidInterface $other) + { + $comparison = 0; + + if ($this->getMostSignificantBitsHex() < $other->getMostSignificantBitsHex()) { + $comparison = -1; + } elseif ($this->getMostSignificantBitsHex() > $other->getMostSignificantBitsHex()) { + $comparison = 1; + } elseif ($this->getLeastSignificantBitsHex() < $other->getLeastSignificantBitsHex()) { + $comparison = -1; + } elseif ($this->getLeastSignificantBitsHex() > $other->getLeastSignificantBitsHex()) { + $comparison = 1; + } + + return $comparison; + } + + public function equals($other) + { + if (!($other instanceof UuidInterface)) { + return false; + } + + return ($this->compareTo($other) == 0); + } + + public function getBytes() + { + return $this->codec->encodeBinary($this); + } + + /** + * Returns the high field of the clock sequence multiplexed with the variant + * (bits 65-72 of the UUID). + * + * @return int Unsigned 8-bit integer value of clock_seq_hi_and_reserved + */ + public function getClockSeqHiAndReserved() + { + return hexdec($this->getClockSeqHiAndReservedHex()); + } + + public function getClockSeqHiAndReservedHex() + { + return $this->fields['clock_seq_hi_and_reserved']; + } + + /** + * Returns the low field of the clock sequence (bits 73-80 of the UUID). + * + * @return int Unsigned 8-bit integer value of clock_seq_low + */ + public function getClockSeqLow() + { + return hexdec($this->getClockSeqLowHex()); + } + + public function getClockSeqLowHex() + { + return $this->fields['clock_seq_low']; + } + + /** + * Returns the clock sequence value associated with this UUID. + * + * For UUID version 1, the clock sequence is used to help avoid + * duplicates that could arise when the clock is set backwards in time + * or if the node ID changes. + * + * For UUID version 3 or 5, the clock sequence is a 14-bit value + * constructed from a name as described in RFC 4122, Section 4.3. + * + * For UUID version 4, clock sequence is a randomly or pseudo-randomly + * generated 14-bit value as described in RFC 4122, Section 4.4. + * + * @return int Unsigned 14-bit integer value of clock sequence + * @link http://tools.ietf.org/html/rfc4122#section-4.1.5 + */ + public function getClockSequence() + { + return (($this->getClockSeqHiAndReserved() & 0x3f) << 8) + | $this->getClockSeqLow(); + } + + public function getClockSequenceHex() + { + return sprintf('%04x', $this->getClockSequence()); + } + + public function getNumberConverter() + { + return $this->converter; + } + + /** + * @inheritdoc + */ + public function getDateTime() + { + if ($this->getVersion() != 1) { + throw new UnsupportedOperationException('Not a time-based UUID'); + } + + $unixTime = ($this->getTimestamp() - 0x01b21dd213814000) / 1e7; + $unixTime = number_format($unixTime, 0, '', ''); + + return new \DateTime("@{$unixTime}"); + } + + /** + * Returns an array of the fields of this UUID, with keys named according + * to the RFC 4122 names for the fields. + * + * * **time_low**: The low field of the timestamp, an unsigned 32-bit integer + * * **time_mid**: The middle field of the timestamp, an unsigned 16-bit integer + * * **time_hi_and_version**: The high field of the timestamp multiplexed with + * the version number, an unsigned 16-bit integer + * * **clock_seq_hi_and_reserved**: The high field of the clock sequence + * multiplexed with the variant, an unsigned 8-bit integer + * * **clock_seq_low**: The low field of the clock sequence, an unsigned + * 8-bit integer + * * **node**: The spatially unique node identifier, an unsigned 48-bit + * integer + * + * @return array The UUID fields represented as integer values + * @link http://tools.ietf.org/html/rfc4122#section-4.1.2 + */ + public function getFields() + { + return array( + 'time_low' => $this->getTimeLow(), + 'time_mid' => $this->getTimeMid(), + 'time_hi_and_version' => $this->getTimeHiAndVersion(), + 'clock_seq_hi_and_reserved' => $this->getClockSeqHiAndReserved(), + 'clock_seq_low' => $this->getClockSeqLow(), + 'node' => $this->getNode(), + ); + } + + public function getFieldsHex() + { + return $this->fields; + } + + public function getHex() + { + return str_replace('-', '', $this->toString()); + } + + /** + * @inheritdoc + */ + public function getInteger() + { + return $this->converter->fromHex($this->getHex()); + } + + /** + * Returns the least significant 64 bits of this UUID's 128 bit value. + * + * @return mixed Converted representation of the unsigned 64-bit integer value + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + */ + public function getLeastSignificantBits() + { + return $this->converter->fromHex($this->getLeastSignificantBitsHex()); + } + + public function getLeastSignificantBitsHex() + { + return sprintf( + '%02s%02s%012s', + $this->fields['clock_seq_hi_and_reserved'], + $this->fields['clock_seq_low'], + $this->fields['node'] + ); + } + + /** + * Returns the most significant 64 bits of this UUID's 128 bit value. + * + * @return mixed Converted representation of the unsigned 64-bit integer value + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + */ + public function getMostSignificantBits() + { + return $this->converter->fromHex($this->getMostSignificantBitsHex()); + } + + public function getMostSignificantBitsHex() + { + return sprintf( + '%08s%04s%04s', + $this->fields['time_low'], + $this->fields['time_mid'], + $this->fields['time_hi_and_version'] + ); + } + + /** + * Returns the node value associated with this UUID + * + * For UUID version 1, the node field consists of an IEEE 802 MAC + * address, usually the host address. For systems with multiple IEEE + * 802 addresses, any available one can be used. The lowest addressed + * octet (octet number 10) contains the global/local bit and the + * unicast/multicast bit, and is the first octet of the address + * transmitted on an 802.3 LAN. + * + * For systems with no IEEE address, a randomly or pseudo-randomly + * generated value may be used; see RFC 4122, Section 4.5. The + * multicast bit must be set in such addresses, in order that they + * will never conflict with addresses obtained from network cards. + * + * For UUID version 3 or 5, the node field is a 48-bit value constructed + * from a name as described in RFC 4122, Section 4.3. + * + * For UUID version 4, the node field is a randomly or pseudo-randomly + * generated 48-bit value as described in RFC 4122, Section 4.4. + * + * @return int Unsigned 48-bit integer value of node + * @link http://tools.ietf.org/html/rfc4122#section-4.1.6 + */ + public function getNode() + { + return hexdec($this->getNodeHex()); + } + + public function getNodeHex() + { + return $this->fields['node']; + } + + /** + * Returns the high field of the timestamp multiplexed with the version + * number (bits 49-64 of the UUID). + * + * @return int Unsigned 16-bit integer value of time_hi_and_version + */ + public function getTimeHiAndVersion() + { + return hexdec($this->getTimeHiAndVersionHex()); + } + + public function getTimeHiAndVersionHex() + { + return $this->fields['time_hi_and_version']; + } + + /** + * Returns the low field of the timestamp (the first 32 bits of the UUID). + * + * @return int Unsigned 32-bit integer value of time_low + */ + public function getTimeLow() + { + return hexdec($this->getTimeLowHex()); + } + + public function getTimeLowHex() + { + return $this->fields['time_low']; + } + + /** + * Returns the middle field of the timestamp (bits 33-48 of the UUID). + * + * @return int Unsigned 16-bit integer value of time_mid + */ + public function getTimeMid() + { + return hexdec($this->getTimeMidHex()); + } + + public function getTimeMidHex() + { + return $this->fields['time_mid']; + } + + /** + * Returns the timestamp value associated with this UUID. + * + * The 60 bit timestamp value is constructed from the time_low, + * time_mid, and time_hi fields of this UUID. The resulting + * timestamp is measured in 100-nanosecond units since midnight, + * October 15, 1582 UTC. + * + * The timestamp value is only meaningful in a time-based UUID, which + * has version type 1. If this UUID is not a time-based UUID then + * this method throws UnsupportedOperationException. + * + * @return int Unsigned 60-bit integer value of the timestamp + * @throws UnsupportedOperationException If this UUID is not a version 1 UUID + * @link http://tools.ietf.org/html/rfc4122#section-4.1.4 + */ + public function getTimestamp() + { + if ($this->getVersion() != 1) { + throw new UnsupportedOperationException('Not a time-based UUID'); + } + + return hexdec($this->getTimestampHex()); + } + + /** + * @inheritdoc + */ + public function getTimestampHex() + { + if ($this->getVersion() != 1) { + throw new UnsupportedOperationException('Not a time-based UUID'); + } + + return sprintf( + '%03x%04s%08s', + ($this->getTimeHiAndVersion() & 0x0fff), + $this->fields['time_mid'], + $this->fields['time_low'] + ); + } + + public function getUrn() + { + return 'urn:uuid:' . $this->toString(); + } + + public function getVariant() + { + $clockSeq = $this->getClockSeqHiAndReserved(); + if (0 === ($clockSeq & 0x80)) { + $variant = self::RESERVED_NCS; + } elseif (0 === ($clockSeq & 0x40)) { + $variant = self::RFC_4122; + } elseif (0 === ($clockSeq & 0x20)) { + $variant = self::RESERVED_MICROSOFT; + } else { + $variant = self::RESERVED_FUTURE; + } + + return $variant; + } + + public function getVersion() + { + if ($this->getVariant() == self::RFC_4122) { + return (int) (($this->getTimeHiAndVersion() >> 12) & 0x0f); + } + + return null; + } + + public function toString() + { + return $this->codec->encode($this); + } + + /** + * Returns the currently set factory used to create UUIDs. + * + * @return UuidFactoryInterface + */ + public static function getFactory() + { + if (!self::$factory) { + self::$factory = new UuidFactory(); + } + + return self::$factory; + } + + /** + * Sets the factory used to create UUIDs. + * + * @param UuidFactoryInterface $factory + */ + public static function setFactory(UuidFactoryInterface $factory) + { + self::$factory = $factory; + } + + /** + * Creates a UUID from a byte string. + * + * @param string $bytes + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + * @throws \InvalidArgumentException + */ + public static function fromBytes($bytes) + { + return self::getFactory()->fromBytes($bytes); + } + + /** + * Creates a UUID from the string standard representation. + * + * @param string $name A string that specifies a UUID + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public static function fromString($name) + { + return self::getFactory()->fromString($name); + } + + /** + * Creates a UUID from a 128-bit integer string. + * + * @param string $integer String representation of 128-bit integer + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public static function fromInteger($integer) + { + return self::getFactory()->fromInteger($integer); + } + + /** + * Check if a string is a valid UUID. + * + * @param string $uuid The string UUID to test + * @return boolean + */ + public static function isValid($uuid) + { + $uuid = str_replace(array('urn:', 'uuid:', '{', '}'), '', $uuid); + + if ($uuid == self::NIL) { + return true; + } + + if (!preg_match('/' . self::VALID_PATTERN . '/D', $uuid)) { + return false; + } + + return true; + } + + /** + * Generate a version 1 UUID from a host ID, sequence number, and the current time. + * + * @param int|string $node A 48-bit number representing the hardware address + * This number may be represented as an integer or a hexadecimal string. + * @param int $clockSeq A 14-bit number used to help avoid duplicates that + * could arise when the clock is set backwards in time or if the node ID + * changes. + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and + * `Moontoast\Math\BigNumber` is not present + * @throws \InvalidArgumentException + * @throws \Exception if it was not possible to gather sufficient entropy + */ + public static function uuid1($node = null, $clockSeq = null) + { + return self::getFactory()->uuid1($node, $clockSeq); + } + + /** + * Generate a version 3 UUID based on the MD5 hash of a namespace identifier + * (which is a UUID) and a name (which is a string). + * + * @param string $ns The UUID namespace in which to create the named UUID + * @param string $name The name to create a UUID for + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public static function uuid3($ns, $name) + { + return self::getFactory()->uuid3($ns, $name); + } + + /** + * Generate a version 4 (random) UUID. + * + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws \InvalidArgumentException + * @throws \Exception + */ + public static function uuid4() + { + return self::getFactory()->uuid4(); + } + + /** + * Generate a version 5 UUID based on the SHA-1 hash of a namespace + * identifier (which is a UUID) and a name (which is a string). + * + * @param string $ns The UUID namespace in which to create the named UUID + * @param string $name The name to create a UUID for + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public static function uuid5($ns, $name) + { + return self::getFactory()->uuid5($ns, $name); + } +} diff --git a/vendor/ramsey/uuid/src/UuidFactory.php b/vendor/ramsey/uuid/src/UuidFactory.php new file mode 100644 index 000000000..99644d4b4 --- /dev/null +++ b/vendor/ramsey/uuid/src/UuidFactory.php @@ -0,0 +1,314 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid; + +use Ramsey\Uuid\Converter\NumberConverterInterface; +use Ramsey\Uuid\Provider\NodeProviderInterface; +use Ramsey\Uuid\Generator\RandomGeneratorInterface; +use Ramsey\Uuid\Generator\TimeGeneratorInterface; +use Ramsey\Uuid\Codec\CodecInterface; +use Ramsey\Uuid\Builder\UuidBuilderInterface; + +class UuidFactory implements UuidFactoryInterface +{ + /** + * @var CodecInterface + */ + private $codec = null; + + /** + * @var NodeProviderInterface + */ + private $nodeProvider = null; + + /** + * @var NumberConverterInterface + */ + private $numberConverter = null; + + /** + * @var RandomGeneratorInterface + */ + private $randomGenerator = null; + + /** + * @var TimeGeneratorInterface + */ + private $timeGenerator = null; + + /** + * @var UuidBuilderInterface + */ + private $uuidBuilder = null; + + /** + * Constructs a `UuidFactory` for creating `Ramsey\Uuid\UuidInterface` instances + * + * @param FeatureSet $features A set of features for use when creating UUIDs + */ + public function __construct(FeatureSet $features = null) + { + $features = $features ?: new FeatureSet(); + + $this->codec = $features->getCodec(); + $this->nodeProvider = $features->getNodeProvider(); + $this->numberConverter = $features->getNumberConverter(); + $this->randomGenerator = $features->getRandomGenerator(); + $this->timeGenerator = $features->getTimeGenerator(); + $this->uuidBuilder = $features->getBuilder(); + } + + /** + * Returns the UUID coder-decoder used by this factory + * + * @return CodecInterface + */ + public function getCodec() + { + return $this->codec; + } + + /** + * Sets the UUID coder-decoder used by this factory + * + * @param CodecInterface $codec + */ + public function setCodec(CodecInterface $codec) + { + $this->codec = $codec; + } + + /** + * Returns the system node ID provider used by this factory + * + * @return NodeProviderInterface + */ + public function getNodeProvider() + { + return $this->nodeProvider; + } + + /** + * Returns the random UUID generator used by this factory + * + * @return RandomGeneratorInterface + */ + public function getRandomGenerator() + { + return $this->randomGenerator; + } + + /** + * Returns the time-based UUID generator used by this factory + * + * @return TimeGeneratorInterface + */ + public function getTimeGenerator() + { + return $this->timeGenerator; + } + + /** + * Sets the time-based UUID generator this factory will use to generate version 1 UUIDs + * + * @param TimeGeneratorInterface $generator + */ + public function setTimeGenerator(TimeGeneratorInterface $generator) + { + $this->timeGenerator = $generator; + } + + /** + * Returns the number converter used by this factory + * + * @return NumberConverterInterface + */ + public function getNumberConverter() + { + return $this->numberConverter; + } + + /** + * Sets the random UUID generator this factory will use to generate version 4 UUIDs + * + * @param RandomGeneratorInterface $generator + */ + public function setRandomGenerator(RandomGeneratorInterface $generator) + { + $this->randomGenerator = $generator; + } + + /** + * Sets the number converter this factory will use + * + * @param NumberConverterInterface $converter + */ + public function setNumberConverter(NumberConverterInterface $converter) + { + $this->numberConverter = $converter; + } + + /** + * Returns the UUID builder this factory uses when creating `Uuid` instances + * + * @return UuidBuilderInterface $builder + */ + public function getUuidBuilder() + { + return $this->uuidBuilder; + } + + /** + * Sets the UUID builder this factory will use when creating `Uuid` instances + * + * @param UuidBuilderInterface $builder + */ + public function setUuidBuilder(UuidBuilderInterface $builder) + { + $this->uuidBuilder = $builder; + } + + /** + * @inheritdoc + */ + public function fromBytes($bytes) + { + return $this->codec->decodeBytes($bytes); + } + + /** + * @inheritdoc + */ + public function fromString($uuid) + { + $uuid = strtolower($uuid); + return $this->codec->decode($uuid); + } + + /** + * @inheritdoc + */ + public function fromInteger($integer) + { + $hex = $this->numberConverter->toHex($integer); + $hex = str_pad($hex, 32, '0', STR_PAD_LEFT); + + return $this->fromString($hex); + } + + /** + * @inheritdoc + */ + public function uuid1($node = null, $clockSeq = null) + { + $bytes = $this->timeGenerator->generate($node, $clockSeq); + $hex = bin2hex($bytes); + + return $this->uuidFromHashedName($hex, 1); + } + + /** + * @inheritdoc + */ + public function uuid3($ns, $name) + { + return $this->uuidFromNsAndName($ns, $name, 3, 'md5'); + } + + /** + * @inheritdoc + */ + public function uuid4() + { + $bytes = $this->randomGenerator->generate(16); + + // When converting the bytes to hex, it turns into a 32-character + // hexadecimal string that looks a lot like an MD5 hash, so at this + // point, we can just pass it to uuidFromHashedName. + $hex = bin2hex($bytes); + + return $this->uuidFromHashedName($hex, 4); + } + + /** + * @inheritdoc + */ + public function uuid5($ns, $name) + { + return $this->uuidFromNsAndName($ns, $name, 5, 'sha1'); + } + + /** + * Returns a `Uuid` + * + * Uses the configured builder and codec and the provided array of hexadecimal + * value UUID fields to construct a `Uuid` object. + * + * @param array $fields An array of fields from which to construct a UUID; + * see {@see \Ramsey\Uuid\UuidInterface::getFieldsHex()} for array structure. + * @return UuidInterface + */ + public function uuid(array $fields) + { + return $this->uuidBuilder->build($this->codec, $fields); + } + + /** + * Returns a version 3 or 5 namespaced `Uuid` + * + * @param string|UuidInterface $ns The UUID namespace to use + * @param string $name The string to hash together with the namespace + * @param int $version The version of UUID to create (3 or 5) + * @param string $hashFunction The hash function to use when hashing together + * the namespace and name + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + protected function uuidFromNsAndName($ns, $name, $version, $hashFunction) + { + if (!($ns instanceof UuidInterface)) { + $ns = $this->codec->decode($ns); + } + + $hash = call_user_func($hashFunction, ($ns->getBytes() . $name)); + + return $this->uuidFromHashedName($hash, $version); + } + + /** + * Returns a `Uuid` created from `$hash` with the version field set to `$version` + * and the variant field set for RFC 4122 + * + * @param string $hash The hash to use when creating the UUID + * @param int $version The UUID version to set for this hash (1, 3, 4, or 5) + * @return UuidInterface + */ + protected function uuidFromHashedName($hash, $version) + { + $timeHi = BinaryUtils::applyVersion(substr($hash, 12, 4), $version); + $clockSeqHi = BinaryUtils::applyVariant(hexdec(substr($hash, 16, 2))); + + $fields = array( + 'time_low' => substr($hash, 0, 8), + 'time_mid' => substr($hash, 8, 4), + 'time_hi_and_version' => str_pad(dechex($timeHi), 4, '0', STR_PAD_LEFT), + 'clock_seq_hi_and_reserved' => str_pad(dechex($clockSeqHi), 2, '0', STR_PAD_LEFT), + 'clock_seq_low' => substr($hash, 18, 2), + 'node' => substr($hash, 20, 12), + ); + + return $this->uuid($fields); + } +} diff --git a/vendor/ramsey/uuid/src/UuidFactoryInterface.php b/vendor/ramsey/uuid/src/UuidFactoryInterface.php new file mode 100644 index 000000000..a228f5bc7 --- /dev/null +++ b/vendor/ramsey/uuid/src/UuidFactoryInterface.php @@ -0,0 +1,103 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid; + +/** + * UuidFactoryInterface defines common functionality all `UuidFactory` instances + * must implement + */ +interface UuidFactoryInterface +{ + /** + * Generate a version 1 UUID from a host ID, sequence number, and the current time. + * + * @param int|string|null $node A 48-bit number representing the hardware address + * This number may be represented as an integer or a hexadecimal string. + * @param int|null $clockSeq A 14-bit number used to help avoid duplicates that + * could arise when the clock is set backwards in time or if the node ID + * changes. + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and + * `Moontoast\Math\BigNumber` is not present + * @throws \InvalidArgumentException + * @throws \Exception if it was not possible to gather sufficient entropy + */ + public function uuid1($node = null, $clockSeq = null); + + /** + * Generate a version 3 UUID based on the MD5 hash of a namespace identifier + * (which is a UUID) and a name (which is a string). + * + * @param string $ns The UUID namespace in which to create the named UUID + * @param string $name The name to create a UUID for + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public function uuid3($ns, $name); + + /** + * Generate a version 4 (random) UUID. + * + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws \InvalidArgumentException + * @throws \Exception + */ + public function uuid4(); + + /** + * Generate a version 5 UUID based on the SHA-1 hash of a namespace + * identifier (which is a UUID) and a name (which is a string). + * + * @param string $ns The UUID namespace in which to create the named UUID + * @param string $name The name to create a UUID for + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public function uuid5($ns, $name); + + /** + * Creates a UUID from a byte string. + * + * @param string $bytes A 16-byte string representation of a UUID + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + * @throws \InvalidArgumentException if string has not 16 characters + */ + public function fromBytes($bytes); + + /** + * Creates a UUID from the string standard representation + * + * @param string $uuid A string representation of a UUID + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public function fromString($uuid); + + /** + * Creates a `Uuid` from an integer representation + * + * The integer representation may be a real integer, a string integer, or + * an integer representation supported by a configured number converter. + * + * @param mixed $integer The integer to use when creating a `Uuid` from an + * integer; may be of any type understood by the configured number converter + * @return UuidInterface + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + */ + public function fromInteger($integer); +} diff --git a/vendor/ramsey/uuid/src/UuidInterface.php b/vendor/ramsey/uuid/src/UuidInterface.php new file mode 100644 index 000000000..ea3a46fb2 --- /dev/null +++ b/vendor/ramsey/uuid/src/UuidInterface.php @@ -0,0 +1,270 @@ +<?php +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + * @link https://benramsey.com/projects/ramsey-uuid/ Documentation + * @link https://packagist.org/packages/ramsey/uuid Packagist + * @link https://github.com/ramsey/uuid GitHub + */ + +namespace Ramsey\Uuid; + +use Ramsey\Uuid\Converter\NumberConverterInterface; +use Ramsey\Uuid\Exception\UnsupportedOperationException; + +/** + * UuidInterface defines common functionality for all universally unique + * identifiers (UUIDs) + */ +interface UuidInterface extends \JsonSerializable, \Serializable +{ + /** + * Compares this UUID to the specified UUID. + * + * The first of two UUIDs is greater than the second if the most + * significant field in which the UUIDs differ is greater for the first + * UUID. + * + * * Q. What's the value of being able to sort UUIDs? + * * A. Use them as keys in a B-Tree or similar mapping. + * + * @param UuidInterface $other UUID to which this UUID is compared + * @return int -1, 0 or 1 as this UUID is less than, equal to, or greater than `$uuid` + */ + public function compareTo(UuidInterface $other); + + /** + * Compares this object to the specified object. + * + * The result is true if and only if the argument is not null, is a UUID + * object, has the same variant, and contains the same value, bit for bit, + * as this UUID. + * + * @param object $other + * @return bool True if `$other` is equal to this UUID + */ + public function equals($other); + + /** + * Returns the UUID as a 16-byte string (containing the six integer fields + * in big-endian byte order). + * + * @return string + */ + public function getBytes(); + + /** + * Returns the number converter to use for converting hex values to/from integers. + * + * @return NumberConverterInterface + */ + public function getNumberConverter(); + + /** + * Returns the hexadecimal value of the UUID. + * + * @return string + */ + public function getHex(); + + /** + * Returns an array of the fields of this UUID, with keys named according + * to the RFC 4122 names for the fields. + * + * * **time_low**: The low field of the timestamp, an unsigned 32-bit integer + * * **time_mid**: The middle field of the timestamp, an unsigned 16-bit integer + * * **time_hi_and_version**: The high field of the timestamp multiplexed with + * the version number, an unsigned 16-bit integer + * * **clock_seq_hi_and_reserved**: The high field of the clock sequence + * multiplexed with the variant, an unsigned 8-bit integer + * * **clock_seq_low**: The low field of the clock sequence, an unsigned + * 8-bit integer + * * **node**: The spatially unique node identifier, an unsigned 48-bit + * integer + * + * @return array The UUID fields represented as hexadecimal values + */ + public function getFieldsHex(); + + /** + * Returns the high field of the clock sequence multiplexed with the variant + * (bits 65-72 of the UUID). + * + * @return string Hexadecimal value of clock_seq_hi_and_reserved + */ + public function getClockSeqHiAndReservedHex(); + + /** + * Returns the low field of the clock sequence (bits 73-80 of the UUID). + * + * @return string Hexadecimal value of clock_seq_low + */ + public function getClockSeqLowHex(); + + /** + * Returns the clock sequence value associated with this UUID. + * + * @return string Hexadecimal value of clock sequence + */ + public function getClockSequenceHex(); + + /** + * Returns a PHP `DateTime` object representing the timestamp associated + * with this UUID. + * + * The timestamp value is only meaningful in a time-based UUID, which + * has version type 1. If this UUID is not a time-based UUID then + * this method throws `UnsupportedOperationException`. + * + * @return \DateTime A PHP DateTime representation of the date + * @throws UnsupportedOperationException If this UUID is not a version 1 UUID + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called in a 32-bit system and + * `Moontoast\Math\BigNumber` is not present + */ + public function getDateTime(); + + /** + * Returns the integer value of the UUID, converted to an appropriate number + * representation. + * + * @return mixed Converted representation of the unsigned 128-bit integer value + * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + */ + public function getInteger(); + + /** + * Returns the least significant 64 bits of this UUID's 128 bit value. + * + * @return string Hexadecimal value of least significant bits + */ + public function getLeastSignificantBitsHex(); + + /** + * Returns the most significant 64 bits of this UUID's 128 bit value. + * + * @return string Hexadecimal value of most significant bits + */ + public function getMostSignificantBitsHex(); + + /** + * Returns the node value associated with this UUID + * + * For UUID version 1, the node field consists of an IEEE 802 MAC + * address, usually the host address. For systems with multiple IEEE + * 802 addresses, any available one can be used. The lowest addressed + * octet (octet number 10) contains the global/local bit and the + * unicast/multicast bit, and is the first octet of the address + * transmitted on an 802.3 LAN. + * + * For systems with no IEEE address, a randomly or pseudo-randomly + * generated value may be used; see RFC 4122, Section 4.5. The + * multicast bit must be set in such addresses, in order that they + * will never conflict with addresses obtained from network cards. + * + * For UUID version 3 or 5, the node field is a 48-bit value constructed + * from a name as described in RFC 4122, Section 4.3. + * + * For UUID version 4, the node field is a randomly or pseudo-randomly + * generated 48-bit value as described in RFC 4122, Section 4.4. + * + * @return string Hexadecimal value of node + * @link http://tools.ietf.org/html/rfc4122#section-4.1.6 + */ + public function getNodeHex(); + + /** + * Returns the high field of the timestamp multiplexed with the version + * number (bits 49-64 of the UUID). + * + * @return string Hexadecimal value of time_hi_and_version + */ + public function getTimeHiAndVersionHex(); + + /** + * Returns the low field of the timestamp (the first 32 bits of the UUID). + * + * @return string Hexadecimal value of time_low + */ + public function getTimeLowHex(); + + /** + * Returns the middle field of the timestamp (bits 33-48 of the UUID). + * + * @return string Hexadecimal value of time_mid + */ + public function getTimeMidHex(); + + /** + * Returns the timestamp value associated with this UUID. + * + * The 60 bit timestamp value is constructed from the time_low, + * time_mid, and time_hi fields of this UUID. The resulting + * timestamp is measured in 100-nanosecond units since midnight, + * October 15, 1582 UTC. + * + * The timestamp value is only meaningful in a time-based UUID, which + * has version type 1. If this UUID is not a time-based UUID then + * this method throws UnsupportedOperationException. + * + * @return string Hexadecimal value of the timestamp + * @throws UnsupportedOperationException If this UUID is not a version 1 UUID + * @link http://tools.ietf.org/html/rfc4122#section-4.1.4 + */ + public function getTimestampHex(); + + /** + * Returns the string representation of the UUID as a URN. + * + * @return string + * @link http://en.wikipedia.org/wiki/Uniform_Resource_Name + */ + public function getUrn(); + + /** + * Returns the variant number associated with this UUID. + * + * The variant number describes the layout of the UUID. The variant + * number has the following meaning: + * + * * 0 - Reserved for NCS backward compatibility + * * 2 - The RFC 4122 variant (used by this class) + * * 6 - Reserved, Microsoft Corporation backward compatibility + * * 7 - Reserved for future definition + * + * @return int + * @link http://tools.ietf.org/html/rfc4122#section-4.1.1 + */ + public function getVariant(); + + /** + * Returns the version number associated with this UUID. + * + * The version number describes how this UUID was generated and has the + * following meaning: + * + * * 1 - Time-based UUID + * * 2 - DCE security UUID + * * 3 - Name-based UUID hashed with MD5 + * * 4 - Randomly generated UUID + * * 5 - Name-based UUID hashed with SHA-1 + * + * Returns null if this UUID is not an RFC 4122 variant, since version + * is only meaningful for this variant. + * + * @return int|null + * @link http://tools.ietf.org/html/rfc4122#section-4.1.3 + */ + public function getVersion(); + + /** + * Converts this UUID into a string representation. + * + * @return string + */ + public function toString(); +} diff --git a/vendor/simplepie/simplepie/.travis.yml b/vendor/simplepie/simplepie/.travis.yml index 83d90ad19..539710c0b 100644 --- a/vendor/simplepie/simplepie/.travis.yml +++ b/vendor/simplepie/simplepie/.travis.yml @@ -1,21 +1,17 @@ -sudo: false language: php -matrix: - fast_finish: true - include: - - php: 5.4 - - php: 5.5 - - php: 5.6 - - php: 7.0 - - php: 7.1 - - php: hhvm - sudo: true - dist: trusty - group: edge # until the next Travis CI update - allow_failures: - - php: hhvm - - php: 7.0 - - php: 7.1 + +php: + - 5.6 + - 7.0 + - 7.1 + - 7.2 + +before_script: + - travis_retry composer install --no-interaction + +script: + - composer test + branches: except: - one-dot-two diff --git a/vendor/simplepie/simplepie/composer.json b/vendor/simplepie/simplepie/composer.json index b5965b26f..dd1346150 100644 --- a/vendor/simplepie/simplepie/composer.json +++ b/vendor/simplepie/simplepie/composer.json @@ -24,17 +24,30 @@ } ], "require": { - "php": ">=5.3.0" + "php": ">=5.6.0", + "ext-pcre": "*", + "ext-xml": "*", + "ext-xmlreader": "*" }, "require-dev": { - "phpunit/phpunit": "~4 || ~5" + "phpunit/phpunit": "~5.4.3 || ~6.5" }, "suggest": { + "ext-curl": "", + "ext-iconv": "", + "ext-intl": "", + "ext-mbstring": "", "mf2/mf2": "Microformat module that allows for parsing HTML for microformats" }, "autoload": { "psr-0": { "SimplePie": "library" } - } + }, + "config": { + "bin-dir": "bin" + }, + "scripts": { + "test": "phpunit" + } } diff --git a/vendor/simplepie/simplepie/idn/idna_convert.class.php b/vendor/simplepie/simplepie/idn/idna_convert.class.php index eb9d5f516..ec137dc4c 100644 --- a/vendor/simplepie/simplepie/idn/idna_convert.class.php +++ b/vendor/simplepie/simplepie/idn/idna_convert.class.php @@ -306,20 +306,20 @@ class idna_convert if ($this->_strict_mode) { $this->_error('Neither email addresses nor URLs are allowed in strict mode.'); return false; - } else { - // Skip first char - if ($k) { - $encoded = ''; - $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin))); - if ($encoded) { - $output .= $encoded; - } else { - $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin))); - } - $output .= chr($decoded[$k]); + } + + // Skip first char + if ($k) { + $encoded = ''; + $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin))); + if ($encoded) { + $output .= $encoded; + } else { + $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin))); } - $last_begin = $k + 1; + $output .= chr($decoded[$k]); } + $last_begin = $k + 1; } } // Catch the rest of the string @@ -333,13 +333,13 @@ class idna_convert $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len)-$last_begin))); } return $output; - } else { - if ($output = $this->_encode($decoded)) { - return $output; - } else { - return $this->_ucs4_to_utf8($decoded); - } } + + if ($output = $this->_encode($decoded)) { + return $output; + } + + return $this->_ucs4_to_utf8($decoded); } /** diff --git a/vendor/simplepie/simplepie/library/SimplePie.php b/vendor/simplepie/simplepie/library/SimplePie.php index 34b6ca0c9..78e724525 100644 --- a/vendor/simplepie/simplepie/library/SimplePie.php +++ b/vendor/simplepie/simplepie/library/SimplePie.php @@ -33,7 +33,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * @package SimplePie - * @version 1.5.1 + * @version 1.5.2 * @copyright 2004-2017 Ryan Parman, Geoffrey Sneddon, Ryan McCue * @author Ryan Parman * @author Geoffrey Sneddon @@ -50,7 +50,7 @@ define('SIMPLEPIE_NAME', 'SimplePie'); /** * SimplePie Version */ -define('SIMPLEPIE_VERSION', '1.5.1'); +define('SIMPLEPIE_VERSION', '1.5.2'); /** * SimplePie Build @@ -648,7 +648,7 @@ class SimplePie * @access private */ public $enable_exceptions = false; - + /** * The SimplePie class contains feed level data and options * @@ -1387,7 +1387,7 @@ class SimplePie list($headers, $sniffed) = $fetched; } - + // Empty response check if(empty($this->raw_data)){ $this->error = "A feed could not be found at `$this->feed_url`. Empty body."; @@ -1471,7 +1471,7 @@ class SimplePie // Cache the file if caching is enabled if ($cache && !$cache->save($this)) { - trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING); + trigger_error("$this->cache_location is not writable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING); } return true; } @@ -1640,7 +1640,7 @@ class SimplePie if (!$this->force_feed) { // Check if the supplied URL is a feed, if it isn't, look for it. - $locate = $this->registry->create('Locator', array(&$file, $this->timeout, $this->useragent, $this->max_checked_feeds)); + $locate = $this->registry->create('Locator', array(&$file, $this->timeout, $this->useragent, $this->max_checked_feeds, $this->force_fsockopen, $this->curl_options)); if (!$locate->is_feed($file)) { @@ -1708,7 +1708,7 @@ class SimplePie $this->data = array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD); if (!$cache->save($this)) { - trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING); + trigger_error("$this->cache_location is not writable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING); } $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc')); } @@ -1904,7 +1904,7 @@ class SimplePie /** * Get the URL for the feed - * + * * When the 'permanent' mode is enabled, returns the original feed URL, * except in the case of an `HTTP 301 Moved Permanently` status response, * in which case the location of the first redirection is returned. @@ -2138,10 +2138,8 @@ class SimplePie { return $this->get_link(); } - else - { - return $this->subscribe_url(); - } + + return $this->subscribe_url(); } /** @@ -2211,10 +2209,8 @@ class SimplePie { return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); } - else - { - return null; - } + + return null; } /** @@ -2231,10 +2227,8 @@ class SimplePie { return $categories[$key]; } - else - { - return null; - } + + return null; } /** @@ -2296,10 +2290,8 @@ class SimplePie { return array_unique($categories); } - else - { - return null; - } + + return null; } /** @@ -2316,10 +2308,8 @@ class SimplePie { return $authors[$key]; } - else - { - return null; - } + + return null; } /** @@ -2394,10 +2384,8 @@ class SimplePie { return array_unique($authors); } - else - { - return null; - } + + return null; } /** @@ -2414,10 +2402,8 @@ class SimplePie { return $contributors[$key]; } - else - { - return null; - } + + return null; } /** @@ -2480,10 +2466,8 @@ class SimplePie { return array_unique($contributors); } - else - { - return null; - } + + return null; } /** @@ -2501,10 +2485,8 @@ class SimplePie { return $links[$key]; } - else - { - return null; - } + + return null; } /** @@ -2606,10 +2588,8 @@ class SimplePie { return $this->data['links'][$rel]; } - else - { - return null; - } + + return null; } public function get_all_discovered_feeds() @@ -2664,10 +2644,8 @@ class SimplePie { return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0])); } - else - { - return null; - } + + return null; } /** @@ -2700,10 +2678,8 @@ class SimplePie { return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); } - else - { - return null; - } + + return null; } /** @@ -2744,10 +2720,8 @@ class SimplePie { return $this->sanitize($this->data['headers']['content-language'], SIMPLEPIE_CONSTRUCT_TEXT); } - else - { - return null; - } + + return null; } /** @@ -2773,10 +2747,8 @@ class SimplePie { return (float) $match[1]; } - else - { - return null; - } + + return null; } /** @@ -2805,10 +2777,8 @@ class SimplePie { return (float) $match[2]; } - else - { - return null; - } + + return null; } /** @@ -2842,10 +2812,8 @@ class SimplePie { return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); } - else - { - return null; - } + + return null; } /** @@ -2885,10 +2853,8 @@ class SimplePie { return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0])); } - else - { - return null; - } + + return null; } @@ -2917,10 +2883,8 @@ class SimplePie { return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0])); } - else - { - return null; - } + + return null; } /** @@ -2943,10 +2907,8 @@ class SimplePie { return 88.0; } - else - { - return null; - } + + return null; } /** @@ -2969,10 +2931,8 @@ class SimplePie { return 31.0; } - else - { - return null; - } + + return null; } /** @@ -2992,10 +2952,8 @@ class SimplePie { return $qty; } - else - { - return ($qty > $max) ? $max : $qty; - } + + return ($qty > $max) ? $max : $qty; } /** @@ -3017,10 +2975,8 @@ class SimplePie { return $items[$key]; } - else - { - return null; - } + + return null; } /** @@ -3115,10 +3071,8 @@ class SimplePie { return array_slice($items, $start); } - else - { - return array_slice($items, $start, $end); - } + + return array_slice($items, $start, $end); } /** @@ -3241,16 +3195,12 @@ class SimplePie { return array_slice($items, $start); } - else - { - return array_slice($items, $start, $end); - } - } - else - { - trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING); - return array(); + + return array_slice($items, $start, $end); } + + trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING); + return array(); } /** diff --git a/vendor/simplepie/simplepie/library/SimplePie/Author.php b/vendor/simplepie/simplepie/library/SimplePie/Author.php index e6768ff29..14794cf27 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Author.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Author.php @@ -113,10 +113,8 @@ class SimplePie_Author { return $this->name; } - else - { - return null; - } + + return null; } /** @@ -130,10 +128,8 @@ class SimplePie_Author { return $this->link; } - else - { - return null; - } + + return null; } /** @@ -147,10 +143,7 @@ class SimplePie_Author { return $this->email; } - else - { - return null; - } + + return null; } } - diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php index 8686b6c67..061ed043a 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php @@ -96,7 +96,7 @@ class SimplePie_Cache_MySQL extends SimplePie_Cache_DB 'cache_purge_time' => 2592000 ), ); - + $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location)); // Path is prefixed with a "/" @@ -395,10 +395,8 @@ class SimplePie_Cache_MySQL extends SimplePie_Cache_DB { return $time; } - else - { - return false; - } + + return false; } /** @@ -416,14 +414,8 @@ class SimplePie_Cache_MySQL extends SimplePie_Cache_DB $query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id'); $query->bindValue(':time', time()); $query->bindValue(':id', $this->id); - if ($query->execute() && $query->rowCount() > 0) - { - return true; - } - else - { - return false; - } + + return $query->execute() && $query->rowCount() > 0; } /** @@ -442,13 +434,7 @@ class SimplePie_Cache_MySQL extends SimplePie_Cache_DB $query->bindValue(':id', $this->id); $query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id'); $query2->bindValue(':id', $this->id); - if ($query->execute() && $query2->execute()) - { - return true; - } - else - { - return false; - } + + return $query->execute() && $query2->execute(); } } diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/Redis.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/Redis.php index 04d72c79a..dbc88e829 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Cache/Redis.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/Redis.php @@ -65,6 +65,12 @@ class SimplePie_Cache_Redis implements SimplePie_Cache_Base { $parsed = SimplePie_Cache::parse_URL($location); $redis = new Redis(); $redis->connect($parsed['host'], $parsed['port']); + if (isset($parsed['pass'])) { + $redis->auth($parsed['pass']); + } + if (isset($parsed['path'])) { + $redis->select((int)substr($parsed['path'], 1)); + } $this->cache = $redis; if (!is_null($options) && is_array($options)) { diff --git a/vendor/simplepie/simplepie/library/SimplePie/Caption.php b/vendor/simplepie/simplepie/library/SimplePie/Caption.php index abf07de1b..854857603 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Caption.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Caption.php @@ -131,10 +131,8 @@ class SimplePie_Caption { return $this->endTime; } - else - { - return null; - } + + return null; } /** @@ -149,10 +147,8 @@ class SimplePie_Caption { return $this->lang; } - else - { - return null; - } + + return null; } /** @@ -166,10 +162,8 @@ class SimplePie_Caption { return $this->startTime; } - else - { - return null; - } + + return null; } /** @@ -183,10 +177,8 @@ class SimplePie_Caption { return $this->text; } - else - { - return null; - } + + return null; } /** @@ -200,10 +192,7 @@ class SimplePie_Caption { return $this->type; } - else - { - return null; - } + + return null; } } - diff --git a/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php b/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php index ff35de614..b86dfa33c 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php @@ -120,24 +120,18 @@ class SimplePie_Content_Type_Sniffer { return $return; } - else - { - return $official; - } + + return $official; } elseif ($official === 'text/html') { return $this->feed_or_html(); } - else - { - return $official; - } - } - else - { - return $this->unknown(); + + return $official; } + + return $this->unknown(); } /** @@ -158,10 +152,8 @@ class SimplePie_Content_Type_Sniffer { return 'application/octect-stream'; } - else - { - return 'text/plain'; - } + + return 'text/plain'; } /** @@ -207,10 +199,8 @@ class SimplePie_Content_Type_Sniffer { return 'image/vnd.microsoft.icon'; } - else - { - return $this->text_or_binary(); - } + + return $this->text_or_binary(); } /** @@ -241,10 +231,8 @@ class SimplePie_Content_Type_Sniffer { return 'image/vnd.microsoft.icon'; } - else - { - return false; - } + + return false; } /** @@ -328,4 +316,3 @@ class SimplePie_Content_Type_Sniffer return 'text/html'; } } - diff --git a/vendor/simplepie/simplepie/library/SimplePie/Copyright.php b/vendor/simplepie/simplepie/library/SimplePie/Copyright.php index 3f3d07d3b..a57f323e6 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Copyright.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Copyright.php @@ -103,10 +103,8 @@ class SimplePie_Copyright { return $this->url; } - else - { - return null; - } + + return null; } /** @@ -120,10 +118,7 @@ class SimplePie_Copyright { return $this->label; } - else - { - return null; - } + + return null; } } - diff --git a/vendor/simplepie/simplepie/library/SimplePie/Credit.php b/vendor/simplepie/simplepie/library/SimplePie/Credit.php index 9bad9ef34..064a1b864 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Credit.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Credit.php @@ -112,10 +112,8 @@ class SimplePie_Credit { return $this->role; } - else - { - return null; - } + + return null; } /** @@ -129,10 +127,8 @@ class SimplePie_Credit { return $this->scheme; } - else - { - return null; - } + + return null; } /** @@ -146,10 +142,7 @@ class SimplePie_Credit { return $this->name; } - else - { - return null; - } + + return null; } } - diff --git a/vendor/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php b/vendor/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php index de3f2cb53..773481a8c 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php @@ -117,10 +117,8 @@ class SimplePie_Decode_HTML_Entities $this->consumed .= $this->data[$this->position]; return $this->data[$this->position++]; } - else - { - return false; - } + + return false; } /** @@ -139,10 +137,8 @@ class SimplePie_Decode_HTML_Entities $this->position += $len; return $data; } - else - { - return false; - } + + return false; } /** @@ -612,4 +608,3 @@ class SimplePie_Decode_HTML_Entities } } } - diff --git a/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php b/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php index 15060e193..ddbbc3c92 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php @@ -282,10 +282,8 @@ class SimplePie_Enclosure { return $this->bitrate; } - else - { - return null; - } + + return null; } /** @@ -301,10 +299,8 @@ class SimplePie_Enclosure { return $captions[$key]; } - else - { - return null; - } + + return null; } /** @@ -318,10 +314,8 @@ class SimplePie_Enclosure { return $this->captions; } - else - { - return null; - } + + return null; } /** @@ -337,10 +331,8 @@ class SimplePie_Enclosure { return $categories[$key]; } - else - { - return null; - } + + return null; } /** @@ -354,10 +346,8 @@ class SimplePie_Enclosure { return $this->categories; } - else - { - return null; - } + + return null; } /** @@ -371,10 +361,8 @@ class SimplePie_Enclosure { return $this->channels; } - else - { - return null; - } + + return null; } /** @@ -388,10 +376,8 @@ class SimplePie_Enclosure { return $this->copyright; } - else - { - return null; - } + + return null; } /** @@ -407,10 +393,8 @@ class SimplePie_Enclosure { return $credits[$key]; } - else - { - return null; - } + + return null; } /** @@ -424,10 +408,8 @@ class SimplePie_Enclosure { return $this->credits; } - else - { - return null; - } + + return null; } /** @@ -441,10 +423,8 @@ class SimplePie_Enclosure { return $this->description; } - else - { - return null; - } + + return null; } /** @@ -462,15 +442,11 @@ class SimplePie_Enclosure $time = SimplePie_Misc::time_hms($this->duration); return $time; } - else - { - return $this->duration; - } - } - else - { - return null; + + return $this->duration; } + + return null; } /** @@ -484,10 +460,8 @@ class SimplePie_Enclosure { return $this->expression; } - else - { - return 'full'; - } + + return 'full'; } /** @@ -519,10 +493,8 @@ class SimplePie_Enclosure { return $this->framerate; } - else - { - return null; - } + + return null; } /** @@ -549,10 +521,8 @@ class SimplePie_Enclosure { return $hashes[$key]; } - else - { - return null; - } + + return null; } /** @@ -566,10 +536,8 @@ class SimplePie_Enclosure { return $this->hashes; } - else - { - return null; - } + + return null; } /** @@ -583,10 +551,8 @@ class SimplePie_Enclosure { return $this->height; } - else - { - return null; - } + + return null; } /** @@ -601,10 +567,8 @@ class SimplePie_Enclosure { return $this->lang; } - else - { - return null; - } + + return null; } /** @@ -620,10 +584,8 @@ class SimplePie_Enclosure { return $keywords[$key]; } - else - { - return null; - } + + return null; } /** @@ -637,10 +599,8 @@ class SimplePie_Enclosure { return $this->keywords; } - else - { - return null; - } + + return null; } /** @@ -654,10 +614,8 @@ class SimplePie_Enclosure { return $this->length; } - else - { - return null; - } + + return null; } /** @@ -671,10 +629,8 @@ class SimplePie_Enclosure { return urldecode($this->link); } - else - { - return null; - } + + return null; } /** @@ -689,10 +645,8 @@ class SimplePie_Enclosure { return $this->medium; } - else - { - return null; - } + + return null; } /** @@ -707,10 +661,8 @@ class SimplePie_Enclosure { return $this->player; } - else - { - return null; - } + + return null; } /** @@ -726,10 +678,8 @@ class SimplePie_Enclosure { return $ratings[$key]; } - else - { - return null; - } + + return null; } /** @@ -743,10 +693,8 @@ class SimplePie_Enclosure { return $this->ratings; } - else - { - return null; - } + + return null; } /** @@ -762,10 +710,8 @@ class SimplePie_Enclosure { return $restrictions[$key]; } - else - { - return null; - } + + return null; } /** @@ -779,10 +725,8 @@ class SimplePie_Enclosure { return $this->restrictions; } - else - { - return null; - } + + return null; } /** @@ -796,10 +740,8 @@ class SimplePie_Enclosure { return $this->samplingrate; } - else - { - return null; - } + + return null; } /** @@ -814,10 +756,8 @@ class SimplePie_Enclosure { return round($length/1048576, 2); } - else - { - return null; - } + + return null; } /** @@ -833,10 +773,8 @@ class SimplePie_Enclosure { return $thumbnails[$key]; } - else - { - return null; - } + + return null; } /** @@ -850,10 +788,8 @@ class SimplePie_Enclosure { return $this->thumbnails; } - else - { - return null; - } + + return null; } /** @@ -867,10 +803,8 @@ class SimplePie_Enclosure { return $this->title; } - else - { - return null; - } + + return null; } /** @@ -885,10 +819,8 @@ class SimplePie_Enclosure { return $this->type; } - else - { - return null; - } + + return null; } /** @@ -902,10 +834,8 @@ class SimplePie_Enclosure { return $this->width; } - else - { - return null; - } + + return null; } /** @@ -1365,15 +1295,10 @@ class SimplePie_Enclosure { return 'mp3'; } - else - { - return null; - } - } - else - { - return $type; + + return null; } + + return $type; } } - diff --git a/vendor/simplepie/simplepie/library/SimplePie/File.php b/vendor/simplepie/simplepie/library/SimplePie/File.php index 2bb0a3b44..c73e0fbc9 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/File.php +++ b/vendor/simplepie/simplepie/library/SimplePie/File.php @@ -71,7 +71,7 @@ class SimplePie_File { $idn = new idna_convert(); $parsed = SimplePie_Misc::parse_url($url); - $url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']); + $url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], NULL); } $this->url = $url; $this->permanent_url = $url; diff --git a/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php b/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php index e982c206f..7d6188dd1 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php +++ b/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php @@ -155,15 +155,13 @@ class SimplePie_HTTP_Parser { return true; } - else - { - $this->http_version = ''; - $this->status_code = ''; - $this->reason = ''; - $this->headers = array(); - $this->body = ''; - return false; - } + + $this->http_version = ''; + $this->status_code = ''; + $this->reason = ''; + $this->headers = array(); + $this->body = ''; + return false; } /** diff --git a/vendor/simplepie/simplepie/library/SimplePie/IRI.php b/vendor/simplepie/simplepie/library/SimplePie/IRI.php index 2b3fbaf07..ffba232b1 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/IRI.php +++ b/vendor/simplepie/simplepie/library/SimplePie/IRI.php @@ -211,10 +211,8 @@ class SimplePie_IRI { return $this->normalization[$this->scheme][$name]; } - else - { - return $return; - } + + return $return; } /** @@ -225,14 +223,7 @@ class SimplePie_IRI */ public function __isset($name) { - if (method_exists($this, 'get_' . $name) || isset($this->$name)) - { - return true; - } - else - { - return false; - } + return method_exists($this, 'get_' . $name) || isset($this->$name); } /** @@ -356,10 +347,8 @@ class SimplePie_IRI $target->scheme_normalization(); return $target; } - else - { - return false; - } + + return false; } } @@ -396,11 +385,9 @@ class SimplePie_IRI } return $match; } - else - { - // This can occur when a paragraph is accidentally parsed as a URI - return false; - } + + // This can occur when a paragraph is accidentally parsed as a URI + return false; } /** @@ -804,7 +791,7 @@ class SimplePie_IRI public function set_iri($iri, $clear_cache = false) { static $cache; - if ($clear_cache) + if ($clear_cache) { $cache = null; return; @@ -830,30 +817,28 @@ class SimplePie_IRI $return) = $cache[$iri]; return $return; } - else - { - $parsed = $this->parse_iri((string) $iri); - if (!$parsed) - { - return false; - } - $return = $this->set_scheme($parsed['scheme']) - && $this->set_authority($parsed['authority']) - && $this->set_path($parsed['path']) - && $this->set_query($parsed['query']) - && $this->set_fragment($parsed['fragment']); - - $cache[$iri] = array($this->scheme, - $this->iuserinfo, - $this->ihost, - $this->port, - $this->ipath, - $this->iquery, - $this->ifragment, - $return); - return $return; + $parsed = $this->parse_iri((string) $iri); + if (!$parsed) + { + return false; } + + $return = $this->set_scheme($parsed['scheme']) + && $this->set_authority($parsed['authority']) + && $this->set_path($parsed['path']) + && $this->set_query($parsed['query']) + && $this->set_fragment($parsed['fragment']); + + $cache[$iri] = array($this->scheme, + $this->iuserinfo, + $this->ihost, + $this->port, + $this->ipath, + $this->iquery, + $this->ifragment, + $return); + return $return; } /** @@ -915,42 +900,40 @@ class SimplePie_IRI return $return; } + + $remaining = $authority; + if (($iuserinfo_end = strrpos($remaining, '@')) !== false) + { + $iuserinfo = substr($remaining, 0, $iuserinfo_end); + $remaining = substr($remaining, $iuserinfo_end + 1); + } else { - $remaining = $authority; - if (($iuserinfo_end = strrpos($remaining, '@')) !== false) - { - $iuserinfo = substr($remaining, 0, $iuserinfo_end); - $remaining = substr($remaining, $iuserinfo_end + 1); - } - else - { - $iuserinfo = null; - } - if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) - { - if (($port = substr($remaining, $port_start + 1)) === false) - { - $port = null; - } - $remaining = substr($remaining, 0, $port_start); - } - else + $iuserinfo = null; + } + if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) + { + if (($port = substr($remaining, $port_start + 1)) === false) { $port = null; } + $remaining = substr($remaining, 0, $port_start); + } + else + { + $port = null; + } - $return = $this->set_userinfo($iuserinfo) && - $this->set_host($remaining) && - $this->set_port($port); + $return = $this->set_userinfo($iuserinfo) && + $this->set_host($remaining) && + $this->set_port($port); - $cache[$authority] = array($this->iuserinfo, - $this->ihost, - $this->port, - $return); + $cache[$authority] = array($this->iuserinfo, + $this->ihost, + $this->port, + $return); - return $return; - } + return $return; } /** @@ -1050,11 +1033,9 @@ class SimplePie_IRI $this->scheme_normalization(); return true; } - else - { - $this->port = null; - return false; - } + + $this->port = null; + return false; } /** @@ -1066,7 +1047,7 @@ class SimplePie_IRI public function set_path($ipath, $clear_cache = false) { static $cache; - if ($clear_cache) + if ($clear_cache) { $cache = null; return; @@ -1185,7 +1166,7 @@ class SimplePie_IRI { $iri .= $this->ipath; } - elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '') + elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '') { $iri .= $this->normalization[$this->scheme]['ipath']; } @@ -1229,16 +1210,14 @@ class SimplePie_IRI { $iauthority .= $this->ihost; } - if ($this->port !== null) + if ($this->port !== null && $this->port !== 0) { $iauthority .= ':' . $this->port; } return $iauthority; } - else - { - return null; - } + + return null; } /** @@ -1251,7 +1230,7 @@ class SimplePie_IRI $iauthority = $this->get_iauthority(); if (is_string($iauthority)) return $this->to_uri($iauthority); - else - return $iauthority; + + return $iauthority; } } diff --git a/vendor/simplepie/simplepie/library/SimplePie/Item.php b/vendor/simplepie/simplepie/library/SimplePie/Item.php index 2083e7a92..9b9c1f5db 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Item.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Item.php @@ -147,10 +147,8 @@ class SimplePie_Item { return $this->data['child'][$namespace][$tag]; } - else - { - return null; - } + + return null; } /** @@ -366,10 +364,8 @@ class SimplePie_Item { return $this->get_content(true); } - else - { - return null; - } + + return null; } /** @@ -407,18 +403,16 @@ class SimplePie_Item { return $this->get_description(true); } - else - { - return null; - } + + return null; } - + /** * Get the media:thumbnail of the item * * Uses `<media:thumbnail>` * - * + * * @return array|null */ public function get_thumbnail() @@ -435,7 +429,7 @@ class SimplePie_Item } } return $this->data['thumbnail']; - } + } /** * Get a category for the item @@ -451,10 +445,8 @@ class SimplePie_Item { return $categories[$key]; } - else - { - return null; - } + + return null; } /** @@ -519,10 +511,8 @@ class SimplePie_Item { return array_unique($categories); } - else - { - return null; - } + + return null; } /** @@ -539,10 +529,8 @@ class SimplePie_Item { return $authors[$key]; } - else - { - return null; - } + + return null; } /** @@ -559,10 +547,8 @@ class SimplePie_Item { return $contributors[$key]; } - else - { - return null; - } + + return null; } /** @@ -571,7 +557,7 @@ class SimplePie_Item * Uses `<atom:contributor>` * * @since 1.1 - * @return array|null List of {@see SimplePie_Author} objects + * @return SimplePie_Author[]|null List of {@see SimplePie_Author} objects */ public function get_contributors() { @@ -625,10 +611,8 @@ class SimplePie_Item { return array_unique($contributors); } - else - { - return null; - } + + return null; } /** @@ -637,7 +621,7 @@ class SimplePie_Item * Uses `<atom:author>`, `<author>`, `<dc:creator>` or `<itunes:author>` * * @since Beta 2 - * @return array|null List of {@see SimplePie_Author} objects + * @return SimplePie_Author[]|null List of {@see SimplePie_Author} objects */ public function get_authors() { @@ -715,10 +699,8 @@ class SimplePie_Item { return $authors; } - else - { - return null; - } + + return null; } /** @@ -743,10 +725,8 @@ class SimplePie_Item { return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); } - else - { - return null; - } + + return null; } /** @@ -825,10 +805,8 @@ class SimplePie_Item return date($date_format, $this->data['date']['parsed']); } } - else - { - return null; - } + + return null; } /** @@ -876,10 +854,8 @@ class SimplePie_Item return date($date_format, $this->data['updated']['parsed']); } } - else - { - return null; - } + + return null; } /** @@ -905,10 +881,8 @@ class SimplePie_Item { return strftime($date_format, $date); } - else - { - return null; - } + + return null; } /** @@ -969,10 +943,8 @@ class SimplePie_Item { return $enclosure->get_link(); } - else - { - return null; - } + + return null; } /** @@ -990,10 +962,8 @@ class SimplePie_Item { return $links[$key]; } - else - { - return null; - } + + return null; } /** @@ -1073,10 +1043,8 @@ class SimplePie_Item { return $this->data['links'][$rel]; } - else - { - return null; - } + + return null; } /** @@ -1096,10 +1064,8 @@ class SimplePie_Item { return $enclosures[$key]; } - else - { - return null; - } + + return null; } /** @@ -2922,10 +2888,8 @@ class SimplePie_Item { return $this->data['enclosures']; } - else - { - return null; - } + + return null; } /** @@ -2950,10 +2914,8 @@ class SimplePie_Item { return (float) $match[1]; } - else - { - return null; - } + + return null; } /** @@ -2982,10 +2944,8 @@ class SimplePie_Item { return (float) $match[2]; } - else - { - return null; - } + + return null; } /** @@ -3000,10 +2960,7 @@ class SimplePie_Item { return $this->registry->create('Source', array($this, $return[0])); } - else - { - return null; - } + + return null; } } - diff --git a/vendor/simplepie/simplepie/library/SimplePie/Locator.php b/vendor/simplepie/simplepie/library/SimplePie/Locator.php index bc314c2cd..3876a2da6 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Locator.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Locator.php @@ -62,14 +62,18 @@ class SimplePie_Locator var $base_location = 0; var $checked_feeds = 0; var $max_checked_feeds = 10; + var $force_fsockopen = false; + var $curl_options = array(); protected $registry; - public function __construct(SimplePie_File $file, $timeout = 10, $useragent = null, $max_checked_feeds = 10) + public function __construct(SimplePie_File $file, $timeout = 10, $useragent = null, $max_checked_feeds = 10, $force_fsockopen = false, $curl_options = array()) { $this->file = $file; $this->useragent = $useragent; $this->timeout = $timeout; $this->max_checked_feeds = $max_checked_feeds; + $this->force_fsockopen = $force_fsockopen; + $this->curl_options = $curl_options; if (class_exists('DOMDocument')) { @@ -154,14 +158,8 @@ class SimplePie_Locator { $mime_types[] = 'text/html'; } - if (in_array($sniffed, $mime_types)) - { - return true; - } - else - { - return false; - } + + return in_array($sniffed, $mime_types); } elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL) { @@ -210,10 +208,8 @@ class SimplePie_Locator { return array_values($feeds); } - else - { - return null; - } + + return null; } protected function search_elements_by_tag($name, &$done, $feeds) @@ -254,7 +250,7 @@ class SimplePie_Locator $headers = array( 'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1', ); - $feed = $this->registry->create('File', array($href, $this->timeout, 5, $headers, $this->useragent)); + $feed = $this->registry->create('File', array($href, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options)); if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed, true)) { $feeds[$href] = $feed; @@ -384,7 +380,7 @@ class SimplePie_Locator $headers = array( 'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1', ); - $feed = $this->registry->create('File', array($value, $this->timeout, 5, $headers, $this->useragent)); + $feed = $this->registry->create('File', array($value, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options)); if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed)) { return array($feed); @@ -412,7 +408,7 @@ class SimplePie_Locator $headers = array( 'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1', ); - $feed = $this->registry->create('File', array($value, $this->timeout, 5, null, $this->useragent)); + $feed = $this->registry->create('File', array($value, $this->timeout, 5, null, $this->useragent, $this->force_fsockopen, $this->curl_options)); if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed)) { return array($feed); @@ -426,4 +422,3 @@ class SimplePie_Locator return null; } } - diff --git a/vendor/simplepie/simplepie/library/SimplePie/Misc.php b/vendor/simplepie/simplepie/library/SimplePie/Misc.php index 2e3107eb4..2a2ecc575 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Misc.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Misc.php @@ -217,10 +217,8 @@ class SimplePie_Misc { return substr_replace($url, 'itpc', 0, 4); } - else - { - return $url; - } + + return $url; } public static function array_merge_recursive($array1, $array2) @@ -234,9 +232,9 @@ class SimplePie_Misc else { $array1[$key] = $value; - } + } } - + return $array1; } @@ -276,10 +274,8 @@ class SimplePie_Misc { return chr($integer); } - else - { - return strtoupper($match[0]); - } + + return strtoupper($match[0]); } /** @@ -343,11 +339,9 @@ class SimplePie_Misc { return $return; } + // If we can't do anything, just fail - else - { - return false; - } + return false; } protected static function change_encoding_mbstring($data, $input, $output) @@ -1858,10 +1852,8 @@ class SimplePie_Misc { return trim($mime); } - else - { - return trim(substr($mime, 0, $pos)); - } + + return trim(substr($mime, 0, $pos)); } public static function atom_03_construct_type($attribs) @@ -1894,10 +1886,8 @@ class SimplePie_Misc return SIMPLEPIE_CONSTRUCT_NONE | $mode; } } - else - { - return SIMPLEPIE_CONSTRUCT_TEXT | $mode; - } + + return SIMPLEPIE_CONSTRUCT_TEXT | $mode; } public static function atom_10_construct_type($attribs) @@ -1947,10 +1937,8 @@ class SimplePie_Misc return SIMPLEPIE_CONSTRUCT_BASE64; } } - else - { - return SIMPLEPIE_CONSTRUCT_TEXT; - } + + return SIMPLEPIE_CONSTRUCT_TEXT; } public static function is_isegment_nz_nc($string) @@ -2007,11 +1995,9 @@ class SimplePie_Misc { return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f)); } - else - { - // U+FFFD REPLACEMENT CHARACTER - return "\xEF\xBF\xBD"; - } + + // U+FFFD REPLACEMENT CHARACTER + return "\xEF\xBF\xBD"; } /** @@ -2215,10 +2201,8 @@ function embed_wmedia(width, height, link) { { return filemtime(dirname(__FILE__) . '/Core.php'); } - else - { - return filemtime(__FILE__); - } + + return filemtime(__FILE__); } /** @@ -2276,4 +2260,3 @@ function embed_wmedia(width, height, link) { // No-op } } - diff --git a/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php b/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php index 47658aff2..a054e8be5 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php @@ -173,10 +173,8 @@ class SimplePie_Net_IPv6 { return implode(':', $ip_parts); } - else - { - return $ip_parts[0]; - } + + return $ip_parts[0]; } /** @@ -200,10 +198,8 @@ class SimplePie_Net_IPv6 $ipv4_part = substr($ip, $pos + 1); return array($ipv6_part, $ipv4_part); } - else - { - return array($ip, ''); - } + + return array($ip, ''); } /** @@ -253,10 +249,8 @@ class SimplePie_Net_IPv6 } return true; } - else - { - return false; - } + + return false; } /** diff --git a/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php b/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php index 1f2156655..b29274c64 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php @@ -694,10 +694,8 @@ class SimplePie_Parse_Date return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone; } - else - { - return false; - } + + return false; } /** @@ -848,10 +846,8 @@ class SimplePie_Parse_Date return gmmktime($match[5], $match[6], $second, $month, $match[2], $match[4]) - $timezone; } - else - { - return false; - } + + return false; } /** @@ -913,10 +909,8 @@ class SimplePie_Parse_Date return gmmktime($match[5], $match[6], $match[7], $month, $match[2], $match[4]) - $timezone; } - else - { - return false; - } + + return false; } /** @@ -955,10 +949,8 @@ class SimplePie_Parse_Date $month = $this->month[strtolower($match[2])]; return gmmktime($match[4], $match[5], $match[6], $month, $match[3], $match[7]); } - else - { - return false; - } + + return false; } /** @@ -974,10 +966,7 @@ class SimplePie_Parse_Date { return false; } - else - { - return $strtotime; - } + + return $strtotime; } } - diff --git a/vendor/simplepie/simplepie/library/SimplePie/Parser.php b/vendor/simplepie/simplepie/library/SimplePie/Parser.php index df1234023..3cef2287d 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Parser.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Parser.php @@ -176,76 +176,72 @@ class SimplePie_Parser xml_parser_free($xml); return $return; } - else + + libxml_clear_errors(); + $xml = new XMLReader(); + $xml->xml($data); + while (@$xml->read()) { - libxml_clear_errors(); - $xml = new XMLReader(); - $xml->xml($data); - while (@$xml->read()) + switch ($xml->nodeType) { - switch ($xml->nodeType) - { - case constant('XMLReader::END_ELEMENT'): + case constant('XMLReader::END_ELEMENT'): + if ($xml->namespaceURI !== '') + { + $tagName = $xml->namespaceURI . $this->separator . $xml->localName; + } + else + { + $tagName = $xml->localName; + } + $this->tag_close(null, $tagName); + break; + case constant('XMLReader::ELEMENT'): + $empty = $xml->isEmptyElement; + if ($xml->namespaceURI !== '') + { + $tagName = $xml->namespaceURI . $this->separator . $xml->localName; + } + else + { + $tagName = $xml->localName; + } + $attributes = array(); + while ($xml->moveToNextAttribute()) + { if ($xml->namespaceURI !== '') { - $tagName = $xml->namespaceURI . $this->separator . $xml->localName; + $attrName = $xml->namespaceURI . $this->separator . $xml->localName; } else { - $tagName = $xml->localName; + $attrName = $xml->localName; } + $attributes[$attrName] = $xml->value; + } + $this->tag_open(null, $tagName, $attributes); + if ($empty) + { $this->tag_close(null, $tagName); - break; - case constant('XMLReader::ELEMENT'): - $empty = $xml->isEmptyElement; - if ($xml->namespaceURI !== '') - { - $tagName = $xml->namespaceURI . $this->separator . $xml->localName; - } - else - { - $tagName = $xml->localName; - } - $attributes = array(); - while ($xml->moveToNextAttribute()) - { - if ($xml->namespaceURI !== '') - { - $attrName = $xml->namespaceURI . $this->separator . $xml->localName; - } - else - { - $attrName = $xml->localName; - } - $attributes[$attrName] = $xml->value; - } - $this->tag_open(null, $tagName, $attributes); - if ($empty) - { - $this->tag_close(null, $tagName); - } - break; - case constant('XMLReader::TEXT'): + } + break; + case constant('XMLReader::TEXT'): - case constant('XMLReader::CDATA'): - $this->cdata(null, $xml->value); - break; - } - } - if ($error = libxml_get_last_error()) - { - $this->error_code = $error->code; - $this->error_string = $error->message; - $this->current_line = $error->line; - $this->current_column = $error->column; - return false; - } - else - { - return true; + case constant('XMLReader::CDATA'): + $this->cdata(null, $xml->value); + break; } } + if ($error = libxml_get_last_error()) + { + $this->error_code = $error->code; + $this->error_string = $error->message; + $this->current_line = $error->line; + $this->current_column = $error->column; + return false; + } + + return true; } public function get_error_code() @@ -662,4 +658,4 @@ class SimplePie_Parser // html is allowed, but the xml specification says they must be declared. return '<!DOCTYPE html [ <!ENTITY nbsp " "> <!ENTITY iexcl "¡"> <!ENTITY cent "¢"> <!ENTITY pound "£"> <!ENTITY curren "¤"> <!ENTITY yen "¥"> <!ENTITY brvbar "¦"> <!ENTITY sect "§"> <!ENTITY uml "¨"> <!ENTITY copy "©"> <!ENTITY ordf "ª"> <!ENTITY laquo "«"> <!ENTITY not "¬"> <!ENTITY shy "­"> <!ENTITY reg "®"> <!ENTITY macr "¯"> <!ENTITY deg "°"> <!ENTITY plusmn "±"> <!ENTITY sup2 "²"> <!ENTITY sup3 "³"> <!ENTITY acute "´"> <!ENTITY micro "µ"> <!ENTITY para "¶"> <!ENTITY middot "·"> <!ENTITY cedil "¸"> <!ENTITY sup1 "¹"> <!ENTITY ordm "º"> <!ENTITY raquo "»"> <!ENTITY frac14 "¼"> <!ENTITY frac12 "½"> <!ENTITY frac34 "¾"> <!ENTITY iquest "¿"> <!ENTITY Agrave "À"> <!ENTITY Aacute "Á"> <!ENTITY Acirc "Â"> <!ENTITY Atilde "Ã"> <!ENTITY Auml "Ä"> <!ENTITY Aring "Å"> <!ENTITY AElig "Æ"> <!ENTITY Ccedil "Ç"> <!ENTITY Egrave "È"> <!ENTITY Eacute "É"> <!ENTITY Ecirc "Ê"> <!ENTITY Euml "Ë"> <!ENTITY Igrave "Ì"> <!ENTITY Iacute "Í"> <!ENTITY Icirc "Î"> <!ENTITY Iuml "Ï"> <!ENTITY ETH "Ð"> <!ENTITY Ntilde "Ñ"> <!ENTITY Ograve "Ò"> <!ENTITY Oacute "Ó"> <!ENTITY Ocirc "Ô"> <!ENTITY Otilde "Õ"> <!ENTITY Ouml "Ö"> <!ENTITY times "×"> <!ENTITY Oslash "Ø"> <!ENTITY Ugrave "Ù"> <!ENTITY Uacute "Ú"> <!ENTITY Ucirc "Û"> <!ENTITY Uuml "Ü"> <!ENTITY Yacute "Ý"> <!ENTITY THORN "Þ"> <!ENTITY szlig "ß"> <!ENTITY agrave "à"> <!ENTITY aacute "á"> <!ENTITY acirc "â"> <!ENTITY atilde "ã"> <!ENTITY auml "ä"> <!ENTITY aring "å"> <!ENTITY aelig "æ"> <!ENTITY ccedil "ç"> <!ENTITY egrave "è"> <!ENTITY eacute "é"> <!ENTITY ecirc "ê"> <!ENTITY euml "ë"> <!ENTITY igrave "ì"> <!ENTITY iacute "í"> <!ENTITY icirc "î"> <!ENTITY iuml "ï"> <!ENTITY eth "ð"> <!ENTITY ntilde "ñ"> <!ENTITY ograve "ò"> <!ENTITY oacute "ó"> <!ENTITY ocirc "ô"> <!ENTITY otilde "õ"> <!ENTITY ouml "ö"> <!ENTITY divide "÷"> <!ENTITY oslash "ø"> <!ENTITY ugrave "ù"> <!ENTITY uacute "ú"> <!ENTITY ucirc "û"> <!ENTITY uuml "ü"> <!ENTITY yacute "ý"> <!ENTITY thorn "þ"> <!ENTITY yuml "ÿ"> <!ENTITY OElig "Œ"> <!ENTITY oelig "œ"> <!ENTITY Scaron "Š"> <!ENTITY scaron "š"> <!ENTITY Yuml "Ÿ"> <!ENTITY fnof "ƒ"> <!ENTITY circ "ˆ"> <!ENTITY tilde "˜"> <!ENTITY Alpha "Α"> <!ENTITY Beta "Β"> <!ENTITY Gamma "Γ"> <!ENTITY Epsilon "Ε"> <!ENTITY Zeta "Ζ"> <!ENTITY Eta "Η"> <!ENTITY Theta "Θ"> <!ENTITY Iota "Ι"> <!ENTITY Kappa "Κ"> <!ENTITY Lambda "Λ"> <!ENTITY Mu "Μ"> <!ENTITY Nu "Ν"> <!ENTITY Xi "Ξ"> <!ENTITY Omicron "Ο"> <!ENTITY Pi "Π"> <!ENTITY Rho "Ρ"> <!ENTITY Sigma "Σ"> <!ENTITY Tau "Τ"> <!ENTITY Upsilon "Υ"> <!ENTITY Phi "Φ"> <!ENTITY Chi "Χ"> <!ENTITY Psi "Ψ"> <!ENTITY Omega "Ω"> <!ENTITY alpha "α"> <!ENTITY beta "β"> <!ENTITY gamma "γ"> <!ENTITY delta "δ"> <!ENTITY epsilon "ε"> <!ENTITY zeta "ζ"> <!ENTITY eta "η"> <!ENTITY theta "θ"> <!ENTITY iota "ι"> <!ENTITY kappa "κ"> <!ENTITY lambda "λ"> <!ENTITY mu "μ"> <!ENTITY nu "ν"> <!ENTITY xi "ξ"> <!ENTITY omicron "ο"> <!ENTITY pi "π"> <!ENTITY rho "ρ"> <!ENTITY sigmaf "ς"> <!ENTITY sigma "σ"> <!ENTITY tau "τ"> <!ENTITY upsilon "υ"> <!ENTITY phi "φ"> <!ENTITY chi "χ"> <!ENTITY psi "ψ"> <!ENTITY omega "ω"> <!ENTITY thetasym "ϑ"> <!ENTITY upsih "ϒ"> <!ENTITY piv "ϖ"> <!ENTITY ensp " "> <!ENTITY emsp " "> <!ENTITY thinsp " "> <!ENTITY zwnj "‌"> <!ENTITY zwj "‍"> <!ENTITY lrm "‎"> <!ENTITY rlm "‏"> <!ENTITY ndash "–"> <!ENTITY mdash "—"> <!ENTITY lsquo "‘"> <!ENTITY rsquo "’"> <!ENTITY sbquo "‚"> <!ENTITY ldquo "“"> <!ENTITY rdquo "”"> <!ENTITY bdquo "„"> <!ENTITY dagger "†"> <!ENTITY Dagger "‡"> <!ENTITY bull "•"> <!ENTITY hellip "…"> <!ENTITY permil "‰"> <!ENTITY prime "′"> <!ENTITY Prime "″"> <!ENTITY lsaquo "‹"> <!ENTITY rsaquo "›"> <!ENTITY oline "‾"> <!ENTITY frasl "⁄"> <!ENTITY euro "€"> <!ENTITY image "ℑ"> <!ENTITY weierp "℘"> <!ENTITY real "ℜ"> <!ENTITY trade "™"> <!ENTITY alefsym "ℵ"> <!ENTITY larr "←"> <!ENTITY uarr "↑"> <!ENTITY rarr "→"> <!ENTITY darr "↓"> <!ENTITY harr "↔"> <!ENTITY crarr "↵"> <!ENTITY lArr "⇐"> <!ENTITY uArr "⇑"> <!ENTITY rArr "⇒"> <!ENTITY dArr "⇓"> <!ENTITY hArr "⇔"> <!ENTITY forall "∀"> <!ENTITY part "∂"> <!ENTITY exist "∃"> <!ENTITY empty "∅"> <!ENTITY nabla "∇"> <!ENTITY isin "∈"> <!ENTITY notin "∉"> <!ENTITY ni "∋"> <!ENTITY prod "∏"> <!ENTITY sum "∑"> <!ENTITY minus "−"> <!ENTITY lowast "∗"> <!ENTITY radic "√"> <!ENTITY prop "∝"> <!ENTITY infin "∞"> <!ENTITY ang "∠"> <!ENTITY and "∧"> <!ENTITY or "∨"> <!ENTITY cap "∩"> <!ENTITY cup "∪"> <!ENTITY int "∫"> <!ENTITY there4 "∴"> <!ENTITY sim "∼"> <!ENTITY cong "≅"> <!ENTITY asymp "≈"> <!ENTITY ne "≠"> <!ENTITY equiv "≡"> <!ENTITY le "≤"> <!ENTITY ge "≥"> <!ENTITY sub "⊂"> <!ENTITY sup "⊃"> <!ENTITY nsub "⊄"> <!ENTITY sube "⊆"> <!ENTITY supe "⊇"> <!ENTITY oplus "⊕"> <!ENTITY otimes "⊗"> <!ENTITY perp "⊥"> <!ENTITY sdot "⋅"> <!ENTITY lceil "⌈"> <!ENTITY rceil "⌉"> <!ENTITY lfloor "⌊"> <!ENTITY rfloor "⌋"> <!ENTITY lang "〈"> <!ENTITY rang "〉"> <!ENTITY loz "◊"> <!ENTITY spades "♠"> <!ENTITY clubs "♣"> <!ENTITY hearts "♥"> <!ENTITY diams "♦"> ]>'; } -}
\ No newline at end of file +} diff --git a/vendor/simplepie/simplepie/library/SimplePie/Rating.php b/vendor/simplepie/simplepie/library/SimplePie/Rating.php index eaf57080c..108dd22bf 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Rating.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Rating.php @@ -103,10 +103,8 @@ class SimplePie_Rating { return $this->scheme; } - else - { - return null; - } + + return null; } /** @@ -120,9 +118,7 @@ class SimplePie_Rating { return $this->value; } - else - { - return null; - } + + return null; } } diff --git a/vendor/simplepie/simplepie/library/SimplePie/Restriction.php b/vendor/simplepie/simplepie/library/SimplePie/Restriction.php index 001a5cd28..803d84fde 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Restriction.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Restriction.php @@ -112,10 +112,8 @@ class SimplePie_Restriction { return $this->relationship; } - else - { - return null; - } + + return null; } /** @@ -129,10 +127,8 @@ class SimplePie_Restriction { return $this->type; } - else - { - return null; - } + + return null; } /** @@ -146,9 +142,7 @@ class SimplePie_Restriction { return $this->value; } - else - { - return null; - } + + return null; } } diff --git a/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php b/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php index 5a11721df..40b066266 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php @@ -354,7 +354,7 @@ class SimplePie_Sanitize } else { - trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING); + trigger_error("$this->cache_location is not writable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING); } } } diff --git a/vendor/simplepie/simplepie/library/SimplePie/Source.php b/vendor/simplepie/simplepie/library/SimplePie/Source.php index 1a66a392d..8fac13ef7 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/Source.php +++ b/vendor/simplepie/simplepie/library/SimplePie/Source.php @@ -79,10 +79,8 @@ class SimplePie_Source { return $this->data['child'][$namespace][$tag]; } - else - { - return null; - } + + return null; } public function get_base($element = array()) @@ -130,10 +128,8 @@ class SimplePie_Source { return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); } - else - { - return null; - } + + return null; } public function get_category($key = 0) @@ -143,10 +139,8 @@ class SimplePie_Source { return $categories[$key]; } - else - { - return null; - } + + return null; } public function get_categories() @@ -200,10 +194,8 @@ class SimplePie_Source { return array_unique($categories); } - else - { - return null; - } + + return null; } public function get_author($key = 0) @@ -213,10 +205,8 @@ class SimplePie_Source { return $authors[$key]; } - else - { - return null; - } + + return null; } public function get_authors() @@ -283,10 +273,8 @@ class SimplePie_Source { return array_unique($authors); } - else - { - return null; - } + + return null; } public function get_contributor($key = 0) @@ -296,10 +284,8 @@ class SimplePie_Source { return $contributors[$key]; } - else - { - return null; - } + + return null; } public function get_contributors() @@ -354,10 +340,8 @@ class SimplePie_Source { return array_unique($contributors); } - else - { - return null; - } + + return null; } public function get_link($key = 0, $rel = 'alternate') @@ -367,10 +351,8 @@ class SimplePie_Source { return $links[$key]; } - else - { - return null; - } + + return null; } /** @@ -449,10 +431,8 @@ class SimplePie_Source { return $this->data['links'][$rel]; } - else - { - return null; - } + + return null; } public function get_description() @@ -493,10 +473,8 @@ class SimplePie_Source { return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0])); } - else - { - return null; - } + + return null; } public function get_copyright() @@ -521,10 +499,8 @@ class SimplePie_Source { return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); } - else - { - return null; - } + + return null; } public function get_language() @@ -545,10 +521,8 @@ class SimplePie_Source { return $this->sanitize($this->data['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT); } - else - { - return null; - } + + return null; } public function get_latitude() @@ -561,10 +535,8 @@ class SimplePie_Source { return (float) $match[1]; } - else - { - return null; - } + + return null; } public function get_longitude() @@ -581,10 +553,8 @@ class SimplePie_Source { return (float) $match[2]; } - else - { - return null; - } + + return null; } public function get_image_url() @@ -601,10 +571,7 @@ class SimplePie_Source { return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0])); } - else - { - return null; - } + + return null; } } - diff --git a/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php b/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php index 99e751672..18ca1b79b 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php +++ b/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php @@ -136,13 +136,11 @@ class SimplePie_XML_Declaration_Parser { return true; } - else - { - $this->version = ''; - $this->encoding = ''; - $this->standalone = ''; - return false; - } + + $this->version = ''; + $this->encoding = ''; + $this->standalone = ''; + return false; } /** diff --git a/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php b/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php index 0e8bc8fc6..f4aeafa28 100644 --- a/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php +++ b/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php @@ -338,10 +338,8 @@ class SimplePie_gzdecode { return false; } - else - { - $this->position = $this->compressed_size - 8; - } + + $this->position = $this->compressed_size - 8; // Check CRC of data $crc = current(unpack('V', substr($this->compressed_data, $this->position, 4))); @@ -362,9 +360,7 @@ class SimplePie_gzdecode // Wow, against all odds, we've actually got a valid gzip string return true; } - else - { - return false; - } + + return false; } } diff --git a/vendor/symfony/polyfill-ctype/Ctype.php b/vendor/symfony/polyfill-ctype/Ctype.php new file mode 100644 index 000000000..58414dc73 --- /dev/null +++ b/vendor/symfony/polyfill-ctype/Ctype.php @@ -0,0 +1,227 @@ +<?php + +/* + * This file is part of the Symfony package. + * + * (c) Fabien Potencier <fabien@symfony.com> + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Polyfill\Ctype; + +/** + * Ctype implementation through regex. + * + * @internal + * + * @author Gert de Pagter <BackEndTea@gmail.com> + */ +final class Ctype +{ + /** + * Returns TRUE if every character in text is either a letter or a digit, FALSE otherwise. + * + * @see https://php.net/ctype-alnum + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_alnum($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^A-Za-z0-9]/', $text); + } + + /** + * Returns TRUE if every character in text is a letter, FALSE otherwise. + * + * @see https://php.net/ctype-alpha + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_alpha($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^A-Za-z]/', $text); + } + + /** + * Returns TRUE if every character in text is a control character from the current locale, FALSE otherwise. + * + * @see https://php.net/ctype-cntrl + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_cntrl($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^\x00-\x1f\x7f]/', $text); + } + + /** + * Returns TRUE if every character in the string text is a decimal digit, FALSE otherwise. + * + * @see https://php.net/ctype-digit + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_digit($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^0-9]/', $text); + } + + /** + * Returns TRUE if every character in text is printable and actually creates visible output (no white space), FALSE otherwise. + * + * @see https://php.net/ctype-graph + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_graph($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^!-~]/', $text); + } + + /** + * Returns TRUE if every character in text is a lowercase letter. + * + * @see https://php.net/ctype-lower + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_lower($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^a-z]/', $text); + } + + /** + * Returns TRUE if every character in text will actually create output (including blanks). Returns FALSE if text contains control characters or characters that do not have any output or control function at all. + * + * @see https://php.net/ctype-print + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_print($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^ -~]/', $text); + } + + /** + * Returns TRUE if every character in text is printable, but neither letter, digit or blank, FALSE otherwise. + * + * @see https://php.net/ctype-punct + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_punct($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^!-\/\:-@\[-`\{-~]/', $text); + } + + /** + * Returns TRUE if every character in text creates some sort of white space, FALSE otherwise. Besides the blank character this also includes tab, vertical tab, line feed, carriage return and form feed characters. + * + * @see https://php.net/ctype-space + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_space($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^\s]/', $text); + } + + /** + * Returns TRUE if every character in text is an uppercase letter. + * + * @see https://php.net/ctype-upper + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_upper($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^A-Z]/', $text); + } + + /** + * Returns TRUE if every character in text is a hexadecimal 'digit', that is a decimal digit or a character from [A-Fa-f] , FALSE otherwise. + * + * @see https://php.net/ctype-xdigit + * + * @param string|int $text + * + * @return bool + */ + public static function ctype_xdigit($text) + { + $text = self::convert_int_to_char_for_ctype($text); + + return \is_string($text) && '' !== $text && !preg_match('/[^A-Fa-f0-9]/', $text); + } + + /** + * Converts integers to their char versions according to normal ctype behaviour, if needed. + * + * If an integer between -128 and 255 inclusive is provided, + * it is interpreted as the ASCII value of a single character + * (negative values have 256 added in order to allow characters in the Extended ASCII range). + * Any other integer is interpreted as a string containing the decimal digits of the integer. + * + * @param string|int $int + * + * @return mixed + */ + private static function convert_int_to_char_for_ctype($int) + { + if (!\is_int($int)) { + return $int; + } + + if ($int < -128 || $int > 255) { + return (string) $int; + } + + if ($int < 0) { + $int += 256; + } + + return \chr($int); + } +} diff --git a/vendor/symfony/polyfill-ctype/LICENSE b/vendor/symfony/polyfill-ctype/LICENSE new file mode 100644 index 000000000..ad399a798 --- /dev/null +++ b/vendor/symfony/polyfill-ctype/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2018 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/vendor/symfony/polyfill-ctype/README.md b/vendor/symfony/polyfill-ctype/README.md new file mode 100644 index 000000000..8add1ab00 --- /dev/null +++ b/vendor/symfony/polyfill-ctype/README.md @@ -0,0 +1,12 @@ +Symfony Polyfill / Ctype +======================== + +This component provides `ctype_*` functions to users who run php versions without the ctype extension. + +More information can be found in the +[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md). + +License +======= + +This library is released under the [MIT license](LICENSE). diff --git a/vendor/symfony/polyfill-ctype/bootstrap.php b/vendor/symfony/polyfill-ctype/bootstrap.php new file mode 100644 index 000000000..14d1d0faa --- /dev/null +++ b/vendor/symfony/polyfill-ctype/bootstrap.php @@ -0,0 +1,26 @@ +<?php + +/* + * This file is part of the Symfony package. + * + * (c) Fabien Potencier <fabien@symfony.com> + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +use Symfony\Polyfill\Ctype as p; + +if (!function_exists('ctype_alnum')) { + function ctype_alnum($text) { return p\Ctype::ctype_alnum($text); } + function ctype_alpha($text) { return p\Ctype::ctype_alpha($text); } + function ctype_cntrl($text) { return p\Ctype::ctype_cntrl($text); } + function ctype_digit($text) { return p\Ctype::ctype_digit($text); } + function ctype_graph($text) { return p\Ctype::ctype_graph($text); } + function ctype_lower($text) { return p\Ctype::ctype_lower($text); } + function ctype_print($text) { return p\Ctype::ctype_print($text); } + function ctype_punct($text) { return p\Ctype::ctype_punct($text); } + function ctype_space($text) { return p\Ctype::ctype_space($text); } + function ctype_upper($text) { return p\Ctype::ctype_upper($text); } + function ctype_xdigit($text) { return p\Ctype::ctype_xdigit($text); } +} diff --git a/vendor/symfony/polyfill-ctype/composer.json b/vendor/symfony/polyfill-ctype/composer.json new file mode 100644 index 000000000..094f8d867 --- /dev/null +++ b/vendor/symfony/polyfill-ctype/composer.json @@ -0,0 +1,34 @@ +{ + "name": "symfony/polyfill-ctype", + "type": "library", + "description": "Symfony polyfill for ctype functions", + "keywords": ["polyfill", "compatibility", "portable", "ctype"], + "homepage": "https://symfony.com", + "license": "MIT", + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "require": { + "php": ">=5.3.3" + }, + "autoload": { + "psr-4": { "Symfony\\Polyfill\\Ctype\\": "" }, + "files": [ "bootstrap.php" ] + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "1.9-dev" + } + } +} diff --git a/view/ca/hmessages.po b/view/ca/hmessages.po index 24c740752..e7bbc980b 100644 --- a/view/ca/hmessages.po +++ b/view/ca/hmessages.po @@ -10,12 +10,12 @@ # Rafael Garau, 2015 msgid "" msgstr "" -"Project-Id-Version: Redmatrix\n" +"Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-23 11:34+0200\n" -"PO-Revision-Date: 2018-05-20 02:06+0000\n" +"POT-Creation-Date: 2018-07-18 11:47+0200\n" +"PO-Revision-Date: 2018-08-20 19:57+0000\n" "Last-Translator: fadelkon <fadelkon@posteo.net>\n" -"Language-Team: Catalan (Spain) (http://www.transifex.com/Friendica/red-matrix/language/ca_ES/)\n" +"Language-Team: Catalan (Spain) (http://www.transifex.com/Friendica/hubzilla/language/ca_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -79,8 +79,8 @@ msgid "Can like/dislike profiles and profile things" msgstr "Pot fer m'agrada i no m'agrada als perfils i coses del perfil" #: ../../Zotlabs/Access/Permissions.php:70 -msgid "Can forward to all my channel connections via @+ mentions in posts" -msgstr "Pot reenviar a totes les connexions del meu canal fent servir @+ per mencionar" +msgid "Can forward to all my channel connections via ! mentions in posts" +msgstr "Pot fer arribar entrades a totes les meves connexions fent servir mencions amb \"!\"" #: ../../Zotlabs/Access/Permissions.php:71 msgid "Can chat with me" @@ -155,14 +155,14 @@ msgid "Special - Group Repository" msgstr "Especial - Repositori d'un Grup" #: ../../Zotlabs/Access/PermissionRoles.php:306 -#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:144 -#: ../../Zotlabs/Module/Settings/Channel.php:479 +#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:172 +#: ../../Zotlabs/Module/Settings/Channel.php:496 #: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795 -#: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49 +#: ../../Zotlabs/Module/Register.php:233 ../../include/selectors.php:49 #: ../../include/selectors.php:66 ../../include/selectors.php:104 #: ../../include/selectors.php:140 ../../include/event.php:1315 -#: ../../include/event.php:1322 ../../include/connections.php:697 -#: ../../include/connections.php:704 +#: ../../include/event.php:1322 ../../include/connections.php:703 +#: ../../include/connections.php:710 msgid "Other" msgstr "Altres" @@ -174,8 +174,9 @@ msgstr "Personalitzat, mode expert" #: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Connect.php:17 #: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12 #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 -#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32 -#: ../../Zotlabs/Module/Cards.php:33 ../../Zotlabs/Module/Webpages.php:33 +#: ../../Zotlabs/Module/Menu.php:91 ../../Zotlabs/Module/Layouts.php:31 +#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Cards.php:33 +#: ../../Zotlabs/Module/Webpages.php:33 #: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1197 msgid "Requested profile is not available." msgstr "El perfil demanat no està disponible." @@ -183,14 +184,14 @@ msgstr "El perfil demanat no està disponible." #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 #: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94 #: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Editlayout.php:67 -#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:110 -#: ../../Zotlabs/Module/Channel.php:248 ../../Zotlabs/Module/Channel.php:288 +#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:115 +#: ../../Zotlabs/Module/Channel.php:281 ../../Zotlabs/Module/Channel.php:320 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 -#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271 -#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Events.php:271 +#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:20 #: ../../Zotlabs/Module/Article_edit.php:51 -#: ../../Zotlabs/Module/New_channel.php:91 -#: ../../Zotlabs/Module/New_channel.php:116 +#: ../../Zotlabs/Module/New_channel.php:105 +#: ../../Zotlabs/Module/New_channel.php:130 #: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 #: ../../Zotlabs/Module/Moderate.php:13 #: ../../Zotlabs/Module/Settings/Features.php:38 @@ -207,30 +208,32 @@ msgstr "El perfil demanat no està disponible." #: ../../Zotlabs/Module/Profile_photo.php:315 #: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229 #: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256 -#: ../../Zotlabs/Module/Item.php:1106 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Item.php:1108 ../../Zotlabs/Module/Page.php:34 #: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389 #: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 -#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71 -#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 -#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:13 -#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635 +#: ../../Zotlabs/Module/Menu.php:129 ../../Zotlabs/Module/Menu.php:140 +#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 +#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Cloud.php:40 +#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:12 +#: ../../Zotlabs/Module/Group.php:24 ../../Zotlabs/Module/Profiles.php:198 +#: ../../Zotlabs/Module/Profiles.php:635 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 #: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10 #: ../../Zotlabs/Module/Cards.php:72 ../../Zotlabs/Module/Webpages.php:118 #: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74 -#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:74 +#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:77 #: ../../Zotlabs/Module/Like.php:185 ../../Zotlabs/Module/Suggest.php:28 #: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146 #: ../../Zotlabs/Module/Register.php:77 -#: ../../Zotlabs/Module/Cover_photo.php:281 -#: ../../Zotlabs/Module/Cover_photo.php:294 +#: ../../Zotlabs/Module/Cover_photo.php:313 +#: ../../Zotlabs/Module/Cover_photo.php:326 #: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:15 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 -#: ../../Zotlabs/Module/Filestorage.php:85 -#: ../../Zotlabs/Module/Filestorage.php:117 ../../Zotlabs/Module/Common.php:38 +#: ../../Zotlabs/Module/Filestorage.php:96 +#: ../../Zotlabs/Module/Filestorage.php:140 ../../Zotlabs/Module/Common.php:38 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Service_limits.php:11 @@ -240,11 +243,10 @@ msgstr "El perfil demanat no està disponible." #: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53 #: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:150 #: ../../include/attach.php:197 ../../include/attach.php:270 -#: ../../include/attach.php:284 ../../include/attach.php:293 -#: ../../include/attach.php:366 ../../include/attach.php:380 -#: ../../include/attach.php:387 ../../include/attach.php:469 -#: ../../include/attach.php:1029 ../../include/attach.php:1103 -#: ../../include/attach.php:1268 ../../include/items.php:3706 +#: ../../include/attach.php:379 ../../include/attach.php:393 +#: ../../include/attach.php:400 ../../include/attach.php:482 +#: ../../include/attach.php:1042 ../../include/attach.php:1116 +#: ../../include/attach.php:1281 ../../include/items.php:3653 #: ../../include/photos.php:27 msgid "Permission denied." msgstr "S'ha denegat el permís." @@ -254,7 +256,7 @@ msgstr "S'ha denegat el permís." msgid "Block Name" msgstr "Nom del bloc" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2422 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2458 msgid "Blocks" msgstr "Blocs" @@ -262,22 +264,22 @@ msgstr "Blocs" msgid "Block Title" msgstr "Títol del bloc" -#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114 +#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:177 #: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251 msgid "Created" msgstr "Creat" -#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:115 +#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:178 #: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252 msgid "Edited" msgstr "Editat" #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96 -#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:160 -#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:118 +#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:188 +#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:181 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798 #: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239 -#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:382 +#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:390 #: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165 msgid "Create" msgstr "Crea" @@ -285,29 +287,29 @@ msgstr "Crea" #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Article_edit.php:99 #: ../../Zotlabs/Module/Admin/Profs.php:175 -#: ../../Zotlabs/Module/Settings/Oauth2.php:149 +#: ../../Zotlabs/Module/Settings/Oauth2.php:150 #: ../../Zotlabs/Module/Settings/Oauth.php:150 #: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Module/Editblock.php:114 #: ../../Zotlabs/Module/Connections.php:281 #: ../../Zotlabs/Module/Connections.php:319 #: ../../Zotlabs/Module/Connections.php:339 ../../Zotlabs/Module/Wiki.php:202 -#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:112 -#: ../../Zotlabs/Module/Layouts.php:193 +#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:175 +#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:216 #: ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Card_edit.php:99 -#: ../../Zotlabs/Lib/Apps.php:409 ../../Zotlabs/Lib/ThreadItem.php:121 -#: ../../Zotlabs/Storage/Browser.php:288 ../../Zotlabs/Widget/Cdav.php:126 +#: ../../Zotlabs/Lib/Apps.php:475 ../../Zotlabs/Lib/ThreadItem.php:128 +#: ../../Zotlabs/Storage/Browser.php:290 ../../Zotlabs/Widget/Cdav.php:126 #: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296 -#: ../../include/channel.php:1300 ../../include/menu.php:113 +#: ../../include/channel.php:1300 ../../include/menu.php:118 msgid "Edit" msgstr "Edita" -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1102 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1107 #: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194 #: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124 -#: ../../include/conversation.php:1366 +#: ../../include/conversation.php:1374 msgid "Share" -msgstr "Compartir" +msgstr "Comparteix" #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138 #: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187 @@ -315,18 +317,17 @@ msgstr "Compartir" #: ../../Zotlabs/Module/Admin/Accounts.php:175 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:176 -#: ../../Zotlabs/Module/Settings/Oauth2.php:150 +#: ../../Zotlabs/Module/Settings/Oauth2.php:151 #: ../../Zotlabs/Module/Settings/Oauth.php:151 #: ../../Zotlabs/Module/Thing.php:267 ../../Zotlabs/Module/Editblock.php:139 #: ../../Zotlabs/Module/Connections.php:289 -#: ../../Zotlabs/Module/Photos.php:1203 ../../Zotlabs/Module/Connedit.php:654 -#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Group.php:179 -#: ../../Zotlabs/Module/Profiles.php:800 +#: ../../Zotlabs/Module/Photos.php:1208 ../../Zotlabs/Module/Connedit.php:654 +#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Profiles.php:800 #: ../../Zotlabs/Module/Editwebpage.php:167 #: ../../Zotlabs/Module/Webpages.php:242 -#: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Lib/Apps.php:410 -#: ../../Zotlabs/Lib/ThreadItem.php:141 ../../Zotlabs/Storage/Browser.php:289 -#: ../../include/conversation.php:690 ../../include/conversation.php:733 +#: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Lib/Apps.php:476 +#: ../../Zotlabs/Lib/ThreadItem.php:148 ../../Zotlabs/Storage/Browser.php:291 +#: ../../include/conversation.php:691 ../../include/conversation.php:736 msgid "Delete" msgstr "Esborra" @@ -408,50 +409,51 @@ msgid "3. Click [Connect]" msgstr "3. Clica [connecta]" #: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493 +#: ../../Zotlabs/Module/Mitem.php:259 ../../Zotlabs/Module/Events.php:493 #: ../../Zotlabs/Module/Appman.php:153 #: ../../Zotlabs/Module/Import_items.php:129 #: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349 #: ../../Zotlabs/Module/Connect.php:98 #: ../../Zotlabs/Module/Admin/Features.php:66 -#: ../../Zotlabs/Module/Admin/Plugins.php:438 #: ../../Zotlabs/Module/Admin/Accounts.php:168 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Addons.php:438 #: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Account_edit.php:74 -#: ../../Zotlabs/Module/Admin/Security.php:104 +#: ../../Zotlabs/Module/Admin/Security.php:112 #: ../../Zotlabs/Module/Settings/Permcats.php:115 -#: ../../Zotlabs/Module/Settings/Channel.php:495 +#: ../../Zotlabs/Module/Settings/Channel.php:516 #: ../../Zotlabs/Module/Settings/Features.php:79 #: ../../Zotlabs/Module/Settings/Tokens.php:168 -#: ../../Zotlabs/Module/Settings/Oauth2.php:84 +#: ../../Zotlabs/Module/Settings/Oauth2.php:85 #: ../../Zotlabs/Module/Settings/Account.php:118 #: ../../Zotlabs/Module/Settings/Featured.php:54 #: ../../Zotlabs/Module/Settings/Display.php:192 #: ../../Zotlabs/Module/Settings/Oauth.php:88 #: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379 -#: ../../Zotlabs/Module/Import.php:530 ../../Zotlabs/Module/Cal.php:345 -#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1082 -#: ../../Zotlabs/Module/Photos.php:1122 ../../Zotlabs/Module/Photos.php:1240 +#: ../../Zotlabs/Module/Import.php:565 ../../Zotlabs/Module/Cal.php:345 +#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1087 +#: ../../Zotlabs/Module/Photos.php:1127 ../../Zotlabs/Module/Photos.php:1245 #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98 #: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Connedit.php:887 #: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242 #: ../../Zotlabs/Module/Email_validation.php:40 #: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249 -#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:723 -#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Sources.php:114 -#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Lib/ThreadItem.php:752 +#: ../../Zotlabs/Module/Group.php:121 ../../Zotlabs/Module/Group.php:137 +#: ../../Zotlabs/Module/Profiles.php:723 ../../Zotlabs/Module/Editpost.php:85 +#: ../../Zotlabs/Module/Sources.php:117 ../../Zotlabs/Module/Sources.php:154 +#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431 +#: ../../Zotlabs/Module/Filestorage.php:183 ../../Zotlabs/Module/Rate.php:166 +#: ../../Zotlabs/Lib/ThreadItem.php:757 #: ../../Zotlabs/Widget/Eventstools.php:16 #: ../../Zotlabs/Widget/Wiki_pages.php:40 #: ../../Zotlabs/Widget/Wiki_pages.php:97 #: ../../view/theme/redbasic_c/php/config.php:95 #: ../../view/theme/redbasic/php/config.php:93 -#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:275 +#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:284 #: ../../addon/planets/planets.php:153 #: ../../addon/openclipatar/openclipatar.php:53 #: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 @@ -459,7 +461,7 @@ msgstr "3. Clica [connecta]" #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 #: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:825 +#: ../../addon/diaspora/diaspora.php:830 #: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84 #: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161 #: ../../addon/mailtest/mailtest.php:100 @@ -468,7 +470,7 @@ msgstr "3. Clica [connecta]" #: ../../addon/jappixmini/jappixmini.php:371 #: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 #: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1072 +#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1159 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 @@ -477,8 +479,11 @@ msgstr "3. Clica [connecta]" #: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:218 #: ../../addon/twitter/twitter.php:265 #: ../../addon/smileybutton/smileybutton.php:219 -#: ../../addon/cart/cart.php:1104 ../../addon/piwik/piwik.php:95 -#: ../../addon/pageheader/pageheader.php:48 +#: ../../addon/cart/cart.php:1251 +#: ../../addon/cart/submodules/paypalbutton.php:144 +#: ../../addon/cart/submodules/hzservices.php:78 +#: ../../addon/cart/submodules/hzservices.php:647 +#: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48 #: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69 #: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124 #: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22 @@ -486,8 +491,8 @@ msgid "Submit" msgstr "Envia" #: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191 -#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:133 -#: ../../include/nav.php:469 +#: ../../Zotlabs/Lib/Apps.php:292 ../../include/features.php:133 +#: ../../include/nav.php:461 msgid "Articles" msgstr "Articles" @@ -519,14 +524,35 @@ msgstr "Descripció del disseny (opcional)" msgid "Edit Layout" msgstr "Edita el disseny" +#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:899 +#: ../../Zotlabs/Module/Cdav.php:1188 +#: ../../Zotlabs/Module/Article_edit.php:131 +#: ../../Zotlabs/Module/Admin/Addons.php:423 +#: ../../Zotlabs/Module/Settings/Oauth2.php:86 +#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth.php:89 +#: ../../Zotlabs/Module/Settings/Oauth.php:115 +#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:347 +#: ../../Zotlabs/Module/Wiki.php:379 +#: ../../Zotlabs/Module/Profile_photo.php:465 +#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66 +#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 +#: ../../Zotlabs/Module/Editwebpage.php:169 +#: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Filer.php:55 +#: ../../Zotlabs/Module/Cover_photo.php:399 ../../Zotlabs/Module/Tagrm.php:15 +#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Card_edit.php:131 +#: ../../include/conversation.php:1397 ../../include/conversation.php:1446 +msgid "Cancel" +msgstr "Cancel·la" + #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86 #: ../../Zotlabs/Module/Import_items.php:120 -#: ../../Zotlabs/Module/Cloud.php:117 ../../Zotlabs/Module/Group.php:74 +#: ../../Zotlabs/Module/Cloud.php:126 ../../Zotlabs/Module/Group.php:83 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68 #: ../../Zotlabs/Module/Like.php:296 ../../Zotlabs/Web/WebServer.php:122 #: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:73 #: ../../addon/frphotos/frphotos.php:82 ../../addon/redfiles/redfiles.php:109 -#: ../../include/items.php:358 +#: ../../include/items.php:364 msgid "Permission denied" msgstr "S'ha denegat el permís" @@ -565,11 +591,11 @@ msgstr "Resum:" #: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787 #: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146 -#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273 -#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:833 +#: ../../Zotlabs/Module/Photos.php:822 ../../Zotlabs/Module/Photos.php:1278 +#: ../../Zotlabs/Lib/Apps.php:819 ../../Zotlabs/Lib/Apps.php:898 #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891 -#: ../../include/conversation.php:1160 +#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:961 +#: ../../include/conversation.php:1165 msgid "Unknown" msgstr "Desconegut" @@ -608,6 +634,7 @@ msgstr "Data i hora de fi" #: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473 #: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101 #: ../../addon/rendezvous/rendezvous.php:173 +#: ../../addon/cart/submodules/hzservices.php:659 msgid "Description" msgstr "Descripció" @@ -620,14 +647,14 @@ msgstr "Ubicació" #: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Events.php:689 #: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:339 -#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:971 +#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:976 msgid "Previous" msgstr "Anterior" #: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Events.php:690 #: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263 #: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347 -#: ../../Zotlabs/Module/Photos.php:980 +#: ../../Zotlabs/Module/Photos.php:985 msgid "Next" msgstr "Següent" @@ -676,22 +703,6 @@ msgstr "Tria un calendari" msgid "Delete all" msgstr "Esborra'ls tots" -#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188 -#: ../../Zotlabs/Module/Admin/Plugins.php:423 -#: ../../Zotlabs/Module/Settings/Oauth2.php:85 -#: ../../Zotlabs/Module/Settings/Oauth2.php:113 -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -#: ../../Zotlabs/Module/Settings/Oauth.php:115 -#: ../../Zotlabs/Module/Wiki.php:347 ../../Zotlabs/Module/Wiki.php:379 -#: ../../Zotlabs/Module/Profile_photo.php:464 -#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66 -#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 -#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:366 -#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 -#: ../../include/conversation.php:1389 ../../include/conversation.php:1438 -msgid "Cancel" -msgstr "Cancel·la" - #: ../../Zotlabs/Module/Cdav.php:900 msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "Malauradament encara no es poden editar esdeveniments periòdics." @@ -699,13 +710,14 @@ msgstr "Malauradament encara no es poden editar esdeveniments periòdics." #: ../../Zotlabs/Module/Cdav.php:1170 #: ../../Zotlabs/Module/Sharedwithme.php:105 #: ../../Zotlabs/Module/Admin/Channels.php:159 -#: ../../Zotlabs/Module/Settings/Oauth2.php:86 -#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 #: ../../Zotlabs/Module/Settings/Oauth.php:90 #: ../../Zotlabs/Module/Settings/Oauth.php:116 #: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906 -#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:558 -#: ../../Zotlabs/Storage/Browser.php:283 +#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Module/Group.php:125 +#: ../../Zotlabs/Lib/NativeWikiPage.php:558 +#: ../../Zotlabs/Storage/Browser.php:285 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 msgid "Name" @@ -730,7 +742,7 @@ msgstr "Telèfon" #: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1770 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1769 msgid "Email" msgstr "Correu electrònic" @@ -758,19 +770,19 @@ msgstr "Nota" #: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915 #: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308 -#: ../../include/connections.php:690 +#: ../../include/connections.php:696 msgid "Mobile" msgstr "Mòbil" #: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916 #: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309 -#: ../../include/connections.php:691 +#: ../../include/connections.php:697 msgid "Home" msgstr "Inici" #: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917 #: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312 -#: ../../include/connections.php:694 +#: ../../include/connections.php:700 msgid "Work" msgstr "Feina" @@ -786,13 +798,13 @@ msgid "Add Field" msgstr "Afegeix un camp" #: ../../Zotlabs/Module/Cdav.php:1186 -#: ../../Zotlabs/Module/Admin/Plugins.php:453 -#: ../../Zotlabs/Module/Settings/Oauth2.php:39 -#: ../../Zotlabs/Module/Settings/Oauth2.php:112 +#: ../../Zotlabs/Module/Admin/Addons.php:453 +#: ../../Zotlabs/Module/Settings/Oauth2.php:40 +#: ../../Zotlabs/Module/Settings/Oauth2.php:113 #: ../../Zotlabs/Module/Settings/Oauth.php:43 #: ../../Zotlabs/Module/Settings/Oauth.php:114 #: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:799 -#: ../../Zotlabs/Lib/Apps.php:393 +#: ../../Zotlabs/Lib/Apps.php:456 msgid "Update" msgstr "Actualitza" @@ -837,25 +849,35 @@ msgstr "Llibreta d'adreces per defecte" msgid "This site is not a directory server" msgstr "Aquest hub no és un servidor de directori" -#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Ochannel.php:32 +#: ../../Zotlabs/Module/Channel.php:35 ../../Zotlabs/Module/Ochannel.php:32 #: ../../Zotlabs/Module/Chat.php:25 ../../addon/chess/chess.php:508 msgid "You must be logged in to see this page." msgstr "Has de tenir una sessió iniciada per a veure aquesta pàgina." -#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:37 +#: ../../Zotlabs/Module/Channel.php:50 ../../Zotlabs/Module/Hcard.php:37 #: ../../Zotlabs/Module/Profile.php:45 msgid "Posts and comments" msgstr "Entrades i comentaris" -#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:44 +#: ../../Zotlabs/Module/Channel.php:57 ../../Zotlabs/Module/Hcard.php:44 #: ../../Zotlabs/Module/Profile.php:52 msgid "Only posts" msgstr "Només entrades" -#: ../../Zotlabs/Module/Channel.php:107 +#: ../../Zotlabs/Module/Channel.php:112 msgid "Insufficient permissions. Request redirected to profile page." msgstr "S'ha denegat el permís. La petició s'ha redirigit a la pàgina de perfil." +#: ../../Zotlabs/Module/Channel.php:129 ../../Zotlabs/Module/Network.php:174 +msgid "Search Results For:" +msgstr "Cerca resultats per:" + +#: ../../Zotlabs/Module/Channel.php:164 ../../Zotlabs/Module/Hq.php:134 +#: ../../Zotlabs/Module/Pubstream.php:80 ../../Zotlabs/Module/Display.php:81 +#: ../../Zotlabs/Module/Network.php:204 +msgid "Reset form" +msgstr "Esborra el formulari" + #: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58 msgid "Export Channel" msgstr "Exporta un canal" @@ -922,7 +944,7 @@ msgstr "Benvingut/da a Hubzilla!" msgid "You have got no unseen posts..." msgstr "No tens entrades pendents de veure..." -#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:540 +#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:545 #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63 #: ../../Zotlabs/Module/Directory.php:68 ../../Zotlabs/Module/Display.php:30 #: ../../Zotlabs/Module/Viewconnections.php:23 @@ -930,9 +952,10 @@ msgid "Public access denied." msgstr "L'accés públic no està permès." #: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:335 -#: ../../Zotlabs/Lib/Apps.php:256 ../../Zotlabs/Widget/Sitesearch.php:31 -#: ../../include/text.php:1051 ../../include/text.php:1063 -#: ../../include/acl_selectors.php:118 ../../include/nav.php:179 +#: ../../Zotlabs/Lib/Apps.php:318 ../../Zotlabs/Widget/Sitesearch.php:31 +#: ../../Zotlabs/Widget/Activity_filter.php:148 ../../include/text.php:1062 +#: ../../include/text.php:1074 ../../include/acl_selectors.php:118 +#: ../../include/nav.php:185 msgid "Search" msgstr "Cerca" @@ -947,7 +970,7 @@ msgid "Search results for: %s" msgstr "Resultats de cerca per: %s" #: ../../Zotlabs/Module/Pubstream.php:95 -#: ../../Zotlabs/Widget/Notifications.php:131 +#: ../../Zotlabs/Widget/Notifications.php:142 msgid "Public Stream" msgstr "Flux públic" @@ -977,11 +1000,11 @@ msgstr "No s'ha trobat cap ubicació." msgid "Manage Channel Locations" msgstr "Gestiona les ubicacions del canal" -#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:111 +#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:115 msgid "Primary" msgstr "Primària" -#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113 +#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:176 msgid "Drop" msgstr "Esborra" @@ -1021,67 +1044,70 @@ msgstr "Fes servir les fletxes per moure l'aplicació cap a l'esquerra (amunt) o msgid "Use arrows to move the corresponding app up or down in the app tray" msgstr "Fes servir les fletxes per moure l'aplicació amunt o avall en la safata" -#: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144 +#: ../../Zotlabs/Module/Mitem.php:31 ../../Zotlabs/Module/Menu.php:208 msgid "Menu not found." msgstr "No s'ha trobat el menú." -#: ../../Zotlabs/Module/Mitem.php:52 +#: ../../Zotlabs/Module/Mitem.php:63 msgid "Unable to create element." msgstr "Incapaç de crear l'element." -#: ../../Zotlabs/Module/Mitem.php:76 +#: ../../Zotlabs/Module/Mitem.php:87 msgid "Unable to update menu element." msgstr "Incapaç d'actualitzar un element del menú." -#: ../../Zotlabs/Module/Mitem.php:92 +#: ../../Zotlabs/Module/Mitem.php:103 msgid "Unable to add menu element." msgstr "No s'ha pogut afegir l'element de menú." -#: ../../Zotlabs/Module/Mitem.php:120 ../../Zotlabs/Module/Menu.php:166 +#: ../../Zotlabs/Module/Mitem.php:134 ../../Zotlabs/Module/Menu.php:231 #: ../../Zotlabs/Module/Xchan.php:41 msgid "Not found." msgstr "No s'ha trobat." -#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230 +#: ../../Zotlabs/Module/Mitem.php:167 ../../Zotlabs/Module/Mitem.php:246 msgid "Menu Item Permissions" msgstr "Permisos dels ítems de menú" -#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 -#: ../../Zotlabs/Module/Settings/Channel.php:528 +#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "(click to open/close)" msgstr "(clica per obrir/tancar)" -#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176 +#: ../../Zotlabs/Module/Mitem.php:174 ../../Zotlabs/Module/Mitem.php:191 msgid "Link Name" msgstr "Nom de l'enllaç" -#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239 +#: ../../Zotlabs/Module/Mitem.php:175 ../../Zotlabs/Module/Mitem.php:255 msgid "Link or Submenu Target" msgstr "Destí de l'enllaç o del submenú" -#: ../../Zotlabs/Module/Mitem.php:161 +#: ../../Zotlabs/Module/Mitem.php:175 msgid "Enter URL of the link or select a menu name to create a submenu" msgstr "Introdueix la URL de l'enllaç o tria un nom de menú per crear un submenú" -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:256 msgid "Use magic-auth if available" msgstr "Empra la magic-auth si està disponible" -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 -#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 #: ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Admin/Site.php:259 -#: ../../Zotlabs/Module/Settings/Channel.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:266 +#: ../../Zotlabs/Module/Settings/Channel.php:315 #: ../../Zotlabs/Module/Settings/Display.php:100 -#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:697 -#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 -#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Connedit.php:779 -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Filestorage.php:155 -#: ../../Zotlabs/Module/Filestorage.php:163 -#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594 +#: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 +#: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:99 +#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Wiki.php:218 +#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Connedit.php:396 +#: ../../Zotlabs/Module/Connedit.php:779 ../../Zotlabs/Module/Menu.php:162 +#: ../../Zotlabs/Module/Menu.php:221 ../../Zotlabs/Module/Defperms.php:180 +#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Sources.php:116 +#: ../../Zotlabs/Module/Sources.php:151 +#: ../../Zotlabs/Module/Filestorage.php:178 +#: ../../Zotlabs/Module/Filestorage.php:186 +#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1618 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1110,30 +1136,38 @@ msgstr "Empra la magic-auth si està disponible" #: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 #: ../../addon/smileybutton/smileybutton.php:211 #: ../../addon/smileybutton/smileybutton.php:215 -#: ../../addon/cart/cart.php:1075 ../../addon/cart/cart.php:1082 -#: ../../addon/cart/cart.php:1090 ../../addon/authchoose/authchoose.php:67 -#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 -#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 -#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 +#: ../../addon/cart/cart.php:1206 ../../addon/cart/cart.php:1213 +#: ../../addon/cart/cart.php:1221 +#: ../../addon/cart/submodules/paypalbutton.php:99 +#: ../../addon/cart/submodules/paypalbutton.php:104 +#: ../../addon/cart/submodules/hzservices.php:73 +#: ../../addon/cart/submodules/hzservices.php:653 +#: ../../addon/cart/submodules/hzservices.php:657 +#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 +#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 +#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../include/dir_fns.php:145 msgid "No" msgstr "No" -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 -#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 #: ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Admin/Site.php:261 -#: ../../Zotlabs/Module/Settings/Channel.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:268 +#: ../../Zotlabs/Module/Settings/Channel.php:315 #: ../../Zotlabs/Module/Settings/Display.php:100 -#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:697 -#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219 -#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Defperms.php:180 -#: ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Filestorage.php:155 -#: ../../Zotlabs/Module/Filestorage.php:163 -#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594 +#: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 +#: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:98 +#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Wiki.php:218 +#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Connedit.php:396 +#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221 +#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +#: ../../Zotlabs/Module/Filestorage.php:178 +#: ../../Zotlabs/Module/Filestorage.php:186 +#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1618 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 #: ../../view/theme/redbasic/php/config.php:98 @@ -1162,92 +1196,98 @@ msgstr "No" #: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 #: ../../addon/smileybutton/smileybutton.php:211 #: ../../addon/smileybutton/smileybutton.php:215 -#: ../../addon/cart/cart.php:1075 ../../addon/cart/cart.php:1082 -#: ../../addon/cart/cart.php:1090 ../../addon/authchoose/authchoose.php:67 -#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 -#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 -#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 +#: ../../addon/cart/cart.php:1206 ../../addon/cart/cart.php:1213 +#: ../../addon/cart/cart.php:1221 +#: ../../addon/cart/submodules/paypalbutton.php:99 +#: ../../addon/cart/submodules/paypalbutton.php:104 +#: ../../addon/cart/submodules/hzservices.php:73 +#: ../../addon/cart/submodules/hzservices.php:653 +#: ../../addon/cart/submodules/hzservices.php:657 +#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 +#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 +#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../include/dir_fns.php:145 msgid "Yes" msgstr "Sí" -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:257 msgid "Open link in new window" msgstr "Obre l'enllaç en una nova finestra" -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258 msgid "Order in list" msgstr "Ordre de la llista" -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258 msgid "Higher numbers will sink to bottom of listing" msgstr "Els números més alts al final de la llista" -#: ../../Zotlabs/Module/Mitem.php:165 +#: ../../Zotlabs/Module/Mitem.php:179 msgid "Submit and finish" msgstr "Envia i acaba" -#: ../../Zotlabs/Module/Mitem.php:166 +#: ../../Zotlabs/Module/Mitem.php:180 msgid "Submit and continue" msgstr "Envia i continua" -#: ../../Zotlabs/Module/Mitem.php:174 +#: ../../Zotlabs/Module/Mitem.php:189 msgid "Menu:" msgstr "Menú:" -#: ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:192 msgid "Link Target" msgstr "Destí de l'enllaç" -#: ../../Zotlabs/Module/Mitem.php:180 +#: ../../Zotlabs/Module/Mitem.php:195 msgid "Edit menu" msgstr "Edita el menú" -#: ../../Zotlabs/Module/Mitem.php:183 +#: ../../Zotlabs/Module/Mitem.php:198 msgid "Edit element" msgstr "Edita l'element" -#: ../../Zotlabs/Module/Mitem.php:184 +#: ../../Zotlabs/Module/Mitem.php:199 msgid "Drop element" msgstr "Esborra l'element" -#: ../../Zotlabs/Module/Mitem.php:185 +#: ../../Zotlabs/Module/Mitem.php:200 msgid "New element" msgstr "Element nou" -#: ../../Zotlabs/Module/Mitem.php:186 +#: ../../Zotlabs/Module/Mitem.php:201 msgid "Edit this menu container" msgstr "Edita el contenidor de menú" -#: ../../Zotlabs/Module/Mitem.php:187 +#: ../../Zotlabs/Module/Mitem.php:202 msgid "Add menu element" msgstr "Afegeix un element de menú" -#: ../../Zotlabs/Module/Mitem.php:188 +#: ../../Zotlabs/Module/Mitem.php:203 msgid "Delete this menu item" msgstr "Esborra aquest article del menú" -#: ../../Zotlabs/Module/Mitem.php:189 +#: ../../Zotlabs/Module/Mitem.php:204 msgid "Edit this menu item" msgstr "Edita aquest article del menú" -#: ../../Zotlabs/Module/Mitem.php:206 +#: ../../Zotlabs/Module/Mitem.php:222 msgid "Menu item not found." msgstr "No s'ha trobat l'element de menú." -#: ../../Zotlabs/Module/Mitem.php:219 +#: ../../Zotlabs/Module/Mitem.php:235 msgid "Menu item deleted." msgstr "S'ha esborrat l'element de menú." -#: ../../Zotlabs/Module/Mitem.php:221 +#: ../../Zotlabs/Module/Mitem.php:237 msgid "Menu item could not be deleted." msgstr "No s'ha pogut esborrar l'element de menú." -#: ../../Zotlabs/Module/Mitem.php:228 +#: ../../Zotlabs/Module/Mitem.php:244 msgid "Edit Menu Element" msgstr "Editar elements del menú" -#: ../../Zotlabs/Module/Mitem.php:238 +#: ../../Zotlabs/Module/Mitem.php:254 msgid "Link text" msgstr "Text de l'enllaç" @@ -1278,7 +1318,7 @@ msgstr "No s'ha trobat l'esdeveniment." #: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73 #: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119 -#: ../../include/text.php:2008 ../../include/event.php:1153 +#: ../../include/text.php:2025 ../../include/event.php:1153 msgid "event" msgstr "esdeveniment" @@ -1339,13 +1379,13 @@ msgstr "Edita la descripció" msgid "Edit Location" msgstr "Edita la ubicació" -#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123 -#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:762 -#: ../../include/conversation.php:1333 +#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1128 +#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:767 +#: ../../include/conversation.php:1341 msgid "Preview" msgstr "Vista prèvia" -#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1405 +#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1413 msgid "Permission settings" msgstr "Configuració de permisos" @@ -1370,7 +1410,7 @@ msgid "Delete event" msgstr "Esborra l'esdeveniment" #: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315 -#: ../../include/text.php:1827 +#: ../../include/text.php:1844 msgid "Link to Source" msgstr "Enllaç a la font" @@ -1455,21 +1495,21 @@ msgstr "Adreça URL de compra de l'aplicació" msgid "Please login." msgstr "Inicia sessió." -#: ../../Zotlabs/Module/Magic.php:72 +#: ../../Zotlabs/Module/Magic.php:76 msgid "Hub not found." msgstr "No s'ha trobat el hub." #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 #: ../../Zotlabs/Module/Like.php:384 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 -#: ../../include/conversation.php:116 ../../include/text.php:2005 +#: ../../addon/diaspora/Receiver.php:1530 ../../addon/pubcrawl/as.php:1509 +#: ../../include/conversation.php:116 ../../include/text.php:2022 msgid "photo" msgstr "foto" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 -#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405 -#: ../../include/conversation.php:144 ../../include/text.php:2011 +#: ../../addon/diaspora/Receiver.php:1530 ../../addon/pubcrawl/as.php:1509 +#: ../../include/conversation.php:144 ../../include/text.php:2028 msgid "status" msgstr "estat" @@ -1494,14 +1534,14 @@ msgstr "No s'ha trobat el canal." #: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207 #: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288 #: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101 -#: ../../include/conversation.php:1278 +#: ../../include/conversation.php:1283 msgid "Insert web link" msgstr "Insereix un enllaç web" #: ../../Zotlabs/Module/Article_edit.php:117 -#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:698 -#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Module/Card_edit.php:117 -#: ../../include/conversation.php:1401 +#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:703 +#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Card_edit.php:117 +#: ../../include/conversation.php:1409 msgid "Title (optional)" msgstr "Títol (opcional)" @@ -1509,17 +1549,17 @@ msgstr "Títol (opcional)" msgid "Edit Article" msgstr "Edita l'article" -#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64 +#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:66 msgid "Nothing to import." msgstr "No s'ha trobat res per importar." -#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:79 -#: ../../Zotlabs/Module/Import.php:95 +#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:81 +#: ../../Zotlabs/Module/Import.php:97 msgid "Unable to download data from old server" msgstr "No s'han pogut descarregar les dades del servidor antic" #: ../../Zotlabs/Module/Import_items.php:77 -#: ../../Zotlabs/Module/Import.php:102 +#: ../../Zotlabs/Module/Import.php:104 msgid "Imported file is empty." msgstr "El fitxer importat està buit." @@ -1542,80 +1582,84 @@ msgid "" msgstr "Empra aquest formulari per importar entrades existents i contingut d'un arxiu d'exportació." #: ../../Zotlabs/Module/Import_items.php:127 -#: ../../Zotlabs/Module/Import.php:517 +#: ../../Zotlabs/Module/Import.php:548 msgid "File to Upload" msgstr "Fitxer per pujar" -#: ../../Zotlabs/Module/New_channel.php:133 +#: ../../Zotlabs/Module/New_channel.php:147 #: ../../Zotlabs/Module/Manage.php:138 #, php-format msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "Has creat %1$.0f canals dels %2$.0f totals permesos." -#: ../../Zotlabs/Module/New_channel.php:146 -#: ../../Zotlabs/Module/Register.php:254 -msgid "Name or caption" -msgstr "Nom o llegenda" +#: ../../Zotlabs/Module/New_channel.php:154 +#: ../../Zotlabs/Module/New_channel.php:161 +#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240 +#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:276 +msgid "Loading" +msgstr "S'està carregant" -#: ../../Zotlabs/Module/New_channel.php:146 -#: ../../Zotlabs/Module/Register.php:254 +#: ../../Zotlabs/Module/New_channel.php:156 +msgid "Your real name is recommended." +msgstr "És recomanable fer servir el nom real." + +#: ../../Zotlabs/Module/New_channel.php:157 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\"" msgstr "Exemples: \"Paula Gomila\", \"Manel i els seus cavalls\", \"Assemblea de veïnes del barri\", \"Filosofia\"" -#: ../../Zotlabs/Module/New_channel.php:148 -#: ../../Zotlabs/Module/Register.php:256 +#: ../../Zotlabs/Module/New_channel.php:162 +msgid "" +"This will be used to create a unique network address (like an email " +"address)." +msgstr "Es farà servir per crear una adreça de xarxa única, com la de email." + +#: ../../Zotlabs/Module/New_channel.php:164 +msgid "Allowed characters are a-z 0-9, - and _" +msgstr "Els caràcters permesos són lletres minúscules sense accents, números i guions: a-z, 0-9, -, _" + +#: ../../Zotlabs/Module/New_channel.php:174 +msgid "Channel name" +msgstr "Nom del canal" + +#: ../../Zotlabs/Module/New_channel.php:176 +#: ../../Zotlabs/Module/Register.php:265 msgid "Choose a short nickname" msgstr "Tria un àlies curt" -#: ../../Zotlabs/Module/New_channel.php:148 -#: ../../Zotlabs/Module/Register.php:256 -#, php-format -msgid "" -"Your nickname will be used to create an easy to remember channel address " -"e.g. nickname%s" -msgstr "El teu àlies servirà per crear un nom fàcil per recordar l'adreça del canal. Per exemple, àlies%s" - -#: ../../Zotlabs/Module/New_channel.php:149 -#: ../../Zotlabs/Module/Settings/Channel.php:539 -#: ../../Zotlabs/Module/Register.php:257 +#: ../../Zotlabs/Module/New_channel.php:177 +#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Register.php:266 msgid "Channel role and privacy" msgstr "Rol i privacitat del canal" -#: ../../Zotlabs/Module/New_channel.php:149 -#: ../../Zotlabs/Module/Register.php:257 -msgid "Select a channel role with your privacy requirements." -msgstr "Tria un rol pel canal segons les teves necessitats de privacitat." +#: ../../Zotlabs/Module/New_channel.php:177 +msgid "" +"Select a channel permission role compatible with your usage needs and " +"privacy requirements." +msgstr "Escull un rol de permisos de canal. Tingues en compte l'ús que en faràs i el nivell de privacitat que desitges." -#: ../../Zotlabs/Module/New_channel.php:149 -#: ../../Zotlabs/Module/Register.php:257 -msgid "Read more about roles" -msgstr "Llegix més sobre els rols" +#: ../../Zotlabs/Module/New_channel.php:177 +#: ../../Zotlabs/Module/Register.php:266 +msgid "Read more about channel permission roles" +msgstr "Llegeix més sobre els rols de permisos en els canals" -#: ../../Zotlabs/Module/New_channel.php:152 -msgid "Create Channel" +#: ../../Zotlabs/Module/New_channel.php:180 +msgid "Create a Channel" msgstr "Crea un canal" -#: ../../Zotlabs/Module/New_channel.php:153 +#: ../../Zotlabs/Module/New_channel.php:181 msgid "" "A channel is a unique network identity. It can represent a person (social " "network profile), a forum (group), a business or celebrity page, a newsfeed," -" and many other things. Channels can make connections with other channels to" -" share information with each other." -msgstr "Cada canal és una identitat de xarxa única. Tant pot representar una persona (el seu perfil social), com un fòrum (un grup), una associació o la pàgina d'algun personatge públic, una font de notícies, i moltes més coses. Els canals poden connectar-se entre ells per a compartir informació." +" and many other things." +msgstr "Un canal és una identitat de xarxa única. Tant pot representar una persona (el seu perfil social), com un fòrum (un grup), una associació o la pàgina d'algun personatge públic, un flux de notícies, i moltes més coses." -#: ../../Zotlabs/Module/New_channel.php:153 -msgid "" -"The type of channel you create affects the basic privacy settings, the " -"permissions that are granted to connections/friends, and also the channel's " -"visibility across the network." -msgstr "El tipus de canal que creïs determinarà els permisos de privacitat bàsics, els atorgats a les connexions i a la visibilitat del canal a la xarxa." - -#: ../../Zotlabs/Module/New_channel.php:154 +#: ../../Zotlabs/Module/New_channel.php:182 msgid "" "or <a href=\"import\">import an existing channel</a> from another location." msgstr "o bé <a href=\"import\">importa un canal existent</a> des d'una altra ubicació." -#: ../../Zotlabs/Module/New_channel.php:159 +#: ../../Zotlabs/Module/New_channel.php:187 msgid "Validate" msgstr "Valida-ho" @@ -1661,7 +1705,7 @@ msgid "" msgstr "Per defecte, només es pot esborrar la instància del canal ubicada en aquest hub." #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:600 +#: ../../Zotlabs/Module/Settings/Channel.php:622 msgid "Remove Channel" msgstr "Elimina el canal" @@ -1674,12 +1718,12 @@ msgid "NEW" msgstr "NOU" #: ../../Zotlabs/Module/Sharedwithme.php:107 -#: ../../Zotlabs/Storage/Browser.php:285 ../../include/text.php:1434 +#: ../../Zotlabs/Storage/Browser.php:287 ../../include/text.php:1451 msgid "Size" msgstr "Mida" #: ../../Zotlabs/Module/Sharedwithme.php:108 -#: ../../Zotlabs/Storage/Browser.php:286 +#: ../../Zotlabs/Storage/Browser.php:288 msgid "Last Modified" msgstr "Última modificació" @@ -2257,152 +2301,6 @@ msgstr "Prova a fer automàticament aquesta actualització" msgid "No failed updates." msgstr "No hi ha actualitzacions fallides." -#: ../../Zotlabs/Module/Admin/Plugins.php:259 -#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94 -#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 -#: ../../Zotlabs/Module/Display.php:453 -#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62 -#: ../../include/items.php:3619 -msgid "Item not found." -msgstr "No s'ha trobat l'element." - -#: ../../Zotlabs/Module/Admin/Plugins.php:289 -#, php-format -msgid "Plugin %s disabled." -msgstr "S'ha desactivat l'extensió %s." - -#: ../../Zotlabs/Module/Admin/Plugins.php:294 -#, php-format -msgid "Plugin %s enabled." -msgstr "S'ha activat l'extensió %s." - -#: ../../Zotlabs/Module/Admin/Plugins.php:310 -#: ../../Zotlabs/Module/Admin/Themes.php:95 -msgid "Disable" -msgstr "Desactiva" - -#: ../../Zotlabs/Module/Admin/Plugins.php:313 -#: ../../Zotlabs/Module/Admin/Themes.php:97 -msgid "Enable" -msgstr "Activa" - -#: ../../Zotlabs/Module/Admin/Plugins.php:341 -#: ../../Zotlabs/Module/Admin/Plugins.php:436 -#: ../../Zotlabs/Module/Admin/Accounts.php:166 -#: ../../Zotlabs/Module/Admin/Logs.php:82 -#: ../../Zotlabs/Module/Admin/Channels.php:145 -#: ../../Zotlabs/Module/Admin/Themes.php:122 -#: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Site.php:294 -#: ../../Zotlabs/Module/Admin/Security.php:86 -#: ../../Zotlabs/Module/Admin.php:136 -msgid "Administration" -msgstr "Administració" - -#: ../../Zotlabs/Module/Admin/Plugins.php:342 -#: ../../Zotlabs/Module/Admin/Plugins.php:437 -#: ../../Zotlabs/Widget/Admin.php:27 -msgid "Plugins" -msgstr "Extensions" - -#: ../../Zotlabs/Module/Admin/Plugins.php:343 -#: ../../Zotlabs/Module/Admin/Themes.php:124 -msgid "Toggle" -msgstr "Commuta'n l'estat" - -#: ../../Zotlabs/Module/Admin/Plugins.php:344 -#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242 -#: ../../Zotlabs/Widget/Newmember.php:46 -#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:105 -#: ../../include/nav.php:192 -msgid "Settings" -msgstr "Configuració" - -#: ../../Zotlabs/Module/Admin/Plugins.php:351 -#: ../../Zotlabs/Module/Admin/Themes.php:134 -msgid "Author: " -msgstr "Autor/a:" - -#: ../../Zotlabs/Module/Admin/Plugins.php:352 -#: ../../Zotlabs/Module/Admin/Themes.php:135 -msgid "Maintainer: " -msgstr "Persona mantenidora:" - -#: ../../Zotlabs/Module/Admin/Plugins.php:353 -msgid "Minimum project version: " -msgstr "Versió mínima del projecte:" - -#: ../../Zotlabs/Module/Admin/Plugins.php:354 -msgid "Maximum project version: " -msgstr "Versió màxima del projecte:" - -#: ../../Zotlabs/Module/Admin/Plugins.php:355 -msgid "Minimum PHP version: " -msgstr "Versió mínima de PHP:" - -#: ../../Zotlabs/Module/Admin/Plugins.php:356 -msgid "Compatible Server Roles: " -msgstr "Rols de servidor compatibles" - -#: ../../Zotlabs/Module/Admin/Plugins.php:357 -msgid "Requires: " -msgstr "Demana:" - -#: ../../Zotlabs/Module/Admin/Plugins.php:358 -#: ../../Zotlabs/Module/Admin/Plugins.php:442 -msgid "Disabled - version incompatibility" -msgstr "Desactivada - versions incompatibles" - -#: ../../Zotlabs/Module/Admin/Plugins.php:411 -msgid "Enter the public git repository URL of the plugin repo." -msgstr "Introdueix la URL del repositori git d'extensions. Ha de ser un repositori públic." - -#: ../../Zotlabs/Module/Admin/Plugins.php:412 -msgid "Plugin repo git URL" -msgstr "Adreça URL del repositori d'extensions." - -#: ../../Zotlabs/Module/Admin/Plugins.php:413 -msgid "Custom repo name" -msgstr "Nom personalitzat pel repositori" - -#: ../../Zotlabs/Module/Admin/Plugins.php:413 -msgid "(optional)" -msgstr "(opcional)" - -#: ../../Zotlabs/Module/Admin/Plugins.php:414 -msgid "Download Plugin Repo" -msgstr "Descarrega el repositori" - -#: ../../Zotlabs/Module/Admin/Plugins.php:421 -msgid "Install new repo" -msgstr "Instal·la un nou repositori" - -#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:393 -msgid "Install" -msgstr "Instal·la" - -#: ../../Zotlabs/Module/Admin/Plugins.php:445 -msgid "Manage Repos" -msgstr "Gestiona els repositoris" - -#: ../../Zotlabs/Module/Admin/Plugins.php:446 -msgid "Installed Plugin Repositories" -msgstr "Repositoris instaŀlats" - -#: ../../Zotlabs/Module/Admin/Plugins.php:447 -msgid "Install a New Plugin Repository" -msgstr "Instal·la un nou repositori" - -#: ../../Zotlabs/Module/Admin/Plugins.php:454 -msgid "Switch branch" -msgstr "Canvia de branca" - -#: ../../Zotlabs/Module/Admin/Plugins.php:455 -#: ../../Zotlabs/Module/Photos.php:1020 ../../Zotlabs/Module/Tagrm.php:137 -#: ../../addon/superblock/superblock.php:116 -msgid "Remove" -msgstr "Esborra" - #: ../../Zotlabs/Module/Admin/Accounts.php:37 #, php-format msgid "%s account blocked/unblocked" @@ -2421,7 +2319,7 @@ msgstr[1] "S'han esborrat %s comptes" msgid "Account not found" msgstr "No s'ha trobat el compte" -#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2473 +#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2490 #, php-format msgid "Account '%s' deleted" msgstr "S'ha esborrat el compte '%s'" @@ -2436,6 +2334,19 @@ msgstr "S'ha bloquejat el compte '%s'" msgid "Account '%s' unblocked" msgstr "S'ha desbloquejat el compte '%s'" +#: ../../Zotlabs/Module/Admin/Accounts.php:166 +#: ../../Zotlabs/Module/Admin/Logs.php:82 +#: ../../Zotlabs/Module/Admin/Channels.php:145 +#: ../../Zotlabs/Module/Admin/Themes.php:122 +#: ../../Zotlabs/Module/Admin/Themes.php:156 +#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Addons.php:341 +#: ../../Zotlabs/Module/Admin/Addons.php:436 +#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/Admin.php:140 +msgid "Administration" +msgstr "Administració" + #: ../../Zotlabs/Module/Admin/Accounts.php:167 #: ../../Zotlabs/Module/Admin/Accounts.php:180 #: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23 @@ -2460,7 +2371,7 @@ msgid "No registrations." msgstr "Sense inscripcions." #: ../../Zotlabs/Module/Admin/Accounts.php:173 -#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:732 +#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:735 msgid "Approve" msgstr "Aprova" @@ -2483,7 +2394,7 @@ msgstr "Desbloqueja" msgid "ID" msgstr "Identificador" -#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/group.php:284 +#: ../../Zotlabs/Module/Admin/Accounts.php:184 msgid "All Channels" msgstr "Tots els canals" @@ -2597,7 +2508,7 @@ msgid "Channel '%s' code disallowed" msgstr "S'ha desactivat un codi pel canal «%s»" #: ../../Zotlabs/Module/Admin/Channels.php:146 -#: ../../Zotlabs/Module/Admin.php:110 ../../Zotlabs/Widget/Admin.php:24 +#: ../../Zotlabs/Module/Admin.php:114 ../../Zotlabs/Widget/Admin.php:24 msgid "Channels" msgstr "Canals" @@ -2618,7 +2529,7 @@ msgid "Disallow Code" msgstr "Desactiva el codi" #: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1811 ../../include/nav.php:378 +#: ../../include/conversation.php:1820 ../../include/nav.php:370 msgid "Channel" msgstr "Canal" @@ -2646,6 +2557,25 @@ msgstr "S'ha actualitzat la configuració de tema." msgid "No themes found." msgstr "No s'ha trobat cap tema." +#: ../../Zotlabs/Module/Admin/Themes.php:72 +#: ../../Zotlabs/Module/Admin/Addons.php:259 ../../Zotlabs/Module/Thing.php:94 +#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 +#: ../../Zotlabs/Module/Display.php:453 +#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62 +#: ../../include/items.php:3566 +msgid "Item not found." +msgstr "No s'ha trobat l'element." + +#: ../../Zotlabs/Module/Admin/Themes.php:95 +#: ../../Zotlabs/Module/Admin/Addons.php:310 +msgid "Disable" +msgstr "Desactiva" + +#: ../../Zotlabs/Module/Admin/Themes.php:97 +#: ../../Zotlabs/Module/Admin/Addons.php:313 +msgid "Enable" +msgstr "Activa" + #: ../../Zotlabs/Module/Admin/Themes.php:116 msgid "Screenshot" msgstr "Captura de pantalla" @@ -2655,6 +2585,28 @@ msgstr "Captura de pantalla" msgid "Themes" msgstr "Temes" +#: ../../Zotlabs/Module/Admin/Themes.php:124 +#: ../../Zotlabs/Module/Admin/Addons.php:343 +msgid "Toggle" +msgstr "Commuta'n l'estat" + +#: ../../Zotlabs/Module/Admin/Themes.php:125 +#: ../../Zotlabs/Module/Admin/Addons.php:344 ../../Zotlabs/Lib/Apps.php:304 +#: ../../Zotlabs/Widget/Newmember.php:46 +#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:99 +msgid "Settings" +msgstr "Configuració" + +#: ../../Zotlabs/Module/Admin/Themes.php:134 +#: ../../Zotlabs/Module/Admin/Addons.php:351 +msgid "Author: " +msgstr "Autor/a:" + +#: ../../Zotlabs/Module/Admin/Themes.php:135 +#: ../../Zotlabs/Module/Admin/Addons.php:352 +msgid "Maintainer: " +msgstr "Persona mantenidora:" + #: ../../Zotlabs/Module/Admin/Themes.php:162 msgid "[Experimental]" msgstr "[Experimental]" @@ -2663,469 +2615,584 @@ msgstr "[Experimental]" msgid "[Unsupported]" msgstr "[Incompatible]" -#: ../../Zotlabs/Module/Admin/Site.php:165 +#: ../../Zotlabs/Module/Admin/Site.php:172 msgid "Site settings updated." msgstr "S'ha actualitzat la configuració del lloc" -#: ../../Zotlabs/Module/Admin/Site.php:191 +#: ../../Zotlabs/Module/Admin/Site.php:198 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3106 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3078 msgid "Default" msgstr "Predeterminat" -#: ../../Zotlabs/Module/Admin/Site.php:202 +#: ../../Zotlabs/Module/Admin/Site.php:209 #: ../../Zotlabs/Module/Settings/Display.php:130 #, php-format msgid "%s - (Incompatible)" msgstr "%s - (Incompatible)" -#: ../../Zotlabs/Module/Admin/Site.php:209 +#: ../../Zotlabs/Module/Admin/Site.php:216 msgid "mobile" msgstr "mòbil" -#: ../../Zotlabs/Module/Admin/Site.php:211 +#: ../../Zotlabs/Module/Admin/Site.php:218 msgid "experimental" msgstr "experimental" -#: ../../Zotlabs/Module/Admin/Site.php:213 +#: ../../Zotlabs/Module/Admin/Site.php:220 msgid "unsupported" msgstr "incompatible" -#: ../../Zotlabs/Module/Admin/Site.php:260 +#: ../../Zotlabs/Module/Admin/Site.php:267 msgid "Yes - with approval" msgstr "Sí - amb aprovació" -#: ../../Zotlabs/Module/Admin/Site.php:266 +#: ../../Zotlabs/Module/Admin/Site.php:273 msgid "My site is not a public server" msgstr "El meu node no es un servidor públic" -#: ../../Zotlabs/Module/Admin/Site.php:267 +#: ../../Zotlabs/Module/Admin/Site.php:274 msgid "My site has paid access only" msgstr "El meu node només ofereix accés de pagament" -#: ../../Zotlabs/Module/Admin/Site.php:268 +#: ../../Zotlabs/Module/Admin/Site.php:275 msgid "My site has free access only" msgstr "El meu node només ofereix accés gratuït" -#: ../../Zotlabs/Module/Admin/Site.php:269 +#: ../../Zotlabs/Module/Admin/Site.php:276 msgid "My site offers free accounts with optional paid upgrades" msgstr "El meu node ofereix comptes gratuïts i millores de pagament" -#: ../../Zotlabs/Module/Admin/Site.php:281 +#: ../../Zotlabs/Module/Admin/Site.php:288 msgid "Beginner/Basic" msgstr "Principiant/bàsica" -#: ../../Zotlabs/Module/Admin/Site.php:282 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "Novice - not skilled but willing to learn" msgstr "Aprenent - amb poca experiència però amb ganes d'aprendre" -#: ../../Zotlabs/Module/Admin/Site.php:283 +#: ../../Zotlabs/Module/Admin/Site.php:290 msgid "Intermediate - somewhat comfortable" msgstr "Intermedi - còmode en entorns informàtics" -#: ../../Zotlabs/Module/Admin/Site.php:284 +#: ../../Zotlabs/Module/Admin/Site.php:291 msgid "Advanced - very comfortable" msgstr "Avançat - molt còmode en entorns informàtics" -#: ../../Zotlabs/Module/Admin/Site.php:285 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "Expert - I can write computer code" msgstr "Expert - Sé programar" -#: ../../Zotlabs/Module/Admin/Site.php:286 +#: ../../Zotlabs/Module/Admin/Site.php:293 msgid "Wizard - I probably know more than you do" msgstr "Bruixot - Segurament en sé més que tu" -#: ../../Zotlabs/Module/Admin/Site.php:295 ../../Zotlabs/Widget/Admin.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:299 +msgid "Default permission role for new accounts" +msgstr "Rol de permisos per defecte per als comptes nous." + +#: ../../Zotlabs/Module/Admin/Site.php:299 +msgid "" +"This role will be used for the first channel created after registration." +msgstr "S'aplicarà aquest rol al primer canal que es creï després del registre d'un compte." + +#: ../../Zotlabs/Module/Admin/Site.php:308 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "Node" -#: ../../Zotlabs/Module/Admin/Site.php:297 -#: ../../Zotlabs/Module/Register.php:269 +#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Register.php:278 msgid "Registration" msgstr "Inscripcions" -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "File upload" msgstr "Pujada d'arxius" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Policies" msgstr "Polítiques" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:313 #: ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "Avançat" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:317 #: ../../addon/statusnet/statusnet.php:891 msgid "Site name" msgstr "Nom del node" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Site default technical skill level" msgstr "Nivell per defecte del lloc de competències tècniques" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Used to provide a member experience matched to technical comfort level" msgstr "Es fa servir per oferir una experiència ajustada al nivell tècnic de cadascú" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Lock the technical skill level setting" msgstr "Bloqueja el paràmetre de nivell tècnic" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Members can set their own technical comfort level by default" msgstr "Per defecte, els/les membres poden modificar el paràmetre de nivell tècnic" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Banner/Logo" msgstr "Cartell i logotip" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "Es permet contingut HTML, CSS i JS, sense filtrar" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "Administrator Information" msgstr "Informació de l'administració" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Informació per contactar amb les persones administradores del node. Es mostra a la pàgina d'informació del node. S'hi pot emprar BBCode." -#: ../../Zotlabs/Module/Admin/Site.php:312 -#: ../../Zotlabs/Module/Siteinfo.php:21 +#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Siteinfo.php:24 msgid "Site Information" msgstr "Informació del node" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Descripció del node visible públicament. Es mostra a la pàgina d'informació del node. S'hi pot emprar BBCode." -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "System language" msgstr "Llengua del sistema" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "System theme" msgstr "Tema del sistema" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "Tema del sistema per defecte. Les persones usuàries poden sobreescriure'l a la configuració de perfil: <a href='#' id='cnftheme'>canvia la configuració de tema</a>" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "Allow Feeds as Connections" msgstr "Permet connectar-se a fluxos RSS" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "(Heavy system resource usage)" msgstr "(Demana molts recursos de sistema)" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "Maximum image size" msgstr "Mida màxima d'imatge" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Mida màxima total per les imatges pujades, en bytes. Per defecte és 0, que vol dir iŀlimitada." -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "Does this site allow new member registration?" msgstr "Aquest node està obert a la inscripció de nous membres?" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "Invitation only" msgstr "Només per invitació" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:333 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "Només permet nous membres només a través d'invitacions. Perquè tingui efecte, les inscripcions han d'estar obertes a nous membres." -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Minimum age" msgstr "Edat mínima" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Minimum age (in years) for who may register on this site." msgstr "Edat mínima en anys per a poder crear un compte en aquest lloc." -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:335 msgid "Which best describes the types of account offered by this hub?" msgstr "Quina descripció s'acosta més al tipus de comptes oferts en aquest node?" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Register text" msgstr "Text d'inscripció" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Will be displayed prominently on the registration page." msgstr "Es mostrarà en gran a la pàgina d'inscripció" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Site homepage to show visitors (default: login box)" msgstr "Pàgina d'inici a mostrar als visitants (per defecte: la pàgina d'inici de sessió)" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "" "example: 'public' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "exemple: 'public' per a mostrar el flux públic, 'page/sys/home' per a mostrar una pàgina web de sistema de nom 'home', o 'include:home.html' per a incloure un arxiu." -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:339 msgid "Preserve site homepage URL" msgstr "Preserva l'adreça URL de la pàgina d'inici" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:339 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "Presenta la pàgina d'inici del node en un marc en el lloc original enlloc de redirigir-hi" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Accounts abandoned after x days" msgstr "Els comptes es consideren abandonats després de X dies" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Estalviarà recursos del sistema en no sondejar nodes externs per a comptes abandonats. Un 0 vol dir \"mai\"." -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:341 msgid "Allowed friend domains" msgstr "Dominis amb permisos de connexió" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:341 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Llista separada per comes de dominis en els quals està permès establir relacions d'amistat amb aquest node. S'accepten comodins (*). Deixa-ho buit per a acceptar qualsevol domini" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "Verify Email Addresses" msgstr "Verifica les adreces de correu electrònic" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "Activa per a comprovar l'adreça de correu emprada durant la inscripció d'un nou compte (recomanat)." -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "Force publish" msgstr "Força la publicació" -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Activa per a forçar que tots el perfils en aquest node siguin llistats en el directori del lloc." -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Import Public Streams" msgstr "Importar fluxos públics" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "Importa i permet l'accés a contingut públic sondejat d'altres llocs. Avís: aquest contingut no estarà moderat." -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "Site only Public Streams" msgstr "Fluxos públics només locals" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "" "Allow access to public content originating only from this site if Imported " "Public Streams are disabled." msgstr "Permet accedir a aquell contingut públic que s'hagi originat en aquest lloc, suposant que no s'estan important fluxos públics d'altres nodes." -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "Allow anybody on the internet to access the Public streams" msgstr "Permet a qualsevol persona d'internet d'accedir els fluxos públics" -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "" "Disable to require authentication before viewing. Warning: this content is " "unmoderated." msgstr "Desabilita-ho per a demanar iniciar sessió per poder-ho veure. Alerta: el contingut no estarà moderat." -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:347 +msgid "Only import Public stream posts with this text" +msgstr "Importa només entrades del flux públics que continguin aquest text" + +#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876 +msgid "" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" +msgstr "paraules una per línia o #etiquetes o /patrons/ o idioma=xx, deixar en blanc per importar totes les entrades" + +#: ../../Zotlabs/Module/Admin/Site.php:348 +msgid "Do not import Public stream posts with this text" +msgstr "No importes entrades del flux públic que continguin aquest text" + +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "Login on Homepage" msgstr "Accés a la Pàgina d'inici" -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:351 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "Presenta una casella d'identificació a la pàgina d'inici als visitants si no s'ha configurat altre contingut." -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "Enable context help" msgstr "Activar l'ajuda contextual" -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "" "Display contextual help for the current page when the help button is " "pressed." msgstr "Mostra l'ajuda contextual per la pàgina actual quan el botó d'ajuda es pressionat." -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:354 msgid "Reply-to email address for system generated email." msgstr "Adreça de correu de resposta per als correus generats." -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:355 msgid "Sender (From) email address for system generated email." msgstr "Adreça de correu de remitent per als correus generats." -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:356 msgid "Name of email sender for system generated email." msgstr "Nom visible de remitent per als correus generats." -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:358 msgid "Directory Server URL" msgstr "URL del Servidor de Directoris" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:358 msgid "Default directory server" msgstr "Servidor de directori per defecte" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:360 msgid "Proxy user" msgstr "Usuari Proxy" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:361 msgid "Proxy URL" msgstr "URL del Proxy" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:362 msgid "Network timeout" msgstr "Temps d'espera de la xarxa" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:362 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Valor en segons. Ajusta a 0 per a sense límits (no recomanat)" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:363 msgid "Delivery interval" msgstr "Interval de lliurament" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:363 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Retarda en segon plà l'interval de lliurament per aquests segons per reduir la càrrega del sistema. Recomanat: 4-5 per a hostes compartits, 2-3 per a servidors privats virtuals. 0-1 per a servidors dedicats." -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:364 msgid "Deliveries per process" msgstr "Entregues per processar" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:364 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust" " if necessary to tune system performance. Recommend: 1-5." msgstr "Nombre de entregues a intentar processar en un únic procèss del sistema operatiu. Ajustar si es necessari per millorar el rendiment. Es recomana: 1-5." -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:365 msgid "Queue Threshold" msgstr "Llindar de la cua" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:365 msgid "" "Always defer immediate delivery if queue contains more than this number of " "entries." msgstr "Posposa el lliurament immediat si la cua conté més d'aquest nombre d'entrades." -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:366 msgid "Poll interval" msgstr "interval de sondeig" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:366 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "Retarda en segon pla el sondeig en aquesta quantitat de segons per a reduir la càrrega dels sistema. Si es 0 , empra l'interval de lliurament." -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:367 msgid "Path to ImageMagick convert program" msgstr "Ruta al programa de conversió d'imatges ImageMagick" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:367 msgid "" "If set, use this program to generate photo thumbnails for huge images ( > " "4000 pixels in either dimension), otherwise memory exhaustion may occur. " "Example: /usr/bin/convert" msgstr "Si se n'indica la ruta, es farà servir aquest programa per a generar miniatures per a imatges enormes (més de 4000 píxels d'ample o alt). En cas contrari es pot esgotar la memòria del servidor. Ruta d'exemple: /usr/bin/convert" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:368 msgid "Allow SVG thumbnails in file browser" msgstr "Permet miniatures en SVG a l'explorador de fitxers" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:368 msgid "WARNING: SVG images may contain malicious code." msgstr "Alerta: Les imatges SVG poden contenir codi maliciós." -#: ../../Zotlabs/Module/Admin/Site.php:351 +#: ../../Zotlabs/Module/Admin/Site.php:369 msgid "Maximum Load Average" msgstr "Càrrega Mitja Màxima" -#: ../../Zotlabs/Module/Admin/Site.php:351 +#: ../../Zotlabs/Module/Admin/Site.php:369 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Càrrega màxima del sistema, abans que els processos de lliurament i sondeig es difereixin - 50 per defecte." -#: ../../Zotlabs/Module/Admin/Site.php:352 +#: ../../Zotlabs/Module/Admin/Site.php:370 msgid "Expiration period in days for imported (grid/network) content" msgstr "Període d'expiració en dies per contingut importat (malla/xarxa)" -#: ../../Zotlabs/Module/Admin/Site.php:352 +#: ../../Zotlabs/Module/Admin/Site.php:370 msgid "0 for no expiration of imported content" msgstr "0 vol dir sense temps d'expiració pel contingut importat" -#: ../../Zotlabs/Module/Admin/Site.php:353 +#: ../../Zotlabs/Module/Admin/Site.php:371 msgid "" "Do not expire any posts which have comments less than this many days ago" msgstr "No facis caducar les entrades que tinguin comentaris més nous que aquest nombre de dies" -#: ../../Zotlabs/Module/Admin/Site.php:355 +#: ../../Zotlabs/Module/Admin/Site.php:373 msgid "" "Public servers: Optional landing (marketing) webpage for new registrants" msgstr "Servidors públics: Pàgina d'arribada promocional per a nous usuaris o usuàries." -#: ../../Zotlabs/Module/Admin/Site.php:355 +#: ../../Zotlabs/Module/Admin/Site.php:373 #, php-format msgid "Create this page first. Default is %s/register" msgstr "Crea primer aquesta pàgina. Per defecte és %s/register" -#: ../../Zotlabs/Module/Admin/Site.php:356 +#: ../../Zotlabs/Module/Admin/Site.php:374 msgid "Page to display after creating a new channel" msgstr "Pàgina que es mostrarà després d'haver creat un canal nou" -#: ../../Zotlabs/Module/Admin/Site.php:356 -msgid "Recommend: profiles, go, or settings" -msgstr "Recomanat: profiles (perfils), go (mostra diverses opcions), settings (configuració)" +#: ../../Zotlabs/Module/Admin/Site.php:374 +msgid "Default: profiles" +msgstr "Per defecte: profiles" -#: ../../Zotlabs/Module/Admin/Site.php:358 +#: ../../Zotlabs/Module/Admin/Site.php:376 msgid "Optional: site location" msgstr "Opcional: ubicació del node" -#: ../../Zotlabs/Module/Admin/Site.php:358 +#: ../../Zotlabs/Module/Admin/Site.php:376 msgid "Region or country" msgstr "Regió o país" +#: ../../Zotlabs/Module/Admin/Addons.php:289 +#, php-format +msgid "Plugin %s disabled." +msgstr "S'ha desactivat l'extensió %s." + +#: ../../Zotlabs/Module/Admin/Addons.php:294 +#, php-format +msgid "Plugin %s enabled." +msgstr "S'ha activat l'extensió %s." + +#: ../../Zotlabs/Module/Admin/Addons.php:342 +#: ../../Zotlabs/Module/Admin/Addons.php:437 ../../Zotlabs/Widget/Admin.php:27 +msgid "Addons" +msgstr "Extensions" + +#: ../../Zotlabs/Module/Admin/Addons.php:353 +msgid "Minimum project version: " +msgstr "Versió mínima del projecte:" + +#: ../../Zotlabs/Module/Admin/Addons.php:354 +msgid "Maximum project version: " +msgstr "Versió màxima del projecte:" + +#: ../../Zotlabs/Module/Admin/Addons.php:355 +msgid "Minimum PHP version: " +msgstr "Versió mínima de PHP:" + +#: ../../Zotlabs/Module/Admin/Addons.php:356 +msgid "Compatible Server Roles: " +msgstr "Rols de servidor compatibles" + +#: ../../Zotlabs/Module/Admin/Addons.php:357 +msgid "Requires: " +msgstr "Demana:" + +#: ../../Zotlabs/Module/Admin/Addons.php:358 +#: ../../Zotlabs/Module/Admin/Addons.php:442 +msgid "Disabled - version incompatibility" +msgstr "Desactivada - versions incompatibles" + +#: ../../Zotlabs/Module/Admin/Addons.php:411 +msgid "Enter the public git repository URL of the addon repo." +msgstr "Introdueix la URL del repositori git d'extensions. Ha de ser un repositori públic." + +#: ../../Zotlabs/Module/Admin/Addons.php:412 +msgid "Addon repo git URL" +msgstr "Adreça URL del repositori d'extensions." + +#: ../../Zotlabs/Module/Admin/Addons.php:413 +msgid "Custom repo name" +msgstr "Nom personalitzat pel repositori" + +#: ../../Zotlabs/Module/Admin/Addons.php:413 +msgid "(optional)" +msgstr "(opcional)" + +#: ../../Zotlabs/Module/Admin/Addons.php:414 +msgid "Download Addon Repo" +msgstr "Descarrega el repositori" + +#: ../../Zotlabs/Module/Admin/Addons.php:421 +msgid "Install new repo" +msgstr "Instal·la un nou repositori" + +#: ../../Zotlabs/Module/Admin/Addons.php:422 ../../Zotlabs/Lib/Apps.php:456 +msgid "Install" +msgstr "Instal·la" + +#: ../../Zotlabs/Module/Admin/Addons.php:445 +msgid "Manage Repos" +msgstr "Gestiona els repositoris" + +#: ../../Zotlabs/Module/Admin/Addons.php:446 +msgid "Installed Addon Repositories" +msgstr "Repositoris instaŀlats" + +#: ../../Zotlabs/Module/Admin/Addons.php:447 +msgid "Install a New Addon Repository" +msgstr "Instal·la un nou repositori" + +#: ../../Zotlabs/Module/Admin/Addons.php:454 +msgid "Switch branch" +msgstr "Canvia de branca" + +#: ../../Zotlabs/Module/Admin/Addons.php:455 +#: ../../Zotlabs/Module/Photos.php:1025 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../addon/superblock/superblock.php:116 +msgid "Remove" +msgstr "Esborra" + #: ../../Zotlabs/Module/Admin/Profs.php:89 msgid "New Profile Field" msgstr "Camp de Perfil Nou" @@ -3168,8 +3235,8 @@ msgstr "Informació adicional (opcional)" #: ../../Zotlabs/Module/Admin/Profs.php:94 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53 -#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1052 -#: ../../include/text.php:1064 +#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1063 +#: ../../include/text.php:1075 msgid "Save" msgstr "Guardar" @@ -3179,7 +3246,7 @@ msgstr "No es troba la definició del camp" #: ../../Zotlabs/Module/Admin/Profs.php:109 msgid "Edit Profile Field" -msgstr "Camp d'Edició del Perfil" +msgstr "Modifica el camp de perfil" #: ../../Zotlabs/Module/Admin/Profs.php:168 ../../Zotlabs/Widget/Admin.php:30 msgid "Profile Fields" @@ -3246,116 +3313,129 @@ msgstr "Idioma pel compte (pels correus)" msgid "Service class" msgstr "Classe de servei" -#: ../../Zotlabs/Module/Admin/Security.php:77 +#: ../../Zotlabs/Module/Admin/Security.php:83 msgid "" "By default, unfiltered HTML is allowed in embedded media. This is inherently" " insecure." msgstr "Per defecte, HTML no filtrat està permés als media embeguts. Això es inherentment no segur." -#: ../../Zotlabs/Module/Admin/Security.php:80 +#: ../../Zotlabs/Module/Admin/Security.php:86 msgid "" "The recommended setting is to only allow unfiltered HTML from the following " "sites:" msgstr "L'ajust recomanat és només permetre HTML sense filtrar dels següents llocs:" -#: ../../Zotlabs/Module/Admin/Security.php:81 +#: ../../Zotlabs/Module/Admin/Security.php:87 msgid "" "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br" " />https://vimeo.com/<br />https://soundcloud.com/<br />" msgstr "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />" -#: ../../Zotlabs/Module/Admin/Security.php:82 +#: ../../Zotlabs/Module/Admin/Security.php:88 msgid "" "All other embedded content will be filtered, <strong>unless</strong> " "embedded content from that site is explicitly blocked." msgstr "Tota la resta de contingut embegut seà filtrat, <strong>excepte</strong> contingut embegut d'aquest lloc que està blocat explícitament." -#: ../../Zotlabs/Module/Admin/Security.php:87 +#: ../../Zotlabs/Module/Admin/Security.php:93 #: ../../Zotlabs/Widget/Admin.php:25 msgid "Security" msgstr "Seguretat" -#: ../../Zotlabs/Module/Admin/Security.php:89 +#: ../../Zotlabs/Module/Admin/Security.php:95 msgid "Block public" msgstr "Bloca que sigui públic" -#: ../../Zotlabs/Module/Admin/Security.php:89 +#: ../../Zotlabs/Module/Admin/Security.php:95 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently authenticated." msgstr "activa per blocar l'accés a les pàgines personals públiques a tothom excepte aquells/es que s'hagin autenticat en aquest node." -#: ../../Zotlabs/Module/Admin/Security.php:90 +#: ../../Zotlabs/Module/Admin/Security.php:96 +msgid "Provide a cloud root directory" +msgstr "Ofereix un directori arrel de núvols" + +#: ../../Zotlabs/Module/Admin/Security.php:96 +msgid "" +"The cloud root directory lists all channel names which provide public files" +msgstr "EL directori arrel de núvols llista tots els canals que ofereixen fitxers públicament" + +#: ../../Zotlabs/Module/Admin/Security.php:97 +msgid "Show total disk space available to cloud uploads" +msgstr "Mostra l'espai disc disponible per a pujar arxius als núvols" + +#: ../../Zotlabs/Module/Admin/Security.php:98 msgid "Set \"Transport Security\" HTTP header" msgstr "Set \"Transport Security\" HTTP header" -#: ../../Zotlabs/Module/Admin/Security.php:91 +#: ../../Zotlabs/Module/Admin/Security.php:99 msgid "Set \"Content Security Policy\" HTTP header" msgstr "Set \"Content Security Policy\" HTTP header" -#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/Admin/Security.php:100 msgid "Allowed email domains" msgstr "Dominis de correu electonic acceptats" -#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/Admin/Security.php:100 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "llista separada per comes de dominis d'adreces de correu electrònic permeses en aquest lloc. S'accepten comodins. Deixar buit per acceptar qualsevol domini" -#: ../../Zotlabs/Module/Admin/Security.php:93 +#: ../../Zotlabs/Module/Admin/Security.php:101 msgid "Not allowed email domains" msgstr "Dominis de correu electrònic no acceptats" -#: ../../Zotlabs/Module/Admin/Security.php:93 +#: ../../Zotlabs/Module/Admin/Security.php:101 msgid "" "Comma separated list of domains which are not allowed in email addresses for" " registrations to this site. Wildcards are accepted. Empty to allow any " "domains, unless allowed domains have been defined." msgstr "llista separada per comes de dominis d'adreces de correu electrònic no permeses en aquest lloc. S'accepten comodins. Deixar buit per no acceptar cap domini, excepte els que s'hagin definits com acceptats." -#: ../../Zotlabs/Module/Admin/Security.php:94 +#: ../../Zotlabs/Module/Admin/Security.php:102 msgid "Allow communications only from these sites" msgstr "Permetre comunicacions únicament des de aquests llocs" -#: ../../Zotlabs/Module/Admin/Security.php:94 +#: ../../Zotlabs/Module/Admin/Security.php:102 msgid "" "One site per line. Leave empty to allow communication from anywhere by " "default" msgstr "Un lloc per línia. Deixar en blanc per permetre, per defecte, la comunicació amb tothom." -#: ../../Zotlabs/Module/Admin/Security.php:95 +#: ../../Zotlabs/Module/Admin/Security.php:103 msgid "Block communications from these sites" msgstr "Bloca comunicacions que venen d'aquests llocs" -#: ../../Zotlabs/Module/Admin/Security.php:96 +#: ../../Zotlabs/Module/Admin/Security.php:104 msgid "Allow communications only from these channels" msgstr "Permet la comunicació només per aquests canals" -#: ../../Zotlabs/Module/Admin/Security.php:96 +#: ../../Zotlabs/Module/Admin/Security.php:104 msgid "" "One channel (hash) per line. Leave empty to allow from any channel by " "default" msgstr "Un canal (hash) per línia. Deixa en blanc per permetre, per defecte, la comunicació qualsevol canal." -#: ../../Zotlabs/Module/Admin/Security.php:97 +#: ../../Zotlabs/Module/Admin/Security.php:105 msgid "Block communications from these channels" msgstr "Bloca les comunicacions que venen d'aquests canals" -#: ../../Zotlabs/Module/Admin/Security.php:98 +#: ../../Zotlabs/Module/Admin/Security.php:106 msgid "Only allow embeds from secure (SSL) websites and links." msgstr "Permetre embeguts només de llocs web i enllaços segurs (SSL)." -#: ../../Zotlabs/Module/Admin/Security.php:99 +#: ../../Zotlabs/Module/Admin/Security.php:107 msgid "Allow unfiltered embedded HTML content only from these domains" msgstr "Permetre HTML embegut sense filtrar només d'aquests dominis." -#: ../../Zotlabs/Module/Admin/Security.php:99 +#: ../../Zotlabs/Module/Admin/Security.php:107 msgid "One site per line. By default embedded content is filtered." msgstr "Un lloc per línia. Per defecte el contingut embegut es filtrat." -#: ../../Zotlabs/Module/Admin/Security.php:100 +#: ../../Zotlabs/Module/Admin/Security.php:108 msgid "Block embedded HTML from these domains" msgstr "Bloca HTML embegut d'aquests dominis" @@ -3368,7 +3448,7 @@ msgid "Visible to:" msgstr "Visible per:" #: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153 -#: ../../Zotlabs/Module/Acl.php:121 ../../include/acl_selectors.php:88 +#: ../../Zotlabs/Module/Acl.php:120 ../../include/acl_selectors.php:88 msgctxt "acl" msgid "Profile" msgstr "Perfil" @@ -3396,6 +3476,7 @@ msgid "" msgstr "Pots crear regles de permisos segons classe de persona o de connexió." #: ../../Zotlabs/Module/Settings/Permcats.php:99 +#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240 msgid "Permission Categories" msgstr "Categories de permisos" @@ -3407,7 +3488,7 @@ msgstr "Nom de permís" #: ../../Zotlabs/Module/Settings/Tokens.php:161 #: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250 msgid "My Settings" -msgstr "Els Meus Ajustos" +msgstr "La meva configuració" #: ../../Zotlabs/Module/Settings/Permcats.php:110 #: ../../Zotlabs/Module/Settings/Tokens.php:163 @@ -3429,20 +3510,20 @@ msgid "" "href=\"settings\"><strong>privacy settings</strong></a>, which have higher " "priority than individual settings. You can <strong>not</strong> change those" " settings here." -msgstr "Alguns permisos poden ser heretats dels teus canals <a href=\"settings\"><strong>ajustos de privacitat</strong></a>, Els quals tenen més prioritat que els ajustos individuals. <strong>No</strong> pots canviar aquests ajustos aquí." +msgstr "Alguns permisos pot ser que vinguin heretats de la <a href=\"settings\"><strong>configuració de privacitat</strong></a> del teu canal. Aquesta té més prioritat que les configuracions individuals. <strong>No</strong> pots canviar aquests paràmetres aquí." -#: ../../Zotlabs/Module/Settings/Channel.php:64 #: ../../Zotlabs/Module/Settings/Channel.php:68 -#: ../../Zotlabs/Module/Settings/Channel.php:69 #: ../../Zotlabs/Module/Settings/Channel.php:72 -#: ../../Zotlabs/Module/Settings/Channel.php:83 +#: ../../Zotlabs/Module/Settings/Channel.php:73 +#: ../../Zotlabs/Module/Settings/Channel.php:76 +#: ../../Zotlabs/Module/Settings/Channel.php:87 #: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:24 #: ../../include/selectors.php:123 ../../include/channel.php:437 #: ../../include/channel.php:438 ../../include/channel.php:445 msgid "Friends" msgstr "Amics" -#: ../../Zotlabs/Module/Settings/Channel.php:264 +#: ../../Zotlabs/Module/Settings/Channel.php:272 #: ../../Zotlabs/Module/Defperms.php:103 #: ../../addon/rendezvous/rendezvous.php:82 #: ../../addon/openstreetmap/openstreetmap.php:184 @@ -3452,401 +3533,415 @@ msgstr "Amics" msgid "Settings updated." msgstr "Ajustes actualizados." -#: ../../Zotlabs/Module/Settings/Channel.php:325 +#: ../../Zotlabs/Module/Settings/Channel.php:333 msgid "Nobody except yourself" msgstr "Ningú excepte tú" -#: ../../Zotlabs/Module/Settings/Channel.php:326 +#: ../../Zotlabs/Module/Settings/Channel.php:334 msgid "Only those you specifically allow" msgstr "Només allò que específicament permetis" -#: ../../Zotlabs/Module/Settings/Channel.php:327 +#: ../../Zotlabs/Module/Settings/Channel.php:335 msgid "Approved connections" msgstr "Connexions aprovades" -#: ../../Zotlabs/Module/Settings/Channel.php:328 +#: ../../Zotlabs/Module/Settings/Channel.php:336 msgid "Any connections" msgstr "Qualsevol connexió" -#: ../../Zotlabs/Module/Settings/Channel.php:329 +#: ../../Zotlabs/Module/Settings/Channel.php:337 msgid "Anybody on this website" msgstr "Qualsevol en aquest lloc" -#: ../../Zotlabs/Module/Settings/Channel.php:330 +#: ../../Zotlabs/Module/Settings/Channel.php:338 msgid "Anybody in this network" msgstr "Qualsevol en aquesta xarxa" -#: ../../Zotlabs/Module/Settings/Channel.php:331 +#: ../../Zotlabs/Module/Settings/Channel.php:339 msgid "Anybody authenticated" msgstr "Qualsevol autenticat" -#: ../../Zotlabs/Module/Settings/Channel.php:332 +#: ../../Zotlabs/Module/Settings/Channel.php:340 msgid "Anybody on the internet" msgstr "Qualsevol a internet" -#: ../../Zotlabs/Module/Settings/Channel.php:407 +#: ../../Zotlabs/Module/Settings/Channel.php:415 msgid "Publish your default profile in the network directory" msgstr "Publica el teu perfil per defecte al directori de la xarxa" -#: ../../Zotlabs/Module/Settings/Channel.php:412 +#: ../../Zotlabs/Module/Settings/Channel.php:420 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Ens permets suggerir-te com a potencial amic als nous membres?" -#: ../../Zotlabs/Module/Settings/Channel.php:416 +#: ../../Zotlabs/Module/Settings/Channel.php:424 msgid "or" msgstr "o" -#: ../../Zotlabs/Module/Settings/Channel.php:425 +#: ../../Zotlabs/Module/Settings/Channel.php:433 msgid "Your channel address is" msgstr "La teva adreça del canal es" -#: ../../Zotlabs/Module/Settings/Channel.php:428 +#: ../../Zotlabs/Module/Settings/Channel.php:436 msgid "Your files/photos are accessible via WebDAV at" msgstr "Les teves fotos i arxius estan disponibles mitjançant WebDAV a" -#: ../../Zotlabs/Module/Settings/Channel.php:493 +#: ../../Zotlabs/Module/Settings/Channel.php:488 +msgid "Automatic membership approval" +msgstr "Acceptació automàtica de membres" + +#: ../../Zotlabs/Module/Settings/Channel.php:488 +#: ../../Zotlabs/Module/Defperms.php:239 +msgid "" +"If enabled, connection requests will be approved without your interaction" +msgstr "Si s'habilita, les soŀlicituds de connexió s'aprovaran automàticament sense requerir la teva interacció" + +#: ../../Zotlabs/Module/Settings/Channel.php:514 msgid "Channel Settings" -msgstr "Ajustos del Canal" +msgstr "Configuració de canal" -#: ../../Zotlabs/Module/Settings/Channel.php:500 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Basic Settings" -msgstr "Ajustos Bàsics" +msgstr "Configuració bàsica" -#: ../../Zotlabs/Module/Settings/Channel.php:501 +#: ../../Zotlabs/Module/Settings/Channel.php:522 #: ../../include/channel.php:1521 msgid "Full Name:" msgstr "Nom Complet:" -#: ../../Zotlabs/Module/Settings/Channel.php:502 +#: ../../Zotlabs/Module/Settings/Channel.php:523 #: ../../Zotlabs/Module/Settings/Account.php:119 msgid "Email Address:" msgstr "Adreça de E-Correu:" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "Your Timezone:" msgstr "La teva Franja Horària" -#: ../../Zotlabs/Module/Settings/Channel.php:504 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Default Post Location:" msgstr "Localització Predeterminada de les Entrades:" -#: ../../Zotlabs/Module/Settings/Channel.php:504 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Geographical location to display on your posts" msgstr "Posició geogràfica a mostrar a les teves entrades" -#: ../../Zotlabs/Module/Settings/Channel.php:505 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "Use Browser Location:" msgstr "Empra la Localització del Navegador:" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "Adult Content" msgstr "Contingut per a Adults" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "Aquest canal publica freqúentment o amb regularitat contingut per a adults. (Si us plau, etiqueti qualsevol material per a adults amb #NSFW)" -#: ../../Zotlabs/Module/Settings/Channel.php:509 +#: ../../Zotlabs/Module/Settings/Channel.php:530 msgid "Security and Privacy Settings" -msgstr "Ajustos de Seguretat i Privacitat" +msgstr "Configuració de seguretat i privacitat" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:532 msgid "Your permissions are already configured. Click to view/adjust" msgstr "Els teus permisos estan configurats. Clic per veure/ajustar" -#: ../../Zotlabs/Module/Settings/Channel.php:513 +#: ../../Zotlabs/Module/Settings/Channel.php:534 msgid "Hide my online presence" msgstr "Amaga la meva presencia en línia" -#: ../../Zotlabs/Module/Settings/Channel.php:513 +#: ../../Zotlabs/Module/Settings/Channel.php:534 msgid "Prevents displaying in your profile that you are online" msgstr "Evita mostrar en el teu perfil, que estàs en línia" -#: ../../Zotlabs/Module/Settings/Channel.php:515 +#: ../../Zotlabs/Module/Settings/Channel.php:536 msgid "Simple Privacy Settings:" -msgstr "Ajustos simples de privacitat:" +msgstr "Configuració simple de privacitat:" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:537 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "Molt públic - <em>extremadament permissiu (s'ha d'anar en compte)</em>" -#: ../../Zotlabs/Module/Settings/Channel.php:517 +#: ../../Zotlabs/Module/Settings/Channel.php:538 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "Normal - <em>públic per defecte, privat quan es desitgi (similar als permisos de xarxa social, però amb millor privacitat)" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:539 msgid "Private - <em>default private, never open or public</em>" msgstr "Privat - <em>privat per defecte, mai públic o obert</em>" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "Bloquejat - <em>tothom bloquejat per defecte</em>" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "Allow others to tag your posts" msgstr "Permet a altres etiquetar les teves entrades" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "Sovint emprat per la comunitat per marcar retroactivament contingut inapropiat" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:544 msgid "Channel Permission Limits" msgstr "Límits dels permisos del canal" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "Expire other channel content after this many days" msgstr "El contingut d'altes canals caduca després d'aquests dies" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "0 or blank to use the website limit." msgstr "0 o en blanc per emprar el limit del lloc web." -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 #, php-format msgid "This website expires after %d days." msgstr "Aquest lloc web expira després de %d dies." -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "This website does not expire imported content." msgstr "A aquest lloc web no expira el contingut importat" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "The website limit takes precedence if lower than your limit." msgstr "El límit del lloc web pren la preferència si es inferior al teu límit." -#: ../../Zotlabs/Module/Settings/Channel.php:526 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "Maximum Friend Requests/Day:" msgstr "Nombre màxim de peticions d'amistat per dia" -#: ../../Zotlabs/Module/Settings/Channel.php:526 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "May reduce spam activity" msgstr "Pot reduir l'SPAM" -#: ../../Zotlabs/Module/Settings/Channel.php:527 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "Default Privacy Group" msgstr "Grup de privacitat per defecte" -#: ../../Zotlabs/Module/Settings/Channel.php:529 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "Use my default audience setting for the type of object published" -msgstr "Empra els meus ajustos per defecte segons el tipus de entrada publicada" +msgstr "Empra la meva configuració d'audiència que hagi triat per al tipus d'entrada" -#: ../../Zotlabs/Module/Settings/Channel.php:530 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "Profile to assign new connections" msgstr "Perfil al qual assignar les connexions noves" -#: ../../Zotlabs/Module/Settings/Channel.php:540 +#: ../../Zotlabs/Module/Settings/Channel.php:561 msgid "Default Permissions Group" msgstr "Grup de permisos per defecte" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Maximum private messages per day from unknown people:" msgstr "Nombre màxim de missatges privats de desconeguts al dia:" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Useful to reduce spamming" msgstr "Útil per a reduir l'spam" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:570 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" -msgstr "Ajustos de notificacions" +msgstr "Configuració de notificacions" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "By default post a status message when:" msgstr "Per defecte envia un missatge d'estat quan:" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "accepting a friend request" msgstr "S'accepta una sol·licitud d'amistat" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "joining a forum/community" msgstr "Apuntar-se a un fòrum o comunitat" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "making an <em>interesting</em> profile change" msgstr "Faci un canvi <em>interesant</em> al perfil" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "Send a notification email when:" msgstr "Notifica per correu quan:" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "You receive a connection request" msgstr "Rebi una petició de connexió" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "Your connections are confirmed" msgstr "Es confirma una connexió" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "Someone writes on your profile wall" msgstr "Algú ha escrit al mur del teu perfil" -#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Someone writes a followup comment" msgstr "Algú ha escrit un comentari de resposta" -#: ../../Zotlabs/Module/Settings/Channel.php:559 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "You receive a private message" msgstr "Rebi un missatge privat" -#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "You receive a friend suggestion" msgstr "Rebi una suggerència d'amistat" -#: ../../Zotlabs/Module/Settings/Channel.php:561 +#: ../../Zotlabs/Module/Settings/Channel.php:582 msgid "You are tagged in a post" msgstr "Estàs etiquetat a l'entrada" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "You are poked/prodded/etc. in a post" msgstr "S'enfoten/te piquen/etc. en una entrada" -#: ../../Zotlabs/Module/Settings/Channel.php:564 +#: ../../Zotlabs/Module/Settings/Channel.php:585 msgid "Someone likes your post/comment" msgstr "A algú li ha agradat la teva entrada o comentari" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:588 msgid "Show visual notifications including:" msgstr "Mostra notificacion visuals, com ara:" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "Unseen grid activity" msgstr "Activitat de malla no vista" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:591 msgid "Unseen channel activity" msgstr "Activitat no vista del canal" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Unseen private messages" msgstr "Missatges privats no llegits" -#: ../../Zotlabs/Module/Settings/Channel.php:571 -#: ../../Zotlabs/Module/Settings/Channel.php:576 -#: ../../Zotlabs/Module/Settings/Channel.php:577 -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:598 +#: ../../Zotlabs/Module/Settings/Channel.php:599 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "Recomanat" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Upcoming events" msgstr "Esdeveniments propers" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Events today" msgstr "Esdeveniments d'avui" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Upcoming birthdays" msgstr "Aniversaris propers" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Not available in all themes" msgstr "No està disponible en tots els temes" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "System (personal) notifications" msgstr "Notificacions (personals) del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "System info messages" msgstr "Missatges d'informació del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:598 msgid "System critical alerts" msgstr "Alertes crítiques del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:599 msgid "New connections" msgstr "Noves connexions" -#: ../../Zotlabs/Module/Settings/Channel.php:579 +#: ../../Zotlabs/Module/Settings/Channel.php:600 msgid "System Registrations" msgstr "Inscripcions del Sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:601 msgid "Unseen shared files" msgstr "Fitxers compartits nous" -#: ../../Zotlabs/Module/Settings/Channel.php:581 +#: ../../Zotlabs/Module/Settings/Channel.php:602 msgid "Unseen public activity" msgstr "Activitat pública nova" -#: ../../Zotlabs/Module/Settings/Channel.php:582 +#: ../../Zotlabs/Module/Settings/Channel.php:603 msgid "Unseen likes and dislikes" msgstr "\"M'agrada\" i \"no m'agrada\" pendents" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:604 +msgid "Unseen forum posts" +msgstr "Entrades de fòrum no llegides" + +#: ../../Zotlabs/Module/Settings/Channel.php:605 msgid "Email notification hub (hostname)" msgstr "Hub per a notificacions per correu (nom de domini)" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:605 #, php-format msgid "" "If your channel is mirrored to multiple hubs, set this to your preferred " "location. This will prevent duplicate email notifications. Example: %s" msgstr "En cas que el teu canal estigui repicat en diversos hubs, habilita aquesta opció al teu hub preferit. Això evita notificacions duplicades. Exemple: %s" -#: ../../Zotlabs/Module/Settings/Channel.php:584 +#: ../../Zotlabs/Module/Settings/Channel.php:606 msgid "Show new wall posts, private messages and connections under Notices" msgstr "Mostra totes les novetats d'entrades de mur, missatges privats i connexions a Notícies" -#: ../../Zotlabs/Module/Settings/Channel.php:586 +#: ../../Zotlabs/Module/Settings/Channel.php:608 msgid "Notify me of events this many days in advance" msgstr "Notifica'm dels esdeveniments amb aquests dies d'antelació" -#: ../../Zotlabs/Module/Settings/Channel.php:586 +#: ../../Zotlabs/Module/Settings/Channel.php:608 msgid "Must be greater than 0" msgstr "Ha de ser més gran que 0" -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:614 msgid "Advanced Account/Page Type Settings" -msgstr "Ajustos avançats de compte i tipus de pàgina" +msgstr "Configuració avançada de compte i de tipus de pàgina" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:615 msgid "Change the behaviour of this account for special situations" msgstr "Modifica el comportament d'aquest compte en situacions especials" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:617 msgid "Miscellaneous Settings" -msgstr "Ajustos diversos" +msgstr "Configuració diversa" -#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:618 msgid "Default photo upload folder" msgstr "Carpeta per defecte de fotos pujades" -#: ../../Zotlabs/Module/Settings/Channel.php:596 -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:618 +#: ../../Zotlabs/Module/Settings/Channel.php:619 msgid "%Y - current year, %m - current month" msgstr "%Y - any en curs, %m - mes corrent" -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:619 msgid "Default file upload folder" msgstr "Carpeta per defecte d'arxius pujats" -#: ../../Zotlabs/Module/Settings/Channel.php:599 +#: ../../Zotlabs/Module/Settings/Channel.php:621 msgid "Personal menu to display in your channel pages" msgstr "Menú personal per mostrar en les teves pàgines de canal" -#: ../../Zotlabs/Module/Settings/Channel.php:601 +#: ../../Zotlabs/Module/Settings/Channel.php:623 msgid "Remove this channel." msgstr "Elimina aquest canal." -#: ../../Zotlabs/Module/Settings/Channel.php:602 +#: ../../Zotlabs/Module/Settings/Channel.php:624 msgid "Firefox Share $Projectname provider" msgstr "Firefox Share $Projectname provider" -#: ../../Zotlabs/Module/Settings/Channel.php:603 +#: ../../Zotlabs/Module/Settings/Channel.php:625 msgid "Start calendar week on Monday" msgstr "Comença la setmana en dilluns" @@ -3913,96 +4008,96 @@ msgstr "Data de caducitat (aaaa-mm-dd)" #: ../../Zotlabs/Module/Settings/Tokens.php:160 #: ../../Zotlabs/Module/Connedit.php:890 msgid "Their Settings" -msgstr "Els seus Ajustos" +msgstr "La seva configuració" -#: ../../Zotlabs/Module/Settings/Oauth2.php:35 +#: ../../Zotlabs/Module/Settings/Oauth2.php:36 msgid "Name and Secret are required" msgstr "Es necessiten el nom i el secret" -#: ../../Zotlabs/Module/Settings/Oauth2.php:83 +#: ../../Zotlabs/Module/Settings/Oauth2.php:84 msgid "Add OAuth2 application" msgstr "Afegeix una aplicació OAuth2" -#: ../../Zotlabs/Module/Settings/Oauth2.php:86 -#: ../../Zotlabs/Module/Settings/Oauth2.php:114 +#: ../../Zotlabs/Module/Settings/Oauth2.php:87 +#: ../../Zotlabs/Module/Settings/Oauth2.php:115 #: ../../Zotlabs/Module/Settings/Oauth.php:90 msgid "Name of application" msgstr "Nom de l'aplicatiu" -#: ../../Zotlabs/Module/Settings/Oauth2.php:87 -#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 #: ../../Zotlabs/Module/Settings/Oauth.php:92 #: ../../Zotlabs/Module/Settings/Oauth.php:118 #: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../Zotlabs/Module/Settings/Oauth2.php:87 -#: ../../Zotlabs/Module/Settings/Oauth2.php:115 +#: ../../Zotlabs/Module/Settings/Oauth2.php:88 +#: ../../Zotlabs/Module/Settings/Oauth2.php:116 #: ../../Zotlabs/Module/Settings/Oauth.php:91 #: ../../Zotlabs/Module/Settings/Oauth.php:92 msgid "Automatically generated - change if desired. Max length 20" msgstr "Generat automàticament- Canvia-ho si ho vols. Max. longitud 20" -#: ../../Zotlabs/Module/Settings/Oauth2.php:88 -#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 #: ../../Zotlabs/Module/Settings/Oauth.php:93 #: ../../Zotlabs/Module/Settings/Oauth.php:119 msgid "Redirect" msgstr "Redirecciona" -#: ../../Zotlabs/Module/Settings/Oauth2.php:88 -#: ../../Zotlabs/Module/Settings/Oauth2.php:116 +#: ../../Zotlabs/Module/Settings/Oauth2.php:89 +#: ../../Zotlabs/Module/Settings/Oauth2.php:117 #: ../../Zotlabs/Module/Settings/Oauth.php:93 msgid "" "Redirect URI - leave blank unless your application specifically requires " "this" msgstr "URI redirigida - No canviar excepte perquè el teu aplicatiu ho requereixi." -#: ../../Zotlabs/Module/Settings/Oauth2.php:89 -#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +#: ../../Zotlabs/Module/Settings/Oauth2.php:90 +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 msgid "Grant Types" msgstr "Tipus de permís" -#: ../../Zotlabs/Module/Settings/Oauth2.php:89 #: ../../Zotlabs/Module/Settings/Oauth2.php:90 -#: ../../Zotlabs/Module/Settings/Oauth2.php:117 +#: ../../Zotlabs/Module/Settings/Oauth2.php:91 #: ../../Zotlabs/Module/Settings/Oauth2.php:118 +#: ../../Zotlabs/Module/Settings/Oauth2.php:119 msgid "leave blank unless your application sepcifically requires this" msgstr "deixa-ho en blanc si no és que la teva aplicació ho demana explícitament" -#: ../../Zotlabs/Module/Settings/Oauth2.php:90 -#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +#: ../../Zotlabs/Module/Settings/Oauth2.php:91 +#: ../../Zotlabs/Module/Settings/Oauth2.php:119 msgid "Authorization scope" msgstr "Àmbit d'autorització" -#: ../../Zotlabs/Module/Settings/Oauth2.php:102 +#: ../../Zotlabs/Module/Settings/Oauth2.php:103 msgid "OAuth2 Application not found." msgstr "No s'ha trobat l'aplicació OAuth2." -#: ../../Zotlabs/Module/Settings/Oauth2.php:111 -#: ../../Zotlabs/Module/Settings/Oauth2.php:148 +#: ../../Zotlabs/Module/Settings/Oauth2.php:112 +#: ../../Zotlabs/Module/Settings/Oauth2.php:149 #: ../../Zotlabs/Module/Settings/Oauth.php:87 #: ../../Zotlabs/Module/Settings/Oauth.php:113 #: ../../Zotlabs/Module/Settings/Oauth.php:149 msgid "Add application" msgstr "Afegir aplicatiu" -#: ../../Zotlabs/Module/Settings/Oauth2.php:147 +#: ../../Zotlabs/Module/Settings/Oauth2.php:148 msgid "Connected OAuth2 Apps" msgstr "Aplicacions OAuth2 connectades" -#: ../../Zotlabs/Module/Settings/Oauth2.php:151 +#: ../../Zotlabs/Module/Settings/Oauth2.php:152 #: ../../Zotlabs/Module/Settings/Oauth.php:152 msgid "Client key starts with" msgstr "La clau del client comença amb" -#: ../../Zotlabs/Module/Settings/Oauth2.php:152 +#: ../../Zotlabs/Module/Settings/Oauth2.php:153 #: ../../Zotlabs/Module/Settings/Oauth.php:153 msgid "No name" msgstr "Sin nombre" -#: ../../Zotlabs/Module/Settings/Oauth2.php:153 +#: ../../Zotlabs/Module/Settings/Oauth2.php:154 #: ../../Zotlabs/Module/Settings/Oauth.php:154 msgid "Remove authorization" msgstr "Elimina autorització" @@ -4045,7 +4140,7 @@ msgstr "L'actualització de la contrasenya va fallar. Si us plau, torneu a inten #: ../../Zotlabs/Module/Settings/Account.php:112 msgid "Account Settings" -msgstr "Ajustos de Compte" +msgstr "Configuració del compte" #: ../../Zotlabs/Module/Settings/Account.php:113 msgid "Current Password" @@ -4115,23 +4210,23 @@ msgstr "%s - (Experimental)" #: ../../Zotlabs/Module/Settings/Display.php:187 msgid "Display Settings" -msgstr "Ajustos de Pantalla" +msgstr "Configuració de pantalla" #: ../../Zotlabs/Module/Settings/Display.php:188 msgid "Theme Settings" -msgstr "Ajustos de Tema" +msgstr "Configuració de tema" #: ../../Zotlabs/Module/Settings/Display.php:189 msgid "Custom Theme Settings" -msgstr "Ajustos Personals de Tema" +msgstr "Configuració de temes personalitzats" #: ../../Zotlabs/Module/Settings/Display.php:190 msgid "Content Settings" -msgstr "Ajustos de Contingut" +msgstr "Configuració dels continguts" #: ../../Zotlabs/Module/Settings/Display.php:196 msgid "Display Theme:" -msgstr "Ajustos de Tema:" +msgstr "Tema de pantalla:" #: ../../Zotlabs/Module/Settings/Display.php:197 msgid "Select scheme" @@ -4241,7 +4336,7 @@ msgid "Icon url" msgstr "Icona de url" #: ../../Zotlabs/Module/Settings/Oauth.php:94 -#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 +#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150 msgid "Optional" msgstr "Opcional" @@ -4254,22 +4349,22 @@ msgid "Connected Apps" msgstr "Aplicatius Conectats" #: ../../Zotlabs/Module/Embedphotos.php:140 -#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1350 +#: ../../Zotlabs/Module/Photos.php:816 ../../Zotlabs/Module/Photos.php:1355 #: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78 msgid "View Photo" msgstr "Mostra la imatge" #: ../../Zotlabs/Module/Embedphotos.php:156 -#: ../../Zotlabs/Module/Photos.php:842 ../../Zotlabs/Widget/Portfolio.php:108 +#: ../../Zotlabs/Module/Photos.php:847 ../../Zotlabs/Widget/Portfolio.php:108 #: ../../Zotlabs/Widget/Album.php:95 msgid "Edit Album" msgstr "Modifica l'àlbum" #: ../../Zotlabs/Module/Embedphotos.php:158 -#: ../../Zotlabs/Module/Photos.php:712 -#: ../../Zotlabs/Module/Profile_photo.php:458 -#: ../../Zotlabs/Module/Cover_photo.php:362 -#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Widget/Cdav.php:133 +#: ../../Zotlabs/Module/Photos.php:717 +#: ../../Zotlabs/Module/Profile_photo.php:459 +#: ../../Zotlabs/Module/Cover_photo.php:395 +#: ../../Zotlabs/Storage/Browser.php:392 ../../Zotlabs/Widget/Cdav.php:133 #: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110 #: ../../Zotlabs/Widget/Album.php:97 msgid "Upload" @@ -4333,9 +4428,9 @@ msgid "URL for photo of thing (optional)" msgstr "Adreça URL de la foto d'una cosa (opcional)" #: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372 -#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071 +#: ../../Zotlabs/Module/Photos.php:707 ../../Zotlabs/Module/Photos.php:1076 #: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235 -#: ../../Zotlabs/Module/Filestorage.php:147 +#: ../../Zotlabs/Module/Filestorage.php:170 #: ../../include/acl_selectors.php:123 msgid "Permissions" msgstr "Permisos " @@ -4345,12 +4440,12 @@ msgid "Add Thing to your Profile" msgstr "Afegeix una cosa al teu perfil" #: ../../Zotlabs/Module/Notify.php:61 -#: ../../Zotlabs/Module/Notifications.php:57 +#: ../../Zotlabs/Module/Notifications.php:55 msgid "No more system notifications." msgstr "No hi ha més notificacions del sistema." #: ../../Zotlabs/Module/Notify.php:65 -#: ../../Zotlabs/Module/Notifications.php:61 +#: ../../Zotlabs/Module/Notifications.php:59 msgid "System Notifications" msgstr "Notificacions del sistema" @@ -4358,52 +4453,56 @@ msgstr "Notificacions del sistema" msgid "Connection added." msgstr "S'ha afegit la connexió." -#: ../../Zotlabs/Module/Import.php:144 +#: ../../Zotlabs/Module/Import.php:146 #, php-format msgid "Your service plan only allows %d channels." msgstr "El teu paquet de serveis només admet %d canals." -#: ../../Zotlabs/Module/Import.php:158 +#: ../../Zotlabs/Module/Import.php:173 msgid "No channel. Import failed." msgstr "Sense canal. No s'ha pogut importar." -#: ../../Zotlabs/Module/Import.php:482 +#: ../../Zotlabs/Module/Import.php:513 #: ../../addon/diaspora/import_diaspora.php:139 msgid "Import completed." msgstr "S'ha completat la importació." -#: ../../Zotlabs/Module/Import.php:510 +#: ../../Zotlabs/Module/Import.php:541 msgid "You must be logged in to use this feature." msgstr "Has d'estar registrat per fer servir aquesta funcionalitat." -#: ../../Zotlabs/Module/Import.php:515 +#: ../../Zotlabs/Module/Import.php:546 msgid "Import Channel" msgstr "Importa un canal" -#: ../../Zotlabs/Module/Import.php:516 +#: ../../Zotlabs/Module/Import.php:547 msgid "" "Use this form to import an existing channel from a different server/hub. You" " may retrieve the channel identity from the old server/hub via the network " "or provide an export file." msgstr "Empra aquest formulari per importar un canal existent en un altre servidor/concentrador. Pots recuperar el canal des de l'antic servidor/concentrador via la xarxa o mitjançant un fitxer d'exportació" -#: ../../Zotlabs/Module/Import.php:518 +#: ../../Zotlabs/Module/Import.php:549 msgid "Or provide the old server/hub details" msgstr "O proveeix els detalls de l'antic servidor/node" -#: ../../Zotlabs/Module/Import.php:519 +#: ../../Zotlabs/Module/Import.php:551 msgid "Your old identity address (xyz@example.com)" msgstr "La teva adreça de canal antiga. El format és canal@exemple.org" -#: ../../Zotlabs/Module/Import.php:520 +#: ../../Zotlabs/Module/Import.php:552 msgid "Your old login email address" msgstr "La teva adreça de correu electrònic antiga" -#: ../../Zotlabs/Module/Import.php:521 +#: ../../Zotlabs/Module/Import.php:553 msgid "Your old login password" msgstr "La teva contrasenya antiga" -#: ../../Zotlabs/Module/Import.php:522 +#: ../../Zotlabs/Module/Import.php:554 +msgid "Import a few months of posts if possible (limited by available memory" +msgstr "Importa, si es possible, missatges de fa uns quants mesos (limitat per la memòria disponible) " + +#: ../../Zotlabs/Module/Import.php:556 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be" @@ -4411,19 +4510,26 @@ msgid "" "primary location for files, photos, and media." msgstr "Per a qualsevol de les opcions, escull si vols fer primària l'adreça d'aquest node o mantenir l'anterior com a primària. Podràs penjar entrades des de totes dues adreces, però per als fitxers, imatges i altres en cal una de primària." -#: ../../Zotlabs/Module/Import.php:523 +#: ../../Zotlabs/Module/Import.php:558 msgid "Make this hub my primary location" msgstr "Fes d'aquest node la meva ubicació primària" -#: ../../Zotlabs/Module/Import.php:524 +#: ../../Zotlabs/Module/Import.php:559 msgid "Move this channel (disable all previous locations)" msgstr "Moure aquest canal (desactiva totes les prèvies localitzacions)" -#: ../../Zotlabs/Module/Import.php:525 -msgid "Import a few months of posts if possible (limited by available memory" -msgstr "Importa, si es possible, missatges de fa uns quants mesos (limitat per la memòria disponible) " +#: ../../Zotlabs/Module/Import.php:560 +msgid "Use this channel nickname instead of the one provided" +msgstr "Fes servir aquest nom de canal en comptes del que has facilitat" + +#: ../../Zotlabs/Module/Import.php:560 +msgid "" +"Leave blank to keep your existing channel nickname. You will be randomly " +"assigned a similar nickname if either name is already allocated on this " +"site." +msgstr "Deixa-ho en blanc per a mantenir el teu nom de canal actual. Se t'assignarà un nom aleatori però similar a l'actual en cas que el nom actual ja estigui agafat en aquest node." -#: ../../Zotlabs/Module/Import.php:526 +#: ../../Zotlabs/Module/Import.php:562 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -4433,16 +4539,16 @@ msgstr "Aquest procès pot trigar minuts en completar. Si et plau envia el formu msgid "Authentication failed." msgstr "Ha fallat l'autentificació." -#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1590 -#: ../../include/channel.php:2318 +#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1614 +#: ../../include/channel.php:2334 msgid "Remote Authentication" msgstr "Autentificació Remota" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2319 +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2335 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "Introdueix la teva adreça del canal (eg canal@exemple.com)" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2320 +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2336 msgid "Authenticate" msgstr "Autentica't" @@ -4450,7 +4556,7 @@ msgstr "Autentica't" msgid "Permissions denied." msgstr "Permís denegat." -#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2446 +#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2482 msgid "Import" msgstr "Importar" @@ -4484,15 +4590,15 @@ msgstr "Editar Bloc" msgid "vcard" msgstr "vcard (targeta estàndard de contacte)" -#: ../../Zotlabs/Module/Apps.php:48 ../../Zotlabs/Lib/Apps.php:228 +#: ../../Zotlabs/Module/Apps.php:50 ../../Zotlabs/Lib/Apps.php:291 msgid "Apps" msgstr "Aplicatius" -#: ../../Zotlabs/Module/Apps.php:51 +#: ../../Zotlabs/Module/Apps.php:53 msgid "Manage apps" msgstr "Gestiona apps" -#: ../../Zotlabs/Module/Apps.php:52 +#: ../../Zotlabs/Module/Apps.php:54 msgid "Create new app" msgstr "Crear una nova app" @@ -4502,7 +4608,7 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "%1$s es %2$s" -#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:253 +#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:315 msgid "Mood" msgstr "Ànim" @@ -4540,9 +4646,9 @@ msgid "Archived/Unreachable" msgstr "Arxivades o inaccessibles" #: ../../Zotlabs/Module/Connections.php:80 -#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:116 -#: ../../Zotlabs/Module/Notifications.php:52 -#: ../../include/conversation.php:1717 +#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:179 +#: ../../Zotlabs/Module/Notifications.php:50 +#: ../../include/conversation.php:1726 msgid "New" msgstr "Nou" @@ -4651,8 +4757,8 @@ msgstr "Ignora" msgid "Recent activity" msgstr "Activitat recent" -#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:235 -#: ../../include/text.php:973 +#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:298 +#: ../../include/text.php:975 msgid "Connections" msgstr "Connexions" @@ -4674,21 +4780,17 @@ msgstr "Troba" msgid "item" msgstr "element" -#: ../../Zotlabs/Module/Viewsrc.php:55 -msgid "Source of Item" -msgstr "Origen de l'article" - #: ../../Zotlabs/Module/Bookmarks.php:56 msgid "Bookmark added" -msgstr "Favorit afegit" +msgstr "S'ha afegit el marcador" #: ../../Zotlabs/Module/Bookmarks.php:79 msgid "My Bookmarks" -msgstr "Els Meus Favorits" +msgstr "Els meus marcadors" #: ../../Zotlabs/Module/Bookmarks.php:90 msgid "My Connections Bookmarks" -msgstr "Les connexions dels meus Favorits" +msgstr "Els marcadors de les meves connexions" #: ../../Zotlabs/Module/Removeaccount.php:35 msgid "" @@ -4722,7 +4824,7 @@ msgstr "Per defecte, només les instancies dels canal ubicats en aquest node pod msgid "Page owner information could not be retrieved." msgstr "La informació del propietari de la pàgina no va poder ser recuperada" -#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120 +#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:113 msgid "Album not found." msgstr "Àlbum no trobat" @@ -4730,190 +4832,190 @@ msgstr "Àlbum no trobat" msgid "Delete Album" msgstr "Esborra Àlbum" -#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1083 +#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1088 msgid "Delete Photo" msgstr "Esborra Foto" -#: ../../Zotlabs/Module/Photos.php:551 +#: ../../Zotlabs/Module/Photos.php:556 msgid "No photos selected" msgstr "No has seleccionat fotos" -#: ../../Zotlabs/Module/Photos.php:600 +#: ../../Zotlabs/Module/Photos.php:605 msgid "Access to this item is restricted." msgstr "L'accés a aquest element esta restringit." -#: ../../Zotlabs/Module/Photos.php:646 +#: ../../Zotlabs/Module/Photos.php:651 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "S'estan fent servir %1$.2f MB de %2$.2f MB de l'espai per a imatges." -#: ../../Zotlabs/Module/Photos.php:649 +#: ../../Zotlabs/Module/Photos.php:654 #, php-format msgid "%1$.2f MB photo storage used." msgstr "S'estan fent servir %1$.2f MB de l'espai per a imatges." -#: ../../Zotlabs/Module/Photos.php:691 +#: ../../Zotlabs/Module/Photos.php:696 msgid "Upload Photos" msgstr "Puja imatges" -#: ../../Zotlabs/Module/Photos.php:695 +#: ../../Zotlabs/Module/Photos.php:700 msgid "Enter an album name" msgstr "Escriu el nom del àlbum" -#: ../../Zotlabs/Module/Photos.php:696 +#: ../../Zotlabs/Module/Photos.php:701 msgid "or select an existing album (doubleclick)" msgstr "o bé fes doble clic a un d'existent" -#: ../../Zotlabs/Module/Photos.php:697 +#: ../../Zotlabs/Module/Photos.php:702 msgid "Create a status post for this upload" msgstr "Genera una entrada a partir de la pujada" -#: ../../Zotlabs/Module/Photos.php:699 +#: ../../Zotlabs/Module/Photos.php:704 msgid "Description (optional)" msgstr "Descripció (opcional)" -#: ../../Zotlabs/Module/Photos.php:785 +#: ../../Zotlabs/Module/Photos.php:790 msgid "Show Newest First" msgstr "Ordena de més nou a més antic" -#: ../../Zotlabs/Module/Photos.php:787 +#: ../../Zotlabs/Module/Photos.php:792 msgid "Show Oldest First" msgstr "Ordena de més antic a més nou" -#: ../../Zotlabs/Module/Photos.php:844 ../../Zotlabs/Module/Photos.php:1381 +#: ../../Zotlabs/Module/Photos.php:849 ../../Zotlabs/Module/Photos.php:1386 msgid "Add Photos" msgstr "Afegeix fotos" -#: ../../Zotlabs/Module/Photos.php:892 +#: ../../Zotlabs/Module/Photos.php:897 msgid "Permission denied. Access to this item may be restricted." msgstr "S'ha denegat el permís. Pot ser que l'accés estigui restringit." -#: ../../Zotlabs/Module/Photos.php:894 +#: ../../Zotlabs/Module/Photos.php:899 msgid "Photo not available" msgstr "La imatge no està disponible" -#: ../../Zotlabs/Module/Photos.php:952 +#: ../../Zotlabs/Module/Photos.php:957 msgid "Use as profile photo" msgstr "Fes-la imatge de perfil" -#: ../../Zotlabs/Module/Photos.php:953 +#: ../../Zotlabs/Module/Photos.php:958 msgid "Use as cover photo" msgstr "Emprar com a foto de portada" -#: ../../Zotlabs/Module/Photos.php:960 +#: ../../Zotlabs/Module/Photos.php:965 msgid "Private Photo" msgstr "Imatge privada" -#: ../../Zotlabs/Module/Photos.php:975 +#: ../../Zotlabs/Module/Photos.php:980 msgid "View Full Size" msgstr "Mostra a mida completa" -#: ../../Zotlabs/Module/Photos.php:1057 +#: ../../Zotlabs/Module/Photos.php:1062 msgid "Edit photo" msgstr "Modifica la imatge" -#: ../../Zotlabs/Module/Photos.php:1059 +#: ../../Zotlabs/Module/Photos.php:1064 msgid "Rotate CW (right)" msgstr "Tomba cap a la dreta" -#: ../../Zotlabs/Module/Photos.php:1060 +#: ../../Zotlabs/Module/Photos.php:1065 msgid "Rotate CCW (left)" msgstr "Tomba cap a l'esquerra" -#: ../../Zotlabs/Module/Photos.php:1063 +#: ../../Zotlabs/Module/Photos.php:1068 msgid "Move photo to album" msgstr "Mou la foto a un àlbum" -#: ../../Zotlabs/Module/Photos.php:1064 +#: ../../Zotlabs/Module/Photos.php:1069 msgid "Enter a new album name" msgstr "Escriu el nom del nou àlbum" -#: ../../Zotlabs/Module/Photos.php:1065 +#: ../../Zotlabs/Module/Photos.php:1070 msgid "or select an existing one (doubleclick)" msgstr "o bé fes doble clic a un d'existent" -#: ../../Zotlabs/Module/Photos.php:1070 +#: ../../Zotlabs/Module/Photos.php:1075 msgid "Add a Tag" msgstr "Afegeix una etiqueta" -#: ../../Zotlabs/Module/Photos.php:1078 +#: ../../Zotlabs/Module/Photos.php:1083 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "Exemple: @joan, @Paula_Peris, @mar@exemple.org" -#: ../../Zotlabs/Module/Photos.php:1081 +#: ../../Zotlabs/Module/Photos.php:1086 msgid "Flag as adult in album view" msgstr "Marca com a contingut adult" -#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:281 +#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:285 msgid "I like this (toggle)" msgstr "M'agrada això (canvia)" -#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Lib/ThreadItem.php:282 +#: ../../Zotlabs/Module/Photos.php:1106 ../../Zotlabs/Lib/ThreadItem.php:286 msgid "I don't like this (toggle)" msgstr "No m'agrada això (canvia)" -#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Lib/ThreadItem.php:427 -#: ../../include/conversation.php:785 +#: ../../Zotlabs/Module/Photos.php:1108 ../../Zotlabs/Lib/ThreadItem.php:432 +#: ../../include/conversation.php:787 msgid "Please wait" msgstr "Si us plau, espera" -#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237 -#: ../../Zotlabs/Lib/ThreadItem.php:749 +#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1242 +#: ../../Zotlabs/Lib/ThreadItem.php:754 msgid "This is you" msgstr "Ets tú" -#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239 -#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/js_strings.php:6 +#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1244 +#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/js_strings.php:6 msgid "Comment" msgstr "Comentari" -#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618 +#: ../../Zotlabs/Module/Photos.php:1142 ../../include/conversation.php:619 msgctxt "title" msgid "Likes" msgstr "Agrada" -#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618 +#: ../../Zotlabs/Module/Photos.php:1142 ../../include/conversation.php:619 msgctxt "title" msgid "Dislikes" msgstr "Desagrada" -#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 +#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620 msgctxt "title" msgid "Agree" msgstr "Acord" -#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 +#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620 msgctxt "title" msgid "Disagree" msgstr "Desacord" -#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619 +#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620 msgctxt "title" msgid "Abstain" msgstr "Abstenirse" -#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621 msgctxt "title" msgid "Attending" msgstr "Assistint" -#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621 msgctxt "title" msgid "Not attending" msgstr "Desassistint" -#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621 msgctxt "title" msgid "Might attend" msgstr "Podrien assistir" -#: ../../Zotlabs/Module/Photos.php:1156 ../../Zotlabs/Module/Photos.php:1168 -#: ../../Zotlabs/Lib/ThreadItem.php:201 ../../Zotlabs/Lib/ThreadItem.php:213 +#: ../../Zotlabs/Module/Photos.php:1161 ../../Zotlabs/Module/Photos.php:1173 +#: ../../Zotlabs/Lib/ThreadItem.php:212 ../../Zotlabs/Lib/ThreadItem.php:224 msgid "View all" msgstr "Veure tot" -#: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205 -#: ../../include/conversation.php:1981 ../../include/channel.php:1539 +#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:216 +#: ../../include/conversation.php:1990 ../../include/channel.php:1539 #: ../../include/taxonomy.php:661 msgctxt "noun" msgid "Like" @@ -4921,56 +5023,58 @@ msgid_plural "Likes" msgstr[0] "Agrada" msgstr[1] "Agraden" -#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:210 -#: ../../include/conversation.php:1984 +#: ../../Zotlabs/Module/Photos.php:1170 ../../Zotlabs/Lib/ThreadItem.php:221 +#: ../../include/conversation.php:1993 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "Desagrada" msgstr[1] "Desagrada" -#: ../../Zotlabs/Module/Photos.php:1265 +#: ../../Zotlabs/Module/Photos.php:1270 msgid "Photo Tools" msgstr "Eines per Fotos" -#: ../../Zotlabs/Module/Photos.php:1274 +#: ../../Zotlabs/Module/Photos.php:1279 msgid "In This Photo:" msgstr "Hi apareixen:" -#: ../../Zotlabs/Module/Photos.php:1279 +#: ../../Zotlabs/Module/Photos.php:1284 msgid "Map" msgstr "Mapa" -#: ../../Zotlabs/Module/Photos.php:1287 ../../Zotlabs/Lib/ThreadItem.php:415 +#: ../../Zotlabs/Module/Photos.php:1292 ../../Zotlabs/Lib/ThreadItem.php:420 msgctxt "noun" msgid "Likes" msgstr "Agrada" -#: ../../Zotlabs/Module/Photos.php:1288 ../../Zotlabs/Lib/ThreadItem.php:416 +#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421 msgctxt "noun" msgid "Dislikes" msgstr "Desagrada" -#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421 +#: ../../Zotlabs/Module/Photos.php:1298 ../../Zotlabs/Lib/ThreadItem.php:426 #: ../../include/acl_selectors.php:125 msgid "Close" msgstr "Tanca" -#: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378 -#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:667 +#: ../../Zotlabs/Module/Photos.php:1370 ../../Zotlabs/Module/Photos.php:1383 +#: ../../Zotlabs/Module/Photos.php:1384 ../../include/photos.php:668 msgid "Recent Photos" msgstr "Imatges recents" -#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1135 +#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1293 msgid "Profile Unavailable." msgstr "El perfil no està disponible." -#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:114 +#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:123 msgid "Not found" msgstr "No s'ha trobat" -#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:114 -#: ../../addon/cart/cart.php:1204 ../../addon/cart/manual_payments.php:58 +#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:51 +#: ../../addon/cart/cart.php:1420 +#: ../../addon/cart/submodules/paypalbutton.php:481 +#: ../../addon/cart/manual_payments.php:62 msgid "Invalid channel" msgstr "El canal és invàlid" @@ -4986,8 +5090,8 @@ msgstr "S'ha produït un error en crear la carpeta per al fitxer comprimit d'exp msgid "Error downloading wiki: " msgstr "S'ha produït un error en descarregar la wiki:" -#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1928 -#: ../../include/nav.php:494 +#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1937 +#: ../../include/nav.php:486 msgid "Wikis" msgstr "Wikis" @@ -5011,22 +5115,22 @@ msgstr "Llenguatge de formatació" #: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 #: ../../Zotlabs/Widget/Wiki_pages.php:36 #: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40 -#: ../../include/text.php:1869 +#: ../../include/text.php:1886 msgid "Markdown" msgstr "Markdown" #: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 #: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1867 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1884 msgid "BBcode" msgstr "BBCode" #: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1870 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1887 msgid "Text" msgstr "Cap (text pla)" -#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:284 +#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:286 msgid "Type" msgstr "Tipus" @@ -5082,59 +5186,59 @@ msgstr "Font" msgid "New page name" msgstr "Nou nom de pàgina" -#: ../../Zotlabs/Module/Wiki.php:377 ../../include/conversation.php:1282 +#: ../../Zotlabs/Module/Wiki.php:377 msgid "Embed image from photo albums" msgstr "Embeu una imatge dels àlbums de fotos" -#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1388 +#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1396 msgid "Embed an image from your albums" msgstr "Embeu una imatge dels teus àlbums" #: ../../Zotlabs/Module/Wiki.php:380 -#: ../../Zotlabs/Module/Profile_photo.php:465 -#: ../../Zotlabs/Module/Cover_photo.php:367 -#: ../../include/conversation.php:1390 ../../include/conversation.php:1437 +#: ../../Zotlabs/Module/Profile_photo.php:466 +#: ../../Zotlabs/Module/Cover_photo.php:400 +#: ../../include/conversation.php:1398 ../../include/conversation.php:1445 msgid "OK" msgstr "OK" #: ../../Zotlabs/Module/Wiki.php:381 -#: ../../Zotlabs/Module/Profile_photo.php:466 -#: ../../Zotlabs/Module/Cover_photo.php:368 -#: ../../include/conversation.php:1320 +#: ../../Zotlabs/Module/Profile_photo.php:467 +#: ../../Zotlabs/Module/Cover_photo.php:401 +#: ../../include/conversation.php:1327 msgid "Choose images to embed" msgstr "Tria una imatge per a embeure-la" #: ../../Zotlabs/Module/Wiki.php:382 -#: ../../Zotlabs/Module/Profile_photo.php:467 -#: ../../Zotlabs/Module/Cover_photo.php:369 -#: ../../include/conversation.php:1321 +#: ../../Zotlabs/Module/Profile_photo.php:468 +#: ../../Zotlabs/Module/Cover_photo.php:402 +#: ../../include/conversation.php:1328 msgid "Choose an album" msgstr "Tria un àlbum" #: ../../Zotlabs/Module/Wiki.php:383 -#: ../../Zotlabs/Module/Profile_photo.php:468 -#: ../../Zotlabs/Module/Cover_photo.php:370 +#: ../../Zotlabs/Module/Profile_photo.php:469 +#: ../../Zotlabs/Module/Cover_photo.php:403 msgid "Choose a different album" msgstr "Escull un àlbum diferent" #: ../../Zotlabs/Module/Wiki.php:384 -#: ../../Zotlabs/Module/Profile_photo.php:469 -#: ../../Zotlabs/Module/Cover_photo.php:371 -#: ../../include/conversation.php:1323 +#: ../../Zotlabs/Module/Profile_photo.php:470 +#: ../../Zotlabs/Module/Cover_photo.php:404 +#: ../../include/conversation.php:1330 msgid "Error getting album list" msgstr "Ha ocorregut un error quan treia la llista de àlbums" #: ../../Zotlabs/Module/Wiki.php:385 -#: ../../Zotlabs/Module/Profile_photo.php:470 -#: ../../Zotlabs/Module/Cover_photo.php:372 -#: ../../include/conversation.php:1324 +#: ../../Zotlabs/Module/Profile_photo.php:471 +#: ../../Zotlabs/Module/Cover_photo.php:405 +#: ../../include/conversation.php:1331 msgid "Error getting photo link" msgstr "Ha ocorregut un error quan treia l'enllaç a la foto" #: ../../Zotlabs/Module/Wiki.php:386 -#: ../../Zotlabs/Module/Profile_photo.php:471 -#: ../../Zotlabs/Module/Cover_photo.php:373 -#: ../../include/conversation.php:1325 +#: ../../Zotlabs/Module/Profile_photo.php:472 +#: ../../Zotlabs/Module/Cover_photo.php:406 +#: ../../include/conversation.php:1332 msgid "Error getting album" msgstr "Ha ocorregut un error treient l'àlbum" @@ -5234,8 +5338,8 @@ msgstr "Modifica un altre disseny" msgid "System layout" msgstr "Disseny del sistema" -#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:254 -#: ../../include/conversation.php:1092 +#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:316 +#: ../../include/conversation.php:1097 msgid "Poke" msgstr "Esperonar" @@ -5264,7 +5368,7 @@ msgid "Make this post private" msgstr "Fer aquesta entrada privada" #: ../../Zotlabs/Module/Profile_photo.php:66 -#: ../../Zotlabs/Module/Cover_photo.php:56 +#: ../../Zotlabs/Module/Cover_photo.php:57 msgid "Image uploaded but image cropping failed." msgstr "S'ha pujat la imatge però no s'ha pogut retallar." @@ -5275,7 +5379,7 @@ msgid "Profile Photos" msgstr "Fotos del Perfil" #: ../../Zotlabs/Module/Profile_photo.php:142 -#: ../../Zotlabs/Module/Cover_photo.php:159 +#: ../../Zotlabs/Module/Cover_photo.php:191 msgid "Image resize failed." msgstr "No s'ha pogut escalar la imatge." @@ -5287,73 +5391,85 @@ msgid "" msgstr "Refresca la memòria cau del navegador si la foto no s'actualitza immediatament. Dreceres: «Ctrl+F5» i «Ctrl+Maj+R»" #: ../../Zotlabs/Module/Profile_photo.php:225 -#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:195 +#: ../../Zotlabs/Module/Cover_photo.php:205 ../../include/photos.php:196 msgid "Unable to process image" msgstr "incapaç de processar la imatge" #: ../../Zotlabs/Module/Profile_photo.php:260 -#: ../../Zotlabs/Module/Cover_photo.php:197 +#: ../../Zotlabs/Module/Cover_photo.php:229 msgid "Image upload failed." msgstr "La pujada de la imatge va fracassar." #: ../../Zotlabs/Module/Profile_photo.php:279 -#: ../../Zotlabs/Module/Cover_photo.php:214 +#: ../../Zotlabs/Module/Cover_photo.php:246 msgid "Unable to process image." msgstr "Incapaç de processar l'imatge." #: ../../Zotlabs/Module/Profile_photo.php:343 #: ../../Zotlabs/Module/Profile_photo.php:390 -#: ../../Zotlabs/Module/Cover_photo.php:307 -#: ../../Zotlabs/Module/Cover_photo.php:322 +#: ../../Zotlabs/Module/Cover_photo.php:339 +#: ../../Zotlabs/Module/Cover_photo.php:354 msgid "Photo not available." msgstr "Foto no disponible." -#: ../../Zotlabs/Module/Profile_photo.php:455 -#: ../../Zotlabs/Module/Cover_photo.php:359 +#: ../../Zotlabs/Module/Profile_photo.php:454 +msgid "" +"Your default profile photo is visible to anybody on the internet. Profile " +"photos for alternate profiles will inherit the permissions of the profile" +msgstr "La teva foto de perfil predeterminada és pública i visible per a tothom. Les fotos de perfil dels perfils alternatius hereten els permisos del seu perfil." + +#: ../../Zotlabs/Module/Profile_photo.php:454 +msgid "" +"Your profile photo is visible to anybody on the internet and may be " +"distributed to other websites." +msgstr "La teva foto de perfil és pública i visible a tothom, i és probable que s'escampi per altres webs." + +#: ../../Zotlabs/Module/Profile_photo.php:456 +#: ../../Zotlabs/Module/Cover_photo.php:392 msgid "Upload File:" msgstr "Puja Arxiu:" -#: ../../Zotlabs/Module/Profile_photo.php:456 -#: ../../Zotlabs/Module/Cover_photo.php:360 +#: ../../Zotlabs/Module/Profile_photo.php:457 +#: ../../Zotlabs/Module/Cover_photo.php:393 msgid "Select a profile:" msgstr "Tria un perfil:" -#: ../../Zotlabs/Module/Profile_photo.php:457 +#: ../../Zotlabs/Module/Profile_photo.php:458 msgid "Use Photo for Profile" msgstr "Fes servir la foto per al perfil" -#: ../../Zotlabs/Module/Profile_photo.php:457 +#: ../../Zotlabs/Module/Profile_photo.php:458 msgid "Change Profile Photo" msgstr "Canvia la imatge de perfil" -#: ../../Zotlabs/Module/Profile_photo.php:458 +#: ../../Zotlabs/Module/Profile_photo.php:459 msgid "Use" msgstr "Aplica" -#: ../../Zotlabs/Module/Profile_photo.php:462 #: ../../Zotlabs/Module/Profile_photo.php:463 -#: ../../Zotlabs/Module/Cover_photo.php:364 -#: ../../Zotlabs/Module/Cover_photo.php:365 +#: ../../Zotlabs/Module/Profile_photo.php:464 +#: ../../Zotlabs/Module/Cover_photo.php:397 +#: ../../Zotlabs/Module/Cover_photo.php:398 msgid "Use a photo from your albums" msgstr "Agafa una foto dels àlbums" -#: ../../Zotlabs/Module/Profile_photo.php:473 -#: ../../Zotlabs/Module/Cover_photo.php:376 +#: ../../Zotlabs/Module/Profile_photo.php:474 +#: ../../Zotlabs/Module/Cover_photo.php:409 msgid "Select existing photo" msgstr "Tria una foto existent" -#: ../../Zotlabs/Module/Profile_photo.php:492 -#: ../../Zotlabs/Module/Cover_photo.php:393 +#: ../../Zotlabs/Module/Profile_photo.php:493 +#: ../../Zotlabs/Module/Cover_photo.php:426 msgid "Crop Image" msgstr "Retalla Imatge" -#: ../../Zotlabs/Module/Profile_photo.php:493 -#: ../../Zotlabs/Module/Cover_photo.php:394 +#: ../../Zotlabs/Module/Profile_photo.php:494 +#: ../../Zotlabs/Module/Cover_photo.php:427 msgid "Please adjust the image cropping for optimum viewing." msgstr "Si us plau, retalla la imatge per a una optima visualització" -#: ../../Zotlabs/Module/Profile_photo.php:495 -#: ../../Zotlabs/Module/Cover_photo.php:396 +#: ../../Zotlabs/Module/Profile_photo.php:496 +#: ../../Zotlabs/Module/Cover_photo.php:429 msgid "Done Editing" msgstr "Edició Feta" @@ -5373,60 +5489,68 @@ msgstr "No s'ha pogut trobar l'entrada original." msgid "Empty post discarded." msgstr "S'ha descartat l'entrada perquè no té contingut." -#: ../../Zotlabs/Module/Item.php:874 +#: ../../Zotlabs/Module/Item.php:864 msgid "Duplicate post suppressed." msgstr "Publicació duplicada s'ha suprimit." -#: ../../Zotlabs/Module/Item.php:1019 +#: ../../Zotlabs/Module/Item.php:1009 msgid "System error. Post not saved." msgstr "Hi ha hagut un error del sistema. L'entrada no s'ha desat." -#: ../../Zotlabs/Module/Item.php:1055 +#: ../../Zotlabs/Module/Item.php:1045 msgid "Your comment is awaiting approval." msgstr "El teu comentari encara no ha estat aprovat." -#: ../../Zotlabs/Module/Item.php:1160 +#: ../../Zotlabs/Module/Item.php:1162 msgid "Unable to obtain post information from database." msgstr "No s'ha pogut obtenir informació de l'entrada a la base de dades." -#: ../../Zotlabs/Module/Item.php:1189 +#: ../../Zotlabs/Module/Item.php:1191 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Has assolit el teu límit de %1$.0f entrades (descomptant comentaris)." -#: ../../Zotlabs/Module/Item.php:1196 +#: ../../Zotlabs/Module/Item.php:1198 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Has assolit el teu limit de %1$.0f pàgines web." -#: ../../Zotlabs/Module/Ping.php:330 +#: ../../Zotlabs/Module/Ping.php:332 msgid "sent you a private message" msgstr "Se t'ha enviat un missatge privat" -#: ../../Zotlabs/Module/Ping.php:383 +#: ../../Zotlabs/Module/Ping.php:385 msgid "added your channel" msgstr "el teu canal s'ha afegit" -#: ../../Zotlabs/Module/Ping.php:407 +#: ../../Zotlabs/Module/Ping.php:409 msgid "requires approval" msgstr "requereix aprovació" -#: ../../Zotlabs/Module/Ping.php:417 +#: ../../Zotlabs/Module/Ping.php:419 msgid "g A l F d" msgstr "g A l F d" -#: ../../Zotlabs/Module/Ping.php:435 +#: ../../Zotlabs/Module/Ping.php:437 msgid "[today]" msgstr "[avui]" -#: ../../Zotlabs/Module/Ping.php:444 +#: ../../Zotlabs/Module/Ping.php:446 msgid "posted an event" msgstr "enviat un esdeveniment" -#: ../../Zotlabs/Module/Ping.php:477 +#: ../../Zotlabs/Module/Ping.php:479 msgid "shared a file with you" msgstr "ha compartit un fitxer amb tu" +#: ../../Zotlabs/Module/Ping.php:654 +msgid "Private forum" +msgstr "Fòrum privat" + +#: ../../Zotlabs/Module/Ping.php:654 +msgid "Public forum" +msgstr "Fòrum públic" + #: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29 msgid "Invalid item." msgstr "Article invàlid." @@ -5487,11 +5611,11 @@ msgstr "No es poden ajustar els paràmetres dels contactes." msgid "Connection has been removed." msgstr "S'han eliminat les conexions." -#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:247 +#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:309 #: ../../addon/openclipatar/openclipatar.php:57 -#: ../../include/conversation.php:1032 ../../include/nav.php:114 +#: ../../include/conversation.php:1037 ../../include/nav.php:108 msgid "View Profile" -msgstr "Veure Perfil" +msgstr "Mostra el meu perfil" #: ../../Zotlabs/Module/Connedit.php:597 #, php-format @@ -5514,7 +5638,7 @@ msgstr "Recarrega la foto" msgid "Fetch updated photo" msgstr "Demana la nova foto al servidor" -#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1042 +#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1047 msgid "Recent Activity" msgstr "Activitat Recent" @@ -5597,7 +5721,7 @@ msgstr "Afinitat" #: ../../Zotlabs/Module/Connedit.php:705 msgid "Open Set Affinity section by default" -msgstr "Obrir, per defecte, la secció d'Ajustos d'Afinitat" +msgstr "Obre per defecte la barra d'afinitat" #: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:22 msgid "Me" @@ -5662,7 +5786,7 @@ msgstr "Aquesta connexió no és accessible des d'aquest hub. La seva xarxa no msgid "Connection Default Permissions" msgstr "Permisos per Defecte de la Connexió" -#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4214 +#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4158 #, php-format msgid "Connection: %s" msgstr "Connexió: %s" @@ -5679,11 +5803,6 @@ msgstr "Les peticions de connexió seran aprovades sense la teva interacció" msgid "Permission role" msgstr "Permisos de rol" -#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240 -#: ../../Zotlabs/Widget/Notifications.php:151 ../../include/nav.php:284 -msgid "Loading" -msgstr "S'està carregant" - #: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:241 msgid "Add permission role" msgstr "Afegir permisos de rol" @@ -5731,12 +5850,6 @@ msgstr "Filtre a mida" msgid "Only import posts with this text" msgstr "Importa exclusivament entrades amb aquest text" -#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876 -msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" -msgstr "paraules una per línia o #etiquetes o /patrons/ o idioma=xx, deixar en blanc per importar totes les entrades" - #: ../../Zotlabs/Module/Connedit.php:876 msgid "Do not import posts with this text" msgstr "No importar entrades amb aquest text" @@ -5762,7 +5875,7 @@ msgid "" "href=\"settings\"><strong>privacy settings</strong></a>, which have higher " "priority than individual settings. You can change those settings here but " "they wont have any impact unless the inherited setting changes." -msgstr "Alguns permisos poden ser heretats dels teus canals <a href=\"settings\"><strong>ajustos de privacitat</strong></a>, Els quals tenen més prioritat que els ajustos individuals. <strong>Pots</strong> canviar aquests ajustos aquí pero no tindran cap impacte fins que no canviis els ajustos heretats." +msgstr "Alguns permisos pot ser que vinguin heretats de la <a href=\"settings\"><strong>configuració de privacitat</strong></a>. del teu canal. Aquesta té més prioritat que les configuracions individuals. Pots canviar aquí aquests permisos però no tindran cap impacte mentre no canviï la configuració del teu canal." #: ../../Zotlabs/Module/Connedit.php:896 msgid "Last update:" @@ -5794,16 +5907,16 @@ msgstr "Estic connectat/da" #: ../../Zotlabs/Module/Chat.php:202 msgid "Bookmark this room" -msgstr "Fes favorit aquest xat" +msgstr "Desa aquesta sala" #: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241 -#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1315 +#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1322 msgid "Please enter a link URL:" msgstr "Si us plau entra l'enllaç URL:" #: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294 -#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:766 -#: ../../include/conversation.php:1435 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:771 +#: ../../include/conversation.php:1443 msgid "Encrypt text" msgstr "Text encriptat" @@ -5836,111 +5949,111 @@ msgstr "Expiració" msgid "min" msgstr "min" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:248 -#: ../../include/conversation.php:1834 ../../include/nav.php:401 +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:310 +#: ../../include/conversation.php:1843 ../../include/nav.php:393 msgid "Photos" msgstr "Fotos" -#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:243 -#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1842 -#: ../../include/nav.php:409 +#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:305 +#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1851 +#: ../../include/nav.php:401 msgid "Files" msgstr "Arxius" -#: ../../Zotlabs/Module/Menu.php:49 +#: ../../Zotlabs/Module/Menu.php:67 msgid "Unable to update menu." msgstr "No s'ha pogut actualitzar el menú." -#: ../../Zotlabs/Module/Menu.php:60 +#: ../../Zotlabs/Module/Menu.php:78 msgid "Unable to create menu." msgstr "No s'ha pogut crear el menú." -#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 +#: ../../Zotlabs/Module/Menu.php:160 ../../Zotlabs/Module/Menu.php:173 msgid "Menu Name" msgstr "Nom del menú" -#: ../../Zotlabs/Module/Menu.php:98 +#: ../../Zotlabs/Module/Menu.php:160 msgid "Unique name (not visible on webpage) - required" msgstr "Nom únic (no visible a la pàgina web) - requerit" -#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 +#: ../../Zotlabs/Module/Menu.php:161 ../../Zotlabs/Module/Menu.php:174 msgid "Menu Title" msgstr "Títol del menú" -#: ../../Zotlabs/Module/Menu.php:99 +#: ../../Zotlabs/Module/Menu.php:161 msgid "Visible on webpage - leave empty for no title" msgstr "Visible a la pàgina web - deixar buit per a no posar títol" -#: ../../Zotlabs/Module/Menu.php:100 +#: ../../Zotlabs/Module/Menu.php:162 msgid "Allow Bookmarks" -msgstr "Permetre Marcadors" +msgstr "Activa els marcadors" -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 +#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221 msgid "Menu may be used to store saved bookmarks" -msgstr "El menú es pot emprar per a guardar marcadors" +msgstr "El menú es pot emprar per a desar marcadors" -#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159 +#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:224 msgid "Submit and proceed" msgstr "Envia i procedeix" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2423 +#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2459 msgid "Menus" msgstr "Menús" -#: ../../Zotlabs/Module/Menu.php:117 +#: ../../Zotlabs/Module/Menu.php:180 msgid "Bookmarks allowed" msgstr "Marcadors permesos" -#: ../../Zotlabs/Module/Menu.php:119 +#: ../../Zotlabs/Module/Menu.php:182 msgid "Delete this menu" msgstr "Esborra el menú" -#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154 +#: ../../Zotlabs/Module/Menu.php:183 ../../Zotlabs/Module/Menu.php:218 msgid "Edit menu contents" msgstr "Edita el contingut del menú" -#: ../../Zotlabs/Module/Menu.php:121 +#: ../../Zotlabs/Module/Menu.php:184 msgid "Edit this menu" msgstr "Edita el menú" -#: ../../Zotlabs/Module/Menu.php:136 +#: ../../Zotlabs/Module/Menu.php:200 msgid "Menu could not be deleted." msgstr "El menu no es pot esborrar." -#: ../../Zotlabs/Module/Menu.php:149 +#: ../../Zotlabs/Module/Menu.php:213 msgid "Edit Menu" msgstr "Edita Menú" -#: ../../Zotlabs/Module/Menu.php:153 +#: ../../Zotlabs/Module/Menu.php:217 msgid "Add or remove entries to this menu" msgstr "Afegeix o esborra entrades a aquest menú" -#: ../../Zotlabs/Module/Menu.php:155 +#: ../../Zotlabs/Module/Menu.php:219 msgid "Menu name" msgstr "Nom del Menú" -#: ../../Zotlabs/Module/Menu.php:155 +#: ../../Zotlabs/Module/Menu.php:219 msgid "Must be unique, only seen by you" msgstr "Ha de ser únic, nomes vist per tú" -#: ../../Zotlabs/Module/Menu.php:156 +#: ../../Zotlabs/Module/Menu.php:220 msgid "Menu title" msgstr "Títol del menú" -#: ../../Zotlabs/Module/Menu.php:156 +#: ../../Zotlabs/Module/Menu.php:220 msgid "Menu title as seen by others" msgstr "Títol del menú vist pels altres" -#: ../../Zotlabs/Module/Menu.php:157 +#: ../../Zotlabs/Module/Menu.php:221 msgid "Allow bookmarks" -msgstr "Marcadors permesos" +msgstr "Activa els marcadors" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2424 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2460 msgid "Layouts" msgstr "Dissenys" -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:251 -#: ../../include/nav.php:176 ../../include/nav.php:280 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:313 +#: ../../include/nav.php:170 ../../include/nav.php:272 #: ../../include/help.php:68 ../../include/help.php:74 msgid "Help" msgstr "Ajuda" @@ -5957,11 +6070,11 @@ msgstr "Descripció del disseny pàgina" msgid "Download PDL file" msgstr "Descarrega l'arxiu PDL" -#: ../../Zotlabs/Module/Cloud.php:120 +#: ../../Zotlabs/Module/Cloud.php:129 msgid "Please refresh page" msgstr "Recarrega la pàgina" -#: ../../Zotlabs/Module/Cloud.php:123 +#: ../../Zotlabs/Module/Cloud.php:132 msgid "Unknown error" msgstr "S'ha produït un error desconegut" @@ -5995,12 +6108,12 @@ msgid "Post not found." msgstr "No s'ha trobat l'entrada" #: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160 -#: ../../include/bbcode.php:352 +#: ../../include/bbcode.php:354 msgid "post" msgstr "entrada" #: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146 -#: ../../include/text.php:2013 +#: ../../include/text.php:2030 msgid "comment" msgstr "comentari" @@ -6022,12 +6135,7 @@ msgid "" "Warning: Changing some settings could render your channel inoperable. Please" " leave this page unless you are comfortable with and knowledgeable about how" " to correctly use this feature." -msgstr "atenció: Realitzar segons quins ajustos pot fer el canal inoperable. Deixa aquesta pàgina si no estas segur i tens suficients coneixements sobre l'ús correcte d'aquesta característica." - -#: ../../Zotlabs/Module/Defperms.php:239 -msgid "" -"If enabled, connection requests will be approved without your interaction" -msgstr "Si s'habilita, les soŀlicituds de connexió s'aprovaran automàticament sense requerir la teva interacció" +msgstr "Alerta: segons quines combinacions podrien deixar el teu canal inusable. No és recomanable canviar aquesta configuració si no ets sents còmode/ i segur/a de com fer servir aquesta funcionalitat." #: ../../Zotlabs/Module/Defperms.php:246 msgid "Automatic approval settings" @@ -6056,58 +6164,77 @@ msgstr "Vols autoritzar l'aplicació %s a accedir a les dades del teu canal?" msgid "Allow" msgstr "Permet-ho" -#: ../../Zotlabs/Module/Group.php:24 +#: ../../Zotlabs/Module/Group.php:35 msgid "Privacy group created." -msgstr "Creat grup privat." +msgstr "S'ha creat el grup de privacitat." -#: ../../Zotlabs/Module/Group.php:30 +#: ../../Zotlabs/Module/Group.php:38 msgid "Could not create privacy group." -msgstr "No es pot crear el grup privat." +msgstr "No s'ha pogut crear el grup de privacitat." -#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143 -#: ../../include/items.php:4181 +#: ../../Zotlabs/Module/Group.php:51 ../../Zotlabs/Module/Group.php:181 +#: ../../include/items.php:4125 msgid "Privacy group not found." -msgstr "No es troben grups privats." +msgstr "No s'ha trobat el grup de privacitat." -#: ../../Zotlabs/Module/Group.php:58 +#: ../../Zotlabs/Module/Group.php:67 msgid "Privacy group updated." -msgstr "Grup privat actualitzat." +msgstr "S'ha actualitzat el grup de privacitat." -#: ../../Zotlabs/Module/Group.php:92 -msgid "Create a group of channels." -msgstr "Crear un grup de canals." +#: ../../Zotlabs/Module/Group.php:113 ../../Zotlabs/Module/Group.php:124 +#: ../../Zotlabs/Widget/Activity_filter.php:68 ../../include/features.php:221 +#: ../../include/nav.php:97 ../../include/group.php:320 +msgid "Privacy Groups" +msgstr "Grup de privacitat" -#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:186 -msgid "Privacy group name: " -msgstr "Nom del grup privat:" +#: ../../Zotlabs/Module/Group.php:114 +msgid "Add Group" +msgstr "Afegeix un grup" -#: ../../Zotlabs/Module/Group.php:95 ../../Zotlabs/Module/Group.php:189 +#: ../../Zotlabs/Module/Group.php:118 +msgid "Privacy group name" +msgstr "Nom del grup de privacitat" + +#: ../../Zotlabs/Module/Group.php:119 ../../Zotlabs/Module/Group.php:220 msgid "Members are visible to other channels" msgstr "Els membres son visibles en altres canals" -#: ../../Zotlabs/Module/Group.php:113 +#: ../../Zotlabs/Module/Group.php:126 ../../Zotlabs/Module/Help.php:81 +msgid "Members" +msgstr "Membres" + +#: ../../Zotlabs/Module/Group.php:151 msgid "Privacy group removed." -msgstr "Grup privat eliminat." +msgstr "S'ha esborrat el grup de privacitat." -#: ../../Zotlabs/Module/Group.php:115 +#: ../../Zotlabs/Module/Group.php:153 msgid "Unable to remove privacy group." -msgstr "No puc eliminar el grup privat." +msgstr "No s'ha pogut esborrar el grup de privacitat." -#: ../../Zotlabs/Module/Group.php:185 -msgid "Privacy group editor" -msgstr "Editor del grup privat" +#: ../../Zotlabs/Module/Group.php:215 +#, php-format +msgid "Privacy Group: %s" +msgstr "Grup de privacitat: %s" -#: ../../Zotlabs/Module/Group.php:199 ../../Zotlabs/Module/Help.php:81 -msgid "Members" -msgstr "Membres" +#: ../../Zotlabs/Module/Group.php:217 +msgid "Privacy group name: " +msgstr "Nom del grup de privacitat:" -#: ../../Zotlabs/Module/Group.php:201 -msgid "All Connected Channels" -msgstr "Tots els Canals Connectats" +#: ../../Zotlabs/Module/Group.php:222 +msgid "Delete Group" +msgstr "Esborra el grup" -#: ../../Zotlabs/Module/Group.php:233 -msgid "Click on a channel to add or remove." -msgstr "Clic sobre el canal per afegir o esborrar." +#: ../../Zotlabs/Module/Group.php:232 +msgid "Group members" +msgstr "Membres del grup" + +#: ../../Zotlabs/Module/Group.php:234 +msgid "Not in this group" +msgstr "No hi són al grup" + +#: ../../Zotlabs/Module/Group.php:266 +msgid "Click a channel to toggle membership" +msgstr "Fes clic a un canal per a ficar-lo o treure'l del grup" #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184 #: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659 @@ -6193,11 +6320,11 @@ msgstr "Amaga dels curiosos la teva llista de connexions d'aquest perfil" #: ../../Zotlabs/Module/Profiles.php:722 msgid "Edit Profile Details" -msgstr "Edita els Detalls del Perfil" +msgstr "Modifica els detalls de perfil" #: ../../Zotlabs/Module/Profiles.php:724 msgid "View this profile" -msgstr "Veure aquest perfil" +msgstr "Mostra aquest perfil" #: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824 #: ../../include/channel.php:1319 @@ -6218,7 +6345,7 @@ msgstr "Canviar la foto del perfil" #: ../../Zotlabs/Module/Profiles.php:729 msgid "Create a new profile using these settings" -msgstr "Crea un perfil nou amb aquests ajustos" +msgstr "Crea un perfil nou amb aquesta configuració" #: ../../Zotlabs/Module/Profiles.php:730 msgid "Clone this profile" @@ -6232,7 +6359,7 @@ msgstr "Elimina aquest perfil" msgid "Add profile things" msgstr "Afegeix coses al perfil" -#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1708 +#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1717 msgid "Personal" msgstr "Personal" @@ -6383,9 +6510,9 @@ msgid "Profile Image" msgstr "Imatge del Perfil" #: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296 -#: ../../include/nav.php:117 +#: ../../include/nav.php:111 msgid "Edit Profiles" -msgstr "Editar Perfils" +msgstr "Modifica els perfils" #: ../../Zotlabs/Module/Go.php:21 msgid "This page is available only to site members" @@ -6414,7 +6541,7 @@ msgstr "Puja una imatge de portada" #: ../../Zotlabs/Module/Go.php:37 msgid "Edit your default profile" -msgstr "Modifica el teu perfil" +msgstr "Modifica el teu perfil per defecte" #: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:34 msgid "View friend suggestions" @@ -6462,10 +6589,10 @@ msgstr "Edita la Pàgina Web" msgid "Create a new channel" msgstr "Crear un nou canal" -#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:240 -#: ../../include/nav.php:102 ../../include/nav.php:190 +#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:302 +#: ../../include/nav.php:94 msgid "Channel Manager" -msgstr "Gestor de Canals" +msgstr "Gestor de canals" #: ../../Zotlabs/Module/Manage.php:171 msgid "Current Channel" @@ -6498,8 +6625,8 @@ msgid "Delegated Channel" msgstr "Canal Delegat" #: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194 -#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1893 -#: ../../include/features.php:123 ../../include/nav.php:458 +#: ../../Zotlabs/Lib/Apps.php:293 ../../include/conversation.php:1902 +#: ../../include/features.php:123 ../../include/nav.php:450 msgid "Cards" msgstr "Targetes" @@ -6511,45 +6638,49 @@ msgstr "Afegeix una carta" msgid "This directory server requires an access token" msgstr "Aquest servidor de directori requereix un token de accès" -#: ../../Zotlabs/Module/Siteinfo.php:18 +#: ../../Zotlabs/Module/Siteinfo.php:21 msgid "About this site" msgstr "Sobre aquest lloc web" -#: ../../Zotlabs/Module/Siteinfo.php:19 +#: ../../Zotlabs/Module/Siteinfo.php:22 msgid "Site Name" msgstr "Nom del lloc web" -#: ../../Zotlabs/Module/Siteinfo.php:23 +#: ../../Zotlabs/Module/Siteinfo.php:26 msgid "Administrator" msgstr "Administrador" -#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:232 +#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:241 msgid "Terms of Service" msgstr "Condicions del Servei" -#: ../../Zotlabs/Module/Siteinfo.php:26 +#: ../../Zotlabs/Module/Siteinfo.php:29 msgid "Software and Project information" msgstr "Informació del programari i del projecte" -#: ../../Zotlabs/Module/Siteinfo.php:27 +#: ../../Zotlabs/Module/Siteinfo.php:30 msgid "This site is powered by $Projectname" msgstr "Aquest lloc web funciona amb $Projectname" -#: ../../Zotlabs/Module/Siteinfo.php:28 +#: ../../Zotlabs/Module/Siteinfo.php:31 msgid "" "Federated and decentralised networking and identity services provided by Zot" msgstr "Els serveis d'identitat i la federació i descentralització de la xarxa funcionen amb Zot" -#: ../../Zotlabs/Module/Siteinfo.php:30 +#: ../../Zotlabs/Module/Siteinfo.php:34 +msgid "Additional federated transport protocols:" +msgstr "Altres protocols de transport federats:" + +#: ../../Zotlabs/Module/Siteinfo.php:36 #, php-format msgid "Version %s" msgstr "Versió %s" -#: ../../Zotlabs/Module/Siteinfo.php:31 +#: ../../Zotlabs/Module/Siteinfo.php:37 msgid "Project homepage" msgstr "Pàgina principal del projecte" -#: ../../Zotlabs/Module/Siteinfo.php:32 +#: ../../Zotlabs/Module/Siteinfo.php:38 msgid "Developer homepage" msgstr "Pàgina principal de desenvolupament" @@ -6558,7 +6689,7 @@ msgid "No ratings" msgstr "No valorat" #: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35 -#: ../../include/conversation.php:1082 +#: ../../include/conversation.php:1087 msgid "Ratings" msgstr "Valoracions" @@ -6590,8 +6721,8 @@ msgstr "Exporta elements de pàgina web" msgid "Export selected" msgstr "Exporta la selecció" -#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:244 -#: ../../include/conversation.php:1915 ../../include/nav.php:481 +#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:306 +#: ../../include/conversation.php:1924 ../../include/nav.php:473 msgid "Webpages" msgstr "Pàgines web" @@ -6734,76 +6865,84 @@ msgstr "Opcions" msgid "Redeliver" msgstr "Tornar a lliurar" -#: ../../Zotlabs/Module/Sources.php:37 +#: ../../Zotlabs/Module/Sources.php:38 msgid "Failed to create source. No channel selected." msgstr "Error en crear l'origen. Cap canal seleccionat." -#: ../../Zotlabs/Module/Sources.php:51 +#: ../../Zotlabs/Module/Sources.php:54 msgid "Source created." msgstr "Origen creat." -#: ../../Zotlabs/Module/Sources.php:64 +#: ../../Zotlabs/Module/Sources.php:67 msgid "Source updated." msgstr "Origen actualitzat." -#: ../../Zotlabs/Module/Sources.php:90 +#: ../../Zotlabs/Module/Sources.php:93 msgid "*" msgstr "*" -#: ../../Zotlabs/Module/Sources.php:96 +#: ../../Zotlabs/Module/Sources.php:99 #: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292 msgid "Channel Sources" msgstr "Canal Origen" -#: ../../Zotlabs/Module/Sources.php:97 +#: ../../Zotlabs/Module/Sources.php:100 msgid "Manage remote sources of content for your channel." msgstr "Gestiona contingut per al teu canal d'origens remots" -#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108 +#: ../../Zotlabs/Module/Sources.php:101 ../../Zotlabs/Module/Sources.php:111 msgid "New Source" msgstr "Nou Origen" -#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143 +#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:146 msgid "" "Import all or selected content from the following channel into this channel " "and distribute it according to your channel settings." -msgstr "Importar tot o sel·lecciona contingut dels següents canals, en aquest canal i distribueix-lo d'acord als teus ajustos de canals." +msgstr "Importa-ho tot o només allò seleccionat del següent canals, cap a aquest canal, i distribueix-lo d'acord a la configuració del teu canal." -#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 +#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147 msgid "Only import content with these words (one per line)" msgstr "Només importa contingut amb aquestes paraules (una per línia)" -#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 +#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147 msgid "Leave blank to import all public content" msgstr "Deixar en blanc per importar tot el contingut públic" -#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148 +#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:153 msgid "Channel Name" msgstr "Nom del canal" -#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147 +#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150 msgid "" "Add the following categories to posts imported from this source (comma " "separated)" msgstr "Afegeix les següents categories d'entrades importades des d'aquest origen (separat per comes)" -#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161 +#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +msgid "Resend posts with this channel as author" +msgstr "Reenvia les entrades que tinguin aquest canal com a autor/a" + +#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +msgid "Copyrights may apply" +msgstr "Poden aplicar drets d'autor" + +#: ../../Zotlabs/Module/Sources.php:136 ../../Zotlabs/Module/Sources.php:166 msgid "Source not found." msgstr "No s'ha trobat la font." -#: ../../Zotlabs/Module/Sources.php:140 +#: ../../Zotlabs/Module/Sources.php:143 msgid "Edit Source" msgstr "Edita la font" -#: ../../Zotlabs/Module/Sources.php:141 +#: ../../Zotlabs/Module/Sources.php:144 msgid "Delete Source" msgstr "Esborra la font" -#: ../../Zotlabs/Module/Sources.php:169 +#: ../../Zotlabs/Module/Sources.php:174 msgid "Source removed" msgstr "S'ha esborrat la font" -#: ../../Zotlabs/Module/Sources.php:171 +#: ../../Zotlabs/Module/Sources.php:176 msgid "Unable to remove source." msgstr "No s'ha pogut esborrar la font." @@ -6842,13 +6981,13 @@ msgstr "El canal està inactiu." msgid "Previous action reversed." msgstr "S'ha desfet l'acció anterior." -#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529 -#: ../../addon/pubcrawl/as.php:1440 ../../include/conversation.php:160 +#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1559 +#: ../../addon/pubcrawl/as.php:1544 ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s agrada %2$s de %3$s" -#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442 +#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1546 #: ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" @@ -6869,17 +7008,17 @@ msgstr "%1$s no està d'acord amb %3$s de %2$s" msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "%1$s s'abstén en %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072 +#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2102 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "%1$s assistirà a %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074 +#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2104 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "%1$s no assistirà a %3$s de %2$s" -#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076 +#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2106 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "%1$s potser assistirà a %3$s de %2$s" @@ -6938,7 +7077,7 @@ msgstr "Sobre:" #: ../../Zotlabs/Module/Directory.php:338 ../../Zotlabs/Module/Suggest.php:56 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/conversation.php:1052 ../../include/channel.php:1376 +#: ../../include/conversation.php:1057 ../../include/channel.php:1376 #: ../../include/connections.php:110 msgid "Connect" msgstr "Connecta " @@ -7087,7 +7226,6 @@ msgid "Subject:" msgstr "Assumpte:" #: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 -#: ../../include/conversation.php:1385 msgid "Attach file" msgstr "Adjunta arxiu" @@ -7096,7 +7234,7 @@ msgid "Send" msgstr "Envia" #: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 -#: ../../include/conversation.php:1430 +#: ../../include/conversation.php:1438 msgid "Set expiration date" msgstr "Ajusta la data d'expiració" @@ -7172,19 +7310,19 @@ msgstr "Programari" msgid "Rate" msgstr "Puntua" -#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:267 +#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:269 msgid "webpage" msgstr "pàgina web" -#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:273 +#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:275 msgid "block" msgstr "bloc" -#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:270 +#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:272 msgid "layout" msgstr "disposició" -#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:276 +#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:278 msgid "menu" msgstr "menú" @@ -7204,15 +7342,15 @@ msgstr "Tria una carpeta d'interès" #: ../../Zotlabs/Module/Rbmark.php:99 msgid "Save Bookmark" -msgstr "Guarda Favorits" +msgstr "Desa el marcadors" #: ../../Zotlabs/Module/Rbmark.php:100 msgid "URL of bookmark" -msgstr "URL de favorit" +msgstr "URL del marcador" #: ../../Zotlabs/Module/Rbmark.php:105 msgid "Or enter new bookmark folder name" -msgstr "O entra un nou nom de favorit" +msgstr "O introdueix el nom d'una carpeta de marcadors nova" #: ../../Zotlabs/Module/Filer.php:52 msgid "Enter a folder name" @@ -7222,7 +7360,7 @@ msgstr "Escriu el nom de la carpeta" msgid "or select an existing folder (doubleclick)" msgstr "o escull-ne una d'existent amb doble clic" -#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:151 +#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:162 msgid "Save to Folder" msgstr "Guardar en la Carpeta" @@ -7270,98 +7408,123 @@ msgstr "L'inscripció en aquest node està deshabilitat." msgid "Registration on this hub is by approval only." msgstr "L'inscripció en aquest node es únicament per validació." -#: ../../Zotlabs/Module/Register.php:202 +#: ../../Zotlabs/Module/Register.php:202 ../../Zotlabs/Module/Register.php:211 msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>" msgstr "<a href=\"pubsites\">Inscripció en altre node afiliat</a>" -#: ../../Zotlabs/Module/Register.php:212 +#: ../../Zotlabs/Module/Register.php:210 +msgid "Registration on this hub is by invitation only." +msgstr "El registre en aquest node funciona per invitació." + +#: ../../Zotlabs/Module/Register.php:221 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "El lloc ha excedit el límit màxim diari de nous comptes/inscripció. Provau demà." -#: ../../Zotlabs/Module/Register.php:238 +#: ../../Zotlabs/Module/Register.php:247 #, php-format msgid "I accept the %s for this website" msgstr "Accepto el %s per a aquest lloc web" -#: ../../Zotlabs/Module/Register.php:245 +#: ../../Zotlabs/Module/Register.php:254 #, php-format msgid "I am over %s years of age and accept the %s for this website" msgstr "Tinc més de %s anys i accepto les %s" -#: ../../Zotlabs/Module/Register.php:250 +#: ../../Zotlabs/Module/Register.php:259 msgid "Your email address" msgstr "La teva adreça de correu electrónic" -#: ../../Zotlabs/Module/Register.php:251 +#: ../../Zotlabs/Module/Register.php:260 msgid "Choose a password" msgstr "Tria una contrasenya" -#: ../../Zotlabs/Module/Register.php:252 +#: ../../Zotlabs/Module/Register.php:261 msgid "Please re-enter your password" msgstr "Si et plau, re-entra la contrasenya" -#: ../../Zotlabs/Module/Register.php:253 +#: ../../Zotlabs/Module/Register.php:262 msgid "Please enter your invitation code" msgstr "Si et plau, introdueix el teu codi d'invitació" -#: ../../Zotlabs/Module/Register.php:258 +#: ../../Zotlabs/Module/Register.php:263 +msgid "Your Name" +msgstr "El teu nom" + +#: ../../Zotlabs/Module/Register.php:263 +msgid "Real names are preferred." +msgstr "Considera de fer servir el teu nom real." + +#: ../../Zotlabs/Module/Register.php:265 +#, php-format +msgid "" +"Your nickname will be used to create an easy to remember channel address " +"e.g. nickname%s" +msgstr "El teu àlies servirà per crear un nom fàcil per recordar l'adreça del canal. Per exemple, àlies%s" + +#: ../../Zotlabs/Module/Register.php:266 +msgid "" +"Select a channel permission role for your usage needs and privacy " +"requirements." +msgstr "Escull un rol de permisos de canal. Tingues en compte l'ús que en faràs i el nivell de privacitat que desitges." + +#: ../../Zotlabs/Module/Register.php:267 msgid "no" msgstr "no" -#: ../../Zotlabs/Module/Register.php:258 +#: ../../Zotlabs/Module/Register.php:267 msgid "yes" msgstr "sí" -#: ../../Zotlabs/Module/Register.php:274 -msgid "Membership on this site is by invitation only." -msgstr "La pertinença en aquest lloc es per invitació exclusivament." - -#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1570 -#: ../../include/nav.php:164 +#: ../../Zotlabs/Module/Register.php:294 ../../boot.php:1593 +#: ../../include/nav.php:158 msgid "Register" msgstr "Inscripció" -#: ../../Zotlabs/Module/Register.php:287 +#: ../../Zotlabs/Module/Register.php:295 msgid "" "This site requires email verification. After completing this form, please " "check your email for further instructions." msgstr "Aquest node demana que es verifiquin els comptes de correu. Un cop completat el formulari, comprova la teva safata d'entrada i segueix les instruccions que hi trobaràs." -#: ../../Zotlabs/Module/Cover_photo.php:136 -#: ../../Zotlabs/Module/Cover_photo.php:186 +#: ../../Zotlabs/Module/Cover_photo.php:168 +#: ../../Zotlabs/Module/Cover_photo.php:218 msgid "Cover Photos" msgstr "Fotos de Portada" -#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4558 +#: ../../Zotlabs/Module/Cover_photo.php:269 ../../include/items.php:4502 msgid "female" msgstr "femení" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4559 +#: ../../Zotlabs/Module/Cover_photo.php:270 ../../include/items.php:4503 #, php-format msgid "%1$s updated her %2$s" msgstr "%1$s actualitzà el seu %2$s" -#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4560 +#: ../../Zotlabs/Module/Cover_photo.php:271 ../../include/items.php:4504 msgid "male" msgstr "masculí" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4561 +#: ../../Zotlabs/Module/Cover_photo.php:272 ../../include/items.php:4505 #, php-format msgid "%1$s updated his %2$s" msgstr "%1$s actualitzà el seu %2$s" -#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4563 +#: ../../Zotlabs/Module/Cover_photo.php:274 ../../include/items.php:4507 #, php-format msgid "%1$s updated their %2$s" msgstr "%1$s actualitzà els seus %2$s" -#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2070 +#: ../../Zotlabs/Module/Cover_photo.php:276 ../../include/channel.php:2081 msgid "cover photo" msgstr "Foto de la portada" -#: ../../Zotlabs/Module/Cover_photo.php:361 +#: ../../Zotlabs/Module/Cover_photo.php:390 +msgid "Your cover photo may be visible to anybody on the internet" +msgstr "La teva foto de portada és pública i visible a tothom." + +#: ../../Zotlabs/Module/Cover_photo.php:394 msgid "Change Cover Photo" msgstr "Canvia la foto de portada" @@ -7369,8 +7532,8 @@ msgstr "Canvia la foto de portada" msgid "Documentation Search" msgstr "Cerca de Documentació" -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1824 -#: ../../include/nav.php:391 +#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1833 +#: ../../include/nav.php:383 msgid "About" msgstr "El Meu Perfil" @@ -7414,39 +7577,27 @@ msgstr "Elimina l'etiqueta d'element" msgid "Select a tag to remove: " msgstr "Tria l'etiqueta a eliminar:" -#: ../../Zotlabs/Module/Network.php:100 +#: ../../Zotlabs/Module/Network.php:116 msgid "No such group" msgstr "No existeix el grup" -#: ../../Zotlabs/Module/Network.php:142 +#: ../../Zotlabs/Module/Network.php:157 msgid "No such channel" msgstr "No existeix el canal" -#: ../../Zotlabs/Module/Network.php:147 -msgid "forum" -msgstr "fòrum" - -#: ../../Zotlabs/Module/Network.php:159 -msgid "Search Results For:" -msgstr "Cerca resultats per:" - -#: ../../Zotlabs/Module/Network.php:229 +#: ../../Zotlabs/Module/Network.php:242 msgid "Privacy group is empty" -msgstr "el grup privat està vuit" +msgstr "El grup de privacitat està buit" -#: ../../Zotlabs/Module/Network.php:238 +#: ../../Zotlabs/Module/Network.php:253 msgid "Privacy group: " -msgstr "Grup privat:" +msgstr "Grup de privacitat:" -#: ../../Zotlabs/Module/Network.php:265 -msgid "Invalid connection." -msgstr "La connexió és invàlida." - -#: ../../Zotlabs/Module/Network.php:285 ../../addon/redred/redred.php:65 +#: ../../Zotlabs/Module/Network.php:304 ../../addon/redred/redred.php:65 msgid "Invalid channel." msgstr "El canal no és vàlid." -#: ../../Zotlabs/Module/Acl.php:361 +#: ../../Zotlabs/Module/Acl.php:359 msgid "network" msgstr "xarxa" @@ -7464,44 +7615,44 @@ msgstr "Benvingut a %s" msgid "Permission Denied." msgstr "Permisos Denegats." -#: ../../Zotlabs/Module/Filestorage.php:95 +#: ../../Zotlabs/Module/Filestorage.php:112 msgid "File not found." msgstr "Arxiu no torbat." -#: ../../Zotlabs/Module/Filestorage.php:142 +#: ../../Zotlabs/Module/Filestorage.php:165 msgid "Edit file permissions" msgstr "Edita els permisos d'arxiu" -#: ../../Zotlabs/Module/Filestorage.php:154 +#: ../../Zotlabs/Module/Filestorage.php:177 msgid "Set/edit permissions" msgstr "Canvia/edita permisos" -#: ../../Zotlabs/Module/Filestorage.php:155 +#: ../../Zotlabs/Module/Filestorage.php:178 msgid "Include all files and sub folders" msgstr "Inclou tots als arxius i subdirectoris" -#: ../../Zotlabs/Module/Filestorage.php:156 +#: ../../Zotlabs/Module/Filestorage.php:179 msgid "Return to file list" msgstr "Tornar al llistat d'arxius" -#: ../../Zotlabs/Module/Filestorage.php:158 +#: ../../Zotlabs/Module/Filestorage.php:181 msgid "Copy/paste this code to attach file to a post" msgstr "Copia/enganxa aquest codi per a adjuntar un arxiu a l'entrada" -#: ../../Zotlabs/Module/Filestorage.php:159 +#: ../../Zotlabs/Module/Filestorage.php:182 msgid "Copy/paste this URL to link file from a web page" msgstr "Copia/enganxa aquesta URL per a enllaçar l'arxiu d'una pàgina web" -#: ../../Zotlabs/Module/Filestorage.php:161 +#: ../../Zotlabs/Module/Filestorage.php:184 msgid "Share this file" msgstr "Comparteix l'arxiu" -#: ../../Zotlabs/Module/Filestorage.php:162 +#: ../../Zotlabs/Module/Filestorage.php:185 msgid "Show URL to this file" msgstr "Mostra la URL d'aquest arxiu" -#: ../../Zotlabs/Module/Filestorage.php:163 -#: ../../Zotlabs/Storage/Browser.php:397 +#: ../../Zotlabs/Module/Filestorage.php:186 +#: ../../Zotlabs/Storage/Browser.php:405 msgid "Show in your contacts shared folder" msgstr "Mostra les carpetes compartides dels teus contactes" @@ -7550,47 +7701,47 @@ msgstr "Comptes caducats" msgid "Expiring accounts" msgstr "Comptes a punt de caducar" -#: ../../Zotlabs/Module/Admin.php:112 +#: ../../Zotlabs/Module/Admin.php:116 msgid "Clones" msgstr "Clons" -#: ../../Zotlabs/Module/Admin.php:118 +#: ../../Zotlabs/Module/Admin.php:122 msgid "Message queues" msgstr "Cues de missatges" -#: ../../Zotlabs/Module/Admin.php:132 +#: ../../Zotlabs/Module/Admin.php:136 msgid "Your software should be updated" msgstr "El teu programari cal que s'actualitzi" -#: ../../Zotlabs/Module/Admin.php:137 +#: ../../Zotlabs/Module/Admin.php:141 msgid "Summary" msgstr "Sumari" -#: ../../Zotlabs/Module/Admin.php:140 +#: ../../Zotlabs/Module/Admin.php:144 msgid "Registered accounts" msgstr "Comptes registrades" -#: ../../Zotlabs/Module/Admin.php:141 +#: ../../Zotlabs/Module/Admin.php:145 msgid "Pending registrations" msgstr "Comptes pendents d'inscripció" -#: ../../Zotlabs/Module/Admin.php:142 +#: ../../Zotlabs/Module/Admin.php:146 msgid "Registered channels" msgstr "Canals registrats" -#: ../../Zotlabs/Module/Admin.php:143 -msgid "Active plugins" +#: ../../Zotlabs/Module/Admin.php:147 +msgid "Active addons" msgstr "Extensions actives" -#: ../../Zotlabs/Module/Admin.php:144 +#: ../../Zotlabs/Module/Admin.php:148 msgid "Version" msgstr "Versió" -#: ../../Zotlabs/Module/Admin.php:145 +#: ../../Zotlabs/Module/Admin.php:149 msgid "Repository version (master)" msgstr "Versió (master) del repositori" -#: ../../Zotlabs/Module/Admin.php:146 +#: ../../Zotlabs/Module/Admin.php:150 msgid "Repository version (dev)" msgstr "Versió (desenvolupament) del repositori" @@ -7643,7 +7794,7 @@ msgid "" "Password reset failed." msgstr "Ha fallat el restabliment de contrasenya perquè la no s'ha pogut verificar soŀlicitud. Pot ser que ja ho hàgiu soŀlicitat abans." -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1598 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1622 msgid "Password Reset" msgstr "Restabliment de contrasenya" @@ -7688,8 +7839,8 @@ msgstr "Escriu la teva adreça de correu electrònic i envia per restablir la co msgid "Email Address" msgstr "Adreça electrònica" -#: ../../Zotlabs/Module/Notifications.php:62 -#: ../../Zotlabs/Lib/ThreadItem.php:408 +#: ../../Zotlabs/Module/Notifications.php:60 +#: ../../Zotlabs/Lib/ThreadItem.php:413 msgid "Mark all seen" msgstr "Marca tot com ja vist" @@ -7717,124 +7868,120 @@ msgstr "4. Expert - puc escriure codi en algun llenguatge de programació" msgid "5. Wizard - I probably know more than you do" msgstr "5. Ninja - probablement en sé més que tu" -#: ../../Zotlabs/Lib/Apps.php:231 +#: ../../Zotlabs/Lib/Apps.php:294 msgid "Site Admin" msgstr "Administració" -#: ../../Zotlabs/Lib/Apps.php:232 ../../addon/buglink/buglink.php:16 +#: ../../Zotlabs/Lib/Apps.php:295 ../../addon/buglink/buglink.php:16 msgid "Report Bug" msgstr "Informa d'errors" -#: ../../Zotlabs/Lib/Apps.php:233 +#: ../../Zotlabs/Lib/Apps.php:296 msgid "View Bookmarks" -msgstr "Veure Marcadors" +msgstr "Marcadors" -#: ../../Zotlabs/Lib/Apps.php:234 +#: ../../Zotlabs/Lib/Apps.php:297 msgid "My Chatrooms" msgstr "Les meves Sales de Xat" -#: ../../Zotlabs/Lib/Apps.php:236 -msgid "Firefox Share" -msgstr "Compartir amb Firefox" - -#: ../../Zotlabs/Lib/Apps.php:237 +#: ../../Zotlabs/Lib/Apps.php:299 msgid "Remote Diagnostics" msgstr "Diagnòstics Remots" -#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:417 +#: ../../Zotlabs/Lib/Apps.php:300 ../../include/features.php:435 msgid "Suggest Channels" msgstr "Suggerir Canals" -#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1589 -#: ../../include/nav.php:126 ../../include/nav.php:130 +#: ../../Zotlabs/Lib/Apps.php:301 ../../boot.php:1613 +#: ../../include/nav.php:120 ../../include/nav.php:124 msgid "Login" msgstr "Identifica't" -#: ../../Zotlabs/Lib/Apps.php:241 +#: ../../Zotlabs/Lib/Apps.php:303 msgid "Activity" msgstr "Activitat" -#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1931 -#: ../../include/features.php:96 ../../include/nav.php:497 +#: ../../Zotlabs/Lib/Apps.php:307 ../../include/conversation.php:1940 +#: ../../include/features.php:96 ../../include/nav.php:489 msgid "Wiki" msgstr "Wiki" -#: ../../Zotlabs/Lib/Apps.php:246 +#: ../../Zotlabs/Lib/Apps.php:308 msgid "Channel Home" msgstr "Canal Personal" -#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1853 -#: ../../include/conversation.php:1856 +#: ../../Zotlabs/Lib/Apps.php:311 ../../include/conversation.php:1862 +#: ../../include/conversation.php:1865 msgid "Events" msgstr "Esdeveniments" -#: ../../Zotlabs/Lib/Apps.php:250 +#: ../../Zotlabs/Lib/Apps.php:312 msgid "Directory" msgstr "Directori" -#: ../../Zotlabs/Lib/Apps.php:252 +#: ../../Zotlabs/Lib/Apps.php:314 msgid "Mail" msgstr "Correu" -#: ../../Zotlabs/Lib/Apps.php:255 +#: ../../Zotlabs/Lib/Apps.php:317 msgid "Chat" msgstr "Xerrar" -#: ../../Zotlabs/Lib/Apps.php:257 +#: ../../Zotlabs/Lib/Apps.php:319 msgid "Probe" msgstr "Sondeig" -#: ../../Zotlabs/Lib/Apps.php:258 +#: ../../Zotlabs/Lib/Apps.php:320 msgid "Suggest" msgstr "Suggeriment" -#: ../../Zotlabs/Lib/Apps.php:259 +#: ../../Zotlabs/Lib/Apps.php:321 msgid "Random Channel" msgstr "Canal Aleatori" -#: ../../Zotlabs/Lib/Apps.php:260 +#: ../../Zotlabs/Lib/Apps.php:322 msgid "Invite" msgstr "Convida" -#: ../../Zotlabs/Lib/Apps.php:261 ../../Zotlabs/Widget/Admin.php:26 +#: ../../Zotlabs/Lib/Apps.php:323 ../../Zotlabs/Widget/Admin.php:26 msgid "Features" msgstr "Funcionalitats" -#: ../../Zotlabs/Lib/Apps.php:262 ../../addon/openid/MysqlProvider.php:69 +#: ../../Zotlabs/Lib/Apps.php:324 ../../addon/openid/MysqlProvider.php:69 msgid "Language" msgstr "Idioma" -#: ../../Zotlabs/Lib/Apps.php:263 +#: ../../Zotlabs/Lib/Apps.php:325 msgid "Post" msgstr "Entrada" -#: ../../Zotlabs/Lib/Apps.php:264 ../../addon/openid/MysqlProvider.php:58 +#: ../../Zotlabs/Lib/Apps.php:326 ../../addon/openid/MysqlProvider.php:58 #: ../../addon/openid/MysqlProvider.php:59 #: ../../addon/openid/MysqlProvider.php:60 msgid "Profile Photo" msgstr "Foto del Perfil" -#: ../../Zotlabs/Lib/Apps.php:407 +#: ../../Zotlabs/Lib/Apps.php:473 msgid "Purchase" msgstr "Compra" -#: ../../Zotlabs/Lib/Apps.php:411 +#: ../../Zotlabs/Lib/Apps.php:477 msgid "Undelete" msgstr "Desfés l'operació d'esborrar" -#: ../../Zotlabs/Lib/Apps.php:419 +#: ../../Zotlabs/Lib/Apps.php:485 msgid "Add to app-tray" msgstr "Afegeix a la safata d'aplicacions" -#: ../../Zotlabs/Lib/Apps.php:420 +#: ../../Zotlabs/Lib/Apps.php:486 msgid "Remove from app-tray" msgstr "Esborra de la safata d'aplicacions" -#: ../../Zotlabs/Lib/Apps.php:421 +#: ../../Zotlabs/Lib/Apps.php:487 msgid "Pin to navbar" msgstr "Fixa a la barra de navegació" -#: ../../Zotlabs/Lib/Apps.php:422 +#: ../../Zotlabs/Lib/Apps.php:488 msgid "Unpin from navbar" msgstr "Treu de la barra de navegació" @@ -7921,8 +8068,8 @@ msgctxt "wiki_history" msgid "Message" msgstr "Missatge" -#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:744 -#: ../../include/bbcode.php:914 +#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:746 +#: ../../include/bbcode.php:916 msgid "Different viewers will see this text differently" msgstr "Diferents observadors veuran aquest text de diferents formes" @@ -7987,7 +8134,7 @@ msgstr "Aquesta és la configuració per defecte per a qui pugui veure els teus #: ../../Zotlabs/Lib/PermissionDescription.php:154 msgid "This is your default setting for the audience of your webpages" -msgstr "Aquests son els ajustos per defecte de l'audiència de les teves pàgines web" +msgstr "Aquesta és la teva configuració per defecte per l'audiència de les teves pàgines web" #: ../../Zotlabs/Lib/Chatroom.php:23 msgid "Missing room name" @@ -8295,208 +8442,200 @@ msgstr "Error d'Actualització a %s" msgid "Update %s failed. See error logs." msgstr "L'actualització %s ha fallat. Mira el registre d'errors." -#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:697 +#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:700 msgid "Private Message" msgstr "Missatge Privat" -#: ../../Zotlabs/Lib/ThreadItem.php:147 ../../include/conversation.php:689 +#: ../../Zotlabs/Lib/ThreadItem.php:152 ../../Zotlabs/Storage/Browser.php:280 +msgid "Admin Delete" +msgstr "Esborrat amb privilegis d'administració" + +#: ../../Zotlabs/Lib/ThreadItem.php:158 ../../include/conversation.php:690 msgid "Select" msgstr "Selecciona" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:183 msgid "I will attend" msgstr "Assistiré" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:183 msgid "I will not attend" msgstr "No assistiré" -#: ../../Zotlabs/Lib/ThreadItem.php:172 +#: ../../Zotlabs/Lib/ThreadItem.php:183 msgid "I might attend" msgstr "Podria assistir" -#: ../../Zotlabs/Lib/ThreadItem.php:182 +#: ../../Zotlabs/Lib/ThreadItem.php:193 msgid "I agree" msgstr "D'acord" -#: ../../Zotlabs/Lib/ThreadItem.php:182 +#: ../../Zotlabs/Lib/ThreadItem.php:193 msgid "I disagree" msgstr "En desacord" -#: ../../Zotlabs/Lib/ThreadItem.php:182 +#: ../../Zotlabs/Lib/ThreadItem.php:193 msgid "I abstain" msgstr "M'abstinc" -#: ../../Zotlabs/Lib/ThreadItem.php:238 -msgid "Add Star" -msgstr "Fes-lo Preferit" - -#: ../../Zotlabs/Lib/ThreadItem.php:239 -msgid "Remove Star" -msgstr "Treu-lo de Preferits" - -#: ../../Zotlabs/Lib/ThreadItem.php:240 +#: ../../Zotlabs/Lib/ThreadItem.php:247 ../../include/conversation.php:695 msgid "Toggle Star Status" msgstr "Canvia el Estat de la Preferència" -#: ../../Zotlabs/Lib/ThreadItem.php:244 -msgid "starred" -msgstr "preferit" - -#: ../../Zotlabs/Lib/ThreadItem.php:254 ../../include/conversation.php:704 +#: ../../Zotlabs/Lib/ThreadItem.php:258 ../../include/conversation.php:707 msgid "Message signature validated" msgstr "Validada la signatura del missatge" -#: ../../Zotlabs/Lib/ThreadItem.php:255 ../../include/conversation.php:705 +#: ../../Zotlabs/Lib/ThreadItem.php:259 ../../include/conversation.php:708 msgid "Message signature incorrect" msgstr "Signatura del missatge incorrecta" -#: ../../Zotlabs/Lib/ThreadItem.php:263 +#: ../../Zotlabs/Lib/ThreadItem.php:267 msgid "Add Tag" msgstr "Afegeix Etiqueta" -#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575 +#: ../../Zotlabs/Lib/ThreadItem.php:285 ../../include/taxonomy.php:575 msgid "like" msgstr "agrada" -#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576 +#: ../../Zotlabs/Lib/ThreadItem.php:286 ../../include/taxonomy.php:576 msgid "dislike" msgstr "desagrada" -#: ../../Zotlabs/Lib/ThreadItem.php:286 +#: ../../Zotlabs/Lib/ThreadItem.php:290 msgid "Share This" msgstr "Comparteix Això" -#: ../../Zotlabs/Lib/ThreadItem.php:286 +#: ../../Zotlabs/Lib/ThreadItem.php:290 msgid "share" msgstr "comparteix" -#: ../../Zotlabs/Lib/ThreadItem.php:295 +#: ../../Zotlabs/Lib/ThreadItem.php:299 msgid "Delivery Report" msgstr "Informe de Lliurament" -#: ../../Zotlabs/Lib/ThreadItem.php:313 +#: ../../Zotlabs/Lib/ThreadItem.php:317 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d commentari" msgstr[1] "%d commentaris" -#: ../../Zotlabs/Lib/ThreadItem.php:343 ../../Zotlabs/Lib/ThreadItem.php:344 +#: ../../Zotlabs/Lib/ThreadItem.php:347 ../../Zotlabs/Lib/ThreadItem.php:348 #, php-format msgid "View %s's profile - %s" -msgstr "Veure perfil de %s - %s" +msgstr "Mostra el perfil de %s - %s" -#: ../../Zotlabs/Lib/ThreadItem.php:347 +#: ../../Zotlabs/Lib/ThreadItem.php:351 msgid "to" msgstr "a" -#: ../../Zotlabs/Lib/ThreadItem.php:348 +#: ../../Zotlabs/Lib/ThreadItem.php:352 msgid "via" msgstr "via" -#: ../../Zotlabs/Lib/ThreadItem.php:349 +#: ../../Zotlabs/Lib/ThreadItem.php:353 msgid "Wall-to-Wall" msgstr "Mur-a-Mur" -#: ../../Zotlabs/Lib/ThreadItem.php:350 +#: ../../Zotlabs/Lib/ThreadItem.php:354 msgid "via Wall-To-Wall:" msgstr "via Mur-a-Mur:" -#: ../../Zotlabs/Lib/ThreadItem.php:363 ../../include/conversation.php:763 +#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:766 #, php-format msgid "from %s" msgstr "De %s" -#: ../../Zotlabs/Lib/ThreadItem.php:366 ../../include/conversation.php:766 +#: ../../Zotlabs/Lib/ThreadItem.php:370 ../../include/conversation.php:769 #, php-format msgid "last edited: %s" msgstr "últim editat: %s" -#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:767 +#: ../../Zotlabs/Lib/ThreadItem.php:371 ../../include/conversation.php:770 #, php-format msgid "Expires: %s" msgstr "Expira: %s" -#: ../../Zotlabs/Lib/ThreadItem.php:374 +#: ../../Zotlabs/Lib/ThreadItem.php:379 msgid "Attend" msgstr "Assistir-hi" -#: ../../Zotlabs/Lib/ThreadItem.php:375 +#: ../../Zotlabs/Lib/ThreadItem.php:380 msgid "Attendance Options" msgstr "Opcions d'assistència" -#: ../../Zotlabs/Lib/ThreadItem.php:376 +#: ../../Zotlabs/Lib/ThreadItem.php:381 msgid "Vote" msgstr "Votar" -#: ../../Zotlabs/Lib/ThreadItem.php:377 +#: ../../Zotlabs/Lib/ThreadItem.php:382 msgid "Voting Options" msgstr "Opcions de votació" -#: ../../Zotlabs/Lib/ThreadItem.php:398 +#: ../../Zotlabs/Lib/ThreadItem.php:403 #: ../../addon/bookmarker/bookmarker.php:38 msgid "Save Bookmarks" -msgstr "Guarda Favorits" +msgstr "Desa els marcadors" -#: ../../Zotlabs/Lib/ThreadItem.php:399 +#: ../../Zotlabs/Lib/ThreadItem.php:404 msgid "Add to Calendar" msgstr "Afegeix al Calendari" -#: ../../Zotlabs/Lib/ThreadItem.php:426 ../../include/conversation.php:483 +#: ../../Zotlabs/Lib/ThreadItem.php:431 ../../include/conversation.php:483 msgid "This is an unsaved preview" msgstr "Això només és una vista prèvia, no està desada" -#: ../../Zotlabs/Lib/ThreadItem.php:458 ../../include/js_strings.php:7 +#: ../../Zotlabs/Lib/ThreadItem.php:463 ../../include/js_strings.php:7 #, php-format msgid "%s show all" msgstr "%s mostra-ho tot" -#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1380 +#: ../../Zotlabs/Lib/ThreadItem.php:758 ../../include/conversation.php:1388 msgid "Bold" msgstr "Negreta" -#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1381 +#: ../../Zotlabs/Lib/ThreadItem.php:759 ../../include/conversation.php:1389 msgid "Italic" msgstr "Italica" -#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1382 +#: ../../Zotlabs/Lib/ThreadItem.php:760 ../../include/conversation.php:1390 msgid "Underline" msgstr "Subratllat" -#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/conversation.php:1383 +#: ../../Zotlabs/Lib/ThreadItem.php:761 ../../include/conversation.php:1391 msgid "Quote" msgstr "Cometes" -#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../include/conversation.php:1384 +#: ../../Zotlabs/Lib/ThreadItem.php:762 ../../include/conversation.php:1392 msgid "Code" msgstr "Codi" -#: ../../Zotlabs/Lib/ThreadItem.php:758 +#: ../../Zotlabs/Lib/ThreadItem.php:763 msgid "Image" msgstr "Imatge" -#: ../../Zotlabs/Lib/ThreadItem.php:759 -msgid "Attach File" -msgstr "Adjunta un fitxer" +#: ../../Zotlabs/Lib/ThreadItem.php:764 ../../include/conversation.php:1393 +msgid "Attach/Upload file" +msgstr "Adjunta i puja un arxiu" -#: ../../Zotlabs/Lib/ThreadItem.php:760 +#: ../../Zotlabs/Lib/ThreadItem.php:765 msgid "Insert Link" msgstr "Insereix Enllaç" -#: ../../Zotlabs/Lib/ThreadItem.php:761 +#: ../../Zotlabs/Lib/ThreadItem.php:766 msgid "Video" msgstr "Video" -#: ../../Zotlabs/Lib/ThreadItem.php:771 +#: ../../Zotlabs/Lib/ThreadItem.php:776 msgid "Your full name (required)" msgstr "Nom complet (obligatori)" -#: ../../Zotlabs/Lib/ThreadItem.php:772 +#: ../../Zotlabs/Lib/ThreadItem.php:777 msgid "Your email address (required)" msgstr "Adreça de correu (obligatòria)" -#: ../../Zotlabs/Lib/ThreadItem.php:773 +#: ../../Zotlabs/Lib/ThreadItem.php:778 msgid "Your website URL (optional)" msgstr "Adreça web (opcional)" @@ -8512,11 +8651,11 @@ msgstr "Autenticació remota bloquejada. Ha iniciat sessió en aquest lloc a niv msgid "Welcome %s. Remote authentication successful." msgstr "Benvingut %s. Autenticació remota reeixida." -#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:287 +#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:289 msgid "parent" msgstr "amunt" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2845 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2817 msgid "Collection" msgstr "Col·lecció" @@ -8528,8 +8667,8 @@ msgstr "Principal" msgid "Addressbook" msgstr "Llista d'Adreçes" -#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:420 -#: ../../include/nav.php:423 +#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:412 +#: ../../include/nav.php:415 msgid "Calendar" msgstr "Calendari" @@ -8553,33 +8692,36 @@ msgstr "Compartit" msgid "Add Files" msgstr "Afegeix arxius" -#: ../../Zotlabs/Storage/Browser.php:353 +#: ../../Zotlabs/Storage/Browser.php:361 #, php-format msgid "You are using %1$s of your available file storage." msgstr "Estàs emprant el %1$s de l'espai d'emmagatzematge disponible" -#: ../../Zotlabs/Storage/Browser.php:358 +#: ../../Zotlabs/Storage/Browser.php:366 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "Estàs emprant %1$s de %2$s d'emmagatzematge d'arxius disponible.\n(%3$s%)" -#: ../../Zotlabs/Storage/Browser.php:369 +#: ../../Zotlabs/Storage/Browser.php:377 msgid "WARNING:" msgstr "ALERTA:" -#: ../../Zotlabs/Storage/Browser.php:381 +#: ../../Zotlabs/Storage/Browser.php:389 msgid "Create new folder" msgstr "Crea una nova carpeta" -#: ../../Zotlabs/Storage/Browser.php:383 +#: ../../Zotlabs/Storage/Browser.php:391 msgid "Upload file" msgstr "Puja arxiu" -#: ../../Zotlabs/Storage/Browser.php:396 +#: ../../Zotlabs/Storage/Browser.php:404 msgid "Drop files here to immediately upload" msgstr "Deixa anar fitxers aquí per a pujar-los immediatament" #: ../../Zotlabs/Widget/Forums.php:100 +#: ../../Zotlabs/Widget/Activity_filter.php:100 +#: ../../Zotlabs/Widget/Notifications.php:119 +#: ../../Zotlabs/Widget/Notifications.php:120 msgid "Forums" msgstr "Forums" @@ -8659,7 +8801,7 @@ msgstr "Importa una llibreta d'adreces" msgid "Select an addressbook to import to" msgstr "Escull la llibreta d'adreces a on importar" -#: ../../Zotlabs/Widget/Appcategories.php:40 +#: ../../Zotlabs/Widget/Appcategories.php:43 #: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141 #: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:409 #: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 @@ -8667,7 +8809,8 @@ msgstr "Escull la llibreta d'adreces a on importar" msgid "Categories" msgstr "Categories" -#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Widget/Filer.php:31 +#: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31 +#: ../../widgets/Netselect/Netselect.php:26 #: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100 #: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189 msgid "Everything" @@ -8718,8 +8861,8 @@ msgid "New Message" msgstr "Nou Missatge" #: ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1867 ../../include/conversation.php:1870 -#: ../../include/nav.php:434 ../../include/nav.php:437 +#: ../../include/conversation.php:1876 ../../include/conversation.php:1879 +#: ../../include/nav.php:426 ../../include/nav.php:429 msgid "Chatrooms" msgstr "Sala per Xerrar" @@ -8744,6 +8887,74 @@ msgctxt "widget" msgid "Activity" msgstr "Activitat" +#: ../../Zotlabs/Widget/Activity_filter.php:24 +msgid "Personal Posts" +msgstr "Entrades personals" + +#: ../../Zotlabs/Widget/Activity_filter.php:28 +msgid "Show posts that mention or involve me" +msgstr "Mostra les entrades que m'inclouen" + +#: ../../Zotlabs/Widget/Activity_filter.php:39 +msgid "Starred Posts" +msgstr "Entrades destacades" + +#: ../../Zotlabs/Widget/Activity_filter.php:43 +msgid "Show posts that I have starred" +msgstr "Mostra les entrades que he destacat" + +#: ../../Zotlabs/Widget/Activity_filter.php:63 +#, php-format +msgid "Show posts related to the %s privacy group" +msgstr "Mostra les entrades relacionades amb el grup de privacitat %s" + +#: ../../Zotlabs/Widget/Activity_filter.php:72 +msgid "Show my privacy groups" +msgstr "Mostra els meus grups de privacitat" + +#: ../../Zotlabs/Widget/Activity_filter.php:93 +msgid "Show posts to this forum" +msgstr "Mostra les entrades a aquest fòrum" + +#: ../../Zotlabs/Widget/Activity_filter.php:104 +msgid "Show forums" +msgstr "Mostra els fòrums" + +#: ../../Zotlabs/Widget/Activity_filter.php:128 +#, php-format +msgid "Show posts that I have filed to %s" +msgstr "Mostra les entrades que he penjat a %s" + +#: ../../Zotlabs/Widget/Activity_filter.php:134 +#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 +#: ../../include/features.php:488 +msgid "Saved Folders" +msgstr "Carpetes Guardades" + +#: ../../Zotlabs/Widget/Activity_filter.php:138 +msgid "Show filed post categories" +msgstr "Mostra les categories de les entrades pujades" + +#: ../../Zotlabs/Widget/Activity_filter.php:152 +msgid "Panel search" +msgstr "Panell de cerca" + +#: ../../Zotlabs/Widget/Activity_filter.php:162 +#: ../../Zotlabs/Widget/Notifications.php:27 +#: ../../Zotlabs/Widget/Notifications.php:46 +#: ../../Zotlabs/Widget/Notifications.php:122 +#: ../../Zotlabs/Widget/Notifications.php:153 +msgid "Filter by name" +msgstr "Filtra per nom" + +#: ../../Zotlabs/Widget/Activity_filter.php:177 +msgid "Remove active filter" +msgstr "Esborra el filtre actual" + +#: ../../Zotlabs/Widget/Activity_filter.php:193 +msgid "Activity Filters" +msgstr "Filtres d'activitat" + #: ../../Zotlabs/Widget/Follow.php:22 #, php-format msgid "You have %1$.0f of %2$.0f allowed connections." @@ -8805,7 +9016,7 @@ msgstr "Plaç de remoció" msgid "Saved Searches" msgstr "Cerques Guardades" -#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:333 +#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:325 msgid "add" msgstr "afegeix" @@ -8842,10 +9053,33 @@ msgstr "Suggerencies" msgid "See more..." msgstr "Veure més....." -#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:470 -msgid "Saved Folders" -msgstr "Carpetes Guardades" +#: ../../Zotlabs/Widget/Activity_order.php:86 +msgid "Commented Date" +msgstr "Data dels comentaris" + +#: ../../Zotlabs/Widget/Activity_order.php:90 +msgid "Order by last commented date" +msgstr "Ordena segons la data dels comentaris més recents" + +#: ../../Zotlabs/Widget/Activity_order.php:93 +msgid "Posted Date" +msgstr "Data de les entrades" + +#: ../../Zotlabs/Widget/Activity_order.php:97 +msgid "Order by last posted date" +msgstr "Ordena segons la data de publicació de les entrades" + +#: ../../Zotlabs/Widget/Activity_order.php:100 +msgid "Date Unthreaded" +msgstr "Data sense agrupar" + +#: ../../Zotlabs/Widget/Activity_order.php:104 +msgid "Order unthreaded by date" +msgstr "Ordena per data els comentaris i les publicacions sense agrupar-los per converses" + +#: ../../Zotlabs/Widget/Activity_order.php:119 +msgid "Activity Order" +msgstr "Ordre de les activitats" #: ../../Zotlabs/Widget/Cover_photo.php:54 msgid "Click to show more" @@ -8856,6 +9090,18 @@ msgstr "Fes clic per veure més" msgid "Tags" msgstr "Etiquetes" +#: ../../Zotlabs/Widget/Appstore.php:11 +msgid "App Collections" +msgstr "Coŀleccions d'aplicacions" + +#: ../../Zotlabs/Widget/Appstore.php:13 +msgid "Available Apps" +msgstr "Aplicacions disponibles" + +#: ../../Zotlabs/Widget/Appstore.php:14 +msgid "Installed apps" +msgstr "Aplicacions instaŀlades" + #: ../../Zotlabs/Widget/Newmember.php:24 msgid "Profile Creation" msgstr "Creació de perfils" @@ -8868,9 +9114,9 @@ msgstr "Puja una foto de perfil" msgid "Upload cover photo" msgstr "Puja una foto de portada" -#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:119 +#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:113 msgid "Edit your profile" -msgstr "Edita el teu perfil" +msgstr "Modifica el teu perfil" #: ../../Zotlabs/Widget/Newmember.php:31 msgid "Find and Connect with others" @@ -8920,21 +9166,21 @@ msgstr "Revisa cua" msgid "DB updates" msgstr "Actualitzacions de Base de Dades" -#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:199 +#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:191 msgid "Admin" -msgstr "Admin" +msgstr "Administració" #: ../../Zotlabs/Widget/Admin.php:56 -msgid "Plugin Features" -msgstr "Extensions configurables" +msgid "Addon Features" +msgstr "Funcions de les extensions" #: ../../Zotlabs/Widget/Settings_menu.php:35 msgid "Account settings" -msgstr "Ajustos de Compte" +msgstr "Configuració del compte" #: ../../Zotlabs/Widget/Settings_menu.php:41 msgid "Channel settings" -msgstr "Ajustos de Canal" +msgstr "Configuració del canal" #: ../../Zotlabs/Widget/Settings_menu.php:50 msgid "Additional features" @@ -8946,7 +9192,7 @@ msgstr "Configuració de les extensions" #: ../../Zotlabs/Widget/Settings_menu.php:63 msgid "Display settings" -msgstr "Ajustos de pantalla" +msgstr "Configuració de pantalla" #: ../../Zotlabs/Widget/Settings_menu.php:70 msgid "Manage locations" @@ -8964,17 +9210,13 @@ msgstr "Aplicacions OAuth1" msgid "OAuth2 apps" msgstr "Aplicacions OAuth2" -#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240 -msgid "Permission Groups" -msgstr "Grups de permisos" - #: ../../Zotlabs/Widget/Settings_menu.php:125 msgid "Premium Channel Settings" -msgstr "Ajustos Premium de Canal" +msgstr "Configuració dels canals prèmium" #: ../../Zotlabs/Widget/Bookmarkedchats.php:24 msgid "Bookmarked Chatrooms" -msgstr "Sales de Xat Favorites" +msgstr "Sales de xat desades" #: ../../Zotlabs/Widget/Notifications.php:16 msgid "New Network Activity" @@ -8994,16 +9236,10 @@ msgstr "Marca totes les notificacions com a vistes" #: ../../Zotlabs/Widget/Notifications.php:26 #: ../../Zotlabs/Widget/Notifications.php:45 -#: ../../Zotlabs/Widget/Notifications.php:141 +#: ../../Zotlabs/Widget/Notifications.php:152 msgid "Show new posts only" msgstr "Mostra només les entrades noves" -#: ../../Zotlabs/Widget/Notifications.php:27 -#: ../../Zotlabs/Widget/Notifications.php:46 -#: ../../Zotlabs/Widget/Notifications.php:142 -msgid "Filter by name" -msgstr "Filtra per nom" - #: ../../Zotlabs/Widget/Notifications.php:35 msgid "New Home Activity" msgstr "Activitat nova al mur" @@ -9017,7 +9253,7 @@ msgid "View your home activity" msgstr "Mostra l'activitat al teu mur" #: ../../Zotlabs/Widget/Notifications.php:42 -#: ../../Zotlabs/Widget/Notifications.php:138 +#: ../../Zotlabs/Widget/Notifications.php:149 msgid "Mark all notifications seen" msgstr "Marca totes les notificacions com a vistes" @@ -9082,23 +9318,23 @@ msgstr "Mostra totes les notificacions" msgid "Mark all notices seen" msgstr "Marca totes les notificacions com a vistes" -#: ../../Zotlabs/Widget/Notifications.php:121 +#: ../../Zotlabs/Widget/Notifications.php:132 msgid "New Registrations" msgstr "Inscripcions noves" -#: ../../Zotlabs/Widget/Notifications.php:122 +#: ../../Zotlabs/Widget/Notifications.php:133 msgid "New Registrations Notifications" msgstr "Notificacions noves d'inscripció" -#: ../../Zotlabs/Widget/Notifications.php:132 +#: ../../Zotlabs/Widget/Notifications.php:143 msgid "Public Stream Notifications" msgstr "Notificacions del flux públic" -#: ../../Zotlabs/Widget/Notifications.php:135 +#: ../../Zotlabs/Widget/Notifications.php:146 msgid "View the public stream" msgstr "Mostra el flux públic" -#: ../../Zotlabs/Widget/Notifications.php:150 +#: ../../Zotlabs/Widget/Notifications.php:161 msgid "Sorry, you have got no notifications at the moment" msgstr "No tens cap notificació" @@ -9106,57 +9342,53 @@ msgstr "No tens cap notificació" msgid "Source channel not found." msgstr "No s'ha trobat el canal font." -#: ../../boot.php:1569 +#: ../../boot.php:1592 msgid "Create an account to access services and applications" msgstr "Crea un compte per tal d'accedir a serveis i aplicacions" -#: ../../boot.php:1588 ../../include/nav.php:111 ../../include/nav.php:140 -#: ../../include/nav.php:159 +#: ../../boot.php:1612 ../../include/nav.php:105 ../../include/nav.php:134 +#: ../../include/nav.php:153 msgid "Logout" -msgstr "Desconectar" +msgstr "Surt" -#: ../../boot.php:1592 +#: ../../boot.php:1616 msgid "Login/Email" msgstr "Correu d'usuari" -#: ../../boot.php:1593 +#: ../../boot.php:1617 msgid "Password" msgstr "Contrasenya" -#: ../../boot.php:1594 +#: ../../boot.php:1618 msgid "Remember me" msgstr "Recorda'm" -#: ../../boot.php:1597 +#: ../../boot.php:1621 msgid "Forgot your password?" msgstr "Has perdut la Contrasenya?" -#: ../../boot.php:2354 +#: ../../boot.php:2405 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "[$Projectname] Error de TLS per a %s" -#: ../../boot.php:2359 +#: ../../boot.php:2410 msgid "Website SSL certificate is not valid. Please correct." msgstr "El certificat SSL és invalid, soluciona-ho, si us plau." -#: ../../boot.php:2475 +#: ../../boot.php:2526 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "[$Projectname] Les tasques del cron tasks no s'estan executant a %s" -#: ../../boot.php:2480 +#: ../../boot.php:2531 msgid "Cron/Scheduled tasks not running." msgstr "No s'estan executant les tasques programades al cron." -#: ../../boot.php:2481 ../../include/datetime.php:238 +#: ../../boot.php:2532 ../../include/datetime.php:238 msgid "never" msgstr "mai" -#: ../../store/[data]/smarty3/compiled/a0a1289f91f53b2c12e4e0b45ffe8291540ba895_0.file.cover_photo.tpl.php:123 -msgid "Cover Photo" -msgstr "Foto de portada" - #: ../../view/theme/redbasic_c/php/config.php:16 #: ../../view/theme/redbasic_c/php/config.php:19 #: ../../view/theme/redbasic/php/config.php:16 @@ -9167,7 +9399,7 @@ msgstr "Focus (Hubzilla per defecte)" #: ../../view/theme/redbasic_c/php/config.php:99 #: ../../view/theme/redbasic/php/config.php:97 msgid "Theme settings" -msgstr "Ajustos de tema" +msgstr "Configuració de tema" #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic/php/config.php:98 @@ -9273,6 +9505,33 @@ msgstr "Ajusta la mida de la foto del autor a la conversa" msgid "Set size of followup author photos" msgstr "Ajusta la mida del seguidor de les fotos de l'autor" +#: ../../widgets/Netselect/Netselect.php:24 +msgid "Network/Protocol" +msgstr "Xarxa/protocol" + +#: ../../widgets/Netselect/Netselect.php:28 ../../include/network.php:1772 +msgid "Zot" +msgstr "Zot" + +#: ../../widgets/Netselect/Netselect.php:31 ../../include/network.php:1770 +msgid "Diaspora" +msgstr "Diaspora" + +#: ../../widgets/Netselect/Netselect.php:33 ../../include/network.php:1763 +#: ../../include/network.php:1764 +msgid "Friendica" +msgstr "Friendica" + +#: ../../widgets/Netselect/Netselect.php:38 ../../include/network.php:1765 +msgid "OStatus" +msgstr "OStatus" + +#: ../../widgets/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1219 +#: ../../addon/pubcrawl/as.php:1374 ../../addon/pubcrawl/as.php:1553 +#: ../../include/network.php:1768 +msgid "ActivityPub" +msgstr "ActivityPub" + #: ../../addon/rendezvous/rendezvous.php:57 msgid "Errors encountered deleting database table " msgstr "S'ha produït un o més errors en esborrar una taula de la base de dades" @@ -9415,30 +9674,30 @@ msgstr "Opció Y" msgid "Skeleton Settings" msgstr "Configuració del Skeleton" -#: ../../addon/gnusoc/gnusoc.php:249 +#: ../../addon/gnusoc/gnusoc.php:258 msgid "GNU-Social Protocol Settings updated." msgstr "S'ha actualitzat la configuració del Protocol GNU-Social" -#: ../../addon/gnusoc/gnusoc.php:268 +#: ../../addon/gnusoc/gnusoc.php:277 msgid "" "The GNU-Social protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "El Protocol GNU-Social és incompatible amb la independència de hub. Les connexions que facis en aquesta xarxa no seran accessibles des de hubs alternatius del teu canal." -#: ../../addon/gnusoc/gnusoc.php:271 +#: ../../addon/gnusoc/gnusoc.php:280 msgid "Enable the GNU-Social protocol for this channel" msgstr "Habilita el Protocol GNU-Social per a aquest canal" -#: ../../addon/gnusoc/gnusoc.php:275 +#: ../../addon/gnusoc/gnusoc.php:284 msgid "GNU-Social Protocol Settings" msgstr "Configuració del Protocol GNU-Social " -#: ../../addon/gnusoc/gnusoc.php:471 +#: ../../addon/gnusoc/gnusoc.php:480 msgid "Follow" msgstr "Segueix" -#: ../../addon/gnusoc/gnusoc.php:474 +#: ../../addon/gnusoc/gnusoc.php:483 #, php-format msgid "%1$s is now following %2$s" msgstr "%1$s ara segueix a %2$s" @@ -9485,9 +9744,9 @@ msgid "Page to load after image selection." msgstr "Pàgina per carregar després d'haver seleccionat una imatge." #: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1300 -#: ../../include/nav.php:119 +#: ../../include/nav.php:113 msgid "Edit Profile" -msgstr "Edita Perfil" +msgstr "Modifica el meu perfil" #: ../../addon/openclipatar/openclipatar.php:59 msgid "Profile List" @@ -9871,6 +10130,14 @@ msgstr "S'han actualitzat els paràmetres de IRC." msgid "IRC Chatroom" msgstr "Sala de IRC" +#: ../../addon/gallery/gallery.php:42 ../../addon/gallery/Mod_Gallery.php:111 +msgid "Gallery" +msgstr "Galeria" + +#: ../../addon/gallery/gallery.php:45 +msgid "Photo Gallery" +msgstr "Galeria d'imatges" + #: ../../addon/ljpost/ljpost.php:42 msgid "Post to LiveJournal" msgstr "Publica a LiveJournal" @@ -9973,7 +10240,7 @@ msgstr "Aniversar" msgid "OpenID protocol error. No ID returned." msgstr "Error d'OpenID. No s'ha aconseguit cap ID." -#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:300 +#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:317 msgid "Login failed." msgstr "Identificació fallida." @@ -10170,39 +10437,39 @@ msgstr "declarar-li l'amor etern a" msgid "declared undying love for" msgstr "li ha declarar amor etern a" -#: ../../addon/diaspora/diaspora.php:781 +#: ../../addon/diaspora/diaspora.php:786 msgid "Diaspora Protocol Settings updated." msgstr "S'ha actualitzat la configuració del Protocol de Diàspora" -#: ../../addon/diaspora/diaspora.php:800 +#: ../../addon/diaspora/diaspora.php:805 msgid "" "The Diaspora protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "El Protocol de Diàspora és incompatible amb la independència de hub. Les connexions que facis en aquesta xarxa no seran accessibles des de hubs alternatius del teu canal." -#: ../../addon/diaspora/diaspora.php:803 +#: ../../addon/diaspora/diaspora.php:808 msgid "Enable the Diaspora protocol for this channel" msgstr "Activa el Protocol de Diàspora per aquest canal" -#: ../../addon/diaspora/diaspora.php:807 +#: ../../addon/diaspora/diaspora.php:812 msgid "Allow any Diaspora member to comment on your public posts" msgstr "Permet a qualsevol membre de Diàspora de comentar les teves entrades públiques" -#: ../../addon/diaspora/diaspora.php:811 +#: ../../addon/diaspora/diaspora.php:816 msgid "Prevent your hashtags from being redirected to other sites" msgstr "Evita que les teves etiquetes siguin redirigides a altres llocs web" -#: ../../addon/diaspora/diaspora.php:815 +#: ../../addon/diaspora/diaspora.php:820 msgid "" "Sign and forward posts and comments with no existing Diaspora signature" msgstr "Signa i reenvia entrades o comentaris encara que no tinguin una signatura de Diàspora vàlida." -#: ../../addon/diaspora/diaspora.php:820 +#: ../../addon/diaspora/diaspora.php:825 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "Etiquetes seguides (separades per comes i sense incloure #)" -#: ../../addon/diaspora/diaspora.php:825 +#: ../../addon/diaspora/diaspora.php:830 msgid "Diaspora Protocol Settings" msgstr "Configuració del Protocol de Diàspora" @@ -10210,7 +10477,7 @@ msgstr "Configuració del Protocol de Diàspora" msgid "No username found in import file." msgstr "No s'ha trobat el nom d'usuari en el fitxer d'importació." -#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:67 +#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:72 msgid "Unable to create a unique channel address. Import failed." msgstr "No s'ha pogut importar el canal perquè l'adreça única de canal no s'ha pogut crear." @@ -10673,35 +10940,40 @@ msgstr "Nom de registre a Friendica" msgid "Friendica Login Password" msgstr "Contrasenya a Friendica" -#: ../../addon/pubcrawl/as.php:1146 ../../addon/pubcrawl/as.php:1273 -#: ../../addon/pubcrawl/as.php:1449 ../../include/network.php:1769 -msgid "ActivityPub" -msgstr "ActivityPub" - -#: ../../addon/pubcrawl/pubcrawl.php:1053 +#: ../../addon/pubcrawl/pubcrawl.php:1136 msgid "ActivityPub Protocol Settings updated." msgstr "S'ha actualitzat la configuració del Protocol ActivityPub." -#: ../../addon/pubcrawl/pubcrawl.php:1062 +#: ../../addon/pubcrawl/pubcrawl.php:1145 msgid "" "The ActivityPub protocol does not support location independence. Connections" " you make within that network may be unreachable from alternate channel " "locations." msgstr "El Protocol ActivityPub és incompatible amb la independència de hub. Les connexions que facis en aquesta xarxa no seran accessibles des de hubs alternatius del teu canal." -#: ../../addon/pubcrawl/pubcrawl.php:1065 +#: ../../addon/pubcrawl/pubcrawl.php:1148 msgid "Enable the ActivityPub protocol for this channel" msgstr "Activa el Protocol ActivityPub en aquest canal" -#: ../../addon/pubcrawl/pubcrawl.php:1068 +#: ../../addon/pubcrawl/pubcrawl.php:1151 +msgid "Deliver to ActivityPub recipients in privacy groups" +msgstr "Envia a identitats d'ActivityPub en grups de privacitat" + +#: ../../addon/pubcrawl/pubcrawl.php:1151 +msgid "" +"May result in a large number of mentions and expose all the members of your " +"privacy group" +msgstr "Pot comportar moltes mencions i revelar els teus grups de privacitat." + +#: ../../addon/pubcrawl/pubcrawl.php:1155 msgid "Send multi-media HTML articles" msgstr "Envia articles HTML multimèdia" -#: ../../addon/pubcrawl/pubcrawl.php:1068 +#: ../../addon/pubcrawl/pubcrawl.php:1155 msgid "Not supported by some microblog services such as Mastodon" msgstr "Incompatible amb alguns serveis de microbloguing com Mastodon" -#: ../../addon/pubcrawl/pubcrawl.php:1072 +#: ../../addon/pubcrawl/pubcrawl.php:1159 msgid "ActivityPub Protocol Settings" msgstr "Configuració del Protocol ActivityPub" @@ -11186,75 +11458,206 @@ msgstr "Amaga el botó i mostra les icones directament." msgid "Smileybutton Settings" msgstr "Configuració de Smileybutton" -#: ../../addon/cart/myshop.php:138 +#: ../../addon/cart/myshop.php:44 +msgid "Access Denied." +msgstr "S'ha denegat l'accés." + +#: ../../addon/cart/myshop.php:125 ../../addon/cart/cart.php:1324 msgid "Order Not Found" msgstr "No s'ha trobat l'ordre" -#: ../../addon/cart/cart.php:810 -msgid "Order cannot be checked out." -msgstr "No s'ha pogut confirmar l'ordre." +#: ../../addon/cart/myshop.php:155 ../../addon/cart/myshop.php:191 +#: ../../addon/cart/myshop.php:225 ../../addon/cart/myshop.php:273 +#: ../../addon/cart/myshop.php:308 ../../addon/cart/myshop.php:331 +msgid "Access Denied" +msgstr "S'ha denegat l'accés" + +#: ../../addon/cart/myshop.php:200 ../../addon/cart/myshop.php:234 +#: ../../addon/cart/myshop.php:283 ../../addon/cart/myshop.php:341 +msgid "Invalid Item" +msgstr "L'article és invàlid" -#: ../../addon/cart/cart.php:1073 +#: ../../addon/cart/cart.php:467 +msgid "[cart] Item Added" +msgstr "[cart] S'ha afegit un article" + +#: ../../addon/cart/cart.php:851 +msgid "Order already checked out." +msgstr "La comanda ja s'ha servit." + +#: ../../addon/cart/cart.php:1204 msgid "Enable Shopping Cart" msgstr "Habilita la cistella de la compra" -#: ../../addon/cart/cart.php:1080 +#: ../../addon/cart/cart.php:1211 msgid "Enable Test Catalog" msgstr "Habilita un catàleg de prova" -#: ../../addon/cart/cart.php:1088 +#: ../../addon/cart/cart.php:1219 msgid "Enable Manual Payments" msgstr "Habilita els pagaments manuals" -#: ../../addon/cart/cart.php:1103 -msgid "Base Cart Settings" -msgstr "Configuració bàsica de la cistella" +#: ../../addon/cart/cart.php:1238 +msgid "Base Merchant Currency" +msgstr "Moneda base del comerç" -#: ../../addon/cart/cart.php:1151 -msgid "Add Item" -msgstr "Afegeix un element" +#: ../../addon/cart/cart.php:1250 +msgid "Cart - Base Settings" +msgstr "Carretó - Configuració bàsica" -#: ../../addon/cart/cart.php:1165 -msgid "Call cart_post_" -msgstr "Crida cart_post_" +#: ../../addon/cart/cart.php:1271 ../../addon/cart/cart.php:1274 +msgid "Shop" +msgstr "Botiga" -#: ../../addon/cart/cart.php:1195 +#: ../../addon/cart/cart.php:1401 +msgid "You must be logged into the Grid to shop." +msgstr "Cal haver iniciat sessió per a poder comprar." + +#: ../../addon/cart/cart.php:1411 msgid "Cart Not Enabled (profile: " msgstr "La cistella no està habilitada (perfil:" -#: ../../addon/cart/cart.php:1226 ../../addon/cart/manual_payments.php:36 +#: ../../addon/cart/cart.php:1442 +#: ../../addon/cart/submodules/paypalbutton.php:417 +#: ../../addon/cart/manual_payments.php:37 msgid "Order not found." msgstr "No s'ha trobat l'ordre." -#: ../../addon/cart/cart.php:1262 ../../addon/cart/cart.php:1389 +#: ../../addon/cart/cart.php:1451 +msgid "Access denied." +msgstr "S'ha denegat l'accés." + +#: ../../addon/cart/cart.php:1503 ../../addon/cart/cart.php:1647 msgid "No Order Found" msgstr "No s'ha trobat cap ordre" -#: ../../addon/cart/cart.php:1270 -msgid "call: " -msgstr "crida:" - -#: ../../addon/cart/cart.php:1273 +#: ../../addon/cart/cart.php:1512 msgid "An unknown error has occurred Please start again." msgstr "S'ha produït un error inesperat. Torna-ho a provar." -#: ../../addon/cart/cart.php:1414 +#: ../../addon/cart/cart.php:1680 msgid "Invalid Payment Type. Please start again." msgstr "El tipus de pagament no és vàlid. Torna a començar." -#: ../../addon/cart/cart.php:1421 +#: ../../addon/cart/cart.php:1687 msgid "Order not found" msgstr "No s'ha trobat l'ordre" -#: ../../addon/cart/manual_payments.php:9 +#: ../../addon/cart/submodules/paypalbutton.php:97 +msgid "Enable Paypal Button Module" +msgstr "Activa el mòdul del botó de Paypal" + +#: ../../addon/cart/submodules/paypalbutton.php:102 +msgid "Use Production Key" +msgstr "Fes servir la clau de producció" + +#: ../../addon/cart/submodules/paypalbutton.php:109 +msgid "Paypal Sandbox Client Key" +msgstr "Clau de client de Paypal del banc de proves" + +#: ../../addon/cart/submodules/paypalbutton.php:116 +msgid "Paypal Sandbox Secret Key" +msgstr "Clau secreta de Paypal del banc de proves" + +#: ../../addon/cart/submodules/paypalbutton.php:122 +msgid "Paypal Production Client Key" +msgstr "Clau de client de Paypal de producció" + +#: ../../addon/cart/submodules/paypalbutton.php:129 +msgid "Paypal Production Secret Key" +msgstr "Clau secreta de Paypal de producció" + +#: ../../addon/cart/submodules/paypalbutton.php:143 +msgid "Cart - Paypal Addon" +msgstr "Carretó - Extensió de Paypal" + +#: ../../addon/cart/submodules/paypalbutton.php:277 +msgid "Paypal button payments are not enabled." +msgstr "El botó de pagament per Paypal no està habilitat." + +#: ../../addon/cart/submodules/paypalbutton.php:295 +msgid "" +"Paypal button payments are not properly configured. Please choose another " +"payment option." +msgstr "El botó de pagament per Paypal no està ben configurat. Escull un altre mètode de pagament." + +#: ../../addon/cart/submodules/hzservices.php:71 +msgid "Enable Hubzilla Services Module" +msgstr "Activa el mòdul \"Serveis de Hubzilla\"" + +#: ../../addon/cart/submodules/hzservices.php:77 +msgid "Cart - Hubzilla Services Addon" +msgstr "Carretó - Extensió \"Serveis de Hubzilla\"" + +#: ../../addon/cart/submodules/hzservices.php:169 +msgid "New Sku" +msgstr "Nova SKU" + +#: ../../addon/cart/submodules/hzservices.php:204 +msgid "Cannot save edits to locked item." +msgstr "No s'han pogut desar els canvis a l'article perquè està bloquejat." + +#: ../../addon/cart/submodules/hzservices.php:252 +#: ../../addon/cart/submodules/hzservices.php:339 +msgid "SKU not found." +msgstr "Non s'ha trobat l'SKU" + +#: ../../addon/cart/submodules/hzservices.php:305 +#: ../../addon/cart/submodules/hzservices.php:309 +msgid "Invalid Activation Directive." +msgstr "La directiva d'activació és invàlida." + +#: ../../addon/cart/submodules/hzservices.php:380 +#: ../../addon/cart/submodules/hzservices.php:384 +msgid "Invalid Deactivation Directive." +msgstr "La directiva de desactivació és invàlida." + +#: ../../addon/cart/submodules/hzservices.php:570 +msgid "Add to this privacy group" +msgstr "Afegeix-ho al teu grup de privacitat" + +#: ../../addon/cart/submodules/hzservices.php:586 +msgid "Set user service class" +msgstr "Defineix la classe de servei de l'usuària" + +#: ../../addon/cart/submodules/hzservices.php:613 +msgid "You must be using a local account to purchase this service." +msgstr "Cal una sessió iniciada en aquest hub per a comprar el servei." + +#: ../../addon/cart/submodules/hzservices.php:651 +msgid "Changes Locked" +msgstr "Article bloquejat" + +#: ../../addon/cart/submodules/hzservices.php:655 +msgid "Item available for purchase." +msgstr "Article a la venda." + +#: ../../addon/cart/submodules/hzservices.php:662 +msgid "Price" +msgstr "Preu" + +#: ../../addon/cart/submodules/hzservices.php:665 +msgid "Add buyer to privacy group" +msgstr "Afegeix el comprador a un grup de privacitat" + +#: ../../addon/cart/submodules/hzservices.php:670 +msgid "Add buyer as connection" +msgstr "Connecta automàticament amb els canals de les compradores" + +#: ../../addon/cart/submodules/hzservices.php:677 +#: ../../addon/cart/submodules/hzservices.php:718 +msgid "Set Service Class" +msgstr "Defineix la classe de servei" + +#: ../../addon/cart/manual_payments.php:7 msgid "Error: order mismatch. Please try again." msgstr "Error: l'ordre no coincideix. Torna-ho a provar." -#: ../../addon/cart/manual_payments.php:29 +#: ../../addon/cart/manual_payments.php:30 msgid "Manual payments are not enabled." msgstr "El pagament manual no està habilitat." -#: ../../addon/cart/manual_payments.php:44 +#: ../../addon/cart/manual_payments.php:46 msgid "Finished" msgstr "Operació completa" @@ -11738,11 +12141,11 @@ msgstr "Configuració de les entrades de pump.io" msgid "PumpIO Settings saved." msgstr "S'ha desat la configuració de pump.io" -#: ../../addon/ldapauth/ldapauth.php:61 +#: ../../addon/ldapauth/ldapauth.php:70 msgid "An account has been created for you." msgstr "S'ha creat un compte nou." -#: ../../addon/ldapauth/ldapauth.php:68 +#: ../../addon/ldapauth/ldapauth.php:77 msgid "Authentication successful but rejected: account creation is disabled." msgstr "L'autenticació ha tingut èxit però no s'ha pogut crear un compte perquè no està permès." @@ -12054,282 +12457,286 @@ msgstr "%1$s esta ara connectat amb %2$s" msgid "%1$s poked %2$s" msgstr "%1$s a esperonat %2$s" -#: ../../include/conversation.php:251 ../../include/text.php:1129 -#: ../../include/text.php:1133 +#: ../../include/conversation.php:251 ../../include/text.php:1140 +#: ../../include/text.php:1144 msgid "poked" msgstr "esperonat" -#: ../../include/conversation.php:736 +#: ../../include/conversation.php:739 #, php-format msgid "View %s's profile @ %s" -msgstr "Vista %s del perfil @ %s" +msgstr "Mostra el perfil @%s de %s" -#: ../../include/conversation.php:756 +#: ../../include/conversation.php:759 msgid "Categories:" msgstr "Categories:" -#: ../../include/conversation.php:757 +#: ../../include/conversation.php:760 msgid "Filed under:" msgstr "Arxivar a:" -#: ../../include/conversation.php:783 +#: ../../include/conversation.php:785 msgid "View in context" msgstr "Veure en context" -#: ../../include/conversation.php:884 +#: ../../include/conversation.php:886 msgid "remove" msgstr "treu" -#: ../../include/conversation.php:888 +#: ../../include/conversation.php:890 msgid "Loading..." msgstr "Carregant..." -#: ../../include/conversation.php:889 +#: ../../include/conversation.php:891 msgid "Delete Selected Items" msgstr "Esborra els Articles Seleccionats" -#: ../../include/conversation.php:932 +#: ../../include/conversation.php:934 msgid "View Source" msgstr "Veure l'Origen" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:944 msgid "Follow Thread" msgstr "Segueix el Fil" -#: ../../include/conversation.php:951 +#: ../../include/conversation.php:953 msgid "Unfollow Thread" msgstr "Fil Abandonat" -#: ../../include/conversation.php:1062 +#: ../../include/conversation.php:1067 msgid "Edit Connection" msgstr "Modifica la Connexió" -#: ../../include/conversation.php:1072 +#: ../../include/conversation.php:1077 msgid "Message" msgstr "Missatge" -#: ../../include/conversation.php:1206 +#: ../../include/conversation.php:1211 #, php-format msgid "%s likes this." msgstr "%s agrada això." -#: ../../include/conversation.php:1206 +#: ../../include/conversation.php:1211 #, php-format msgid "%s doesn't like this." msgstr "%s no agrada això." -#: ../../include/conversation.php:1210 +#: ../../include/conversation.php:1215 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." msgstr[0] "<span %1$s>%2$d gent</span> agrada això." msgstr[1] "<span %1$s>%2$d gent</span> agrada això." -#: ../../include/conversation.php:1212 +#: ../../include/conversation.php:1217 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." msgstr[0] "<span %1$s>%2$d gent</span> no agrada això." msgstr[1] "<span %1$s>%2$d gent</span> no agrada això." -#: ../../include/conversation.php:1218 +#: ../../include/conversation.php:1223 msgid "and" msgstr "i" -#: ../../include/conversation.php:1221 +#: ../../include/conversation.php:1226 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] ", i %d altra gent" msgstr[1] ", i %d altra gent" -#: ../../include/conversation.php:1222 +#: ../../include/conversation.php:1227 #, php-format msgid "%s like this." msgstr "%s agrada això." -#: ../../include/conversation.php:1222 +#: ../../include/conversation.php:1227 #, php-format msgid "%s don't like this." msgstr "%s no agrada això." -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1270 msgid "Set your location" msgstr "Ajusta la teva ubicació" -#: ../../include/conversation.php:1266 +#: ../../include/conversation.php:1271 msgid "Clear browser location" msgstr "Treu la localització del navegador" -#: ../../include/conversation.php:1316 +#: ../../include/conversation.php:1287 +msgid "Embed (existing) photo from your photo albums" +msgstr "Incrusta una imatge existent dels teus àlbums." + +#: ../../include/conversation.php:1323 msgid "Tag term:" msgstr "Paraula de l'Etiqueta:" -#: ../../include/conversation.php:1317 +#: ../../include/conversation.php:1324 msgid "Where are you right now?" msgstr "On ets ara?" -#: ../../include/conversation.php:1322 +#: ../../include/conversation.php:1329 msgid "Choose a different album..." msgstr "Tria un àlbum diferent..." -#: ../../include/conversation.php:1326 +#: ../../include/conversation.php:1333 msgid "Comments enabled" msgstr "S'han activat els comentaris" -#: ../../include/conversation.php:1327 +#: ../../include/conversation.php:1334 msgid "Comments disabled" msgstr "S'han activat els comentaris" -#: ../../include/conversation.php:1375 +#: ../../include/conversation.php:1383 msgid "Page link name" msgstr "Nom de la pàgina enllaçada" -#: ../../include/conversation.php:1378 +#: ../../include/conversation.php:1386 msgid "Post as" msgstr "Envia com" -#: ../../include/conversation.php:1392 +#: ../../include/conversation.php:1400 msgid "Toggle voting" msgstr "Commutar votació" -#: ../../include/conversation.php:1395 +#: ../../include/conversation.php:1403 msgid "Disable comments" msgstr "Desactiva els comentaris" -#: ../../include/conversation.php:1396 +#: ../../include/conversation.php:1404 msgid "Toggle comments" msgstr "Commuta l'estat dels comentaris" -#: ../../include/conversation.php:1404 +#: ../../include/conversation.php:1412 msgid "Categories (optional, comma-separated list)" msgstr "Categories (opcional, llista separada per comes)" -#: ../../include/conversation.php:1427 +#: ../../include/conversation.php:1435 msgid "Other networks and post services" msgstr "Altres xarxes i serveis de correu" -#: ../../include/conversation.php:1433 +#: ../../include/conversation.php:1441 msgid "Set publish date" msgstr "Ajusta la data de publicació" -#: ../../include/conversation.php:1693 +#: ../../include/conversation.php:1702 msgid "Commented Order" msgstr "Ordenar per Comentaris" -#: ../../include/conversation.php:1696 +#: ../../include/conversation.php:1705 msgid "Sort by Comment Date" msgstr "Ordenar per Data del Comentari" -#: ../../include/conversation.php:1700 +#: ../../include/conversation.php:1709 msgid "Posted Order" msgstr "Ordenar per Entrades" -#: ../../include/conversation.php:1703 +#: ../../include/conversation.php:1712 msgid "Sort by Post Date" msgstr "Ordenar per Data d' Entrada" -#: ../../include/conversation.php:1711 +#: ../../include/conversation.php:1720 msgid "Posts that mention or involve you" msgstr "Entrades que et mencionen o involucren" -#: ../../include/conversation.php:1720 +#: ../../include/conversation.php:1729 msgid "Activity Stream - by date" msgstr "Activitat del Flux - per data" -#: ../../include/conversation.php:1726 +#: ../../include/conversation.php:1735 msgid "Starred" msgstr "Preferit" -#: ../../include/conversation.php:1729 +#: ../../include/conversation.php:1738 msgid "Favourite Posts" msgstr "Entrades Favorites" -#: ../../include/conversation.php:1736 +#: ../../include/conversation.php:1745 msgid "Spam" msgstr "Spam" -#: ../../include/conversation.php:1739 +#: ../../include/conversation.php:1748 msgid "Posts flagged as SPAM" msgstr "Entrades marcades com a SPAM" -#: ../../include/conversation.php:1814 ../../include/nav.php:381 +#: ../../include/conversation.php:1823 ../../include/nav.php:373 msgid "Status Messages and Posts" msgstr "Estat dels Missatges i Entrades" -#: ../../include/conversation.php:1827 ../../include/nav.php:394 +#: ../../include/conversation.php:1836 ../../include/nav.php:386 msgid "Profile Details" msgstr "Detalls del Perfil" -#: ../../include/conversation.php:1837 ../../include/nav.php:404 -#: ../../include/photos.php:666 +#: ../../include/conversation.php:1846 ../../include/nav.php:396 +#: ../../include/photos.php:667 msgid "Photo Albums" msgstr "Albums de Fotos" -#: ../../include/conversation.php:1845 ../../include/nav.php:412 +#: ../../include/conversation.php:1854 ../../include/nav.php:404 msgid "Files and Storage" msgstr "Arxius i Emmagatzegament" -#: ../../include/conversation.php:1882 ../../include/nav.php:447 +#: ../../include/conversation.php:1891 ../../include/nav.php:439 msgid "Bookmarks" msgstr "Marcadors" -#: ../../include/conversation.php:1885 ../../include/nav.php:450 +#: ../../include/conversation.php:1894 ../../include/nav.php:442 msgid "Saved Bookmarks" -msgstr "Marcadors Guardats" +msgstr "Marcadors desats" -#: ../../include/conversation.php:1896 ../../include/nav.php:461 +#: ../../include/conversation.php:1905 ../../include/nav.php:453 msgid "View Cards" msgstr "Mostra les targetes" -#: ../../include/conversation.php:1904 +#: ../../include/conversation.php:1913 msgid "articles" msgstr "articles" -#: ../../include/conversation.php:1907 ../../include/nav.php:472 +#: ../../include/conversation.php:1916 ../../include/nav.php:464 msgid "View Articles" msgstr "Mostra els articles" -#: ../../include/conversation.php:1918 ../../include/nav.php:484 +#: ../../include/conversation.php:1927 ../../include/nav.php:476 msgid "View Webpages" msgstr "Mostra les pàgines web" -#: ../../include/conversation.php:1987 +#: ../../include/conversation.php:1996 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "Assistint" msgstr[1] "Assistint" -#: ../../include/conversation.php:1990 +#: ../../include/conversation.php:1999 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "Desassistint" msgstr[1] "Desassistint" -#: ../../include/conversation.php:1993 +#: ../../include/conversation.php:2002 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "Indecís" msgstr[1] "Indecisos" -#: ../../include/conversation.php:1996 +#: ../../include/conversation.php:2005 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "Acord" msgstr[1] "Acords" -#: ../../include/conversation.php:1999 +#: ../../include/conversation.php:2008 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "Desacord" msgstr[1] "Desacords" -#: ../../include/conversation.php:2002 +#: ../../include/conversation.php:2011 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -12355,18 +12762,18 @@ msgstr "Només Aquest Lloc Web" #: ../../include/bookmarks.php:34 #, php-format msgid "%1$s's bookmarks" -msgstr "%1$s de marcadors" +msgstr "marcadors de %1$s" #: ../../include/import.php:25 msgid "Unable to import a removed channel." msgstr "No s'ha pogut importar un canal esborrat." -#: ../../include/import.php:46 +#: ../../include/import.php:51 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "No s'ha pogut importar el canal perquè l'identificador del canal no s'ha pogut duplicar en aquest servidor." -#: ../../include/import.php:111 +#: ../../include/import.php:116 msgid "Cloned channel not found. Import failed." msgstr "No s'ha pogut importar el canal perquè el canal clonat no s'ha trobat." @@ -12394,340 +12801,345 @@ msgstr "el més antic" msgid "newer" msgstr "El més nou" -#: ../../include/text.php:961 +#: ../../include/text.php:963 msgid "No connections" msgstr "Sense Connexions" -#: ../../include/text.php:993 +#: ../../include/text.php:995 #, php-format msgid "View all %s connections" msgstr "Veure totes les connexions de %s" -#: ../../include/text.php:1129 ../../include/text.php:1133 +#: ../../include/text.php:1051 +#, php-format +msgid "Network: %s" +msgstr "Xarxa: %s" + +#: ../../include/text.php:1140 ../../include/text.php:1144 msgid "poke" msgstr "esperona" -#: ../../include/text.php:1134 +#: ../../include/text.php:1145 msgid "ping" msgstr "coloca" -#: ../../include/text.php:1134 +#: ../../include/text.php:1145 msgid "pinged" msgstr "colocat" -#: ../../include/text.php:1135 +#: ../../include/text.php:1146 msgid "prod" msgstr "picar" -#: ../../include/text.php:1135 +#: ../../include/text.php:1146 msgid "prodded" msgstr "picat" -#: ../../include/text.php:1136 +#: ../../include/text.php:1147 msgid "slap" msgstr "bufetada" -#: ../../include/text.php:1136 +#: ../../include/text.php:1147 msgid "slapped" msgstr "bufetejat" -#: ../../include/text.php:1137 +#: ../../include/text.php:1148 msgid "finger" msgstr "senyal" -#: ../../include/text.php:1137 +#: ../../include/text.php:1148 msgid "fingered" msgstr "senyalat" -#: ../../include/text.php:1138 +#: ../../include/text.php:1149 msgid "rebuff" msgstr "menyspreu" -#: ../../include/text.php:1138 +#: ../../include/text.php:1149 msgid "rebuffed" msgstr "menyspreuat" -#: ../../include/text.php:1161 +#: ../../include/text.php:1172 msgid "happy" msgstr "feliç" -#: ../../include/text.php:1162 +#: ../../include/text.php:1173 msgid "sad" msgstr "trist" -#: ../../include/text.php:1163 +#: ../../include/text.php:1174 msgid "mellow" msgstr "melós" -#: ../../include/text.php:1164 +#: ../../include/text.php:1175 msgid "tired" msgstr "cansat" -#: ../../include/text.php:1165 +#: ../../include/text.php:1176 msgid "perky" msgstr "turgent" -#: ../../include/text.php:1166 +#: ../../include/text.php:1177 msgid "angry" msgstr "enfadat" -#: ../../include/text.php:1167 +#: ../../include/text.php:1178 msgid "stupefied" msgstr "estupefacte" -#: ../../include/text.php:1168 +#: ../../include/text.php:1179 msgid "puzzled" msgstr "perplexe" -#: ../../include/text.php:1169 +#: ../../include/text.php:1180 msgid "interested" msgstr "Interessat" -#: ../../include/text.php:1170 +#: ../../include/text.php:1181 msgid "bitter" msgstr "amargat" -#: ../../include/text.php:1171 +#: ../../include/text.php:1182 msgid "cheerful" msgstr "feliç" -#: ../../include/text.php:1172 +#: ../../include/text.php:1183 msgid "alive" msgstr "viu" -#: ../../include/text.php:1173 +#: ../../include/text.php:1184 msgid "annoyed" msgstr "molest" -#: ../../include/text.php:1174 +#: ../../include/text.php:1185 msgid "anxious" msgstr "ansiós" -#: ../../include/text.php:1175 +#: ../../include/text.php:1186 msgid "cranky" msgstr "malagaitós" -#: ../../include/text.php:1176 +#: ../../include/text.php:1187 msgid "disturbed" msgstr "transtornat" -#: ../../include/text.php:1177 +#: ../../include/text.php:1188 msgid "frustrated" msgstr "frustrat" -#: ../../include/text.php:1178 +#: ../../include/text.php:1189 msgid "depressed" msgstr "deprimit" -#: ../../include/text.php:1179 +#: ../../include/text.php:1190 msgid "motivated" msgstr "motivat" -#: ../../include/text.php:1180 +#: ../../include/text.php:1191 msgid "relaxed" msgstr "relaxat" -#: ../../include/text.php:1181 +#: ../../include/text.php:1192 msgid "surprised" msgstr "sorprès" -#: ../../include/text.php:1360 ../../include/js_strings.php:76 +#: ../../include/text.php:1371 ../../include/js_strings.php:86 msgid "Monday" msgstr "Dilluns" -#: ../../include/text.php:1360 ../../include/js_strings.php:77 +#: ../../include/text.php:1371 ../../include/js_strings.php:87 msgid "Tuesday" msgstr "Dimarts" -#: ../../include/text.php:1360 ../../include/js_strings.php:78 +#: ../../include/text.php:1371 ../../include/js_strings.php:88 msgid "Wednesday" msgstr "Dimecres" -#: ../../include/text.php:1360 ../../include/js_strings.php:79 +#: ../../include/text.php:1371 ../../include/js_strings.php:89 msgid "Thursday" msgstr "Dijous" -#: ../../include/text.php:1360 ../../include/js_strings.php:80 +#: ../../include/text.php:1371 ../../include/js_strings.php:90 msgid "Friday" msgstr "Divendres" -#: ../../include/text.php:1360 ../../include/js_strings.php:81 +#: ../../include/text.php:1371 ../../include/js_strings.php:91 msgid "Saturday" msgstr "Dissabte" -#: ../../include/text.php:1360 ../../include/js_strings.php:75 +#: ../../include/text.php:1371 ../../include/js_strings.php:85 msgid "Sunday" msgstr "Diumenge" -#: ../../include/text.php:1364 ../../include/js_strings.php:51 +#: ../../include/text.php:1375 ../../include/js_strings.php:61 msgid "January" msgstr "Gener" -#: ../../include/text.php:1364 ../../include/js_strings.php:52 +#: ../../include/text.php:1375 ../../include/js_strings.php:62 msgid "February" msgstr "Febrer" -#: ../../include/text.php:1364 ../../include/js_strings.php:53 +#: ../../include/text.php:1375 ../../include/js_strings.php:63 msgid "March" msgstr "Març" -#: ../../include/text.php:1364 ../../include/js_strings.php:54 +#: ../../include/text.php:1375 ../../include/js_strings.php:64 msgid "April" msgstr "Abril" -#: ../../include/text.php:1364 +#: ../../include/text.php:1375 msgid "May" msgstr "Maig" -#: ../../include/text.php:1364 ../../include/js_strings.php:56 +#: ../../include/text.php:1375 ../../include/js_strings.php:66 msgid "June" msgstr "Juny" -#: ../../include/text.php:1364 ../../include/js_strings.php:57 +#: ../../include/text.php:1375 ../../include/js_strings.php:67 msgid "July" msgstr "Juliol" -#: ../../include/text.php:1364 ../../include/js_strings.php:58 +#: ../../include/text.php:1375 ../../include/js_strings.php:68 msgid "August" msgstr "Agost" -#: ../../include/text.php:1364 ../../include/js_strings.php:59 +#: ../../include/text.php:1375 ../../include/js_strings.php:69 msgid "September" msgstr "Setembre" -#: ../../include/text.php:1364 ../../include/js_strings.php:60 +#: ../../include/text.php:1375 ../../include/js_strings.php:70 msgid "October" msgstr "Octubre" -#: ../../include/text.php:1364 ../../include/js_strings.php:61 +#: ../../include/text.php:1375 ../../include/js_strings.php:71 msgid "November" msgstr "Novembre" -#: ../../include/text.php:1364 ../../include/js_strings.php:62 +#: ../../include/text.php:1375 ../../include/js_strings.php:72 msgid "December" msgstr "Desembre" -#: ../../include/text.php:1428 ../../include/text.php:1432 +#: ../../include/text.php:1449 msgid "Unknown Attachment" msgstr "Adjunt Desconegut" -#: ../../include/text.php:1434 ../../include/feedutils.php:860 +#: ../../include/text.php:1451 ../../include/feedutils.php:860 msgid "unknown" msgstr "desconegut" -#: ../../include/text.php:1470 +#: ../../include/text.php:1487 msgid "remove category" msgstr "elimina categoria" -#: ../../include/text.php:1544 +#: ../../include/text.php:1561 msgid "remove from file" msgstr "elimina del arxiu" -#: ../../include/text.php:1686 ../../include/message.php:12 +#: ../../include/text.php:1703 ../../include/message.php:12 msgid "Download binary/encrypted content" msgstr "Descarrega el binari o contingut xifrat" -#: ../../include/text.php:1849 ../../include/language.php:397 +#: ../../include/text.php:1866 ../../include/language.php:397 msgid "default" msgstr "per defecte" -#: ../../include/text.php:1857 +#: ../../include/text.php:1874 msgid "Page layout" msgstr "Disseny de pàgina" -#: ../../include/text.php:1857 +#: ../../include/text.php:1874 msgid "You can create your own with the layouts tool" msgstr "Pots crear el teu propi amb l'editor de dissenys de pàgina." -#: ../../include/text.php:1868 +#: ../../include/text.php:1885 msgid "HTML" msgstr "HTML" -#: ../../include/text.php:1871 +#: ../../include/text.php:1888 msgid "Comanche Layout" msgstr "Disseny Comanche" -#: ../../include/text.php:1876 +#: ../../include/text.php:1893 msgid "PHP" msgstr "PHP" -#: ../../include/text.php:1885 +#: ../../include/text.php:1902 msgid "Page content type" msgstr "Tipus de contingut de la pàgina" -#: ../../include/text.php:2018 +#: ../../include/text.php:2035 msgid "activity" msgstr "activitat" -#: ../../include/text.php:2100 +#: ../../include/text.php:2135 msgid "a-z, 0-9, -, and _ only" msgstr "només caràcters alfanumèrics en minúscula (a-z, 0-9), guió (-) i guió baix (_)" -#: ../../include/text.php:2419 +#: ../../include/text.php:2455 msgid "Design Tools" msgstr "Eines de disseny" -#: ../../include/text.php:2425 +#: ../../include/text.php:2461 msgid "Pages" msgstr "Pàgines" -#: ../../include/text.php:2447 +#: ../../include/text.php:2483 msgid "Import website..." msgstr "Importa un lloc web" -#: ../../include/text.php:2448 +#: ../../include/text.php:2484 msgid "Select folder to import" msgstr "Escull la carpeta a on importar" -#: ../../include/text.php:2449 +#: ../../include/text.php:2485 msgid "Import from a zipped folder:" msgstr "Importa des d'una carpeta comprimida:" -#: ../../include/text.php:2450 +#: ../../include/text.php:2486 msgid "Import from cloud files:" msgstr "Importa des de fitxers penjats a un núvol:" -#: ../../include/text.php:2451 +#: ../../include/text.php:2487 msgid "/cloud/channel/path/to/folder" msgstr "/núvol/canal/ruta/a/la/carpeta" -#: ../../include/text.php:2452 +#: ../../include/text.php:2488 msgid "Enter path to website files" msgstr "Introdueix la ruta als arxius de la web" -#: ../../include/text.php:2453 +#: ../../include/text.php:2489 msgid "Select folder" msgstr "Escull la carpeta" -#: ../../include/text.php:2454 +#: ../../include/text.php:2490 msgid "Export website..." msgstr "Exporta un lloc web" -#: ../../include/text.php:2455 +#: ../../include/text.php:2491 msgid "Export to a zip file" msgstr "Exporta a una carpeta comprimida" -#: ../../include/text.php:2456 +#: ../../include/text.php:2492 msgid "website.zip" msgstr "lloc-web.zip" -#: ../../include/text.php:2457 +#: ../../include/text.php:2493 msgid "Enter a name for the zip file." msgstr "Introdueix un nom per al fitxer comprimit." -#: ../../include/text.php:2458 +#: ../../include/text.php:2494 msgid "Export to cloud files" msgstr "Exporta a arxius de núvol" -#: ../../include/text.php:2459 +#: ../../include/text.php:2495 msgid "/path/to/export/folder" msgstr "/ruta/a/la/carpeta/exportació" -#: ../../include/text.php:2460 +#: ../../include/text.php:2496 msgid "Enter a path to a cloud files destination." msgstr "Introdueix la ruta dels fitxers de núvol de destí." -#: ../../include/text.php:2461 +#: ../../include/text.php:2497 msgid "Specify folder" msgstr "Escull una carpeta" @@ -12775,7 +13187,7 @@ msgstr "Connexions en comú" msgid "View all %d common connections" msgstr "Mostra totes les connexions en comú amb %d" -#: ../../include/markdown.php:158 ../../include/bbcode.php:356 +#: ../../include/markdown.php:158 ../../include/bbcode.php:358 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "%1$s va escriure el següent %2$s %3$s" @@ -12883,182 +13295,224 @@ msgstr "Si us plau, entra l'enllaç URL" msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "Hi ha canvis sense desar, estàs segur que vols abandonar la pàgina?" +#: ../../include/js_strings.php:26 +msgid "lovely" +msgstr "encantador/a" + +#: ../../include/js_strings.php:27 +msgid "wonderful" +msgstr "meravellós/a" + +#: ../../include/js_strings.php:28 +msgid "fantastic" +msgstr "fantàstic/a" + +#: ../../include/js_strings.php:29 +msgid "great" +msgstr "genial" + +#: ../../include/js_strings.php:30 +msgid "" +"Your chosen nickname was either already taken or not valid. Please use our " +"suggestion (" +msgstr "El nom que has escollit o bé ja està agafat o bé no és vàlid. Pots fer servir la suggerència (" + #: ../../include/js_strings.php:31 +msgid ") or enter a new one." +msgstr ") o provar amb un altre nom." + +#: ../../include/js_strings.php:32 +msgid "Thank you, this nickname is valid." +msgstr "El nom que has triat és vàlid." + +#: ../../include/js_strings.php:33 +msgid "A channel name is required." +msgstr "Cal un nom de canal." + +#: ../../include/js_strings.php:34 +msgid "This is a " +msgstr "Això és un" + +#: ../../include/js_strings.php:35 +msgid " channel name" +msgstr "nom del canal" + +#: ../../include/js_strings.php:41 msgid "timeago.prefixAgo" msgstr "fa" -#: ../../include/js_strings.php:32 +#: ../../include/js_strings.php:42 msgid "timeago.prefixFromNow" msgstr "d'aquí a" -#: ../../include/js_strings.php:33 +#: ../../include/js_strings.php:43 msgid "timeago.suffixAgo" -msgstr "fa" +msgstr "NONE" -#: ../../include/js_strings.php:34 +#: ../../include/js_strings.php:44 msgid "timeago.suffixFromNow" -msgstr "d'aquí a" +msgstr " NONE" -#: ../../include/js_strings.php:37 +#: ../../include/js_strings.php:47 msgid "less than a minute" msgstr "uns segons" -#: ../../include/js_strings.php:38 +#: ../../include/js_strings.php:48 msgid "about a minute" msgstr "prop d'un minut" -#: ../../include/js_strings.php:39 +#: ../../include/js_strings.php:49 #, php-format msgid "%d minutes" msgstr "%d minuts" -#: ../../include/js_strings.php:40 +#: ../../include/js_strings.php:50 msgid "about an hour" msgstr "prop d'una hora" -#: ../../include/js_strings.php:41 +#: ../../include/js_strings.php:51 #, php-format msgid "about %d hours" msgstr "unes %d hores" -#: ../../include/js_strings.php:42 +#: ../../include/js_strings.php:52 msgid "a day" msgstr "un dia" -#: ../../include/js_strings.php:43 +#: ../../include/js_strings.php:53 #, php-format msgid "%d days" msgstr "%d dies" -#: ../../include/js_strings.php:44 +#: ../../include/js_strings.php:54 msgid "about a month" msgstr "prop d'un mes" -#: ../../include/js_strings.php:45 +#: ../../include/js_strings.php:55 #, php-format msgid "%d months" msgstr "%d mesos" -#: ../../include/js_strings.php:46 +#: ../../include/js_strings.php:56 msgid "about a year" msgstr "prop d'un any" -#: ../../include/js_strings.php:47 +#: ../../include/js_strings.php:57 #, php-format msgid "%d years" msgstr "%d anys" -#: ../../include/js_strings.php:48 +#: ../../include/js_strings.php:58 msgid " " msgstr " " -#: ../../include/js_strings.php:49 +#: ../../include/js_strings.php:59 msgid "timeago.numbers" msgstr "timeago.numbers" -#: ../../include/js_strings.php:55 +#: ../../include/js_strings.php:65 msgctxt "long" msgid "May" msgstr "maig" -#: ../../include/js_strings.php:63 +#: ../../include/js_strings.php:73 msgid "Jan" msgstr "gen." -#: ../../include/js_strings.php:64 +#: ../../include/js_strings.php:74 msgid "Feb" msgstr "feb." -#: ../../include/js_strings.php:65 +#: ../../include/js_strings.php:75 msgid "Mar" msgstr "març" -#: ../../include/js_strings.php:66 +#: ../../include/js_strings.php:76 msgid "Apr" msgstr "abr." -#: ../../include/js_strings.php:67 +#: ../../include/js_strings.php:77 msgctxt "short" msgid "May" msgstr "maig" -#: ../../include/js_strings.php:68 +#: ../../include/js_strings.php:78 msgid "Jun" msgstr "juny" -#: ../../include/js_strings.php:69 +#: ../../include/js_strings.php:79 msgid "Jul" msgstr "jul." -#: ../../include/js_strings.php:70 +#: ../../include/js_strings.php:80 msgid "Aug" msgstr "ag." -#: ../../include/js_strings.php:71 +#: ../../include/js_strings.php:81 msgid "Sep" msgstr "set." -#: ../../include/js_strings.php:72 +#: ../../include/js_strings.php:82 msgid "Oct" msgstr "oct." -#: ../../include/js_strings.php:73 +#: ../../include/js_strings.php:83 msgid "Nov" msgstr "nov." -#: ../../include/js_strings.php:74 +#: ../../include/js_strings.php:84 msgid "Dec" msgstr "des." -#: ../../include/js_strings.php:82 +#: ../../include/js_strings.php:92 msgid "Sun" msgstr "dg." -#: ../../include/js_strings.php:83 +#: ../../include/js_strings.php:93 msgid "Mon" msgstr "dl." -#: ../../include/js_strings.php:84 +#: ../../include/js_strings.php:94 msgid "Tue" msgstr "dm." -#: ../../include/js_strings.php:85 +#: ../../include/js_strings.php:95 msgid "Wed" msgstr "dc." -#: ../../include/js_strings.php:86 +#: ../../include/js_strings.php:96 msgid "Thu" msgstr "dj." -#: ../../include/js_strings.php:87 +#: ../../include/js_strings.php:97 msgid "Fri" msgstr "dv." -#: ../../include/js_strings.php:88 +#: ../../include/js_strings.php:98 msgid "Sat" msgstr "ds." -#: ../../include/js_strings.php:89 +#: ../../include/js_strings.php:99 msgctxt "calendar" msgid "today" msgstr "avui" -#: ../../include/js_strings.php:90 +#: ../../include/js_strings.php:100 msgctxt "calendar" msgid "month" msgstr "mes" -#: ../../include/js_strings.php:91 +#: ../../include/js_strings.php:101 msgctxt "calendar" msgid "week" msgstr "setmana" -#: ../../include/js_strings.php:92 +#: ../../include/js_strings.php:102 msgctxt "calendar" msgid "day" msgstr "dia" -#: ../../include/js_strings.php:93 +#: ../../include/js_strings.php:103 msgctxt "calendar" msgid "All day" msgstr "Tot el dia" @@ -13102,65 +13556,69 @@ msgstr "Visita %1$s en %2$s" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "%1$s Ha actualitzat %2$s, canviant %3$s." -#: ../../include/attach.php:265 ../../include/attach.php:361 +#: ../../include/attach.php:265 ../../include/attach.php:374 msgid "Item was not found." msgstr "Article no trobat." -#: ../../include/attach.php:554 +#: ../../include/attach.php:282 +msgid "Unknown error." +msgstr "Error desconegut." + +#: ../../include/attach.php:567 msgid "No source file." msgstr "No hi ha arxiu d'origen." -#: ../../include/attach.php:576 +#: ../../include/attach.php:589 msgid "Cannot locate file to replace" msgstr "No trobo l'arxiu a reemplaçar" -#: ../../include/attach.php:595 +#: ../../include/attach.php:608 msgid "Cannot locate file to revise/update" msgstr "No trobo l'arxiu a revisar/actualitzar" -#: ../../include/attach.php:737 +#: ../../include/attach.php:750 #, php-format msgid "File exceeds size limit of %d" msgstr "L'arxiu excedeix la mida limit de %d" -#: ../../include/attach.php:758 +#: ../../include/attach.php:771 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "Has arribat al teu límit de %1$.0f Mbytes de emagatzematge d'adjunts." -#: ../../include/attach.php:940 +#: ../../include/attach.php:953 msgid "File upload failed. Possible system limit or action terminated." msgstr "Pujada del arxiu fallida. Possible límit del sistema o acció interrompuda." -#: ../../include/attach.php:969 +#: ../../include/attach.php:982 msgid "Stored file could not be verified. Upload failed." msgstr "L'arxiu guardat no es pot verificar. Pujada fallida." -#: ../../include/attach.php:1043 ../../include/attach.php:1059 +#: ../../include/attach.php:1056 ../../include/attach.php:1072 msgid "Path not available." msgstr "Trajectòria no disponible" -#: ../../include/attach.php:1108 ../../include/attach.php:1273 +#: ../../include/attach.php:1121 ../../include/attach.php:1286 msgid "Empty pathname" msgstr "Trajèctoria vuida." -#: ../../include/attach.php:1134 +#: ../../include/attach.php:1147 msgid "duplicate filename or path" msgstr "Nom o trajectòria duplicat" -#: ../../include/attach.php:1159 +#: ../../include/attach.php:1172 msgid "Path not found." msgstr "Trajectòria no trobada." -#: ../../include/attach.php:1227 +#: ../../include/attach.php:1240 msgid "mkdir failed." msgstr "mkdir va fracassar." -#: ../../include/attach.php:1231 +#: ../../include/attach.php:1244 msgid "database storage failed." msgstr "Arxiu de base de dades va fallar." -#: ../../include/attach.php:1279 +#: ../../include/attach.php:1292 msgid "Empty path" msgstr "Trajèctoria vuida" @@ -13170,71 +13628,71 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "El formulario de la cadena de seguridad no era correcto. Esto probablemente ocurrió porque el formulario se ha abierto durante demasiado tiempo (> 3 horas) antes de enviarlo." -#: ../../include/items.php:885 ../../include/items.php:945 +#: ../../include/items.php:891 ../../include/items.php:951 msgid "(Unknown)" msgstr "(Desconegut)" -#: ../../include/items.php:1133 +#: ../../include/items.php:1137 msgid "Visible to anybody on the internet." msgstr "Visible per tothom a la Internet" -#: ../../include/items.php:1135 +#: ../../include/items.php:1139 msgid "Visible to you only." msgstr "Visible només per tú." -#: ../../include/items.php:1137 +#: ../../include/items.php:1141 msgid "Visible to anybody in this network." msgstr "Visible per tothom en aquesta xarxa." -#: ../../include/items.php:1139 +#: ../../include/items.php:1143 msgid "Visible to anybody authenticated." msgstr "Visible per tothom autenticat." -#: ../../include/items.php:1141 +#: ../../include/items.php:1145 #, php-format msgid "Visible to anybody on %s." msgstr "Visible per a tothom a %s." -#: ../../include/items.php:1143 +#: ../../include/items.php:1147 msgid "Visible to all connections." msgstr "Visible per a totes les connexions." -#: ../../include/items.php:1145 +#: ../../include/items.php:1149 msgid "Visible to approved connections." msgstr "Visible per a les connexions aprovades." -#: ../../include/items.php:1147 +#: ../../include/items.php:1151 msgid "Visible to specific connections." msgstr "Visible per a específiques connexions." -#: ../../include/items.php:4197 +#: ../../include/items.php:4141 msgid "Privacy group is empty." -msgstr "El grup privat està vuit." +msgstr "El grup de privacitat està buit." -#: ../../include/items.php:4204 +#: ../../include/items.php:4148 #, php-format msgid "Privacy group: %s" -msgstr "Grup privat: %s" +msgstr "Grup de privacitat: %s" -#: ../../include/items.php:4216 +#: ../../include/items.php:4160 msgid "Connection not found." msgstr "Connexió no trobada." -#: ../../include/items.php:4565 +#: ../../include/items.php:4509 msgid "profile photo" msgstr "foto del perfil" -#: ../../include/items.php:4756 +#: ../../include/items.php:4700 #, php-format msgid "[Edited %s]" msgstr "[S'ha editat %s]" -#: ../../include/items.php:4756 +#: ../../include/items.php:4700 msgctxt "edit_activity" msgid "Post" msgstr "Entrada" -#: ../../include/items.php:4756 +#: ../../include/items.php:4700 msgctxt "edit_activity" msgid "Comment" msgstr "Comentari" @@ -13424,63 +13882,47 @@ msgstr "En Procès" msgid "Cancelled" msgstr "Cancel·lat" -#: ../../include/event.php:1310 ../../include/connections.php:692 +#: ../../include/event.php:1310 ../../include/connections.php:698 msgid "Home, Voice" msgstr "Casa, veu" -#: ../../include/event.php:1311 ../../include/connections.php:693 +#: ../../include/event.php:1311 ../../include/connections.php:699 msgid "Home, Fax" msgstr "Casa, fax" -#: ../../include/event.php:1313 ../../include/connections.php:695 +#: ../../include/event.php:1313 ../../include/connections.php:701 msgid "Work, Voice" msgstr "Feina, veu" -#: ../../include/event.php:1314 ../../include/connections.php:696 +#: ../../include/event.php:1314 ../../include/connections.php:702 msgid "Work, Fax" msgstr "Feina, fax" -#: ../../include/network.php:762 +#: ../../include/network.php:760 msgid "view full size" msgstr "Veure a mida competa" -#: ../../include/network.php:1764 ../../include/network.php:1765 -msgid "Friendica" -msgstr "Friendica" - #: ../../include/network.php:1766 -msgid "OStatus" -msgstr "OStatus" - -#: ../../include/network.php:1767 msgid "GNU-Social" msgstr "GNU-Social" -#: ../../include/network.php:1768 +#: ../../include/network.php:1767 msgid "RSS/Atom" msgstr "RSS/Atom" #: ../../include/network.php:1771 -msgid "Diaspora" -msgstr "Diaspora" - -#: ../../include/network.php:1772 msgid "Facebook" msgstr "Facebook" #: ../../include/network.php:1773 -msgid "Zot" -msgstr "Zot" - -#: ../../include/network.php:1774 msgid "LinkedIn" msgstr "LinkedIn" -#: ../../include/network.php:1775 +#: ../../include/network.php:1774 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:1776 +#: ../../include/network.php:1775 msgid "MySpace" msgstr "MySpace" @@ -13522,77 +13964,81 @@ msgstr "Els permisos d'entrada %s no poden esser canviats %s posteriorment a que msgid "Cannot locate DNS info for database server '%s'" msgstr "No s'ha trobat informació de DNS pel servidor de base de dades '%s'" -#: ../../include/bbcode.php:198 ../../include/bbcode.php:1200 -#: ../../include/bbcode.php:1203 ../../include/bbcode.php:1208 -#: ../../include/bbcode.php:1211 ../../include/bbcode.php:1214 -#: ../../include/bbcode.php:1217 ../../include/bbcode.php:1222 -#: ../../include/bbcode.php:1225 ../../include/bbcode.php:1230 -#: ../../include/bbcode.php:1233 ../../include/bbcode.php:1236 -#: ../../include/bbcode.php:1239 +#: ../../include/bbcode.php:200 ../../include/bbcode.php:1202 +#: ../../include/bbcode.php:1205 ../../include/bbcode.php:1210 +#: ../../include/bbcode.php:1213 ../../include/bbcode.php:1216 +#: ../../include/bbcode.php:1219 ../../include/bbcode.php:1224 +#: ../../include/bbcode.php:1227 ../../include/bbcode.php:1232 +#: ../../include/bbcode.php:1235 ../../include/bbcode.php:1238 +#: ../../include/bbcode.php:1241 msgid "Image/photo" msgstr "Imatge/foto" -#: ../../include/bbcode.php:237 ../../include/bbcode.php:1250 +#: ../../include/bbcode.php:239 ../../include/bbcode.php:1252 msgid "Encrypted content" msgstr "Contingut encriptat" -#: ../../include/bbcode.php:253 +#: ../../include/bbcode.php:255 #, php-format msgid "Install %1$s element %2$s" msgstr "Instaŀla l'element %2$s del tipus %1$s" -#: ../../include/bbcode.php:257 +#: ../../include/bbcode.php:259 #, php-format msgid "" "This post contains an installable %s element, however you lack permissions " "to install it on this site." msgstr "Aquesta entrada contè un element %s instal·lable, potser manques de permissos per instal·lar-lo en aquest lloc." -#: ../../include/bbcode.php:348 +#: ../../include/bbcode.php:350 msgid "card" msgstr "targeta" -#: ../../include/bbcode.php:350 +#: ../../include/bbcode.php:352 msgid "article" msgstr "article" -#: ../../include/bbcode.php:433 ../../include/bbcode.php:441 +#: ../../include/bbcode.php:435 ../../include/bbcode.php:443 msgid "Click to open/close" msgstr "Clic per obrir/tancar" -#: ../../include/bbcode.php:441 +#: ../../include/bbcode.php:443 msgid "spoiler" msgstr "xafa guitarres" -#: ../../include/bbcode.php:454 +#: ../../include/bbcode.php:456 msgid "View article" msgstr "Mostra l'article" -#: ../../include/bbcode.php:454 +#: ../../include/bbcode.php:456 msgid "View summary" msgstr "Mostra'n un resum" -#: ../../include/bbcode.php:1188 +#: ../../include/bbcode.php:1190 msgid "$1 wrote:" msgstr "$1 va escriure:" -#: ../../include/oembed.php:329 +#: ../../include/oembed.php:224 +msgid "View PDF" +msgstr "Mostra el pdf" + +#: ../../include/oembed.php:347 msgid " by " msgstr "de" -#: ../../include/oembed.php:330 +#: ../../include/oembed.php:348 msgid " on " msgstr "a" -#: ../../include/oembed.php:359 +#: ../../include/oembed.php:377 msgid "Embedded content" msgstr "Contingut embegut" -#: ../../include/oembed.php:368 +#: ../../include/oembed.php:386 msgid "Embedding disabled" msgstr "Incorporació desactivada" -#: ../../include/zid.php:347 +#: ../../include/zid.php:351 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "OpenWebAuth: %1$s dóna la benvinguda a %2$s" @@ -13721,13 +14167,9 @@ msgstr "Permet configurar al detall els temes i els dissenys de pàgina" msgid "Access Control and Permissions" msgstr "Control d'accés i permisos" -#: ../../include/features.php:221 ../../include/group.php:328 -msgid "Privacy Groups" -msgstr "Grup Privat" - #: ../../include/features.php:222 msgid "Enable management and selection of privacy groups" -msgstr "Habilita gestió i selecció de grups privats" +msgstr "Habilita la gestió i selecció de grups de privacitat" #: ../../include/features.php:230 msgid "Multiple Profiles" @@ -13738,8 +14180,8 @@ msgid "Ability to create multiple profiles" msgstr "Capacitat per crear multiples perfils" #: ../../include/features.php:241 -msgid "Provide alternate connection permission roles." -msgstr "Proporciona rols diferents per als permisos de connexió." +msgid "Create custom connection permission limits" +msgstr "Personalitza els límits de permisos de les connexions" #: ../../include/features.php:249 msgid "OAuth1 Clients" @@ -13861,94 +14303,112 @@ msgid "Save search terms for re-use" msgstr "Guardar els termin de la cerca per a re-usar" #: ../../include/features.php:390 -msgid "Network Personal Tab" -msgstr "Pestanya Personal de Xarxa" +msgid "Alternate Stream Order" +msgstr "Diversos ordres al flux" #: ../../include/features.php:391 -msgid "Enable tab to display only Network posts that you've interacted on" -msgstr "Activa la pestanya per mostrar només les entrades de xarxa en les que has intervingut" +msgid "" +"Ability to order the stream by last post date, last comment date or " +"unthreaded activities" +msgstr "Permet canviar l'ordre dels continguts en el flux: segons la data de les entrades, segons la data de l'últim comentari, o segons la data de cada missatge sense agrupar per converses" #: ../../include/features.php:399 -msgid "Network New Tab" -msgstr "Pestanya Nou a la Xarxa" +msgid "Contact Filter" +msgstr "Filtre de contactes" #: ../../include/features.php:400 -msgid "Enable tab to display all new Network activity" -msgstr "Activa pestanya per mostrar tota l'activitat nova de la Xarxa" +msgid "Ability to display only posts of a selected contact" +msgstr "Permet mostrar només entrades d'un contacte determinat" #: ../../include/features.php:408 +msgid "Forum Filter" +msgstr "Filtre de fòrums" + +#: ../../include/features.php:409 +msgid "Ability to display only posts of a specific forum" +msgstr "Permet mostrar només entrades d'un fòrum determinat" + +#: ../../include/features.php:417 +msgid "Personal Posts Filter" +msgstr "Filtre d'interaccions amb mi" + +#: ../../include/features.php:418 +msgid "Ability to display only posts that you've interacted on" +msgstr "Permet mostrar només les entrades amb què has interactuat" + +#: ../../include/features.php:426 msgid "Affinity Tool" msgstr "Eina d'Afinitat" -#: ../../include/features.php:409 +#: ../../include/features.php:427 msgid "Filter stream activity by depth of relationships" msgstr "Filtre d'activitat del flux per importància de la relació" -#: ../../include/features.php:418 +#: ../../include/features.php:436 msgid "Show friend and connection suggestions" msgstr "Suggereix connexions o amistats" -#: ../../include/features.php:426 +#: ../../include/features.php:444 msgid "Connection Filtering" msgstr "Filtre de Connexió" -#: ../../include/features.php:427 +#: ../../include/features.php:445 msgid "Filter incoming posts from connections based on keywords/content" msgstr "Filtre de missatges d'entrada de conexions, basat en paraules clau/contingut " -#: ../../include/features.php:439 +#: ../../include/features.php:457 msgid "Post/Comment Tools" msgstr "Eina d'Entrades/Comentaris" -#: ../../include/features.php:443 +#: ../../include/features.php:461 msgid "Community Tagging" msgstr "Etiquetat per la Comunitat" -#: ../../include/features.php:444 +#: ../../include/features.php:462 msgid "Ability to tag existing posts" msgstr "Capacitat d'etiquetar entrades existents" -#: ../../include/features.php:452 +#: ../../include/features.php:470 msgid "Post Categories" msgstr "Categories d'Entrades" -#: ../../include/features.php:453 +#: ../../include/features.php:471 msgid "Add categories to your posts" msgstr "Afegeix categoria a la teva entrada" -#: ../../include/features.php:461 +#: ../../include/features.php:479 msgid "Emoji Reactions" msgstr "Reaccions dels Emoji" -#: ../../include/features.php:462 +#: ../../include/features.php:480 msgid "Add emoji reaction ability to posts" msgstr "Afegeix un emoji habilitat per reaccionar a entrades" -#: ../../include/features.php:471 +#: ../../include/features.php:489 msgid "Ability to file posts under folders" msgstr "Capacitat de arxivar entrades en les carpetes" -#: ../../include/features.php:479 +#: ../../include/features.php:497 msgid "Dislike Posts" msgstr "No Agrada l'Entrada" -#: ../../include/features.php:480 +#: ../../include/features.php:498 msgid "Ability to dislike posts/comments" msgstr "Capacitat per marcar amb \"No Agrada\" les entrades/comentaris" -#: ../../include/features.php:488 +#: ../../include/features.php:506 msgid "Star Posts" msgstr "Entrades Excel·lents" -#: ../../include/features.php:489 +#: ../../include/features.php:507 msgid "Ability to mark special posts with a star indicator" msgstr "Capacitat per marcar entrades especials amb l'indicador d'excel·lencia" -#: ../../include/features.php:497 +#: ../../include/features.php:515 msgid "Tag Cloud" msgstr "Núvol d'Etiquetes." -#: ../../include/features.php:498 +#: ../../include/features.php:516 msgid "Provide a personal tag cloud on your channel page" msgstr "Proporcionar un núvol d'etiquetes personals a la teva pàgina de canal" @@ -14017,38 +14477,38 @@ msgstr "Ha fallat guardar la informació del compte" msgid "Registration confirmation for %s" msgstr "Inscripció confirmada per %s" -#: ../../include/account.php:383 +#: ../../include/account.php:385 #, php-format msgid "Registration request at %s" msgstr "Sol·licitud d'inscripció a %s" -#: ../../include/account.php:405 +#: ../../include/account.php:407 msgid "your registration password" msgstr "la teva contrasenya registrada" -#: ../../include/account.php:411 ../../include/account.php:473 +#: ../../include/account.php:413 ../../include/account.php:475 #, php-format msgid "Registration details for %s" msgstr "Detalls de l'inscripció per %s" -#: ../../include/account.php:484 +#: ../../include/account.php:486 msgid "Account approved." msgstr "Compte aprovat." -#: ../../include/account.php:524 +#: ../../include/account.php:526 #, php-format msgid "Registration revoked for %s" msgstr "Inscripció revocada per %s" -#: ../../include/account.php:803 ../../include/account.php:805 +#: ../../include/account.php:805 ../../include/account.php:807 msgid "Click here to upgrade." msgstr "Feu clic aquí per actualitzar." -#: ../../include/account.php:811 +#: ../../include/account.php:813 msgid "This action exceeds the limits set by your subscription plan." msgstr "Aquesta acció és superior als límits establerts pel seu pla de subscripció." -#: ../../include/account.php:816 +#: ../../include/account.php:818 msgid "This action is not available under your subscription plan." msgstr "Aquesta acció no està disponible en el seu pla de subscripció." @@ -14133,106 +14593,110 @@ msgstr "Aniversari de %1$s" msgid "Happy Birthday %1$s" msgstr "Feliç Aniversari %1$s" -#: ../../include/nav.php:96 +#: ../../include/nav.php:88 msgid "Remote authentication" msgstr "Autenticació remota" -#: ../../include/nav.php:96 +#: ../../include/nav.php:88 msgid "Click to authenticate to your home hub" msgstr "Clica per autentificar-te en el teu node" -#: ../../include/nav.php:102 ../../include/nav.php:190 -msgid "Manage Your Channels" -msgstr "Gestiona els Teus Canals" +#: ../../include/nav.php:94 +msgid "Manage your channels" +msgstr "Gestiona els teus canals" -#: ../../include/nav.php:105 ../../include/nav.php:192 +#: ../../include/nav.php:97 +msgid "Manage your privacy groups" +msgstr "Gestiona els teus grups de privacitat" + +#: ../../include/nav.php:99 msgid "Account/Channel Settings" -msgstr "Ajustos de Compte/Canal" +msgstr "Configuració de compte i canal" -#: ../../include/nav.php:111 ../../include/nav.php:140 +#: ../../include/nav.php:105 ../../include/nav.php:134 msgid "End this session" msgstr "Finalitza aquesta sessió" -#: ../../include/nav.php:114 +#: ../../include/nav.php:108 msgid "Your profile page" msgstr "La teva pàgina de perfil" -#: ../../include/nav.php:117 +#: ../../include/nav.php:111 msgid "Manage/Edit profiles" -msgstr "Gestiona/Edita perfils" +msgstr "Gestiona/edita els perfils" -#: ../../include/nav.php:126 ../../include/nav.php:130 +#: ../../include/nav.php:120 ../../include/nav.php:124 msgid "Sign in" msgstr "Signatura" -#: ../../include/nav.php:157 +#: ../../include/nav.php:151 msgid "Take me home" msgstr "Porta'm a casa" -#: ../../include/nav.php:159 +#: ../../include/nav.php:153 msgid "Log me out of this site" msgstr "Tanca'm la sessió en aquest lloc web" -#: ../../include/nav.php:164 +#: ../../include/nav.php:158 msgid "Create an account" msgstr "Crear un compte" -#: ../../include/nav.php:176 +#: ../../include/nav.php:170 msgid "Help and documentation" msgstr "Ajuda i documentació" -#: ../../include/nav.php:179 +#: ../../include/nav.php:185 msgid "Search site @name, !forum, #tag, ?docs, content" msgstr "Cerca en el node @nom, !fòrum, #etiqueta, ?documentació, contingut" -#: ../../include/nav.php:199 +#: ../../include/nav.php:191 msgid "Site Setup and Configuration" -msgstr "Ajustos i Configuració del Lloc" +msgstr "Configuració del node" -#: ../../include/nav.php:290 +#: ../../include/nav.php:282 msgid "@name, !forum, #tag, ?doc, content" msgstr "@nom, !fòrum, #etiqueta, ?documentació, contingut" -#: ../../include/nav.php:291 +#: ../../include/nav.php:283 msgid "Please wait..." msgstr "Si us plau, espera......." -#: ../../include/nav.php:297 +#: ../../include/nav.php:289 msgid "Add Apps" msgstr "Afegeix aplicacions" -#: ../../include/nav.php:298 +#: ../../include/nav.php:290 msgid "Arrange Apps" msgstr "Endreça les aplicacions" -#: ../../include/nav.php:299 +#: ../../include/nav.php:291 msgid "Toggle System Apps" msgstr "Commuta l'estat de les aplicacions de sistema" -#: ../../include/photos.php:150 +#: ../../include/photos.php:151 #, php-format msgid "Image exceeds website size limit of %lu bytes" msgstr "La imatge excedeix la mida limit pel lloc web en %lu bytes" -#: ../../include/photos.php:161 +#: ../../include/photos.php:162 msgid "Image file is empty." msgstr "El fitxer d'imatge esta buit." -#: ../../include/photos.php:326 +#: ../../include/photos.php:327 msgid "Photo storage failed." msgstr "Fracassà l'emmagatzematge de la Foto" -#: ../../include/photos.php:375 +#: ../../include/photos.php:376 msgid "a new photo" msgstr "Una foto nova" -#: ../../include/photos.php:379 +#: ../../include/photos.php:380 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "%1$s enviat %2$s a %3$s" -#: ../../include/photos.php:671 +#: ../../include/photos.php:672 msgid "Upload New Photos" msgstr "Puja Noves Fotos" @@ -14244,12 +14708,12 @@ msgstr "paquet de dades invàlid" msgid "Unable to verify channel signature" msgstr "No es pot verificar la signatura del canal" -#: ../../include/zot.php:2552 +#: ../../include/zot.php:2557 #, php-format msgid "Unable to verify site signature for %s" msgstr "No es pot verificar la signatura del lloc per %s" -#: ../../include/zot.php:4219 +#: ../../include/zot.php:4221 msgid "invalid target signature" msgstr "Signatura objectiu invàlida" @@ -14262,23 +14726,23 @@ msgstr "Un grup esborrat amb aquest nom fou reviscolat. Els permisos dels items #: ../../include/group.php:264 msgid "Add new connections to this privacy group" -msgstr "Afegir noves connexions a aquest grup privat" +msgstr "Afegeix noves connexions a aquest grup de privacitat" -#: ../../include/group.php:306 +#: ../../include/group.php:298 msgid "edit" msgstr "edita" -#: ../../include/group.php:329 +#: ../../include/group.php:321 msgid "Edit group" msgstr "Editar grup" -#: ../../include/group.php:330 +#: ../../include/group.php:322 msgid "Add privacy group" -msgstr "Afegir grup privat" +msgstr "Afegeix grup de privacitat" -#: ../../include/group.php:331 +#: ../../include/group.php:323 msgid "Channels not in any privacy group" -msgstr "Sense canals en grups privats" +msgstr "Canals que no estan en cap grup de privacitat" #: ../../include/connections.php:133 msgid "New window" @@ -14288,19 +14752,19 @@ msgstr "Nova finestra" msgid "Open the selected location in a different window or browser tab" msgstr "Obrir la localització seleccionada en un altre finestra o pestanya del navegador" -#: ../../include/auth.php:152 +#: ../../include/auth.php:192 msgid "Delegation session ended." msgstr "S'ha tancat la sessió de delegació." -#: ../../include/auth.php:156 +#: ../../include/auth.php:196 msgid "Logged out." msgstr "Sortir." -#: ../../include/auth.php:273 +#: ../../include/auth.php:291 msgid "Email validation is incomplete. Please check your email." msgstr "Encara no s'ha validat el teu correu. Comprova la safata d'entrada i la paperera." -#: ../../include/auth.php:289 +#: ../../include/auth.php:307 msgid "Failed authentication" msgstr "Autenticació fallida" diff --git a/view/ca/hstrings.php b/view/ca/hstrings.php index 50ffaebeb..d2954b2b7 100644 --- a/view/ca/hstrings.php +++ b/view/ca/hstrings.php @@ -19,7 +19,7 @@ App::$strings["Can post on my channel (wall) page"] = "Pot penjar entrades al mu App::$strings["Can comment on or like my posts"] = "Pot comentar i fer \"m'agrada\" a les meves entrades"; App::$strings["Can send me private mail messages"] = "Pot enviar-me missatges privats"; App::$strings["Can like/dislike profiles and profile things"] = "Pot fer m'agrada i no m'agrada als perfils i coses del perfil"; -App::$strings["Can forward to all my channel connections via @+ mentions in posts"] = "Pot reenviar a totes les connexions del meu canal fent servir @+ per mencionar"; +App::$strings["Can forward to all my channel connections via ! mentions in posts"] = "Pot fer arribar entrades a totes les meves connexions fent servir mencions amb \"!\""; App::$strings["Can chat with me"] = "Pot xatejar amb mi"; App::$strings["Can source my public posts in derived channels"] = "Pot fer servir les meves entrades per publicar automàticament en altres canals"; App::$strings["Can administer my channel"] = "Pot administrar el meu canal"; @@ -49,7 +49,7 @@ App::$strings["Created"] = "Creat"; App::$strings["Edited"] = "Editat"; App::$strings["Create"] = "Crea"; App::$strings["Edit"] = "Edita"; -App::$strings["Share"] = "Compartir"; +App::$strings["Share"] = "Comparteix"; App::$strings["Delete"] = "Esborra"; App::$strings["View"] = "Mostra"; App::$strings["Total invitation limit exceeded."] = "S'ha superat el límit total d'invitacions."; @@ -78,6 +78,7 @@ App::$strings["Item not found"] = "No s'ha trobat l'element"; App::$strings["Layout Name"] = "Nom del disseny"; App::$strings["Layout Description (Optional)"] = "Descripció del disseny (opcional)"; App::$strings["Edit Layout"] = "Edita el disseny"; +App::$strings["Cancel"] = "Cancel·la"; App::$strings["Permission denied"] = "S'ha denegat el permís"; App::$strings["Invalid profile identifier."] = "L'identificador de perfil no és vàlid."; App::$strings["Profile Visibility Editor"] = "Editor de la visibilitat del perfil"; @@ -111,7 +112,6 @@ App::$strings["More"] = "Mostra més"; App::$strings["Less"] = "Mostra menys"; App::$strings["Select calendar"] = "Tria un calendari"; App::$strings["Delete all"] = "Esborra'ls tots"; -App::$strings["Cancel"] = "Cancel·la"; App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "Malauradament encara no es poden editar esdeveniments periòdics."; App::$strings["Name"] = "Nom"; App::$strings["Organisation"] = "Organització"; @@ -142,6 +142,8 @@ App::$strings["You must be logged in to see this page."] = "Has de tenir una ses App::$strings["Posts and comments"] = "Entrades i comentaris"; App::$strings["Only posts"] = "Només entrades"; App::$strings["Insufficient permissions. Request redirected to profile page."] = "S'ha denegat el permís. La petició s'ha redirigit a la pàgina de perfil."; +App::$strings["Search Results For:"] = "Cerca resultats per:"; +App::$strings["Reset form"] = "Esborra el formulari"; App::$strings["Export Channel"] = "Exporta un canal"; App::$strings["Export your basic channel information to a file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exporta la informació bàsica del canal a un arxiu. Això serveix com a còpia de seguretat de les teves connexions, permisos, perfil i dades bàsiques, i pots emprar-la per a importar aquestes dades des d'un altre hub. No conté el contingut del canal."; App::$strings["Export Content"] = "Exporta'n el contingut"; @@ -273,16 +275,18 @@ App::$strings["Import Items"] = "Importa articles"; App::$strings["Use this form to import existing posts and content from an export file."] = "Empra aquest formulari per importar entrades existents i contingut d'un arxiu d'exportació."; App::$strings["File to Upload"] = "Fitxer per pujar"; App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Has creat %1$.0f canals dels %2$.0f totals permesos."; -App::$strings["Name or caption"] = "Nom o llegenda"; +App::$strings["Loading"] = "S'està carregant"; +App::$strings["Your real name is recommended."] = "És recomanable fer servir el nom real."; App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Exemples: \"Paula Gomila\", \"Manel i els seus cavalls\", \"Assemblea de veïnes del barri\", \"Filosofia\""; +App::$strings["This will be used to create a unique network address (like an email address)."] = "Es farà servir per crear una adreça de xarxa única, com la de email."; +App::$strings["Allowed characters are a-z 0-9, - and _"] = "Els caràcters permesos són lletres minúscules sense accents, números i guions: a-z, 0-9, -, _"; +App::$strings["Channel name"] = "Nom del canal"; App::$strings["Choose a short nickname"] = "Tria un àlies curt"; -App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "El teu àlies servirà per crear un nom fàcil per recordar l'adreça del canal. Per exemple, àlies%s"; App::$strings["Channel role and privacy"] = "Rol i privacitat del canal"; -App::$strings["Select a channel role with your privacy requirements."] = "Tria un rol pel canal segons les teves necessitats de privacitat."; -App::$strings["Read more about roles"] = "Llegix més sobre els rols"; -App::$strings["Create Channel"] = "Crea un canal"; -App::$strings["A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things. Channels can make connections with other channels to share information with each other."] = "Cada canal és una identitat de xarxa única. Tant pot representar una persona (el seu perfil social), com un fòrum (un grup), una associació o la pàgina d'algun personatge públic, una font de notícies, i moltes més coses. Els canals poden connectar-se entre ells per a compartir informació."; -App::$strings["The type of channel you create affects the basic privacy settings, the permissions that are granted to connections/friends, and also the channel's visibility across the network."] = "El tipus de canal que creïs determinarà els permisos de privacitat bàsics, els atorgats a les connexions i a la visibilitat del canal a la xarxa."; +App::$strings["Select a channel permission role compatible with your usage needs and privacy requirements."] = "Escull un rol de permisos de canal. Tingues en compte l'ús que en faràs i el nivell de privacitat que desitges."; +App::$strings["Read more about channel permission roles"] = "Llegeix més sobre els rols de permisos en els canals"; +App::$strings["Create a Channel"] = "Crea un canal"; +App::$strings["A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things."] = "Un canal és una identitat de xarxa única. Tant pot representar una persona (el seu perfil social), com un fòrum (un grup), una associació o la pàgina d'algun personatge públic, un flux de notícies, i moltes més coses."; App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "o bé <a href=\"import\">importa un canal existent</a> des d'una altra ubicació."; App::$strings["Validate"] = "Valida-ho"; App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "No es permet esborrar un canal fins a 48 hores més tard d'haver canviant la contrasenya del compte al qual pertany."; @@ -418,35 +422,6 @@ App::$strings["Failed Updates"] = "Actualitzacions fallides"; App::$strings["Mark success (if update was manually applied)"] = "Marca com a exitosa. Fes-ho només si l'actualització s'ha aplicat de forma manual i saps del cert que ha estat així."; App::$strings["Attempt to execute this update step automatically"] = "Prova a fer automàticament aquesta actualització"; App::$strings["No failed updates."] = "No hi ha actualitzacions fallides."; -App::$strings["Item not found."] = "No s'ha trobat l'element."; -App::$strings["Plugin %s disabled."] = "S'ha desactivat l'extensió %s."; -App::$strings["Plugin %s enabled."] = "S'ha activat l'extensió %s."; -App::$strings["Disable"] = "Desactiva"; -App::$strings["Enable"] = "Activa"; -App::$strings["Administration"] = "Administració"; -App::$strings["Plugins"] = "Extensions"; -App::$strings["Toggle"] = "Commuta'n l'estat"; -App::$strings["Settings"] = "Configuració"; -App::$strings["Author: "] = "Autor/a:"; -App::$strings["Maintainer: "] = "Persona mantenidora:"; -App::$strings["Minimum project version: "] = "Versió mínima del projecte:"; -App::$strings["Maximum project version: "] = "Versió màxima del projecte:"; -App::$strings["Minimum PHP version: "] = "Versió mínima de PHP:"; -App::$strings["Compatible Server Roles: "] = "Rols de servidor compatibles"; -App::$strings["Requires: "] = "Demana:"; -App::$strings["Disabled - version incompatibility"] = "Desactivada - versions incompatibles"; -App::$strings["Enter the public git repository URL of the plugin repo."] = "Introdueix la URL del repositori git d'extensions. Ha de ser un repositori públic."; -App::$strings["Plugin repo git URL"] = "Adreça URL del repositori d'extensions."; -App::$strings["Custom repo name"] = "Nom personalitzat pel repositori"; -App::$strings["(optional)"] = "(opcional)"; -App::$strings["Download Plugin Repo"] = "Descarrega el repositori"; -App::$strings["Install new repo"] = "Instal·la un nou repositori"; -App::$strings["Install"] = "Instal·la"; -App::$strings["Manage Repos"] = "Gestiona els repositoris"; -App::$strings["Installed Plugin Repositories"] = "Repositoris instaŀlats"; -App::$strings["Install a New Plugin Repository"] = "Instal·la un nou repositori"; -App::$strings["Switch branch"] = "Canvia de branca"; -App::$strings["Remove"] = "Esborra"; App::$strings["%s account blocked/unblocked"] = array( 0 => "S'ha [des]bloquejat %s compte", 1 => "S'han [des]bloquejat %s comptes", @@ -459,6 +434,7 @@ App::$strings["Account not found"] = "No s'ha trobat el compte"; App::$strings["Account '%s' deleted"] = "S'ha esborrat el compte '%s'"; App::$strings["Account '%s' blocked"] = "S'ha bloquejat el compte '%s'"; App::$strings["Account '%s' unblocked"] = "S'ha desbloquejat el compte '%s'"; +App::$strings["Administration"] = "Administració"; App::$strings["Accounts"] = "Comptes"; App::$strings["select all"] = "sel·leciona-ho tot"; App::$strings["Registrations waiting for confirm"] = "Inscripcions esperant confirmació"; @@ -512,8 +488,15 @@ App::$strings["Selected channels will be deleted!\\n\\nEverything that was poste App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "El canal {0} està a punt de ser esborrat!\\n\\nTotes les seves publicacions d'aquest en aquest lloc s'eliminaran de forma permanent!\\n\\nN'estàs segur/a?"; App::$strings["Theme settings updated."] = "S'ha actualitzat la configuració de tema."; App::$strings["No themes found."] = "No s'ha trobat cap tema."; +App::$strings["Item not found."] = "No s'ha trobat l'element."; +App::$strings["Disable"] = "Desactiva"; +App::$strings["Enable"] = "Activa"; App::$strings["Screenshot"] = "Captura de pantalla"; App::$strings["Themes"] = "Temes"; +App::$strings["Toggle"] = "Commuta'n l'estat"; +App::$strings["Settings"] = "Configuració"; +App::$strings["Author: "] = "Autor/a:"; +App::$strings["Maintainer: "] = "Persona mantenidora:"; App::$strings["[Experimental]"] = "[Experimental]"; App::$strings["[Unsupported]"] = "[Incompatible]"; App::$strings["Site settings updated."] = "S'ha actualitzat la configuració del lloc"; @@ -533,6 +516,8 @@ App::$strings["Intermediate - somewhat comfortable"] = "Intermedi - còmode en e App::$strings["Advanced - very comfortable"] = "Avançat - molt còmode en entorns informàtics"; App::$strings["Expert - I can write computer code"] = "Expert - Sé programar"; App::$strings["Wizard - I probably know more than you do"] = "Bruixot - Segurament en sé més que tu"; +App::$strings["Default permission role for new accounts"] = "Rol de permisos per defecte per als comptes nous."; +App::$strings["This role will be used for the first channel created after registration."] = "S'aplicarà aquest rol al primer canal que es creï després del registre d'un compte."; App::$strings["Site"] = "Node"; App::$strings["Registration"] = "Inscripcions"; App::$strings["File upload"] = "Pujada d'arxius"; @@ -582,6 +567,9 @@ App::$strings["Site only Public Streams"] = "Fluxos públics només locals"; App::$strings["Allow access to public content originating only from this site if Imported Public Streams are disabled."] = "Permet accedir a aquell contingut públic que s'hagi originat en aquest lloc, suposant que no s'estan important fluxos públics d'altres nodes."; App::$strings["Allow anybody on the internet to access the Public streams"] = "Permet a qualsevol persona d'internet d'accedir els fluxos públics"; App::$strings["Disable to require authentication before viewing. Warning: this content is unmoderated."] = "Desabilita-ho per a demanar iniciar sessió per poder-ho veure. Alerta: el contingut no estarà moderat."; +App::$strings["Only import Public stream posts with this text"] = "Importa només entrades del flux públics que continguin aquest text"; +App::$strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "paraules una per línia o #etiquetes o /patrons/ o idioma=xx, deixar en blanc per importar totes les entrades"; +App::$strings["Do not import Public stream posts with this text"] = "No importes entrades del flux públic que continguin aquest text"; App::$strings["Login on Homepage"] = "Accés a la Pàgina d'inici"; App::$strings["Present a login box to visitors on the home page if no other content has been configured."] = "Presenta una casella d'identificació a la pàgina d'inici als visitants si no s'ha configurat altre contingut."; App::$strings["Enable context help"] = "Activar l'ajuda contextual"; @@ -615,9 +603,30 @@ App::$strings["Do not expire any posts which have comments less than this many d App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = "Servidors públics: Pàgina d'arribada promocional per a nous usuaris o usuàries."; App::$strings["Create this page first. Default is %s/register"] = "Crea primer aquesta pàgina. Per defecte és %s/register"; App::$strings["Page to display after creating a new channel"] = "Pàgina que es mostrarà després d'haver creat un canal nou"; -App::$strings["Recommend: profiles, go, or settings"] = "Recomanat: profiles (perfils), go (mostra diverses opcions), settings (configuració)"; +App::$strings["Default: profiles"] = "Per defecte: profiles"; App::$strings["Optional: site location"] = "Opcional: ubicació del node"; App::$strings["Region or country"] = "Regió o país"; +App::$strings["Plugin %s disabled."] = "S'ha desactivat l'extensió %s."; +App::$strings["Plugin %s enabled."] = "S'ha activat l'extensió %s."; +App::$strings["Addons"] = "Extensions"; +App::$strings["Minimum project version: "] = "Versió mínima del projecte:"; +App::$strings["Maximum project version: "] = "Versió màxima del projecte:"; +App::$strings["Minimum PHP version: "] = "Versió mínima de PHP:"; +App::$strings["Compatible Server Roles: "] = "Rols de servidor compatibles"; +App::$strings["Requires: "] = "Demana:"; +App::$strings["Disabled - version incompatibility"] = "Desactivada - versions incompatibles"; +App::$strings["Enter the public git repository URL of the addon repo."] = "Introdueix la URL del repositori git d'extensions. Ha de ser un repositori públic."; +App::$strings["Addon repo git URL"] = "Adreça URL del repositori d'extensions."; +App::$strings["Custom repo name"] = "Nom personalitzat pel repositori"; +App::$strings["(optional)"] = "(opcional)"; +App::$strings["Download Addon Repo"] = "Descarrega el repositori"; +App::$strings["Install new repo"] = "Instal·la un nou repositori"; +App::$strings["Install"] = "Instal·la"; +App::$strings["Manage Repos"] = "Gestiona els repositoris"; +App::$strings["Installed Addon Repositories"] = "Repositoris instaŀlats"; +App::$strings["Install a New Addon Repository"] = "Instal·la un nou repositori"; +App::$strings["Switch branch"] = "Canvia de branca"; +App::$strings["Remove"] = "Esborra"; App::$strings["New Profile Field"] = "Camp de Perfil Nou"; App::$strings["Field nickname"] = "Àlies de Camp"; App::$strings["System name of field"] = "nOM DEL SISTEMA DEL CAMP"; @@ -628,7 +637,7 @@ App::$strings["Help text"] = "Text d'ajuda"; App::$strings["Additional info (optional)"] = "Informació adicional (opcional)"; App::$strings["Save"] = "Guardar"; App::$strings["Field definition not found"] = "No es troba la definició del camp"; -App::$strings["Edit Profile Field"] = "Camp d'Edició del Perfil"; +App::$strings["Edit Profile Field"] = "Modifica el camp de perfil"; App::$strings["Profile Fields"] = "Camps del Perfil"; App::$strings["Basic Profile Fields"] = "Camps Bàsics del Perfil"; App::$strings["Advanced Profile Fields"] = "Camps Avançats del Perfil"; @@ -652,6 +661,9 @@ App::$strings["All other embedded content will be filtered, <strong>unless</stro App::$strings["Security"] = "Seguretat"; App::$strings["Block public"] = "Bloca que sigui públic"; App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "activa per blocar l'accés a les pàgines personals públiques a tothom excepte aquells/es que s'hagin autenticat en aquest node."; +App::$strings["Provide a cloud root directory"] = "Ofereix un directori arrel de núvols"; +App::$strings["The cloud root directory lists all channel names which provide public files"] = "EL directori arrel de núvols llista tots els canals que ofereixen fitxers públicament"; +App::$strings["Show total disk space available to cloud uploads"] = "Mostra l'espai disc disponible per a pujar arxius als núvols"; App::$strings["Set \"Transport Security\" HTTP header"] = "Set \"Transport Security\" HTTP header"; App::$strings["Set \"Content Security Policy\" HTTP header"] = "Set \"Content Security Policy\" HTTP header"; App::$strings["Allowed email domains"] = "Dominis de correu electonic acceptats"; @@ -678,10 +690,10 @@ App::$strings["Permission category saved."] = "S'ha desat la categoria de permis App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Pots crear regles de permisos segons classe de persona o de connexió."; App::$strings["Permission Categories"] = "Categories de permisos"; App::$strings["Permission Name"] = "Nom de permís"; -App::$strings["My Settings"] = "Els Meus Ajustos"; +App::$strings["My Settings"] = "La meva configuració"; App::$strings["inherited"] = "heretat"; App::$strings["Individual Permissions"] = "Permisos Individuals"; -App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Alguns permisos poden ser heretats dels teus canals <a href=\"settings\"><strong>ajustos de privacitat</strong></a>, Els quals tenen més prioritat que els ajustos individuals. <strong>No</strong> pots canviar aquests ajustos aquí."; +App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Alguns permisos pot ser que vinguin heretats de la <a href=\"settings\"><strong>configuració de privacitat</strong></a> del teu canal. Aquesta té més prioritat que les configuracions individuals. <strong>No</strong> pots canviar aquests paràmetres aquí."; App::$strings["Friends"] = "Amics"; App::$strings["Settings updated."] = "Ajustes actualizados."; App::$strings["Nobody except yourself"] = "Ningú excepte tú"; @@ -697,8 +709,10 @@ App::$strings["Allow us to suggest you as a potential friend to new members?"] = App::$strings["or"] = "o"; App::$strings["Your channel address is"] = "La teva adreça del canal es"; App::$strings["Your files/photos are accessible via WebDAV at"] = "Les teves fotos i arxius estan disponibles mitjançant WebDAV a"; -App::$strings["Channel Settings"] = "Ajustos del Canal"; -App::$strings["Basic Settings"] = "Ajustos Bàsics"; +App::$strings["Automatic membership approval"] = "Acceptació automàtica de membres"; +App::$strings["If enabled, connection requests will be approved without your interaction"] = "Si s'habilita, les soŀlicituds de connexió s'aprovaran automàticament sense requerir la teva interacció"; +App::$strings["Channel Settings"] = "Configuració de canal"; +App::$strings["Basic Settings"] = "Configuració bàsica"; App::$strings["Full Name:"] = "Nom Complet:"; App::$strings["Email Address:"] = "Adreça de E-Correu:"; App::$strings["Your Timezone:"] = "La teva Franja Horària"; @@ -707,11 +721,11 @@ App::$strings["Geographical location to display on your posts"] = "Posició geog App::$strings["Use Browser Location:"] = "Empra la Localització del Navegador:"; App::$strings["Adult Content"] = "Contingut per a Adults"; App::$strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Aquest canal publica freqúentment o amb regularitat contingut per a adults. (Si us plau, etiqueti qualsevol material per a adults amb #NSFW)"; -App::$strings["Security and Privacy Settings"] = "Ajustos de Seguretat i Privacitat"; +App::$strings["Security and Privacy Settings"] = "Configuració de seguretat i privacitat"; App::$strings["Your permissions are already configured. Click to view/adjust"] = "Els teus permisos estan configurats. Clic per veure/ajustar"; App::$strings["Hide my online presence"] = "Amaga la meva presencia en línia"; App::$strings["Prevents displaying in your profile that you are online"] = "Evita mostrar en el teu perfil, que estàs en línia"; -App::$strings["Simple Privacy Settings:"] = "Ajustos simples de privacitat:"; +App::$strings["Simple Privacy Settings:"] = "Configuració simple de privacitat:"; App::$strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Molt públic - <em>extremadament permissiu (s'ha d'anar en compte)</em>"; App::$strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "Normal - <em>públic per defecte, privat quan es desitgi (similar als permisos de xarxa social, però amb millor privacitat)"; App::$strings["Private - <em>default private, never open or public</em>"] = "Privat - <em>privat per defecte, mai públic o obert</em>"; @@ -727,12 +741,12 @@ App::$strings["The website limit takes precedence if lower than your limit."] = App::$strings["Maximum Friend Requests/Day:"] = "Nombre màxim de peticions d'amistat per dia"; App::$strings["May reduce spam activity"] = "Pot reduir l'SPAM"; App::$strings["Default Privacy Group"] = "Grup de privacitat per defecte"; -App::$strings["Use my default audience setting for the type of object published"] = "Empra els meus ajustos per defecte segons el tipus de entrada publicada"; +App::$strings["Use my default audience setting for the type of object published"] = "Empra la meva configuració d'audiència que hagi triat per al tipus d'entrada"; App::$strings["Profile to assign new connections"] = "Perfil al qual assignar les connexions noves"; App::$strings["Default Permissions Group"] = "Grup de permisos per defecte"; App::$strings["Maximum private messages per day from unknown people:"] = "Nombre màxim de missatges privats de desconeguts al dia:"; App::$strings["Useful to reduce spamming"] = "Útil per a reduir l'spam"; -App::$strings["Notification Settings"] = "Ajustos de notificacions"; +App::$strings["Notification Settings"] = "Configuració de notificacions"; App::$strings["By default post a status message when:"] = "Per defecte envia un missatge d'estat quan:"; App::$strings["accepting a friend request"] = "S'accepta una sol·licitud d'amistat"; App::$strings["joining a forum/community"] = "Apuntar-se a un fòrum o comunitat"; @@ -764,14 +778,15 @@ App::$strings["System Registrations"] = "Inscripcions del Sistema"; App::$strings["Unseen shared files"] = "Fitxers compartits nous"; App::$strings["Unseen public activity"] = "Activitat pública nova"; App::$strings["Unseen likes and dislikes"] = "\"M'agrada\" i \"no m'agrada\" pendents"; +App::$strings["Unseen forum posts"] = "Entrades de fòrum no llegides"; App::$strings["Email notification hub (hostname)"] = "Hub per a notificacions per correu (nom de domini)"; App::$strings["If your channel is mirrored to multiple hubs, set this to your preferred location. This will prevent duplicate email notifications. Example: %s"] = "En cas que el teu canal estigui repicat en diversos hubs, habilita aquesta opció al teu hub preferit. Això evita notificacions duplicades. Exemple: %s"; App::$strings["Show new wall posts, private messages and connections under Notices"] = "Mostra totes les novetats d'entrades de mur, missatges privats i connexions a Notícies"; App::$strings["Notify me of events this many days in advance"] = "Notifica'm dels esdeveniments amb aquests dies d'antelació"; App::$strings["Must be greater than 0"] = "Ha de ser més gran que 0"; -App::$strings["Advanced Account/Page Type Settings"] = "Ajustos avançats de compte i tipus de pàgina"; +App::$strings["Advanced Account/Page Type Settings"] = "Configuració avançada de compte i de tipus de pàgina"; App::$strings["Change the behaviour of this account for special situations"] = "Modifica el comportament d'aquest compte en situacions especials"; -App::$strings["Miscellaneous Settings"] = "Ajustos diversos"; +App::$strings["Miscellaneous Settings"] = "Configuració diversa"; App::$strings["Default photo upload folder"] = "Carpeta per defecte de fotos pujades"; App::$strings["%Y - current year, %m - current month"] = "%Y - any en curs, %m - mes corrent"; App::$strings["Default file upload folder"] = "Carpeta per defecte d'arxius pujats"; @@ -791,7 +806,7 @@ App::$strings["Guest Access Tokens"] = "Tokens d'accés de convidat"; App::$strings["Login Name"] = "Nom d'usuari"; App::$strings["Login Password"] = "Contrasenya d'usuari"; App::$strings["Expires (yyyy-mm-dd)"] = "Data de caducitat (aaaa-mm-dd)"; -App::$strings["Their Settings"] = "Els seus Ajustos"; +App::$strings["Their Settings"] = "La seva configuració"; App::$strings["Name and Secret are required"] = "Es necessiten el nom i el secret"; App::$strings["Add OAuth2 application"] = "Afegeix una aplicació OAuth2"; App::$strings["Name of application"] = "Nom de l'aplicatiu"; @@ -817,7 +832,7 @@ App::$strings["Passwords do not match. Password unchanged."] = "Les contrasenyes App::$strings["Empty passwords are not allowed. Password unchanged."] = "Les contrasenyes en blanc no estan permesas. Contrasenya sense canvis."; App::$strings["Password changed."] = "Contrasenya canviada."; App::$strings["Password update failed. Please try again."] = "L'actualització de la contrasenya va fallar. Si us plau, torneu a intentar-ho."; -App::$strings["Account Settings"] = "Ajustos de Compte"; +App::$strings["Account Settings"] = "Configuració del compte"; App::$strings["Current Password"] = "Contrasenya Actual"; App::$strings["Enter New Password"] = "Entra la Nova Contrasenya"; App::$strings["Confirm New Password"] = "Confirma la Nova Contrasenya"; @@ -834,11 +849,11 @@ App::$strings["Affinity Slider Settings"] = "Configuració de la barra d'afinita App::$strings["Addon Settings"] = "Configuració de les extensions"; App::$strings["Please save/submit changes to any panel before opening another."] = "Desa els canvis en un panell abans d'obrir-ne un altre."; App::$strings["%s - (Experimental)"] = "%s - (Experimental)"; -App::$strings["Display Settings"] = "Ajustos de Pantalla"; -App::$strings["Theme Settings"] = "Ajustos de Tema"; -App::$strings["Custom Theme Settings"] = "Ajustos Personals de Tema"; -App::$strings["Content Settings"] = "Ajustos de Contingut"; -App::$strings["Display Theme:"] = "Ajustos de Tema:"; +App::$strings["Display Settings"] = "Configuració de pantalla"; +App::$strings["Theme Settings"] = "Configuració de tema"; +App::$strings["Custom Theme Settings"] = "Configuració de temes personalitzats"; +App::$strings["Content Settings"] = "Configuració dels continguts"; +App::$strings["Display Theme:"] = "Tema de pantalla:"; App::$strings["Select scheme"] = "Tria esquema"; App::$strings["Preload images before rendering the page"] = "Precarrega les imatges abans de dibuixar la pàgina"; App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "El temps subjectiu per carregar la pàgina pot ser llarg però la pàgina estarà preparada quan es mostri"; @@ -899,10 +914,12 @@ App::$strings["Or provide the old server/hub details"] = "O proveeix els detalls App::$strings["Your old identity address (xyz@example.com)"] = "La teva adreça de canal antiga. El format és canal@exemple.org"; App::$strings["Your old login email address"] = "La teva adreça de correu electrònic antiga"; App::$strings["Your old login password"] = "La teva contrasenya antiga"; +App::$strings["Import a few months of posts if possible (limited by available memory"] = "Importa, si es possible, missatges de fa uns quants mesos (limitat per la memòria disponible) "; App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Per a qualsevol de les opcions, escull si vols fer primària l'adreça d'aquest node o mantenir l'anterior com a primària. Podràs penjar entrades des de totes dues adreces, però per als fitxers, imatges i altres en cal una de primària."; App::$strings["Make this hub my primary location"] = "Fes d'aquest node la meva ubicació primària"; App::$strings["Move this channel (disable all previous locations)"] = "Moure aquest canal (desactiva totes les prèvies localitzacions)"; -App::$strings["Import a few months of posts if possible (limited by available memory"] = "Importa, si es possible, missatges de fa uns quants mesos (limitat per la memòria disponible) "; +App::$strings["Use this channel nickname instead of the one provided"] = "Fes servir aquest nom de canal en comptes del que has facilitat"; +App::$strings["Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site."] = "Deixa-ho en blanc per a mantenir el teu nom de canal actual. Se t'assignarà un nom aleatori però similar a l'actual en cas que el nom actual ja estigui agafat en aquest node."; App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Aquest procès pot trigar minuts en completar. Si et plau envia el formulari només una vegada i manté aquesta pàgina oberta fins que finalitzi."; App::$strings["Authentication failed."] = "Ha fallat l'autentificació."; App::$strings["Remote Authentication"] = "Autentificació Remota"; @@ -959,10 +976,9 @@ App::$strings["Search your connections"] = "Cerca entre les teves connexions"; App::$strings["Connections search"] = "Cerca connexions"; App::$strings["Find"] = "Troba"; App::$strings["item"] = "element"; -App::$strings["Source of Item"] = "Origen de l'article"; -App::$strings["Bookmark added"] = "Favorit afegit"; -App::$strings["My Bookmarks"] = "Els Meus Favorits"; -App::$strings["My Connections Bookmarks"] = "Les connexions dels meus Favorits"; +App::$strings["Bookmark added"] = "S'ha afegit el marcador"; +App::$strings["My Bookmarks"] = "Els meus marcadors"; +App::$strings["My Connections Bookmarks"] = "Els marcadors de les meves connexions"; App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "L'esborrat de comptes no està permès fins que transcorren 48 hores des de l'últim canvi de contrasenya."; App::$strings["Remove This Account"] = "Esborra el compte"; App::$strings["This account and all its channels will be completely removed from the network. "] = "Aquest compte i tots els seus canals s'estan apunt d'esborrar totalment de la xarxa."; @@ -1104,6 +1120,8 @@ App::$strings["Unable to process image"] = "incapaç de processar la imatge"; App::$strings["Image upload failed."] = "La pujada de la imatge va fracassar."; App::$strings["Unable to process image."] = "Incapaç de processar l'imatge."; App::$strings["Photo not available."] = "Foto no disponible."; +App::$strings["Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile"] = "La teva foto de perfil predeterminada és pública i visible per a tothom. Les fotos de perfil dels perfils alternatius hereten els permisos del seu perfil."; +App::$strings["Your profile photo is visible to anybody on the internet and may be distributed to other websites."] = "La teva foto de perfil és pública i visible a tothom, i és probable que s'escampi per altres webs."; App::$strings["Upload File:"] = "Puja Arxiu:"; App::$strings["Select a profile:"] = "Tria un perfil:"; App::$strings["Use Photo for Profile"] = "Fes servir la foto per al perfil"; @@ -1131,6 +1149,8 @@ App::$strings["g A l F d"] = "g A l F d"; App::$strings["[today]"] = "[avui]"; App::$strings["posted an event"] = "enviat un esdeveniment"; App::$strings["shared a file with you"] = "ha compartit un fitxer amb tu"; +App::$strings["Private forum"] = "Fòrum privat"; +App::$strings["Public forum"] = "Fòrum públic"; App::$strings["Invalid item."] = "Article invàlid."; App::$strings["Page not found."] = "Pàgina no trobada."; App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; @@ -1143,7 +1163,7 @@ App::$strings["Could not access address book record."] = "No puc accedir al regi App::$strings["Refresh failed - channel is currently unavailable."] = "Ha fallat la recàrrega - el canal es actualment inaccesible."; App::$strings["Unable to set address book parameters."] = "No es poden ajustar els paràmetres dels contactes."; App::$strings["Connection has been removed."] = "S'han eliminat les conexions."; -App::$strings["View Profile"] = "Veure Perfil"; +App::$strings["View Profile"] = "Mostra el meu perfil"; App::$strings["View %s's profile"] = "Mostra el perfil de %s"; App::$strings["Refresh Permissions"] = "Recarrega els Permissos"; App::$strings["Fetch updated permissions"] = "Obté els permisos actualitzats"; @@ -1169,7 +1189,7 @@ App::$strings["Fetch Vcard"] = "Obté la targeta de contacte Vcard"; App::$strings["Fetch electronic calling card for this connection"] = "Obté la targeta de trucada electrònica d'aquesta connexió"; App::$strings["Open Individual Permissions section by default"] = "Obrir, per defecte, la secció de Permisos Individuals"; App::$strings["Affinity"] = "Afinitat"; -App::$strings["Open Set Affinity section by default"] = "Obrir, per defecte, la secció d'Ajustos d'Afinitat"; +App::$strings["Open Set Affinity section by default"] = "Obre per defecte la barra d'afinitat"; App::$strings["Me"] = "Jo"; App::$strings["Family"] = "Família"; App::$strings["Acquaintances"] = "Coneguts"; @@ -1189,7 +1209,6 @@ App::$strings["Connection: %s"] = "Connexió: %s"; App::$strings["Apply these permissions automatically"] = "Aplica aquests permissos automaticament"; App::$strings["Connection requests will be approved without your interaction"] = "Les peticions de connexió seran aprovades sense la teva interacció"; App::$strings["Permission role"] = "Permisos de rol"; -App::$strings["Loading"] = "S'està carregant"; App::$strings["Add permission role"] = "Afegir permisos de rol"; App::$strings["This connection's primary address is"] = "La primera adreça d'aqueste connexió es"; App::$strings["Available locations:"] = "Localització disponible:"; @@ -1201,12 +1220,11 @@ App::$strings["Slide to adjust your rating"] = "Llisca per ajustar la valoració App::$strings["Optionally explain your rating"] = "Opcionalment pots explicar la teva valoració"; App::$strings["Custom Filter"] = "Filtre a mida"; App::$strings["Only import posts with this text"] = "Importa exclusivament entrades amb aquest text"; -App::$strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "paraules una per línia o #etiquetes o /patrons/ o idioma=xx, deixar en blanc per importar totes les entrades"; App::$strings["Do not import posts with this text"] = "No importar entrades amb aquest text"; App::$strings["This information is public!"] = "Aquesta informació es pública!"; App::$strings["Connection Pending Approval"] = "Connexió Pendent d'Aprovació"; App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Tria el perfil que vols mostrar a %s quan es vegi el perfil segur."; -App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Alguns permisos poden ser heretats dels teus canals <a href=\"settings\"><strong>ajustos de privacitat</strong></a>, Els quals tenen més prioritat que els ajustos individuals. <strong>Pots</strong> canviar aquests ajustos aquí pero no tindran cap impacte fins que no canviis els ajustos heretats."; +App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Alguns permisos pot ser que vinguin heretats de la <a href=\"settings\"><strong>configuració de privacitat</strong></a>. del teu canal. Aquesta té més prioritat que les configuracions individuals. Pots canviar aquí aquests permisos però no tindran cap impacte mentre no canviï la configuració del teu canal."; App::$strings["Last update:"] = "Darrera actualització:"; App::$strings["Details"] = "Detalls"; App::$strings["Room not found"] = "No s'ha trobat la sala"; @@ -1214,7 +1232,7 @@ App::$strings["Leave Room"] = "Abandona la sala"; App::$strings["Delete Room"] = "Esborra Sala"; App::$strings["I am away right now"] = "Absent"; App::$strings["I am online"] = "Estic connectat/da"; -App::$strings["Bookmark this room"] = "Fes favorit aquest xat"; +App::$strings["Bookmark this room"] = "Desa aquesta sala"; App::$strings["Please enter a link URL:"] = "Si us plau entra l'enllaç URL:"; App::$strings["Encrypt text"] = "Text encriptat"; App::$strings["New Chatroom"] = "Nova sala per a Xerrar"; @@ -1232,8 +1250,8 @@ App::$strings["Menu Name"] = "Nom del menú"; App::$strings["Unique name (not visible on webpage) - required"] = "Nom únic (no visible a la pàgina web) - requerit"; App::$strings["Menu Title"] = "Títol del menú"; App::$strings["Visible on webpage - leave empty for no title"] = "Visible a la pàgina web - deixar buit per a no posar títol"; -App::$strings["Allow Bookmarks"] = "Permetre Marcadors"; -App::$strings["Menu may be used to store saved bookmarks"] = "El menú es pot emprar per a guardar marcadors"; +App::$strings["Allow Bookmarks"] = "Activa els marcadors"; +App::$strings["Menu may be used to store saved bookmarks"] = "El menú es pot emprar per a desar marcadors"; App::$strings["Submit and proceed"] = "Envia i procedeix"; App::$strings["Menus"] = "Menús"; App::$strings["Bookmarks allowed"] = "Marcadors permesos"; @@ -1247,7 +1265,7 @@ App::$strings["Menu name"] = "Nom del Menú"; App::$strings["Must be unique, only seen by you"] = "Ha de ser únic, nomes vist per tú"; App::$strings["Menu title"] = "Títol del menú"; App::$strings["Menu title as seen by others"] = "Títol del menú vist pels altres"; -App::$strings["Allow bookmarks"] = "Marcadors permesos"; +App::$strings["Allow bookmarks"] = "Activa els marcadors"; App::$strings["Layouts"] = "Dissenys"; App::$strings["Help"] = "Ajuda"; App::$strings["Comanche page description language help"] = "Pgina d'ajuda del llenguatge Comanche"; @@ -1266,27 +1284,30 @@ App::$strings["comment"] = "comentari"; App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetat %3\$s de %2\$s amb %4\$s"; App::$strings["This setting requires special processing and editing has been blocked."] = "Aquest ajust requereix un procés espedial i l'edició esta bloquejada."; App::$strings["Configuration Editor"] = "Editor de Configuració"; -App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "atenció: Realitzar segons quins ajustos pot fer el canal inoperable. Deixa aquesta pàgina si no estas segur i tens suficients coneixements sobre l'ús correcte d'aquesta característica."; -App::$strings["If enabled, connection requests will be approved without your interaction"] = "Si s'habilita, les soŀlicituds de connexió s'aprovaran automàticament sense requerir la teva interacció"; +App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Alerta: segons quines combinacions podrien deixar el teu canal inusable. No és recomanable canviar aquesta configuració si no ets sents còmode/ i segur/a de com fer servir aquesta funcionalitat."; App::$strings["Automatic approval settings"] = "Aprovació automàtica de soŀlicituds de connexió"; App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = "El valor per defecte dels permisos individuals poden tenir valors per defecte segons el tipus de canal i les opcions de privacitat. Pot ser que no estiguis autoritzat/da a modificar-los."; App::$strings["Unknown App"] = "No es coneix l'aplicació"; App::$strings["Authorize"] = "Autoritza"; App::$strings["Do you authorize the app %s to access your channel data?"] = "Vols autoritzar l'aplicació %s a accedir a les dades del teu canal?"; App::$strings["Allow"] = "Permet-ho"; -App::$strings["Privacy group created."] = "Creat grup privat."; -App::$strings["Could not create privacy group."] = "No es pot crear el grup privat."; -App::$strings["Privacy group not found."] = "No es troben grups privats."; -App::$strings["Privacy group updated."] = "Grup privat actualitzat."; -App::$strings["Create a group of channels."] = "Crear un grup de canals."; -App::$strings["Privacy group name: "] = "Nom del grup privat:"; +App::$strings["Privacy group created."] = "S'ha creat el grup de privacitat."; +App::$strings["Could not create privacy group."] = "No s'ha pogut crear el grup de privacitat."; +App::$strings["Privacy group not found."] = "No s'ha trobat el grup de privacitat."; +App::$strings["Privacy group updated."] = "S'ha actualitzat el grup de privacitat."; +App::$strings["Privacy Groups"] = "Grup de privacitat"; +App::$strings["Add Group"] = "Afegeix un grup"; +App::$strings["Privacy group name"] = "Nom del grup de privacitat"; App::$strings["Members are visible to other channels"] = "Els membres son visibles en altres canals"; -App::$strings["Privacy group removed."] = "Grup privat eliminat."; -App::$strings["Unable to remove privacy group."] = "No puc eliminar el grup privat."; -App::$strings["Privacy group editor"] = "Editor del grup privat"; App::$strings["Members"] = "Membres"; -App::$strings["All Connected Channels"] = "Tots els Canals Connectats"; -App::$strings["Click on a channel to add or remove."] = "Clic sobre el canal per afegir o esborrar."; +App::$strings["Privacy group removed."] = "S'ha esborrat el grup de privacitat."; +App::$strings["Unable to remove privacy group."] = "No s'ha pogut esborrar el grup de privacitat."; +App::$strings["Privacy Group: %s"] = "Grup de privacitat: %s"; +App::$strings["Privacy group name: "] = "Nom del grup de privacitat:"; +App::$strings["Delete Group"] = "Esborra el grup"; +App::$strings["Group members"] = "Membres del grup"; +App::$strings["Not in this group"] = "No hi són al grup"; +App::$strings["Click a channel to toggle membership"] = "Fes clic a un canal per a ficar-lo o treure'l del grup"; App::$strings["Profile not found."] = "Perfil no trobat."; App::$strings["Profile deleted."] = "Perfil eliminat."; App::$strings["Profile-"] = "Perfil-"; @@ -1307,13 +1328,13 @@ App::$strings["Homepage"] = "Pàgina Personal"; App::$strings["Interests"] = "Interessos"; App::$strings["Profile updated."] = "Perfil actualitzat."; App::$strings["Hide your connections list from viewers of this profile"] = "Amaga dels curiosos la teva llista de connexions d'aquest perfil"; -App::$strings["Edit Profile Details"] = "Edita els Detalls del Perfil"; -App::$strings["View this profile"] = "Veure aquest perfil"; +App::$strings["Edit Profile Details"] = "Modifica els detalls de perfil"; +App::$strings["View this profile"] = "Mostra aquest perfil"; App::$strings["Edit visibility"] = "Editar visibilitat"; App::$strings["Profile Tools"] = "Eines per Perfils"; App::$strings["Change cover photo"] = "Canviar la foto de portada"; App::$strings["Change profile photo"] = "Canviar la foto del perfil"; -App::$strings["Create a new profile using these settings"] = "Crea un perfil nou amb aquests ajustos"; +App::$strings["Create a new profile using these settings"] = "Crea un perfil nou amb aquesta configuració"; App::$strings["Clone this profile"] = "Clonar aquest perfil"; App::$strings["Delete this profile"] = "Elimina aquest perfil"; App::$strings["Add profile things"] = "Afegeix coses al perfil"; @@ -1354,14 +1375,14 @@ App::$strings["Contact information and social networks"] = "Informació de conta App::$strings["My other channels"] = "Els meus altres canals"; App::$strings["Communications"] = "Comunicacions"; App::$strings["Profile Image"] = "Imatge del Perfil"; -App::$strings["Edit Profiles"] = "Editar Perfils"; +App::$strings["Edit Profiles"] = "Modifica els perfils"; App::$strings["This page is available only to site members"] = "Aquesta pàgina només és accessible per als membres del node."; App::$strings["Welcome"] = "Benvingut/da"; App::$strings["What would you like to do?"] = "Què t'agradaria fer?"; App::$strings["Please bookmark this page if you would like to return to it in the future"] = "Marca aquesta pàgina si vols tornar-hi en un futur"; App::$strings["Upload a profile photo"] = "Puja una imatge de perfil"; App::$strings["Upload a cover photo"] = "Puja una imatge de portada"; -App::$strings["Edit your default profile"] = "Modifica el teu perfil"; +App::$strings["Edit your default profile"] = "Modifica el teu perfil per defecte"; App::$strings["View friend suggestions"] = "Mostra suggerències de connexions"; App::$strings["View the channel directory"] = "Mostra el directori del canal"; App::$strings["View/edit your channel settings"] = "Mostra o modifica la configuració del teu canal"; @@ -1373,7 +1394,7 @@ App::$strings["View the public stream. Warning: this content is not moderated"] App::$strings["Page link"] = "Enllaç de la pàgina"; App::$strings["Edit Webpage"] = "Edita la Pàgina Web"; App::$strings["Create a new channel"] = "Crear un nou canal"; -App::$strings["Channel Manager"] = "Gestor de Canals"; +App::$strings["Channel Manager"] = "Gestor de canals"; App::$strings["Current Channel"] = "Canal Actual"; App::$strings["Switch to one of your channels by selecting it."] = "Canviar a un altre dels teus canals seleccionant-ho."; App::$strings["Default Channel"] = "Canal per Defecte"; @@ -1391,6 +1412,7 @@ App::$strings["Terms of Service"] = "Condicions del Servei"; App::$strings["Software and Project information"] = "Informació del programari i del projecte"; App::$strings["This site is powered by \$Projectname"] = "Aquest lloc web funciona amb \$Projectname"; App::$strings["Federated and decentralised networking and identity services provided by Zot"] = "Els serveis d'identitat i la federació i descentralització de la xarxa funcionen amb Zot"; +App::$strings["Additional federated transport protocols:"] = "Altres protocols de transport federats:"; App::$strings["Version %s"] = "Versió %s"; App::$strings["Project homepage"] = "Pàgina principal del projecte"; App::$strings["Developer homepage"] = "Pàgina principal de desenvolupament"; @@ -1444,11 +1466,13 @@ App::$strings["*"] = "*"; App::$strings["Channel Sources"] = "Canal Origen"; App::$strings["Manage remote sources of content for your channel."] = "Gestiona contingut per al teu canal d'origens remots"; App::$strings["New Source"] = "Nou Origen"; -App::$strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importar tot o sel·lecciona contingut dels següents canals, en aquest canal i distribueix-lo d'acord als teus ajustos de canals."; +App::$strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importa-ho tot o només allò seleccionat del següent canals, cap a aquest canal, i distribueix-lo d'acord a la configuració del teu canal."; App::$strings["Only import content with these words (one per line)"] = "Només importa contingut amb aquestes paraules (una per línia)"; App::$strings["Leave blank to import all public content"] = "Deixar en blanc per importar tot el contingut públic"; App::$strings["Channel Name"] = "Nom del canal"; App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "Afegeix les següents categories d'entrades importades des d'aquest origen (separat per comes)"; +App::$strings["Resend posts with this channel as author"] = "Reenvia les entrades que tinguin aquest canal com a autor/a"; +App::$strings["Copyrights may apply"] = "Poden aplicar drets d'autor"; App::$strings["Source not found."] = "No s'ha trobat la font."; App::$strings["Edit Source"] = "Edita la font"; App::$strings["Delete Source"] = "Esborra la font"; @@ -1547,9 +1571,9 @@ App::$strings["menu"] = "menú"; App::$strings["%s element installed"] = "%s element instal·lat"; App::$strings["%s element installation failed"] = "%s instal·lació d'element va fallar"; App::$strings["Select a bookmark folder"] = "Tria una carpeta d'interès"; -App::$strings["Save Bookmark"] = "Guarda Favorits"; -App::$strings["URL of bookmark"] = "URL de favorit"; -App::$strings["Or enter new bookmark folder name"] = "O entra un nou nom de favorit"; +App::$strings["Save Bookmark"] = "Desa el marcadors"; +App::$strings["URL of bookmark"] = "URL del marcador"; +App::$strings["Or enter new bookmark folder name"] = "O introdueix el nom d'una carpeta de marcadors nova"; App::$strings["Enter a folder name"] = "Escriu el nom de la carpeta"; App::$strings["or select an existing folder (doubleclick)"] = "o escull-ne una d'existent amb doble clic"; App::$strings["Save to Folder"] = "Guardar en la Carpeta"; @@ -1564,6 +1588,7 @@ App::$strings["Your registration can not be processed."] = "La teva inscripció App::$strings["Registration on this hub is disabled."] = "L'inscripció en aquest node està deshabilitat."; App::$strings["Registration on this hub is by approval only."] = "L'inscripció en aquest node es únicament per validació."; App::$strings["<a href=\"pubsites\">Register at another affiliated hub.</a>"] = "<a href=\"pubsites\">Inscripció en altre node afiliat</a>"; +App::$strings["Registration on this hub is by invitation only."] = "El registre en aquest node funciona per invitació."; App::$strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "El lloc ha excedit el límit màxim diari de nous comptes/inscripció. Provau demà."; App::$strings["I accept the %s for this website"] = "Accepto el %s per a aquest lloc web"; App::$strings["I am over %s years of age and accept the %s for this website"] = "Tinc més de %s anys i accepto les %s"; @@ -1571,9 +1596,12 @@ App::$strings["Your email address"] = "La teva adreça de correu electrónic"; App::$strings["Choose a password"] = "Tria una contrasenya"; App::$strings["Please re-enter your password"] = "Si et plau, re-entra la contrasenya"; App::$strings["Please enter your invitation code"] = "Si et plau, introdueix el teu codi d'invitació"; +App::$strings["Your Name"] = "El teu nom"; +App::$strings["Real names are preferred."] = "Considera de fer servir el teu nom real."; +App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "El teu àlies servirà per crear un nom fàcil per recordar l'adreça del canal. Per exemple, àlies%s"; +App::$strings["Select a channel permission role for your usage needs and privacy requirements."] = "Escull un rol de permisos de canal. Tingues en compte l'ús que en faràs i el nivell de privacitat que desitges."; App::$strings["no"] = "no"; App::$strings["yes"] = "sí"; -App::$strings["Membership on this site is by invitation only."] = "La pertinença en aquest lloc es per invitació exclusivament."; App::$strings["Register"] = "Inscripció"; App::$strings["This site requires email verification. After completing this form, please check your email for further instructions."] = "Aquest node demana que es verifiquin els comptes de correu. Un cop completat el formulari, comprova la teva safata d'entrada i segueix les instruccions que hi trobaràs."; App::$strings["Cover Photos"] = "Fotos de Portada"; @@ -1583,6 +1611,7 @@ App::$strings["male"] = "masculí"; App::$strings["%1\$s updated his %2\$s"] = "%1\$s actualitzà el seu %2\$s"; App::$strings["%1\$s updated their %2\$s"] = "%1\$s actualitzà els seus %2\$s"; App::$strings["cover photo"] = "Foto de la portada"; +App::$strings["Your cover photo may be visible to anybody on the internet"] = "La teva foto de portada és pública i visible a tothom."; App::$strings["Change Cover Photo"] = "Canvia la foto de portada"; App::$strings["Documentation Search"] = "Cerca de Documentació"; App::$strings["About"] = "El Meu Perfil"; @@ -1598,11 +1627,8 @@ App::$strings["Remove Item Tag"] = "Elimina l'etiqueta d'element"; App::$strings["Select a tag to remove: "] = "Tria l'etiqueta a eliminar:"; App::$strings["No such group"] = "No existeix el grup"; App::$strings["No such channel"] = "No existeix el canal"; -App::$strings["forum"] = "fòrum"; -App::$strings["Search Results For:"] = "Cerca resultats per:"; -App::$strings["Privacy group is empty"] = "el grup privat està vuit"; -App::$strings["Privacy group: "] = "Grup privat:"; -App::$strings["Invalid connection."] = "La connexió és invàlida."; +App::$strings["Privacy group is empty"] = "El grup de privacitat està buit"; +App::$strings["Privacy group: "] = "Grup de privacitat:"; App::$strings["Invalid channel."] = "El canal no és vàlid."; App::$strings["network"] = "xarxa"; App::$strings["\$Projectname"] = "\$Projectname"; @@ -1636,7 +1662,7 @@ App::$strings["Summary"] = "Sumari"; App::$strings["Registered accounts"] = "Comptes registrades"; App::$strings["Pending registrations"] = "Comptes pendents d'inscripció"; App::$strings["Registered channels"] = "Canals registrats"; -App::$strings["Active plugins"] = "Extensions actives"; +App::$strings["Active addons"] = "Extensions actives"; App::$strings["Version"] = "Versió"; App::$strings["Repository version (master)"] = "Versió (master) del repositori"; App::$strings["Repository version (dev)"] = "Versió (desenvolupament) del repositori"; @@ -1670,9 +1696,8 @@ App::$strings["4. Expert - I can write computer code"] = "4. Expert - puc escriu App::$strings["5. Wizard - I probably know more than you do"] = "5. Ninja - probablement en sé més que tu"; App::$strings["Site Admin"] = "Administració"; App::$strings["Report Bug"] = "Informa d'errors"; -App::$strings["View Bookmarks"] = "Veure Marcadors"; +App::$strings["View Bookmarks"] = "Marcadors"; App::$strings["My Chatrooms"] = "Les meves Sales de Xat"; -App::$strings["Firefox Share"] = "Compartir amb Firefox"; App::$strings["Remote Diagnostics"] = "Diagnòstics Remots"; App::$strings["Suggest Channels"] = "Suggerir Canals"; App::$strings["Login"] = "Identifica't"; @@ -1729,7 +1754,7 @@ App::$strings["This is your default setting for the audience of your normal stre App::$strings["This is your default setting for who can view your default channel profile"] = "Aquesta és la configuració per defecte per a qui pugui veure el teu perfil per defecte del canal"; App::$strings["This is your default setting for who can view your connections"] = "Aquesta és la configuració per defecte per a qui pugui veure les teves connexions"; App::$strings["This is your default setting for who can view your file storage and photos"] = "Aquesta és la configuració per defecte per a qui pugui veure els teus arxius i fotos"; -App::$strings["This is your default setting for the audience of your webpages"] = "Aquests son els ajustos per defecte de l'audiència de les teves pàgines web"; +App::$strings["This is your default setting for the audience of your webpages"] = "Aquesta és la teva configuració per defecte per l'audiència de les teves pàgines web"; App::$strings["Missing room name"] = "Perdut el nom de la sala"; App::$strings["Duplicate room name"] = "Nom de la sala duplicat"; App::$strings["Invalid room specifier."] = "Especificació de la sala invàlida."; @@ -1795,6 +1820,7 @@ App::$strings["Wiki files deleted successfully"] = "S'han esborrat els fitxers d App::$strings["Update Error at %s"] = "Error d'Actualització a %s"; App::$strings["Update %s failed. See error logs."] = "L'actualització %s ha fallat. Mira el registre d'errors."; App::$strings["Private Message"] = "Missatge Privat"; +App::$strings["Admin Delete"] = "Esborrat amb privilegis d'administració"; App::$strings["Select"] = "Selecciona"; App::$strings["I will attend"] = "Assistiré"; App::$strings["I will not attend"] = "No assistiré"; @@ -1802,10 +1828,7 @@ App::$strings["I might attend"] = "Podria assistir"; App::$strings["I agree"] = "D'acord"; App::$strings["I disagree"] = "En desacord"; App::$strings["I abstain"] = "M'abstinc"; -App::$strings["Add Star"] = "Fes-lo Preferit"; -App::$strings["Remove Star"] = "Treu-lo de Preferits"; App::$strings["Toggle Star Status"] = "Canvia el Estat de la Preferència"; -App::$strings["starred"] = "preferit"; App::$strings["Message signature validated"] = "Validada la signatura del missatge"; App::$strings["Message signature incorrect"] = "Signatura del missatge incorrecta"; App::$strings["Add Tag"] = "Afegeix Etiqueta"; @@ -1818,7 +1841,7 @@ App::$strings["%d comment"] = array( 0 => "%d commentari", 1 => "%d commentaris", ); -App::$strings["View %s's profile - %s"] = "Veure perfil de %s - %s"; +App::$strings["View %s's profile - %s"] = "Mostra el perfil de %s - %s"; App::$strings["to"] = "a"; App::$strings["via"] = "via"; App::$strings["Wall-to-Wall"] = "Mur-a-Mur"; @@ -1830,7 +1853,7 @@ App::$strings["Attend"] = "Assistir-hi"; App::$strings["Attendance Options"] = "Opcions d'assistència"; App::$strings["Vote"] = "Votar"; App::$strings["Voting Options"] = "Opcions de votació"; -App::$strings["Save Bookmarks"] = "Guarda Favorits"; +App::$strings["Save Bookmarks"] = "Desa els marcadors"; App::$strings["Add to Calendar"] = "Afegeix al Calendari"; App::$strings["This is an unsaved preview"] = "Això només és una vista prèvia, no està desada"; App::$strings["%s show all"] = "%s mostra-ho tot"; @@ -1840,7 +1863,7 @@ App::$strings["Underline"] = "Subratllat"; App::$strings["Quote"] = "Cometes"; App::$strings["Code"] = "Codi"; App::$strings["Image"] = "Imatge"; -App::$strings["Attach File"] = "Adjunta un fitxer"; +App::$strings["Attach/Upload file"] = "Adjunta i puja un arxiu"; App::$strings["Insert Link"] = "Insereix Enllaç"; App::$strings["Video"] = "Video"; App::$strings["Your full name (required)"] = "Nom complet (obligatori)"; @@ -1903,6 +1926,21 @@ App::$strings["Rating Tools"] = "Eines de Valoració"; App::$strings["Rate Me"] = "Valora'm"; App::$strings["View Ratings"] = "Veure Valoracions"; App::$strings["__ctx:widget__ Activity"] = "Activitat"; +App::$strings["Personal Posts"] = "Entrades personals"; +App::$strings["Show posts that mention or involve me"] = "Mostra les entrades que m'inclouen"; +App::$strings["Starred Posts"] = "Entrades destacades"; +App::$strings["Show posts that I have starred"] = "Mostra les entrades que he destacat"; +App::$strings["Show posts related to the %s privacy group"] = "Mostra les entrades relacionades amb el grup de privacitat %s"; +App::$strings["Show my privacy groups"] = "Mostra els meus grups de privacitat"; +App::$strings["Show posts to this forum"] = "Mostra les entrades a aquest fòrum"; +App::$strings["Show forums"] = "Mostra els fòrums"; +App::$strings["Show posts that I have filed to %s"] = "Mostra les entrades que he penjat a %s"; +App::$strings["Saved Folders"] = "Carpetes Guardades"; +App::$strings["Show filed post categories"] = "Mostra les categories de les entrades pujades"; +App::$strings["Panel search"] = "Panell de cerca"; +App::$strings["Filter by name"] = "Filtra per nom"; +App::$strings["Remove active filter"] = "Esborra el filtre actual"; +App::$strings["Activity Filters"] = "Filtres d'activitat"; App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Tens %1$.0f de %2$.0f connexions permeses."; App::$strings["Add New Connection"] = "Afegeix una Nova Connexió"; App::$strings["Enter channel address"] = "Introdueix l'adreça del canal"; @@ -1927,13 +1965,22 @@ App::$strings["Refresh"] = "Refresc"; App::$strings["Tasks"] = "Tasques"; App::$strings["Suggestions"] = "Suggerencies"; App::$strings["See more..."] = "Veure més....."; -App::$strings["Saved Folders"] = "Carpetes Guardades"; +App::$strings["Commented Date"] = "Data dels comentaris"; +App::$strings["Order by last commented date"] = "Ordena segons la data dels comentaris més recents"; +App::$strings["Posted Date"] = "Data de les entrades"; +App::$strings["Order by last posted date"] = "Ordena segons la data de publicació de les entrades"; +App::$strings["Date Unthreaded"] = "Data sense agrupar"; +App::$strings["Order unthreaded by date"] = "Ordena per data els comentaris i les publicacions sense agrupar-los per converses"; +App::$strings["Activity Order"] = "Ordre de les activitats"; App::$strings["Click to show more"] = "Fes clic per veure més"; App::$strings["Tags"] = "Etiquetes"; +App::$strings["App Collections"] = "Coŀleccions d'aplicacions"; +App::$strings["Available Apps"] = "Aplicacions disponibles"; +App::$strings["Installed apps"] = "Aplicacions instaŀlades"; App::$strings["Profile Creation"] = "Creació de perfils"; App::$strings["Upload profile photo"] = "Puja una foto de perfil"; App::$strings["Upload cover photo"] = "Puja una foto de portada"; -App::$strings["Edit your profile"] = "Edita el teu perfil"; +App::$strings["Edit your profile"] = "Modifica el teu perfil"; App::$strings["Find and Connect with others"] = "Cerca altres canals i connecta-t'hi"; App::$strings["View the directory"] = "Mostra la carpeta"; App::$strings["Manage your connections"] = "Gestiona les teves conexions"; @@ -1946,26 +1993,24 @@ App::$strings["New Member Links"] = "Enllaços de membres nous"; App::$strings["Member registrations waiting for confirmation"] = "Una inscripció per a ser membre està esperant confirmació"; App::$strings["Inspect queue"] = "Revisa cua"; App::$strings["DB updates"] = "Actualitzacions de Base de Dades"; -App::$strings["Admin"] = "Admin"; -App::$strings["Plugin Features"] = "Extensions configurables"; -App::$strings["Account settings"] = "Ajustos de Compte"; -App::$strings["Channel settings"] = "Ajustos de Canal"; +App::$strings["Admin"] = "Administració"; +App::$strings["Addon Features"] = "Funcions de les extensions"; +App::$strings["Account settings"] = "Configuració del compte"; +App::$strings["Channel settings"] = "Configuració del canal"; App::$strings["Additional features"] = "Característiques addicionals"; App::$strings["Addon settings"] = "Configuració de les extensions"; -App::$strings["Display settings"] = "Ajustos de pantalla"; +App::$strings["Display settings"] = "Configuració de pantalla"; App::$strings["Manage locations"] = "Gestiona ubicacions"; App::$strings["Export channel"] = "Exportat canal"; App::$strings["OAuth1 apps"] = "Aplicacions OAuth1"; App::$strings["OAuth2 apps"] = "Aplicacions OAuth2"; -App::$strings["Permission Groups"] = "Grups de permisos"; -App::$strings["Premium Channel Settings"] = "Ajustos Premium de Canal"; -App::$strings["Bookmarked Chatrooms"] = "Sales de Xat Favorites"; +App::$strings["Premium Channel Settings"] = "Configuració dels canals prèmium"; +App::$strings["Bookmarked Chatrooms"] = "Sales de xat desades"; App::$strings["New Network Activity"] = "Activitat nova a la xarxa"; App::$strings["New Network Activity Notifications"] = "Notificacions noves d'activitat a la xarxa"; App::$strings["View your network activity"] = "Mostra l'activitat a la xarxa"; App::$strings["Mark all notifications read"] = "Marca totes les notificacions com a vistes"; App::$strings["Show new posts only"] = "Mostra només les entrades noves"; -App::$strings["Filter by name"] = "Filtra per nom"; App::$strings["New Home Activity"] = "Activitat nova al mur"; App::$strings["New Home Activity Notifications"] = "Notificacions noves d'activitat al mur"; App::$strings["View your home activity"] = "Mostra l'activitat al teu mur"; @@ -1992,7 +2037,7 @@ App::$strings["View the public stream"] = "Mostra el flux públic"; App::$strings["Sorry, you have got no notifications at the moment"] = "No tens cap notificació"; App::$strings["Source channel not found."] = "No s'ha trobat el canal font."; App::$strings["Create an account to access services and applications"] = "Crea un compte per tal d'accedir a serveis i aplicacions"; -App::$strings["Logout"] = "Desconectar"; +App::$strings["Logout"] = "Surt"; App::$strings["Login/Email"] = "Correu d'usuari"; App::$strings["Password"] = "Contrasenya"; App::$strings["Remember me"] = "Recorda'm"; @@ -2002,9 +2047,8 @@ App::$strings["Website SSL certificate is not valid. Please correct."] = "El cer App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Les tasques del cron tasks no s'estan executant a %s"; App::$strings["Cron/Scheduled tasks not running."] = "No s'estan executant les tasques programades al cron."; App::$strings["never"] = "mai"; -App::$strings["Cover Photo"] = "Foto de portada"; App::$strings["Focus (Hubzilla default)"] = "Focus (Hubzilla per defecte)"; -App::$strings["Theme settings"] = "Ajustos de tema"; +App::$strings["Theme settings"] = "Configuració de tema"; App::$strings["Narrow navbar"] = "Barra de navegació estreta"; App::$strings["Navigation bar background color"] = "Color de fons de la barra de navegació"; App::$strings["Navigation bar icon color "] = "Color de la icona de la barra de navegació"; @@ -2026,6 +2070,12 @@ App::$strings["Leave empty for default width"] = "Deixa en blanc per l'amplada p App::$strings["Left align page content"] = "Alineació esquerra del contingut de la pàgina"; App::$strings["Set size of conversation author photo"] = "Ajusta la mida de la foto del autor a la conversa"; App::$strings["Set size of followup author photos"] = "Ajusta la mida del seguidor de les fotos de l'autor"; +App::$strings["Network/Protocol"] = "Xarxa/protocol"; +App::$strings["Zot"] = "Zot"; +App::$strings["Diaspora"] = "Diaspora"; +App::$strings["Friendica"] = "Friendica"; +App::$strings["OStatus"] = "OStatus"; +App::$strings["ActivityPub"] = "ActivityPub"; App::$strings["Errors encountered deleting database table "] = "S'ha produït un o més errors en esborrar una taula de la base de dades"; App::$strings["Submit Settings"] = "Desa els canvis"; App::$strings["Drop tables when uninstalling?"] = "Vols eliminar les taules en desinstaŀlar?"; @@ -2072,7 +2122,7 @@ App::$strings["Default Search Term"] = "Paraula de cerca predeterminada"; App::$strings["The default search term. These will be shown second."] = "La paraula de cerca predeterminada. Aquestes es mostraran en segon lloc."; App::$strings["Return After"] = "Acaba després de"; App::$strings["Page to load after image selection."] = "Pàgina per carregar després d'haver seleccionat una imatge."; -App::$strings["Edit Profile"] = "Edita Perfil"; +App::$strings["Edit Profile"] = "Modifica el meu perfil"; App::$strings["Profile List"] = "Llista de perfils"; App::$strings["Order of Preferred"] = "Ordre de les preferides"; App::$strings["Sort order of preferred clipart ids."] = "Ordena les identitats Clipart preferides"; @@ -2164,6 +2214,8 @@ App::$strings["Popular Channels"] = "Canals populars"; App::$strings["IRC Settings"] = "Paràmetres de IRC"; App::$strings["IRC settings saved."] = "S'han actualitzat els paràmetres de IRC."; App::$strings["IRC Chatroom"] = "Sala de IRC"; +App::$strings["Gallery"] = "Galeria"; +App::$strings["Photo Gallery"] = "Galeria d'imatges"; App::$strings["Post to LiveJournal"] = "Publica a LiveJournal"; App::$strings["Enable LiveJournal Post Plugin"] = "Habilita la publicació a LiveJournal"; App::$strings["LiveJournal username"] = "Nom a LiveJournal"; @@ -2358,10 +2410,11 @@ App::$strings["This will import all your Friendica photo albums to this Red chan App::$strings["Friendica Server base URL"] = "URL base del servidor de Friendica"; App::$strings["Friendica Login Username"] = "Nom de registre a Friendica"; App::$strings["Friendica Login Password"] = "Contrasenya a Friendica"; -App::$strings["ActivityPub"] = "ActivityPub"; App::$strings["ActivityPub Protocol Settings updated."] = "S'ha actualitzat la configuració del Protocol ActivityPub."; App::$strings["The ActivityPub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "El Protocol ActivityPub és incompatible amb la independència de hub. Les connexions que facis en aquesta xarxa no seran accessibles des de hubs alternatius del teu canal."; App::$strings["Enable the ActivityPub protocol for this channel"] = "Activa el Protocol ActivityPub en aquest canal"; +App::$strings["Deliver to ActivityPub recipients in privacy groups"] = "Envia a identitats d'ActivityPub en grups de privacitat"; +App::$strings["May result in a large number of mentions and expose all the members of your privacy group"] = "Pot comportar moltes mencions i revelar els teus grups de privacitat."; App::$strings["Send multi-media HTML articles"] = "Envia articles HTML multimèdia"; App::$strings["Not supported by some microblog services such as Mastodon"] = "Incompatible amb alguns serveis de microbloguing com Mastodon"; App::$strings["ActivityPub Protocol Settings"] = "Configuració del Protocol ActivityPub"; @@ -2469,21 +2522,51 @@ App::$strings["Twitter Post Settings"] = "Configuració de Twitter"; App::$strings["Deactivate the feature"] = "Desactiva la funcionalitat"; App::$strings["Hide the button and show the smilies directly."] = "Amaga el botó i mostra les icones directament."; App::$strings["Smileybutton Settings"] = "Configuració de Smileybutton"; +App::$strings["Access Denied."] = "S'ha denegat l'accés."; App::$strings["Order Not Found"] = "No s'ha trobat l'ordre"; -App::$strings["Order cannot be checked out."] = "No s'ha pogut confirmar l'ordre."; +App::$strings["Access Denied"] = "S'ha denegat l'accés"; +App::$strings["Invalid Item"] = "L'article és invàlid"; +App::$strings["[cart] Item Added"] = "[cart] S'ha afegit un article"; +App::$strings["Order already checked out."] = "La comanda ja s'ha servit."; App::$strings["Enable Shopping Cart"] = "Habilita la cistella de la compra"; App::$strings["Enable Test Catalog"] = "Habilita un catàleg de prova"; App::$strings["Enable Manual Payments"] = "Habilita els pagaments manuals"; -App::$strings["Base Cart Settings"] = "Configuració bàsica de la cistella"; -App::$strings["Add Item"] = "Afegeix un element"; -App::$strings["Call cart_post_"] = "Crida cart_post_"; +App::$strings["Base Merchant Currency"] = "Moneda base del comerç"; +App::$strings["Cart - Base Settings"] = "Carretó - Configuració bàsica"; +App::$strings["Shop"] = "Botiga"; +App::$strings["You must be logged into the Grid to shop."] = "Cal haver iniciat sessió per a poder comprar."; App::$strings["Cart Not Enabled (profile: "] = "La cistella no està habilitada (perfil:"; App::$strings["Order not found."] = "No s'ha trobat l'ordre."; +App::$strings["Access denied."] = "S'ha denegat l'accés."; App::$strings["No Order Found"] = "No s'ha trobat cap ordre"; -App::$strings["call: "] = "crida:"; App::$strings["An unknown error has occurred Please start again."] = "S'ha produït un error inesperat. Torna-ho a provar."; App::$strings["Invalid Payment Type. Please start again."] = "El tipus de pagament no és vàlid. Torna a començar."; App::$strings["Order not found"] = "No s'ha trobat l'ordre"; +App::$strings["Enable Paypal Button Module"] = "Activa el mòdul del botó de Paypal"; +App::$strings["Use Production Key"] = "Fes servir la clau de producció"; +App::$strings["Paypal Sandbox Client Key"] = "Clau de client de Paypal del banc de proves"; +App::$strings["Paypal Sandbox Secret Key"] = "Clau secreta de Paypal del banc de proves"; +App::$strings["Paypal Production Client Key"] = "Clau de client de Paypal de producció"; +App::$strings["Paypal Production Secret Key"] = "Clau secreta de Paypal de producció"; +App::$strings["Cart - Paypal Addon"] = "Carretó - Extensió de Paypal"; +App::$strings["Paypal button payments are not enabled."] = "El botó de pagament per Paypal no està habilitat."; +App::$strings["Paypal button payments are not properly configured. Please choose another payment option."] = "El botó de pagament per Paypal no està ben configurat. Escull un altre mètode de pagament."; +App::$strings["Enable Hubzilla Services Module"] = "Activa el mòdul \"Serveis de Hubzilla\""; +App::$strings["Cart - Hubzilla Services Addon"] = "Carretó - Extensió \"Serveis de Hubzilla\""; +App::$strings["New Sku"] = "Nova SKU"; +App::$strings["Cannot save edits to locked item."] = "No s'han pogut desar els canvis a l'article perquè està bloquejat."; +App::$strings["SKU not found."] = "Non s'ha trobat l'SKU"; +App::$strings["Invalid Activation Directive."] = "La directiva d'activació és invàlida."; +App::$strings["Invalid Deactivation Directive."] = "La directiva de desactivació és invàlida."; +App::$strings["Add to this privacy group"] = "Afegeix-ho al teu grup de privacitat"; +App::$strings["Set user service class"] = "Defineix la classe de servei de l'usuària"; +App::$strings["You must be using a local account to purchase this service."] = "Cal una sessió iniciada en aquest hub per a comprar el servei."; +App::$strings["Changes Locked"] = "Article bloquejat"; +App::$strings["Item available for purchase."] = "Article a la venda."; +App::$strings["Price"] = "Preu"; +App::$strings["Add buyer to privacy group"] = "Afegeix el comprador a un grup de privacitat"; +App::$strings["Add buyer as connection"] = "Connecta automàticament amb els canals de les compradores"; +App::$strings["Set Service Class"] = "Defineix la classe de servei"; App::$strings["Error: order mismatch. Please try again."] = "Error: l'ordre no coincideix. Torna-ho a provar."; App::$strings["Manual payments are not enabled."] = "El pagament manual no està habilitat."; App::$strings["Finished"] = "Operació completa"; @@ -2676,7 +2759,7 @@ App::$strings["doesn't like %1\$s's %2\$s"] = "no li agrada %2\$s de %1\$s"; App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s esta ara connectat amb %2\$s"; App::$strings["%1\$s poked %2\$s"] = "%1\$s a esperonat %2\$s"; App::$strings["poked"] = "esperonat"; -App::$strings["View %s's profile @ %s"] = "Vista %s del perfil @ %s"; +App::$strings["View %s's profile @ %s"] = "Mostra el perfil @%s de %s"; App::$strings["Categories:"] = "Categories:"; App::$strings["Filed under:"] = "Arxivar a:"; App::$strings["View in context"] = "Veure en context"; @@ -2707,6 +2790,7 @@ App::$strings["%s like this."] = "%s agrada això."; App::$strings["%s don't like this."] = "%s no agrada això."; App::$strings["Set your location"] = "Ajusta la teva ubicació"; App::$strings["Clear browser location"] = "Treu la localització del navegador"; +App::$strings["Embed (existing) photo from your photo albums"] = "Incrusta una imatge existent dels teus àlbums."; App::$strings["Tag term:"] = "Paraula de l'Etiqueta:"; App::$strings["Where are you right now?"] = "On ets ara?"; App::$strings["Choose a different album..."] = "Tria un àlbum diferent..."; @@ -2735,7 +2819,7 @@ App::$strings["Profile Details"] = "Detalls del Perfil"; App::$strings["Photo Albums"] = "Albums de Fotos"; App::$strings["Files and Storage"] = "Arxius i Emmagatzegament"; App::$strings["Bookmarks"] = "Marcadors"; -App::$strings["Saved Bookmarks"] = "Marcadors Guardats"; +App::$strings["Saved Bookmarks"] = "Marcadors desats"; App::$strings["View Cards"] = "Mostra les targetes"; App::$strings["articles"] = "articles"; App::$strings["View Articles"] = "Mostra els articles"; @@ -2768,7 +2852,7 @@ App::$strings["Directory Options"] = "Opcions de Directori"; App::$strings["Safe Mode"] = "Manera Segura"; App::$strings["Public Forums Only"] = "Només Fòrums Públics"; App::$strings["This Website Only"] = "Només Aquest Lloc Web"; -App::$strings["%1\$s's bookmarks"] = "%1\$s de marcadors"; +App::$strings["%1\$s's bookmarks"] = "marcadors de %1\$s"; App::$strings["Unable to import a removed channel."] = "No s'ha pogut importar un canal esborrat."; App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "No s'ha pogut importar el canal perquè l'identificador del canal no s'ha pogut duplicar en aquest servidor."; App::$strings["Cloned channel not found. Import failed."] = "No s'ha pogut importar el canal perquè el canal clonat no s'ha trobat."; @@ -2780,6 +2864,7 @@ App::$strings["older"] = "el més antic"; App::$strings["newer"] = "El més nou"; App::$strings["No connections"] = "Sense Connexions"; App::$strings["View all %s connections"] = "Veure totes les connexions de %s"; +App::$strings["Network: %s"] = "Xarxa: %s"; App::$strings["poke"] = "esperona"; App::$strings["ping"] = "coloca"; App::$strings["pinged"] = "colocat"; @@ -2901,10 +2986,20 @@ App::$strings["Rate This Channel (this is public)"] = "Valora Aquest Canal (aix App::$strings["Describe (optional)"] = "Descriu (opcional)"; App::$strings["Please enter a link URL"] = "Si us plau, entra l'enllaç URL"; App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Hi ha canvis sense desar, estàs segur que vols abandonar la pàgina?"; +App::$strings["lovely"] = "encantador/a"; +App::$strings["wonderful"] = "meravellós/a"; +App::$strings["fantastic"] = "fantàstic/a"; +App::$strings["great"] = "genial"; +App::$strings["Your chosen nickname was either already taken or not valid. Please use our suggestion ("] = "El nom que has escollit o bé ja està agafat o bé no és vàlid. Pots fer servir la suggerència ("; +App::$strings[") or enter a new one."] = ") o provar amb un altre nom."; +App::$strings["Thank you, this nickname is valid."] = "El nom que has triat és vàlid."; +App::$strings["A channel name is required."] = "Cal un nom de canal."; +App::$strings["This is a "] = "Això és un"; +App::$strings[" channel name"] = "nom del canal"; App::$strings["timeago.prefixAgo"] = "fa"; App::$strings["timeago.prefixFromNow"] = "d'aquí a"; -App::$strings["timeago.suffixAgo"] = "fa"; -App::$strings["timeago.suffixFromNow"] = "d'aquí a"; +App::$strings["timeago.suffixAgo"] = "NONE"; +App::$strings["timeago.suffixFromNow"] = " NONE"; App::$strings["less than a minute"] = "uns segons"; App::$strings["about a minute"] = "prop d'un minut"; App::$strings["%d minutes"] = "%d minuts"; @@ -2953,6 +3048,7 @@ App::$strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s canviat %2\ App::$strings["Visit %1\$s's %2\$s"] = "Visita %1\$s en %2\$s"; App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s Ha actualitzat %2\$s, canviant %3\$s."; App::$strings["Item was not found."] = "Article no trobat."; +App::$strings["Unknown error."] = "Error desconegut."; App::$strings["No source file."] = "No hi ha arxiu d'origen."; App::$strings["Cannot locate file to replace"] = "No trobo l'arxiu a reemplaçar"; App::$strings["Cannot locate file to revise/update"] = "No trobo l'arxiu a revisar/actualitzar"; @@ -2977,8 +3073,8 @@ App::$strings["Visible to anybody on %s."] = "Visible per a tothom a %s."; App::$strings["Visible to all connections."] = "Visible per a totes les connexions."; App::$strings["Visible to approved connections."] = "Visible per a les connexions aprovades."; App::$strings["Visible to specific connections."] = "Visible per a específiques connexions."; -App::$strings["Privacy group is empty."] = "El grup privat està vuit."; -App::$strings["Privacy group: %s"] = "Grup privat: %s"; +App::$strings["Privacy group is empty."] = "El grup de privacitat està buit."; +App::$strings["Privacy group: %s"] = "Grup de privacitat: %s"; App::$strings["Connection not found."] = "Connexió no trobada."; App::$strings["profile photo"] = "foto del perfil"; App::$strings["[Edited %s]"] = "[S'ha editat %s]"; @@ -3035,13 +3131,9 @@ App::$strings["Home, Fax"] = "Casa, fax"; App::$strings["Work, Voice"] = "Feina, veu"; App::$strings["Work, Fax"] = "Feina, fax"; App::$strings["view full size"] = "Veure a mida competa"; -App::$strings["Friendica"] = "Friendica"; -App::$strings["OStatus"] = "OStatus"; App::$strings["GNU-Social"] = "GNU-Social"; App::$strings["RSS/Atom"] = "RSS/Atom"; -App::$strings["Diaspora"] = "Diaspora"; App::$strings["Facebook"] = "Facebook"; -App::$strings["Zot"] = "Zot"; App::$strings["LinkedIn"] = "LinkedIn"; App::$strings["XMPP/IM"] = "XMPP/IM"; App::$strings["MySpace"] = "MySpace"; @@ -3064,6 +3156,7 @@ App::$strings["spoiler"] = "xafa guitarres"; App::$strings["View article"] = "Mostra l'article"; App::$strings["View summary"] = "Mostra'n un resum"; App::$strings["$1 wrote:"] = "$1 va escriure:"; +App::$strings["View PDF"] = "Mostra el pdf"; App::$strings[" by "] = "de"; App::$strings[" on "] = "a"; App::$strings["Embedded content"] = "Contingut embegut"; @@ -3099,11 +3192,10 @@ App::$strings["Allows creation of complex directory search queries"] = "Permet f App::$strings["Advanced Theme and Layout Settings"] = "Configuració de disseny i de tema avançada"; App::$strings["Allows fine tuning of themes and page layouts"] = "Permet configurar al detall els temes i els dissenys de pàgina"; App::$strings["Access Control and Permissions"] = "Control d'accés i permisos"; -App::$strings["Privacy Groups"] = "Grup Privat"; -App::$strings["Enable management and selection of privacy groups"] = "Habilita gestió i selecció de grups privats"; +App::$strings["Enable management and selection of privacy groups"] = "Habilita la gestió i selecció de grups de privacitat"; App::$strings["Multiple Profiles"] = "Multiples Perfils"; App::$strings["Ability to create multiple profiles"] = "Capacitat per crear multiples perfils"; -App::$strings["Provide alternate connection permission roles."] = "Proporciona rols diferents per als permisos de connexió."; +App::$strings["Create custom connection permission limits"] = "Personalitza els límits de permisos de les connexions"; App::$strings["OAuth1 Clients"] = "Clients OAuth1"; App::$strings["Manage OAuth1 authenticatication tokens for mobile and remote apps."] = "Gestiona els tokens d'autenticació OAuth1 per al mòbil i aplicacions remotes."; App::$strings["OAuth2 Clients"] = "Clients OAuth2"; @@ -3132,10 +3224,14 @@ App::$strings["Network and Stream Filtering"] = "Filtrat de Xarxa i Flux"; App::$strings["Search by Date"] = "Cerca per Data"; App::$strings["Ability to select posts by date ranges"] = "Capacitat per seleccionar entrades per rang de dates"; App::$strings["Save search terms for re-use"] = "Guardar els termin de la cerca per a re-usar"; -App::$strings["Network Personal Tab"] = "Pestanya Personal de Xarxa"; -App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Activa la pestanya per mostrar només les entrades de xarxa en les que has intervingut"; -App::$strings["Network New Tab"] = "Pestanya Nou a la Xarxa"; -App::$strings["Enable tab to display all new Network activity"] = "Activa pestanya per mostrar tota l'activitat nova de la Xarxa"; +App::$strings["Alternate Stream Order"] = "Diversos ordres al flux"; +App::$strings["Ability to order the stream by last post date, last comment date or unthreaded activities"] = "Permet canviar l'ordre dels continguts en el flux: segons la data de les entrades, segons la data de l'últim comentari, o segons la data de cada missatge sense agrupar per converses"; +App::$strings["Contact Filter"] = "Filtre de contactes"; +App::$strings["Ability to display only posts of a selected contact"] = "Permet mostrar només entrades d'un contacte determinat"; +App::$strings["Forum Filter"] = "Filtre de fòrums"; +App::$strings["Ability to display only posts of a specific forum"] = "Permet mostrar només entrades d'un fòrum determinat"; +App::$strings["Personal Posts Filter"] = "Filtre d'interaccions amb mi"; +App::$strings["Ability to display only posts that you've interacted on"] = "Permet mostrar només les entrades amb què has interactuat"; App::$strings["Affinity Tool"] = "Eina d'Afinitat"; App::$strings["Filter stream activity by depth of relationships"] = "Filtre d'activitat del flux per importància de la relació"; App::$strings["Show friend and connection suggestions"] = "Suggereix connexions o amistats"; @@ -3216,18 +3312,19 @@ App::$strings["%1\$s's birthday"] = "Aniversari de %1\$s"; App::$strings["Happy Birthday %1\$s"] = "Feliç Aniversari %1\$s"; App::$strings["Remote authentication"] = "Autenticació remota"; App::$strings["Click to authenticate to your home hub"] = "Clica per autentificar-te en el teu node"; -App::$strings["Manage Your Channels"] = "Gestiona els Teus Canals"; -App::$strings["Account/Channel Settings"] = "Ajustos de Compte/Canal"; +App::$strings["Manage your channels"] = "Gestiona els teus canals"; +App::$strings["Manage your privacy groups"] = "Gestiona els teus grups de privacitat"; +App::$strings["Account/Channel Settings"] = "Configuració de compte i canal"; App::$strings["End this session"] = "Finalitza aquesta sessió"; App::$strings["Your profile page"] = "La teva pàgina de perfil"; -App::$strings["Manage/Edit profiles"] = "Gestiona/Edita perfils"; +App::$strings["Manage/Edit profiles"] = "Gestiona/edita els perfils"; App::$strings["Sign in"] = "Signatura"; App::$strings["Take me home"] = "Porta'm a casa"; App::$strings["Log me out of this site"] = "Tanca'm la sessió en aquest lloc web"; App::$strings["Create an account"] = "Crear un compte"; App::$strings["Help and documentation"] = "Ajuda i documentació"; App::$strings["Search site @name, !forum, #tag, ?docs, content"] = "Cerca en el node @nom, !fòrum, #etiqueta, ?documentació, contingut"; -App::$strings["Site Setup and Configuration"] = "Ajustos i Configuració del Lloc"; +App::$strings["Site Setup and Configuration"] = "Configuració del node"; App::$strings["@name, !forum, #tag, ?doc, content"] = "@nom, !fòrum, #etiqueta, ?documentació, contingut"; App::$strings["Please wait..."] = "Si us plau, espera......."; App::$strings["Add Apps"] = "Afegeix aplicacions"; @@ -3244,11 +3341,11 @@ App::$strings["Unable to verify channel signature"] = "No es pot verificar la si App::$strings["Unable to verify site signature for %s"] = "No es pot verificar la signatura del lloc per %s"; App::$strings["invalid target signature"] = "Signatura objectiu invàlida"; App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grup esborrat amb aquest nom fou reviscolat. Els permisos dels items existents <strong>poden</strong> aplicar-se a aquest grup i qualsevol membre futur. Si no es això el que vols, si et plau, crea un altre grup amb un nom diferent."; -App::$strings["Add new connections to this privacy group"] = "Afegir noves connexions a aquest grup privat"; +App::$strings["Add new connections to this privacy group"] = "Afegeix noves connexions a aquest grup de privacitat"; App::$strings["edit"] = "edita"; App::$strings["Edit group"] = "Editar grup"; -App::$strings["Add privacy group"] = "Afegir grup privat"; -App::$strings["Channels not in any privacy group"] = "Sense canals en grups privats"; +App::$strings["Add privacy group"] = "Afegeix grup de privacitat"; +App::$strings["Channels not in any privacy group"] = "Canals que no estan en cap grup de privacitat"; App::$strings["New window"] = "Nova finestra"; App::$strings["Open the selected location in a different window or browser tab"] = "Obrir la localització seleccionada en un altre finestra o pestanya del navegador"; App::$strings["Delegation session ended."] = "S'ha tancat la sessió de delegació."; diff --git a/view/ca/lostpass_eml.tpl b/view/ca/lostpass_eml.tpl index 5ca7b0323..6a1d0bb80 100644 --- a/view/ca/lostpass_eml.tpl +++ b/view/ca/lostpass_eml.tpl @@ -29,4 +29,7 @@ Nom Identificatiu:⇥{{$email}} Atentament, {{$sitename}} Administrador +-- +Condicions del servei: +{{$siteurl}}/help/TermsOfService
\ No newline at end of file diff --git a/view/ca/passchanged_eml.tpl b/view/ca/passchanged_eml.tpl index f5f0531b7..fb9459940 100644 --- a/view/ca/passchanged_eml.tpl +++ b/view/ca/passchanged_eml.tpl @@ -17,4 +17,8 @@ Pots canviar aquesta contrasenya en el teu compte desprès que hagis accedit. Atentament, {{$sitename}} Administrador -
\ No newline at end of file + + +-- +Condicions del servei: +{{$siteurl}}/help/TermsOfService diff --git a/view/ca/register_verify_eml.tpl b/view/ca/register_verify_eml.tpl index a42fe03a9..f808d3ce5 100644 --- a/view/ca/register_verify_eml.tpl +++ b/view/ca/register_verify_eml.tpl @@ -1,24 +1,34 @@ -S'ha rebut una nova petició de registre en {{$sitename}} la qual cosa requereix -la seva aprovació. - +Gràcies per registrar-te a {{$sitename}}. Les dades d'identificació son les següents: Localització del Lloc Web: {{$siteurl}} Nom Identificatiu:⇥{{$email}} -Adreça IP: {{$details}} -Per tal d'aprovar aquesta petició, si us plau, visita el següent enllaç: +identifica't amb la contrasenya que vas triar durant el registre. + +Necessitem verificar la teva adreça de correu per tal de concedir accès total. + +El codi de validació és + +{{$hash}} -{{$siteurl}}/regmod/allow/{{$hash}} +Si has registrat tu aquest compte, introdueix el codi de validació quan te'l demanem o visita aquest enllaç: +{{$siteurl}}/regver/allow/{{$hash}} -Per rebutjar la petició i esborrar el compte, si us plau visita: +Per rebutjar i esborrar el compte, si us plau visita: -{{$siteurl}}/regmod/deny/{{$hash}} + +{{$siteurl}}/regver/deny/{{$hash}} Gràcies. + + +-- +Condicions del servei: +{{$siteurl}}/help/TermsOfService diff --git a/view/ca/update_fail_eml.tpl b/view/ca/update_fail_eml.tpl new file mode 100644 index 000000000..28e52bc39 --- /dev/null +++ b/view/ca/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Ep!:
+Soc el servidor web de {{$sitename}};
+
+L'equip de desenvolupament de Hubzilla ha llençat fa poc l'actualització {{$update}},
+però quan s'intentava instal·lar, quelcom ha anat terriblement malament.
+Això requereix intervenció humana tan aviat com sigui possible.
+Contacta una persona de l'equip de desenvolupament si no pots esbrinar com fer-ho
+per tu mateix. La meva base de dades pot quedar inservible.
+
+El missatge d'error ha estat el següent: '{{$error}}'.
+
+Disculpes per qualsevol inconvenient,
+ el teu servidor web en {{$siteurl}}
\ No newline at end of file diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index 15b1c136b..b04bf742f 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-23 11:34+0200\n" -"PO-Revision-Date: 2018-07-22 19:32+0000\n" +"POT-Creation-Date: 2018-08-21 11:34+0200\n" +"PO-Revision-Date: 2018-08-21 16:39+0200\n" "Last-Translator: Max Kostikov <max@kostikov.co>\n" "Language-Team: Russian (http://www.transifex.com/Friendica/hubzilla/language/ru/)\n" "MIME-Version: 1.0\n" @@ -161,11 +161,11 @@ msgstr "Включить плагин публикаций Dreamwidth" #: ../../extend/addon/hzaddons/cart/cart.php:1206 #: ../../extend/addon/hzaddons/cart/cart.php:1213 #: ../../extend/addon/hzaddons/cart/cart.php:1221 -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:99 -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:104 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:73 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:653 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:657 +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:99 +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:104 #: ../../extend/addon/hzaddons/nsabait/nsabait.php:157 #: ../../extend/addon/hzaddons/nofed/nofed.php:72 #: ../../extend/addon/hzaddons/nofed/nofed.php:76 @@ -237,11 +237,11 @@ msgstr "Нет" #: ../../extend/addon/hzaddons/cart/cart.php:1206 #: ../../extend/addon/hzaddons/cart/cart.php:1213 #: ../../extend/addon/hzaddons/cart/cart.php:1221 -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:99 -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:104 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:73 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:653 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:657 +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:99 +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:104 #: ../../extend/addon/hzaddons/nsabait/nsabait.php:157 #: ../../extend/addon/hzaddons/nofed/nofed.php:72 #: ../../extend/addon/hzaddons/nofed/nofed.php:76 @@ -310,7 +310,7 @@ msgstr "Настройки публикаций в Dreamwidth" #: ../../extend/addon/hzaddons/twitter/twitter.php:218 #: ../../extend/addon/hzaddons/twitter/twitter.php:265 #: ../../extend/addon/hzaddons/pubcrawl/pubcrawl.php:1159 -#: ../../extend/addon/hzaddons/diaspora/diaspora.php:830 +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:831 #: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:53 #: ../../extend/addon/hzaddons/skeleton/skeleton.php:65 #: ../../extend/addon/hzaddons/gnusoc/gnusoc.php:284 @@ -328,9 +328,9 @@ msgstr "Настройки публикаций в Dreamwidth" #: ../../extend/addon/hzaddons/redphotos/redphotos.php:136 #: ../../extend/addon/hzaddons/visage/visage.php:170 #: ../../extend/addon/hzaddons/cart/cart.php:1251 -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:144 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:78 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:647 +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:144 #: ../../extend/addon/hzaddons/nsabait/nsabait.php:161 #: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:84 #: ../../extend/addon/hzaddons/nofed/nofed.php:80 @@ -340,7 +340,7 @@ msgstr "Настройки публикаций в Dreamwidth" #: ../../extend/addon/hzaddons/wppost/wppost.php:113 #: ../../view/theme/redbasic/php/config.php:93 ../../include/js_strings.php:22 #: ../../Zotlabs/Lib/ThreadItem.php:757 ../../Zotlabs/Widget/Wiki_pages.php:40 -#: ../../Zotlabs/Widget/Wiki_pages.php:97 +#: ../../Zotlabs/Widget/Wiki_pages.php:99 #: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Module/Appman.php:153 #: ../../Zotlabs/Module/Photos.php:1087 ../../Zotlabs/Module/Photos.php:1127 #: ../../Zotlabs/Module/Photos.php:1245 ../../Zotlabs/Module/Connect.php:98 @@ -385,7 +385,7 @@ msgstr "Отправить" #: ../../extend/addon/hzaddons/mdpost/mdpost.php:40 ../../include/text.php:1886 #: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../Zotlabs/Module/Wiki.php:208 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:208 #: ../../Zotlabs/Module/Wiki.php:350 msgid "Markdown" msgstr "Разметка" @@ -578,10 +578,7 @@ msgid "" "If enabled, members will automatically login to an ejabberd server that has " "to be installed on this machine with synchronized credentials via the " "\"auth_ejabberd.php\" script." -msgstr "" -"Если включено, участники автоматически войдут на сервер ejabberd, который должен " -"быть установлен на этом компьютере с синхронизированными учетными данными через " -"скрипт \"auth_ejabberd.php\"." +msgstr "Если включено, участники автоматически войдут на сервер ejabberd, который должен быть установлен на этом компьютере с синхронизированными учетными данными через скрипт \"auth_ejabberd.php\"." #: ../../extend/addon/hzaddons/xmpp/xmpp.php:102 #: ../../extend/addon/hzaddons/logrot/logrot.php:54 @@ -623,7 +620,7 @@ msgid "Test mode (only send to hub administrator)" msgstr "Тестовый режим (отправка только администратору узла)" #: ../../extend/addon/hzaddons/buglink/buglink.php:16 -#: ../../Zotlabs/Lib/Apps.php:295 +#: ../../Zotlabs/Lib/Apps.php:299 msgid "Report Bug" msgstr "Сообщить об ошибке" @@ -1271,10 +1268,7 @@ msgid "" "This identity has been deleted by another member due to inactivity. Please " "press the \"New identity\" button or refresh the page to register a new " "identity. You may use the same name." -msgstr "" -"Этот идентификатор был удалён другим участником из-за неактивности. Пожалуйста " -"нажмите кнопку \"Новый идентификатор\" для обновления страницы и получения " -"нового идентификатора. Вы можете использовать то же имя." +msgstr "Этот идентификатор был удалён другим участником из-за неактивности. Пожалуйста нажмите кнопку \"Новый идентификатор\" для обновления страницы и получения нового идентификатора. Вы можете использовать то же имя." #: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:168 msgid "Welcome to Rendezvous!" @@ -1285,10 +1279,7 @@ msgid "" "Enter your name to join this rendezvous. To begin sharing your location with " "the other members, tap the GPS control. When your location is discovered, a " "red dot will appear and others will be able to see you on the map." -msgstr "" -"Введите ваше имя для вступления в это Rendezvous. Для того, чтобы делиться вашим " -"положением с другими участниками, нажмите \"GPS control\". Когда ваше местоположение " -"определно, красная точка появится и остальные смогут увидеть вас на карте." +msgstr "Введите ваше имя для вступления в это Rendezvous. Для того, чтобы делиться вашим положением с другими участниками, нажмите \"GPS control\". Когда ваше местоположение определно, красная точка появится и остальные смогут увидеть вас на карте." #: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:171 msgid "Let's meet here" @@ -1495,7 +1486,7 @@ msgstr "Электронная почта" #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:58 #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:59 #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:60 -#: ../../Zotlabs/Lib/Apps.php:326 +#: ../../Zotlabs/Lib/Apps.php:330 msgid "Profile Photo" msgstr "Фотография профиля" @@ -1533,7 +1524,7 @@ msgid "Homepage URL" msgstr "URL домашней страницы" #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:69 -#: ../../Zotlabs/Lib/Apps.php:324 +#: ../../Zotlabs/Lib/Apps.php:328 msgid "Language" msgstr "Язык" @@ -1716,8 +1707,8 @@ msgid "" msgstr "Предоставьте возможность редактирования фотографий, чтобы скрыть неприемлемые фотографии из альбома по умолчанию" #: ../../extend/addon/hzaddons/pubcrawl/as.php:961 -#: ../../include/conversation.php:1165 ../../Zotlabs/Lib/Apps.php:819 -#: ../../Zotlabs/Lib/Apps.php:898 ../../Zotlabs/Widget/Album.php:84 +#: ../../include/conversation.php:1165 ../../Zotlabs/Lib/Apps.php:867 +#: ../../Zotlabs/Lib/Apps.php:949 ../../Zotlabs/Widget/Album.php:84 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Module/Cdav.php:786 #: ../../Zotlabs/Module/Cdav.php:787 ../../Zotlabs/Module/Cdav.php:794 #: ../../Zotlabs/Module/Photos.php:822 ../../Zotlabs/Module/Photos.php:1278 @@ -1820,38 +1811,38 @@ msgstr "Импорт завершен." msgid "$projectname" msgstr "" -#: ../../extend/addon/hzaddons/diaspora/diaspora.php:786 +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:787 msgid "Diaspora Protocol Settings updated." msgstr "Настройки протокола Diaspora обновлены." -#: ../../extend/addon/hzaddons/diaspora/diaspora.php:805 +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:806 msgid "" "The Diaspora protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "Прокол Diaspora не поддерживает независимость от расположения. Ваши контакты установленные в этой сети могут быть недоступны из альтернативных мест размещения канала." -#: ../../extend/addon/hzaddons/diaspora/diaspora.php:808 +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:809 msgid "Enable the Diaspora protocol for this channel" msgstr "Включить протокол Diaspora для этого канала" -#: ../../extend/addon/hzaddons/diaspora/diaspora.php:812 +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:813 msgid "Allow any Diaspora member to comment on your public posts" msgstr "Разрешить любому участнику Diaspora комментировать ваши общедоступные публикации" -#: ../../extend/addon/hzaddons/diaspora/diaspora.php:816 +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:817 msgid "Prevent your hashtags from being redirected to other sites" msgstr "Предотвратить перенаправление тегов на другие сайты" -#: ../../extend/addon/hzaddons/diaspora/diaspora.php:820 +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:821 msgid "Sign and forward posts and comments with no existing Diaspora signature" msgstr "Подписывать и отправлять публикации и комментарии с несуществующей подписью Diaspora" -#: ../../extend/addon/hzaddons/diaspora/diaspora.php:825 +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:826 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "Отслеживаемые теги (через запятую, исключая #)" -#: ../../extend/addon/hzaddons/diaspora/diaspora.php:830 +#: ../../extend/addon/hzaddons/diaspora/diaspora.php:831 msgid "Diaspora Protocol Settings" msgstr "Настройки протокола Diaspora" @@ -1904,7 +1895,7 @@ msgstr "Страница для загрузки после выбора изо #: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:57 #: ../../include/conversation.php:1037 ../../include/nav.php:108 -#: ../../Zotlabs/Lib/Apps.php:309 ../../Zotlabs/Module/Connedit.php:594 +#: ../../Zotlabs/Lib/Apps.php:313 ../../Zotlabs/Module/Connedit.php:594 msgid "View Profile" msgstr "Просмотреть профиль" @@ -2150,10 +2141,7 @@ msgid "" "pause it at any time and continue where you left off by reloading the page, " "or navigting to another page.</p><p>You can also advance by pressing the " "return key" -msgstr "" -"Добро пожаловать в Hubzilla! Желаете получить обзор пользовательского интерфейса?</p> " -"<p>Вы можете его приостановаить и в любое время перезагрузив страницу или перейдя на другую.</p>" -"<p>Также вы можете нажать клавишу \"Назад\"" +msgstr "Добро пожаловать в Hubzilla! Желаете получить обзор пользовательского интерфейса?</p> <p>Вы можете его приостановаить и в любое время перезагрузив страницу или перейдя на другую.</p><p>Также вы можете нажать клавишу \"Назад\"" #: ../../extend/addon/hzaddons/skeleton/skeleton.php:59 msgid "Some setting" @@ -2663,7 +2651,7 @@ msgid "Manual payments are not enabled." msgstr "Ручные платежи не подключены." #: ../../extend/addon/hzaddons/cart/manual_payments.php:37 -#: ../../extend/addon/hzaddons/cart/cart.php:1442 +#: ../../extend/addon/hzaddons/cart/cart.php:1447 #: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:417 msgid "Order not found." msgstr "Заказ не найден." @@ -2673,7 +2661,7 @@ msgid "Finished" msgstr "Завершено" #: ../../extend/addon/hzaddons/cart/manual_payments.php:62 -#: ../../extend/addon/hzaddons/cart/cart.php:1420 +#: ../../extend/addon/hzaddons/cart/cart.php:1425 #: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:481 #: ../../extend/addon/hzaddons/cart/myshop.php:51 #: ../../Zotlabs/Module/Wiki.php:68 @@ -2708,88 +2696,50 @@ msgstr "Основная торговая валюта" msgid "Cart - Base Settings" msgstr "Корзина - Основные настройки" -#: ../../extend/addon/hzaddons/cart/cart.php:1271 -#: ../../extend/addon/hzaddons/cart/cart.php:1274 +#: ../../extend/addon/hzaddons/cart/cart.php:1275 +#: ../../extend/addon/hzaddons/cart/cart.php:1278 msgid "Shop" msgstr "Магазин" -#: ../../extend/addon/hzaddons/cart/cart.php:1293 +#: ../../extend/addon/hzaddons/cart/cart.php:1298 #: ../../Zotlabs/Module/Wiki.php:30 msgid "Profile Unavailable." msgstr "Профиль недоступен." -#: ../../extend/addon/hzaddons/cart/cart.php:1324 +#: ../../extend/addon/hzaddons/cart/cart.php:1329 #: ../../extend/addon/hzaddons/cart/myshop.php:125 msgid "Order Not Found" msgstr "Заказ не найден" -#: ../../extend/addon/hzaddons/cart/cart.php:1401 +#: ../../extend/addon/hzaddons/cart/cart.php:1406 msgid "You must be logged into the Grid to shop." msgstr "Вы должны быть в сети для доступа к магазину" -#: ../../extend/addon/hzaddons/cart/cart.php:1411 +#: ../../extend/addon/hzaddons/cart/cart.php:1416 msgid "Cart Not Enabled (profile: " msgstr "Корзина не подключена (профиль:" -#: ../../extend/addon/hzaddons/cart/cart.php:1451 +#: ../../extend/addon/hzaddons/cart/cart.php:1456 msgid "Access denied." msgstr "Доступ запрещён." -#: ../../extend/addon/hzaddons/cart/cart.php:1503 -#: ../../extend/addon/hzaddons/cart/cart.php:1647 +#: ../../extend/addon/hzaddons/cart/cart.php:1508 +#: ../../extend/addon/hzaddons/cart/cart.php:1652 msgid "No Order Found" msgstr "Нет найденных заказов" -#: ../../extend/addon/hzaddons/cart/cart.php:1512 +#: ../../extend/addon/hzaddons/cart/cart.php:1517 msgid "An unknown error has occurred Please start again." msgstr "Произошла неизвестная ошибка. Пожалуйста, начните снова." -#: ../../extend/addon/hzaddons/cart/cart.php:1680 +#: ../../extend/addon/hzaddons/cart/cart.php:1685 msgid "Invalid Payment Type. Please start again." msgstr "Недействительный тип платежа. Пожалуйста, начните снова." -#: ../../extend/addon/hzaddons/cart/cart.php:1687 +#: ../../extend/addon/hzaddons/cart/cart.php:1692 msgid "Order not found" msgstr "Заказ не найден" -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:97 -msgid "Enable Paypal Button Module" -msgstr "Включить модуль кнопки Paypal" - -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:102 -msgid "Use Production Key" -msgstr "Использовать ключ Production" - -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:109 -msgid "Paypal Sandbox Client Key" -msgstr "Ключ клиента Paypal Sandbox" - -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:116 -msgid "Paypal Sandbox Secret Key" -msgstr "Секретный ключ Paypal Sandbox" - -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:122 -msgid "Paypal Production Client Key" -msgstr "Ключ клиента Paypal Production" - -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:129 -msgid "Paypal Production Secret Key" -msgstr "Секретный ключ Paypal Production" - -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:143 -msgid "Cart - Paypal Addon" -msgstr "Корзина - Paypal плагин" - -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:277 -msgid "Paypal button payments are not enabled." -msgstr "Кнопка Paypal для платежей не включена." - -#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:295 -msgid "" -"Paypal button payments are not properly configured. Please choose another " -"payment option." -msgstr "Кнопка Paypal для платежей настроена неправильно. Пожалуйста, используйте другой вариант оплаты." - #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:71 msgid "Enable Hubzilla Services Module" msgstr "Включить модуль сервиса Hubzilla" @@ -2858,6 +2808,44 @@ msgstr "Добавить покупателя как контакт" msgid "Set Service Class" msgstr "Установить класс обслуживания" +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:97 +msgid "Enable Paypal Button Module" +msgstr "Включить модуль кнопки Paypal" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:102 +msgid "Use Production Key" +msgstr "Использовать ключ Production" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:109 +msgid "Paypal Sandbox Client Key" +msgstr "Ключ клиента Paypal Sandbox" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:116 +msgid "Paypal Sandbox Secret Key" +msgstr "Секретный ключ Paypal Sandbox" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:122 +msgid "Paypal Production Client Key" +msgstr "Ключ клиента Paypal Production" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:129 +msgid "Paypal Production Secret Key" +msgstr "Секретный ключ Paypal Production" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:143 +msgid "Cart - Paypal Addon" +msgstr "Корзина - Paypal плагин" + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:277 +msgid "Paypal button payments are not enabled." +msgstr "Кнопка Paypal для платежей не включена." + +#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:295 +msgid "" +"Paypal button payments are not properly configured. Please choose another " +"payment option." +msgstr "Кнопка Paypal для платежей настроена неправильно. Пожалуйста, используйте другой вариант оплаты." + #: ../../extend/addon/hzaddons/cart/myshop.php:44 msgid "Access Denied." msgstr "Доступ запрещён." @@ -3324,7 +3312,7 @@ msgstr "Ваш аккаунт на %s перестанет работать че #: ../../extend/addon/hzaddons/testdrive/testdrive.php:105 msgid "Your $Productname test account is about to expire." -msgstr "Срок действия пробного аккаунта в $Productname близок к окончанию." +msgstr "Ваш тестовый аккаунт в $Productname близок к окончанию срока действия." #: ../../boot.php:1595 msgid "Create an account to access services and applications" @@ -3341,7 +3329,7 @@ msgid "Logout" msgstr "Выход" #: ../../boot.php:1616 ../../include/nav.php:120 ../../include/nav.php:124 -#: ../../Zotlabs/Lib/Apps.php:301 +#: ../../Zotlabs/Lib/Apps.php:305 msgid "Login" msgstr "Войти" @@ -3556,7 +3544,7 @@ msgstr "спойлер" #: ../../include/bbcode.php:456 msgid "View article" -msgstr "Просмотр статей" +msgstr "Просмотр статьи" #: ../../include/bbcode.php:456 msgid "View summary" @@ -3723,12 +3711,12 @@ msgstr "Согласен" #: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1143 msgctxt "title" msgid "Disagree" -msgstr "Против" +msgstr "Не согласен" #: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1143 msgctxt "title" msgid "Abstain" -msgstr "Воздерживаюсь" +msgstr "Воздержался" #: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1144 msgctxt "title" @@ -3750,7 +3738,7 @@ msgid "Select" msgstr "Выбрать" #: ../../include/conversation.php:691 ../../include/conversation.php:736 -#: ../../Zotlabs/Lib/ThreadItem.php:148 ../../Zotlabs/Lib/Apps.php:476 +#: ../../Zotlabs/Lib/ThreadItem.php:148 ../../Zotlabs/Lib/Apps.php:500 #: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187 #: ../../Zotlabs/Module/Photos.php:1208 #: ../../Zotlabs/Module/Connections.php:289 @@ -3877,7 +3865,7 @@ msgstr "Сообщение" msgid "Ratings" msgstr "Оценки" -#: ../../include/conversation.php:1097 ../../Zotlabs/Lib/Apps.php:316 +#: ../../include/conversation.php:1097 ../../Zotlabs/Lib/Apps.php:320 #: ../../Zotlabs/Module/Poke.php:182 msgid "Poke" msgstr "Ткнуть" @@ -4197,7 +4185,7 @@ msgid "Profile Details" msgstr "Информация о профиле" #: ../../include/conversation.php:1843 ../../include/nav.php:393 -#: ../../Zotlabs/Lib/Apps.php:310 ../../Zotlabs/Module/Fbrowser.php:29 +#: ../../Zotlabs/Lib/Apps.php:314 ../../Zotlabs/Module/Fbrowser.php:29 msgid "Photos" msgstr "Фотографии" @@ -4207,7 +4195,7 @@ msgid "Photo Albums" msgstr "Фотоальбомы" #: ../../include/conversation.php:1851 ../../include/nav.php:401 -#: ../../Zotlabs/Lib/Apps.php:305 ../../Zotlabs/Module/Fbrowser.php:85 +#: ../../Zotlabs/Lib/Apps.php:309 ../../Zotlabs/Module/Fbrowser.php:85 #: ../../Zotlabs/Storage/Browser.php:272 msgid "Files" msgstr "Файлы" @@ -4217,7 +4205,7 @@ msgid "Files and Storage" msgstr "Файлы и хранилище" #: ../../include/conversation.php:1862 ../../include/conversation.php:1865 -#: ../../Zotlabs/Lib/Apps.php:311 +#: ../../Zotlabs/Lib/Apps.php:315 msgid "Events" msgstr "События" @@ -4236,7 +4224,7 @@ msgid "Saved Bookmarks" msgstr "Сохранённые закладки" #: ../../include/conversation.php:1902 ../../include/nav.php:450 -#: ../../include/features.php:123 ../../Zotlabs/Lib/Apps.php:293 +#: ../../include/features.php:123 ../../Zotlabs/Lib/Apps.php:297 #: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194 msgid "Cards" msgstr "Карточки" @@ -4254,7 +4242,7 @@ msgid "View Articles" msgstr "Просмотр статей" #: ../../include/conversation.php:1924 ../../include/nav.php:473 -#: ../../Zotlabs/Lib/Apps.php:306 ../../Zotlabs/Module/Webpages.php:237 +#: ../../Zotlabs/Lib/Apps.php:310 ../../Zotlabs/Module/Webpages.php:237 msgid "Webpages" msgstr "Веб-страницы" @@ -4268,7 +4256,7 @@ msgid "Wikis" msgstr "" #: ../../include/conversation.php:1940 ../../include/nav.php:489 -#: ../../include/features.php:96 ../../Zotlabs/Lib/Apps.php:307 +#: ../../include/features.php:96 ../../Zotlabs/Lib/Apps.php:311 msgid "Wiki" msgstr "" @@ -4311,9 +4299,7 @@ msgstr[2] "Не посетят" msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" -msgstr[0] "Не решил" -msgstr[1] "Не решили" -msgstr[2] "Не решили" +msgstr "Не решил" #: ../../include/conversation.php:2005 msgctxt "noun" @@ -4397,44 +4383,44 @@ msgstr "В процессе" msgid "Cancelled" msgstr "Отменено" -#: ../../include/event.php:1308 ../../include/connections.php:696 +#: ../../include/event.php:1308 ../../include/connections.php:698 #: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915 #: ../../Zotlabs/Module/Profiles.php:792 msgid "Mobile" msgstr "Мобильный" -#: ../../include/event.php:1309 ../../include/connections.php:697 +#: ../../include/event.php:1309 ../../include/connections.php:699 #: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916 #: ../../Zotlabs/Module/Profiles.php:793 msgid "Home" msgstr "Домашний" -#: ../../include/event.php:1310 ../../include/connections.php:698 +#: ../../include/event.php:1310 ../../include/connections.php:700 msgid "Home, Voice" msgstr "Дом, голос" -#: ../../include/event.php:1311 ../../include/connections.php:699 +#: ../../include/event.php:1311 ../../include/connections.php:701 msgid "Home, Fax" msgstr "Дом, факс" -#: ../../include/event.php:1312 ../../include/connections.php:700 +#: ../../include/event.php:1312 ../../include/connections.php:702 #: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917 #: ../../Zotlabs/Module/Profiles.php:794 msgid "Work" msgstr "Рабочий" -#: ../../include/event.php:1313 ../../include/connections.php:701 +#: ../../include/event.php:1313 ../../include/connections.php:703 msgid "Work, Voice" msgstr "Работа, голос" -#: ../../include/event.php:1314 ../../include/connections.php:702 +#: ../../include/event.php:1314 ../../include/connections.php:704 msgid "Work, Fax" msgstr "Работа, факс" #: ../../include/event.php:1315 ../../include/event.php:1322 #: ../../include/selectors.php:49 ../../include/selectors.php:66 #: ../../include/selectors.php:104 ../../include/selectors.php:140 -#: ../../include/connections.php:703 ../../include/connections.php:710 +#: ../../include/connections.php:705 ../../include/connections.php:712 #: ../../Zotlabs/Access/PermissionRoles.php:306 #: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/Connedit.php:918 #: ../../Zotlabs/Module/Settings/Channel.php:496 @@ -4609,7 +4595,7 @@ msgstr "Удаленная аутентификация" msgid "Click to authenticate to your home hub" msgstr "Нажмите, чтобы аутентифицировать себя на домашнем узле" -#: ../../include/nav.php:94 ../../Zotlabs/Lib/Apps.php:302 +#: ../../include/nav.php:94 ../../Zotlabs/Lib/Apps.php:306 #: ../../Zotlabs/Module/Manage.php:170 msgid "Channel Manager" msgstr "Менеджер каналов" @@ -4619,7 +4605,8 @@ msgid "Manage your channels" msgstr "Управление вашими каналами" #: ../../include/nav.php:97 ../../include/group.php:320 -#: ../../include/features.php:221 ../../Zotlabs/Widget/Activity_filter.php:68 +#: ../../include/features.php:221 ../../Zotlabs/Lib/Apps.php:333 +#: ../../Zotlabs/Widget/Activity_filter.php:68 #: ../../Zotlabs/Module/Group.php:113 ../../Zotlabs/Module/Group.php:124 msgid "Privacy Groups" msgstr "Группы безопасности" @@ -4628,7 +4615,7 @@ msgstr "Группы безопасности" msgid "Manage your privacy groups" msgstr "Управление вашим группами безопасности" -#: ../../include/nav.php:99 ../../Zotlabs/Lib/Apps.php:304 +#: ../../include/nav.php:99 ../../Zotlabs/Lib/Apps.php:308 #: ../../Zotlabs/Widget/Settings_menu.php:141 #: ../../Zotlabs/Widget/Newmember.php:46 #: ../../Zotlabs/Module/Admin/Addons.php:344 @@ -4679,7 +4666,7 @@ msgstr "Создать аккаунт" #: ../../include/nav.php:170 ../../include/nav.php:272 #: ../../include/help.php:68 ../../include/help.php:74 -#: ../../Zotlabs/Lib/Apps.php:313 ../../Zotlabs/Module/Layouts.php:186 +#: ../../Zotlabs/Lib/Apps.php:317 ../../Zotlabs/Module/Layouts.php:186 msgid "Help" msgstr "Помощь" @@ -4689,7 +4676,7 @@ msgstr "Справочная информация и документация" #: ../../include/nav.php:185 ../../include/acl_selectors.php:118 #: ../../include/text.php:1062 ../../include/text.php:1074 -#: ../../Zotlabs/Lib/Apps.php:318 ../../Zotlabs/Widget/Sitesearch.php:31 +#: ../../Zotlabs/Lib/Apps.php:322 ../../Zotlabs/Widget/Sitesearch.php:31 #: ../../Zotlabs/Widget/Activity_filter.php:148 #: ../../Zotlabs/Module/Connections.php:335 ../../Zotlabs/Module/Search.php:44 msgid "Search" @@ -4728,7 +4715,7 @@ msgstr "Добавить приложения" #: ../../include/nav.php:290 msgid "Arrange Apps" -msgstr "Управление приложениями" +msgstr "Упорядочить приложения" #: ../../include/nav.php:291 msgid "Toggle System Apps" @@ -4740,7 +4727,7 @@ msgid "Calendar" msgstr "Календарь" #: ../../include/nav.php:461 ../../include/features.php:133 -#: ../../Zotlabs/Lib/Apps.php:292 ../../Zotlabs/Module/Articles.php:38 +#: ../../Zotlabs/Lib/Apps.php:296 ../../Zotlabs/Module/Articles.php:38 #: ../../Zotlabs/Module/Articles.php:191 msgid "Articles" msgstr "Статьи" @@ -4940,9 +4927,7 @@ msgstr "Настраиваемый выбор" msgid "" "Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " "the scope of \"Show\"." -msgstr "" -"Нажмите \"Показать\" чтобы разрешить просмотр. \"Не показывать\" позволит вам " -"переопределить и ограничить область показа." +msgstr "Нажмите \"Показать\" чтобы разрешить просмотр. \"Не показывать\" позволит вам переопределить и ограничить область показа." #: ../../include/acl_selectors.php:116 msgid "Show" @@ -5105,7 +5090,7 @@ msgstr "новее" msgid "No connections" msgstr "Нет контактов" -#: ../../include/text.php:975 ../../Zotlabs/Lib/Apps.php:298 +#: ../../include/text.php:975 ../../Zotlabs/Lib/Apps.php:302 #: ../../Zotlabs/Module/Connections.php:331 msgid "Connections" msgstr "Контакты" @@ -5366,7 +5351,7 @@ msgid "You can create your own with the layouts tool" msgstr "Вы можете создать свой собственный с помощью инструмента шаблонов" #: ../../include/text.php:1884 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../Zotlabs/Module/Wiki.php:208 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:208 #: ../../Zotlabs/Module/Wiki.php:350 msgid "BBcode" msgstr "" @@ -5376,7 +5361,7 @@ msgid "HTML" msgstr "" #: ../../include/text.php:1887 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../Zotlabs/Module/Wiki.php:208 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:208 msgid "Text" msgstr "Текст" @@ -5496,7 +5481,7 @@ msgstr "Не верный токен безопасности для формы. #: ../../include/menu.php:118 ../../include/channel.php:1296 #: ../../include/channel.php:1300 ../../Zotlabs/Lib/ThreadItem.php:128 -#: ../../Zotlabs/Lib/Apps.php:475 ../../Zotlabs/Widget/Cdav.php:126 +#: ../../Zotlabs/Lib/Apps.php:499 ../../Zotlabs/Widget/Cdav.php:126 #: ../../Zotlabs/Widget/Cdav.php:162 ../../Zotlabs/Module/Connections.php:281 #: ../../Zotlabs/Module/Connections.php:319 #: ../../Zotlabs/Module/Connections.php:339 @@ -5913,7 +5898,8 @@ msgstr "Работа / занятость:" msgid "School/education:" msgstr "Школа / образование:" -#: ../../include/channel.php:1644 ../../Zotlabs/Module/Profperm.php:113 +#: ../../include/channel.php:1644 ../../Zotlabs/Lib/Apps.php:331 +#: ../../Zotlabs/Module/Profperm.php:113 msgid "Profile" msgstr "Профиль" @@ -6262,7 +6248,7 @@ msgstr "Инструмент сходства / соответствия" msgid "Filter stream activity by depth of relationships" msgstr "Фильтровать потоки активности по глубине отношений" -#: ../../include/features.php:435 ../../Zotlabs/Lib/Apps.php:300 +#: ../../include/features.php:435 ../../Zotlabs/Lib/Apps.php:304 msgid "Suggest Channels" msgstr "Предлагаемые каналы" @@ -7197,75 +7183,87 @@ msgstr "Ваш адрес электронной почты (требуется) msgid "Your website URL (optional)" msgstr "URL вашего вебсайта (необязательно)" -#: ../../Zotlabs/Lib/Apps.php:291 ../../Zotlabs/Module/Apps.php:50 +#: ../../Zotlabs/Lib/Apps.php:295 ../../Zotlabs/Module/Apps.php:50 msgid "Apps" msgstr "Приложения" -#: ../../Zotlabs/Lib/Apps.php:294 +#: ../../Zotlabs/Lib/Apps.php:298 msgid "Site Admin" msgstr "Администратор сайта" -#: ../../Zotlabs/Lib/Apps.php:296 +#: ../../Zotlabs/Lib/Apps.php:300 msgid "View Bookmarks" msgstr "Просмотреть закадки" -#: ../../Zotlabs/Lib/Apps.php:297 +#: ../../Zotlabs/Lib/Apps.php:301 msgid "My Chatrooms" msgstr "Мои чаты" -#: ../../Zotlabs/Lib/Apps.php:299 +#: ../../Zotlabs/Lib/Apps.php:303 msgid "Remote Diagnostics" msgstr "Удалённая диагностика" -#: ../../Zotlabs/Lib/Apps.php:303 +#: ../../Zotlabs/Lib/Apps.php:307 msgid "Activity" msgstr "Активность" -#: ../../Zotlabs/Lib/Apps.php:308 +#: ../../Zotlabs/Lib/Apps.php:312 msgid "Channel Home" msgstr "Главная канала" -#: ../../Zotlabs/Lib/Apps.php:312 +#: ../../Zotlabs/Lib/Apps.php:316 msgid "Directory" msgstr "Каталог" -#: ../../Zotlabs/Lib/Apps.php:314 +#: ../../Zotlabs/Lib/Apps.php:318 msgid "Mail" msgstr "Переписка" -#: ../../Zotlabs/Lib/Apps.php:315 ../../Zotlabs/Module/Mood.php:135 +#: ../../Zotlabs/Lib/Apps.php:319 ../../Zotlabs/Module/Mood.php:135 msgid "Mood" msgstr "Настроение" -#: ../../Zotlabs/Lib/Apps.php:317 +#: ../../Zotlabs/Lib/Apps.php:321 msgid "Chat" msgstr "Чат" -#: ../../Zotlabs/Lib/Apps.php:319 +#: ../../Zotlabs/Lib/Apps.php:323 msgid "Probe" msgstr "Проба" -#: ../../Zotlabs/Lib/Apps.php:320 +#: ../../Zotlabs/Lib/Apps.php:324 msgid "Suggest" msgstr "Предложить" -#: ../../Zotlabs/Lib/Apps.php:321 +#: ../../Zotlabs/Lib/Apps.php:325 msgid "Random Channel" msgstr "Случайный канал" -#: ../../Zotlabs/Lib/Apps.php:322 +#: ../../Zotlabs/Lib/Apps.php:326 msgid "Invite" msgstr "Пригласить" -#: ../../Zotlabs/Lib/Apps.php:323 ../../Zotlabs/Widget/Admin.php:26 +#: ../../Zotlabs/Lib/Apps.php:327 ../../Zotlabs/Widget/Admin.php:26 msgid "Features" msgstr "Функции" -#: ../../Zotlabs/Lib/Apps.php:325 +#: ../../Zotlabs/Lib/Apps.php:329 msgid "Post" msgstr "Публикация" -#: ../../Zotlabs/Lib/Apps.php:456 ../../Zotlabs/Module/Cdav.php:1186 +#: ../../Zotlabs/Lib/Apps.php:332 +msgid "Profiles" +msgstr "Редактировать профиль" + +#: ../../Zotlabs/Lib/Apps.php:334 +msgid "Notifications" +msgstr "Оповещения" + +#: ../../Zotlabs/Lib/Apps.php:335 +msgid "Order Apps" +msgstr "Порядок приложений" + +#: ../../Zotlabs/Lib/Apps.php:480 ../../Zotlabs/Module/Cdav.php:1186 #: ../../Zotlabs/Module/Connedit.php:922 #: ../../Zotlabs/Module/Admin/Addons.php:453 #: ../../Zotlabs/Module/Settings/Oauth2.php:40 @@ -7276,31 +7274,31 @@ msgstr "Публикация" msgid "Update" msgstr "Обновить" -#: ../../Zotlabs/Lib/Apps.php:456 ../../Zotlabs/Module/Admin/Addons.php:422 +#: ../../Zotlabs/Lib/Apps.php:480 ../../Zotlabs/Module/Admin/Addons.php:422 msgid "Install" msgstr "Установить" -#: ../../Zotlabs/Lib/Apps.php:473 +#: ../../Zotlabs/Lib/Apps.php:497 msgid "Purchase" msgstr "Купить" -#: ../../Zotlabs/Lib/Apps.php:477 +#: ../../Zotlabs/Lib/Apps.php:501 msgid "Undelete" msgstr "Восстановить" -#: ../../Zotlabs/Lib/Apps.php:485 +#: ../../Zotlabs/Lib/Apps.php:509 msgid "Add to app-tray" msgstr "Добавить в app-tray" -#: ../../Zotlabs/Lib/Apps.php:486 +#: ../../Zotlabs/Lib/Apps.php:510 msgid "Remove from app-tray" msgstr "Удалить из app-tray" -#: ../../Zotlabs/Lib/Apps.php:487 +#: ../../Zotlabs/Lib/Apps.php:511 msgid "Pin to navbar" msgstr "Добавить на панель навигации" -#: ../../Zotlabs/Lib/Apps.php:488 +#: ../../Zotlabs/Lib/Apps.php:512 msgid "Unpin from navbar" msgstr "Удалить с панели навигации" @@ -7352,7 +7350,7 @@ msgstr "%1$s отправил вам новое личное сообщение #: ../../Zotlabs/Lib/Enotify.php:130 #, php-format msgid "%1$s sent you %2$s." -msgstr "%1$s послал вам %2$s." +msgstr "%1$s отправил вам %2$s." #: ../../Zotlabs/Lib/Enotify.php:130 msgid "a private message" @@ -7378,17 +7376,17 @@ msgstr "не понравилось" #: ../../Zotlabs/Lib/Enotify.php:201 #, php-format msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]" -msgstr "" +msgstr "%1$s %2$s [zrl=%3$s]%4$s[/zrl]" #: ../../Zotlabs/Lib/Enotify.php:209 #, php-format msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" -msgstr "" +msgstr "%1$s %2$s [zrl=%3$s]%5$s %4$s[/zrl]" #: ../../Zotlabs/Lib/Enotify.php:218 #, php-format msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]" -msgstr "%1$s%2$s [zrl=%3$s]ваш %4$s[/zrl]" +msgstr "%1$s %2$s [zrl=%3$s]ваш %4$s[/zrl]" #: ../../Zotlabs/Lib/Enotify.php:230 #, php-format @@ -7679,31 +7677,31 @@ msgstr "Комната не найдена." msgid "Room is full" msgstr "Комната переполнена" -#: ../../Zotlabs/Widget/Activity_order.php:86 +#: ../../Zotlabs/Widget/Activity_order.php:89 msgid "Commented Date" msgstr "По комментариям" -#: ../../Zotlabs/Widget/Activity_order.php:90 +#: ../../Zotlabs/Widget/Activity_order.php:93 msgid "Order by last commented date" msgstr "Сортировка по дате последнего комментария" -#: ../../Zotlabs/Widget/Activity_order.php:93 +#: ../../Zotlabs/Widget/Activity_order.php:96 msgid "Posted Date" msgstr "По публикациям" -#: ../../Zotlabs/Widget/Activity_order.php:97 +#: ../../Zotlabs/Widget/Activity_order.php:100 msgid "Order by last posted date" msgstr "Сортировка по дате последней публикации" -#: ../../Zotlabs/Widget/Activity_order.php:100 +#: ../../Zotlabs/Widget/Activity_order.php:103 msgid "Date Unthreaded" msgstr "По порядку" -#: ../../Zotlabs/Widget/Activity_order.php:104 +#: ../../Zotlabs/Widget/Activity_order.php:107 msgid "Order unthreaded by date" msgstr "Сортировка в порядке поступления" -#: ../../Zotlabs/Widget/Activity_order.php:119 +#: ../../Zotlabs/Widget/Activity_order.php:122 msgid "Activity Order" msgstr "Сортировка активности" @@ -7907,20 +7905,20 @@ msgid "Create a new post" msgstr "Создать новую публикацию" #: ../../Zotlabs/Widget/Wiki_pages.php:32 -#: ../../Zotlabs/Widget/Wiki_pages.php:89 +#: ../../Zotlabs/Widget/Wiki_pages.php:91 msgid "Add new page" msgstr "Добавить новую страницу" #: ../../Zotlabs/Widget/Wiki_pages.php:39 -#: ../../Zotlabs/Widget/Wiki_pages.php:96 ../../Zotlabs/Module/Dreport.php:151 +#: ../../Zotlabs/Widget/Wiki_pages.php:98 ../../Zotlabs/Module/Dreport.php:151 msgid "Options" msgstr "Параметры" -#: ../../Zotlabs/Widget/Wiki_pages.php:83 +#: ../../Zotlabs/Widget/Wiki_pages.php:85 msgid "Wiki Pages" msgstr "Wiki страницы" -#: ../../Zotlabs/Widget/Wiki_pages.php:94 +#: ../../Zotlabs/Widget/Wiki_pages.php:96 msgid "Page name" msgstr "Название страницы" @@ -8829,7 +8827,7 @@ msgstr "Удалить фотографию" #: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Directory.php:68 #: ../../Zotlabs/Module/Display.php:30 msgid "Public access denied." -msgstr "Общественный доступ запрещен." +msgstr "Публичный доступ запрещен." #: ../../Zotlabs/Module/Photos.php:556 msgid "No photos selected" @@ -9511,7 +9509,7 @@ msgstr "Сообщение отозванно." #: ../../Zotlabs/Module/Mail.php:227 msgid "Conversation removed." -msgstr "Разговор удален." +msgstr "Беседа удалена." #: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363 msgid "Expires YYYY-MM-DD HH:MM" @@ -9563,7 +9561,7 @@ msgstr "Сообщение отозванно" #: ../../Zotlabs/Module/Mail.php:414 msgid "Delete Conversation" -msgstr "Удалить разговор" +msgstr "Удалить беседу" #: ../../Zotlabs/Module/Mail.php:416 msgid "" @@ -9786,11 +9784,7 @@ msgid "" "These content files may be imported or restored by visiting <a href=\"%1$s\">" "%2$s</a> on any site containing your channel. For best results please import " "or restore these in date order (oldest first)." -msgstr "" -"Данные файлы с содержимым могут быть импортированы и восстановлены на любом " -"содержащем ваш канал сайте. Посетите <a href=\"%1$s\">%2$s</a>. Для лучших " -"результатов пожалуйста производите импорт и восстановление в порядке датировки " -"(старые сначала)." +msgstr "Данные файлы с содержимым могут быть импортированы и восстановлены на любом содержащем ваш канал сайте. Посетите <a href=\"%1$s\">%2$s</a>. Для лучших результатов пожалуйста производите импорт и восстановление в порядке датировки (старые сначала)." #: ../../Zotlabs/Module/Chatsvc.php:131 msgid "Away" @@ -10150,7 +10144,7 @@ msgid "" "consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " "cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -msgstr "Бля бля бля Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." +msgstr "" #: ../../Zotlabs/Module/Editblock.php:113 ../../Zotlabs/Module/Blocks.php:97 #: ../../Zotlabs/Module/Blocks.php:155 @@ -10593,10 +10587,7 @@ msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " "individual settings. You can <strong>not</strong> change those settings here." -msgstr "" -"Некоторые разрешения могут наследовать из <a href=\"settings\"><strong>настроек " -"приватности</strong></a> ваших каналов которые могут иметь более высокий приоритет " -"чем индивидуальные. Вы <strong>не можете</strong> менять эти настройки здесь." +msgstr "Некоторые разрешения могут наследовать из <a href=\"settings\"><strong>настроек приватности</strong></a> ваших каналов которые могут иметь более высокий приоритет чем индивидуальные. Вы <strong>не можете</strong> менять эти настройки здесь." #: ../../Zotlabs/Module/Connedit.php:895 msgid "" @@ -10604,11 +10595,7 @@ msgid "" "\"><strong>privacy settings</strong></a>, which have higher priority than " "individual settings. You can change those settings here but they wont have " "any impact unless the inherited setting changes." -msgstr "" -"Некоторые разрешения могут быть унаследованы из <a href=\"settings\"><strong>настроек " -"приватности</strong></a> вашего канала, которые могут иметь более высокий приоритет " -"чем индивидуальные. Вы можете изменить эти настройки, однако они не будут применены до " -"изменения переданных по наследству настроек." +msgstr "Некоторые разрешения могут быть унаследованы из <a href=\"settings\"><strong>настроек приватности</strong></a> вашего канала, которые могут иметь более высокий приоритет чем индивидуальные. Вы можете изменить эти настройки, однако они не будут применены до изменения переданных по наследству настроек." #: ../../Zotlabs/Module/Connedit.php:896 msgid "Last update:" @@ -11611,9 +11598,7 @@ msgstr "Только по приглашениям" msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." -msgstr "" -"Регистрация пользователей разрешается только по приглашениям. Вышеуказанная " -"политика регистрация должны быть установлена в \"Да\"." +msgstr "Регистрация пользователей разрешается только по приглашениям. Вышеуказанная политика регистрация должны быть установлена в \"Да\"." #: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Minimum age" @@ -11627,6 +11612,10 @@ msgstr "Минимальный возраст (в годах) для регис msgid "Which best describes the types of account offered by this hub?" msgstr "Как лучше описать тип учётных записей предлагаемых на этом хабе?" +#: ../../Zotlabs/Module/Admin/Site.php:335 +msgid "This is displayed on the public server site list." +msgstr "Это отображается в списке общедоступных серверов." + #: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Register text" msgstr "Текст регистрации" @@ -11748,8 +11737,7 @@ msgstr "Включить контекстную помощь" #: ../../Zotlabs/Module/Admin/Site.php:352 msgid "" "Display contextual help for the current page when the help button is pressed." -msgstr "" -"Показывать контекстную помощь для текущей странице при нажатии на кнопку \"Помощь\"." +msgstr "Показывать контекстную помощь для текущей странице при нажатии на кнопку \"Помощь\"." #: ../../Zotlabs/Module/Admin/Site.php:354 msgid "Reply-to email address for system generated email." @@ -11868,7 +11856,7 @@ msgstr "0 для постоянного хранения импортирова #: ../../Zotlabs/Module/Admin/Site.php:371 msgid "" "Do not expire any posts which have comments less than this many days ago" -msgstr "Продлевать строк хранения для любых публикаций, которые имею комментарии возрастом менее этого значения" +msgstr "Продлевать строк хранения для любых публикаций, которые имеют комментарии возрастом менее этого значения" #: ../../Zotlabs/Module/Admin/Site.php:373 msgid "" @@ -11886,7 +11874,7 @@ msgstr "Страница для показа после создания нов #: ../../Zotlabs/Module/Admin/Site.php:374 msgid "Default: profiles" -msgstr "По умолчанию: профили" +msgstr "По умолчанию: profiles" #: ../../Zotlabs/Module/Admin/Site.php:376 msgid "Optional: site location" @@ -11997,31 +11985,25 @@ msgstr "Класс обслуживания" msgid "" "Selected accounts will be deleted!\\n\\nEverything these accounts had posted " "on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" -"Выбранные учётные записи будут удалены!\n\nВсё что было ими опубликовано на " -"этом сайте будет удалено навсегда!\n\nВы уверены?" +msgstr "Выбранные учётные записи будут удалены!\n\nВсё что было ими опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?" #: ../../Zotlabs/Module/Admin/Accounts.php:191 msgid "" "The account {0} will be deleted!\\n\\nEverything this account has posted on " "this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" -"Этот аккаунт {0} будет удалён!\n\nВсё что им было опубликовано на этом сайте " -"будет удалено навсегда!\n\nВы уверены?" +msgstr "Этот аккаунт {0} будет удалён!\n\nВсё что им было опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?" #: ../../Zotlabs/Module/Admin/Security.php:83 msgid "" "By default, unfiltered HTML is allowed in embedded media. This is inherently " "insecure." -msgstr "" -"По умолчанию, HTML без фильтрации доступен во встраиваемых медиа. Это небезопасно." +msgstr "По умолчанию, HTML без фильтрации доступен во встраиваемых медиа. Это небезопасно." #: ../../Zotlabs/Module/Admin/Security.php:86 msgid "" "The recommended setting is to only allow unfiltered HTML from the following " "sites:" -msgstr "" -"Рекомендуется настроить разрешения использовать HTML без фильтрации только для следующих сайтов:" +msgstr "Рекомендуется настроить разрешения использовать HTML без фильтрации только для следующих сайтов:" #: ../../Zotlabs/Module/Admin/Security.php:87 msgid "" @@ -12425,17 +12407,13 @@ msgstr "" msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" -"Выбранные каналы будут удалены!\n\nВсё что было опубликовано в этих каналах на " -"этом сайте будет удалено навсегда!\n\nВы уверены?" +msgstr "Этот аккаунт {0} будет удалён!\n\nВсё что им было опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?" #: ../../Zotlabs/Module/Admin/Channels.php:163 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" -"Канал {0} будет удалён!\n\nВсё что было опубликовано в этом канале на этом сайте " -"будет удалено навсегда!\n\nВы уверены?" +msgstr "Канал {0} будет удалён!\n\nВсё что было опубликовано в этом канале на этом сайте будет удалено навсегда!\n\nВы уверены?" #: ../../Zotlabs/Module/Email_validation.php:24 #: ../../Zotlabs/Module/Email_resend.php:12 @@ -12452,11 +12430,7 @@ msgid "" "A verification token was sent to your email address [%s]. Enter that token " "here to complete the account verification step. Please allow a few minutes " "for delivery, and check your spam folder if you do not see the message." -msgstr "" -"Проверочный токен был выслн на ваш адрес электронной почты {%s]. Введите этот " -"токен здесь для завершения этапа проверки учётной записи. Пожалуйста, подождите " -"несколько минут для завершения доставки и проверьте вашу папку \"Спам\" если вы " -"не видите письма." +msgstr "Проверочный токен был выслн на ваш адрес электронной почты {%s]. Введите этот токен здесь для завершения этапа проверки учётной записи. Пожалуйста, подождите несколько минут для завершения доставки и проверьте вашу папку \"Спам\" если вы не видите письма." #: ../../Zotlabs/Module/Email_validation.php:38 msgid "Resend Email" @@ -12556,9 +12530,7 @@ msgstr "Это действие доступно только участника msgid "" "Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" "\"register\">register as a new $Projectname member</a> to continue." -msgstr "" -"Пожалуйста, для продолжения <a href=\"rmagic\"> войдите с вашим $Projectname " -"ID</a> или <a href=\"register\">зарегистрируйтесь как новый участник $Projectname</a>." +msgstr "Пожалуйста, для продолжения <a href=\"rmagic\"> войдите с вашим $Projectname ID</a> или <a href=\"register\">зарегистрируйтесь как новый участник $Projectname</a>." #: ../../Zotlabs/Module/Like.php:109 ../../Zotlabs/Module/Like.php:135 #: ../../Zotlabs/Module/Like.php:173 @@ -13788,14 +13760,12 @@ msgstr "Рекомендуется использовать ваше насто msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\"" -msgstr "" -"Примеры: \"Иван Иванов\", \"Оксана и Кони\", \"Футболист\", \"Тимур и его команда\"" +msgstr "Примеры: \"Иван Иванов\", \"Оксана и кони\", \"Футбол\", \"Тимур и его команда\"" #: ../../Zotlabs/Module/New_channel.php:162 msgid "" "This will be used to create a unique network address (like an email address)." -msgstr "" -"Это будет использовано для создания уникального сетевого адреса (наподобие email)." +msgstr "Это будет использовано для создания уникального сетевого адреса (наподобие email)." #: ../../Zotlabs/Module/New_channel.php:164 msgid "Allowed characters are a-z 0-9, - and _" @@ -14059,8 +14029,7 @@ msgstr "Превышено максимальное количество рег #: ../../Zotlabs/Module/Register.php:55 msgid "" "Please indicate acceptance of the Terms of Service. Registration failed." -msgstr "" -"Пожалуйста, подтвердите согласие с \"Условиями обслуживания\". Регистрация не удалась." +msgstr "Пожалуйста, подтвердите согласие с \"Условиями обслуживания\". Регистрация не удалась." #: ../../Zotlabs/Module/Register.php:89 msgid "Passwords do not match." @@ -14884,4 +14853,3 @@ msgstr "Загрузить файл" #: ../../Zotlabs/Storage/Browser.php:404 msgid "Drop files here to immediately upload" msgstr "Поместите файлы сюда для немедленной загрузки" - diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php index cedd38a31..b37c85888 100644 --- a/view/ru/hstrings.php +++ b/view/ru/hstrings.php @@ -533,15 +533,6 @@ App::$strings["No Order Found"] = "Нет найденных заказов"; App::$strings["An unknown error has occurred Please start again."] = "Произошла неизвестная ошибка. Пожалуйста, начните снова."; App::$strings["Invalid Payment Type. Please start again."] = "Недействительный тип платежа. Пожалуйста, начните снова."; App::$strings["Order not found"] = "Заказ не найден"; -App::$strings["Enable Paypal Button Module"] = "Включить модуль кнопки Paypal"; -App::$strings["Use Production Key"] = "Использовать ключ Production"; -App::$strings["Paypal Sandbox Client Key"] = "Ключ клиента Paypal Sandbox"; -App::$strings["Paypal Sandbox Secret Key"] = "Секретный ключ Paypal Sandbox"; -App::$strings["Paypal Production Client Key"] = "Ключ клиента Paypal Production"; -App::$strings["Paypal Production Secret Key"] = "Секретный ключ Paypal Production"; -App::$strings["Cart - Paypal Addon"] = "Корзина - Paypal плагин"; -App::$strings["Paypal button payments are not enabled."] = "Кнопка Paypal для платежей не включена."; -App::$strings["Paypal button payments are not properly configured. Please choose another payment option."] = "Кнопка Paypal для платежей настроена неправильно. Пожалуйста, используйте другой вариант оплаты."; App::$strings["Enable Hubzilla Services Module"] = "Включить модуль сервиса Hubzilla"; App::$strings["Cart - Hubzilla Services Addon"] = "Корзина - плагин сервиса Hubzilla"; App::$strings["New Sku"] = "Новый код"; @@ -558,6 +549,15 @@ App::$strings["Price"] = "Цена"; App::$strings["Add buyer to privacy group"] = "Добавить покупателя в группу безопасности"; App::$strings["Add buyer as connection"] = "Добавить покупателя как контакт"; App::$strings["Set Service Class"] = "Установить класс обслуживания"; +App::$strings["Enable Paypal Button Module"] = "Включить модуль кнопки Paypal"; +App::$strings["Use Production Key"] = "Использовать ключ Production"; +App::$strings["Paypal Sandbox Client Key"] = "Ключ клиента Paypal Sandbox"; +App::$strings["Paypal Sandbox Secret Key"] = "Секретный ключ Paypal Sandbox"; +App::$strings["Paypal Production Client Key"] = "Ключ клиента Paypal Production"; +App::$strings["Paypal Production Secret Key"] = "Секретный ключ Paypal Production"; +App::$strings["Cart - Paypal Addon"] = "Корзина - Paypal плагин"; +App::$strings["Paypal button payments are not enabled."] = "Кнопка Paypal для платежей не включена."; +App::$strings["Paypal button payments are not properly configured. Please choose another payment option."] = "Кнопка Paypal для платежей настроена неправильно. Пожалуйста, используйте другой вариант оплаты."; App::$strings["Access Denied."] = "Доступ запрещён."; App::$strings["Access Denied"] = "Доступ запрещён"; App::$strings["Invalid Item"] = "Недействительный элемент"; @@ -667,7 +667,7 @@ App::$strings["WordPress Post Settings"] = "Настройки публикац App::$strings["Wordpress Settings saved."] = "Настройки WordPress сохранены."; App::$strings["Who likes me?"] = "Кому я нравлюсь?"; App::$strings["Your account on %s will expire in a few days."] = "Ваш аккаунт на %s перестанет работать через несколько дней."; -App::$strings["Your $Productname test account is about to expire."] = "Срок действия пробного аккаунта в $Productname близок к окончанию."; +App::$strings["Your $Productname test account is about to expire."] = "Ваш тестовый аккаунт в $Productname близок к окончанию срока действия."; App::$strings["Create an account to access services and applications"] = "Создайте аккаунт для доступа к службам и приложениям"; App::$strings["Register"] = "Регистрация"; App::$strings["Logout"] = "Выход"; @@ -720,7 +720,7 @@ App::$strings["post"] = "публикация"; App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s была создана %2\$s %3\$s"; App::$strings["Click to open/close"] = "Нажмите, чтобы открыть/закрыть"; App::$strings["spoiler"] = "спойлер"; -App::$strings["View article"] = "Просмотр статей"; +App::$strings["View article"] = "Просмотр статьи"; App::$strings["View summary"] = "Просмотр резюме"; App::$strings["Different viewers will see this text differently"] = "Различные зрители увидят этот текст по-разному"; App::$strings["$1 wrote:"] = "$1 писал:"; @@ -757,8 +757,8 @@ App::$strings["This is an unsaved preview"] = "Это несохранённый App::$strings["__ctx:title__ Likes"] = "Нравится"; App::$strings["__ctx:title__ Dislikes"] = "Не нравится"; App::$strings["__ctx:title__ Agree"] = "Согласен"; -App::$strings["__ctx:title__ Disagree"] = "Против"; -App::$strings["__ctx:title__ Abstain"] = "Воздерживаюсь"; +App::$strings["__ctx:title__ Disagree"] = "Не согласен"; +App::$strings["__ctx:title__ Abstain"] = "Воздержался"; App::$strings["__ctx:title__ Attending"] = "Посещаю"; App::$strings["__ctx:title__ Not attending"] = "Не посещаю"; App::$strings["__ctx:title__ Might attend"] = "Возможно посещу"; @@ -899,11 +899,7 @@ App::$strings["__ctx:noun__ Not Attending"] = array( 1 => "Не посетят", 2 => "Не посетят", ); -App::$strings["__ctx:noun__ Undecided"] = array( - 0 => "Не решил", - 1 => "Не решили", - 2 => "Не решили", -); +App::$strings["__ctx:noun__ Undecided"] = "Не решил"; App::$strings["__ctx:noun__ Agree"] = array( 0 => "Согласен", 1 => "Согласны", @@ -1006,7 +1002,7 @@ App::$strings["Loading"] = "Загрузка"; App::$strings["@name, !forum, #tag, ?doc, content"] = "@name, !forum, #tag, ?docs, содержимое"; App::$strings["Please wait..."] = "Подождите пожалуйста ..."; App::$strings["Add Apps"] = "Добавить приложения"; -App::$strings["Arrange Apps"] = "Управление приложениями"; +App::$strings["Arrange Apps"] = "Упорядочить приложения"; App::$strings["Toggle System Apps"] = "Переключить системные приложения"; App::$strings["Calendar"] = "Календарь"; App::$strings["Articles"] = "Статьи"; @@ -1625,6 +1621,9 @@ App::$strings["Random Channel"] = "Случайный канал"; App::$strings["Invite"] = "Пригласить"; App::$strings["Features"] = "Функции"; App::$strings["Post"] = "Публикация"; +App::$strings["Profiles"] = "Редактировать профиль"; +App::$strings["Notifications"] = "Оповещения"; +App::$strings["Order Apps"] = "Порядок приложений"; App::$strings["Update"] = "Обновить"; App::$strings["Install"] = "Установить"; App::$strings["Purchase"] = "Купить"; @@ -1642,15 +1641,15 @@ App::$strings["Notification Settings"] = "Настройки уведомлен App::$strings["%s <!item_type!>"] = ""; App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname:Notify] Получено новое сообщение в %s"; App::$strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s отправил вам новое личное сообщение в %2\$s."; -App::$strings["%1\$s sent you %2\$s."] = "%1\$s послал вам %2\$s."; +App::$strings["%1\$s sent you %2\$s."] = "%1\$s отправил вам %2\$s."; App::$strings["a private message"] = "личное сообщение"; App::$strings["Please visit %s to view and/or reply to your private messages."] = "Пожалуйста, посетите %s для просмотра и/или ответа на ваши личные сообщения."; App::$strings["commented on"] = "прокомментировал"; App::$strings["liked"] = "понравилось"; App::$strings["disliked"] = "не понравилось"; -App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = ""; -App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = ""; -App::$strings["%1\$s %2\$s [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s%2\$s [zrl=%3\$s]ваш %4\$s[/zrl]"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]%4\$s[/zrl]"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]%5\$s %4\$s[/zrl]"; +App::$strings["%1\$s %2\$s [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]ваш %4\$s[/zrl]"; App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notify] Отмодерирован комментарий к беседе #%1\$d по %2\$s"; App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notify] Комментарий к беседе #%1\$d по %2\$s"; App::$strings["%1\$s commented on an item/conversation you have been following."] = "%1\$s прокомментировал тему / беседу за которым вы следите."; @@ -1982,7 +1981,7 @@ App::$strings["Page owner information could not be retrieved."] = "Информ App::$strings["Album not found."] = "Альбом не найден."; App::$strings["Delete Album"] = "Удалить альбом"; App::$strings["Delete Photo"] = "Удалить фотографию"; -App::$strings["Public access denied."] = "Общественный доступ запрещен."; +App::$strings["Public access denied."] = "Публичный доступ запрещен."; App::$strings["No photos selected"] = "Никакие фотографии не выбраны"; App::$strings["Access to this item is restricted."] = "Доступ к этому элементу ограничен."; App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "Вы использовали %1$.2f мегабайт из %2$.2f для хранения фото."; @@ -2143,7 +2142,7 @@ App::$strings["Selected channel has private message restrictions. Send failed."] App::$strings["Messages"] = "Сообщения"; App::$strings["message"] = "сообщение"; App::$strings["Message recalled."] = "Сообщение отозванно."; -App::$strings["Conversation removed."] = "Разговор удален."; +App::$strings["Conversation removed."] = "Беседа удалена."; App::$strings["Expires YYYY-MM-DD HH:MM"] = "Истекает YYYY-MM-DD HH:MM"; App::$strings["Requested channel is not in this network"] = "Запрашиваемый канал не доступен."; App::$strings["Send Private Message"] = "Отправить личное сообщение"; @@ -2156,7 +2155,7 @@ App::$strings["Delete message"] = "Удалить сообщение"; App::$strings["Delivery report"] = "Отчёт о доставке"; App::$strings["Recall message"] = "Отозвать сообщение"; App::$strings["Message has been recalled."] = "Сообщение отозванно"; -App::$strings["Delete Conversation"] = "Удалить разговор"; +App::$strings["Delete Conversation"] = "Удалить беседу"; App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Безопасная связь недоступна. Вы <strong>можете</strong> попытаться ответить со страницы профиля отправителя."; App::$strings["Send Reply"] = "Отправить ответ"; App::$strings["Your message for %s (%s):"] = "Ваше сообщение для %s (%s):"; @@ -2279,7 +2278,7 @@ App::$strings["Show URL to this file"] = "Показать URL этого фай App::$strings["Show in your contacts shared folder"] = "Показать общий каталог в ваших контактах"; App::$strings["Post not found."] = "Публикация не найдена"; App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s отметил тегом %2\$s %3\$s с %4\$s"; -App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Бля бля бля Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; +App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = ""; App::$strings["Block Name"] = "Название блока"; App::$strings["Edit Block"] = "Редактировать блок"; App::$strings["Item is not editable"] = "Элемент нельзя редактировать"; @@ -2608,6 +2607,7 @@ App::$strings["Only allow new member registrations with an invitation code. Abov App::$strings["Minimum age"] = "Минимальный возраст"; App::$strings["Minimum age (in years) for who may register on this site."] = "Минимальный возраст (в годах) для регистрации на этом сайте."; App::$strings["Which best describes the types of account offered by this hub?"] = "Как лучше описать тип учётных записей предлагаемых на этом хабе?"; +App::$strings["This is displayed on the public server site list."] = "Это отображается в списке общедоступных серверов."; App::$strings["Register text"] = "Текст регистрации"; App::$strings["Will be displayed prominently on the registration page."] = "Будет отображаться на странице регистрации на видном месте."; App::$strings["Site homepage to show visitors (default: login box)"] = "Домашняя страница, которая будет показываться посетителям сайт (по умочанию - форма входа)."; @@ -2659,11 +2659,11 @@ App::$strings["Maximum Load Average"] = "Максимальная средняя App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Максимальная нагрузка системы для откладывания процессов опроса и доставки - по умолчанию 50."; App::$strings["Expiration period in days for imported (grid/network) content"] = "Срок хранения в днях для импортированного содержимого (из матрицы / сети)."; App::$strings["0 for no expiration of imported content"] = "0 для постоянного хранения импортированного содержимого"; -App::$strings["Do not expire any posts which have comments less than this many days ago"] = "Продлевать строк хранения для любых публикаций, которые имею комментарии возрастом менее этого значения"; +App::$strings["Do not expire any posts which have comments less than this many days ago"] = "Продлевать строк хранения для любых публикаций, которые имеют комментарии возрастом менее этого значения"; App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = "Публичные серверы: необязательная маркетинговая лэндинг-страница для новых пользователей"; App::$strings["Create this page first. Default is %s/register"] = "Создать эту страницу первой. По умолчанию %s/register"; App::$strings["Page to display after creating a new channel"] = "Страница для показа после создания нового канала"; -App::$strings["Default: profiles"] = "По умолчанию: профили"; +App::$strings["Default: profiles"] = "По умолчанию: profiles"; App::$strings["Optional: site location"] = "Необязательно: место размещения сайта"; App::$strings["Region or country"] = "Регион или страна"; App::$strings["Log settings updated."] = "Настройки журнала обновлены."; @@ -2798,7 +2798,7 @@ App::$strings["Uncensor"] = "Нецензурировать"; App::$strings["Allow Code"] = "Разрешить код"; App::$strings["Disallow Code"] = "Запретить код"; App::$strings["UID"] = ""; -App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Выбранные каналы будут удалены!\n\nВсё что было опубликовано в этих каналах на этом сайте будет удалено навсегда!\n\nВы уверены?"; +App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Этот аккаунт {0} будет удалён!\n\nВсё что им было опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?"; App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "Канал {0} будет удалён!\n\nВсё что было опубликовано в этом канале на этом сайте будет удалено навсегда!\n\nВы уверены?"; App::$strings["Token verification failed."] = "Не удалось выполнить проверку токена."; App::$strings["Email Verification Required"] = "Требуется проверка адреса email"; @@ -3113,7 +3113,7 @@ App::$strings["Visit %s's profile [%s]"] = "Посетить %s профи App::$strings["View Connections"] = "Просмотр контактов"; App::$strings["Authentication failed."] = "Ошибка аутентификации."; App::$strings["Your real name is recommended."] = "Рекомендуется использовать ваше настоящее имя."; -App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Примеры: \"Иван Иванов\", \"Оксана и Кони\", \"Футболист\", \"Тимур и его команда\""; +App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Примеры: \"Иван Иванов\", \"Оксана и кони\", \"Футбол\", \"Тимур и его команда\""; App::$strings["This will be used to create a unique network address (like an email address)."] = "Это будет использовано для создания уникального сетевого адреса (наподобие email)."; App::$strings["Allowed characters are a-z 0-9, - and _"] = "Разрешённые символы a-z 0-9, - и _"; App::$strings["Channel name"] = "Название канала"; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 970e4bc89..943b27637 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -33,7 +33,12 @@ aside #region_1 { } aside #left_aside_wrapper { - margin-bottom: 10px; + /*margin-bottom: 10px;*/ + margin-bottom: $bottom_margin; +} +aside #right_aside_wrapper { + /*margin-bottom: 10px;*/ + margin-bottom: $bottom_margin; } main { @@ -42,6 +47,10 @@ main { max-width: $main_widthpx; } +main #region_2 { + margin-bottom: $bottom_margin; +} + #overlay { position: absolute; top: 0; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 91cc0b85b..0631fa142 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -106,6 +106,8 @@ if(! $top_photo) $top_photo = '2.3rem'; if(! $reply_photo) $reply_photo = '2.3rem'; +if(! $bottom_margin) + $bottom_margin = '200px'; // Apply the settings if(file_exists('view/theme/redbasic/css/style.css')) { @@ -150,7 +152,9 @@ if(file_exists('view/theme/redbasic/css/style.css')) { '$pmenu_top' => $pmenu_top, '$pmenu_reply' => $pmenu_reply, '$main_width' => $main_width, - '$aside_width' => $aside_width + '$aside_width' => $aside_width, + '$bottom_margin' => $bottom_margin + ); echo str_replace(array_keys($options), array_values($options), $x); diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index ac6af40e9..05c3d7ae0 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -175,6 +175,10 @@ {{if $item.drop.dropping}} <a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a> {{/if}} + {{if $item.dropdown_extras}} + <div class="dropdown-divider"></div> + {{$item.dropdown_extras}} + {{/if}} {{if $item.edpost && $item.dreport}} <div class="dropdown-divider"></div> <a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a> diff --git a/view/tpl/nwiki_page_history.tpl b/view/tpl/nwiki_page_history.tpl index b1c6c9284..6926cca2d 100644 --- a/view/tpl/nwiki_page_history.tpl +++ b/view/tpl/nwiki_page_history.tpl @@ -43,17 +43,17 @@ {{foreach $pageHistory as $commit}} <tr class="wikis-index-row"><td> <table id="rev-{{$commit.revision}}" onclick="$('#details-{{$commit.revision}}').show()" style="width: 100%;"> - <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td> + <tr><td width="10%">{{$date_lbl}}</td><td width="70%">{{$commit.date}}</td> <td rowspan="3" width="20%" align="right"> - {{if $permsWrite}} - <button id="revert-{{$commit.revision}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.revision}}')">Revert</button> + {{if $permsWrite}} + <button id="revert-{{$commit.revision}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.revision}}')">{{$revert_btn}}</button> <br><br> - {{/if}} - <button id="compare-{{$commit.revision}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.revision}}')">Compare</button> + {{/if}} + <button id="compare-{{$commit.revision}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.revision}}')">{{$compare_btn}}</button> </td></tr> <tr><td>{{$name_lbl}}</td><td>{{$commit.name}}</td></tr> <tr><td>{{$msg_label}}</td><td>{{$commit.title}}</td></tr> </table> </td></tr> - {{/foreach}} -</table> + {{/foreach}} +</table>
\ No newline at end of file diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 6ca4b0c77..0f725749f 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -42,8 +42,8 @@ <div id="wiki-content-container" class="section-content-wrapper"> <ul class="nav nav-tabs" id="wiki-nav-tabs"> <li class="nav-item" id="edit-pane-tab"><a class="nav-link" data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li> - <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li> - <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li> + <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">{{$view_lbl}}</a></li> + <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">{{$history_lbl}}</a></li> </ul> <div class="tab-content" id="wiki-page-tabs"> <div id="edit-pane" class="tab-pane"> |