diff --git a/.gitignore b/.gitignore index aee99119b0..dc0550dbca 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,17 @@ node_modules # test oc-includes/osclass/t/config.php oc-includes/simpletest/test/osclass/custom_config.php + + +# Created by https://www.gitignore.io/api/composer + +### Composer ### +composer.phar +/vendor/ + +# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file +# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file +# composer.lock + +# End of https://www.gitignore.io/api/composer + diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..61c9c4213d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: php +php: + - '5.6' + - '7.0' + - '7.1' +install: composer install +script: vendor/bin/phpunit diff --git a/composer.json b/composer.json new file mode 100644 index 0000000000..d93892b292 --- /dev/null +++ b/composer.json @@ -0,0 +1,19 @@ +{ + "name": "osclass/Osclass", + "description": "Osclass is your one-stop shop to building your own classifieds marketplace", + "license": "Apache-2.0", + "type": "project", + "authors": [ + { + "name": "Christopher Silva", + "email": "xiris@xiris.com.br" + }, + { + "name": "Blackleg", + "email": "hectorespertpardo@gmail.com" + } + ], + "require-dev": { + "phpunit/phpunit": "^5.7" + } +} diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000000..43ae0cd565 --- /dev/null +++ b/composer.lock @@ -0,0 +1,1332 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "hash": "2533ce20a280c03a8039b59670f8c572", + "content-hash": "8dc4b281cce232048b14c521b421884f", + "packages": [], + "packages-dev": [ + { + "name": "doctrine/instantiator", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "shasum": "" + }, + "require": { + "php": ">=5.3,<8.0-DEV" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2015-06-14 21:17:01" + }, + { + "name": "myclabs/deep-copy", + "version": "1.6.1", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102", + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "doctrine/collections": "1.*", + "phpunit/phpunit": "~4.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "homepage": "https://github.com/myclabs/DeepCopy", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "time": "2017-04-12 18:52:22" + }, + { + "name": "phpdocumentor/reflection-common", + "version": "1.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", + "keywords": [ + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" + ], + "time": "2015-12-27 11:43:31" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "phpdocumentor/reflection-common": "^1.0@dev", + "phpdocumentor/type-resolver": "^0.2.0", + "webmozart/assert": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^4.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "time": "2016-09-30 07:12:33" + }, + { + "name": "phpdocumentor/type-resolver", + "version": "0.2.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "phpdocumentor/reflection-common": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^5.2||^4.8.24" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "time": "2016-11-25 06:54:22" + }, + { + "name": "phpspec/prophecy", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", + "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "sebastian/comparator": "^1.1|^2.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0" + }, + "require-dev": { + "phpspec/phpspec": "^2.5|^3.2", + "phpunit/phpunit": "^4.8 || ^5.6.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-0": { + "Prophecy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "time": "2017-03-02 20:05:34" + }, + { + "name": "phpunit/php-code-coverage", + "version": "4.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": "^5.6 || ^7.0", + "phpunit/php-file-iterator": "^1.3", + "phpunit/php-text-template": "^1.2", + "phpunit/php-token-stream": "^1.4.2 || ^2.0", + "sebastian/code-unit-reverse-lookup": "^1.0", + "sebastian/environment": "^1.3.2 || ^2.0", + "sebastian/version": "^1.0 || ^2.0" + }, + "require-dev": { + "ext-xdebug": "^2.1.4", + "phpunit/phpunit": "^5.7" + }, + "suggest": { + "ext-xdebug": "^2.5.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2017-04-02 07:44:40" + }, + { + "name": "phpunit/php-file-iterator", + "version": "1.4.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "time": "2016-10-03 07:40:28" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2015-06-21 13:50:34" + }, + { + "name": "phpunit/php-timer", + "version": "1.0.9", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2017-02-26 11:10:40" + }, + { + "name": "phpunit/php-token-stream", + "version": "1.4.11", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7", + "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2017-02-27 10:12:30" + }, + { + "name": "phpunit/phpunit", + "version": "5.7.21", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3b91adfb64264ddec5a2dee9851f354aa66327db", + "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "myclabs/deep-copy": "~1.3", + "php": "^5.6 || ^7.0", + "phpspec/prophecy": "^1.6.2", + "phpunit/php-code-coverage": "^4.0.4", + "phpunit/php-file-iterator": "~1.4", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": "^1.0.6", + "phpunit/phpunit-mock-objects": "^3.2", + "sebastian/comparator": "^1.2.4", + "sebastian/diff": "^1.4.3", + "sebastian/environment": "^1.3.4 || ^2.0", + "sebastian/exporter": "~2.0", + "sebastian/global-state": "^1.1", + "sebastian/object-enumerator": "~2.0", + "sebastian/resource-operations": "~1.0", + "sebastian/version": "~1.0.3|~2.0", + "symfony/yaml": "~2.1|~3.0" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "3.0.2" + }, + "require-dev": { + "ext-pdo": "*" + }, + "suggest": { + "ext-xdebug": "*", + "phpunit/php-invoker": "~1.1" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.7.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": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2017-06-21 08:11:54" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "3.4.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "a23b761686d50a560cc56233b9ecf49597cc9118" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118", + "reference": "a23b761686d50a560cc56233b9ecf49597cc9118", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": "^5.6 || ^7.0", + "phpunit/php-text-template": "^1.2", + "sebastian/exporter": "^1.2 || ^2.0" + }, + "conflict": { + "phpunit/phpunit": "<5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.4" + }, + "suggest": { + "ext-soap": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ], + "time": "2017-06-30 09:13:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "time": "2017-03-04 06:30:41" + }, + { + "name": "sebastian/comparator", + "version": "1.2.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/diff": "~1.2", + "sebastian/exporter": "~1.2 || ~2.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2017-01-29 09:50:25" + }, + { + "name": "sebastian/diff", + "version": "1.4.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2017-05-22 07:24:03" + }, + { + "name": "sebastian/environment", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2016-11-26 07:53:53" + }, + { + "name": "sebastian/exporter", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/recursion-context": "~2.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2016-11-19 08:54:04" + }, + { + "name": "sebastian/global-state", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2015-10-12 03:26:01" + }, + { + "name": "sebastian/object-enumerator", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", + "shasum": "" + }, + "require": { + "php": ">=5.6", + "sebastian/recursion-context": "~2.0" + }, + "require-dev": { + "phpunit/phpunit": "~5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "time": "2017-02-18 15:18:39" + }, + { + "name": "sebastian/recursion-context", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2016-11-19 07:33:16" + }, + { + "name": "sebastian/resource-operations", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "shasum": "" + }, + "require": { + "php": ">=5.6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2015-07-28 20:34:47" + }, + { + "name": "sebastian/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.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": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2016-10-03 07:35:21" + }, + { + "name": "symfony/yaml", + "version": "v3.3.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "1f93a8d19b8241617f5074a123e282575b821df8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/1f93a8d19b8241617f5074a123e282575b821df8", + "reference": "1f93a8d19b8241617f5074a123e282575b821df8", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "require-dev": { + "symfony/console": "~2.8|~3.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "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 Yaml Component", + "homepage": "https://symfony.com", + "time": "2017-06-15 12:58:50" + }, + { + "name": "webmozart/assert", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", + "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2016-11-23 20:04:58" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [] +} diff --git a/oc-admin/ajax/ajax.php b/oc-admin/ajax/ajax.php index 9d80d4b177..933b99666b 100755 --- a/oc-admin/ajax/ajax.php +++ b/oc-admin/ajax/ajax.php @@ -123,6 +123,8 @@ function doModel() $result = array( 'ok' => __("Order saved")); } + osc_run_hook('edited_category_order', $error); + echo json_encode($result); break; case 'category_edit_iframe': diff --git a/oc-admin/login.php b/oc-admin/login.php index 9a4a71753f..78c47ab277 100755 --- a/oc-admin/login.php +++ b/oc-admin/login.php @@ -116,7 +116,10 @@ function doModel() // post execution to recover the password $admin = Admin::newInstance()->findByEmail( Params::getParam('email') ); - if( $admin ) { + if(!isset($admin['pk_i_id'])) { + $admin = Admin::newInstance()->findByUsername(Params::getParam('email')); + } + if( isset($admin['pk_i_id']) ) { if( (osc_recaptcha_private_key() != '') ) { if( !osc_check_recaptcha() ) { osc_add_flash_error_message( _m('The reCAPTCHA code is wrong'), 'admin'); diff --git a/oc-content/languages/en_US/core.mo b/oc-content/languages/en_US/core.mo index 9483ea03a2..c195d347bf 100644 Binary files a/oc-content/languages/en_US/core.mo and b/oc-content/languages/en_US/core.mo differ diff --git a/oc-content/languages/en_US/core.po b/oc-content/languages/en_US/core.po index 59f3a326a2..80baf60caf 100644 --- a/oc-content/languages/en_US/core.po +++ b/oc-content/languages/en_US/core.po @@ -8,9 +8,12 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2016-12-12 04:46++0100\n" +"PO-Revision-Date: 2017-04-24 09:01+0100\n" "Last-Translator: Translations \n" "Language-Team: Translations \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: en_US\n" +"X-Generator: Poedit 1.6.10\n" #: index.php:50 oc-admin/themes/modern/tools/maintenance.php:38 msgid "Maintenance » %s" @@ -37,9 +40,9 @@ msgid "Edit" msgstr "" #: oc-admin/admins.php:323 oc-admin/admins.php:363 oc-admin/comments.php:257 -#: oc-admin/items.php:822 oc-admin/languages.php:366 oc-admin/languages.php:422 -#: oc-admin/media.php:135 oc-admin/pages.php:277 oc-admin/plugins.php:338 -#: oc-admin/themes/modern/admins/index.php:175 +#: oc-admin/items.php:822 oc-admin/languages.php:366 +#: oc-admin/languages.php:422 oc-admin/media.php:135 oc-admin/pages.php:277 +#: oc-admin/plugins.php:338 oc-admin/themes/modern/admins/index.php:175 #: oc-admin/themes/modern/admins/index.php:186 #: oc-admin/themes/modern/appearance/index.php:107 #: oc-admin/themes/modern/appearance/widgets.php:87 @@ -320,7 +323,8 @@ msgstr "" msgid "Type your new password" msgstr "" -#: oc-admin/gui/forgot_password.php:46 oc-admin/themes/modern/admins/frm.php:96 +#: oc-admin/gui/forgot_password.php:46 +#: oc-admin/themes/modern/admins/frm.php:96 #: oc-admin/themes/modern/users/frm.php:298 msgid "New password" msgstr "" @@ -353,7 +357,8 @@ msgstr "" msgid "Username" msgstr "" -#: oc-admin/gui/login.php:47 oc-admin/themes/modern/settings/mailserver.php:133 +#: oc-admin/gui/login.php:47 +#: oc-admin/themes/modern/settings/mailserver.php:133 #: oc-admin/themes/modern/users/frm.php:296 #: oc-includes/osclass/install-functions.php:695 #: oc-includes/osclass/install-functions.php:805 @@ -578,7 +583,10 @@ msgid "Admin type (required)" msgstr "" #: oc-admin/themes/modern/admins/frm.php:82 -msgid "Administrators have total control over all aspects of your installation, while moderators are only allowed to moderate listings, comments and media files" +msgid "" +"Administrators have total control over all aspects of your installation, " +"while moderators are only allowed to moderate listings, comments and media " +"files" msgstr "" #: oc-admin/themes/modern/admins/frm.php:88 @@ -586,7 +594,9 @@ msgid "Current password" msgstr "" #: oc-admin/themes/modern/admins/frm.php:91 -msgid "If you want to change your password, type your current password here. Otherwise, leave this blank." +msgid "" +"If you want to change your password, type your current password here. " +"Otherwise, leave this blank." msgstr "" #: oc-admin/themes/modern/admins/frm.php:103 @@ -648,7 +658,10 @@ msgid "Cancel" msgstr "" #: oc-admin/themes/modern/admins/index.php:19 -msgid "Add users who can manage your page. You can add admins or moderators: admins have access to the whole admin panel while moderators can only modify listings and see stats." +msgid "" +"Add users who can manage your page. You can add admins or moderators: admins " +"have access to the whole admin panel while moderators can only modify " +"listings and see stats." msgstr "" #: oc-admin/themes/modern/admins/index.php:24 @@ -737,7 +750,9 @@ msgid "Are you sure you want to delete this admin?" msgstr "" #: oc-admin/themes/modern/appearance/add.php:19 -msgid "Manually add Osclass themes in .zip format. If you prefer, you can manually upload the decompressed theme to oc-content/themes." +msgid "" +"Manually add Osclass themes in .zip format. If you prefer, you can manually " +"upload the decompressed theme to oc-content/themes." msgstr "" #: oc-admin/themes/modern/appearance/add.php:25 @@ -775,13 +790,18 @@ msgid "Can't install a new theme" msgstr "" #: oc-admin/themes/modern/appearance/add.php:65 -msgid "The theme folder is not writable on your server so you can't upload themes from the administration panel. Please make the theme folder writable and try again." +msgid "" +"The theme folder is not writable on your server so you can't upload themes " +"from the administration panel. Please make the theme folder writable and try " +"again." msgstr "" #: oc-admin/themes/modern/appearance/add.php:68 #: oc-admin/themes/modern/languages/add.php:61 #: oc-admin/themes/modern/plugins/add.php:68 -msgid "To make the directory writable under UNIX execute this command from the shell:" +msgid "" +"To make the directory writable under UNIX execute this command from the " +"shell:" msgstr "" #: oc-admin/themes/modern/appearance/add.php:83 @@ -931,7 +951,11 @@ msgid "Delete theme" msgstr "" #: oc-admin/themes/modern/appearance/index.php:48 -msgid "Change your site's look and feel by activating a theme among those available. You can download new themes from the market. Be careful: if your theme has been customized, you'll lose all changes if you change to a new theme." +msgid "" +"Change your site's look and feel by activating a theme among those " +"available. You can download new themes from the market. " +"Be careful: if your theme has been customized, you'll lose " +"all changes if you change to a new theme." msgstr "" #: oc-admin/themes/modern/appearance/index.php:56 @@ -968,7 +992,8 @@ msgid "Update" msgstr "" #: oc-admin/themes/modern/appearance/index.php:173 -msgid "This action can not be undone. Are you sure you want to delete the theme?" +msgid "" +"This action can not be undone. Are you sure you want to delete the theme?" msgstr "" #: oc-admin/themes/modern/appearance/index.php:194 @@ -988,7 +1013,8 @@ msgstr "" #: oc-admin/themes/modern/appearance/index.php:201 #: oc-admin/themes/modern/functions.php:345 #: oc-admin/themes/modern/languages/index.php:245 -msgid "The theme has been downloaded correctly, proceed to activate or preview it." +msgid "" +"The theme has been downloaded correctly, proceed to activate or preview it." msgstr "" #: oc-admin/themes/modern/appearance/index.php:203 @@ -1011,7 +1037,9 @@ msgid "Close" msgstr "" #: oc-admin/themes/modern/appearance/widgets.php:23 -msgid "Modify your site's header or footer here. Only works with compatible themes, such as those available in the market." +msgid "" +"Modify your site's header or footer here. Only works with compatible themes, " +"such as those available in the market." msgstr "" #: oc-admin/themes/modern/appearance/widgets.php:42 @@ -1063,7 +1091,8 @@ msgid "Enable / Disable the price field" msgstr "" #: oc-admin/themes/modern/categories/iframe.php:40 -msgid "Apply the expiration date and price field changes to children categories" +msgid "" +"Apply the expiration date and price field changes to children categories" msgstr "" #: oc-admin/themes/modern/categories/iframe.php:91 @@ -1072,7 +1101,11 @@ msgid "Ajax error, please try again." msgstr "" #: oc-admin/themes/modern/categories/index.php:24 -msgid "Add, edit or delete the categories or subcategories in which users can post listings. Reorder sections by dragging and dropping, or nest a subcategory in an expanded category. Be careful: If you delete a category, all listings associated will also be deleted!" +msgid "" +"Add, edit or delete the categories or subcategories in which users can post " +"listings. Reorder sections by dragging and dropping, or nest a subcategory " +"in an expanded category. Be careful: If you delete a " +"category, all listings associated will also be deleted!" msgstr "" #: oc-admin/themes/modern/categories/index.php:29 @@ -1101,7 +1134,9 @@ msgid "Ajax error, try again." msgstr "" #: oc-admin/themes/modern/categories/index.php:363 -msgid "Drag&drop the categories to reorder them the way you like. Click on edit link to edit the category" +msgid "" +"Drag&drop the categories to reorder them the way you like. Click on edit " +"link to edit the category" msgstr "" #: oc-admin/themes/modern/categories/index.php:378 @@ -1109,7 +1144,9 @@ msgid "Delete category" msgstr "" #: oc-admin/themes/modern/categories/index.php:381 -msgid "WARNING: This will also delete the listings under that category. This action cannot be undone. Are you sure you want to continue?" +msgid "" +"WARNING: This will also delete the listings under that " +"category. This action cannot be undone. Are you sure you want to continue?" msgstr "" #: oc-admin/themes/modern/comments/frm.php:25 @@ -1209,7 +1246,9 @@ msgid "Comment" msgstr "" #: oc-admin/themes/modern/comments/index.php:19 -msgid "Manage the comments that users publish on the listings on your site. You can also edit, delete, activate or block comments." +msgid "" +"Manage the comments that users publish on the listings on your site. You can " +"also edit, delete, activate or block comments." msgstr "" #: oc-admin/themes/modern/comments/index.php:25 @@ -1297,7 +1336,10 @@ msgid "Legend" msgstr "" #: oc-admin/themes/modern/emails/index.php:19 -msgid "Modify the emails your site's users receive when they join your site, when someone shows interest in their ad, to recover their password... Be careful: don't modify any of the words that appear within brackets." +msgid "" +"Modify the emails your site's users receive when they join your site, when " +"someone shows interest in their ad, to recover their password... Be " +"careful: don't modify any of the words that appear within brackets." msgstr "" #: oc-admin/themes/modern/emails/index.php:32 @@ -1363,7 +1405,10 @@ msgid "At least one option is required." msgstr "" #: oc-admin/themes/modern/fields/index.php:25 -msgid "Create new fields for users to fill out when they publish a listing. You can require extra information such as the number of bedrooms in real estate listings or fuel type in car listings, for example." +msgid "" +"Create new fields for users to fill out when they publish a listing. You can " +"require extra information such as the number of bedrooms in real estate " +"listings or fuel type in car listings, for example." msgstr "" #: oc-admin/themes/modern/fields/index.php:32 @@ -1483,7 +1528,9 @@ msgid "Buy" msgstr "" #: oc-admin/themes/modern/functions.php:340 -msgid "Warning! This package is not compatible with your current version of Osclass (%s)" +msgid "" +"Warning! This package is not compatible with your current version of Osclass " +"(%s)" msgstr "" #: oc-admin/themes/modern/functions.php:341 @@ -1495,12 +1542,15 @@ msgid "Ok, proceed anyway" msgstr "" #: oc-admin/themes/modern/functions.php:343 -msgid "Warning! This theme is not compatible with your current version of Osclass (%s)" +msgid "" +"Warning! This theme is not compatible with your current version of Osclass " +"(%s)" msgstr "" #: oc-admin/themes/modern/functions.php:348 #: oc-admin/themes/modern/plugins/index.php:292 -msgid "The plugin has been downloaded correctly, proceed to install and configure." +msgid "" +"The plugin has been downloaded correctly, proceed to install and configure." msgstr "" #: oc-admin/themes/modern/functions.php:351 @@ -1620,7 +1670,9 @@ msgstr "" #: oc-admin/themes/modern/items/frm.php:258 #: oc-admin/themes/modern/items/frm.php:266 -msgid "It could be an integer (days from original publishing date it will be expired, 0 to never expire) or a date in the format \"yyyy-mm-dd hh:mm:ss\"" +msgid "" +"It could be an integer (days from original publishing date it will be " +"expired, 0 to never expire) or a date in the format \"yyyy-mm-dd hh:mm:ss\"" msgstr "" #: oc-admin/themes/modern/items/frm.php:261 @@ -1628,7 +1680,10 @@ msgid "Update expiration?" msgstr "" #: oc-admin/themes/modern/items/index.php:21 -msgid "Manage all the listings on your site: edit, delete or block the latest listings published. You can also filter by several parameters: user, region, city, etc." +msgid "" +"Manage all the listings on your site: edit, delete or block the latest " +"listings published. You can also filter by several parameters: user, region, " +"city, etc." msgstr "" #: oc-admin/themes/modern/items/index.php:26 @@ -1759,7 +1814,10 @@ msgid "Are you sure you want to delete this listing?" msgstr "" #: oc-admin/themes/modern/items/reported.php:19 -msgid "From here, you can edit or delete the listings reported by users (spam, misclassified, duplicate, expired, offensive). You can also delete the report if you consider it mistaken." +msgid "" +"From here, you can edit or delete the listings reported by users (spam, " +"misclassified, duplicate, expired, offensive). You can also delete the " +"report if you consider it mistaken." msgstr "" #: oc-admin/themes/modern/items/reported.php:32 @@ -1776,7 +1834,8 @@ msgid "Are you sure you want to %s the selected items?" msgstr "" #: oc-admin/themes/modern/items/reported.php:140 -msgid "Are you sure you want to clear all the reportings of the selected items?" +msgid "" +"Are you sure you want to clear all the reportings of the selected items?" msgstr "" #: oc-admin/themes/modern/items/reported.php:140 @@ -1785,7 +1844,8 @@ msgid "Clear All" msgstr "" #: oc-admin/themes/modern/items/reported.php:141 -msgid "Are you sure you want to clear the spam reportings of the selected items?" +msgid "" +"Are you sure you want to clear the spam reportings of the selected items?" msgstr "" #: oc-admin/themes/modern/items/reported.php:141 @@ -1794,7 +1854,9 @@ msgid "Clear Spam" msgstr "" #: oc-admin/themes/modern/items/reported.php:142 -msgid "Are you sure you want to clear the misclassified reportings of the selected items?" +msgid "" +"Are you sure you want to clear the misclassified reportings of the selected " +"items?" msgstr "" #: oc-admin/themes/modern/items/reported.php:142 @@ -1802,7 +1864,9 @@ msgid "Clear Missclassified" msgstr "" #: oc-admin/themes/modern/items/reported.php:143 -msgid "Are you sure you want to clear the duplicated reportings of the selected items?" +msgid "" +"Are you sure you want to clear the duplicated reportings of the selected " +"items?" msgstr "" #: oc-admin/themes/modern/items/reported.php:143 @@ -1811,7 +1875,8 @@ msgid "Clear Duplicated" msgstr "" #: oc-admin/themes/modern/items/reported.php:144 -msgid "Are you sure you want to clear the expired reportings of the selected items?" +msgid "" +"Are you sure you want to clear the expired reportings of the selected items?" msgstr "" #: oc-admin/themes/modern/items/reported.php:144 @@ -1820,7 +1885,9 @@ msgid "Clear Expired" msgstr "" #: oc-admin/themes/modern/items/reported.php:145 -msgid "Are you sure you want to clear the offensive reportings of the selected items?" +msgid "" +"Are you sure you want to clear the offensive reportings of the selected " +"items?" msgstr "" #: oc-admin/themes/modern/items/reported.php:145 @@ -1829,7 +1896,10 @@ msgid "Clear Offensive" msgstr "" #: oc-admin/themes/modern/items/settings.php:19 -msgid "Modify the general settings for your listings. Decide if users have to register in order to publish something, the number of pictures allowed for each listing, etc." +msgid "" +"Modify the general settings for your listings. Decide if users have to " +"register in order to publish something, the number of pictures allowed for " +"each listing, etc." msgstr "" #: oc-admin/themes/modern/items/settings.php:57 @@ -1857,7 +1927,9 @@ msgid "Users have to validate their listings" msgstr "" #: oc-admin/themes/modern/items/settings.php:94 -msgid "After %s validated listings the user doesn't need to validate the listings any more" +msgid "" +"After %s validated listings the user doesn't need to validate the listings " +"any more" msgstr "" #: oc-admin/themes/modern/items/settings.php:96 @@ -1915,7 +1987,9 @@ msgid "days" msgstr "" #: oc-admin/themes/modern/items/settings.php:161 -msgid "This option will send an email X days before an ad expires to the author. 0 for no email." +msgid "" +"This option will send an email X days before an ad expires to the author. 0 " +"for no email." msgstr "" #: oc-admin/themes/modern/items/settings.php:164 @@ -1969,7 +2043,10 @@ msgid "Can't install a new language" msgstr "" #: oc-admin/themes/modern/languages/add.php:58 -msgid "The translations folder is not writable on your server so you can't upload translations from the administration panel. Please make the translation folder writable and try again." +msgid "" +"The translations folder is not writable on your server so you can't upload " +"translations from the administration panel. Please make the translation " +"folder writable and try again." msgstr "" #: oc-admin/themes/modern/languages/frm.php:28 @@ -2018,7 +2095,9 @@ msgid "Enabled for the backoffice (oc-admin)" msgstr "" #: oc-admin/themes/modern/languages/index.php:19 -msgid "Add, edit or delete the language in which your Osclass is displayed, both the part that's viewable by users and the admin panel." +msgid "" +"Add, edit or delete the language in which your Osclass is displayed, both " +"the part that's viewable by users and the admin panel." msgstr "" #: oc-admin/themes/modern/languages/index.php:33 @@ -2175,12 +2254,17 @@ msgid "Disconnect from Market" msgstr "" #: oc-admin/themes/modern/market/header.php:73 -msgid "Sorry, the market is currently unavailable. Please try again in a few moments." +msgid "" +"Sorry, the market is currently unavailable. Please try again in a few " +"moments." msgstr "" #: oc-admin/themes/modern/market/header.php:115 #: oc-admin/themes/modern/settings/index.php:88 -msgid "You are going to be disconnected from the Market, all your plugins and themes downloaded will remain installed and configured but you will not be able to update or download new plugins and themes. Are you sure?" +msgid "" +"You are going to be disconnected from the Market, all your plugins and " +"themes downloaded will remain installed and configured but you will not be " +"able to update or download new plugins and themes. Are you sure?" msgstr "" #: oc-admin/themes/modern/market/header.php:144 @@ -2200,11 +2284,15 @@ msgid "Connecting... please wait" msgstr "" #: oc-admin/themes/modern/market/header.php:157 -msgid "Connect your oc-admin to your Market account!" +msgid "" +"Connect your oc-admin to your Market " +"account!" msgstr "" #: oc-admin/themes/modern/market/header.php:159 -msgid "Your purchased items on Osclass Market will automatically appear on My Purchases tab." +msgid "" +"Your purchased items on Osclass Market will automatically appear on My " +"Purchases tab." msgstr "" #: oc-admin/themes/modern/market/header.php:162 @@ -2217,7 +2305,10 @@ msgstr "" #: oc-admin/themes/modern/market/index.php:18 #: oc-admin/themes/modern/market/section.php:18 -msgid "Browse and download available Osclass plugins, from a constantly-updated selection. After downloading a plugin, you have to install it and configure it to get it up and running." +msgid "" +"Browse and download available Osclass plugins, from a constantly-updated " +"selection. After downloading a plugin, you have to install it and configure " +"it to get it up and running." msgstr "" #: oc-admin/themes/modern/market/index.php:37 @@ -2257,11 +2348,15 @@ msgid "There are no %s that matches your search" msgstr "" #: oc-admin/themes/modern/market/section.php:90 -msgid "Cannot get information from market.osclass.org, sorry for the inconvenience" +msgid "" +"Cannot get information from market.osclass.org, sorry for the inconvenience" msgstr "" #: oc-admin/themes/modern/media/index.php:19 -msgid "Manage the images that users have uploaded along with their listings. You can delete them without deleting the whole listing if the image is inappropriate or doesn’t match the listing." +msgid "" +"Manage the images that users have uploaded along with their listings. You " +"can delete them without deleting the whole listing if the image is " +"inappropriate or doesn’t match the listing." msgstr "" #: oc-admin/themes/modern/media/index.php:24 @@ -2312,7 +2407,10 @@ msgid "Show a link in footer" msgstr "" #: oc-admin/themes/modern/pages/index.php:19 -msgid "With Osclass you can create static pages on which information can be stored, such as \"About Us\" or \"Info\" pages. From here you can create, edit or delete your site's static pages." +msgid "" +"With Osclass you can create static pages on which information can be stored, " +"such as \"About Us\" or \"Info\" pages. From here you can create, edit or " +"delete your site's static pages." msgstr "" #: oc-admin/themes/modern/pages/index.php:26 @@ -2374,7 +2472,9 @@ msgid "Select subcategory" msgstr "" #: oc-admin/themes/modern/plugins/add.php:19 -msgid "Manually upload Osclass plugins in .zip format. If you prefer, you can manually upload the decompressed plugin to oc-content/plugins." +msgid "" +"Manually upload Osclass plugins in .zip format. If you prefer, you can " +"manually upload the decompressed plugin to oc-content/plugins." msgstr "" #: oc-admin/themes/modern/plugins/add.php:32 @@ -2399,7 +2499,10 @@ msgid "Cannot install new plugin" msgstr "" #: oc-admin/themes/modern/plugins/add.php:65 -msgid "The plugin folder is not writable on your server so you cannot upload plugins from the administration panel. Please make the folder writable and try again." +msgid "" +"The plugin folder is not writable on your server so you cannot upload " +"plugins from the administration panel. Please make the folder writable and " +"try again." msgstr "" #: oc-admin/themes/modern/plugins/configuration.php:58 @@ -2413,7 +2516,9 @@ msgid "Select the categories where you want to apply these attribute:" msgstr "" #: oc-admin/themes/modern/plugins/index.php:19 -msgid "Install or uninstall the plugins available in your installation. In some cases, you'll have to configure the plugin in order to get it to work." +msgid "" +"Install or uninstall the plugins available in your installation. In some " +"cases, you'll have to configure the plugin in order to get it to work." msgstr "" #: oc-admin/themes/modern/plugins/index.php:24 @@ -2421,7 +2526,9 @@ msgid "Manage Plugins" msgstr "" #: oc-admin/themes/modern/plugins/index.php:33 -msgid "Plugin couldn't be installed because it triggered a fatal error" +msgid "" +"Plugin couldn't be installed because it triggered a fatal error" msgstr "" #: oc-admin/themes/modern/plugins/index.php:68 @@ -2444,15 +2551,20 @@ msgid "%d plugins" msgstr "" #: oc-admin/themes/modern/plugins/index.php:258 -msgid "This action can not be undone. Uninstalling plugins may result in a permanent loss of data. Are you sure you want to continue?" +msgid "" +"This action can not be undone. Uninstalling plugins may result in a " +"permanent loss of data. Are you sure you want to continue?" msgstr "" #: oc-admin/themes/modern/plugins/index.php:331 -msgid "You are about to delete the files of the plugin. Do you want to continue?" +msgid "" +"You are about to delete the files of the plugin. Do you want to continue?" msgstr "" #: oc-admin/themes/modern/settings/advanced.php:39 -msgid "Change advanced configuration of your Osclass. Be careful when modifying default values if you're not sure what you're doing!" +msgid "" +"Change advanced configuration of your Osclass. Be careful " +"when modifying default values if you're not sure what you're doing!" msgstr "" #: oc-admin/themes/modern/settings/advanced.php:55 @@ -2535,7 +2647,9 @@ msgid "Comments per page: this field must only contain numeric characters" msgstr "" #: oc-admin/themes/modern/settings/comments.php:79 -msgid "Modify the options that allow your users to publish comments on your site's listings." +msgid "" +"Modify the options that allow your users to publish comments on your site's " +"listings." msgstr "" #: oc-admin/themes/modern/settings/comments.php:92 @@ -2563,7 +2677,9 @@ msgid "A comment is being held for moderation" msgstr "" #: oc-admin/themes/modern/settings/comments.php:125 -msgid "Before a comment appears, comment author must have at least %s previously approved comments" +msgid "" +"Before a comment appears, comment author must have at least %s previously " +"approved comments" msgstr "" #: oc-admin/themes/modern/settings/comments.php:126 @@ -2599,7 +2715,9 @@ msgid "There's a new comment on his listing" msgstr "" #: oc-admin/themes/modern/settings/currencies.php:19 -msgid "Add new currencies or edit existing currencies so users can publish listings in their country's currency." +msgid "" +"Add new currencies or edit existing currencies so users can publish listings " +"in their country's currency." msgstr "" #: oc-admin/themes/modern/settings/currencies.php:33 @@ -2661,7 +2779,9 @@ msgid "Currency Code" msgstr "" #: oc-admin/themes/modern/settings/currency_form.php:115 -msgid "Must be a three-character code according to the ISO 4217" +msgid "" +"Must be a three-character code according to the ISO 4217" msgstr "" #: oc-admin/themes/modern/settings/currency_form.php:119 @@ -2703,7 +2823,8 @@ msgid "Listings shown in RSS feed: this field is required" msgstr "" #: oc-admin/themes/modern/settings/index.php:65 -msgid "Listings shown in RSS feed: this field must only contain numeric characters" +msgid "" +"Listings shown in RSS feed: this field must only contain numeric characters" msgstr "" #: oc-admin/themes/modern/settings/index.php:68 @@ -2723,7 +2844,11 @@ msgid "The search page shows: this field must only contain numeric characters" msgstr "" #: oc-admin/themes/modern/settings/index.php:133 -msgid "Change the basic configuration of your Osclass. From here, you can modify variables such as the site’s name, the default currency or how lists of listings are displayed. Be careful when modifying default values if you're not sure what you're doing!" +msgid "" +"Change the basic configuration of your Osclass. From here, you can modify " +"variables such as the site’s name, the default currency or how lists of " +"listings are displayed. Be careful when modifying default " +"values if you're not sure what you're doing!" msgstr "" #: oc-admin/themes/modern/settings/index.php:146 @@ -2847,7 +2972,9 @@ msgid "Parent categories" msgstr "" #: oc-admin/themes/modern/settings/index.php:295 -msgid "Allow users to select a parent category as a category when inserting or editing a listing " +msgid "" +"Allow users to select a parent category as a category when inserting or " +"editing a listing " msgstr "" #: oc-admin/themes/modern/settings/index.php:300 @@ -2871,11 +2998,15 @@ msgid "Automatic cron process" msgstr "" #: oc-admin/themes/modern/settings/index.php:319 -msgid "Allow Osclass to run a built-in cron automatically without setting crontab" +msgid "" +"Allow Osclass to run a built-in cron " +"automatically without setting crontab" msgstr "" #: oc-admin/themes/modern/settings/index.php:322 -msgid "It is recommended to have this option enabled, because some features require it." +msgid "" +"It is recommended to have this option enabled, because some features " +"require it." msgstr "" #: oc-admin/themes/modern/settings/index.php:326 @@ -2989,7 +3120,11 @@ msgid "Add new city" msgstr "" #: oc-admin/themes/modern/settings/locations.php:151 -msgid "Add, edit or delete the countries, regions and cities installed on your Osclass. Be careful: modifying locations can cause your statistics to be incorrect until they're recalculated. Modify only if you're sure what you're doing!" +msgid "" +"Add, edit or delete the countries, regions and cities installed on your " +"Osclass. Be careful: modifying locations can cause your " +"statistics to be incorrect until they're recalculated. Modify only if you're " +"sure what you're doing!" msgstr "" #: oc-admin/themes/modern/settings/locations.php:164 @@ -3052,11 +3187,18 @@ msgid "Cities" msgstr "" #: oc-admin/themes/modern/settings/locations.php:397 -msgid "This action can't be undone. Items associated to this location will be deleted. Users from this location will be unlinked, but not deleted. Are you sure you want to continue?" +msgid "" +"This action can't be undone. Items associated to this location will be " +"deleted. Users from this location will be unlinked, but not deleted. Are you " +"sure you want to continue?" msgstr "" #: oc-admin/themes/modern/settings/mailserver.php:65 -msgid "Modify the settings of the mail server from which your site's emails are sent. Be careful: these settings can vary depending on your hosting or server. If you run into any issues, check your hosting's help section." +msgid "" +"Modify the settings of the mail server from which your site's emails are " +"sent. Be careful: these settings can vary depending on your " +"hosting or server. If you run into any issues, check your hosting's help " +"section." msgstr "" #: oc-admin/themes/modern/settings/mailserver.php:78 @@ -3164,7 +3306,10 @@ msgid "Maximum size: this field must only contain numeric characters" msgstr "" #: oc-admin/themes/modern/settings/media.php:147 -msgid "Manage the options for the images users can upload along with their listings. You can limit their size, the number of images per ad, include a watermark, etc." +msgid "" +"Manage the options for the images users can upload along with their " +"listings. You can limit their size, the number of images per ad, include a " +"watermark, etc." msgstr "" #: oc-admin/themes/modern/settings/media.php:160 @@ -3180,7 +3325,9 @@ msgid "Image sizes" msgstr "" #: oc-admin/themes/modern/settings/media.php:176 -msgid "The sizes listed below determine the maximum dimensions in pixels to use when uploading a image. Format: Width x Height." +msgid "" +"The sizes listed below determine the maximum dimensions in pixels to use " +"when uploading a image. Format: Width x Height." msgstr "" #: oc-admin/themes/modern/settings/media.php:177 @@ -3220,7 +3367,9 @@ msgid "Force JPEG extension." msgstr "" #: oc-admin/themes/modern/settings/media.php:205 -msgid "Uploaded images will be saved in JPG/JPEG format, it saves space but images will not have transparent background." +msgid "" +"Uploaded images will be saved in JPG/JPEG format, it saves space but images " +"will not have transparent background." msgstr "" #: oc-admin/themes/modern/settings/media.php:210 @@ -3281,7 +3430,9 @@ msgid "Text" msgstr "" #: oc-admin/themes/modern/settings/media.php:257 -msgid "Freetype library is required. How to install/configure" +msgid "" +"Freetype library is required. How to install/configure" msgstr "" #: oc-admin/themes/modern/settings/media.php:263 @@ -3344,7 +3495,10 @@ msgid "Regenerate images" msgstr "" #: oc-admin/themes/modern/settings/media.php:324 -msgid "You can regenerate different image dimensions. If you have changed the dimension of thumbnails, preview or normal images, you might want to regenerate your images." +msgid "" +"You can regenerate different image dimensions. If you have changed the " +"dimension of thumbnails, preview or normal images, you might want to " +"regenerate your images." msgstr "" #: oc-admin/themes/modern/settings/media.php:326 @@ -3356,7 +3510,9 @@ msgid "Recommendation" msgstr "" #: oc-admin/themes/modern/settings/media.php:340 -msgid "We highly recommend you have the 'Keep original image' option active when you use watermarks." +msgid "" +"We highly recommend you have the 'Keep original image' option active when " +"you use watermarks." msgstr "" #: oc-admin/themes/modern/settings/permalinks.php:174 @@ -3555,7 +3711,10 @@ msgid "Hide rules" msgstr "" #: oc-admin/themes/modern/settings/permalinks.php:360 -msgid "Activate this option if you want your site's URLs to be more attractive to search engines and intelligible for users. Be careful: depending on your hosting service, this might not work correctly." +msgid "" +"Activate this option if you want your site's URLs to be more attractive to " +"search engines and intelligible for users. Be careful: " +"depending on your hosting service, this might not work correctly." msgstr "" #: oc-admin/themes/modern/settings/permalinks.php:372 @@ -3568,7 +3727,10 @@ msgid "Permalinks" msgstr "" #: oc-admin/themes/modern/settings/permalinks.php:381 -msgid "By default Osclass uses web URLs which have question marks and lots of numbers in them. However, Osclass offers you friendly urls. This can improve the aesthetics, usability, and forward-compatibility of your links" +msgid "" +"By default Osclass uses web URLs which have question marks and lots of " +"numbers in them. However, Osclass offers you friendly urls. This can improve " +"the aesthetics, usability, and forward-compatibility of your links" msgstr "" #: oc-admin/themes/modern/settings/permalinks.php:389 @@ -3760,7 +3922,10 @@ msgid "Custom number: this field cannot be left empty" msgstr "" #: oc-admin/themes/modern/settings/searches.php:69 -msgid "Save the searches users do on your site. In this way, you can get information on what they're most interested in. From here, you can manage the options on how much information you want to save." +msgid "" +"Save the searches users do on your site. In this way, you can get " +"information on what they're most interested in. From here, you can manage " +"the options on how much information you want to save." msgstr "" #: oc-admin/themes/modern/settings/searches.php:82 @@ -3813,11 +3978,16 @@ msgid "Store %s queries" msgstr "" #: oc-admin/themes/modern/settings/searches.php:134 -msgid "This feature can generate a lot of data. It's recommended to purge this data periodically." +msgid "" +"This feature can generate a lot of data. It's recommended to purge this data " +"periodically." msgstr "" #: oc-admin/themes/modern/settings/spamNbots.php:23 -msgid "Keep spammers from publishing on your site by configuring reCAPTCHA and Akismet. Be careful: in order to use these services, you must register on their sites first and follow their instructions." +msgid "" +"Keep spammers from publishing on your site by configuring reCAPTCHA and " +"Akismet. Be careful: in order to use these services, you must register on " +"their sites first and follow their instructions." msgstr "" #: oc-admin/themes/modern/settings/spamNbots.php:36 @@ -3834,7 +4004,10 @@ msgid "Akismet" msgstr "" #: oc-admin/themes/modern/settings/spamNbots.php:45 -msgid "Akismet is a hosted web service that saves you time by automatically detecting comment and trackback spam. It's hosted on our servers, but we give you access to it through plugins and our API." +msgid "" +"Akismet is a hosted web service that saves you time by automatically " +"detecting comment and trackback spam. It's hosted on our servers, but we " +"give you access to it through plugins and our API." msgstr "" #: oc-admin/themes/modern/settings/spamNbots.php:52 @@ -3850,7 +4023,9 @@ msgid "The key you entered is invalid. Please double-check it" msgstr "" #: oc-admin/themes/modern/settings/spamNbots.php:70 -msgid "Akismet is disabled, please enter an API key. (Get your key)" +msgid "" +"Akismet is disabled, please enter an API key. (Get your key)" msgstr "" #: oc-admin/themes/modern/settings/spamNbots.php:87 @@ -3858,7 +4033,10 @@ msgid "reCAPTCHA" msgstr "" #: oc-admin/themes/modern/settings/spamNbots.php:88 -msgid "reCAPTCHA helps prevent automated abuse of your site by using a CAPTCHA to ensure that only humans perform certain actions. Get your key" +msgid "" +"reCAPTCHA helps prevent automated abuse of your site by using a CAPTCHA to " +"ensure that only humans perform certain actions. Get your key" msgstr "" #: oc-admin/themes/modern/settings/spamNbots.php:95 @@ -3870,7 +4048,9 @@ msgid "Use reCaptcha v2." msgstr "" #: oc-admin/themes/modern/settings/spamNbots.php:100 -msgid "If you were using v1, you need to re-generate your reCaptcha keys." +msgid "" +"If you were using v1, you need to re-generate your reCaptcha " +"keys." msgstr "" #: oc-admin/themes/modern/settings/spamNbots.php:105 @@ -3882,7 +4062,9 @@ msgid "Secret key" msgstr "" #: oc-admin/themes/modern/settings/spamNbots.php:118 -msgid "If you see the reCAPTCHA form it means that you have correctly entered the public key" +msgid "" +"If you see the reCAPTCHA form it means that you have correctly entered the " +"public key" msgstr "" #: oc-admin/themes/modern/stats/comments.php:25 @@ -3919,7 +4101,8 @@ msgid "Last 10 days" msgstr "" #: oc-admin/themes/modern/stats/comments.php:40 -msgid "See how many comments the listings published on your site have received." +msgid "" +"See how many comments the listings published on your site have received." msgstr "" #: oc-admin/themes/modern/stats/comments.php:53 @@ -3952,7 +4135,9 @@ msgid "There're no statistics yet" msgstr "" #: oc-admin/themes/modern/stats/items.php:48 -msgid "Quickly find out how many new listings have been published on your site and how many visits each of the listings gets." +msgid "" +"Quickly find out how many new listings have been published on your site and " +"how many visits each of the listings gets." msgstr "" #: oc-admin/themes/modern/stats/items.php:61 @@ -4016,7 +4201,9 @@ msgid "Number of new subscribers" msgstr "" #: oc-admin/themes/modern/stats/reports.php:37 -msgid "See how many listings from your site have been reported as spam, expired, duplicate, etc." +msgid "" +"See how many listings from your site have been reported as spam, expired, " +"duplicate, etc." msgstr "" #: oc-admin/themes/modern/stats/reports.php:50 @@ -4052,7 +4239,10 @@ msgid "Total number of reports" msgstr "" #: oc-admin/themes/modern/stats/users.php:43 -msgid "Stay up-to-date on the number of users registered on your site. You can also see a breakdown of the countries and regions where users live among those available on your site." +msgid "" +"Stay up-to-date on the number of users registered on your site. You can also " +"see a breakdown of the countries and regions where users live among those " +"available on your site." msgstr "" #: oc-admin/themes/modern/stats/users.php:56 @@ -4095,7 +4285,9 @@ msgid "%s listings per user" msgstr "" #: oc-admin/themes/modern/tools/backup.php:36 -msgid "Save a backup of all of your site's information: listings, users and configuration. You can save a backup on your server or on your computer." +msgid "" +"Save a backup of all of your site's information: listings, users and " +"configuration. You can save a backup on your server or on your computer." msgstr "" #: oc-admin/themes/modern/tools/backup.php:42 @@ -4122,11 +4314,15 @@ msgid "Backup folder" msgstr "" #: oc-admin/themes/modern/tools/backup.php:68 -msgid "WARNING: If you don't specify a backup folder, the backup files will be created in the root of your Osclass installation." +msgid "" +"WARNING: If you don't specify a backup folder, the backup " +"files will be created in the root of your Osclass installation." msgstr "" #: oc-admin/themes/modern/tools/backup.php:70 -msgid "This is the folder in which your backups will be created. We recommend that you choose a non-public path." +msgid "" +"This is the folder in which your backups will be created. We recommend that " +"you choose a non-public path." msgstr "" #: oc-admin/themes/modern/tools/backup.php:75 @@ -4151,7 +4347,9 @@ msgid "Category stats" msgstr "" #: oc-admin/themes/modern/tools/category.php:39 -msgid "You can recalculate stats by category, useful if the stats seem to be incorrect." +msgid "" +"You can recalculate stats by category, useful if the stats seem to be " +"incorrect." msgstr "" #: oc-admin/themes/modern/tools/category.php:47 @@ -4159,7 +4357,10 @@ msgid "Calculate category stats" msgstr "" #: oc-admin/themes/modern/tools/import.php:25 -msgid "Upload registers from other Osclass installations or upload new geographic information to your site. Be careful: don’t use this option if you're not 100% sure what you're doing." +msgid "" +"Upload registers from other Osclass installations or upload new geographic " +"information to your site. Be careful: don’t use this option " +"if you're not 100% sure what you're doing." msgstr "" #: oc-admin/themes/modern/tools/import.php:37 @@ -4192,7 +4393,9 @@ msgid "Complete" msgstr "" #: oc-admin/themes/modern/tools/locations.php:86 -msgid "You can recalculate your location stats. This is useful if you upgrade from versions older than Osclass 2.4" +msgid "" +"You can recalculate your location stats. This is useful if you upgrade from " +"versions older than Osclass 2.4" msgstr "" #: oc-admin/themes/modern/tools/locations.php:94 @@ -4200,7 +4403,9 @@ msgid "Calculate location stats" msgstr "" #: oc-admin/themes/modern/tools/maintenance.php:25 -msgid "Show a \"Site in maintenance mode\" message to your users while you're updating your site or modifying its configuration." +msgid "" +"Show a \"Site in maintenance mode\" message to your users while you're " +"updating your site or modifying its configuration." msgstr "" #: oc-admin/themes/modern/tools/maintenance.php:46 @@ -4208,7 +4413,10 @@ msgid "Maintenance" msgstr "" #: oc-admin/themes/modern/tools/maintenance.php:51 -msgid "While in maintenance mode, users can't access your website. Useful if you need to make changes on your website. Use the following button to toggle maintenance mode ON/OFF." +msgid "" +"While in maintenance mode, users can't access your website. Useful if you " +"need to make changes on your website. Use the following button to toggle " +"maintenance mode ON/OFF." msgstr "" #: oc-admin/themes/modern/tools/maintenance.php:53 @@ -4247,7 +4455,9 @@ msgid "Upgrade" msgstr "" #: oc-admin/themes/modern/tools/upgrade.php:79 -msgid "Check to see if you're using the latest version of Osclass. If you're not, the system will let you know so you can update and use the newest features." +msgid "" +"Check to see if you're using the latest version of Osclass. If you're not, " +"the system will let you know so you can update and use the newest features." msgstr "" #: oc-admin/themes/modern/tools/upgrade.php:92 @@ -4255,11 +4465,21 @@ msgid "Upgrade » %s" msgstr "" #: oc-admin/themes/modern/tools/upgrade.php:108 -msgid "Your Osclass installation can be auto-upgraded. Please, back up your database and the folder oc-content before attempting to upgrade your Osclass installation. You can also upgrade Osclass manually, more information in the %s" +msgid "" +"Your Osclass installation can be auto-upgraded. Please, back up your " +"database and the folder oc-content before attempting to upgrade your Osclass " +"installation. You can also upgrade Osclass manually, more information in the " +"%s" msgstr "" #: oc-admin/themes/modern/tools/upgrade.php:112 -msgid "Your Osclass installation can't be auto-upgraded. Files and folders need to be writable. You can apply write permissions via SSH with the command \"chmod -R a+w *\" (without quotes) or via an FTP client, it depends on the program so we can not provide more information. You can also upgrade Osclass by downloading the upgrade package, unzipping it and replacing the files on your server with the ones in the package." +msgid "" +"Your Osclass installation can't be auto-upgraded. Files and folders need to " +"be writable. You can apply write permissions via SSH with the command " +"\"chmod -R a+w *\" (without quotes) or via an FTP client, it depends on the " +"program so we can not provide more information. You can also upgrade Osclass " +"by downloading the upgrade package, unzipping it and replacing the files on " +"your server with the ones in the package." msgstr "" #: oc-admin/themes/modern/tools/version.php:20 @@ -4275,7 +4495,9 @@ msgid "Upgrading your Osclass installation (this could take a while): " msgstr "" #: oc-admin/themes/modern/upgrade/index.php:63 -msgid "You have uploaded a new version of Osclass, you need to upgrade Osclass for it to work correctly." +msgid "" +"You have uploaded a new version of Osclass, you need to upgrade Osclass for " +"it to work correctly." msgstr "" #: oc-admin/themes/modern/upgrade/index.php:65 @@ -4315,7 +4537,9 @@ msgid "Are you sure you want to delete this alert?" msgstr "" #: oc-admin/themes/modern/users/ban.php:19 -msgid "Add, edit or delete ban rules. Keep in mind that ban rules prevent users to register, publish or comment on listings." +msgid "" +"Add, edit or delete ban rules. Keep in mind that ban rules prevent users to " +"register, publish or comment on listings." msgstr "" #: oc-admin/themes/modern/users/ban.php:35 @@ -4443,7 +4667,9 @@ msgid "(twice, required)" msgstr "" #: oc-admin/themes/modern/users/frm.php:302 -msgid "If you'd like to change the password, type a new one. Otherwise leave this blank" +msgid "" +"If you'd like to change the password, type a new one. Otherwise leave this " +"blank" msgstr "" #: oc-admin/themes/modern/users/frm.php:346 @@ -4466,7 +4692,9 @@ msgid "Categories: %s" msgstr "" #: oc-admin/themes/modern/users/index.php:19 -msgid "Add, edit or delete information associated to registered users. Keep in mind that deleting a user also deletes all the listings the user published." +msgid "" +"Add, edit or delete information associated to registered users. Keep in mind " +"that deleting a user also deletes all the listings the user published." msgstr "" #: oc-admin/themes/modern/users/index.php:34 @@ -4493,7 +4721,10 @@ msgid "Are you sure you want to delete this user?" msgstr "" #: oc-admin/themes/modern/users/settings.php:19 -msgid "Manage the options related to users on your site. Here, you can decide if users must register or if email confirmation is necessary, among other options." +msgid "" +"Manage the options related to users on your site. Here, you can decide if " +"users must register or if email confirmation is necessary, among other " +"options." msgstr "" #: oc-admin/themes/modern/users/settings.php:32 @@ -5057,15 +5288,20 @@ msgid "{WEB_TITLE} - Your site has upgraded to Osclass {VERSION}" msgstr "" #: oc-includes/osclass/emails.php:1261 -msgid "

Your site at {WEB_LINK} has been updated automatically to Osclass {VERSION}

" +msgid "" +"

Your site at {WEB_LINK} has been updated automatically to Osclass " +"{VERSION}

" msgstr "" #: oc-includes/osclass/emails.php:1263 -msgid "

There were some minor errors removing temporary files. Please manually remove the \"oc-content/downloads/oc-temp\" folder

" +msgid "" +"

There were some minor errors removing temporary files. Please manually " +"remove the \"oc-content/downloads/oc-temp\" folder

" msgstr "" #: oc-includes/osclass/emails.php:1266 -msgid "{WEB_TITLE} - We failed trying to upgrade your site to Osclass {VERSION}" +msgid "" +"{WEB_TITLE} - We failed trying to upgrade your site to Osclass {VERSION}" msgstr "" #: oc-includes/osclass/frm/Admin.form.class.php:51 @@ -5475,11 +5711,13 @@ msgid "Images already uploaded" msgstr "" #: oc-includes/osclass/frm/Item.form.class.php:1456 -msgid "Too many items ({netItems}) would be uploaded. Item limit is {itemLimit}." +msgid "" +"Too many items ({netItems}) would be uploaded. Item limit is {itemLimit}." msgstr "" #: oc-includes/osclass/frm/Item.form.class.php:1457 -msgid "The files are being uploaded, if you leave now the upload will be cancelled." +msgid "" +"The files are being uploaded, if you leave now the upload will be cancelled." msgstr "" #: oc-includes/osclass/frm/Item.form.class.php:1458 @@ -5720,7 +5958,9 @@ msgid "PHP version >= 5.6.x" msgstr "" #: oc-includes/osclass/install-functions.php:101 -msgid "At least PHP5.6 (PHP 7.0 or higher recommended) is required to run Osclass. You may talk with your hosting to upgrade your PHP version." +msgid "" +"At least PHP5.6 (PHP 7.0 or higher recommended) is required to run Osclass. " +"You may talk with your hosting to upgrade your PHP version." msgstr "" #: oc-includes/osclass/install-functions.php:104 @@ -5728,7 +5968,9 @@ msgid "MySQLi extension for PHP" msgstr "" #: oc-includes/osclass/install-functions.php:106 -msgid "MySQLi extension is required. How to install/configure." +msgid "" +"MySQLi extension is required. How to install/configure." msgstr "" #: oc-includes/osclass/install-functions.php:109 @@ -5736,7 +5978,9 @@ msgid "GD extension for PHP" msgstr "" #: oc-includes/osclass/install-functions.php:111 -msgid "GD extension is required. How to install/configure." +msgid "" +"GD extension is required. How to install/configure." msgstr "" #: oc-includes/osclass/install-functions.php:114 @@ -5744,7 +5988,9 @@ msgid "Folder oc-content/uploads exists" msgstr "" #: oc-includes/osclass/install-functions.php:116 -msgid "You have to create uploads folder, i.e.: mkdir %soc-content/uploads/" +msgid "" +"You have to create uploads folder, i.e.: mkdir %soc-" +"content/uploads/" msgstr "" #: oc-includes/osclass/install-functions.php:119 @@ -5752,7 +5998,9 @@ msgid "oc-content/uploads folder is writable" msgstr "" #: oc-includes/osclass/install-functions.php:121 -msgid "uploads folder has to be writable, i.e.: chmod a+w %soc-content/uploads/" +msgid "" +"uploads folder has to be writable, i.e.: chmod a+w %soc-" +"content/uploads/" msgstr "" #: oc-includes/osclass/install-functions.php:124 @@ -5760,7 +6008,9 @@ msgid "Folder oc-content/downloads exists" msgstr "" #: oc-includes/osclass/install-functions.php:126 -msgid "You have to create downloads folder, i.e.: mkdir %soc-content/downloads/" +msgid "" +"You have to create downloads folder, i.e.: mkdir %soc-" +"content/downloads/" msgstr "" #: oc-includes/osclass/install-functions.php:129 @@ -5768,7 +6018,9 @@ msgid "oc-content/downloads folder is writable" msgstr "" #: oc-includes/osclass/install-functions.php:131 -msgid "downloads folder has to be writable, i.e.: chmod a+w %soc-content/downloads/" +msgid "" +"downloads folder has to be writable, i.e.: chmod a+w %soc-" +"content/downloads/" msgstr "" #: oc-includes/osclass/install-functions.php:134 @@ -5776,7 +6028,9 @@ msgid "Folder oc-content/languages folder exists" msgstr "" #: oc-includes/osclass/install-functions.php:136 -msgid "You have to create the languages folder, i.e.: mkdir %soc-content/languages/" +msgid "" +"You have to create the languages folder, i.e.: mkdir %soc-" +"content/languages/" msgstr "" #: oc-includes/osclass/install-functions.php:139 @@ -5784,7 +6038,9 @@ msgid "oc-content/languages folder is writable" msgstr "" #: oc-includes/osclass/install-functions.php:141 -msgid "languages folder has to be writable, i.e.: chmod a+w %soc-content/languages/" +msgid "" +"languages folder has to be writable, i.e.: chmod a+w %soc-" +"content/languages/" msgstr "" #: oc-includes/osclass/install-functions.php:152 @@ -5792,7 +6048,9 @@ msgid "config.php file is writable" msgstr "" #: oc-includes/osclass/install-functions.php:154 -msgid "config.php file has to be writable, i.e.: chmod a+w %sconfig.php" +msgid "" +"config.php file has to be writable, i.e.: chmod a+w " +"%sconfig.php" msgstr "" #: oc-includes/osclass/install-functions.php:160 @@ -5808,7 +6066,9 @@ msgid "config-sample.php file exists" msgstr "" #: oc-includes/osclass/install-functions.php:170 -msgid "config-sample.php file is required, you should re-download Osclass." +msgid "" +"config-sample.php file is required, you should re-download " +"Osclass." msgstr "" #: oc-includes/osclass/install-functions.php:248 @@ -5820,7 +6080,9 @@ msgstr "" #: oc-includes/osclass/install-functions.php:252 #: oc-includes/osclass/install-functions.php:301 -msgid "The database doesn't exist. You should check the \"Create DB\" checkbox and fill in a username and password with the right privileges" +msgid "" +"The database doesn't exist. You should check the \"Create DB\" checkbox and " +"fill in a username and password with the right privileges" msgstr "" #: oc-includes/osclass/install-functions.php:254 @@ -5830,7 +6092,9 @@ msgstr "" #: oc-includes/osclass/install-functions.php:256 #: oc-includes/osclass/install-functions.php:305 -msgid "Cannot connect to the database. Check if the username and password are correct." +msgid "" +"Cannot connect to the database. Check if the username and password are " +"correct." msgstr "" #: oc-includes/osclass/install-functions.php:258 @@ -5844,7 +6108,9 @@ msgid "Can't create the database. Error number: %s" msgstr "" #: oc-includes/osclass/install-functions.php:277 -msgid "Can't create the database. Check if the admin username and password are correct." +msgid "" +"Can't create the database. Check if the admin username and password are " +"correct." msgstr "" #: oc-includes/osclass/install-functions.php:317 @@ -5854,7 +6120,9 @@ msgstr "" #: oc-includes/osclass/install-functions.php:325 #: oc-includes/osclass/install-functions.php:328 -msgid "config-sample.php doesn't exist. Check if everything is decompressed correctly." +msgid "" +"config-sample.php doesn't exist. Check if everything is decompressed " +"correctly." msgstr "" #: oc-includes/osclass/install-functions.php:332 @@ -5868,7 +6136,9 @@ msgid "Can't create the database structure. Error number: %s" msgstr "" #: oc-includes/osclass/install-functions.php:356 -msgid "There are tables with the same name in the database. Change the table prefix or the database and try again." +msgid "" +"There are tables with the same name in the database. Change the table prefix " +"or the database and try again." msgstr "" #: oc-includes/osclass/install-functions.php:397 @@ -5882,7 +6152,9 @@ msgid "Can't insert basic configuration. Error number: %s" msgstr "" #: oc-includes/osclass/install-functions.php:415 -msgid "Can't insert basic configuration. This user has no privileges to 'INSERT' into the database." +msgid "" +"Can't insert basic configuration. This user has no privileges to 'INSERT' " +"into the database." msgstr "" #: oc-includes/osclass/install-functions.php:675 @@ -5918,7 +6190,9 @@ msgid "Table prefix" msgstr "" #: oc-includes/osclass/install-functions.php:702 -msgid "If you want to run multiple Osclass installations in a single database, change this" +msgid "" +"If you want to run multiple Osclass installations in a single database, " +"change this" msgstr "" #: oc-includes/osclass/install-functions.php:744 @@ -5958,11 +6232,14 @@ msgid "Admin user is required" msgstr "" #: oc-includes/osclass/install-functions.php:814 -msgid "A password will be automatically generated for you if you leave this blank." +msgid "" +"A password will be automatically generated for you if you leave this blank." msgstr "" #: oc-includes/osclass/install-functions.php:815 -msgid "You can modify username and password if you like, just change the input value." +msgid "" +"You can modify username and password if you like, just change the input " +"value." msgstr "" #: oc-includes/osclass/install-functions.php:817 @@ -5982,11 +6259,14 @@ msgid "Create market.osclass.org account" msgstr "" #: oc-includes/osclass/install-functions.php:834 -msgid "(You agree to our Terms & Conditions)" +msgid "" +"(You agree to our Terms & " +"Conditions)" msgstr "" #: oc-includes/osclass/install-functions.php:835 -msgid "Create a market.osclass.org account and download free themes and plugins." +msgid "" +"Create a market.osclass.org account and download free themes and plugins." msgstr "" #: oc-includes/osclass/install-functions.php:841 @@ -5994,7 +6274,9 @@ msgid "Choose countries/cities where your target users are located" msgstr "" #: oc-includes/osclass/install-functions.php:843 -msgid "Once you type a country, you'll be able to choose region and city as well. Therefore, the installation will be more specific." +msgid "" +"Once you type a country, you'll be able to choose region and city as well. " +"Therefore, the installation will be more specific." msgstr "" #: oc-includes/osclass/install-functions.php:855 @@ -6022,7 +6304,9 @@ msgid "There are no cities available for this region" msgstr "" #: oc-includes/osclass/install-functions.php:878 -msgid "No internet connection. You can continue the installation and insert countries later." +msgid "" +"No internet connection. You can continue the installation and insert " +"countries later." msgstr "" #: oc-includes/osclass/install-functions.php:892 @@ -6042,7 +6326,9 @@ msgid "Congratulations!" msgstr "" #: oc-includes/osclass/install-functions.php:951 -msgid "Osclass has been installed. Were you expecting more steps? Sorry to disappoint you!" +msgid "" +"Osclass has been installed. Were you expecting more steps? Sorry to " +"disappoint you!" msgstr "" #: oc-includes/osclass/install-functions.php:952 @@ -6050,7 +6336,10 @@ msgid "An e-mail with the password for oc-admin has been sent to: %s" msgstr "" #: oc-includes/osclass/install-functions.php:977 -msgid "Do not forget to connect your site with Osclass Market in order to download free and paid themes or plugins. You should connect your site as soon as your log in to your new site." +msgid "" +"Do not forget to connect your site with Osclass Market in order to download " +"free and paid themes or plugins. You should connect your site as soon as " +"your log in to your new site." msgstr "" #: oc-includes/osclass/install-functions.php:980 @@ -6058,7 +6347,9 @@ msgid "Do you know Osclass Free, the Osclass cloud solution?" msgstr "" #: oc-includes/osclass/install-functions.php:981 -msgid "With Osclass Free you can create your classifieds page without any technical knowledge and in less than one minute." +msgid "" +"With Osclass Free you can create your classifieds page without any technical " +"knowledge and in less than one minute." msgstr "" #: oc-includes/osclass/install-functions.php:982 @@ -6074,7 +6365,9 @@ msgid "Hi %s," msgstr "" #: oc-includes/osclass/install-location.php:113 -msgid "Your Osclass installation at %s is up and running. You can access the administration panel with these details:" +msgid "" +"Your Osclass installation at %s is up and running. You can access the " +"administration panel with these details:" msgstr "" #: oc-includes/osclass/install-location.php:115 @@ -6086,11 +6379,17 @@ msgid "password: %s" msgstr "" #: oc-includes/osclass/install-location.php:118 -msgid "Remember that for any doubts you might have you can consult our documentation, forum or blog." +msgid "" +"Remember that for any doubts you might have you can consult our documentation, forum or blog." msgstr "" #: oc-includes/osclass/install-location.php:119 -msgid "Osclass doesn’t run any developments but we can put you in touch with third party developers through a Premium Support. And hey, if you would like to contribute to Osclass - learn how here!" +msgid "" +"Osclass doesn’t run any developments but we can put you in touch with third " +"party developers through a Premium Support. And hey, if you would like to " +"contribute to Osclass - learn how here!" msgstr "" #: oc-includes/osclass/install-location.php:120 @@ -6102,7 +6401,9 @@ msgid "The Osclass team" msgstr "" #: oc-includes/osclass/install.php:89 -msgid "Looks like you've already installed Osclass. To reinstall please clear your old database tables first." +msgid "" +"Looks like you've already installed Osclass. To reinstall please clear your " +"old database tables first." msgstr "" #: oc-includes/osclass/install.php:135 @@ -6138,7 +6439,9 @@ msgid "Allow my site to appear in search engines like Google." msgstr "" #: oc-includes/osclass/install.php:205 -msgid "Help make Osclass better by automatically sending usage statistics and crash reports to Osclass." +msgid "" +"Help make Osclass better by automatically sending usage statistics and crash " +"reports to Osclass." msgstr "" #: oc-includes/osclass/install.php:211 @@ -6538,7 +6841,9 @@ msgid "Example Ad" msgstr "" #: oc-includes/osclass/installer/basic_data.php:105 -msgid "Description of the example ad. Insert here some usefull description of your ad." +msgid "" +"Description of the example ad. Insert here some usefull description of your " +"ad." msgstr "" #: oc-includes/osclass/installer/basic_data.php:106 @@ -6566,7 +6871,9 @@ msgid "Example page title" msgstr "" #: oc-includes/osclass/installer/basic_data.php:116 -msgid "This is an example page description. This is a good place to put your Terms of Service or any other help information." +msgid "" +"This is an example page description. This is a good place to put your Terms " +"of Service or any other help information." msgstr "" #: oc-includes/osclass/model/Category.php:602 @@ -6586,15 +6893,22 @@ msgid "Osclass » Has some errors" msgstr "" #: oc-includes/osclass/upgrade-funcs.php:44 -msgid "We've encountered some problems while updating the database structure. The following queries failed:" +msgid "" +"We've encountered some problems while updating the database structure. The " +"following queries failed:" msgstr "" #: oc-includes/osclass/upgrade-funcs.php:46 -msgid "These errors could be false-positive errors. If you're sure that is the case, you can continue with the upgrade, or ask in our forums." +msgid "" +"These errors could be false-positive errors. If you're sure that is the " +"case, you can continue with the upgrade, or ask in our forums." msgstr "" #: oc-includes/osclass/upgrade-funcs.php:286 -msgid "You need to calculate location stats, please go to admin panel, tools, recalculate location stats or click" +msgid "" +"You need to calculate location stats, please go to admin panel, tools, " +"recalculate location stats or click" msgstr "" #: oc-includes/osclass/upgrade-funcs.php:286 @@ -6606,7 +6920,9 @@ msgid "Osclass » Updated correctly" msgstr "" #: oc-includes/osclass/upgrade-funcs.php:533 -msgid "Osclass has been updated successfully. Need more help?" +msgid "" +"Osclass has been updated successfully. Need more help?" msgstr "" #: oc-includes/osclass/utils.php:1898 @@ -6614,7 +6930,10 @@ msgid "Everything looks good! Your Osclass installation is up-to-date" msgstr "" #: oc-includes/osclass/utils.php:1901 -msgid "Nearly everything looks good! Your Osclass installation is up-to-date, but there were some errors removing temporary files. Please manually remove the \"oc-content/downloads/oc-temp\" folder" +msgid "" +"Nearly everything looks good! Your Osclass installation is up-to-date, but " +"there were some errors removing temporary files. Please manually remove the " +"\"oc-content/downloads/oc-temp\" folder" msgstr "" #: oc-includes/osclass/utils.php:1907 @@ -6642,7 +6961,8 @@ msgid "Missing download URL" msgstr "" #: oc-includes/osclass/utils.php:1936 -msgid "We had some errors upgrading your database. The follwing queries failed:" +msgid "" +"We had some errors upgrading your database. The follwing queries failed:" msgstr "" #: oc-includes/osclass/utils.php:2184 @@ -6650,15 +6970,20 @@ msgid "Everything looks good!" msgstr "" #: oc-includes/osclass/utils.php:2187 -msgid "Nearly everything looks good! but there were some errors removing temporary files. Please manually remove the \\\"oc-content/downloads/oc-temp\\\" folder" +msgid "" +"Nearly everything looks good! but there were some errors removing temporary " +"files. Please manually remove the \\\"oc-content/downloads/oc-temp\\\" folder" msgstr "" #: oc-includes/osclass/utils.php:2196 -msgid "NOTE: Web user and destination folder user is not the same, you might have an issue there.
Do this in your console:
chown -R %s:%s %s" +msgid "" +"NOTE: Web user and destination folder user is not the same, you might have " +"an issue there.
Do this in your console:
chown -R %s:%s %s" msgstr "" #: oc-includes/osclass/utils.php:2215 -msgid "This is a paid item, you need to buy it before you are able to download it" +msgid "" +"This is a paid item, you need to buy it before you are able to download it" msgstr "" #: oc-includes/osclass/utils.php:2218 diff --git a/oc-content/languages/en_US/messages.mo b/oc-content/languages/en_US/messages.mo index 77aeca5d96..9ac298448a 100644 Binary files a/oc-content/languages/en_US/messages.mo and b/oc-content/languages/en_US/messages.mo differ diff --git a/oc-content/languages/en_US/messages.po b/oc-content/languages/en_US/messages.po index 9349a583dc..9ab2cf5b84 100644 --- a/oc-content/languages/en_US/messages.po +++ b/oc-content/languages/en_US/messages.po @@ -1,629 +1,545 @@ -# Translation of Flash Messages in Bosnian -# This file is distributed under the same license as the Flash Messages package. +# Copyright (C) 2017 {package-name} +# This file is distributed under the same license as the {package-name} package. msgid "" msgstr "" -"PO-Revision-Date: 2016-12-12 10:45:39+0000\n" +"Project-Id-Version: Osclass\n" +"Report-Msgid-Bugs-To: http://osclass.org/\n" +"POT-Creation-Date: 2017-04-24 06:56:42+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: GlotPress/0.1\n" -"Project-Id-Version: Flash Messages\n" +"PO-Revision-Date: 2017-04-24 09:01+0100\n" +"Last-Translator: Translations \n" +"Language-Team: Translations \n" +"Language: en_US\n" +"X-Generator: Poedit 1.6.10\n" -#: oc-admin/plugins.php:245 -msgid "Invalid plugin file" -msgstr "" - -#: oc-includes/osclass/controller/item.php:438 -msgid "You can't contact the seller, only registered users can. Click here to sign-in." -msgstr "" - -#: oc-admin/controller/settings/main.php:36 -msgid "Disconnected from the market" -msgstr "" - -#: oc-includes/osclass/UserActions.php:153 -msgid "The specified e-mail is already used by %s" -msgstr "" - -#: oc-includes/osclass/controller/register.php:119 -msgid "Account validation failed" -msgstr "" - -#: oc-admin/plugins.php:231 -msgid "The files were deleted" -msgstr "" - -#: oc-admin/controller/settings/advanced.php:51 -msgid "Cache flushed correctly" -msgstr "" - -#: oc-admin/plugins.php:233 -msgid "There were an error deleting the files, please check the permissions of the files in %s" -msgstr "" - -#: oc-includes/osclass/controller/item.php:599 -msgid "The listing has been blocked or is awaiting moderation from the admin" -msgstr "" - -#: oc-includes/osclass/controller/login.php:48 -msgid "Please provide an email address" -msgstr "" - -#: oc-includes/osclass/controller/login.php:52 -msgid "Empty passwords are not allowed. Please provide a password" -msgstr "" - -#: oc-admin/items.php:665 -msgid "Title Length has to be a numeric value" -msgstr "" - -#: oc-admin/items.php:668 -msgid "Description Length has to be a numeric value" -msgstr "" - -#: oc-includes/osclass/ItemActions.php:106 -msgid "Title too short (%s)." -msgstr "" - -#: oc-includes/osclass/ItemActions.php:107 -msgid "Title too long (%s)." -msgstr "" - -#: oc-includes/osclass/ItemActions.php:119 -msgid "Description too short (%s)." -msgstr "" - -#: oc-includes/osclass/ItemActions.php:120 -msgid "Description too long (%s)." -msgstr "" - -#: oc-includes/osclass/controller/login.php:134 -msgid "The user has not been validated yet. Would you like to re-send your activation?" -msgstr "" - -#: oc-includes/osclass/controller/login.php:181 -msgid "Incorrect link" -msgstr "" - -#: oc-includes/osclass/controller/login.php:192 -msgid "Validation email re-sent" -msgstr "" - -#: oc-includes/osclass/controller/login.php:194 -msgid "We have just sent you an email to validate your account, you will have to wait a few minutes to resend it again" +#: oc-admin/admins.php:30 oc-admin/items.php:38 +#: oc-includes/osclass/core/AdminSecBaseModel.php:28 +msgid "You don't have enough permissions" msgstr "" -#: oc-includes/osclass/controller/user-non-secure.php:179 -msgid "Your email has been sent properly." +#: oc-admin/admins.php:50 oc-admin/admins.php:143 oc-admin/admins.php:261 +#: oc-admin/appearance.php:37 oc-admin/appearance.php:74 +#: oc-admin/controller/settings/advanced.php:32 +#: oc-admin/controller/settings/locations.php:31 +#: oc-admin/controller/settings/locations.php:73 +#: oc-admin/controller/settings/locations.php:115 +#: oc-admin/controller/settings/locations.php:144 +#: oc-admin/controller/settings/locations.php:194 +#: oc-admin/controller/settings/locations.php:250 +#: oc-admin/controller/settings/locations.php:286 +#: oc-admin/controller/settings/locations.php:338 +#: oc-admin/controller/settings/locations.php:394 +#: oc-admin/controller/settings/mailserver.php:31 +#: oc-admin/controller/settings/media.php:170 oc-admin/languages.php:41 +#: oc-admin/login.php:112 oc-admin/plugins.php:40 oc-admin/plugins.php:77 +#: oc-admin/plugins.php:113 oc-admin/plugins.php:128 oc-admin/plugins.php:143 +msgid "This action can't be done because it's a demo site" msgstr "" -#: oc-includes/osclass/upgrade-funcs.php:528 -msgid "Osclass has been updated successfully. Need more help?" +#: oc-admin/admins.php:73 oc-admin/admins.php:173 +msgid "Email invalid" msgstr "" -#: oc-includes/osclass/controller/item.php:515 -msgid "You need to be logged to comment" +#: oc-admin/admins.php:77 oc-admin/admins.php:177 +msgid "Username invalid" msgstr "" -#: oc-includes/osclass/helpers/hSecurity.php:83 -msgid "Invalid CSRF token." +#: oc-admin/admins.php:81 oc-admin/admins.php:181 +msgid "Name invalid" msgstr "" -#: oc-includes/osclass/helpers/hSecurity.php:77 -msgid "Probable invalid request." +#: oc-admin/admins.php:85 oc-admin/admins.php:212 +msgid "Password invalid" msgstr "" -#: oc-includes/osclass/controller/item.php:518 -msgid "Sorry, comments are disabled" +#: oc-admin/admins.php:90 +msgid "Email already in use" msgstr "" -#: oc-includes/osclass/controller/item.php:597 -msgid "The listing hasn't been enabled. Please enable it in order to make it public" +#: oc-admin/admins.php:95 +msgid "Username already in use" msgstr "" -#: oc-includes/osclass/UserActions.php:55 -#: oc-includes/osclass/UserActions.php:159 -msgid "The name cannot be empty" +#: oc-admin/admins.php:118 +msgid "The admin has been added" msgstr "" -#: oc-includes/osclass/ItemActions.php:133 -#: oc-includes/osclass/ItemActions.php:343 -msgid "Price must be positive number." +#: oc-admin/admins.php:120 +msgid "There has been an error adding a new admin" msgstr "" -#: oc-admin/plugins.php:90 -msgid "The plugin generated %d characters of unexpected output during the installation. Output: \"%s\"" +#: oc-admin/admins.php:135 +msgid "There is no admin with this id" msgstr "" -#: oc-admin/items.php:662 -msgid "Number of expiration days has to be a numeric value" +#: oc-admin/admins.php:188 +msgid "This admin doesn't exist" msgstr "" -#: oc-admin/controller/settings/permalinks.php:509 -msgid "Friendly URLs deactivated, but .htaccess file was modified outside Osclass and was not deleted" +#: oc-admin/admins.php:194 +msgid "Existing email" msgstr "" -#: oc-admin/controller/settings/permalinks.php:507 -msgid "Friendly URLs deactivated, but .htaccess file could not be deleted. Please, remove it manually" +#: oc-admin/admins.php:201 +msgid "Existing username" msgstr "" -#: oc-admin/controller/settings/permalinks.php:471 -msgid "Here's the content you have to add to the .htaccess file. If you can't modify the file or experience some problems with the URLs, please deactivate the Friendly URLs option." +#: oc-admin/admins.php:220 oc-admin/admins.php:233 +msgid "The password couldn't be updated. Passwords don't match" msgstr "" -#: oc-admin/controller/settings/permalinks.php:469 -msgid "File .htaccess already exists and was not modified." +#: oc-admin/admins.php:225 +msgid "Password wasn't updated, current password is requried" msgstr "" -#: oc-admin/controller/settings/advanced.php:44 -msgid "Advanced settings have been updated" +#: oc-admin/admins.php:251 +msgid "The admin has been updated" msgstr "" -#: oc-includes/osclass/controller/ajax.php:102 -#: oc-includes/osclass/controller/item.php:321 -msgid "The selected photo couldn't be deleted, the url doesn't exist" +#: oc-admin/admins.php:270 +msgid "The admin id isn't in the correct format" msgstr "" -#: oc-includes/osclass/controller/ajax.php:112 -#: oc-includes/osclass/controller/item.php:327 -msgid "The listing doesn't exist" +#: oc-admin/admins.php:276 +msgid "The operation hasn't been completed. You're trying to remove yourself!" msgstr "" -#: oc-includes/osclass/controller/ajax.php:121 -#: oc-includes/osclass/controller/ajax.php:129 -#: oc-includes/osclass/controller/item.php:333 -#: oc-includes/osclass/controller/item.php:338 -msgid "The listing doesn't belong to you" +#: oc-admin/admins.php:283 +msgid "The admin has been deleted correctly" msgstr "" -#: oc-includes/osclass/controller/ajax.php:87 -#: oc-includes/osclass/controller/ajax.php:152 -#: oc-includes/osclass/controller/item.php:352 -msgid "The selected photo has been successfully deleted" +#: oc-admin/admins.php:285 +msgid "The admin couldn't be deleted" msgstr "" -#: oc-includes/osclass/controller/ajax.php:155 -#: oc-includes/osclass/controller/item.php:354 -msgid "The selected photo does not belong to you" +#: oc-admin/appearance.php:51 +msgid "The theme folder is not writable" msgstr "" -#: oc-includes/osclass/controller/ajax.php:87 -#: oc-includes/osclass/controller/ajax.php:159 -#: oc-includes/osclass/controller/item.php:357 -msgid "The selected photo couldn't be deleted" +#: oc-admin/appearance.php:54 +msgid "The theme has been installed correctly" msgstr "" -#: oc-includes/osclass/controller/contact.php:40 -#: oc-includes/osclass/controller/item.php:123 -#: oc-includes/osclass/controller/item.php:232 -#: oc-includes/osclass/controller/item.php:402 -#: oc-includes/osclass/controller/item.php:454 -#: oc-includes/osclass/controller/user-non-secure.php:160 -msgid "The Recaptcha code is wrong" +#: oc-admin/appearance.php:57 oc-admin/languages.php:67 +#: oc-admin/plugins.php:60 +msgid "The zip file is not valid" msgstr "" -#: oc-includes/osclass/emails.php:645 -msgid "There has been some errors sending the message" +#: oc-admin/appearance.php:60 oc-admin/languages.php:70 +#: oc-admin/plugins.php:63 oc-admin/tools.php:55 +msgid "No file was uploaded" msgstr "" -#: oc-includes/osclass/controller/item.php:52 -#: oc-includes/osclass/controller/item.php:117 -msgid "Only registered users are allowed to post listings" +#: oc-admin/appearance.php:65 +msgid "There was a problem adding the theme" msgstr "" -#: oc-includes/osclass/controller/item.php:166 -msgid "Your listing has been published" +#: oc-admin/appearance.php:86 +msgid "Theme removed successfully" msgstr "" -#: oc-includes/osclass/controller/item.php:247 -msgid "Great! We've just updated your listing" +#: oc-admin/appearance.php:88 +msgid "There was a problem removing the theme" msgstr "" -#: oc-includes/osclass/controller/item.php:274 -msgid "The listing has been validated" +#: oc-admin/appearance.php:91 +msgid "Current theme can not be deleted" msgstr "" -#: oc-includes/osclass/controller/item.php:276 -msgid "The listing can't be validated" +#: oc-admin/appearance.php:94 +msgid "No theme selected" msgstr "" -#: oc-includes/osclass/controller/item.php:279 -msgid "The listing has already been validated" +#: oc-admin/appearance.php:123 +msgid "Widget removed correctly" msgstr "" -#: oc-includes/osclass/controller/item.php:292 -msgid "Your listing has been deleted" +#: oc-admin/appearance.php:129 oc-admin/appearance.php:151 +msgid "Description field is required" msgstr "" -#: oc-includes/osclass/controller/item.php:294 -#: oc-includes/osclass/controller/item.php:302 -msgid "The listing you are trying to delete couldn't be deleted" +#: oc-admin/appearance.php:142 +msgid "Widget updated correctly" msgstr "" -#: oc-includes/osclass/controller/item.php:379 -msgid "Thanks! That's very helpful" +#: oc-admin/appearance.php:144 +msgid "Widget cannot be updated correctly" msgstr "" -#: oc-includes/osclass/controller/item.php:425 -#: oc-includes/osclass/controller/item.php:537 -msgid "This listing doesn't exist" +#: oc-admin/appearance.php:163 +msgid "Widget added correctly" msgstr "" -#: oc-includes/osclass/controller/item.php:431 -#: oc-includes/osclass/controller/item.php:474 -msgid "We're sorry, but the listing has expired. You can't contact the seller" +#: oc-admin/appearance.php:170 +msgid "Theme activated correctly" msgstr "" -#: oc-includes/osclass/controller/item.php:446 -msgid "You can't contact the seller, only registered users can" +#: oc-admin/comments.php:52 +msgid "The comments have been deleted" msgstr "" -#: oc-includes/osclass/controller/item.php:487 -msgid "We've just sent an e-mail to the seller" +#: oc-admin/comments.php:65 +msgid "The comments have been approved" msgstr "" -#: oc-includes/osclass/controller/item.php:497 -msgid "Sorry, we could not save your comment. Try again later" +#: oc-admin/comments.php:75 +msgid "The comments have been disapproved" msgstr "" -#: oc-includes/osclass/controller/item.php:500 -msgid "Your comment is awaiting moderation" +#: oc-admin/comments.php:88 +msgid "The comments have been unblocked" msgstr "" -#: oc-includes/osclass/controller/item.php:503 -msgid "Your comment has been approved" +#: oc-admin/comments.php:98 +msgid "The comments have been blocked" msgstr "" -#: oc-includes/osclass/controller/item.php:506 -msgid "Please fill the required field (email)" +#: oc-admin/comments.php:128 +msgid "The comment has been approved" msgstr "" -#: oc-includes/osclass/controller/item.php:509 -msgid "Please type a comment" +#: oc-admin/comments.php:135 +msgid "The comment has been disapproved" msgstr "" -#: oc-includes/osclass/controller/item.php:512 -msgid "Your comment has been marked as spam" +#: oc-admin/comments.php:142 +msgid "The comment has been enabled" msgstr "" -#: oc-includes/osclass/controller/item.php:544 -msgid "You must be logged in to delete a comment" +#: oc-admin/comments.php:149 +msgid "The comment has been disabled" msgstr "" -#: oc-includes/osclass/controller/item.php:552 -msgid "The comment doesn't exist" +#: oc-admin/comments.php:164 +msgid "Email is not correct" msgstr "" -#: oc-includes/osclass/controller/item.php:557 -msgid "The comment is not active, you cannot delete it" +#: oc-admin/comments.php:167 +msgid "Comment is required" msgstr "" -#: oc-includes/osclass/controller/item.php:562 -msgid "The comment was not added by you, you cannot delete it" +#: oc-admin/comments.php:189 +msgid "Great! We just updated your comment" msgstr "" #: oc-admin/comments.php:195 oc-includes/osclass/controller/item.php:567 msgid "The comment has been deleted" msgstr "" -#: oc-includes/osclass/controller/login.php:25 -#: oc-includes/osclass/controller/register.php:26 -#: oc-includes/osclass/controller/user-non-secure.php:25 -#: oc-includes/osclass/controller/user.php:25 -msgid "Users not enabled" -msgstr "" - -#: oc-includes/osclass/controller/login.php:37 -#: oc-includes/osclass/controller/register.php:50 -msgid "Users are not enabled" -msgstr "" - -#: oc-includes/osclass/controller/login.php:66 -#: oc-includes/osclass/controller/login.php:131 -msgid "The user doesn't exist" -msgstr "" - -#: oc-includes/osclass/controller/login.php:70 -msgid "The password is incorrect" -msgstr "" - -#: oc-includes/osclass/controller/login.php:136 -msgid "The user has not been validated yet" -msgstr "" - -#: oc-includes/osclass/controller/login.php:139 -msgid "The user has been suspended" +#: oc-admin/controller/settings/advanced.php:44 +msgid "Advanced settings have been updated" msgstr "" -#: oc-includes/osclass/controller/login.php:207 -msgid "Invalid email address" +#: oc-admin/controller/settings/advanced.php:51 +msgid "Cache flushed correctly" msgstr "" -#: oc-includes/osclass/controller/login.php:216 -msgid "We have sent you an email with the instructions to reset your password" +#: oc-admin/controller/settings/comments.php:48 +msgid "Number of moderate comments must only contain numeric characters" msgstr "" -#: oc-includes/osclass/controller/login.php:220 -msgid "We were not able to identify you given the information provided" +#: oc-admin/controller/settings/comments.php:51 +msgid "Comments per page must only contain numeric characters" msgstr "" -#: oc-includes/osclass/controller/login.php:224 -msgid "The recaptcha code is wrong" +#: oc-admin/controller/settings/comments.php:71 +msgid "Comment settings have been updated" msgstr "" -#: oc-admin/login.php:146 oc-admin/login.php:156 -#: oc-includes/osclass/controller/login.php:234 -#: oc-includes/osclass/controller/login.php:262 -#: oc-includes/osclass/controller/user-non-secure.php:55 -#: oc-includes/osclass/controller/user-non-secure.php:59 -msgid "Sorry, the link is not valid" +#: oc-admin/controller/settings/currencies.php:50 +msgid "The currency code is not in the correct format" msgstr "" -#: oc-includes/osclass/controller/login.php:241 -#: oc-includes/osclass/controller/user.php:171 -msgid "Password cannot be blank" +#: oc-admin/controller/settings/currencies.php:63 +msgid "Currency added" msgstr "" -#: oc-admin/login.php:166 oc-includes/osclass/controller/login.php:255 -msgid "The password has been changed" +#: oc-admin/controller/settings/currencies.php:65 +msgid "Currency couldn't be added" msgstr "" -#: oc-includes/osclass/controller/login.php:258 -msgid "Error, the password don't match" +#: oc-admin/controller/settings/currencies.php:75 +#: oc-admin/controller/settings/currencies.php:82 +msgid "The currency code '%s' doesn't exist" msgstr "" -#: oc-includes/osclass/controller/register.php:31 -msgid "User registration is not enabled" +#: oc-admin/controller/settings/currencies.php:104 +msgid "Error: the currency code is not in the correct format" msgstr "" -#: oc-includes/osclass/controller/register.php:69 -msgid "The user has been created. An activation email has been sent" +#: oc-admin/controller/settings/currencies.php:117 +msgid "Currency updated" msgstr "" -#: oc-includes/osclass/controller/register.php:72 -msgid "Your account has been created successfully" +#: oc-admin/controller/settings/currencies.php:119 +msgid "No changes were made" msgstr "" -#: oc-includes/osclass/UserActions.php:67 -#: oc-includes/osclass/controller/user.php:131 -msgid "The specified e-mail is already in use" +#: oc-admin/controller/settings/currencies.php:141 +msgid "%s couldn't be deleted because it has listings associated to it" msgstr "" -#: oc-includes/osclass/UserActions.php:60 -msgid "The email is not valid" +#: oc-admin/controller/settings/currencies.php:143 +msgid "%s couldn't be deleted because it's the default currency" msgstr "" -#: oc-includes/osclass/UserActions.php:43 -msgid "The password cannot be empty" +#: oc-admin/controller/settings/currencies.php:151 +msgid "No currencies have been deleted" msgstr "" -#: oc-includes/osclass/UserActions.php:48 -#: oc-includes/osclass/UserActions.php:165 -#: oc-includes/osclass/controller/user.php:186 -msgid "Passwords don't match" +#: oc-admin/controller/settings/currencies.php:155 +msgid "One currency has been deleted" msgstr "" -#: oc-includes/osclass/controller/register.php:91 -msgid "The link is not valid anymore. Sorry for the inconvenience!" +#: oc-admin/controller/settings/currencies.php:159 +msgid "%s currencies have been deleted" msgstr "" -#: oc-includes/osclass/controller/register.php:96 -msgid "Your account has already been validated" +#: oc-admin/controller/settings/latestsearches.php:39 +msgid "Custom number could not be left empty" msgstr "" -#: oc-includes/osclass/controller/register.php:117 -msgid "Your account has been validated" +#: oc-admin/controller/settings/latestsearches.php:44 +msgid "Last search settings have been updated" msgstr "" -#: oc-includes/osclass/controller/user-non-secure.php:52 -msgid "Your email has been changed successfully" +#: oc-admin/controller/settings/locations.php:39 +#: oc-admin/controller/settings/locations.php:184 +#: oc-admin/controller/settings/locations.php:243 +#: oc-admin/controller/settings/locations.php:329 +#: oc-admin/controller/settings/locations.php:387 +msgid "%s already was in the database" msgstr "" -#: oc-includes/osclass/controller/user-non-secure.php:81 -#: oc-includes/osclass/controller/user.php:223 -msgid "Alert activated" +#: oc-admin/controller/settings/locations.php:44 +#: oc-admin/controller/settings/locations.php:62 +msgid "%s has been added as a new country" msgstr "" -#: oc-includes/osclass/controller/user-non-secure.php:102 -#: oc-includes/osclass/controller/user.php:244 -msgid "Unsubscribed correctly" +#: oc-admin/controller/settings/locations.php:47 +msgid "Country code and name should have at least two characters" msgstr "" -#: oc-includes/osclass/controller/user.php:76 -msgid "Your profile has been updated successfully" +#: oc-admin/controller/settings/locations.php:78 +msgid "Country name cannot be blank" msgstr "" -#: oc-includes/osclass/controller/user.php:107 -msgid "The specified e-mail is not valid" +#: oc-admin/controller/settings/locations.php:106 +msgid "Country has been edited" msgstr "" -#: oc-includes/osclass/controller/user.php:176 -msgid "Current password doesn't match" +#: oc-admin/controller/settings/locations.php:108 +msgid "There were some problems editing the country" msgstr "" -#: oc-includes/osclass/controller/user.php:181 -msgid "Passwords can't be empty" +#: oc-admin/controller/settings/locations.php:135 +#: oc-admin/controller/settings/locations.php:277 +#: oc-admin/controller/settings/locations.php:418 +msgid "There was a problem deleting locations" msgstr "" -#: oc-includes/osclass/controller/user.php:193 -msgid "Password has been changed" +#: oc-admin/controller/settings/locations.php:138 +msgid "No country was selected" msgstr "" -#: oc-admin/admins.php:30 oc-admin/items.php:38 -#: oc-includes/osclass/core/AdminSecBaseModel.php:28 -msgid "You don't have enough permissions" +#: oc-admin/controller/settings/locations.php:160 +#: oc-admin/controller/settings/locations.php:182 +msgid "%s has been added as a new region" msgstr "" -#: oc-admin/admins.php:73 oc-admin/admins.php:173 -msgid "Email invalid" +#: oc-admin/controller/settings/locations.php:162 +#: oc-admin/controller/settings/locations.php:309 +msgid "%s can't be added" msgstr "" -#: oc-admin/admins.php:77 oc-admin/admins.php:177 -msgid "Username invalid" +#: oc-admin/controller/settings/locations.php:172 +#: oc-admin/controller/settings/locations.php:203 +msgid "Region name cannot be blank" msgstr "" -#: oc-admin/admins.php:81 oc-admin/admins.php:181 -msgid "Name invalid" +#: oc-admin/controller/settings/locations.php:240 +#: oc-admin/controller/settings/locations.php:385 +msgid "%s has been edited" msgstr "" -#: oc-admin/admins.php:85 oc-admin/admins.php:212 -msgid "Password invalid" +#: oc-admin/controller/settings/locations.php:280 +msgid "No region was selected" msgstr "" -#: oc-admin/admins.php:90 -msgid "Email already in use" +#: oc-admin/controller/settings/locations.php:307 +#: oc-admin/controller/settings/locations.php:327 +msgid "%s has been added as a new city" msgstr "" -#: oc-admin/admins.php:95 -msgid "Username already in use" +#: oc-admin/controller/settings/locations.php:317 +msgid "New city name cannot be blank" msgstr "" -#: oc-admin/admins.php:118 -msgid "The admin has been added" +#: oc-admin/controller/settings/locations.php:348 +msgid "City name cannot be blank" msgstr "" -#: oc-admin/admins.php:188 -msgid "This admin doesn't exist" +#: oc-admin/controller/settings/locations.php:421 +msgid "No city was selected" msgstr "" -#: oc-admin/admins.php:194 -msgid "Existing email" +#: oc-admin/controller/settings/mailserver.php:52 +msgid "Mail server type is incorrect" msgstr "" -#: oc-admin/admins.php:201 -msgid "Existing username" +#: oc-admin/controller/settings/mailserver.php:68 +msgid "Mail server configuration has changed" msgstr "" -#: oc-admin/admins.php:220 oc-admin/admins.php:230 -msgid "The password couldn't be updated. Passwords don't match" +#: oc-admin/controller/settings/main.php:29 +msgid "Last check" msgstr "" -#: oc-admin/admins.php:248 -msgid "The admin has been updated" +#: oc-admin/controller/settings/main.php:36 +msgid "Disconnected from the market" msgstr "" -#: oc-admin/admins.php:267 -msgid "The admin id isn't in the correct format" +#: oc-admin/controller/settings/main.php:83 +msgid "Page title field is required" msgstr "" -#: oc-admin/admins.php:273 -msgid "The operation hasn't been completed. You're trying to remove yourself!" +#: oc-admin/controller/settings/main.php:86 +msgid "Contact email field is required" msgstr "" -#: oc-admin/admins.php:280 -msgid "The admin has been deleted correctly" +#: oc-admin/controller/settings/main.php:89 +msgid "Number of listings in the RSS has to be a numeric value" msgstr "" -#: oc-admin/admins.php:282 -msgid "The admin couldn't be deleted" +#: oc-admin/controller/settings/main.php:92 +msgid "Max latest listings has to be a numeric value" msgstr "" -#: oc-admin/tools.php:36 oc-admin/tools.php:63 oc-admin/tools.php:73 -#: oc-admin/tools.php:90 oc-admin/tools.php:126 oc-admin/tools.php:169 -#: oc-admin/tools.php:196 oc-admin/tools.php:225 -msgid "This action cannot be done because it is a demo site" +#: oc-admin/controller/settings/main.php:95 +msgid "Number of listings on search has to be a numeric value" msgstr "" -#: oc-admin/appearance.php:51 -msgid "The theme folder is not writable" +#: oc-admin/controller/settings/main.php:120 +msgid "Number of listings in the RSS must be an integer" msgstr "" -#: oc-admin/appearance.php:54 -msgid "The theme has been installed correctly" +#: oc-admin/controller/settings/main.php:127 +msgid "Number of recent listings displayed at home must be an integer" msgstr "" -#: oc-admin/appearance.php:57 oc-admin/languages.php:67 oc-admin/plugins.php:60 -msgid "The zip file is not valid" +#: oc-admin/controller/settings/main.php:137 +#: oc-admin/controller/settings/main.php:139 +msgid "General settings have been updated" msgstr "" -#: oc-admin/appearance.php:60 oc-admin/languages.php:70 oc-admin/plugins.php:63 -#: oc-admin/tools.php:55 -msgid "No file was uploaded" +#: oc-admin/controller/settings/media.php:83 +#: oc-admin/controller/settings/media.php:91 +msgid "There was a problem uploading the watermark image" msgstr "" -#: oc-admin/appearance.php:65 -msgid "There was a problem adding the theme" +#: oc-admin/controller/settings/media.php:87 +msgid "The watermark image has to be a .PNG file" msgstr "" -#: oc-admin/appearance.php:86 -msgid "Theme removed successfully" +#: oc-admin/controller/settings/media.php:138 +msgid "" +"You cannot set a maximum file size higher than the one allowed in the PHP " +"configuration: %d KB" msgstr "" -#: oc-admin/appearance.php:88 -msgid "There was a problem removing the theme" +#: oc-admin/controller/settings/media.php:163 +msgid "Media config has been updated" msgstr "" -#: oc-admin/appearance.php:91 -msgid "Current theme can not be deleted" +#: oc-admin/controller/settings/media.php:223 +msgid "Re-generation complete" msgstr "" -#: oc-admin/appearance.php:94 -msgid "No theme selected" +#: oc-admin/controller/settings/permalinks.php:424 +msgid "All fields are required." msgstr "" -#: oc-admin/appearance.php:123 -msgid "Widget removed correctly" +#: oc-admin/controller/settings/permalinks.php:424 +msgid "One field was not updated" msgstr "" -#: oc-admin/appearance.php:129 oc-admin/appearance.php:151 -msgid "Description field is required" +#: oc-admin/controller/settings/permalinks.php:427 +#: oc-admin/controller/settings/permalinks.php:475 +msgid "Permalinks structure updated" msgstr "" -#: oc-admin/appearance.php:142 -msgid "Widget updated correctly" +#: oc-admin/controller/settings/permalinks.php:436 +msgid "Permalinks structure updated." msgstr "" -#: oc-admin/appearance.php:144 -msgid "Widget cannot be updated correctly" +#: oc-admin/controller/settings/permalinks.php:438 +msgid "" +"However, we can't check if Apache module mod_rewrite is loaded. If " +"you experience some problems with the URLs, you should deactivate " +"Friendly URLs" msgstr "" -#: oc-admin/appearance.php:163 -msgid "Widget added correctly" +#: oc-admin/controller/settings/permalinks.php:445 +#: oc-admin/controller/settings/permalinks.php:455 +msgid "File .htaccess couldn't be filled out with the right content." msgstr "" -#: oc-admin/appearance.php:170 -msgid "Theme activated correctly" +#: oc-admin/controller/settings/permalinks.php:447 +msgid "" +"Here's the content you have to add to the .htaccess file. If you " +"can't create the file, please deactivate the Friendly URLs option." msgstr "" -#: oc-admin/comments.php:52 -msgid "The comments have been deleted" +#: oc-admin/controller/settings/permalinks.php:457 +msgid "" +"Here's the content you have to add to the .htaccess file. If you " +"can't create the file or experience some problems with the URLs, please " +"deactivate the Friendly URLs option." msgstr "" -#: oc-admin/comments.php:65 -msgid "The comments have been approved" +#: oc-admin/controller/settings/permalinks.php:469 +msgid "File .htaccess already exists and was not modified." msgstr "" -#: oc-admin/comments.php:75 -msgid "The comments have been disapproved" +#: oc-admin/controller/settings/permalinks.php:471 +msgid "" +"Here's the content you have to add to the .htaccess file. If you " +"can't modify the file or experience some problems with the URLs, please " +"deactivate the Friendly URLs option." msgstr "" -#: oc-admin/comments.php:128 -msgid "The comment has been approved" +#: oc-admin/controller/settings/permalinks.php:504 +msgid "Friendly URLs successfully deactivated" msgstr "" -#: oc-admin/comments.php:135 -msgid "The comment has been disapproved" +#: oc-admin/controller/settings/permalinks.php:507 +msgid "" +"Friendly URLs deactivated, but .htaccess file could not be deleted. Please, " +"remove it manually" msgstr "" -#: oc-admin/comments.php:142 -msgid "The comment has been enabled" +#: oc-admin/controller/settings/permalinks.php:509 +msgid "" +"Friendly URLs deactivated, but .htaccess file was modified outside Osclass " +"and was not deleted" msgstr "" -#: oc-admin/comments.php:149 -msgid "The comment has been disabled" +#: oc-admin/controller/settings/spamnbots.php:56 +msgid "Your Akismet key has been cleared" msgstr "" -#: oc-admin/comments.php:164 -msgid "Email is not correct" +#: oc-admin/controller/settings/spamnbots.php:58 +msgid "Your Akismet key has been updated" msgstr "" -#: oc-admin/comments.php:167 -msgid "Comment is required" +#: oc-admin/controller/settings/spamnbots.php:78 +msgid "Your reCAPTCHA key has been cleared" msgstr "" -#: oc-admin/comments.php:189 -msgid "Great! We just updated your comment" +#: oc-admin/controller/settings/spamnbots.php:80 +msgid "Your reCAPTCHA key has been updated" msgstr "" #: oc-admin/emails.php:82 @@ -690,6 +606,10 @@ msgstr "" msgid "%d listing has been unmarked as offensive" msgstr "" +#: oc-admin/items.php:264 +msgid "%d listing has been unmarked" +msgstr "" + #: oc-admin/items.php:289 msgid "The listing has been deleted" msgstr "" @@ -702,6 +622,16 @@ msgstr "" msgid "The listing has been activated" msgstr "" +#: oc-admin/items.php:322 oc-admin/items.php:334 oc-admin/items.php:344 +#: oc-admin/items.php:354 oc-admin/items.php:383 oc-admin/items.php:409 +#: oc-admin/items.php:553 +msgid "An error has occurred" +msgstr "" + +#: oc-admin/items.php:324 +msgid "The listing can't be activated because it's blocked" +msgstr "" + #: oc-admin/items.php:332 msgid "The listing has been deactivated" msgstr "" @@ -738,6 +668,30 @@ msgstr "" msgid "A new listing has been added" msgstr "" +#: oc-admin/items.php:653 +msgid "Wait time must only contain numeric characters" +msgstr "" + +#: oc-admin/items.php:656 +msgid "Number of moderated listings must only contain numeric characters" +msgstr "" + +#: oc-admin/items.php:659 +msgid "Images per listing must only contain numeric characters" +msgstr "" + +#: oc-admin/items.php:662 +msgid "Number of expiration days has to be a numeric value" +msgstr "" + +#: oc-admin/items.php:665 +msgid "Title Length has to be a numeric value" +msgstr "" + +#: oc-admin/items.php:668 +msgid "Description Length has to be a numeric value" +msgstr "" + #: oc-admin/items.php:699 msgid "Listings' settings have been updated" msgstr "" @@ -778,6 +732,10 @@ msgstr "" msgid "Currency format field is required" msgstr "" +#: oc-admin/languages.php:153 +msgid "Number of decimals must only contain numeric characters" +msgstr "" + #: oc-admin/languages.php:174 msgid "%s has been updated" msgstr "" @@ -795,6 +753,10 @@ msgstr "" msgid "Selected languages have been disabled for the website" msgstr "" +#: oc-admin/languages.php:218 oc-admin/languages.php:276 +msgid "%s can't be disabled because it's the default language" +msgstr "" + #: oc-admin/languages.php:238 msgid "Selected languages have been enabled for the backoffice (oc-admin)" msgstr "" @@ -803,10 +765,6 @@ msgstr "" msgid "Selected languages have been disabled for the backoffice (oc-admin)" msgstr "" -#: oc-admin/languages.php:218 oc-admin/languages.php:276 -msgid "%s can't be disabled because it's the default language" -msgstr "" - #: oc-admin/languages.php:302 msgid "Directory '%s' couldn't be removed" msgstr "" @@ -815,36 +773,81 @@ msgstr "" msgid "Directory \"%s\" has been successfully removed" msgstr "" -#: oc-admin/languages.php:310 -msgid "Directory '%s' couldn't be removed because it's the default language. Set another language as default first and try again" +#: oc-admin/languages.php:307 +msgid "Directory '%s' couldn't be removed;)" +msgstr "" + +#: oc-admin/languages.php:310 +msgid "" +"Directory '%s' couldn't be removed because it's the default language. Set another language as default first and try again" +msgstr "" + +#: oc-admin/login.php:44 +msgid "The username field is empty" +msgstr "" + +#: oc-admin/login.php:49 +msgid "The password field is empty" +msgstr "" + +#: oc-admin/login.php:57 +msgid "" +"Sorry, incorrect username. Have you lost your password?" +msgstr "" + +#: oc-admin/login.php:62 +msgid "" +"Sorry, incorrect password. Have you lost your password?" +msgstr "" + +#: oc-admin/login.php:122 +msgid "The reCAPTCHA code is wrong" +msgstr "" + +#: oc-admin/login.php:140 +msgid "A new password has been sent to your e-mail" +msgstr "" + +#: oc-admin/login.php:146 oc-admin/login.php:156 +#: oc-includes/osclass/controller/login.php:234 +#: oc-includes/osclass/controller/login.php:262 +#: oc-includes/osclass/controller/user-non-secure.php:59 +#: oc-includes/osclass/controller/user-non-secure.php:63 +msgid "Sorry, the link is not valid" +msgstr "" + +#: oc-admin/login.php:166 oc-includes/osclass/controller/login.php:255 +msgid "The password has been changed" msgstr "" -#: oc-admin/login.php:44 -msgid "The username field is empty" +#: oc-admin/login.php:169 +msgid "Error, the passwords don't match" msgstr "" -#: oc-admin/login.php:49 -msgid "The password field is empty" +#: oc-admin/main.php:62 +msgid "" +"You have very few free space left, users will not be able to upload pictures" msgstr "" -#: oc-admin/login.php:57 -msgid "Sorry, incorrect username. Have you lost your password?" +#: oc-admin/main.php:71 +msgid "Entered an invalid email" msgstr "" -#: oc-admin/login.php:62 -msgid "Sorry, incorrect password. Have you lost your password?" +#: oc-admin/main.php:74 +msgid "You're already subscribed" msgstr "" -#: oc-admin/login.php:122 -msgid "The reCAPTCHA code is wrong" +#: oc-admin/main.php:77 +msgid "Subscribed correctly" msgstr "" -#: oc-admin/login.php:140 -msgid "A new password has been sent to your e-mail" +#: oc-admin/main.php:80 +msgid "Error subscribing" msgstr "" -#: oc-admin/login.php:169 -msgid "Error, the passwords don't match" +#: oc-admin/pages.php:77 oc-admin/pages.php:142 +msgid "You have to set an internal name" msgstr "" #: oc-admin/pages.php:82 oc-admin/pages.php:147 @@ -859,10 +862,6 @@ msgstr "" msgid "The page couldn't be updated, at least one title should not be empty" msgstr "" -#: oc-admin/pages.php:77 oc-admin/pages.php:142 -msgid "You have to set an internal name" -msgstr "" - #: oc-admin/pages.php:158 msgid "The page has been added" msgstr "" @@ -911,6 +910,12 @@ msgstr "" msgid "There was a problem adding the plugin" msgstr "" +#: oc-admin/plugins.php:90 +msgid "" +"The plugin generated %d characters of unexpected output " +"during the installation. Output: \"%s\"" +msgstr "" + #: oc-admin/plugins.php:93 msgid "Plugin is already installed" msgstr "" @@ -955,278 +960,251 @@ msgstr "" msgid "Plugin is already disabled" msgstr "" -#: oc-admin/plugins.php:222 oc-admin/plugins.php:238 -msgid "No plugin selected" -msgstr "" - #: oc-admin/plugins.php:218 msgid "Configuration was saved" msgstr "" -#: oc-admin/controller/settings/locations.php:39 -#: oc-admin/controller/settings/locations.php:184 -#: oc-admin/controller/settings/locations.php:243 -#: oc-admin/controller/settings/locations.php:329 -#: oc-admin/controller/settings/locations.php:387 -msgid "%s already was in the database" -msgstr "" - -#: oc-admin/controller/settings/locations.php:44 -#: oc-admin/controller/settings/locations.php:62 -msgid "%s has been added as a new country" -msgstr "" - -#: oc-admin/controller/settings/locations.php:106 -msgid "Country has been edited" -msgstr "" - -#: oc-admin/controller/settings/locations.php:108 -msgid "There were some problems editing the country" -msgstr "" - -#: oc-admin/controller/settings/locations.php:160 -#: oc-admin/controller/settings/locations.php:182 -msgid "%s has been added as a new region" -msgstr "" - -#: oc-admin/controller/settings/locations.php:240 -#: oc-admin/controller/settings/locations.php:385 -msgid "%s has been edited" -msgstr "" - -#: oc-admin/controller/settings/locations.php:307 -#: oc-admin/controller/settings/locations.php:327 -msgid "%s has been added as a new city" +#: oc-admin/plugins.php:222 oc-admin/plugins.php:238 +msgid "No plugin selected" msgstr "" -#: oc-admin/controller/settings/permalinks.php:424 -msgid "One field was not updated" +#: oc-admin/plugins.php:231 +msgid "The files were deleted" msgstr "" -#: oc-admin/controller/settings/permalinks.php:427 -#: oc-admin/controller/settings/permalinks.php:475 -msgid "Permalinks structure updated" +#: oc-admin/plugins.php:233 +msgid "" +"There were an error deleting the files, please check the permissions of the " +"files in %s" msgstr "" -#: oc-admin/controller/settings/permalinks.php:436 -msgid "Permalinks structure updated." +#: oc-admin/plugins.php:245 +msgid "Invalid plugin file" msgstr "" -#: oc-admin/controller/settings/permalinks.php:438 -msgid "However, we can't check if Apache module mod_rewrite is loaded. If you experience some problems with the URLs, you should deactivate Friendly URLs" +#: oc-admin/themes/modern/market/header.php:5 +msgid "" +"downloads folder has to be writable, i.e.: chmod a+w %soc-" +"content/downloads/" msgstr "" -#: oc-admin/controller/settings/permalinks.php:504 -msgid "Friendly URLs successfully deactivated" +#: oc-admin/tools.php:36 oc-admin/tools.php:63 oc-admin/tools.php:73 +#: oc-admin/tools.php:83 oc-admin/tools.php:94 oc-admin/tools.php:130 +#: oc-admin/tools.php:173 oc-admin/tools.php:200 oc-admin/tools.php:229 +#: oc-admin/upgrade.php:34 +msgid "This action cannot be done because it is a demo site" msgstr "" -#: oc-admin/controller/settings/spamnbots.php:56 -msgid "Your Akismet key has been cleared" +#: oc-admin/tools.php:50 +msgid "Import complete" msgstr "" -#: oc-admin/controller/settings/spamnbots.php:58 -msgid "Your Akismet key has been updated" +#: oc-admin/tools.php:52 +msgid "There was a problem importing data to the database" msgstr "" -#: oc-admin/controller/settings/spamnbots.php:78 -msgid "Your reCAPTCHA key has been cleared" +#: oc-admin/tools.php:67 +msgid "Recount category stats has been successful" msgstr "" -#: oc-admin/controller/settings/spamnbots.php:80 -msgid "Your reCAPTCHA key has been updated" +#: oc-admin/tools.php:110 oc-admin/tools.php:139 +msgid "Path is empty" msgstr "" -#: oc-admin/controller/settings/currencies.php:50 -msgid "The currency code is not in the correct format" +#: oc-admin/tools.php:113 oc-admin/tools.php:142 +msgid "Could not connect with the database. Error: %s" msgstr "" -#: oc-admin/controller/settings/currencies.php:63 -msgid "Currency added" +#: oc-admin/tools.php:116 oc-admin/tools.php:148 +msgid "There are no tables to back up" msgstr "" -#: oc-admin/controller/settings/currencies.php:65 -msgid "Currency couldn't be added" +#: oc-admin/tools.php:119 oc-admin/tools.php:151 +msgid "The folder is not writable" msgstr "" -#: oc-admin/controller/settings/currencies.php:75 -#: oc-admin/controller/settings/currencies.php:82 -msgid "The currency code '%s' doesn't exist" +#: oc-admin/tools.php:122 oc-admin/tools.php:154 +msgid "Backup completed successfully" msgstr "" -#: oc-admin/controller/settings/currencies.php:104 -msgid "Error: the currency code is not in the correct format" +#: oc-admin/tools.php:145 +msgid "Could not select the database. Error: %s" msgstr "" -#: oc-admin/controller/settings/currencies.php:117 -msgid "Currency updated" +#: oc-admin/tools.php:180 oc-admin/tools.php:217 +msgid "Archived successfully!" msgstr "" -#: oc-admin/controller/settings/currencies.php:119 -msgid "No changes were made" +#: oc-admin/tools.php:194 oc-admin/tools.php:220 +msgid "Error, the zip file was not created in the specified directory" msgstr "" -#: oc-admin/controller/settings/currencies.php:151 -msgid "No currencies have been deleted" +#: oc-admin/tools.php:239 +msgid "Maintenance mode is ON" msgstr "" -#: oc-admin/controller/settings/currencies.php:155 -msgid "One currency has been deleted" +#: oc-admin/tools.php:241 +msgid "" +"There was an error creating the .maintenance file, please create it manually " +"at the root folder" msgstr "" -#: oc-admin/controller/settings/currencies.php:159 -msgid "%s currencies have been deleted" +#: oc-admin/tools.php:249 +msgid "Maintenance mode is OFF" msgstr "" -#: oc-admin/controller/settings/mailserver.php:52 -msgid "Mail server type is incorrect" +#: oc-admin/tools.php:251 +msgid "" +"There was an error removing the .maintenance file, please remove it manually " +"from the root folder" msgstr "" -#: oc-admin/controller/settings/mailserver.php:68 -msgid "Mail server configuration has changed" +#: oc-admin/users.php:68 +msgid "The user has been created. We've sent an activation e-mail" msgstr "" -#: oc-admin/controller/settings/media.php:83 -#: oc-admin/controller/settings/media.php:91 -msgid "There was a problem uploading the watermark image" +#: oc-admin/users.php:70 +msgid "The user has been created successfully" msgstr "" -#: oc-admin/controller/settings/media.php:87 -msgid "The watermark image has to be a .PNG file" +#: oc-admin/users.php:121 +msgid "The user has been updated" msgstr "" -#: oc-admin/controller/settings/media.php:138 -msgid "You cannot set a maximum file size higher than the one allowed in the PHP configuration: %d KB" +#: oc-admin/users.php:123 +msgid "The user has been updated and activated" msgstr "" -#: oc-admin/controller/settings/media.php:163 -msgid "Media config has been updated" +#: oc-admin/users.php:137 oc-admin/users.php:160 oc-admin/users.php:185 +#: oc-admin/users.php:209 oc-admin/users.php:233 oc-admin/users.php:257 +#: oc-admin/users.php:555 +msgid "User id isn't in the correct format" msgstr "" -#: oc-admin/controller/settings/media.php:223 -msgid "Re-generation complete" +#: oc-admin/users.php:147 +msgid "No users have been selected" msgstr "" -#: oc-admin/controller/settings/main.php:83 -msgid "Page title field is required" +#: oc-admin/users.php:149 +msgid "Activation email sent to one user" msgstr "" -#: oc-admin/controller/settings/main.php:86 -msgid "Contact email field is required" +#: oc-admin/users.php:170 +msgid "No users have been activated" msgstr "" -#: oc-admin/controller/settings/main.php:137 -#: oc-admin/controller/settings/main.php:139 -msgid "General settings have been updated" +#: oc-admin/users.php:172 +msgid "One user has been activated" msgstr "" -#: oc-admin/controller/settings/latestsearches.php:39 -msgid "Custom number could not be left empty" +#: oc-admin/users.php:195 +msgid "No users have been deactivated" msgstr "" -#: oc-admin/controller/settings/latestsearches.php:44 -msgid "Last search settings have been updated" +#: oc-admin/users.php:197 +msgid "One user has been deactivated" msgstr "" -#: oc-admin/tools.php:50 -msgid "Import complete" +#: oc-admin/users.php:219 +msgid "No users have been enabled" msgstr "" -#: oc-admin/tools.php:52 -msgid "There was a problem importing data to the database" +#: oc-admin/users.php:221 +msgid "One user has been unblocked" msgstr "" -#: oc-admin/tools.php:67 -msgid "Recount category stats has been successful" +#: oc-admin/users.php:243 +msgid "No users have been disabled" msgstr "" -#: oc-admin/tools.php:106 oc-admin/tools.php:135 -msgid "Path is empty" +#: oc-admin/users.php:245 +msgid "One user has been blocked" msgstr "" -#: oc-admin/tools.php:109 oc-admin/tools.php:138 -msgid "Could not connect with the database. Error: %s" +#: oc-admin/users.php:270 +msgid "No users have been deleted" msgstr "" -#: oc-admin/tools.php:112 oc-admin/tools.php:144 -msgid "There are no tables to back up" +#: oc-admin/users.php:272 +msgid "One user has been deleted" msgstr "" -#: oc-admin/tools.php:115 oc-admin/tools.php:147 -msgid "The folder is not writable" +#: oc-admin/users.php:283 oc-admin/users.php:317 +msgid "Alert id isn't in the correct format" msgstr "" -#: oc-admin/tools.php:141 -msgid "Could not select the database. Error: %s" +#: oc-admin/users.php:298 +msgid "No alerts have been deleted" msgstr "" -#: oc-admin/tools.php:235 -msgid "Maintenance mode is ON" +#: oc-admin/users.php:300 +msgid "One alert has been deleted" msgstr "" -#: oc-admin/tools.php:245 -msgid "Maintenance mode is OFF" +#: oc-admin/users.php:337 +msgid "No alerts have been activated" msgstr "" -#: oc-admin/users.php:68 -msgid "The user has been created. We've sent an activation e-mail" +#: oc-admin/users.php:339 +msgid "One alert has been activated" msgstr "" -#: oc-admin/users.php:70 -msgid "The user has been created successfully" +#: oc-admin/users.php:343 +msgid "No alerts have been deactivated" msgstr "" -#: oc-admin/users.php:123 -msgid "The user has been updated and activated" +#: oc-admin/users.php:345 +msgid "One alert has been deactivated" msgstr "" -#: oc-admin/users.php:121 -msgid "The user has been updated" +#: oc-admin/users.php:383 +msgid "User settings have been updated" msgstr "" -#: oc-admin/users.php:137 oc-admin/users.php:160 oc-admin/users.php:185 -#: oc-admin/users.php:209 oc-admin/users.php:233 oc-admin/users.php:257 -#: oc-admin/users.php:555 -msgid "User id isn't in the correct format" +#: oc-admin/users.php:526 oc-admin/users.php:541 +msgid "Both rules can not be empty" msgstr "" -#: oc-admin/users.php:149 -msgid "Activation email sent to one user" +#: oc-admin/users.php:531 +msgid "Rule updated correctly" msgstr "" -#: oc-admin/users.php:172 -msgid "One user has been activated" +#: oc-admin/users.php:546 +msgid "Rule saved correctly" msgstr "" -#: oc-admin/users.php:197 -msgid "One user has been deactivated" +#: oc-admin/users.php:567 +msgid "No rules have been deleted" msgstr "" -#: oc-admin/users.php:221 -msgid "One user has been unblocked" +#: oc-admin/users.php:569 +msgid "One ban rule has been deleted" msgstr "" -#: oc-admin/users.php:245 -msgid "One user has been blocked" +#: oc-includes/osclass/ItemActions.php:91 +#: oc-includes/osclass/ItemActions.php:306 +msgid "Image with an incorrect extension." msgstr "" -#: oc-admin/users.php:272 -msgid "One user has been deleted" +#: oc-includes/osclass/ItemActions.php:94 +#: oc-includes/osclass/ItemActions.php:309 +msgid "Image is too big. Max. size" msgstr "" -#: oc-includes/osclass/ItemActions.php:321 -msgid "Title too short." +#: oc-includes/osclass/ItemActions.php:106 +msgid "Title too short (%s)." msgstr "" -#: oc-includes/osclass/ItemActions.php:322 -msgid "Title too long." +#: oc-includes/osclass/ItemActions.php:107 +msgid "Title too long (%s)." msgstr "" -#: oc-includes/osclass/ItemActions.php:334 -msgid "Description too short." +#: oc-includes/osclass/ItemActions.php:119 +msgid "Description too short (%s)." msgstr "" -#: oc-includes/osclass/ItemActions.php:335 -msgid "Description too long." +#: oc-includes/osclass/ItemActions.php:120 +msgid "Description too long (%s)." msgstr "" #: oc-includes/osclass/ItemActions.php:130 @@ -1234,11 +1212,21 @@ msgstr "" msgid "Category invalid." msgstr "" +#: oc-includes/osclass/ItemActions.php:131 +#: oc-includes/osclass/ItemActions.php:341 +msgid "Price must be a number." +msgstr "" + #: oc-includes/osclass/ItemActions.php:132 #: oc-includes/osclass/ItemActions.php:342 msgid "Price too long." msgstr "" +#: oc-includes/osclass/ItemActions.php:133 +#: oc-includes/osclass/ItemActions.php:343 +msgid "Price must be positive number." +msgstr "" + #: oc-includes/osclass/ItemActions.php:134 msgid "Name too long." msgstr "" @@ -1306,347 +1294,435 @@ msgstr "" msgid "%s field is required." msgstr "" +#: oc-includes/osclass/ItemActions.php:321 +msgid "Title too short." +msgstr "" + +#: oc-includes/osclass/ItemActions.php:322 +msgid "Title too long." +msgstr "" + +#: oc-includes/osclass/ItemActions.php:334 +msgid "Description too short." +msgstr "" + +#: oc-includes/osclass/ItemActions.php:335 +msgid "Description too long." +msgstr "" + +#: oc-includes/osclass/ItemActions.php:860 +msgid "We just sent your message to %s" +msgstr "" + #: oc-includes/osclass/ItemActions.php:1331 msgid "One of the files you tried to upload exceeds the maximum size" msgstr "" -#: oc-includes/osclass/controller/item.php:164 -msgid "Check your inbox to validate your listing" +#: oc-includes/osclass/ItemActions.php:1386 +#: oc-includes/osclass/controller/contact.php:159 +msgid "The file you tried to upload does not have a valid extension" msgstr "" -#: oc-admin/comments.php:88 -msgid "The comments have been unblocked" +#: oc-includes/osclass/UserActions.php:37 +msgid "The reCAPTCHA was not entered correctly" msgstr "" -#: oc-admin/comments.php:98 -msgid "The comments have been blocked" +#: oc-includes/osclass/UserActions.php:43 +msgid "The password cannot be empty" msgstr "" -#: oc-admin/items.php:264 -msgid "%d listing has been unmarked" +#: oc-includes/osclass/UserActions.php:48 +#: oc-includes/osclass/UserActions.php:165 +#: oc-includes/osclass/controller/user.php:186 +msgid "Passwords don't match" msgstr "" -#: oc-admin/controller/settings/main.php:29 -msgid "Last check" +#: oc-includes/osclass/UserActions.php:55 +#: oc-includes/osclass/UserActions.php:159 +msgid "The name cannot be empty" msgstr "" -#: oc-admin/main.php:71 -msgid "Entered an invalid email" +#: oc-includes/osclass/UserActions.php:60 +msgid "The email is not valid" msgstr "" -#: oc-admin/main.php:74 -msgid "You're already subscribed" +#: oc-includes/osclass/UserActions.php:67 +#: oc-includes/osclass/controller/user.php:131 +msgid "The specified e-mail is already in use" msgstr "" -#: oc-admin/main.php:77 -msgid "Subscribed correctly" +#: oc-includes/osclass/UserActions.php:74 +msgid "Username is already taken" msgstr "" -#: oc-admin/main.php:80 -msgid "Error subscribing" +#: oc-includes/osclass/UserActions.php:78 +#: oc-includes/osclass/controller/user.php:155 +msgid "The specified username is not valid, it contains some invalid words" msgstr "" -#: oc-includes/osclass/core/AdminSecBaseModel.php:48 -msgid "Thank you very much for your donation" +#: oc-includes/osclass/UserActions.php:153 +msgid "The specified e-mail is already used by %s" msgstr "" -#: oc-admin/tools.php:118 oc-admin/tools.php:150 -msgid "Backup completed successfully" +#: oc-includes/osclass/controller/ajax.php:87 +#: oc-includes/osclass/controller/ajax.php:152 +#: oc-includes/osclass/controller/item.php:352 +msgid "The selected photo has been successfully deleted" msgstr "" -#: oc-admin/controller/settings/locations.php:47 -msgid "Country code and name should have at least two characters" +#: oc-includes/osclass/controller/ajax.php:87 +#: oc-includes/osclass/controller/ajax.php:159 +#: oc-includes/osclass/controller/item.php:357 +msgid "The selected photo couldn't be deleted" msgstr "" -#: oc-admin/languages.php:307 -msgid "Directory '%s' couldn't be removed;)" +#: oc-includes/osclass/controller/ajax.php:102 +#: oc-includes/osclass/controller/item.php:321 +msgid "The selected photo couldn't be deleted, the url doesn't exist" msgstr "" -#: oc-admin/main.php:62 -msgid "You have very few free space left, users will not be able to upload pictures" +#: oc-includes/osclass/controller/ajax.php:112 +#: oc-includes/osclass/controller/item.php:327 +msgid "The listing doesn't exist" msgstr "" -#: oc-admin/controller/settings/comments.php:48 -msgid "Number of moderate comments must only contain numeric characters" +#: oc-includes/osclass/controller/ajax.php:121 +#: oc-includes/osclass/controller/ajax.php:129 +#: oc-includes/osclass/controller/item.php:333 +#: oc-includes/osclass/controller/item.php:338 +msgid "The listing doesn't belong to you" msgstr "" -#: oc-admin/controller/settings/comments.php:51 -msgid "Comments per page must only contain numeric characters" +#: oc-includes/osclass/controller/ajax.php:155 +#: oc-includes/osclass/controller/item.php:354 +msgid "The selected photo does not belong to you" msgstr "" -#: oc-admin/controller/settings/comments.php:71 -msgid "Comment settings have been updated" +#: oc-includes/osclass/controller/contact.php:40 +#: oc-includes/osclass/controller/item.php:123 +#: oc-includes/osclass/controller/item.php:232 +#: oc-includes/osclass/controller/item.php:402 +#: oc-includes/osclass/controller/item.php:454 +#: oc-includes/osclass/controller/user-non-secure.php:164 +msgid "The Recaptcha code is wrong" msgstr "" -#: oc-admin/controller/settings/locations.php:78 -msgid "Country name cannot be blank" +#: oc-includes/osclass/controller/contact.php:52 +#: oc-includes/osclass/controller/contact.php:61 +#: oc-includes/osclass/controller/item.php:143 +#: oc-includes/osclass/controller/item.php:466 +#: oc-includes/osclass/controller/login.php:90 +#: oc-includes/osclass/controller/register.php:58 +#: oc-includes/osclass/controller/user-non-secure.php:175 +msgid "Your current email is not allowed" msgstr "" -#: oc-admin/controller/settings/locations.php:135 -#: oc-admin/controller/settings/locations.php:277 -#: oc-admin/controller/settings/locations.php:418 -msgid "There was a problem deleting locations" +#: oc-includes/osclass/controller/contact.php:55 +#: oc-includes/osclass/controller/item.php:146 +#: oc-includes/osclass/controller/item.php:469 +#: oc-includes/osclass/controller/login.php:93 +#: oc-includes/osclass/controller/register.php:61 +#: oc-includes/osclass/controller/user-non-secure.php:178 +msgid "Your current IP is not allowed" msgstr "" -#: oc-admin/controller/settings/locations.php:138 -msgid "No country was selected" +#: oc-includes/osclass/controller/contact.php:66 +msgid "Please enter a correct email" msgstr "" -#: oc-admin/controller/settings/locations.php:162 -#: oc-admin/controller/settings/locations.php:309 -msgid "%s can't be added" +#: oc-includes/osclass/controller/contact.php:157 +msgid "Your email has been sent properly. Thank you for contacting us!" msgstr "" -#: oc-admin/controller/settings/locations.php:172 -#: oc-admin/controller/settings/locations.php:203 -msgid "Region name cannot be blank" +#: oc-includes/osclass/controller/item.php:52 +#: oc-includes/osclass/controller/item.php:117 +msgid "Only registered users are allowed to post listings" msgstr "" -#: oc-admin/controller/settings/locations.php:280 -msgid "No region was selected" +#: oc-includes/osclass/controller/item.php:136 +msgid "" +"A user with that email address already exists, if it is you, please log in" msgstr "" -#: oc-admin/controller/settings/locations.php:317 -msgid "New city name cannot be blank" +#: oc-includes/osclass/controller/item.php:164 +msgid "Check your inbox to validate your listing" msgstr "" -#: oc-admin/controller/settings/locations.php:348 -msgid "City name cannot be blank" +#: oc-includes/osclass/controller/item.php:166 +msgid "Your listing has been published" msgstr "" -#: oc-admin/controller/settings/locations.php:421 -msgid "No city was selected" +#: oc-includes/osclass/controller/item.php:195 +msgid "Sorry, we don't have any listings with that ID" msgstr "" -#: oc-admin/controller/settings/permalinks.php:424 -msgid "All fields are required." +#: oc-includes/osclass/controller/item.php:247 +msgid "Great! We've just updated your listing" msgstr "" -#: oc-admin/controller/settings/permalinks.php:445 -#: oc-admin/controller/settings/permalinks.php:455 -msgid "File .htaccess couldn't be filled out with the right content." +#: oc-includes/osclass/controller/item.php:274 +msgid "The listing has been validated" msgstr "" -#: oc-admin/controller/settings/permalinks.php:447 -msgid "Here's the content you have to add to the .htaccess file. If you can't create the file, please deactivate the Friendly URLs option." +#: oc-includes/osclass/controller/item.php:276 +msgid "The listing can't be validated" msgstr "" -#: oc-admin/controller/settings/permalinks.php:457 -msgid "Here's the content you have to add to the .htaccess file. If you can't create the file or experience some problems with the URLs, please deactivate the Friendly URLs option." +#: oc-includes/osclass/controller/item.php:279 +msgid "The listing has already been validated" msgstr "" -#: oc-admin/controller/settings/currencies.php:141 -msgid "%s couldn't be deleted because it has listings associated to it" +#: oc-includes/osclass/controller/item.php:292 +msgid "Your listing has been deleted" msgstr "" -#: oc-admin/controller/settings/currencies.php:143 -msgid "%s couldn't be deleted because it's the default currency" +#: oc-includes/osclass/controller/item.php:294 +#: oc-includes/osclass/controller/item.php:302 +msgid "The listing you are trying to delete couldn't be deleted" +msgstr "" + +#: oc-includes/osclass/controller/item.php:379 +msgid "Thanks! That's very helpful" +msgstr "" + +#: oc-includes/osclass/controller/item.php:425 +#: oc-includes/osclass/controller/item.php:537 +msgid "This listing doesn't exist" +msgstr "" + +#: oc-includes/osclass/controller/item.php:431 +#: oc-includes/osclass/controller/item.php:474 +msgid "We're sorry, but the listing has expired. You can't contact the seller" +msgstr "" + +#: oc-includes/osclass/controller/item.php:438 +#: oc-includes/osclass/controller/item.php:446 +msgid "You can't contact the seller, only registered users can" +msgstr "" + +#: oc-includes/osclass/controller/item.php:438 +msgid "Click here to sign-in" +msgstr "" + +#: oc-includes/osclass/controller/item.php:487 +msgid "We've just sent an e-mail to the seller" +msgstr "" + +#: oc-includes/osclass/controller/item.php:497 +msgid "Sorry, we could not save your comment. Try again later" +msgstr "" + +#: oc-includes/osclass/controller/item.php:500 +msgid "Your comment is awaiting moderation" msgstr "" -#: oc-admin/controller/settings/main.php:89 -msgid "Number of listings in the RSS has to be a numeric value" +#: oc-includes/osclass/controller/item.php:503 +msgid "Your comment has been approved" msgstr "" -#: oc-admin/controller/settings/main.php:92 -msgid "Max latest listings has to be a numeric value" +#: oc-includes/osclass/controller/item.php:506 +msgid "Please fill the required field (email)" msgstr "" -#: oc-admin/controller/settings/main.php:95 -msgid "Number of listings on search has to be a numeric value" +#: oc-includes/osclass/controller/item.php:509 +msgid "Please type a comment" msgstr "" -#: oc-admin/controller/settings/main.php:120 -msgid "Number of listings in the RSS must be an integer" +#: oc-includes/osclass/controller/item.php:512 +msgid "Your comment has been marked as spam" msgstr "" -#: oc-admin/controller/settings/main.php:127 -msgid "Number of recent listings displayed at home must be an integer" +#: oc-includes/osclass/controller/item.php:515 +msgid "You need to be logged to comment" msgstr "" -#: oc-admin/themes/modern/market/header.php:5 -msgid "downloads folder has to be writable, i.e.: chmod a+w %soc-content/downloads/" +#: oc-includes/osclass/controller/item.php:518 +msgid "Sorry, comments are disabled" msgstr "" -#: oc-admin/tools.php:176 oc-admin/tools.php:213 -msgid "Archived successfully!" +#: oc-includes/osclass/controller/item.php:544 +msgid "You must be logged in to delete a comment" msgstr "" -#: oc-admin/tools.php:190 oc-admin/tools.php:216 -msgid "Error, the zip file was not created in the specified directory" +#: oc-includes/osclass/controller/item.php:552 +msgid "The comment doesn't exist" msgstr "" -#: oc-admin/tools.php:237 -msgid "There was an error creating the .maintenance file, please create it manually at the root folder" +#: oc-includes/osclass/controller/item.php:557 +msgid "The comment is not active, you cannot delete it" msgstr "" -#: oc-admin/tools.php:247 -msgid "There was an error removing the .maintenance file, please remove it manually from the root folder" +#: oc-includes/osclass/controller/item.php:562 +msgid "The comment was not added by you, you cannot delete it" msgstr "" -#: oc-admin/users.php:147 -msgid "No users have been selected" +#: oc-includes/osclass/controller/item.php:590 +msgid "" +"The listing hasn't been validated. Please validate it in order to make it " +"public" msgstr "" -#: oc-admin/users.php:170 -msgid "No users have been activated" +#: oc-includes/osclass/controller/item.php:597 +msgid "" +"The listing hasn't been enabled. Please enable it in order to make it public" msgstr "" -#: oc-admin/users.php:195 -msgid "No users have been deactivated" +#: oc-includes/osclass/controller/item.php:599 +msgid "The listing has been blocked or is awaiting moderation from the admin" msgstr "" -#: oc-admin/users.php:219 -msgid "No users have been enabled" +#: oc-includes/osclass/controller/login.php:25 +#: oc-includes/osclass/controller/register.php:26 +#: oc-includes/osclass/controller/user-non-secure.php:25 +#: oc-includes/osclass/controller/user.php:25 +msgid "Users not enabled" msgstr "" -#: oc-admin/users.php:243 -msgid "No users have been disabled" +#: oc-includes/osclass/controller/login.php:37 +#: oc-includes/osclass/controller/register.php:50 +msgid "Users are not enabled" msgstr "" -#: oc-admin/users.php:270 -msgid "No users have been deleted" +#: oc-includes/osclass/controller/login.php:48 +msgid "Please provide an email address" msgstr "" -#: oc-admin/users.php:283 oc-admin/users.php:317 -msgid "Alert id isn't in the correct format" +#: oc-includes/osclass/controller/login.php:52 +msgid "Empty passwords are not allowed. Please provide a password" msgstr "" -#: oc-admin/users.php:298 -msgid "No alerts have been deleted" +#: oc-includes/osclass/controller/login.php:66 +#: oc-includes/osclass/controller/login.php:131 +msgid "The user doesn't exist" msgstr "" -#: oc-admin/users.php:300 -msgid "One alert has been deleted" +#: oc-includes/osclass/controller/login.php:70 +msgid "The password is incorrect" msgstr "" -#: oc-admin/users.php:337 -msgid "No alerts have been activated" +#: oc-includes/osclass/controller/login.php:134 +msgid "" +"The user has not been validated yet. Would you like to re-send your activation?" msgstr "" -#: oc-admin/users.php:339 -msgid "One alert has been activated" +#: oc-includes/osclass/controller/login.php:136 +msgid "The user has not been validated yet" msgstr "" -#: oc-admin/users.php:343 -msgid "No alerts have been deactivated" +#: oc-includes/osclass/controller/login.php:139 +msgid "The user has been suspended" msgstr "" -#: oc-admin/users.php:345 -msgid "One alert has been deactivated" +#: oc-includes/osclass/controller/login.php:167 +msgid "This should never happen" msgstr "" -#: oc-admin/users.php:383 -msgid "User settings have been updated" +#: oc-includes/osclass/controller/login.php:181 +msgid "Incorrect link" msgstr "" -#: oc-admin/users.php:526 oc-admin/users.php:541 -msgid "Both rules can not be empty" +#: oc-includes/osclass/controller/login.php:192 +msgid "Validation email re-sent" msgstr "" -#: oc-admin/users.php:531 -msgid "Rule updated correctly" +#: oc-includes/osclass/controller/login.php:194 +msgid "" +"We have just sent you an email to validate your account, you will have to " +"wait a few minutes to resend it again" msgstr "" -#: oc-admin/users.php:546 -msgid "Rule saved correctly" +#: oc-includes/osclass/controller/login.php:207 +msgid "Invalid email address" msgstr "" -#: oc-admin/users.php:567 -msgid "No rules have been deleted" +#: oc-includes/osclass/controller/login.php:216 +msgid "We have sent you an email with the instructions to reset your password" msgstr "" -#: oc-admin/users.php:569 -msgid "One ban rule has been deleted" +#: oc-includes/osclass/controller/login.php:220 +msgid "We were not able to identify you given the information provided" msgstr "" -#: oc-includes/osclass/ItemActions.php:91 -#: oc-includes/osclass/ItemActions.php:306 -msgid "Image with an incorrect extension." +#: oc-includes/osclass/controller/login.php:224 +msgid "The recaptcha code is wrong" msgstr "" -#: oc-includes/osclass/ItemActions.php:94 -#: oc-includes/osclass/ItemActions.php:309 -msgid "Image is too big. Max. size" +#: oc-includes/osclass/controller/login.php:241 +#: oc-includes/osclass/controller/user.php:171 +msgid "Password cannot be blank" msgstr "" -#: oc-includes/osclass/ItemActions.php:131 -#: oc-includes/osclass/ItemActions.php:341 -msgid "Price must be a number." +#: oc-includes/osclass/controller/login.php:258 +msgid "Error, the password don't match" msgstr "" -#: oc-includes/osclass/ItemActions.php:860 -msgid "We just sent your message to %s" +#: oc-includes/osclass/controller/register.php:31 +msgid "User registration is not enabled" msgstr "" -#: oc-includes/osclass/ItemActions.php:1386 -#: oc-includes/osclass/controller/contact.php:159 -msgid "The file you tried to upload does not have a valid extension" +#: oc-includes/osclass/controller/register.php:69 +msgid "The user has been created. An activation email has been sent" msgstr "" -#: oc-includes/osclass/controller/contact.php:66 -msgid "Please enter a correct email" +#: oc-includes/osclass/controller/register.php:72 +msgid "Your account has been created successfully" msgstr "" -#: oc-includes/osclass/controller/contact.php:157 -msgid "Your email has been sent properly. Thank you for contacting us!" +#: oc-includes/osclass/controller/register.php:91 +msgid "The link is not valid anymore. Sorry for the inconvenience!" msgstr "" -#: oc-includes/osclass/controller/item.php:136 -msgid "A user with that email address already exists, if it is you, please log in" +#: oc-includes/osclass/controller/register.php:96 +msgid "Your account has already been validated" msgstr "" -#: oc-includes/osclass/controller/contact.php:52 -#: oc-includes/osclass/controller/contact.php:61 -#: oc-includes/osclass/controller/item.php:143 -#: oc-includes/osclass/controller/item.php:466 -#: oc-includes/osclass/controller/login.php:90 -#: oc-includes/osclass/controller/register.php:58 -#: oc-includes/osclass/controller/user-non-secure.php:171 -msgid "Your current email is not allowed" +#: oc-includes/osclass/controller/register.php:117 +msgid "Your account has been validated" msgstr "" -#: oc-includes/osclass/controller/contact.php:55 -#: oc-includes/osclass/controller/item.php:146 -#: oc-includes/osclass/controller/item.php:469 -#: oc-includes/osclass/controller/login.php:93 -#: oc-includes/osclass/controller/register.php:61 -#: oc-includes/osclass/controller/user-non-secure.php:174 -msgid "Your current IP is not allowed" +#: oc-includes/osclass/controller/register.php:119 +msgid "Account validation failed" msgstr "" -#: oc-includes/osclass/controller/item.php:195 -msgid "Sorry, we don't have any listings with that ID" +#: oc-includes/osclass/controller/user-non-secure.php:56 +msgid "Your email has been changed successfully" msgstr "" -#: oc-includes/osclass/controller/item.php:590 -msgid "The listing hasn't been validated. Please validate it in order to make it public" +#: oc-includes/osclass/controller/user-non-secure.php:85 +#: oc-includes/osclass/controller/user.php:223 +msgid "Alert activated" msgstr "" -#: oc-includes/osclass/controller/login.php:167 -msgid "This should never happen" +#: oc-includes/osclass/controller/user-non-secure.php:87 +#: oc-includes/osclass/controller/user.php:225 +msgid "" +"Oops! There was a problem trying to activate your alert. Please contact an " +"administrator" msgstr "" -#: oc-includes/osclass/UserActions.php:37 -msgid "The reCAPTCHA was not entered correctly" +#: oc-includes/osclass/controller/user-non-secure.php:106 +#: oc-includes/osclass/controller/user.php:244 +msgid "Unsubscribed correctly" msgstr "" -#: oc-includes/osclass/UserActions.php:74 -msgid "Username is already taken" +#: oc-includes/osclass/controller/user-non-secure.php:108 +#: oc-includes/osclass/controller/user.php:246 +msgid "" +"Oops! There was a problem trying to unsubscribe you. Please contact an " +"administrator" msgstr "" -#: oc-includes/osclass/UserActions.php:78 -#: oc-includes/osclass/controller/user.php:155 -msgid "The specified username is not valid, it contains some invalid words" +#: oc-includes/osclass/controller/user-non-secure.php:183 +msgid "Your email has been sent properly." msgstr "" -#: oc-includes/osclass/controller/user-non-secure.php:83 -#: oc-includes/osclass/controller/user.php:225 -msgid "Oops! There was a problem trying to activate your alert. Please contact an administrator" +#: oc-includes/osclass/controller/user.php:76 +msgid "Your profile has been updated successfully" msgstr "" -#: oc-includes/osclass/controller/user-non-secure.php:104 -#: oc-includes/osclass/controller/user.php:246 -msgid "Oops! There was a problem trying to unsubscribe you. Please contact an administrator" +#: oc-includes/osclass/controller/user.php:107 +msgid "The specified e-mail is not valid" msgstr "" #: oc-includes/osclass/controller/user.php:145 @@ -1661,72 +1737,56 @@ msgstr "" msgid "The specified username could not be empty" msgstr "" -#: oc-includes/osclass/controller/user.php:269 -msgid "Your account have been deleted" +#: oc-includes/osclass/controller/user.php:176 +msgid "Current password doesn't match" msgstr "" -#: oc-includes/osclass/controller/user.php:272 -#: oc-includes/osclass/controller/user.php:276 -msgid "Oops! you can not do that" +#: oc-includes/osclass/controller/user.php:181 +msgid "Passwords can't be empty" msgstr "" -#: oc-includes/osclass/emails.php:464 -msgid "We've sent you an e-mail. Follow its instructions to validate the changes" +#: oc-includes/osclass/controller/user.php:193 +msgid "Password has been changed" msgstr "" -#: oc-includes/osclass/emails.php:466 -msgid "We tried to sent you an e-mail, but it failed. Please, contact an administrator" +#: oc-includes/osclass/controller/user.php:270 +msgid "Your account have been deleted" msgstr "" -#: oc-admin/items.php:322 oc-admin/items.php:334 oc-admin/items.php:344 -#: oc-admin/items.php:354 oc-admin/items.php:383 oc-admin/items.php:409 -#: oc-admin/items.php:553 -msgid "An error has occurred" +#: oc-includes/osclass/controller/user.php:273 +#: oc-includes/osclass/controller/user.php:277 +msgid "Oops! you can not do that" msgstr "" -#: oc-admin/admins.php:50 oc-admin/admins.php:143 oc-admin/admins.php:258 -#: oc-admin/appearance.php:37 oc-admin/appearance.php:74 -#: oc-admin/controller/settings/advanced.php:32 -#: oc-admin/controller/settings/locations.php:31 -#: oc-admin/controller/settings/locations.php:73 -#: oc-admin/controller/settings/locations.php:115 -#: oc-admin/controller/settings/locations.php:144 -#: oc-admin/controller/settings/locations.php:194 -#: oc-admin/controller/settings/locations.php:250 -#: oc-admin/controller/settings/locations.php:286 -#: oc-admin/controller/settings/locations.php:338 -#: oc-admin/controller/settings/locations.php:394 -#: oc-admin/controller/settings/mailserver.php:31 -#: oc-admin/controller/settings/media.php:170 oc-admin/languages.php:41 -#: oc-admin/login.php:112 oc-admin/plugins.php:40 oc-admin/plugins.php:77 -#: oc-admin/plugins.php:113 oc-admin/plugins.php:128 oc-admin/plugins.php:143 -msgid "This action can't be done because it's a demo site" +#: oc-includes/osclass/core/AdminSecBaseModel.php:48 +msgid "Thank you very much for your donation" msgstr "" -#: oc-admin/admins.php:120 -msgid "There has been an error adding a new admin" +#: oc-includes/osclass/emails.php:464 +msgid "" +"We've sent you an e-mail. Follow its instructions to validate the changes" msgstr "" -#: oc-admin/admins.php:135 -msgid "There is no admin with this id" +#: oc-includes/osclass/emails.php:466 +msgid "" +"We tried to sent you an e-mail, but it failed. Please, contact an " +"administrator" msgstr "" -#: oc-admin/items.php:324 -msgid "The listing can't be activated because it's blocked" +#: oc-includes/osclass/emails.php:645 +msgid "There has been some errors sending the message" msgstr "" -#: oc-admin/items.php:653 -msgid "Wait time must only contain numeric characters" +#: oc-includes/osclass/helpers/hSecurity.php:76 +msgid "Probable invalid request." msgstr "" -#: oc-admin/items.php:656 -msgid "Number of moderated listings must only contain numeric characters" +#: oc-includes/osclass/helpers/hSecurity.php:82 +msgid "Invalid CSRF token." msgstr "" -#: oc-admin/items.php:659 -msgid "Images per listing must only contain numeric characters" +#: oc-includes/osclass/upgrade-funcs.php:532 +msgid "" +"Osclass has been updated successfully. Need more help?" msgstr "" - -#: oc-admin/languages.php:153 -msgid "Number of decimals must only contain numeric characters" -msgstr "" \ No newline at end of file diff --git a/oc-content/languages/en_US/theme.mo b/oc-content/languages/en_US/theme.mo index 264db90900..b5bfbffb66 100644 Binary files a/oc-content/languages/en_US/theme.mo and b/oc-content/languages/en_US/theme.mo differ diff --git a/oc-content/languages/en_US/theme.po b/oc-content/languages/en_US/theme.po index d7c22d4b3a..745c605872 100644 --- a/oc-content/languages/en_US/theme.po +++ b/oc-content/languages/en_US/theme.po @@ -1,135 +1,18 @@ -# Translation of Bender in Bosnian -# This file is distributed under the same license as the Bender package. +# Copyright (C) 2017 Osclass +# This file is distributed under the same license as the {package-name} package. msgid "" msgstr "" -"PO-Revision-Date: 2016-12-12 10:45:38+0000\n" +"Project-Id-Version: Osclass\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-24 06:56:52+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: GlotPress/0.1\n" -"Project-Id-Version: Bender\n" - -#: admin/settings.php:76 -msgid "Location input" -msgstr "" - -#: admin/settings.php:80 -msgid "Show location input as:" -msgstr "" - -#: admin/settings.php:83 -msgid "Dropdown" -msgstr "" - -#: admin/settings.php:84 -msgid "Autocomplete" -msgstr "" - -#: alert-form.php:61 -msgid "Already subscribed to this search" -msgstr "" - -#: admin/settings.php:91 -msgid "Ads management" -msgstr "" - -#: admin/settings.php:95 -msgid "In this section you can configure your site to display ads and start generating revenue." -msgstr "" - -#: admin/settings.php:95 -msgid "If you are using an online advertising platform, such as Google Adsense, copy and paste here the provided code for ads." -msgstr "" - -#: admin/settings.php:101 -msgid "Header 728x90" -msgstr "" - -#: admin/settings.php:105 -msgid "This ad will be shown at the top of your website, next to the site title and above the search results. Note that the size of the ad has to be 728x90 pixels." -msgstr "" - -#: admin/settings.php:109 -msgid "Homepage 728x90" -msgstr "" - -#: admin/settings.php:113 -msgid "This ad will be shown on the main site of your website. It will appear both at the top and bottom of your site homepage. Note that the size of the ad has to be 728x90 pixels." -msgstr "" - -#: admin/settings.php:117 -msgid "Search results 728x90 (top of the page)" -msgstr "" - -#: admin/settings.php:121 -msgid "This ad will be shown on top of the search results of your site. Note that the size of the ad has to be 728x90 pixels." -msgstr "" - -#: admin/settings.php:125 -msgid "Search results 728x90 (middle of the page)" -msgstr "" - -#: admin/settings.php:129 -msgid "This ad will be shown among the search results of your site. Note that the size of the ad has to be 728x90 pixels." -msgstr "" - -#: admin/settings.php:133 -msgid "Sidebar 300x250" -msgstr "" - -#: admin/settings.php:137 -msgid "This ad will be shown at the right sidebar of your website, on the product detail page. Note that the size of the ad has to be 300x350 pixels." -msgstr "" - -#: user-change_email.php:76 -msgid "Email: this field is required" -msgstr "" - -#: common/head.php:74 -msgid "Close" -msgstr "" - -#: common/head.php:73 -msgid "Next image" -msgstr "" - -#: common/head.php:72 -msgid "Previous image" -msgstr "" - -#: footer.php:69 -msgid "This website is proudly using the classifieds scripts software Osclass" -msgstr "" - -#: functions.php:418 -msgid "Public Profile" -msgstr "" - -#: item-sidebar.php:104 -msgid "Attachment" -msgstr "" - -#: main.php:41 -msgid "There aren't listings available at this moment" -msgstr "" - -#: search.php:75 -msgid "%1$d - %2$d of %3$d listings" -msgstr "" - -#: search.php:121 -msgid "Premium listings" -msgstr "" - -msgid "http://osclass.org/" -msgstr "" - -msgid "Bender theme" -msgstr "" - -msgid "Osclass" -msgstr "" +"PO-Revision-Date: 2017-04-24 09:03+0100\n" +"Last-Translator: Translations \n" +"Language-Team: Translations \n" +"Language: en_US\n" +"X-Generator: Poedit 1.6.10\n" #: 404.php:30 msgid "Sorry but I can't find the page you're looking for" @@ -176,7 +59,9 @@ msgid "The preferred size of the logo is 600x100." msgstr "" #: admin/header.php:55 -msgid "Note: Uploading another logo will overwrite the current logo." +msgid "" +"Note: Uploading another logo will overwrite the current " +"logo." msgstr "" #: admin/header.php:63 @@ -200,11 +85,13 @@ msgid "Please make the aforementioned image folder writable." msgstr "" #: admin/header.php:85 -msgid "To make a directory writable under UNIX execute this command from the shell:" +msgid "" +"To make a directory writable under UNIX execute this command from the shell:" msgstr "" #: admin/settings.php:36 -msgid "I would like to contribute to the development of Osclass with a donation of" +msgid "" +"I would like to contribute to the development of Osclass with a donation of" msgstr "" #: admin/settings.php:41 @@ -240,11 +127,99 @@ msgid "Footer link" msgstr "" #: admin/settings.php:68 -msgid "I want to help Osclass by linking to osclass.org from my site with the following text:" +msgid "" +"I want to help Osclass by linking to osclass.org from my site with the following text:" msgstr "" #: admin/settings.php:69 -msgid "This website is proudly using the classifieds scripts software Osclass" +msgid "" +"This website is proudly using the classifieds scripts software Osclass" +msgstr "" + +#: admin/settings.php:76 +msgid "Location input" +msgstr "" + +#: admin/settings.php:80 +msgid "Show location input as:" +msgstr "" + +#: admin/settings.php:83 +msgid "Dropdown" +msgstr "" + +#: admin/settings.php:84 +msgid "Autocomplete" +msgstr "" + +#: admin/settings.php:91 +msgid "Ads management" +msgstr "" + +#: admin/settings.php:95 +msgid "" +"In this section you can configure your site to display ads and start " +"generating revenue." +msgstr "" + +#: admin/settings.php:95 +msgid "" +"If you are using an online advertising platform, such as Google Adsense, " +"copy and paste here the provided code for ads." +msgstr "" + +#: admin/settings.php:101 +msgid "Header 728x90" +msgstr "" + +#: admin/settings.php:105 +msgid "" +"This ad will be shown at the top of your website, next to the site title and " +"above the search results. Note that the size of the ad has to be 728x90 " +"pixels." +msgstr "" + +#: admin/settings.php:109 +msgid "Homepage 728x90" +msgstr "" + +#: admin/settings.php:113 +msgid "" +"This ad will be shown on the main site of your website. It will appear both " +"at the top and bottom of your site homepage. Note that the size of the ad " +"has to be 728x90 pixels." +msgstr "" + +#: admin/settings.php:117 +msgid "Search results 728x90 (top of the page)" +msgstr "" + +#: admin/settings.php:121 +msgid "" +"This ad will be shown on top of the search results of your site. Note that " +"the size of the ad has to be 728x90 pixels." +msgstr "" + +#: admin/settings.php:125 +msgid "Search results 728x90 (middle of the page)" +msgstr "" + +#: admin/settings.php:129 +msgid "" +"This ad will be shown among the search results of your site. Note that the " +"size of the ad has to be 728x90 pixels." +msgstr "" + +#: admin/settings.php:133 +msgid "Sidebar 300x250" +msgstr "" + +#: admin/settings.php:137 +msgid "" +"This ad will be shown at the right sidebar of your website, on the product " +"detail page. Note that the size of the ad has to be 300x350 pixels." msgstr "" #: admin/settings.php:141 @@ -263,6 +238,10 @@ msgstr "" msgid "There was a problem with the alert" msgstr "" +#: alert-form.php:61 +msgid "Already subscribed to this search" +msgstr "" + #: alert-form.php:65 msgid "Subscribe to this search" msgstr "" @@ -280,6 +259,18 @@ msgstr "" msgid "Cancel" msgstr "" +#: common/head.php:72 +msgid "Previous image" +msgstr "" + +#: common/head.php:73 +msgid "Next image" +msgstr "" + +#: common/head.php:74 +msgid "Close" +msgstr "" + #: contact.php:31 msgid "Contact us" msgstr "" @@ -289,7 +280,8 @@ msgstr "" msgid "Your name" msgstr "" -#: contact.php:41 contact.php:54 item-sidebar.php:93 user-public-sidebar.php:41 +#: contact.php:41 contact.php:54 item-sidebar.php:93 +#: user-public-sidebar.php:41 msgid "optional" msgstr "" @@ -339,6 +331,12 @@ msgstr "" msgid "Contact" msgstr "" +#: footer.php:69 +msgid "" +"This website is proudly using the classifieds scripts software Osclass" +msgstr "" + #: footer.php:74 msgid "Language:" msgstr "" @@ -418,6 +416,10 @@ msgstr "" msgid "Create a new account" msgstr "" +#: functions.php:418 +msgid "Public Profile" +msgstr "" + #: functions.php:453 user-sidebar.php:28 msgid "Delete account" msgstr "" @@ -503,7 +505,8 @@ msgstr "" msgid "Name" msgstr "" -#: item-post.php:185 user-login.php:38 user-recover.php:37 user-register.php:45 +#: item-post.php:185 user-login.php:38 user-recover.php:37 +#: user-register.php:45 msgid "E-mail" msgstr "" @@ -569,7 +572,8 @@ msgid "It's your own listing, you can't contact the publisher." msgstr "" #: item-sidebar.php:60 -msgid "You must log in or register a new account in order to contact the advertiser" +msgid "" +"You must log in or register a new account in order to contact the advertiser" msgstr "" #: item-sidebar.php:70 @@ -592,6 +596,10 @@ msgstr "" msgid "Phone number" msgstr "" +#: item-sidebar.php:104 +msgid "Attachment" +msgstr "" + #: item-sidebar.php:125 user-public-sidebar.php:63 msgid "Enter the words above" msgstr "" @@ -637,15 +645,21 @@ msgid "Avoid scams by acting locally or paying with PayPal" msgstr "" #: item.php:132 -msgid "Never pay with Western Union, Moneygram or other anonymous payment services" +msgid "" +"Never pay with Western Union, Moneygram or other anonymous payment services" msgstr "" #: item.php:133 -msgid "Don't buy or sell outside of your country. Don't accept cashier cheques from outside your country" +msgid "" +"Don't buy or sell outside of your country. Don't accept cashier cheques from " +"outside your country" msgstr "" #: item.php:134 -msgid "This site is never involved in any transaction, and does not handle payments, shipping, guarantee transactions, provide escrow services, or offer \"buyer protection\" or \"seller certification\"" +msgid "" +"This site is never involved in any transaction, and does not handle " +"payments, shipping, guarantee transactions, provide escrow services, or " +"offer \"buyer protection\" or \"seller certification\"" msgstr "" #: item.php:141 @@ -684,6 +698,10 @@ msgstr "" msgid "Latest Listings" msgstr "" +#: main.php:41 +msgid "There aren't listings available at this moment" +msgstr "" + #: main.php:46 search.php:81 msgid "Grid" msgstr "" @@ -732,6 +750,10 @@ msgstr "" msgid "There are no results matching \"%s\"" msgstr "" +#: search.php:75 +msgid "%1$d - %2$d of %3$d listings" +msgstr "" + #: search.php:78 msgid "Show filters" msgstr "" @@ -740,6 +762,10 @@ msgstr "" msgid "Sort by" msgstr "" +#: search.php:121 +msgid "Premium listings" +msgstr "" + #: search.php:142 msgid "Other searches that may interest you" msgstr "" @@ -772,6 +798,10 @@ msgstr "" msgid "New e-mail" msgstr "" +#: user-change_email.php:76 +msgid "Email: this field is required" +msgstr "" + #: user-change_password.php:45 msgid "Current password" msgstr "" @@ -896,5 +926,14 @@ msgstr "" msgid "Are you sure you want to delete your account?" msgstr "" +#. Theme Name of the plugin/theme msgid "bender" -msgstr "" \ No newline at end of file +msgstr "" + +#. Description of the plugin/theme +msgid "Bender theme" +msgstr "" + +#. Author of the plugin/theme +msgid "Osclass" +msgstr "" diff --git a/oc-includes/osclass/ItemActions.php b/oc-includes/osclass/ItemActions.php index b6aa570c3d..7174fc4417 100755 --- a/oc-includes/osclass/ItemActions.php +++ b/oc-includes/osclass/ItemActions.php @@ -143,7 +143,7 @@ public function add() ((!osc_validate_max($aItem['cityArea'], 50)) ? _m("Municipality too long.") . PHP_EOL : '' ) . ((!osc_validate_text($aItem['address'], 3, false)) ? _m("Address too short.") . PHP_EOL : '' ) . ((!osc_validate_max($aItem['address'], 100)) ? _m("Address too long.") . PHP_EOL : '' ) . - ((((time() - Session::newInstance()->_get('last_submit_item')) < osc_items_wait_time()) && !$this->is_admin) ? _m("Too fast. You should wait a little to publish your ad.") . PHP_EOL : '' ); + ((((time() - (int)Session::newInstance()->_get('last_submit_item')) < osc_items_wait_time()) && !$this->is_admin) ? _m("Too fast. You should wait a little to publish your ad.") . PHP_EOL : '' ); $_meta = Field::newInstance()->findByCategory($aItem['catId']); $meta = Params::getParam("meta"); diff --git a/oc-includes/osclass/UserActions.php b/oc-includes/osclass/UserActions.php index 6edd5f7d41..02b9c78093 100755 --- a/oc-includes/osclass/UserActions.php +++ b/oc-includes/osclass/UserActions.php @@ -229,7 +229,7 @@ function recover_password() $user = User::newInstance()->findByEmail( Params::getParam('s_email') ); Session::newInstance()->_set( 'recover_time', time() ); - if ( (osc_recaptcha_private_key() != '') ) { + if ( (osc_recaptcha_private_key() != '') && Session::newInstance()->_get('recover_captcha_not_set')!=1) { if( !osc_check_recaptcha() ) { return 2; // BREAK THE PROCESS, THE RECAPTCHA IS WRONG } diff --git a/oc-includes/osclass/classes/Dependencies.php b/oc-includes/osclass/classes/Dependencies.php index 9f68c413c7..445e6183eb 100644 --- a/oc-includes/osclass/classes/Dependencies.php +++ b/oc-includes/osclass/classes/Dependencies.php @@ -15,8 +15,7 @@ class Dependencies { public function __construct() { - $registered = array(); - $queue = array(); + } /** @@ -26,7 +25,7 @@ public function __construct() * @param type $url * @param type $dependencies mixed, it could be an array or a string */ - public function register($id, $url, $dependencies) { + public function register($id, $url, $dependencies = null) { if($id!='' && $url!='') { $this->registered[$id] = array( 'key' => $id @@ -45,6 +44,26 @@ public function unregister($id) { unset($this->registered[$id]); } + + /** + * Enqueu to be loaded + * + * @param string $id + */ + public function enqueu($id) + { + $this->queue[$id] = $id; + } + + /** + * Remove to not be loaded + * + * @param type $id + */ + public function remove($id) + { + unset($this->queue[$id]); + } /** * Try to order all script having in mind their dependencies diff --git a/oc-includes/osclass/classes/Scripts.php b/oc-includes/osclass/classes/Scripts.php index b334c1567c..48313afe1a 100644 --- a/oc-includes/osclass/classes/Scripts.php +++ b/oc-includes/osclass/classes/Scripts.php @@ -51,7 +51,7 @@ public function unregisterScript($id) */ public function enqueuScript($id) { - $this->queue[$id] = $id; + $this->enqueu($id); } /** @@ -61,7 +61,7 @@ public function enqueuScript($id) */ public function removeScript($id) { - unset($this->queue[$id]); + $this->remove($id); } /** diff --git a/oc-includes/osclass/frm/Item.form.class.php b/oc-includes/osclass/frm/Item.form.class.php index c1cb759f48..340e6d4c95 100755 --- a/oc-includes/osclass/frm/Item.form.class.php +++ b/oc-includes/osclass/frm/Item.form.class.php @@ -1308,7 +1308,11 @@ static public function ajax_photos($resources = null) { $aImages = array(); if( Session::newInstance()->_getForm('photos') != '' ) { $aImages = Session::newInstance()->_getForm('photos'); - $aImages = $aImages['name']; + if (isset($aImages['name'])) { + $aImages = $aImages['name']; + } else { + $aImages = array(); + } Session::newInstance()->_drop('photos'); Session::newInstance()->_dropKeepForm('photos'); } diff --git a/oc-includes/osclass/helpers/hUtils.php b/oc-includes/osclass/helpers/hUtils.php index 34cfab7b32..d869f2cc4e 100755 --- a/oc-includes/osclass/helpers/hUtils.php +++ b/oc-includes/osclass/helpers/hUtils.php @@ -109,10 +109,14 @@ function osc_show_recaptcha($section = '') { if(osc_recaptcha_version()=="2") { switch($section) { case('recover_password'): + Session::newInstance()->_set('recover_captcha_not_set',0); $time = Session::newInstance()->_get('recover_time'); if((time()-$time)<=1200) { echo _osc_recaptcha_get_html(osc_recaptcha_public_key(), substr(osc_language(), 0, 2))."
"; } + else{ + Session::newInstance()->_set('recover_captcha_not_set',1); + } break; default: diff --git a/phpunit.xml b/phpunit.xml new file mode 100644 index 0000000000..cc540f3417 --- /dev/null +++ b/phpunit.xml @@ -0,0 +1,8 @@ + + + + + ./test + + + diff --git a/test/bootstrap.php b/test/bootstrap.php new file mode 100644 index 0000000000..a4d0f690af --- /dev/null +++ b/test/bootstrap.php @@ -0,0 +1,18 @@ +assertNotNull($dependencies); + } + + + public function testRegister() + { + $dependencies = new Dependencies(); + $dependencies->register("dependencie", "url", "dependencies"); + $this->assertArrayHasKey("dependencie", $dependencies->registered); + $dependencie = $dependencies->registered["dependencie"]; + $this->assertNotNull($dependencie); + $this->assertEquals("dependencie", $dependencie['key']); + $this->assertEquals("url", $dependencie['url']); + $this->assertEquals("dependencies", $dependencie['dependencies']); + + $dependencies->register("dependencie_two", "url", ["dependencie", "dependencie_other"]); + $this->assertArrayHasKey("dependencie_two", $dependencies->registered); + $dependencie_two = $dependencies->registered["dependencie_two"]; + $this->assertNotNull($dependencie_two); + $this->assertEquals("dependencie_two", $dependencie_two['key']); + $this->assertEquals("url", $dependencie_two['url']); + $this->assertEquals(["dependencie", "dependencie_other"], $dependencie_two['dependencies']); + } + + public function testUnregister() + { + $dependencies = new Dependencies(); + $dependencies->register("dependencie", "url", "dependencies"); + $dependencies->register("dependencie_two", "url", ["dependencie", "dependencie_other"]); + $this->assertArrayHasKey("dependencie", $dependencies->registered); + $this->assertArrayHasKey("dependencie_two", $dependencies->registered); + + $dependencies->unregister("dependencie_two"); + $this->assertArrayHasKey("dependencie", $dependencies->registered); + $this->assertArrayNotHasKey("dependencie_two", $dependencies->registered); + + $dependencies->unregister("dependencie"); + $this->assertArrayNotHasKey("dependencie", $dependencies->registered); + $this->assertArrayNotHasKey("dependencie_two", $dependencies->registered); + } + + public function testEnqueu() + { + $dependencies = new Dependencies(); + $this->assertEmpty($dependencies->queue); + $dependencies->enqueu("dependencie"); + $this->assertArrayHasKey("dependencie", $dependencies->queue); + $dependencies->enqueu("dependencie_two"); + $this->assertArrayHasKey("dependencie_two", $dependencies->queue); + + $this->assertNotEmpty($dependencies->queue); + $this->assertEquals(["dependencie" => "dependencie", "dependencie_two" => "dependencie_two"], $dependencies->queue); + } + + public function testRemove() + { + $dependencies = new Dependencies(); + $dependencies->enqueu("dependencie"); + $dependencies->enqueu("dependencie_two"); + $this->assertNotEmpty($dependencies->queue); + $this->assertEquals(["dependencie" => "dependencie", "dependencie_two" => "dependencie_two"], $dependencies->queue); + + $dependencies->remove("dependencie_two"); + $this->assertArrayNotHasKey("dependencie_two", $dependencies->queue); + + $dependencies->remove("dependencie"); + $this->assertArrayNotHasKey("dependencie", $dependencies->queue); + $this->assertEmpty($dependencies->queue); + } + + public function testOrder() + { + $dependencies = new Dependencies(); + $dependencies->register("dependencie", "url", "dependencies"); + $dependencies->register("dependencie_two", "url", ["dependencie", "dependencies"]); + $dependencies->register("dependencies", "url"); + + $dependencies->enqueu("dependencie"); + $dependencies->enqueu("dependencie_two"); + $dependencies->enqueu("dependencies"); + + $this->assertEmpty($dependencies->resolved); + $dependencies->order(); + $this->assertNotEmpty($dependencies->resolved); + + $this->assertEmpty($dependencies->unresolved); + $this->assertEmpty($dependencies->error); + } +} diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php new file mode 100644 index 0000000000..95ef9aa28f --- /dev/null +++ b/test/classes/ScriptsTest.php @@ -0,0 +1,112 @@ +assertNotNull($scripts); + } + + public function testNewInstance() + { + $scripts = Scripts::newInstance(); + $this->assertNotNull($scripts); + $this->assertSame($scripts, Scripts::newInstance()); + } + + public function testRegisterScript() + { + $scripts = new Scripts(); + $scripts->registerScript("script", "url", "scripts"); + $this->assertArrayHasKey("script", $scripts->registered); + + $scripts->register("script_two", "url", ["script", "script_other"]); + $this->assertArrayHasKey("script_two", $scripts->registered); + + $scripts->register("script_other", "url"); + $this->assertArrayHasKey("script_other", $scripts->registered); + } + + public function testUnregisterScript() + { + $scripts = new Scripts(); + $scripts->registerScript("script", "url", "scripts"); + $scripts->registerScript("script_two", "url", ["script", "script_other"]); + $this->assertArrayHasKey("script", $scripts->registered); + $this->assertArrayHasKey("script_two", $scripts->registered); + + $scripts->unregisterScript("script_two"); + $this->assertArrayHasKey("script", $scripts->registered); + $this->assertArrayNotHasKey("script_two", $scripts->registered); + + $scripts->unregisterScript("script"); + $this->assertArrayNotHasKey("script", $scripts->registered); + $this->assertArrayNotHasKey("script_two", $scripts->registered); + } + + + public function testEnqueuScript() + { + $scripts = new Scripts(); + $this->assertEmpty($scripts->queue); + $scripts->enqueuScript("script"); + $this->assertArrayHasKey("script", $scripts->queue); + $scripts->enqueuScript("script_two"); + $this->assertArrayHasKey("script_two", $scripts->queue); + $this->assertNotEmpty($scripts->queue); + $this->assertEquals(["script" => "script", "script_two" => "script_two"], $scripts->queue); + } + + public function testRemoveScript() + { + $scripts = new Scripts(); + $scripts->enqueu("script"); + $scripts->enqueu("script_two"); + $this->assertNotEmpty($scripts->queue); + $this->assertEquals(["script" => "script", "script_two" => "script_two"], $scripts->queue); + + $scripts->remove("script_two"); + $this->assertArrayNotHasKey("script_two", $scripts->queue); + + $scripts->remove("script"); + $this->assertArrayNotHasKey("script", $scripts->queue); + $this->assertEmpty($scripts->queue); + } + + public function testGetScripts() { + $scripts = new Scripts(); + $scripts->registerScript("script_root", "root_url"); + $scripts->registerScript("script", "script_url", "script_root"); + $scripts->registerScript("script_two", "script_two_url", ["script_root", "script"]); + + $scripts->enqueu("script_root"); + $scripts->enqueu("script"); + $scripts->enqueu("script_two"); + + $result = $scripts->getScripts(); + $this->assertNotNull($result); + $this->assertEquals($result, ["root_url", "script_url", "script_two_url"]); + } + +} diff --git a/test/classes/StylesTest.php b/test/classes/StylesTest.php new file mode 100644 index 0000000000..e17f841484 --- /dev/null +++ b/test/classes/StylesTest.php @@ -0,0 +1,80 @@ +assertNotNull($styles); + } + + public function testNewInstance() + { + $styles = Styles::newInstance(); + $this->assertNotNull($styles); + $this->assertSame($styles, Styles::newInstance()); + } + + public function testAddStyle() + { + $styles = new Styles(); + $styles->addStyle("style", "url"); + $this->assertArrayHasKey("style", $styles->styles); + + $styles->addStyle("style_two", "url"); + $this->assertArrayHasKey("style_two", $styles->styles); + + $styles->addStyle("style_other", "url"); + $this->assertArrayHasKey("style_other", $styles->styles); + $this->assertEquals(["style" => "url", "style_two" => "url", "style_other" => "url"], $styles->styles); + } + + public function testRemoveScript() + { + $styles = new Styles(); + $styles->addStyle("style", "url"); + $styles->addStyle("style_two", "url"); + $this->assertNotEmpty($styles->styles); + $this->assertEquals(["style" => "url", "style_two" => "url"], $styles->styles); + + $styles->removeStyle("style_two"); + $this->assertArrayNotHasKey("style_two", $styles->styles); + + $styles->removeStyle("style"); + $this->assertArrayNotHasKey("style", $styles->styles); + $this->assertEmpty($styles->styles); + } + + public function testGetStyles() { + $styles = new Styles(); + $styles->addStyle("style", "style_url"); + $styles->addStyle("style_two", "style_two_url"); + $styles->addStyle("style_other", "style_other_url"); + + + $result = $styles->getStyles(); + $this->assertNotNull($result); + $this->assertEquals($result, ["style" => "style_url", "style_two" => "style_two_url", "style_other" => "style_other_url"]); + } + +}