diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-12-02 07:32:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-02 07:32:03 +0300 |
| commit | 95dff7b6812f54c1afc67d6781a5d01d47c3ca60 (patch) | |
| tree | 3c49147c490360c0d436dba0e1c9690d9978bd0b | |
| parent | 28409d4c92f46ce3b250501c769bb08ebb26884c (diff) | |
| parent | 59ba07cba11cd51a49ba5a4946abee0d34c4c7a9 (diff) | |
Merge pull request #10945 from piwik/3.x-dev3.0.0-b4
Piwik 3.0.0-b4 release
406 files changed, 7299 insertions, 3902 deletions
diff --git a/.travis.yml b/.travis.yml index a821c6294d..463a521af5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,24 +78,21 @@ matrix: # AngularJS tests need to run only on one PHP version - php: 5.5 env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 - + sudo: required script: $PIWIK_ROOT_DIR/tests/travis/travis.sh -cache: - directories: - - "travis_phantomjs" - before_install: + # do not use the Zend allocator on PHP 5.3 since it will randomly segfault after program execution + - '[[ "$TRAVIS_PHP_VERSION" == 5.3* ]] && export USE_ZEND_ALLOC=0 || true' - ./tests/travis/install_git_lfs.sh install: - git fetch -q - # Disable it until this is in master, otherwise we have to create a branch for travis submodule - #- export GENERATE_TRAVIS_YML_COMMAND="php ./tests/travis/generator/main.php generate:travis-yml --core --verbose" - #- '[[ "$TRAVIS_JOB_NUMBER" != *.1 || "$TRAVIS_PULL_REQUEST" != "false" ]] || ./tests/travis/autoupdate_travis_yml.sh' + - export GENERATE_TRAVIS_YML_COMMAND="php ./tests/travis/generator/main.php generate:travis-yml --core --verbose" + - '[[ "$TRAVIS_JOB_NUMBER" != *.1 || "$TRAVIS_PULL_REQUEST" != "false" ]] || ./tests/travis/autoupdate_travis_yml.sh' - ./tests/travis/configure_git.sh @@ -148,8 +145,7 @@ before_script: - ./tests/travis/prepare.sh - ./tests/travis/setup_webserver.sh - - ./tests/travis/install_phantomjs.sh - - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH + - if [[ "$TRAVIS_PHP_VERSION" != 5.3* ]]; then ./tests/travis/install_phantomjs.sh; export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH; fi - cd tests/PHPUnit @@ -170,6 +166,14 @@ after_success: - cd $PIWIK_ROOT_DIR - ./tests/travis/generate_docs.sh +cache: + directories: + - "travis_phantomjs" + + + + + notifications: slack: rooms: @@ -185,4 +189,4 @@ notifications: - "irc.freenode.org#piwik-dev" template: - "%{repository} (%{commit}) : %{message} %{foo} " - - "Build details: %{build_url}" + - "Build details: %{build_url}"
\ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cf95ce416..0acf77785c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ The Product Changelog at **[piwik.org/changelog](http://piwik.org/changelog)** l Read more about migrating a plugin from Piwik 2.X to Piwik 3 in [our Migration guide](http://developer.piwik.org/guides/migrate-piwik-2-to-3). ### Breaking Changes +* The UserManager API methods do no longer return any `token_auth` properties when requesting a user +* Reporting API: if you call the Reporting API requesting data in `json` format then you may be affected. The `json` formatting has changed, a bug was fixed so that API methods that return simple associative arrays like `array('name' => 'value', 'name2' => 'value2')` will now appear correctly as `{"name":"value","name2":"value2"}` in JSON API output instead of `[{"name":"value","name2":"value2"}]` (as it used to be in Piwik 2). API methods like **SitesManager.getSiteFromId** & **UsersManager.getUser** and others are affected. * The menu classes `Piwik\Menu\MenuReporting` and `Piwik\Menu\MenuMain` have been removed * The class `Piwik\Plugin\Widgets` has been removed and replaced by `Piwik\Widget\Widget`. For each widget one class is needed from now on. You can generate a widget via `./console generate:widget`. * The class `Piwik\WidgetList` class has been moved to `Piwik\Widget\WidgetsList`. @@ -52,7 +54,24 @@ Read more about migrating a plugin from Piwik 2.X to Piwik 3 in [our Migration g * `Login.initSession.end` * `Login.authenticate.successful` * When posting one of the events `API.Request.dispatch`, `API.Request.dispatch.end`, `API.$plugin.$apiAction`, or `API.$plugin.$apiAction.end` the `$finalParameters` parameter is indexed in Piwik 2 (eg `array(1, 6)`), and named in Piwik 3 (eg `array('idSite' => 1, 'idGoal' => 6)`) - +* Widgets using the already removed `UserSettings` plugin won't work any longer. Please update the module and action parameter in the widget url according to the following list + + old module | old action | new module | new action + ---------- | ---------- | ---------- | ---------- + UserSettings | getPlugin | DevicePlugins | getPlugin + UserSettings | index | DevicesDetection | software + UserSettings | getBrowser | DevicesDetection | getBrowsers + UserSettings | getBrowserVerions | DevicesDetection | getBrowserVersions + UserSettings | getMobileVsDesktop | DevicesDetection | getType + UserSettings | getOS | DevicesDetection | getOsVersions + UserSettings | getOSFamily | DevicesDetection | getOsFamilies + UserSettings | getBrowserType | DevicesDetection | getBrowserEngines + UserSettings | getResolution | Resolution | getResolution + UserSettings | getConfiguration | Resolution | getConfiguration + UserSettings | getLanguage | UserLanguage | getLanguage + UserSettings | getLanguageCode | UserLanguage | getLanguageCode + + Read more about migrating a plugin from Piwik 2.X to Piwik 3 on our [Migration guide](https://developer.piwik.org/guides/migrate-piwik-2-to-3). ### Deprecations @@ -84,10 +103,17 @@ Read more about migrating a plugin from Piwik 2.X to Piwik 3 on our [Migration g * `Updater.componentUninstalled` triggered after a component was uninstalled * New HTTP Tracking API parameter `pv_id` which accepts a six character unique ID that identifies which actions were performed on a specific page view. Read more about it in the [HTTP Tracking API](https://developer.piwik.org/api-reference/tracking-api); * New event `Segment.addSegments` that lets you add segments. -* New Piwik JavaScript Tracker method `disableHeartBeatTimer()` to disable the heartbeat timer if it was previously enabled. +* New Piwik JavaScript Tracker method `disableHeartBeatTimer()` to disable the heartbeat timer if it was previously enabled. +* The `SitesManager.getJavascriptTag` has a new option `getJavascriptTag` to enable the tracking of users that have JavaScript disabled + +### Changes +* New now accept tracking requests for up to 1 day in the past instead of only 4 hours +* If a tracking request has a custom timestamp that is older than one day and the tracking request is not authenticated, we ignore the whole tracking request instead of ignoring the custom timestamp and still tracking the request with the current timestamp ### New features +* Piwik JavaScript Tracking API: we now attempt to track Downloads and Outlinks when the user uses the mouse middle click or the mouse right right click. Previously only left clicks on Downloads and Outlinks were measured. * New "Sparklines" visualization that lets you create a widget showing multiple sparklines. +* New config.ini.php setting: `tracking_requests_require_authentication_when_custom_timestamp_newer_than` to change how far back Piwik will track your requests without authentication. By default, value is set to 86400 (one day). The configured value is in seconds. ### Library updates * Updated AngularJS from 1.2.28 to 1.4.3 diff --git a/composer.lock b/composer.lock index 3ffc6dbe3f..f36e81f89f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "75544710dc04491e5d39085ee8b7ae05", - "content-hash": "6c07c2bb4f82daef6519c9ac18c642c4", + "hash": "db7672f3c64f1dbbd65edc6fd119e414", + "content-hash": "126d7da5eef61ae7f0764a2cfdf2c068", "packages": [ { "name": "composer/semver", @@ -1505,7 +1505,7 @@ "performance", "profiling" ], - "time": "2014-08-28 17:34:52" + "time": "2015-02-26 14:37:51" }, { "name": "guzzle/guzzle", @@ -2154,16 +2154,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.27", + "version": "4.8.28", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90" + "reference": "558a3a0d28b4cb7e4a593a4fbd2220e787076225" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c062dddcb68e44b563f66ee319ddae2b5a322a90", - "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/558a3a0d28b4cb7e4a593a4fbd2220e787076225", + "reference": "558a3a0d28b4cb7e4a593a4fbd2220e787076225", "shasum": "" }, "require": { @@ -2222,7 +2222,7 @@ "testing", "xunit" ], - "time": "2016-07-21 06:48:14" + "time": "2016-11-14 06:25:28" }, { "name": "phpunit/phpunit-mock-objects", diff --git a/config/global.ini.php b/config/global.ini.php index a12a5947ad..1b03d9a088 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -697,6 +697,11 @@ bulk_requests_use_transaction = 1 ; DO NOT USE THIS SETTING ON PUBLIC PIWIK SERVERS tracking_requests_require_authentication = 1 +; By default, Piwik accepts only tracking requests for up to 1 day in the past. For tracking requests with a custom date +; date is older than 1 day, Piwik requires an authenticated tracking requests. By setting this config to another value +; You can change how far back Piwik will track your requests without authentication. The configured value is in seconds. +tracking_requests_require_authentication_when_custom_timestamp_newer_than = 86400; + [Segments] ; Reports with segmentation in API requests are processed in real time. ; On high traffic websites it is recommended to pre-process the data diff --git a/core/API/DataTableManipulator/Flattener.php b/core/API/DataTableManipulator/Flattener.php index 7aaef6bf27..fbcd36d068 100644 --- a/core/API/DataTableManipulator/Flattener.php +++ b/core/API/DataTableManipulator/Flattener.php @@ -63,18 +63,26 @@ class Flattener extends DataTableManipulator { $newDataTable = $dataTable->getEmptyClone($keepFilters = true); - foreach ($dataTable->getRows() as $rowId => $row) { - $this->flattenRow($row, $rowId, $newDataTable); - } + // this recursive filter will be applied to subtables + $dataTable->filter('ReplaceSummaryRowLabel'); + + $this->flattenDataTableInto($dataTable, $newDataTable); - $queuedFiltersEnabled = Common::getRequestVar('disable_queued_filters', 0, 'int', $this->request) == 0; - if ($queuedFiltersEnabled) { - $newDataTable->applyQueuedFilters(); - } return $newDataTable; } /** + * @param $dataTable DataTable + * @param $newDataTable + */ + protected function flattenDataTableInto($dataTable, $newDataTable, $prefix = '', $logo = false) + { + foreach ($dataTable->getRows() as $rowId => $row) { + $this->flattenRow($row, $rowId, $newDataTable, $prefix, $logo); + } + } + + /** * @param Row $row * @param DataTable $dataTable * @param string $labelPrefix @@ -128,9 +136,7 @@ class Flattener extends DataTableManipulator $dataTable->addRow($row); } $prefix = $label . $this->recursiveLabelSeparator; - foreach ($subTable->getRows() as $rowId => $row) { - $this->flattenRow($row, $rowId, $dataTable, $prefix, $logo); - } + $this->flattenDataTableInto($subTable, $dataTable, $prefix, $logo); } } @@ -146,4 +152,5 @@ class Flattener extends DataTableManipulator return $request; } + } diff --git a/core/API/Inconsistencies.php b/core/API/Inconsistencies.php index 36c85bb994..df52f730e3 100644 --- a/core/API/Inconsistencies.php +++ b/core/API/Inconsistencies.php @@ -31,6 +31,7 @@ class Inconsistencies return array( 'bounce_rate', 'conversion_rate', + 'abandoned_rate', 'interaction_rate', 'exit_rate', 'bounce_rate_returning', diff --git a/core/Auth/Password.php b/core/Auth/Password.php new file mode 100644 index 0000000000..0767fad7ce --- /dev/null +++ b/core/Auth/Password.php @@ -0,0 +1,69 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ +namespace Piwik\Auth; + +/** + * Main class to handle actions related to password hashing and verification. + * + * @api + */ +class Password +{ + /** + * Hashes a password with the configured algorithm. + * + * @param string $password + * @return string + */ + public function hash($password) + { + return password_hash($password, PASSWORD_BCRYPT); + } + + /** + * Returns information about a hashed password (algo, options, ...). + * + * Can be used to verify whether a string is compatible with password_hash(). + * + * @param string + * @return array + */ + public function info($hash) + { + return password_get_info($hash); + } + + /** + * Rehashes a user's password if necessary. + * + * This method expects the password to be pre-hashed by + * \Piwik\Plugins\UsersManager\UsersManager::getPasswordHash(). + * + * @param string $hash + * @return boolean + */ + public function needsRehash($hash) + { + return password_needs_rehash($hash, PASSWORD_BCRYPT); + } + + /** + * Verifies a user's password against the provided hash. + * + * This method expects the password to be pre-hashed by + * \Piwik\Plugins\UsersManager\UsersManager::getPasswordHash(). + * + * @param string $password + * @param string $hash + * @return boolean + */ + public function verify($password, $hash) + { + return password_verify($password, $hash); + } +} diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php index ceeba0b156..cf352d2f6d 100644 --- a/core/DataAccess/LogAggregator.php +++ b/core/DataAccess/LogAggregator.php @@ -158,10 +158,10 @@ class LogAggregator $this->queryOriginHint = $nameOfOrigiin; } - public function generateQuery($select, $from, $where, $groupBy, $orderBy) + public function generateQuery($select, $from, $where, $groupBy, $orderBy, $limit = 0, $offset = 0) { $bind = $this->getGeneralQueryBindParams(); - $query = $this->segment->getSelectQuery($select, $from, $where, $bind, $orderBy, $groupBy); + $query = $this->segment->getSelectQuery($select, $from, $where, $bind, $orderBy, $groupBy, $limit, $offset); $select = 'SELECT'; if ($this->queryOriginHint && is_array($query) && 0 === strpos(trim($query['sql']), $select)) { diff --git a/core/DataAccess/LogQueryBuilder/JoinGenerator.php b/core/DataAccess/LogQueryBuilder/JoinGenerator.php index 1bd3ab3912..7b69184f0b 100644 --- a/core/DataAccess/LogQueryBuilder/JoinGenerator.php +++ b/core/DataAccess/LogQueryBuilder/JoinGenerator.php @@ -228,6 +228,13 @@ class JoinGenerator ); if (is_array($tA) && is_array($tB)) { + if (isset($tB['tableAlias']) && isset($tA['joinOn']) && strpos($tA['joinOn'], $tB['tableAlias']) !== false) { + return 1; + } + if (isset($tA['tableAlias']) && isset($tB['joinOn']) && strpos($tB['joinOn'], $tA['tableAlias']) !== false) { + return -1; + } + return 0; } diff --git a/core/DataAccess/LogQueryBuilder/JoinTables.php b/core/DataAccess/LogQueryBuilder/JoinTables.php index d840cfba3f..1faad323a7 100644 --- a/core/DataAccess/LogQueryBuilder/JoinTables.php +++ b/core/DataAccess/LogQueryBuilder/JoinTables.php @@ -97,7 +97,17 @@ class JoinTables extends \ArrayObject // we need to make sure first table always comes first, only sort tables after the first table $firstTable = array_shift($tables); - usort($tables, $cmpFunction); + usort($tables, function ($ta, $tb) use ($tables, $cmpFunction) { + $return = call_user_func($cmpFunction, $ta, $tb); + if ($return === 0) { + $indexA = array_search($ta, $tables); + $indexB = array_search($tb, $tables); + + return $indexA - $indexB; + } + + return $return; + }); array_unshift($tables, $firstTable); $this->exchangeArray($tables); diff --git a/core/Db/Schema/Mysql.php b/core/Db/Schema/Mysql.php index 146ee77068..7a65c23d2c 100644 --- a/core/Db/Schema/Mysql.php +++ b/core/Db/Schema/Mysql.php @@ -35,7 +35,7 @@ class Mysql implements SchemaInterface $tables = array( 'user' => "CREATE TABLE {$prefixTables}user ( login VARCHAR(100) NOT NULL, - password CHAR(32) NOT NULL, + password VARCHAR(255) NOT NULL, alias VARCHAR(45) NOT NULL, email VARCHAR(100) NOT NULL, token_auth CHAR(32) NOT NULL, diff --git a/core/Filesystem.php b/core/Filesystem.php index 585246a0cd..513dcd68a8 100644 --- a/core/Filesystem.php +++ b/core/Filesystem.php @@ -10,6 +10,7 @@ namespace Piwik; use Exception; use Piwik\Container\StaticContainer; +use Piwik\Plugins\Installation\ServerFilesGenerator; use Piwik\Tracker\Cache as TrackerCache; use Piwik\Cache as PiwikCache; diff --git a/core/Intl/Data/Resources/languages.php b/core/Intl/Data/Resources/languages.php index ca6930f369..53438f8b7c 100644 --- a/core/Intl/Data/Resources/languages.php +++ b/core/Intl/Data/Resources/languages.php @@ -30,7 +30,7 @@ return array( 'bh' => array('Bihari'), // 'Bihari languages' 'bi' => array('Bislama'), 'bm' => array('Bambara'), - 'bn' => array('Bengali'), + 'bn' => array('Bangla'), 'bo' => array('Tibetan'), 'br' => array('Breton'), 'bs' => array('Bosnian'), diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php index 8ad254f96b..948d41da9c 100644 --- a/core/Tracker/Request.php +++ b/core/Tracker/Request.php @@ -54,7 +54,7 @@ class Request const UNKNOWN_RESOLUTION = 'unknown'; - const CUSTOM_TIMESTAMP_DOES_NOT_REQUIRE_TOKENAUTH_WHEN_NEWER_THAN = 14400; // 4 hours + private $customTimestampDoesNotRequireTokenauthWhenNewerThan; /** * @param $params @@ -70,6 +70,7 @@ class Request $this->tokenAuth = $tokenAuth; $this->timestamp = time(); $this->isEmptyRequest = empty($params); + $this->customTimestampDoesNotRequireTokenauthWhenNewerThan = (int) TrackerConfig::getConfigValue('tracking_requests_require_authentication_when_custom_timestamp_newer_than'); // When the 'url' and referrer url parameter are not given, we might be in the 'Simple Image Tracker' mode. // The URL can default to the Referrer, which will be in this case @@ -465,13 +466,14 @@ class Request // If timestamp in the past, token_auth is required $timeFromNow = $this->timestamp - $cdt; - $isTimestampRecent = $timeFromNow < self::CUSTOM_TIMESTAMP_DOES_NOT_REQUIRE_TOKENAUTH_WHEN_NEWER_THAN; + $isTimestampRecent = $timeFromNow < $this->customTimestampDoesNotRequireTokenauthWhenNewerThan; if (!$isTimestampRecent) { if (!$this->isAuthenticated()) { - Common::printDebug(sprintf("Custom timestamp is %s seconds old, requires &token_auth...", $timeFromNow)); + $message = sprintf("Custom timestamp is %s seconds old, requires &token_auth...", $timeFromNow); + Common::printDebug($message); Common::printDebug("WARN: Tracker API 'cdt' was used with invalid token_auth"); - return false; + throw new InvalidRequestParameterException($message); } } diff --git a/core/Tracker/TrackerCodeGenerator.php b/core/Tracker/TrackerCodeGenerator.php index ffeea91b6a..ac958e6102 100644 --- a/core/Tracker/TrackerCodeGenerator.php +++ b/core/Tracker/TrackerCodeGenerator.php @@ -31,6 +31,7 @@ class TrackerCodeGenerator * @param string $customCampaignKeywordParam * @param bool $doNotTrack * @param bool $disableCookies + * @param bool $trackNoScript * @return string Javascript code. */ public function generate( @@ -44,7 +45,8 @@ class TrackerCodeGenerator $customCampaignNameQueryParam = null, $customCampaignKeywordParam = null, $doNotTrack = false, - $disableCookies = false + $disableCookies = false, + $trackNoScript = false ) { // changes made to this code should be mirrored in plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js var generateJsCode @@ -120,7 +122,8 @@ class TrackerCodeGenerator 'options' => $options, 'optionsBeforeTrackerUrl' => $optionsBeforeTrackerUrl, 'protocol' => '//', - 'loadAsync' => true + 'loadAsync' => true, + 'trackNoScript' => $trackNoScript ); $parameters = compact('mergeSubdomains', 'groupPageTitlesByDomain', 'mergeAliasUrls', 'visitorCustomVariables', 'pageCustomVariables', 'customCampaignNameQueryParam', 'customCampaignKeywordParam', @@ -161,6 +164,7 @@ class TrackerCodeGenerator $view = new View('@Morpheus/javascriptCode'); $view->disableCacheBuster(); $view->loadAsync = $codeImpl['loadAsync']; + $view->trackNoScript = $codeImpl['trackNoScript']; $jsCode = $view->render(); $jsCode = htmlentities($jsCode); diff --git a/core/Tracker/VisitorRecognizer.php b/core/Tracker/VisitorRecognizer.php index a21ea063e0..498329b51c 100644 --- a/core/Tracker/VisitorRecognizer.php +++ b/core/Tracker/VisitorRecognizer.php @@ -231,7 +231,7 @@ class VisitorRecognizer $dimensions = VisitDimension::getAllDimensions(); foreach ($dimensions as $dimension) { - if ($dimension->hasImplementedEvent('onExistingVisit')) { + if ($dimension->hasImplementedEvent('onExistingVisit') || $dimension->hasImplementedEvent('onAnyGoalConversion')) { $fields[] = $dimension->getColumnName(); } diff --git a/core/Updates/3.0.0-b4.php b/core/Updates/3.0.0-b4.php new file mode 100644 index 0000000000..cb6568e28f --- /dev/null +++ b/core/Updates/3.0.0-b4.php @@ -0,0 +1,99 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ + +namespace Piwik\Updates; + +use Piwik\Common; +use Piwik\Db; +use Piwik\Plugins\Installation\ServerFilesGenerator; +use Piwik\Updater; +use Piwik\Updater\Migration; +use Piwik\Updater\Migration\Factory as MigrationFactory; +use Piwik\Updates; + +class Updates_3_0_0_b4 extends Updates +{ + /** + * @var MigrationFactory + */ + private $migration; + + /** + * @var string + */ + private $userTable = 'user'; + + public function __construct(MigrationFactory $factory) + { + $this->migration = $factory; + } + + /** + * Here you can define one or multiple SQL statements that should be executed during the update. + * @param Updater $updater + * @return Migration[] + */ + public function getMigrations(Updater $updater) + { + $migrations = []; + $migrations = $this->getUserDatabaseMigrations($migrations); + + return $migrations; + } + + + public function doUpdate(Updater $updater) + { + $updater->executeMigrations(__FILE__, $this->getMigrations($updater)); + $updater->executeMigrations(__FILE__, $this->getUserPasswordMigrations([])); + + ServerFilesGenerator::createFilesForSecurity(); + } + + /** + * Returns database migrations for this update. + * @param Migration[] $queries + * @return Migration[] + */ + private function getUserDatabaseMigrations($queries) + { + $queries[] = $this->migration->db->changeColumn($this->userTable, 'password', 'password', 'VARCHAR(255) NOT NULL'); + + return $queries; + } + + /** + * Returns migrations to hash existing password with bcrypt. + * @param Migration[] $queries + * @return Migration[] + */ + private function getUserPasswordMigrations($queries) + { + $db = Db::get(); + $userTable = Common::prefixTable($this->userTable); + + $users = $db->fetchAll( + 'SELECT `login`, `password` FROM `' . $userTable . '` WHERE LENGTH(`password`) = 32' + ); + + foreach ($users as $user) { + $queries[] = $this->migration->db->boundSql( + 'UPDATE `' . $userTable . '`' + . ' SET `password` = ?' + . ' WHERE `login` = ?', + [ + password_hash($user['password'], PASSWORD_BCRYPT), + $user['login'], + ] + ); + } + + return $queries; + } +} diff --git a/core/UrlHelper.php b/core/UrlHelper.php index 66a0e64e25..f9d2bac83e 100644 --- a/core/UrlHelper.php +++ b/core/UrlHelper.php @@ -17,6 +17,32 @@ use Piwik\Intl\Data\Provider\RegionDataProvider; */ class UrlHelper { + + /** + * Checks if a string matches/is equal to one of the patterns/strings. + * + * @static + * @param $test String to test. + * @param $patterns Array of strings or regexs. + * + * @return true if $test matches or is equal to one of the regex/string in $patterns, false otherwise. + */ + protected static function in_array_matches_regex($test, $patterns) + { + foreach($patterns as $val) { + if(@preg_match($val, null) === false) { + if( strcasecmp($val, $test) === 0 ) { + return true; + } + } else { + if( preg_match($val, $test) === 1 ) { + return true; + } + } + } + return false; + } + /** * Converts an array of query parameter name/value mappings into a query string. * Parameters that are in `$parametersToExclude` will not appear in the result. @@ -36,7 +62,7 @@ class UrlHelper // decode encoded square brackets $name = str_replace(array('%5B', '%5D'), array('[', ']'), $name); - if (!in_array(strtolower($name), $parametersToExclude)) { + if (!self::in_array_matches_regex(strtolower($name), $parametersToExclude)) { if (is_array($value)) { foreach ($value as $param) { if ($param === false) { diff --git a/core/Version.php b/core/Version.php index d70cd0b1f2..993e7cd131 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,7 +20,7 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '3.0.0-b3'; + const VERSION = '3.0.0-b4'; public function isStableVersion($version) { diff --git a/js/piwik.js b/js/piwik.js index 04afc3cd19..5463c308f5 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -4994,6 +4994,11 @@ if (typeof window.Piwik !== 'object') { * Add click listener to a DOM element */ function addClickListener(element, enable) { + var enableType = typeof enable; + if (enableType === 'undefined') { + enable = true; + } + addEventListener(element, 'click', clickHandler(enable), false); if (enable) { @@ -5977,7 +5982,7 @@ if (typeof window.Piwik !== 'object') { * When clicked, Piwik will log the click automatically. * * @param DOMElement element - * @param bool enable If true, use pseudo click-handler (middle click + context menu) + * @param bool enable If false, do not use pseudo click-handler (middle click + context menu) */ this.addListener = function (element, enable) { addClickListener(element, enable); @@ -5998,10 +6003,11 @@ if (typeof window.Piwik !== 'object') { * * @see https://bugs.webkit.org/show_bug.cgi?id=54783 * - * @param bool enable If "true", use pseudo click-handler (treat middle click and open contextmenu as + * @param bool enable Defaults to true. + * * If "true", use pseudo click-handler (treat middle click and open contextmenu as * left click). A right click (or any click that opens the context menu) on a link - * will be tracked as clicked even if "Open in new tab" is not selected. If - * "false" (default), nothing will be tracked on open context menu or middle click. + * will be tracked as clicked even if "Open in new tab" is not selected. + * * If "false" (default), nothing will be tracked on open context menu or middle click. * The context menu is usually opened to open a link / download in a new tab * therefore you can get more accurate results by treat it as a click but it can lead * to wrong click numbers. diff --git a/js/piwik.min.js b/js/piwik.min.js index 6fa09e8deb..f467468a49 100644 --- a/js/piwik.min.js +++ b/js/piwik.min.js @@ -53,20 +53,20 @@ if(cH&&cH.name===cG.name&&cH.piece===cG.piece&&cH.target===cG.target){return tru var cK;if(cG){cK=cG.target||cG.srcElement}if(!cK){cK=cF}if(!aT(cJ,cK)){return}bP(bj);if(W.isLinkElement(cF)&&W.hasNodeAttributeWithValue(cF,"href")&&W.hasNodeAttributeWithValue(cF,r.CONTENT_TARGET_ATTR)){var cH=W.getAttributeValueFromNode(cF,"href");if(!aE(cH)&&cF.wasContentTargetAttrReplaced){W.setAnyAttribute(cF,r.CONTENT_TARGET_ATTR,"")}}var cO=cz(cF);if(ag&&cO&&cO.type){return cO.type}if(bf(cJ)){return"href"}var cL=r.buildContentBlock(cJ);if(!cL){return}var cI=cL.name;var cP=cL.piece;var cN=cL.target;var cM=az("click",cI,cP,cN);bg(cM,bj);return cM}}function bA(cH){if(!cH||!cH.length){return}var cF,cG;for(cF=0;cF<cH.length;cF++){cG=r.findTargetNode(cH[cF]);if(cG&&!cG.contentInteractionTrackingSetupDone){cG.contentInteractionTrackingSetupDone=true;ae(cG,"click",aI(cG))}}}function ba(cH,cI){if(!cH||!cH.length){return[]}var cF,cG;for(cF=0;cF<cH.length;cF++){if(aG(cH[cF])){cH.splice(cF,1);cF--}else{bJ.push(cH[cF])}}if(!cH||!cH.length){return[]}ax(cI);bA(cI);var cJ=[];for(cF=0;cF<cH.length; cF++){cG=b0(r.buildImpressionRequestParams(cH[cF].name,cH[cF].piece,cH[cF].target),undefined,"contentImpressions");if(cG){cJ.push(cG)}}return cJ}function b6(cG){var cF=r.collectContent(cG);return ba(cF,cG)}function aR(cG){if(!cG||!cG.length){return[]}var cF;for(cF=0;cF<cG.length;cF++){if(!r.isNodeVisible(cG[cF])){cG.splice(cF,1);cF--}}if(!cG||!cG.length){return[]}return b6(cG)}function ar(cH,cF,cG){var cI=r.buildImpressionRequestParams(cH,cF,cG);return b0(cI,null,"contentImpression")}function cA(cI,cG){if(!cI){return}var cF=r.findParentContentNode(cI);var cH=r.buildContentBlock(cF);if(!cH){return}if(!cG){cG="Unknown"}return az(cG,cH.name,cH.piece,cH.target)}function ch(cG,cI,cF,cH){return"e_c="+p(cG)+"&e_a="+p(cI)+(D(cF)?"&e_n="+p(cF):"")+(D(cH)?"&e_v="+p(cH):"")}function ak(cH,cJ,cF,cI,cL,cK){if(String(cH).length===0||String(cJ).length===0){return false}var cG=b0(ch(cH,cJ,cF,cI),cL,"event");bg(cG,bj,cK)}function bI(cF,cI,cG,cJ){var cH=b0("search="+p(cF)+(cI?"&search_cat="+p(cI):"")+(D(cG)?"&search_count="+cG:""),cJ,"sitesearch"); bg(cH,bj)}function cl(cF,cI,cH){var cG=b0("idgoal="+cF+(cI?"&revenue="+cI:""),cH,"goal");bg(cG,bj)}function cs(cI,cF,cM,cL,cH){var cK=cF+"="+p(bB(cI));var cG=b2(cH,"click",cI);if(cG){cK+="&"+cG}var cJ=b0(cK,cM,"link");bg(cJ,bj,cL)}function bs(cG,cF){if(cG!==""){return cG+cF.charAt(0).toUpperCase()+cF.slice(1)}return cF}function bQ(cK){var cJ,cF,cI=["","webkit","ms","moz"],cH;if(!aV){for(cF=0;cF<cI.length;cF++){cH=cI[cF];if(Object.prototype.hasOwnProperty.call(A,bs(cH,"hidden"))){if(A[bs(cH,"visibilityState")]==="prerender"){cJ=true}break}}}if(cJ){ae(A,cH+"visibilitychange",function cG(){A.removeEventListener(cH+"visibilitychange",cG,false);cK()});return}cK()}function cc(cF){var cG=cz(cF);if(cG&&cG.type){cG.href=l(cG.href);cs(cG.href,cG.type,undefined,null,cF)}}function b4(){return A.all&&!A.addEventListener}function cn(cF){var cH=cF.which;var cG=(typeof cF.button);if(!cH&&cG!=="undefined"){if(b4()){if(cF.button&1){cH=1}else{if(cF.button&2){cH=3}else{if(cF.button&4){cH=2}}}}else{if(cF.button===0||cF.button==="0"){cH=1 -}else{if(cF.button&1){cH=2}else{if(cF.button&2){cH=3}}}}}return cH}function bt(cF){switch(cn(cF)){case 1:return"left";case 2:return"middle";case 3:return"right"}}function aK(cF){return cF.target||cF.srcElement}function an(cF){return function(cI){cI=cI||N.event;var cH=bt(cI);var cJ=aK(cI);if(cI.type==="click"){var cG=false;if(cF&&cH==="middle"){cG=true}if(cJ&&!cG){cc(cJ)}}else{if(cI.type==="mousedown"){if(cH==="middle"&&cJ){aB=cH;bd=cJ}else{aB=bd=null}}else{if(cI.type==="mouseup"){if(cH===aB&&cJ===bd){cc(cJ)}aB=bd=null}else{if(cI.type==="contextmenu"){cc(cJ)}}}}}}function ah(cG,cF){ae(cG,"click",an(cF),false);if(cF){ae(cG,"mouseup",an(cF),false);ae(cG,"mousedown",an(cF),false);ae(cG,"contextmenu",an(cF),false)}}function be(cG){if(!ag){ag=true;var cH,cF=aJ(bc,"ignore"),cI=A.links;if(cI){for(cH=0;cH<cI.length;cH++){if(!cF.test(cI[cH].className)){ah(cI[cH],cG)}}}}}function aC(cH,cJ,cK){if(bO){return true}bO=true;var cL=false;var cI,cG;function cF(){cL=true}j(function(){function cM(cO){setTimeout(function(){if(!bO){return -}cL=false;cK.trackVisibleContentImpressions();cM(cO)},cO)}function cN(cO){setTimeout(function(){if(!bO){return}if(cL){cL=false;cK.trackVisibleContentImpressions()}cN(cO)},cO)}if(cH){cI=["scroll","resize"];for(cG=0;cG<cI.length;cG++){if(A.addEventListener){A.addEventListener(cI[cG],cF)}else{N.attachEvent("on"+cI[cG],cF)}}cN(100)}if(cJ&&cJ>0){cJ=parseInt(cJ,10);cM(cJ)}})}function ca(){var cG,cI,cJ={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"};if(!((new RegExp("MSIE")).test(f.userAgent))){if(f.mimeTypes&&f.mimeTypes.length){for(cG in cJ){if(Object.prototype.hasOwnProperty.call(cJ,cG)){cI=f.mimeTypes[cJ[cG]];cw[cG]=(cI&&cI.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&D(f.javaEnabled)&&f.javaEnabled()){cw.java="1"}if(v(N.GearsFactory)){cw.gears="1" -}cw.cookie=bE()}var cH=parseInt(R.width,10);var cF=parseInt(R.height,10);cw.res=parseInt(cH,10)+"x"+parseInt(cF,10)}ca();aX();aw();this.getVisitorId=function(){return aH().uuid};this.getVisitorInfo=function(){return cg()};this.getAttributionInfo=function(){return bm()};this.getAttributionCampaignName=function(){return bm()[0]};this.getAttributionCampaignKeyword=function(){return bm()[1]};this.getAttributionReferrerTimestamp=function(){return bm()[2]};this.getAttributionReferrerUrl=function(){return bm()[3]};this.setTrackerUrl=function(cF){ap=cF};this.getTrackerUrl=function(){return ap};this.addTracker=function(cF,cH){if(!cH){throw new Error("A siteId must be given to add a new tracker")}if(!D(cF)||null===cF){cF=this.getTrackerUrl()}var cG=new K(cF,cH);C.push(cG);return cG};this.getSiteId=function(){return bF};this.setSiteId=function(cF){bC(cF)};this.setUserId=function(cF){if(!D(cF)||!cF.length){return}bb=cF;bo=bG(bb).substr(0,16)};this.getUserId=function(){return bb};this.setCustomData=function(cF,cG){if(Q(cF)){af=cF -}else{if(!af){af={}}af[cF]=cG}};this.getCustomData=function(){return af};this.setCustomRequestProcessing=function(cF){bK=cF};this.appendToTrackingUrl=function(cF){cq=cF};this.getRequest=function(cF){return b0(cF)};this.addPlugin=function(cF,cG){a[cF]=cG};this.setCustomDimension=function(cF,cG){cF=parseInt(cF,10);if(cF>0){if(!D(cG)){cG=""}if(!s(cG)){cG=String(cG)}a1[cF]=cG}};this.getCustomDimension=function(cF){cF=parseInt(cF,10);if(cF>0&&Object.prototype.hasOwnProperty.call(a1,cF)){return a1[cF]}};this.deleteCustomDimension=function(cF){cF=parseInt(cF,10);if(cF>0){delete a1[cF]}};this.setCustomVariable=function(cG,cF,cJ,cH){var cI;if(!D(cH)){cH="visit"}if(!D(cF)){return}if(!D(cJ)){cJ=""}if(cG>0){cF=!s(cF)?String(cF):cF;cJ=!s(cJ)?String(cJ):cJ;cI=[cF.slice(0,a7),cJ.slice(0,a7)];if(cH==="visit"||cH===2){b9();aA[cG]=cI}else{if(cH==="page"||cH===3){bv[cG]=cI}else{if(cH==="event"){bU[cG]=cI}}}}};this.getCustomVariable=function(cG,cH){var cF;if(!D(cH)){cH="visit"}if(cH==="page"||cH===3){cF=bv[cG] -}else{if(cH==="event"){cF=bU[cG]}else{if(cH==="visit"||cH===2){b9();cF=aA[cG]}}}if(!D(cF)||(cF&&cF[0]==="")){return false}return cF};this.deleteCustomVariable=function(cF,cG){if(this.getCustomVariable(cF,cG)){this.setCustomVariable(cF,"","",cG)}};this.storeCustomVariablesInCookie=function(){bq=true};this.setLinkTrackingTimer=function(cF){bj=cF};this.setDownloadExtensions=function(cF){if(s(cF)){cF=cF.split("|")}cv=cF};this.addDownloadExtensions=function(cG){var cF;if(s(cG)){cG=cG.split("|")}for(cF=0;cF<cG.length;cF++){cv.push(cG[cF])}};this.removeDownloadExtensions=function(cH){var cG,cF=[];if(s(cH)){cH=cH.split("|")}for(cG=0;cG<cv.length;cG++){if(G(cH,cv[cG])===-1){cF.push(cv[cG])}}cv=cF};this.setDomains=function(cF){al=s(cF)?[cF]:cF;var cJ=false,cH=0,cG;for(cH;cH<al.length;cH++){cG=String(al[cH]);if(cb(cm,F(cG))){cJ=true;break}var cI=bT(cG);if(cI&&cI!=="/"&&cI!=="/*"){cJ=true;break}}if(!cJ){al.push(cm)}};this.setIgnoreClasses=function(cF){bc=s(cF)?[cF]:cF};this.setRequestMethod=function(cF){cy=cF||bR -};this.setRequestContentType=function(cF){b3=cF||au};this.setReferrerUrl=function(cF){a2=cF};this.setCustomUrl=function(cF){aN=bu(bn,cF)};this.setDocumentTitle=function(cF){aY=cF};this.setAPIUrl=function(cF){bi=cF};this.setDownloadClasses=function(cF){bl=s(cF)?[cF]:cF};this.setLinkClasses=function(cF){aQ=s(cF)?[cF]:cF};this.setCampaignNameKey=function(cF){bZ=s(cF)?[cF]:cF};this.setCampaignKeywordKey=function(cF){bh=s(cF)?[cF]:cF};this.discardHashTag=function(cF){bp=cF};this.setCookieNamePrefix=function(cF){aZ=cF;aA=bw()};this.setCookieDomain=function(cF){var cG=F(cF);if(a9(cG)){co=cG;aX()}};this.setCookiePath=function(cF){a4=cF;aX()};this.setVisitorCookieTimeout=function(cF){ce=cF*1000};this.setSessionCookieTimeout=function(cF){bX=cF*1000};this.setReferralCookieTimeout=function(cF){cu=cF*1000};this.setConversionAttributionFirstReferrer=function(cF){a8=cF};this.disableCookies=function(){a0=true;cw.cookie="0";if(bF){aq()}};this.deleteCookies=function(){aq()};this.setDoNotTrack=function(cG){var cF=f.doNotTrack||f.msDoNotTrack; -ci=cG&&(cF==="yes"||cF==="1");if(ci){this.disableCookies()}};this.addListener=function(cG,cF){ah(cG,cF)};this.enableLinkTracking=function(cF){cx=true;bQ(function(){m(function(){be(cF)})})};this.enableJSErrorTracking=function(){if(ck){return}ck=true;var cF=N.onerror;N.onerror=function(cK,cI,cH,cJ,cG){bQ(function(){var cL="JavaScript Errors";var cM=cI+":"+cH;if(cJ){cM+=":"+cJ}ak(cL,cM,cK)});if(cF){return cF(cK,cI,cH,cJ,cG)}return false}};this.disablePerformanceTracking=function(){aL=false};this.setGenerationTimeMs=function(cF){bV=parseInt(cF,10)};this.enableHeartBeatTimer=function(cF){cF=Math.max(cF,1);aO=(cF||15)*1000;if(cp!==null){cD()}};this.disableHeartBeatTimer=function(){bk();if(aO||ay){if(N.removeEventListener){N.removeEventListener("focus",aS,true);N.removeEventListener("blur",am,true)}else{if(N.detachEvent){N.detachEvent("onfocus",aS);N.detachEvent("onblur",am)}}}aO=null;ay=false};this.killFrame=function(){if(N.location!==N.top.location){N.top.location=N.location}};this.redirectFile=function(cF){if(N.location.protocol==="file:"){N.location=cF -}};this.setCountPreRendered=function(cF){aV=cF};this.trackGoal=function(cF,cH,cG){bQ(function(){cl(cF,cH,cG)})};this.trackLink=function(cG,cF,cI,cH){bQ(function(){cs(cG,cF,cI,cH)})};this.trackPageView=function(cF,cH,cG){bJ=[];if(H(bF)){bQ(function(){S(ap,bi,bF)})}else{bQ(function(){bz(cF,cH,cG)})}};this.trackAllContentImpressions=function(){if(H(bF)){return}bQ(function(){m(function(){var cF=r.findContentNodes();var cG=b6(cF);cC(cG,bj)})})};this.trackVisibleContentImpressions=function(cF,cG){if(H(bF)){return}if(!D(cF)){cF=true}if(!D(cG)){cG=750}aC(cF,cG,this);bQ(function(){j(function(){var cH=r.findContentNodes();var cI=aR(cH);cC(cI,bj)})})};this.trackContentImpression=function(cH,cF,cG){if(H(bF)){return}if(!cH){return}cF=cF||"Unknown";bQ(function(){var cI=ar(cH,cF,cG);bg(cI,bj)})};this.trackContentImpressionsWithinNode=function(cF){if(H(bF)||!cF){return}bQ(function(){if(bO){j(function(){var cG=r.findContentNodesWithinNode(cF);var cH=aR(cG);cC(cH,bj)})}else{m(function(){var cG=r.findContentNodesWithinNode(cF); -var cH=b6(cG);cC(cH,bj)})}})};this.trackContentInteraction=function(cH,cI,cF,cG){if(H(bF)){return}if(!cH||!cI){return}cF=cF||"Unknown";bQ(function(){var cJ=az(cH,cI,cF,cG);bg(cJ,bj)})};this.trackContentInteractionNode=function(cG,cF){if(H(bF)||!cG){return}bQ(function(){var cH=cA(cG,cF);bg(cH,bj)})};this.logAllContentBlocksOnPage=function(){var cG=r.findContentNodes();var cF=r.collectContent(cG);if(console!==undefined&&console&&console.log){console.log(cF)}};this.trackEvent=function(cG,cI,cF,cH,cK,cJ){bQ(function(){ak(cG,cI,cF,cH,cK,cJ)})};this.trackSiteSearch=function(cF,cH,cG,cI){bQ(function(){bI(cF,cH,cG,cI)})};this.setEcommerceView=function(cI,cF,cH,cG){if(!D(cH)||!cH.length){cH=""}else{if(cH instanceof Array){cH=JSON2.stringify(cH)}}bv[5]=["_pkc",cH];if(D(cG)&&String(cG).length){bv[2]=["_pkp",cG]}if((!D(cI)||!cI.length)&&(!D(cF)||!cF.length)){return}if(D(cI)&&cI.length){bv[3]=["_pks",cI]}if(!D(cF)||!cF.length){cF=""}bv[4]=["_pkn",cF]};this.addEcommerceItem=function(cJ,cF,cH,cG,cI){if(cJ.length){cr[cJ]=[cJ,cF,cH,cG,cI] -}};this.trackEcommerceOrder=function(cF,cJ,cI,cH,cG,cK){by(cF,cJ,cI,cH,cG,cK)};this.trackEcommerceCartUpdate=function(cF){a6(cF)};this.trackRequest=function(cF,cH,cG){bQ(function(){var cI=b0(cF,cH);bg(cI,bj,cG)})};d.trigger("TrackerSetup",[this])}function B(){return{push:X}}function b(ak,aj){var al={};var ah,ai;for(ah=0;ah<aj.length;ah++){var af=aj[ah];al[af]=1;for(ai=0;ai<ak.length;ai++){if(ak[ai]&&ak[ai][0]){var ag=ak[ai][0];if(af===ag){X(ak[ai]);delete ak[ai];if(al[ag]>1){ab("The method "+ag+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: http://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')}al[ag]++}}}}return ak}var x=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","enableLinkTracking"];function V(af,ah){var ag=new K(af,ah);C.push(ag);_paq=b(_paq,x);for(z=0;z<_paq.length; -z++){if(_paq[z]){X(_paq[z])}}_paq=new B();return ag}ae(N,"beforeunload",Z,false);Date.prototype.getTimeAlias=Date.prototype.getTime;d={initialized:false,DOM:{addEventListener:function(ai,ah,ag,af){var aj=typeof af;if(aj==="undefined"){af=false}ae(ai,ah,ag,af)},onLoad:j,onReady:m},on:function(ag,af){if(!t[ag]){t[ag]=[]}t[ag].push(af)},off:function(ah,ag){if(!t[ah]){return}var af=0;for(af;af<t[ah].length;af++){if(t[ah][af]===ag){t[ah].splice(af,1)}}},trigger:function(ah,ai,ag){if(!t[ah]){return}var af=0;for(af;af<t[ah].length;af++){t[ah][af].apply(ag||N,ai)}},addPlugin:function(af,ag){a[af]=ag},getTracker:function(af,ag){if(!D(ag)){ag=this.getAsyncTracker().getSiteId()}if(!D(af)){af=this.getAsyncTracker().getTrackerUrl()}return new K(af,ag)},getAsyncTrackers:function(){return C},addTracker:function(af,ag){if(!C.length){V(af,ag)}else{C[0].addTracker(af,ag)}},getAsyncTracker:function(ag,aj){var ai;if(C&&C.length&&C[0]){ai=C[0]}else{return V(ag,aj)}if(!aj&&!ag){return ai}if((!D(aj)||null===aj)&&ai){aj=ai.getSiteId() -}if((!D(ag)||null===ag)&&ai){ag=ai.getTrackerUrl()}var ah,af=0;for(af;af<C.length;af++){ah=C[af];if(ah&&String(ah.getSiteId())===String(aj)&&ah.getTrackerUrl()===ag){return ah}}},retryMissedPluginCalls:function(){var ag=Y;Y=[];var af=0;for(af;af<ag.length;af++){X(ag[af])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return d})}return d}()); +}else{if(cF.button&1){cH=2}else{if(cF.button&2){cH=3}}}}}return cH}function bt(cF){switch(cn(cF)){case 1:return"left";case 2:return"middle";case 3:return"right"}}function aK(cF){return cF.target||cF.srcElement}function an(cF){return function(cI){cI=cI||N.event;var cH=bt(cI);var cJ=aK(cI);if(cI.type==="click"){var cG=false;if(cF&&cH==="middle"){cG=true}if(cJ&&!cG){cc(cJ)}}else{if(cI.type==="mousedown"){if(cH==="middle"&&cJ){aB=cH;bd=cJ}else{aB=bd=null}}else{if(cI.type==="mouseup"){if(cH===aB&&cJ===bd){cc(cJ)}aB=bd=null}else{if(cI.type==="contextmenu"){cc(cJ)}}}}}}function ah(cH,cG){var cF=typeof cG;if(cF==="undefined"){cG=true}ae(cH,"click",an(cG),false);if(cG){ae(cH,"mouseup",an(cG),false);ae(cH,"mousedown",an(cG),false);ae(cH,"contextmenu",an(cG),false)}}function be(cG){if(!ag){ag=true;var cH,cF=aJ(bc,"ignore"),cI=A.links;if(cI){for(cH=0;cH<cI.length;cH++){if(!cF.test(cI[cH].className)){ah(cI[cH],cG)}}}}}function aC(cH,cJ,cK){if(bO){return true}bO=true;var cL=false;var cI,cG;function cF(){cL=true +}j(function(){function cM(cO){setTimeout(function(){if(!bO){return}cL=false;cK.trackVisibleContentImpressions();cM(cO)},cO)}function cN(cO){setTimeout(function(){if(!bO){return}if(cL){cL=false;cK.trackVisibleContentImpressions()}cN(cO)},cO)}if(cH){cI=["scroll","resize"];for(cG=0;cG<cI.length;cG++){if(A.addEventListener){A.addEventListener(cI[cG],cF)}else{N.attachEvent("on"+cI[cG],cF)}}cN(100)}if(cJ&&cJ>0){cJ=parseInt(cJ,10);cM(cJ)}})}function ca(){var cG,cI,cJ={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"};if(!((new RegExp("MSIE")).test(f.userAgent))){if(f.mimeTypes&&f.mimeTypes.length){for(cG in cJ){if(Object.prototype.hasOwnProperty.call(cJ,cG)){cI=f.mimeTypes[cJ[cG]];cw[cG]=(cI&&cI.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&D(f.javaEnabled)&&f.javaEnabled()){cw.java="1" +}if(v(N.GearsFactory)){cw.gears="1"}cw.cookie=bE()}var cH=parseInt(R.width,10);var cF=parseInt(R.height,10);cw.res=parseInt(cH,10)+"x"+parseInt(cF,10)}ca();aX();aw();this.getVisitorId=function(){return aH().uuid};this.getVisitorInfo=function(){return cg()};this.getAttributionInfo=function(){return bm()};this.getAttributionCampaignName=function(){return bm()[0]};this.getAttributionCampaignKeyword=function(){return bm()[1]};this.getAttributionReferrerTimestamp=function(){return bm()[2]};this.getAttributionReferrerUrl=function(){return bm()[3]};this.setTrackerUrl=function(cF){ap=cF};this.getTrackerUrl=function(){return ap};this.addTracker=function(cF,cH){if(!cH){throw new Error("A siteId must be given to add a new tracker")}if(!D(cF)||null===cF){cF=this.getTrackerUrl()}var cG=new K(cF,cH);C.push(cG);return cG};this.getSiteId=function(){return bF};this.setSiteId=function(cF){bC(cF)};this.setUserId=function(cF){if(!D(cF)||!cF.length){return}bb=cF;bo=bG(bb).substr(0,16)};this.getUserId=function(){return bb +};this.setCustomData=function(cF,cG){if(Q(cF)){af=cF}else{if(!af){af={}}af[cF]=cG}};this.getCustomData=function(){return af};this.setCustomRequestProcessing=function(cF){bK=cF};this.appendToTrackingUrl=function(cF){cq=cF};this.getRequest=function(cF){return b0(cF)};this.addPlugin=function(cF,cG){a[cF]=cG};this.setCustomDimension=function(cF,cG){cF=parseInt(cF,10);if(cF>0){if(!D(cG)){cG=""}if(!s(cG)){cG=String(cG)}a1[cF]=cG}};this.getCustomDimension=function(cF){cF=parseInt(cF,10);if(cF>0&&Object.prototype.hasOwnProperty.call(a1,cF)){return a1[cF]}};this.deleteCustomDimension=function(cF){cF=parseInt(cF,10);if(cF>0){delete a1[cF]}};this.setCustomVariable=function(cG,cF,cJ,cH){var cI;if(!D(cH)){cH="visit"}if(!D(cF)){return}if(!D(cJ)){cJ=""}if(cG>0){cF=!s(cF)?String(cF):cF;cJ=!s(cJ)?String(cJ):cJ;cI=[cF.slice(0,a7),cJ.slice(0,a7)];if(cH==="visit"||cH===2){b9();aA[cG]=cI}else{if(cH==="page"||cH===3){bv[cG]=cI}else{if(cH==="event"){bU[cG]=cI}}}}};this.getCustomVariable=function(cG,cH){var cF; +if(!D(cH)){cH="visit"}if(cH==="page"||cH===3){cF=bv[cG]}else{if(cH==="event"){cF=bU[cG]}else{if(cH==="visit"||cH===2){b9();cF=aA[cG]}}}if(!D(cF)||(cF&&cF[0]==="")){return false}return cF};this.deleteCustomVariable=function(cF,cG){if(this.getCustomVariable(cF,cG)){this.setCustomVariable(cF,"","",cG)}};this.storeCustomVariablesInCookie=function(){bq=true};this.setLinkTrackingTimer=function(cF){bj=cF};this.setDownloadExtensions=function(cF){if(s(cF)){cF=cF.split("|")}cv=cF};this.addDownloadExtensions=function(cG){var cF;if(s(cG)){cG=cG.split("|")}for(cF=0;cF<cG.length;cF++){cv.push(cG[cF])}};this.removeDownloadExtensions=function(cH){var cG,cF=[];if(s(cH)){cH=cH.split("|")}for(cG=0;cG<cv.length;cG++){if(G(cH,cv[cG])===-1){cF.push(cv[cG])}}cv=cF};this.setDomains=function(cF){al=s(cF)?[cF]:cF;var cJ=false,cH=0,cG;for(cH;cH<al.length;cH++){cG=String(al[cH]);if(cb(cm,F(cG))){cJ=true;break}var cI=bT(cG);if(cI&&cI!=="/"&&cI!=="/*"){cJ=true;break}}if(!cJ){al.push(cm)}};this.setIgnoreClasses=function(cF){bc=s(cF)?[cF]:cF +};this.setRequestMethod=function(cF){cy=cF||bR};this.setRequestContentType=function(cF){b3=cF||au};this.setReferrerUrl=function(cF){a2=cF};this.setCustomUrl=function(cF){aN=bu(bn,cF)};this.setDocumentTitle=function(cF){aY=cF};this.setAPIUrl=function(cF){bi=cF};this.setDownloadClasses=function(cF){bl=s(cF)?[cF]:cF};this.setLinkClasses=function(cF){aQ=s(cF)?[cF]:cF};this.setCampaignNameKey=function(cF){bZ=s(cF)?[cF]:cF};this.setCampaignKeywordKey=function(cF){bh=s(cF)?[cF]:cF};this.discardHashTag=function(cF){bp=cF};this.setCookieNamePrefix=function(cF){aZ=cF;aA=bw()};this.setCookieDomain=function(cF){var cG=F(cF);if(a9(cG)){co=cG;aX()}};this.setCookiePath=function(cF){a4=cF;aX()};this.setVisitorCookieTimeout=function(cF){ce=cF*1000};this.setSessionCookieTimeout=function(cF){bX=cF*1000};this.setReferralCookieTimeout=function(cF){cu=cF*1000};this.setConversionAttributionFirstReferrer=function(cF){a8=cF};this.disableCookies=function(){a0=true;cw.cookie="0";if(bF){aq()}};this.deleteCookies=function(){aq() +};this.setDoNotTrack=function(cG){var cF=f.doNotTrack||f.msDoNotTrack;ci=cG&&(cF==="yes"||cF==="1");if(ci){this.disableCookies()}};this.addListener=function(cG,cF){ah(cG,cF)};this.enableLinkTracking=function(cF){cx=true;bQ(function(){m(function(){be(cF)})})};this.enableJSErrorTracking=function(){if(ck){return}ck=true;var cF=N.onerror;N.onerror=function(cK,cI,cH,cJ,cG){bQ(function(){var cL="JavaScript Errors";var cM=cI+":"+cH;if(cJ){cM+=":"+cJ}ak(cL,cM,cK)});if(cF){return cF(cK,cI,cH,cJ,cG)}return false}};this.disablePerformanceTracking=function(){aL=false};this.setGenerationTimeMs=function(cF){bV=parseInt(cF,10)};this.enableHeartBeatTimer=function(cF){cF=Math.max(cF,1);aO=(cF||15)*1000;if(cp!==null){cD()}};this.disableHeartBeatTimer=function(){bk();if(aO||ay){if(N.removeEventListener){N.removeEventListener("focus",aS,true);N.removeEventListener("blur",am,true)}else{if(N.detachEvent){N.detachEvent("onfocus",aS);N.detachEvent("onblur",am)}}}aO=null;ay=false};this.killFrame=function(){if(N.location!==N.top.location){N.top.location=N.location +}};this.redirectFile=function(cF){if(N.location.protocol==="file:"){N.location=cF}};this.setCountPreRendered=function(cF){aV=cF};this.trackGoal=function(cF,cH,cG){bQ(function(){cl(cF,cH,cG)})};this.trackLink=function(cG,cF,cI,cH){bQ(function(){cs(cG,cF,cI,cH)})};this.trackPageView=function(cF,cH,cG){bJ=[];if(H(bF)){bQ(function(){S(ap,bi,bF)})}else{bQ(function(){bz(cF,cH,cG)})}};this.trackAllContentImpressions=function(){if(H(bF)){return}bQ(function(){m(function(){var cF=r.findContentNodes();var cG=b6(cF);cC(cG,bj)})})};this.trackVisibleContentImpressions=function(cF,cG){if(H(bF)){return}if(!D(cF)){cF=true}if(!D(cG)){cG=750}aC(cF,cG,this);bQ(function(){j(function(){var cH=r.findContentNodes();var cI=aR(cH);cC(cI,bj)})})};this.trackContentImpression=function(cH,cF,cG){if(H(bF)){return}if(!cH){return}cF=cF||"Unknown";bQ(function(){var cI=ar(cH,cF,cG);bg(cI,bj)})};this.trackContentImpressionsWithinNode=function(cF){if(H(bF)||!cF){return}bQ(function(){if(bO){j(function(){var cG=r.findContentNodesWithinNode(cF); +var cH=aR(cG);cC(cH,bj)})}else{m(function(){var cG=r.findContentNodesWithinNode(cF);var cH=b6(cG);cC(cH,bj)})}})};this.trackContentInteraction=function(cH,cI,cF,cG){if(H(bF)){return}if(!cH||!cI){return}cF=cF||"Unknown";bQ(function(){var cJ=az(cH,cI,cF,cG);bg(cJ,bj)})};this.trackContentInteractionNode=function(cG,cF){if(H(bF)||!cG){return}bQ(function(){var cH=cA(cG,cF);bg(cH,bj)})};this.logAllContentBlocksOnPage=function(){var cG=r.findContentNodes();var cF=r.collectContent(cG);if(console!==undefined&&console&&console.log){console.log(cF)}};this.trackEvent=function(cG,cI,cF,cH,cK,cJ){bQ(function(){ak(cG,cI,cF,cH,cK,cJ)})};this.trackSiteSearch=function(cF,cH,cG,cI){bQ(function(){bI(cF,cH,cG,cI)})};this.setEcommerceView=function(cI,cF,cH,cG){if(!D(cH)||!cH.length){cH=""}else{if(cH instanceof Array){cH=JSON2.stringify(cH)}}bv[5]=["_pkc",cH];if(D(cG)&&String(cG).length){bv[2]=["_pkp",cG]}if((!D(cI)||!cI.length)&&(!D(cF)||!cF.length)){return}if(D(cI)&&cI.length){bv[3]=["_pks",cI]}if(!D(cF)||!cF.length){cF="" +}bv[4]=["_pkn",cF]};this.addEcommerceItem=function(cJ,cF,cH,cG,cI){if(cJ.length){cr[cJ]=[cJ,cF,cH,cG,cI]}};this.trackEcommerceOrder=function(cF,cJ,cI,cH,cG,cK){by(cF,cJ,cI,cH,cG,cK)};this.trackEcommerceCartUpdate=function(cF){a6(cF)};this.trackRequest=function(cF,cH,cG){bQ(function(){var cI=b0(cF,cH);bg(cI,bj,cG)})};d.trigger("TrackerSetup",[this])}function B(){return{push:X}}function b(ak,aj){var al={};var ah,ai;for(ah=0;ah<aj.length;ah++){var af=aj[ah];al[af]=1;for(ai=0;ai<ak.length;ai++){if(ak[ai]&&ak[ai][0]){var ag=ak[ai][0];if(af===ag){X(ak[ai]);delete ak[ai];if(al[ag]>1){ab("The method "+ag+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: http://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')}al[ag]++}}}}return ak}var x=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","enableLinkTracking"]; +function V(af,ah){var ag=new K(af,ah);C.push(ag);_paq=b(_paq,x);for(z=0;z<_paq.length;z++){if(_paq[z]){X(_paq[z])}}_paq=new B();return ag}ae(N,"beforeunload",Z,false);Date.prototype.getTimeAlias=Date.prototype.getTime;d={initialized:false,DOM:{addEventListener:function(ai,ah,ag,af){var aj=typeof af;if(aj==="undefined"){af=false}ae(ai,ah,ag,af)},onLoad:j,onReady:m},on:function(ag,af){if(!t[ag]){t[ag]=[]}t[ag].push(af)},off:function(ah,ag){if(!t[ah]){return}var af=0;for(af;af<t[ah].length;af++){if(t[ah][af]===ag){t[ah].splice(af,1)}}},trigger:function(ah,ai,ag){if(!t[ah]){return}var af=0;for(af;af<t[ah].length;af++){t[ah][af].apply(ag||N,ai)}},addPlugin:function(af,ag){a[af]=ag},getTracker:function(af,ag){if(!D(ag)){ag=this.getAsyncTracker().getSiteId()}if(!D(af)){af=this.getAsyncTracker().getTrackerUrl()}return new K(af,ag)},getAsyncTrackers:function(){return C},addTracker:function(af,ag){if(!C.length){V(af,ag)}else{C[0].addTracker(af,ag)}},getAsyncTracker:function(ag,aj){var ai;if(C&&C.length&&C[0]){ai=C[0] +}else{return V(ag,aj)}if(!aj&&!ag){return ai}if((!D(aj)||null===aj)&&ai){aj=ai.getSiteId()}if((!D(ag)||null===ag)&&ai){ag=ai.getTrackerUrl()}var ah,af=0;for(af;af<C.length;af++){ah=C[af];if(ah&&String(ah.getSiteId())===String(aj)&&ah.getTrackerUrl()===ag){return ah}}},retryMissedPluginCalls:function(){var ag=Y;Y=[];var af=0;for(af;af<ag.length;af++){X(ag[af])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return d})}return d}()); /*!!! pluginTrackerHook */ -}(function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker()}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker); -if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}; +}(function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker() +}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}; /*!! @license-end */ };
\ No newline at end of file diff --git a/lang/en.json b/lang/en.json index 00aea52f6e..ab7e7dcc9c 100644 --- a/lang/en.json +++ b/lang/en.json @@ -233,6 +233,7 @@ "MultiSitesSummary": "All Websites", "Name": "Name", "NbActions": "Number of Actions", + "NbInteractions": "Number of Interactions", "NbSearches": "Number of Internal Searches", "NeedMoreHelp": "Need more help?", "Never": "Never", diff --git a/lang/he.json b/lang/he.json index 54e2fca1f0..fcc5d260fb 100644 --- a/lang/he.json +++ b/lang/he.json @@ -1,11 +1,15 @@ { "General": { + "12HourClock": "שעון 12 שעות", + "24HourClock": "שעון 24 שעות", + "AbandonedCarts": "עגולות קניה שנעזבו", "AboutPiwikX": "אודות Piwik %s", "Action": "פעולה", "Actions": "פעולות", "Add": "הוספה", "AfterEntry": "אחרי שנכנסו לפה", "All": "הכל", + "AllowPiwikArchivingToTriggerBrowser": "אחסן דוחות כאשר הם נצפים מהדפדפן", "AllWebsitesDashboard": "פאנל סקירה לכל האתרים", "And": "ו", "API": "API", @@ -18,66 +22,120 @@ "AverageQuantity": "כמות ממוצעת", "BackToPiwik": "חזרה ל Piwik", "Broken": "שבור", + "BrokenDownReportDocumentation": "בוצעה חלוקה למספר דוחות, שמוצגים במיקרו-גרפים בתחתית העמוד. אפשר להגדיל את הגרפים על ידי הקלקה על הדוח שאותו ברצונך לראות.", "Cancel": "ביטול", "CannotUnzipFile": "לא יכול לחלץ את הקובץ %1$s: %2$s", "ChangePassword": "שינוי סיסמה", + "ChangeTagCloudView": "נא שימו לב שאפשר לצפות בדוח בדרכים אחרות מאשר בצורת tag cloud. השתמשו בבקרים בתחתית בדוח על מנת לשנות את אופן הצגתם.", + "ChooseDate": "בחרו בתאריך, התאריך שבחר כעת הוא: %s", "ChooseLanguage": "בחירת שפה", "ChoosePeriod": "בחירת תקופה", + "ClickHere": "הקליקו כאן לקבלת יותר מידע.", + "ClickToChangePeriod": "הקליקו שוב על מנת לשנות את התקופה.", "Close": "לסגור", + "ClickToSearch": "הקליקו לחיפוש", "ColumnActionsPerVisit": "פעולות בכל ביקור", + "ColumnActionsPerVisitDocumentation": "המספר הממוצע של פעולות (קריאת דפים, חיפוש באתר, הורדות או קישורי-חוץ) שבוצעו במהלך הביקורים.", + "ColumnAverageGenerationTime": "זמן עיבוד ממוצע", + "ColumnAverageGenerationTimeDocumentation": "הזמן הממוצע שנדרש לעבד את הדף. המדד הזה כולל את הזמן שנדרש לשרת ליצור את הדף בתוספת הזמן שנדרש למבקר להוריד את התוצאה מהשרת. זמן עיבוד ממוצע נמוך פירושו שאתרכם מהר יותר למבקרים!", "ColumnAverageTimeOnPage": "זמן ממוצע בעמוד", + "ColumnAverageTimeOnPageDocumentation": "הזמן הממוצע שמבקרים שהו בדף זה (על הדף, לא על כל האתר).", "ColumnAvgTimeOnSite": "משך שהייה ממוצע באתר", + "ColumnAvgTimeOnSiteDocumentation": "האורך הממוצע של ביקור", "ColumnBounceRate": "שיעור נטישה", + "ColumnBounceRateDocumentation": "אחוז הביקורים שכללו רק הצגת דף אחד. פירוש הדבר שהמבקר עזב את האתר מיידית מדף הכניסה.", "ColumnBounces": "נטישות", + "ColumnBouncesDocumentation": "מספר הביקורים שהתחילו והסתיימו בדף זה. פירוש הדבר שהמבקר עזב את האתר אחרי שראה דף זה בלבד.", "ColumnConversionRate": "שעור המרה", + "ColumnConversionRateDocumentation": "אחוז הביקורים שגרמו לשינוי ביעד.", + "ColumnDestinationPage": "דף היעד", "ColumnEntrances": "כניסות", + "ColumnEntrancesDocumentation": "מספר הביקורים שהתחילו בעמוד זה.", "ColumnExitRate": "שיעור יציאה", + "ColumnExitRateDocumentation": "אחוז הביקורים שעזבו את האתר אחרי שצפו בדף זה.", "ColumnExits": "יציאות", + "ColumnExitsDocumentation": "מספר הביקורים בהסתיימו בדף זה.", + "ColumnGenerationTime": "זמן עיבוד", "ColumnKeyword": "מילת מפתח", "ColumnLabel": "כותרת", "ColumnMaxActions": "מקסימום פעולות בביקור בודד", "ColumnNbActions": "פעולות", + "ColumnNbActionsDocumentation": "מספר הפעולות שבוצעו על ידי המבקרים. ביצועים יכולים להיות צפייה בדפים, חיפושים פנימיים באתר, הורדות וקשרי-חוץ.", "ColumnNbUniqVisitors": "מבקרים יחודיים", + "ColumnNbUniqVisitorsDocumentation": "מספר המבקרים בייחודיים שהגיעו לאתר שלך. כל משתמש נספר פעם אחת בלבד, גם אם הוא מבקר באתר מספר פעמים ביום.", "ColumnNbUsers": "משתמשים", "ColumnNbVisits": "ביקורים", + "ColumnNbVisitsDocumentation": "אם מבקר מגיע לאתר שלך בפעם הראשונה או אם הוא מבקר בדף יותר מ-30 דקות אחרי הצפייה האחרונה, זה יירשם כביקור חדש.", + "ColumnPageBounceRateDocumentation": "אחוז הביקורים שהתחילו בעמוד זה ועזבו מיד את האתר.", "ColumnPageviews": "צפיות", + "ColumnPageviewsDocumentation": "מספר הפעמים שביקרו בדף זה.", "ColumnPercentageVisits": "% ביקורים", + "ColumnRevenue": "רווח", "ColumnSumVisitLength": "הזמן הכולל שהשקיעו המבקרים (שניות)", + "ColumnTotalPageviews": "סך כל הצפיות בדפים", + "ColumnUniqueEntrances": "כניסות ייחודיות", + "ColumnUniqueExits": "יציאות ייחודיות", "ColumnUniquePageviews": "צפיות יחודייות", + "ColumnUniquePageviewsDocumentation": "מספר הביקורים שכללו דף זה. אם ביקרו בדף זה מספר פעמים במהלך ביקור אחד, הוא ייספר רק פעם אחת.", "ColumnValuePerVisit": "תפוקה בכל ביקור", + "ColumnViewedAfterSearch": "הוקלק בתוצאות חיפוש", "ColumnVisitDuration": "משך ביקור (בשניות)", "ColumnVisitsWithConversions": "ביקורים עם המרות", "Continue": "להמשיך", "ContinueToPiwik": "חזרה לPiwik", + "CurrentlyUsingUnsecureHttp": "אתם משתמשים כעת בפיוויק באמצעות קשר HTTP שאינו בטוח. אנו ממליצים שתגדירו את פיוויק לשימוש ב-SSL (HTTPS) לשיפור רמת האבטחה.", + "CreatedByUser": "נוצר על די %s", "CurrentMonth": "חודש נוכחי", "CurrentWeek": "שבוע נוכחי", "CurrentYear": "שנה נוכחית", "Daily": "יומי", "DailyReport": "יומי", "DailyReports": "דוחות יומיים", + "DailySum": "סך יומי", "DashboardForASpecificWebsite": "פאנל סקירה לאתר מסויים", + "DataForThisGraphHasBeenPurged": "הנתונים לגרף זה הם בני יותר מ-%s חודשים ובוטלו.", + "DataForThisTagCloudHasBeenPurged": "הנתונים לתג זה הם בני יותר מ-%s חודשים ובוטלו.", "Date": "תאריך", "DateRange": "טווח תאריכים:", "DateRangeFrom": "מ", + "DateRangeInPeriodList": "טווח התאריכים", "DateRangeTo": "עד", "DaysHours": "%1$s ימים ו-%2$s שעות", "DaysSinceFirstVisit": "ימים מאז ביקור ראשון", + "DaysSinceLastEcommerceOrder": "ימים מאז הזמנת ה-Ecommerce האחרון.", "DaysSinceLastVisit": "ימים מאז ביקור אחרון", "Default": "בררת מחדל", + "DefaultAppended": "(ברירת מחדל)", "Delete": "למחוק", "Description": "תיאור", + "Desktop": "מחשב PC", "Details": "פרטים", + "Discount": "הנחה", "DisplaySimpleTable": "להציג טבלה פשוטה", "DisplayTableWithGoalMetrics": "להציג טבלה עם נתוני יעדים", "DisplayTableWithMoreMetrics": "להציג טבלה עם יותר נתונים", + "Documentation": "תיעוד", + "Donate": "תרומה", "Done": "סיום", "Download": "להוריד", + "DownloadFail_FileExists": "הקובץ %s כבר קיים!", + "DownloadFail_FileExistsContinue": "מנסים להמשיך את ההורדה של %s אבל כבר קיים קובץ שהורד במלואו!", + "DownloadFail_HttpRequestFail": "לא הצלחנו להוריד את הקובץ! אולי יש בעיה באתר ממנו אתם מורידים אותו. אפשר לנסות יותר מאוחר או להשיג את הקובץ באופן עצמאי.", "DownloadFullVersion": "%1$sהורדת%2$s הגרסה המלאה! כנסו ל%3$s", + "DownloadPleaseRemoveExisting": "אם אתם רוצים להחליף אותו, אז הסירו את הקובץ הקיים.", "Downloads": "הורדות", + "EcommerceOrders": "הזמנות Ecommerce", + "EcommerceVisitStatusDesc": "בקרו בסטטוס Ecommerce בתום הביקור", + "EcommerceVisitStatusEg": "לדוגמא, על מנת לבחור את כל הביקורים שביצעו הזמנת Ecommerce, שאילתת ה-API צריך לכלול %s", "Edit": "לערוך", "EncryptedSmtpTransport": "יש להזין את שכבת ההצפנה הדרושה ע\"י שרת ה-SMTP שלך.", "Error": "שגיאה", + "Errors": "שגיאות", + "EvolutionOverPeriod": "התפתחות במהלך התקופה", + "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "המשתמש צריך להיות משתמש-על או המשתמש '%s' עצמו.", "ExceptionConfigurationFileNotFound": "קובץ ההגדרות {%s} לא נמצא.", + "ExceptionConfigurationFileExistsButNotReadable": "נראה שקובץ ההגדרות %s קיים, אבל פיוויק לא היה מסוגל לקרוא אותו.", + "ExceptionConfigurationFilePleaseCheckReadableByUser": "נא בדקו ש %1$s ניתן לצפייה על ידי המשתמש '%2$s'", "ExceptionDatabaseVersion": "גרסאת ה%1$s שלך היא %2$s אך Piwik דורשת לפחות %3$s.", "ExceptionFileIntegrity": "בדיקת שלמות נכשלה: %s", "ExceptionFilesizeMismatch": "אין התאמה במשקל הקובץ: %1$s (מצופה: %2$s, נמצא: %3$s)", @@ -95,89 +153,182 @@ "ExceptionPrivilege": "לא ניתן לגשת למשאב זה מכיוון שהוא דורש גישת %s.", "ExceptionPrivilegeAccessWebsite": "לא ניתן לגשת למשאב זה מכיוון שהוא דורש גישת %s עבור האתר שמספרו הסידורי הוא %d.", "ExceptionPrivilegeAtLeastOneWebsite": "לא ניתן לגשת למשאב זה מכיוון שהוא דורש גישת %s עבור אתר אחד לפחות.", + "ExceptionUnableToStartSession": "לא מצליח להתחיל session.", "ExceptionUndeletableFile": "לא ניתן למחוק את %s", "ExceptionUnreadableFileDisabledMethod": "קובץ ההגדרות {%1$s} לא ניתן לקריאה. המארח אולי חסם את %2$s.", + "ExceptionReportNotFound": "הדוח המבוקש אינו קיים.", + "ExceptionWidgetNotFound": "הווידג'ט המבוקש אינו קיים.", + "ExceptionReportNotEnabled": "הדוח המבוקש לא הופעל. בדרך כלל זה אומר שהתוסף שמגדיר את הדוח בוטל או שאין לך מספיק הרשאות לשם כניסה לדוח זה.", + "ExceptionWidgetNotEnabled": "הווידג'ט המבוקש לא מופעל. בדרך כלל זה אומר שהתוסף שמגדיר את הווידג'ט בוטל או שאין לך מספיק הרשאות לשם כניסה לווידג'ט זה.", + "ExpandDataTableFooter": "שנו את אופן ההצגה או הגדירו את הדוח", "Export": "ייצוא", "ExportAsImage": "לייצא כתמונה", "ExportThisReport": "לייצא מידע בפורמטים אחרים", + "Faq": "שאלות ותשובות נפוצות", "FileIntegrityWarningExplanation": "בדיקת תקינות קבצים נכשלה ודיווחה על מספר שגיאות. ייתכן וזה נגרם עקב העלאה חלקית או כושלת של קבצי המערכת. יש להעלות את הקבצים מחדש במצב BINARY ולרענן את העמוד עד שלא יוצגו שגיאות.", "First": "ראשון", + "Flatten": "לשטח", "ForExampleShort": "לדוגמה", + "Forums": "פורומים", + "FromReferrer": "מ-", + "GeneralInformation": "מידע כללי", + "GeneralSettings": "הגדרות כלליות", + "GetStarted": "צאו לדרך", "GiveUsYourFeedback": "העברת משוב למפתחים!", "Goal": "יעד", "GoTo": "עבור ל%s", "GraphHelp": "מידע נוסף עבור הצגת גרפים ב Piwik.", "HelloUser": "שלום, %s!", + "Help": "עזרה", "Hide": "להסתיר", "HoursMinutes": "%1$s שעות ו-%2$s דקות", "Id": "מספר סידורי", "IfArchivingIsFastYouCanSetupCronRunMoreOften": "בהנחה כי גניזת המידע לארכיון פועלת בצורה מהירה בתהקנה שלך, ניתן להגדיר את העבודה הכרונית (crontab) לרוץ לעיתים תכופות יותר.", + "InfoFor": "מידע על %s", "Installed": "מותקן", "InvalidDateRange": "טווח התאריכים לא תקף, נא לנסות שוב", "InvalidResponse": "המידע שהתקבל אינו תקף.", + "IP": "IP", + "JsTrackingTag": "JavaScript Tracking Code", "Language": "שפה", "LastDays": "%s ימים אחרונים (כולל היום)", + "LastDaysShort": "%s הימים האחרונים", + "LearnMore": "%1$s למדו יותר %2$s", + "Live": "חי", "Loading": "טוען...", "LoadingData": "טוען מידע...", + "LoadingPopover": "טוען %s...", + "LoadingPopoverFor": "טעון %s עבור", "Locale": "he_IL.UTF-8", "Logout": "להתנתק", + "MainMetrics": "מדדים עיקריים", + "Matches": "התאמות", "MediumToHighTrafficItIsRecommendedTo": "לאתרים בעלי תעבודה בינונית עד גבוהה, אנו ממליצים לעבד דוחות להיום לכל היותר בכל חצי שעה (%1$s שניות) או בכל שעה (%2$s שניות)", + "Metadata": "מידע-על", + "Metric": "מדד", + "Metrics": "מדדים", + "MetricsToPlot": "מדדים להתוויה", + "MetricToPlot": "מדד להתוויה", "MinutesSeconds": "%1$s דקות ו-%2$s שניות", + "Mobile": "נייד", "Monthly": "חודשי", + "MonthlyReport": "חודשי", + "MonthlyReports": "דוחות חודשיים", + "More": "יותר", + "MoreDetails": "פרטים נוספים", + "MoreLowerCase": "יותר", "MultiSitesSummary": "כל האתרים", "Name": "שם", "NbActions": "מספר פעולות", + "NbSearches": "מספר חיפושים פנימיים", + "NeedMoreHelp": "זקוקים לעזרה נוספת?", "Never": "לעולם לא", "NewReportsWillBeProcessedByCron": "כאשר ארכיון Piwik אינו מורץ על ידי הדפדפן, דוחות חדשים יעובדו ע\"י עבודה כרונית (crontab).", "NewUpdatePiwikX": "עדכון חדש: Piwik %s", "NewVisitor": "מבקר חדש", + "NewVisits": "ביקורים חדשים", "Next": "הבא", "No": "לא", "NoDataForGraph": "חסר מידע עבור גרף זה.", "NoDataForTagCloud": "חסר מידע עבור ענן תגים זה.", + "NotDefined": "%s לא הוגדר", + "Note": "הערה", + "NotInstalled": "לא מותקן", + "NotRecommended": "לא מומלץ", "NotValid": "%s לא תקף", "NumberOfVisits": "מספר ביוקרים", + "NUsers": "%s משתמשים", "NVisits": "%s ביקורים", "Ok": "או.קי.", + "OneAction": "פעולה 1", + "OneVisit": "ביקור 1", "OnlyEnterIfRequired": "יש להזין שם משתמש רק אם שרת ה-SMTP מבקש זאת.", "OnlyEnterIfRequiredPassword": "יש להזין סיסמה רק אם שרת ה-SMTP מבקש זאת.", "OnlyUsedIfUserPwdIsSet": "משומש רק אם שם המשתמש\/סיסמה מוגדרים, יש לברר עם הספק במקרה של חוסר וודאות באיזה שיטה לבחור.", "OpenSourceWebAnalytics": "ניתוח פעילות אתרים בקוד פתוח", + "OperationAtLeast": "לפחות", + "OperationAtMost": "לכל היותר", + "OperationContains": "מכיל", + "OperationDoesNotContain": "אינו מכיל", + "OperationEquals": "שווה ל-", + "OperationGreaterThan": "גדול מ-", + "OperationIs": "הנו", + "OperationIsNot": "אינו", + "OperationLessThan": "פחות מ-", + "OperationNotEquals": "אינו שווה ל-", + "OperationStartsWith": "מתחיל עם", + "OperationEndsWith": "מסתיים עם", "OptionalSmtpPort": "אופציונלי. ברירת המחדל היא 25 עבור לא מוצפן ו-TLS SMTP, 465 עבור SSL SMTP.", + "Options": "אפשרויות", + "Or": "או", "OrCancel": "או %1$s ביטול %2$s", "Others": "אחרים", + "Outlink": "קישור חוץ", "Outlinks": "קישורים יוצאים", + "OverlayRowActionTooltip": "צפו בסטטיסטיקה ישירות מהאתר שלכם (פותח טאב חדש)", + "OverlayRowActionTooltipTitle": "Open Page Overlay", "Overview": "מבט כללי", "Pages": "עמודים", + "Pagination": "%1$s - %2$s of %3$s", + "PaginationWithoutTotal": "%1$s - %2$s", "Password": "סיסמה", "Period": "תקופה", "Piechart": "גרף עוגה", "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s עכשיו זמינה. %2$s נא לשדרג עכשיו! %3$s (ראו %4$s שינויים %5$s)", + "PleaseContactYourPiwikAdministrator": "נא צרו קשר עם מנהל הפיוויק שלכם.", "PleaseSpecifyValue": "יד להגדיר ערך עבור '%s'.", "PleaseUpdatePiwik": "יש לעדכן את ה-Piwik שלך", "Plugin": "תוסף", "Plugins": "תוספים", + "PoweredBy": "מופעל על ידי", "Previous": "הקודם", "PreviousDays": "%s ימים קודמים (לא כולל היום)", + "PreviousDaysShort": "%s הימים הקודמים", + "Price": "מחיר", + "ProductConversionRate": "Product Conversion Rate", + "ProductRevenue": "רווח למוצר", + "Measurable": "מדיד", + "Measurables": "מדידים", + "PurchasedProducts": "מוצרים שנרכשו", + "Quantity": "כמות", + "RangeReports": "טווחי תאריכים הניתנים להגדרה עצמית", + "ReadThisToLearnMore": "%1$s קראו זאת כדי ללמוד עוד.%2$s", + "Recommended": "מומלץ", + "RecordsToPlot": "רשומות להתוויה", "Refresh": "ריענון", "RefreshPage": "לרענן את העמוד", + "RelatedReport": "דוח קשור", + "RelatedReports": "דוחות קשורים", "Remove": "מחיקה", "Report": "לדווח", + "ReportGeneratedFrom": "דוח זה נוצר על ידי שימוש בנתונים מ-%s", + "ReportRatioTooltip": "'%1$s' represents %2$s of %3$s %4$s with %5$s.", "Reports": "דוחות", + "ReportsContainingTodayWillBeProcessedAtMostEvery": "העבר דוחות לארכיון כל X שניות לכל היותר", + "RearchiveTimeIntervalOnlyForTodayReports": "זה רק נוגע לדוחות להים (או כל טווח תאריכים שכולל את היום)", "ReportsWillBeProcessedAtMostEveryHour": "דוחות יעובדו כמו כן לכל היותר בכל שעה.", "RequestTimedOut": "בקשת מידע מ %s נקטעה. יש לנסות שוב.", "Required": "דרוש %s", "ReturningVisitor": "מבקר חוזר", + "ReturningVisitorAllVisits": "צפו בכל הביקורים", + "RowEvolutionRowActionTooltip": "צפו כיצד המדדים לשורה זו השתנו במהלך הזמן", + "RowEvolutionRowActionTooltipTitle": "פתחו התפתחות השורה", "Rows": "שורות", + "RowsToDisplay": "שורות להצגה", "Save": "לשמור", "SaveImageOnYourComputer": "בכדי לשמור את התמונה על מחשבך: כפתור ימני על התמונה ולחיצה על \"שמירת תמונה בשם...\"", "Search": "חיפוש", + "Clear": "נקה", "SearchNoResults": "אין תוצאות", "SeeAll": "להציג הכל", "SeeTheOfficialDocumentationForMoreInformation": "ראו %1$sתיעוד רשמי%2$s למידע נוסף.", + "SeeThisFaq": "See %1$sthis faq%2$s.", + "Segment": "מקטע", "SelectYesIfYouWantToSendEmailsViaServer": "יש לבחור \"כן\" אם רוצים או חייבים לשלוח דוא\"ל דרך שרת ולא דרך פונקצית הדוא\"ל המקומית", "Settings": "הגדרות", + "Shipping": "משלוח", "Show": "להציג", + "SingleWebsitesDashboard": "פאנל סקירה לאתר אחד", "SmallTrafficYouCanLeaveDefault": "לאתרים בעלי תעבורה נמוכה, ניתן להשאיר את ברירת המחדל של %s שניות ולגשת לדוחות בזמן אמת.", "SmtpEncryption": "הצפנת SMTP", "SmtpPassword": "סיסמת SMTP", @@ -185,35 +336,72 @@ "SmtpServerAddress": "כתובת שרת SMTP", "SmtpUsername": "שם משתמש SMTP", "Source": "מקור", + "Subtotal": "סך ביניים", + "Summary": "סיכום", "Table": "טבלה", "TagCloud": "ענן תגים", + "Tax": "מס", + "TimeAgo": "לפני %s", + "TimeFormat": "פורמט הזמן", + "TimeOnPage": "זמן בדף", "Total": "סך הכל", + "TotalRatioTooltip": "This is %1$s of all %2$s %3$s.", + "TotalRevenue": "סה\"כ הרווח", + "TotalVisitsPageviewsActionsRevenue": "(סל הכל: %1$s ביקורים, %2$s צפיות בדפים, %3$s פעולות, %4$s רווח)", + "TrackingScopeAction": "פעולה", + "TrackingScopePage": "דף", + "TrackingScopeVisit": "ביקור", + "TransitionsRowActionTooltip": "צפו מה עשו המבקרים לפני ואחרי שצפו בדף זה", "TranslatorName": "Nirlah - Nir Lahad", + "UniquePurchases": "רכישות ייחודיות", "Unknown": "לא ידוע", "Upload": "העלאה", + "UsePlusMinusIconsDocumentation": "השתמש בצלמיות הפלוס והמינוס בצד שמאל על מהת לנווט.", + "UserId": "User ID", "Username": "שם משתמש", "UseSMTPServerForEmail": "שימוש בשרת SMTP עבור דוא\"ל", "Value": "ערך", "VBarGraph": "גרף עמודות", + "View": "תצוגה", + "ViewDocumentationFor": "צפו בתיעוד עבור %1$s", "Visit": "ביקור", + "VisitConvertedGoal": "הביקור השפיע על לפחות יעד אחד", + "VisitConvertedGoalId": "הביקור השפיע על ID ספציפי של יעד", + "VisitConvertedNGoals": "הביקור השפיע על %s יעדים", "VisitDuration": "משך ביקור ממוצע (בשניות)", "Visitor": "מבקר", "VisitorID": "מספר מבקר", "VisitorIP": "IP מבקר", "Visitors": "מבקרים", + "VisitsWith": "ביקורים עם %s", + "VisitorSettings": "הגדרת מבקרים", + "VisitType": "סוג הביקור", + "VisitTypeExample": "למשל, על מנת לבחור את כל המבקרים שחזרו לאתר, לרבות אלה שרכשו משהו בביקוריהם הקודמים, שאילתת ה-API צריכה לכלול %s", "Warning": "אזהרה", + "Warnings": "אזהרות", + "WarningPiwikWillStopSupportingPHPVersion": "פיוויק יפסיק לתמוך ב-PHP %1$s בשדרוג הראשי הבא. שדרגו את גירסת ה-PHP שלכם לפחות לגירסת PHP %2$s לפני שזה מאוחר מדי!", + "YouMustUpgradePhpVersionToReceiveLatestPiwik": "עליכם לשדרג את גירסת ה-PHP שלכם על מהת לקבל את גירסת הפיוויק האחרונה.", + "PiwikCannotBeUpgradedBecausePhpIsTooOld": "לא ניתן לשדרג את פיוויק לגירסה הראשית האחרונה מכיוון שגירסת ה-PHP שלך ישן מדי.", + "PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "נא שדרגו את גירסת ה-PHP שלכם לפחות לגירסת PHP %s על מנת שנתוני הסטטיסטיקה של פיוויק יישארו מאובטחים.", "WarningFileIntegrityNoManifest": "לא ניתן לבצע בדיקת תקינות קבצים מכיוון שהקובץ manifest.inc.php חסר.", + "WarningFileIntegrityNoManifestDeployingFromGit": "אם אתם מפעילים את פיוויק מתוך GIT, אז ההודעה הזו רגילה.", "WarningFileIntegrityNoMd5file": "לא ניתן לבצע בדיקת תקינות קבצים מכיוון שהפונקציה md5_file() חסרה.", "WarningPasswordStored": "%1$sאזהרה:%2$s הסיסמה תאוכסן בקובץ ההגדרות וחושפת לכל כיצד להתחבר.", "Website": "אתר", "Weekly": "שבועי", "WeeklyReport": "שבועי", "WeeklyReports": "דוחות שבועיים", + "WellDone": "כל הכבוד!", "Widgets": "ווידג'טים", + "Widget": "ווידג'ט", + "XComparedToY": "%1$s בהשוואה ל-%2$s", + "XFromY": "%1$s מתוך %2$s", "YearlyReport": "שנתי", "YearlyReports": "דוחות שנתיים", "YearsDays": "%1$s שנים ו-%2$s ימים", "Yes": "כן", + "YouAreCurrentlyUsing": "אתה משתמש כעת בפיוויק %s.", + "YouAreViewingDemoShortMessage": "אתם צופים בהדגמה של פיוויק", "YouMustBeLoggedIn": "חובה להתחבר למערכת בכדי לבצע פעולה זו.", "YourChangesHaveBeenSaved": "השינויים נשמרו." }, @@ -240,10 +428,52 @@ "HowtoDeleteAnAccount": "לחץ לחיצה ארוכה כדי להסיר את החשבון", "HowtoDeleteAnAccountOniOS": "גרור שמאלה כדי למחוק את החשבון", "HowtoLoginAnonymous": "השאר את שם המשתמש והסיסמא ריקים כדי להתחבר אנונימית", - "NavigationBack": "חזרה" + "HttpTimeout": "HTTP Timeout", + "IncompatiblePiwikVersion": "גירסת הפיוויק שבשימושך אינה תואמת לפיוויק מובייל 2. שדרגו את התקנת הפיוויק שלכם ונסו שוב או התקינו את פיוויק מובייל 1.", + "LastUpdated": "עדכון אחרון: %s", + "LoadingReport": "טוען %s", + "LoginCredentials": "אישורים", + "LoginToPiwikToChangeSettings": "היכנסו לשרת הפיוויק שלכם על מנת ליצור ולעדכן אתרים ומשתמשים או על מנת לשנות הגדרות כלליות כגון איזה דוח ייטען כברירת מחדל.", + "LoginUseHttps": "השתמשו ב-https", + "MultiChartLabel": "הצג מיקרו-גרפים (sparklines)", + "NavigationBack": "חזרה", + "NetworkError": "שגיאת רשת", + "NetworkErrorWithStatusCodeShort": "שגיאת רשת %s", + "NetworkNotReachable": "לא ניתן ליצור קשר עם הרשת", + "NoAccountIsSelected": "עליך לבחור חשבון. הוסיפו חשבון חדש עם טרם הגדרתם חשבון.", + "NoDataShort": "אין נתונים", + "NoPiwikAccount": "אין לכם חשבון פיוויק?", + "NoReportsShort": "אין דוחות", + "NoVisitorFound": "לא נמצא מבקר", + "NoVisitorsShort": "אין מבקרים", + "NoWebsiteFound": "לא נמצא אתר", + "NoWebsitesShort": "אין אתרים", + "PullDownToRefresh": "משכו למטה לריענון...", + "PossibleSslError": "ייתכן שיש שגיאה בתעודת ה-SSL", + "IgnoreSslError": "התעלם משגיאת SSL", + "RatingDontRemindMe": "אל תזכיר לי", + "RatingNotNow": "לא כעת", + "RatingNow": "בסדר, אני אתן עכשין הערכה.", + "ReleaseToRefresh": "שחררו על מנת לרענן...", + "Reloading": "טוען מחדש...", + "RequestTimedOutShort": "Network Timeout Error", + "RestrictedCompatibility": "תאימות מוגבלת", + "SaveSuccessError": "כתובת פיוויק או שם משתמש וסיסמה שגויים.", + "SearchWebsite": "חפש באתרים", + "ShowAll": "הצג הכל", + "ShowLess": "הצג פחות", + "StaticGraph": "סקירה כללית של גרף", + "TopVisitedWebsites": "האתרים שקיבלו את מירב הביקורים", + "TryIt": "נסו את זה!", + "UseSearchBarHint": "רק %s האתרים הראשונים מוצגים כאן. נא השתמשו בתיבת החיפוש על מנת להציג את יתר האתרים שלך.", + "VerifyAccount": "מאמת את החשבון", + "ValidateSslCertificate": "בדוק תוקף תעודת ה-SSL", + "VerifyLoginData": "וודאו ששילוב שם המשתמש והסיסמה נכונים.", + "YouAreOffline": "סליחה, אבל אתם כרגע לא מקוונים" }, "RowEvolution": { "AvailableMetrics": "מדדים זמינים", + "CompareDocumentation": "הקלקו על הקישור להלן ותפתחו את החלון הקופץ הזה לקבלת שורה נוספת מאותה טבלה על מנת להשוות רשומות מרובות.<br \/>השתמשו ב-shift-click על מנת לסמן את השורה לצורך השוואה מבלי לפתוח חלון קופץ זה.", "CompareRows": "השווה תוצאות", "ComparingRecords": "משווה %s שורות", "Documentation": "לחץ על המדדים כדי להציגם בגרף התקדמות. השתמש בלחיצה על המדדים עם המקש shift כדי להציג מספר מדדים ביחד.", diff --git a/lang/sv.json b/lang/sv.json index d75ebfe627..8de5a64968 100644 --- a/lang/sv.json +++ b/lang/sv.json @@ -134,12 +134,15 @@ "Edit": "Redigera", "EncryptedSmtpTransport": "Ange kryptering för transportlagret som krävs för din SMTP-server.", "Error": "Fel", + "Errors": "Fel", "ErrorRequest": "Hoppsan! Ett fel inträffade. Detta kan ha orsakats av ett temporärt serverfel, eller också innehöll rapporten du försökte skapa för mycket data. Vänligen försök igen. Återupprepas felet så %1$skontakta din Piwik-administratör%2$s för hjälp.", "EvolutionOverPeriod": "Utveckling under perioden", "EvolutionSummaryGeneric": "%1$s i %2$s jämfört med %3$s i %4$s. Utveckling: %5$s", "ExceptionContactSupportGeneric": "Om detta fel består, %1$skontakta din Piwikadministratör%2$s för hjälp.", "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Den här användaren måste vara antingen Superanvändaren eller '%s' användaren.", "ExceptionConfigurationFileNotFound": "Konfigurationsfilen {%s} hittades inte.", + "ExceptionConfigurationFileExistsButNotReadable": "Konfigurationsfilen %s verkar finnas men Piwik kunde inte läsa in den.", + "ExceptionConfigurationFilePleaseCheckReadableByUser": "Kontrollera så att %1$s är läsbar av användare '%2$s'.", "ExceptionDatabaseVersion": "Din %1$s version är %2$s men Piwik kräver åtminstone %3$s.", "ExceptionDatabaseVersionNewerThanCodebase": "Din Piwikinstallation använder den gamla versionen %1$s och vi har upptäckt att din Piwikdatabas redan har uppdaterats till den nyare versionen %2$s.", "ExceptionDatabaseVersionNewerThanCodebaseWait": "Det är möjligt att din Piwikadministratör håller på att uppdatera systemet. Försök igen om några minuter.", @@ -180,6 +183,7 @@ "Forums": "Forum", "FromReferrer": "från", "GeneralInformation": "Allmän information", + "GeneralSettings": "Allmänna inställningar", "GetStarted": "Kom igång", "GiveUsYourFeedback": "Lämna din feedback!", "Goal": "Mål", @@ -285,6 +289,7 @@ "Piechart": "Cirkeldiagram", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s finns tillgänglig. Vänligen informera din %2$sPiwik administratör%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s är tillgänglig. %2$sVänligen uppdatera nu!%3$s (se %4$sförändringar%5$s).", + "PleaseContactYourPiwikAdministrator": "Kontakta din Piwikadministratör", "PleaseSpecifyValue": "Var vänlig och ange ett värde för '%s'.", "PleaseUpdatePiwik": "Var vänlig och uppdatera Piwik", "Plugin": "Plugin", @@ -389,8 +394,12 @@ "VisitType": "Besökstyp", "VisitTypeExample": "Till exempel, för att markera alla besökare som har återvänt till webbplatsen, inklusive de som har köpt något i sina tidigare besök, så skulle API-begäran innehålla %s", "Warning": "Varning", + "Warnings": "Varningar", "WarningPhpVersionXIsTooOld": "Den version av PHP du använder, %s, har nått End of Life (EOL). Du bör uppgradera till en aktuell version eftersom den nuvarande versionen kan innehålla säkerhetsluckor och buggar som har fixats i en senare version av PHP.", "WarningPiwikWillStopSupportingPHPVersion": "Piwik kommer sluta stödja PHP %1$s i nästa major-version. Uppdatera PHP på din server till åtminstone PHP %2$s innan det är för sent.", + "YouMustUpgradePhpVersionToReceiveLatestPiwik": "Du måste uppgradera din PHP-version för att kunna använda den senaste Piwikversionen.", + "PiwikCannotBeUpgradedBecausePhpIsTooOld": "Piwik kan inte uppdateras till den senaste versionen för din PHP-version är för gammal.", + "PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "Uppgradera PHP till åtminstone PHP %s så att dina data är säkrade.", "WarningFileIntegrityNoManifest": "Filintegriteten kunde inte kontrolleras eftersom att filen manifest.inc.php saknades.", "WarningFileIntegrityNoManifestDeployingFromGit": "Om du utvecklar Piwik från Git, är det här meddelandet normalt.", "WarningFileIntegrityNoMd5file": "Filintegriteten kunde inte slutföras eftersom att funktionen md5_file() saknas.", diff --git a/lang/zh-tw.json b/lang/zh-tw.json index ddb87cff70..479143746f 100644 --- a/lang/zh-tw.json +++ b/lang/zh-tw.json @@ -1,5 +1,7 @@ { "General": { + "12HourClock": "12 小時制", + "24HourClock": "24 小時制", "AboutPiwikX": "關於 Piwik %s", "Action": "動作", "Actions": "進站活動", diff --git a/misc/log-analytics b/misc/log-analytics -Subproject 4bdb19479cae3e796d151a30edd031338f7d8d7 +Subproject 26049b008b2ce3cbb9e7179a94033db5475ad69 @@ -53,20 +53,20 @@ if(cH&&cH.name===cG.name&&cH.piece===cG.piece&&cH.target===cG.target){return tru var cK;if(cG){cK=cG.target||cG.srcElement}if(!cK){cK=cF}if(!aT(cJ,cK)){return}bP(bj);if(W.isLinkElement(cF)&&W.hasNodeAttributeWithValue(cF,"href")&&W.hasNodeAttributeWithValue(cF,r.CONTENT_TARGET_ATTR)){var cH=W.getAttributeValueFromNode(cF,"href");if(!aE(cH)&&cF.wasContentTargetAttrReplaced){W.setAnyAttribute(cF,r.CONTENT_TARGET_ATTR,"")}}var cO=cz(cF);if(ag&&cO&&cO.type){return cO.type}if(bf(cJ)){return"href"}var cL=r.buildContentBlock(cJ);if(!cL){return}var cI=cL.name;var cP=cL.piece;var cN=cL.target;var cM=az("click",cI,cP,cN);bg(cM,bj);return cM}}function bA(cH){if(!cH||!cH.length){return}var cF,cG;for(cF=0;cF<cH.length;cF++){cG=r.findTargetNode(cH[cF]);if(cG&&!cG.contentInteractionTrackingSetupDone){cG.contentInteractionTrackingSetupDone=true;ae(cG,"click",aI(cG))}}}function ba(cH,cI){if(!cH||!cH.length){return[]}var cF,cG;for(cF=0;cF<cH.length;cF++){if(aG(cH[cF])){cH.splice(cF,1);cF--}else{bJ.push(cH[cF])}}if(!cH||!cH.length){return[]}ax(cI);bA(cI);var cJ=[];for(cF=0;cF<cH.length; cF++){cG=b0(r.buildImpressionRequestParams(cH[cF].name,cH[cF].piece,cH[cF].target),undefined,"contentImpressions");if(cG){cJ.push(cG)}}return cJ}function b6(cG){var cF=r.collectContent(cG);return ba(cF,cG)}function aR(cG){if(!cG||!cG.length){return[]}var cF;for(cF=0;cF<cG.length;cF++){if(!r.isNodeVisible(cG[cF])){cG.splice(cF,1);cF--}}if(!cG||!cG.length){return[]}return b6(cG)}function ar(cH,cF,cG){var cI=r.buildImpressionRequestParams(cH,cF,cG);return b0(cI,null,"contentImpression")}function cA(cI,cG){if(!cI){return}var cF=r.findParentContentNode(cI);var cH=r.buildContentBlock(cF);if(!cH){return}if(!cG){cG="Unknown"}return az(cG,cH.name,cH.piece,cH.target)}function ch(cG,cI,cF,cH){return"e_c="+p(cG)+"&e_a="+p(cI)+(D(cF)?"&e_n="+p(cF):"")+(D(cH)?"&e_v="+p(cH):"")}function ak(cH,cJ,cF,cI,cL,cK){if(String(cH).length===0||String(cJ).length===0){return false}var cG=b0(ch(cH,cJ,cF,cI),cL,"event");bg(cG,bj,cK)}function bI(cF,cI,cG,cJ){var cH=b0("search="+p(cF)+(cI?"&search_cat="+p(cI):"")+(D(cG)?"&search_count="+cG:""),cJ,"sitesearch"); bg(cH,bj)}function cl(cF,cI,cH){var cG=b0("idgoal="+cF+(cI?"&revenue="+cI:""),cH,"goal");bg(cG,bj)}function cs(cI,cF,cM,cL,cH){var cK=cF+"="+p(bB(cI));var cG=b2(cH,"click",cI);if(cG){cK+="&"+cG}var cJ=b0(cK,cM,"link");bg(cJ,bj,cL)}function bs(cG,cF){if(cG!==""){return cG+cF.charAt(0).toUpperCase()+cF.slice(1)}return cF}function bQ(cK){var cJ,cF,cI=["","webkit","ms","moz"],cH;if(!aV){for(cF=0;cF<cI.length;cF++){cH=cI[cF];if(Object.prototype.hasOwnProperty.call(A,bs(cH,"hidden"))){if(A[bs(cH,"visibilityState")]==="prerender"){cJ=true}break}}}if(cJ){ae(A,cH+"visibilitychange",function cG(){A.removeEventListener(cH+"visibilitychange",cG,false);cK()});return}cK()}function cc(cF){var cG=cz(cF);if(cG&&cG.type){cG.href=l(cG.href);cs(cG.href,cG.type,undefined,null,cF)}}function b4(){return A.all&&!A.addEventListener}function cn(cF){var cH=cF.which;var cG=(typeof cF.button);if(!cH&&cG!=="undefined"){if(b4()){if(cF.button&1){cH=1}else{if(cF.button&2){cH=3}else{if(cF.button&4){cH=2}}}}else{if(cF.button===0||cF.button==="0"){cH=1 -}else{if(cF.button&1){cH=2}else{if(cF.button&2){cH=3}}}}}return cH}function bt(cF){switch(cn(cF)){case 1:return"left";case 2:return"middle";case 3:return"right"}}function aK(cF){return cF.target||cF.srcElement}function an(cF){return function(cI){cI=cI||N.event;var cH=bt(cI);var cJ=aK(cI);if(cI.type==="click"){var cG=false;if(cF&&cH==="middle"){cG=true}if(cJ&&!cG){cc(cJ)}}else{if(cI.type==="mousedown"){if(cH==="middle"&&cJ){aB=cH;bd=cJ}else{aB=bd=null}}else{if(cI.type==="mouseup"){if(cH===aB&&cJ===bd){cc(cJ)}aB=bd=null}else{if(cI.type==="contextmenu"){cc(cJ)}}}}}}function ah(cG,cF){ae(cG,"click",an(cF),false);if(cF){ae(cG,"mouseup",an(cF),false);ae(cG,"mousedown",an(cF),false);ae(cG,"contextmenu",an(cF),false)}}function be(cG){if(!ag){ag=true;var cH,cF=aJ(bc,"ignore"),cI=A.links;if(cI){for(cH=0;cH<cI.length;cH++){if(!cF.test(cI[cH].className)){ah(cI[cH],cG)}}}}}function aC(cH,cJ,cK){if(bO){return true}bO=true;var cL=false;var cI,cG;function cF(){cL=true}j(function(){function cM(cO){setTimeout(function(){if(!bO){return -}cL=false;cK.trackVisibleContentImpressions();cM(cO)},cO)}function cN(cO){setTimeout(function(){if(!bO){return}if(cL){cL=false;cK.trackVisibleContentImpressions()}cN(cO)},cO)}if(cH){cI=["scroll","resize"];for(cG=0;cG<cI.length;cG++){if(A.addEventListener){A.addEventListener(cI[cG],cF)}else{N.attachEvent("on"+cI[cG],cF)}}cN(100)}if(cJ&&cJ>0){cJ=parseInt(cJ,10);cM(cJ)}})}function ca(){var cG,cI,cJ={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"};if(!((new RegExp("MSIE")).test(f.userAgent))){if(f.mimeTypes&&f.mimeTypes.length){for(cG in cJ){if(Object.prototype.hasOwnProperty.call(cJ,cG)){cI=f.mimeTypes[cJ[cG]];cw[cG]=(cI&&cI.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&D(f.javaEnabled)&&f.javaEnabled()){cw.java="1"}if(v(N.GearsFactory)){cw.gears="1" -}cw.cookie=bE()}var cH=parseInt(R.width,10);var cF=parseInt(R.height,10);cw.res=parseInt(cH,10)+"x"+parseInt(cF,10)}ca();aX();aw();this.getVisitorId=function(){return aH().uuid};this.getVisitorInfo=function(){return cg()};this.getAttributionInfo=function(){return bm()};this.getAttributionCampaignName=function(){return bm()[0]};this.getAttributionCampaignKeyword=function(){return bm()[1]};this.getAttributionReferrerTimestamp=function(){return bm()[2]};this.getAttributionReferrerUrl=function(){return bm()[3]};this.setTrackerUrl=function(cF){ap=cF};this.getTrackerUrl=function(){return ap};this.addTracker=function(cF,cH){if(!cH){throw new Error("A siteId must be given to add a new tracker")}if(!D(cF)||null===cF){cF=this.getTrackerUrl()}var cG=new K(cF,cH);C.push(cG);return cG};this.getSiteId=function(){return bF};this.setSiteId=function(cF){bC(cF)};this.setUserId=function(cF){if(!D(cF)||!cF.length){return}bb=cF;bo=bG(bb).substr(0,16)};this.getUserId=function(){return bb};this.setCustomData=function(cF,cG){if(Q(cF)){af=cF -}else{if(!af){af={}}af[cF]=cG}};this.getCustomData=function(){return af};this.setCustomRequestProcessing=function(cF){bK=cF};this.appendToTrackingUrl=function(cF){cq=cF};this.getRequest=function(cF){return b0(cF)};this.addPlugin=function(cF,cG){a[cF]=cG};this.setCustomDimension=function(cF,cG){cF=parseInt(cF,10);if(cF>0){if(!D(cG)){cG=""}if(!s(cG)){cG=String(cG)}a1[cF]=cG}};this.getCustomDimension=function(cF){cF=parseInt(cF,10);if(cF>0&&Object.prototype.hasOwnProperty.call(a1,cF)){return a1[cF]}};this.deleteCustomDimension=function(cF){cF=parseInt(cF,10);if(cF>0){delete a1[cF]}};this.setCustomVariable=function(cG,cF,cJ,cH){var cI;if(!D(cH)){cH="visit"}if(!D(cF)){return}if(!D(cJ)){cJ=""}if(cG>0){cF=!s(cF)?String(cF):cF;cJ=!s(cJ)?String(cJ):cJ;cI=[cF.slice(0,a7),cJ.slice(0,a7)];if(cH==="visit"||cH===2){b9();aA[cG]=cI}else{if(cH==="page"||cH===3){bv[cG]=cI}else{if(cH==="event"){bU[cG]=cI}}}}};this.getCustomVariable=function(cG,cH){var cF;if(!D(cH)){cH="visit"}if(cH==="page"||cH===3){cF=bv[cG] -}else{if(cH==="event"){cF=bU[cG]}else{if(cH==="visit"||cH===2){b9();cF=aA[cG]}}}if(!D(cF)||(cF&&cF[0]==="")){return false}return cF};this.deleteCustomVariable=function(cF,cG){if(this.getCustomVariable(cF,cG)){this.setCustomVariable(cF,"","",cG)}};this.storeCustomVariablesInCookie=function(){bq=true};this.setLinkTrackingTimer=function(cF){bj=cF};this.setDownloadExtensions=function(cF){if(s(cF)){cF=cF.split("|")}cv=cF};this.addDownloadExtensions=function(cG){var cF;if(s(cG)){cG=cG.split("|")}for(cF=0;cF<cG.length;cF++){cv.push(cG[cF])}};this.removeDownloadExtensions=function(cH){var cG,cF=[];if(s(cH)){cH=cH.split("|")}for(cG=0;cG<cv.length;cG++){if(G(cH,cv[cG])===-1){cF.push(cv[cG])}}cv=cF};this.setDomains=function(cF){al=s(cF)?[cF]:cF;var cJ=false,cH=0,cG;for(cH;cH<al.length;cH++){cG=String(al[cH]);if(cb(cm,F(cG))){cJ=true;break}var cI=bT(cG);if(cI&&cI!=="/"&&cI!=="/*"){cJ=true;break}}if(!cJ){al.push(cm)}};this.setIgnoreClasses=function(cF){bc=s(cF)?[cF]:cF};this.setRequestMethod=function(cF){cy=cF||bR -};this.setRequestContentType=function(cF){b3=cF||au};this.setReferrerUrl=function(cF){a2=cF};this.setCustomUrl=function(cF){aN=bu(bn,cF)};this.setDocumentTitle=function(cF){aY=cF};this.setAPIUrl=function(cF){bi=cF};this.setDownloadClasses=function(cF){bl=s(cF)?[cF]:cF};this.setLinkClasses=function(cF){aQ=s(cF)?[cF]:cF};this.setCampaignNameKey=function(cF){bZ=s(cF)?[cF]:cF};this.setCampaignKeywordKey=function(cF){bh=s(cF)?[cF]:cF};this.discardHashTag=function(cF){bp=cF};this.setCookieNamePrefix=function(cF){aZ=cF;aA=bw()};this.setCookieDomain=function(cF){var cG=F(cF);if(a9(cG)){co=cG;aX()}};this.setCookiePath=function(cF){a4=cF;aX()};this.setVisitorCookieTimeout=function(cF){ce=cF*1000};this.setSessionCookieTimeout=function(cF){bX=cF*1000};this.setReferralCookieTimeout=function(cF){cu=cF*1000};this.setConversionAttributionFirstReferrer=function(cF){a8=cF};this.disableCookies=function(){a0=true;cw.cookie="0";if(bF){aq()}};this.deleteCookies=function(){aq()};this.setDoNotTrack=function(cG){var cF=f.doNotTrack||f.msDoNotTrack; -ci=cG&&(cF==="yes"||cF==="1");if(ci){this.disableCookies()}};this.addListener=function(cG,cF){ah(cG,cF)};this.enableLinkTracking=function(cF){cx=true;bQ(function(){m(function(){be(cF)})})};this.enableJSErrorTracking=function(){if(ck){return}ck=true;var cF=N.onerror;N.onerror=function(cK,cI,cH,cJ,cG){bQ(function(){var cL="JavaScript Errors";var cM=cI+":"+cH;if(cJ){cM+=":"+cJ}ak(cL,cM,cK)});if(cF){return cF(cK,cI,cH,cJ,cG)}return false}};this.disablePerformanceTracking=function(){aL=false};this.setGenerationTimeMs=function(cF){bV=parseInt(cF,10)};this.enableHeartBeatTimer=function(cF){cF=Math.max(cF,1);aO=(cF||15)*1000;if(cp!==null){cD()}};this.disableHeartBeatTimer=function(){bk();if(aO||ay){if(N.removeEventListener){N.removeEventListener("focus",aS,true);N.removeEventListener("blur",am,true)}else{if(N.detachEvent){N.detachEvent("onfocus",aS);N.detachEvent("onblur",am)}}}aO=null;ay=false};this.killFrame=function(){if(N.location!==N.top.location){N.top.location=N.location}};this.redirectFile=function(cF){if(N.location.protocol==="file:"){N.location=cF -}};this.setCountPreRendered=function(cF){aV=cF};this.trackGoal=function(cF,cH,cG){bQ(function(){cl(cF,cH,cG)})};this.trackLink=function(cG,cF,cI,cH){bQ(function(){cs(cG,cF,cI,cH)})};this.trackPageView=function(cF,cH,cG){bJ=[];if(H(bF)){bQ(function(){S(ap,bi,bF)})}else{bQ(function(){bz(cF,cH,cG)})}};this.trackAllContentImpressions=function(){if(H(bF)){return}bQ(function(){m(function(){var cF=r.findContentNodes();var cG=b6(cF);cC(cG,bj)})})};this.trackVisibleContentImpressions=function(cF,cG){if(H(bF)){return}if(!D(cF)){cF=true}if(!D(cG)){cG=750}aC(cF,cG,this);bQ(function(){j(function(){var cH=r.findContentNodes();var cI=aR(cH);cC(cI,bj)})})};this.trackContentImpression=function(cH,cF,cG){if(H(bF)){return}if(!cH){return}cF=cF||"Unknown";bQ(function(){var cI=ar(cH,cF,cG);bg(cI,bj)})};this.trackContentImpressionsWithinNode=function(cF){if(H(bF)||!cF){return}bQ(function(){if(bO){j(function(){var cG=r.findContentNodesWithinNode(cF);var cH=aR(cG);cC(cH,bj)})}else{m(function(){var cG=r.findContentNodesWithinNode(cF); -var cH=b6(cG);cC(cH,bj)})}})};this.trackContentInteraction=function(cH,cI,cF,cG){if(H(bF)){return}if(!cH||!cI){return}cF=cF||"Unknown";bQ(function(){var cJ=az(cH,cI,cF,cG);bg(cJ,bj)})};this.trackContentInteractionNode=function(cG,cF){if(H(bF)||!cG){return}bQ(function(){var cH=cA(cG,cF);bg(cH,bj)})};this.logAllContentBlocksOnPage=function(){var cG=r.findContentNodes();var cF=r.collectContent(cG);if(console!==undefined&&console&&console.log){console.log(cF)}};this.trackEvent=function(cG,cI,cF,cH,cK,cJ){bQ(function(){ak(cG,cI,cF,cH,cK,cJ)})};this.trackSiteSearch=function(cF,cH,cG,cI){bQ(function(){bI(cF,cH,cG,cI)})};this.setEcommerceView=function(cI,cF,cH,cG){if(!D(cH)||!cH.length){cH=""}else{if(cH instanceof Array){cH=JSON2.stringify(cH)}}bv[5]=["_pkc",cH];if(D(cG)&&String(cG).length){bv[2]=["_pkp",cG]}if((!D(cI)||!cI.length)&&(!D(cF)||!cF.length)){return}if(D(cI)&&cI.length){bv[3]=["_pks",cI]}if(!D(cF)||!cF.length){cF=""}bv[4]=["_pkn",cF]};this.addEcommerceItem=function(cJ,cF,cH,cG,cI){if(cJ.length){cr[cJ]=[cJ,cF,cH,cG,cI] -}};this.trackEcommerceOrder=function(cF,cJ,cI,cH,cG,cK){by(cF,cJ,cI,cH,cG,cK)};this.trackEcommerceCartUpdate=function(cF){a6(cF)};this.trackRequest=function(cF,cH,cG){bQ(function(){var cI=b0(cF,cH);bg(cI,bj,cG)})};d.trigger("TrackerSetup",[this])}function B(){return{push:X}}function b(ak,aj){var al={};var ah,ai;for(ah=0;ah<aj.length;ah++){var af=aj[ah];al[af]=1;for(ai=0;ai<ak.length;ai++){if(ak[ai]&&ak[ai][0]){var ag=ak[ai][0];if(af===ag){X(ak[ai]);delete ak[ai];if(al[ag]>1){ab("The method "+ag+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: http://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')}al[ag]++}}}}return ak}var x=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","enableLinkTracking"];function V(af,ah){var ag=new K(af,ah);C.push(ag);_paq=b(_paq,x);for(z=0;z<_paq.length; -z++){if(_paq[z]){X(_paq[z])}}_paq=new B();return ag}ae(N,"beforeunload",Z,false);Date.prototype.getTimeAlias=Date.prototype.getTime;d={initialized:false,DOM:{addEventListener:function(ai,ah,ag,af){var aj=typeof af;if(aj==="undefined"){af=false}ae(ai,ah,ag,af)},onLoad:j,onReady:m},on:function(ag,af){if(!t[ag]){t[ag]=[]}t[ag].push(af)},off:function(ah,ag){if(!t[ah]){return}var af=0;for(af;af<t[ah].length;af++){if(t[ah][af]===ag){t[ah].splice(af,1)}}},trigger:function(ah,ai,ag){if(!t[ah]){return}var af=0;for(af;af<t[ah].length;af++){t[ah][af].apply(ag||N,ai)}},addPlugin:function(af,ag){a[af]=ag},getTracker:function(af,ag){if(!D(ag)){ag=this.getAsyncTracker().getSiteId()}if(!D(af)){af=this.getAsyncTracker().getTrackerUrl()}return new K(af,ag)},getAsyncTrackers:function(){return C},addTracker:function(af,ag){if(!C.length){V(af,ag)}else{C[0].addTracker(af,ag)}},getAsyncTracker:function(ag,aj){var ai;if(C&&C.length&&C[0]){ai=C[0]}else{return V(ag,aj)}if(!aj&&!ag){return ai}if((!D(aj)||null===aj)&&ai){aj=ai.getSiteId() -}if((!D(ag)||null===ag)&&ai){ag=ai.getTrackerUrl()}var ah,af=0;for(af;af<C.length;af++){ah=C[af];if(ah&&String(ah.getSiteId())===String(aj)&&ah.getTrackerUrl()===ag){return ah}}},retryMissedPluginCalls:function(){var ag=Y;Y=[];var af=0;for(af;af<ag.length;af++){X(ag[af])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return d})}return d}()); +}else{if(cF.button&1){cH=2}else{if(cF.button&2){cH=3}}}}}return cH}function bt(cF){switch(cn(cF)){case 1:return"left";case 2:return"middle";case 3:return"right"}}function aK(cF){return cF.target||cF.srcElement}function an(cF){return function(cI){cI=cI||N.event;var cH=bt(cI);var cJ=aK(cI);if(cI.type==="click"){var cG=false;if(cF&&cH==="middle"){cG=true}if(cJ&&!cG){cc(cJ)}}else{if(cI.type==="mousedown"){if(cH==="middle"&&cJ){aB=cH;bd=cJ}else{aB=bd=null}}else{if(cI.type==="mouseup"){if(cH===aB&&cJ===bd){cc(cJ)}aB=bd=null}else{if(cI.type==="contextmenu"){cc(cJ)}}}}}}function ah(cH,cG){var cF=typeof cG;if(cF==="undefined"){cG=true}ae(cH,"click",an(cG),false);if(cG){ae(cH,"mouseup",an(cG),false);ae(cH,"mousedown",an(cG),false);ae(cH,"contextmenu",an(cG),false)}}function be(cG){if(!ag){ag=true;var cH,cF=aJ(bc,"ignore"),cI=A.links;if(cI){for(cH=0;cH<cI.length;cH++){if(!cF.test(cI[cH].className)){ah(cI[cH],cG)}}}}}function aC(cH,cJ,cK){if(bO){return true}bO=true;var cL=false;var cI,cG;function cF(){cL=true +}j(function(){function cM(cO){setTimeout(function(){if(!bO){return}cL=false;cK.trackVisibleContentImpressions();cM(cO)},cO)}function cN(cO){setTimeout(function(){if(!bO){return}if(cL){cL=false;cK.trackVisibleContentImpressions()}cN(cO)},cO)}if(cH){cI=["scroll","resize"];for(cG=0;cG<cI.length;cG++){if(A.addEventListener){A.addEventListener(cI[cG],cF)}else{N.attachEvent("on"+cI[cG],cF)}}cN(100)}if(cJ&&cJ>0){cJ=parseInt(cJ,10);cM(cJ)}})}function ca(){var cG,cI,cJ={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"};if(!((new RegExp("MSIE")).test(f.userAgent))){if(f.mimeTypes&&f.mimeTypes.length){for(cG in cJ){if(Object.prototype.hasOwnProperty.call(cJ,cG)){cI=f.mimeTypes[cJ[cG]];cw[cG]=(cI&&cI.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&D(f.javaEnabled)&&f.javaEnabled()){cw.java="1" +}if(v(N.GearsFactory)){cw.gears="1"}cw.cookie=bE()}var cH=parseInt(R.width,10);var cF=parseInt(R.height,10);cw.res=parseInt(cH,10)+"x"+parseInt(cF,10)}ca();aX();aw();this.getVisitorId=function(){return aH().uuid};this.getVisitorInfo=function(){return cg()};this.getAttributionInfo=function(){return bm()};this.getAttributionCampaignName=function(){return bm()[0]};this.getAttributionCampaignKeyword=function(){return bm()[1]};this.getAttributionReferrerTimestamp=function(){return bm()[2]};this.getAttributionReferrerUrl=function(){return bm()[3]};this.setTrackerUrl=function(cF){ap=cF};this.getTrackerUrl=function(){return ap};this.addTracker=function(cF,cH){if(!cH){throw new Error("A siteId must be given to add a new tracker")}if(!D(cF)||null===cF){cF=this.getTrackerUrl()}var cG=new K(cF,cH);C.push(cG);return cG};this.getSiteId=function(){return bF};this.setSiteId=function(cF){bC(cF)};this.setUserId=function(cF){if(!D(cF)||!cF.length){return}bb=cF;bo=bG(bb).substr(0,16)};this.getUserId=function(){return bb +};this.setCustomData=function(cF,cG){if(Q(cF)){af=cF}else{if(!af){af={}}af[cF]=cG}};this.getCustomData=function(){return af};this.setCustomRequestProcessing=function(cF){bK=cF};this.appendToTrackingUrl=function(cF){cq=cF};this.getRequest=function(cF){return b0(cF)};this.addPlugin=function(cF,cG){a[cF]=cG};this.setCustomDimension=function(cF,cG){cF=parseInt(cF,10);if(cF>0){if(!D(cG)){cG=""}if(!s(cG)){cG=String(cG)}a1[cF]=cG}};this.getCustomDimension=function(cF){cF=parseInt(cF,10);if(cF>0&&Object.prototype.hasOwnProperty.call(a1,cF)){return a1[cF]}};this.deleteCustomDimension=function(cF){cF=parseInt(cF,10);if(cF>0){delete a1[cF]}};this.setCustomVariable=function(cG,cF,cJ,cH){var cI;if(!D(cH)){cH="visit"}if(!D(cF)){return}if(!D(cJ)){cJ=""}if(cG>0){cF=!s(cF)?String(cF):cF;cJ=!s(cJ)?String(cJ):cJ;cI=[cF.slice(0,a7),cJ.slice(0,a7)];if(cH==="visit"||cH===2){b9();aA[cG]=cI}else{if(cH==="page"||cH===3){bv[cG]=cI}else{if(cH==="event"){bU[cG]=cI}}}}};this.getCustomVariable=function(cG,cH){var cF; +if(!D(cH)){cH="visit"}if(cH==="page"||cH===3){cF=bv[cG]}else{if(cH==="event"){cF=bU[cG]}else{if(cH==="visit"||cH===2){b9();cF=aA[cG]}}}if(!D(cF)||(cF&&cF[0]==="")){return false}return cF};this.deleteCustomVariable=function(cF,cG){if(this.getCustomVariable(cF,cG)){this.setCustomVariable(cF,"","",cG)}};this.storeCustomVariablesInCookie=function(){bq=true};this.setLinkTrackingTimer=function(cF){bj=cF};this.setDownloadExtensions=function(cF){if(s(cF)){cF=cF.split("|")}cv=cF};this.addDownloadExtensions=function(cG){var cF;if(s(cG)){cG=cG.split("|")}for(cF=0;cF<cG.length;cF++){cv.push(cG[cF])}};this.removeDownloadExtensions=function(cH){var cG,cF=[];if(s(cH)){cH=cH.split("|")}for(cG=0;cG<cv.length;cG++){if(G(cH,cv[cG])===-1){cF.push(cv[cG])}}cv=cF};this.setDomains=function(cF){al=s(cF)?[cF]:cF;var cJ=false,cH=0,cG;for(cH;cH<al.length;cH++){cG=String(al[cH]);if(cb(cm,F(cG))){cJ=true;break}var cI=bT(cG);if(cI&&cI!=="/"&&cI!=="/*"){cJ=true;break}}if(!cJ){al.push(cm)}};this.setIgnoreClasses=function(cF){bc=s(cF)?[cF]:cF +};this.setRequestMethod=function(cF){cy=cF||bR};this.setRequestContentType=function(cF){b3=cF||au};this.setReferrerUrl=function(cF){a2=cF};this.setCustomUrl=function(cF){aN=bu(bn,cF)};this.setDocumentTitle=function(cF){aY=cF};this.setAPIUrl=function(cF){bi=cF};this.setDownloadClasses=function(cF){bl=s(cF)?[cF]:cF};this.setLinkClasses=function(cF){aQ=s(cF)?[cF]:cF};this.setCampaignNameKey=function(cF){bZ=s(cF)?[cF]:cF};this.setCampaignKeywordKey=function(cF){bh=s(cF)?[cF]:cF};this.discardHashTag=function(cF){bp=cF};this.setCookieNamePrefix=function(cF){aZ=cF;aA=bw()};this.setCookieDomain=function(cF){var cG=F(cF);if(a9(cG)){co=cG;aX()}};this.setCookiePath=function(cF){a4=cF;aX()};this.setVisitorCookieTimeout=function(cF){ce=cF*1000};this.setSessionCookieTimeout=function(cF){bX=cF*1000};this.setReferralCookieTimeout=function(cF){cu=cF*1000};this.setConversionAttributionFirstReferrer=function(cF){a8=cF};this.disableCookies=function(){a0=true;cw.cookie="0";if(bF){aq()}};this.deleteCookies=function(){aq() +};this.setDoNotTrack=function(cG){var cF=f.doNotTrack||f.msDoNotTrack;ci=cG&&(cF==="yes"||cF==="1");if(ci){this.disableCookies()}};this.addListener=function(cG,cF){ah(cG,cF)};this.enableLinkTracking=function(cF){cx=true;bQ(function(){m(function(){be(cF)})})};this.enableJSErrorTracking=function(){if(ck){return}ck=true;var cF=N.onerror;N.onerror=function(cK,cI,cH,cJ,cG){bQ(function(){var cL="JavaScript Errors";var cM=cI+":"+cH;if(cJ){cM+=":"+cJ}ak(cL,cM,cK)});if(cF){return cF(cK,cI,cH,cJ,cG)}return false}};this.disablePerformanceTracking=function(){aL=false};this.setGenerationTimeMs=function(cF){bV=parseInt(cF,10)};this.enableHeartBeatTimer=function(cF){cF=Math.max(cF,1);aO=(cF||15)*1000;if(cp!==null){cD()}};this.disableHeartBeatTimer=function(){bk();if(aO||ay){if(N.removeEventListener){N.removeEventListener("focus",aS,true);N.removeEventListener("blur",am,true)}else{if(N.detachEvent){N.detachEvent("onfocus",aS);N.detachEvent("onblur",am)}}}aO=null;ay=false};this.killFrame=function(){if(N.location!==N.top.location){N.top.location=N.location +}};this.redirectFile=function(cF){if(N.location.protocol==="file:"){N.location=cF}};this.setCountPreRendered=function(cF){aV=cF};this.trackGoal=function(cF,cH,cG){bQ(function(){cl(cF,cH,cG)})};this.trackLink=function(cG,cF,cI,cH){bQ(function(){cs(cG,cF,cI,cH)})};this.trackPageView=function(cF,cH,cG){bJ=[];if(H(bF)){bQ(function(){S(ap,bi,bF)})}else{bQ(function(){bz(cF,cH,cG)})}};this.trackAllContentImpressions=function(){if(H(bF)){return}bQ(function(){m(function(){var cF=r.findContentNodes();var cG=b6(cF);cC(cG,bj)})})};this.trackVisibleContentImpressions=function(cF,cG){if(H(bF)){return}if(!D(cF)){cF=true}if(!D(cG)){cG=750}aC(cF,cG,this);bQ(function(){j(function(){var cH=r.findContentNodes();var cI=aR(cH);cC(cI,bj)})})};this.trackContentImpression=function(cH,cF,cG){if(H(bF)){return}if(!cH){return}cF=cF||"Unknown";bQ(function(){var cI=ar(cH,cF,cG);bg(cI,bj)})};this.trackContentImpressionsWithinNode=function(cF){if(H(bF)||!cF){return}bQ(function(){if(bO){j(function(){var cG=r.findContentNodesWithinNode(cF); +var cH=aR(cG);cC(cH,bj)})}else{m(function(){var cG=r.findContentNodesWithinNode(cF);var cH=b6(cG);cC(cH,bj)})}})};this.trackContentInteraction=function(cH,cI,cF,cG){if(H(bF)){return}if(!cH||!cI){return}cF=cF||"Unknown";bQ(function(){var cJ=az(cH,cI,cF,cG);bg(cJ,bj)})};this.trackContentInteractionNode=function(cG,cF){if(H(bF)||!cG){return}bQ(function(){var cH=cA(cG,cF);bg(cH,bj)})};this.logAllContentBlocksOnPage=function(){var cG=r.findContentNodes();var cF=r.collectContent(cG);if(console!==undefined&&console&&console.log){console.log(cF)}};this.trackEvent=function(cG,cI,cF,cH,cK,cJ){bQ(function(){ak(cG,cI,cF,cH,cK,cJ)})};this.trackSiteSearch=function(cF,cH,cG,cI){bQ(function(){bI(cF,cH,cG,cI)})};this.setEcommerceView=function(cI,cF,cH,cG){if(!D(cH)||!cH.length){cH=""}else{if(cH instanceof Array){cH=JSON2.stringify(cH)}}bv[5]=["_pkc",cH];if(D(cG)&&String(cG).length){bv[2]=["_pkp",cG]}if((!D(cI)||!cI.length)&&(!D(cF)||!cF.length)){return}if(D(cI)&&cI.length){bv[3]=["_pks",cI]}if(!D(cF)||!cF.length){cF="" +}bv[4]=["_pkn",cF]};this.addEcommerceItem=function(cJ,cF,cH,cG,cI){if(cJ.length){cr[cJ]=[cJ,cF,cH,cG,cI]}};this.trackEcommerceOrder=function(cF,cJ,cI,cH,cG,cK){by(cF,cJ,cI,cH,cG,cK)};this.trackEcommerceCartUpdate=function(cF){a6(cF)};this.trackRequest=function(cF,cH,cG){bQ(function(){var cI=b0(cF,cH);bg(cI,bj,cG)})};d.trigger("TrackerSetup",[this])}function B(){return{push:X}}function b(ak,aj){var al={};var ah,ai;for(ah=0;ah<aj.length;ah++){var af=aj[ah];al[af]=1;for(ai=0;ai<ak.length;ai++){if(ak[ai]&&ak[ai][0]){var ag=ak[ai][0];if(af===ag){X(ak[ai]);delete ak[ai];if(al[ag]>1){ab("The method "+ag+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: http://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')}al[ag]++}}}}return ak}var x=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","enableLinkTracking"]; +function V(af,ah){var ag=new K(af,ah);C.push(ag);_paq=b(_paq,x);for(z=0;z<_paq.length;z++){if(_paq[z]){X(_paq[z])}}_paq=new B();return ag}ae(N,"beforeunload",Z,false);Date.prototype.getTimeAlias=Date.prototype.getTime;d={initialized:false,DOM:{addEventListener:function(ai,ah,ag,af){var aj=typeof af;if(aj==="undefined"){af=false}ae(ai,ah,ag,af)},onLoad:j,onReady:m},on:function(ag,af){if(!t[ag]){t[ag]=[]}t[ag].push(af)},off:function(ah,ag){if(!t[ah]){return}var af=0;for(af;af<t[ah].length;af++){if(t[ah][af]===ag){t[ah].splice(af,1)}}},trigger:function(ah,ai,ag){if(!t[ah]){return}var af=0;for(af;af<t[ah].length;af++){t[ah][af].apply(ag||N,ai)}},addPlugin:function(af,ag){a[af]=ag},getTracker:function(af,ag){if(!D(ag)){ag=this.getAsyncTracker().getSiteId()}if(!D(af)){af=this.getAsyncTracker().getTrackerUrl()}return new K(af,ag)},getAsyncTrackers:function(){return C},addTracker:function(af,ag){if(!C.length){V(af,ag)}else{C[0].addTracker(af,ag)}},getAsyncTracker:function(ag,aj){var ai;if(C&&C.length&&C[0]){ai=C[0] +}else{return V(ag,aj)}if(!aj&&!ag){return ai}if((!D(aj)||null===aj)&&ai){aj=ai.getSiteId()}if((!D(ag)||null===ag)&&ai){ag=ai.getTrackerUrl()}var ah,af=0;for(af;af<C.length;af++){ah=C[af];if(ah&&String(ah.getSiteId())===String(aj)&&ah.getTrackerUrl()===ag){return ah}}},retryMissedPluginCalls:function(){var ag=Y;Y=[];var af=0;for(af;af<ag.length;af++){X(ag[af])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return d})}return d}()); /*!!! pluginTrackerHook */ -}(function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker()}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker); -if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}; +}(function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker() +}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}; /*!! @license-end */ };
\ No newline at end of file diff --git a/plugins/API/Renderer/Json.php b/plugins/API/Renderer/Json.php index 8adfdaebe1..1f7591370b 100644 --- a/plugins/API/Renderer/Json.php +++ b/plugins/API/Renderer/Json.php @@ -17,9 +17,6 @@ use Piwik\ProxyHttp; /** * API output renderer for JSON. * - * **NOTE: This is the old JSON format. It includes bugs that are fixed in the JSON2 API output - * format. Please use that format instead of this.** - * * @deprecated */ class Json extends ApiRenderer @@ -61,7 +58,17 @@ class Json extends ApiRenderer return $this->applyJsonpIfNeeded($result); } - return $this->renderDataTable($array); + $result = $this->renderDataTable($array); + + // if $array is a simple associative array, remove the JSON root array that is added by renderDataTable + if (!empty($array) + && Piwik::isAssociativeArray($array) + && !Piwik::isMultiDimensionalArray($array) + ) { + $result = substr($result, 1, strlen($result) - 2); + } + + return $result; } public function sendHeader() diff --git a/plugins/API/Renderer/Json2.php b/plugins/API/Renderer/Json2.php index 898fe6a9ce..bd27810fb8 100644 --- a/plugins/API/Renderer/Json2.php +++ b/plugins/API/Renderer/Json2.php @@ -11,23 +11,8 @@ namespace Piwik\Plugins\API\Renderer; use Piwik\Piwik; /** - * Correct API output renderer for JSON. Includes bug fixes for bugs in the old JSON API - * format. + * Left here for Backward compatibility in Piwik 3.X+ for all users who correctly used format=json2 during Piwik 2.X */ class Json2 extends Json { - public function renderArray($array) - { - $result = parent::renderArray($array); - - // if $array is a simple associative array, remove the JSON root array that is added by renderDataTable - if (!empty($array) - && Piwik::isAssociativeArray($array) - && !Piwik::isMultiDimensionalArray($array) - ) { - $result = substr($result, 1, strlen($result) - 2); - } - - return $result; - } }
\ No newline at end of file diff --git a/plugins/API/lang/en.json b/plugins/API/lang/en.json index 95152566a2..1697353df0 100644 --- a/plugins/API/lang/en.json +++ b/plugins/API/lang/en.json @@ -1,5 +1,6 @@ { "API": { + "ChangeTokenHint": "If you want to change this token, please go to your %1$spersonal settings page%2$s.", "GenerateVisits": "If you don't have data for today you can first generate some data using the %1$s plugin. You can enable the %2$s plugin, then click on the 'Visitor Generator' menu in the Piwik Admin area.", "KeepTokenSecret": "This token_auth is as secret as your login and password, %1$s do not share it%2$s!", "LoadedAPIs": "Successfully loaded %s APIs", diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig index c84488b1ec..258b74c49d 100644 --- a/plugins/API/templates/listAllAPI.twig +++ b/plugins/API/templates/listAllAPI.twig @@ -10,7 +10,7 @@ {% block content %} <div class="api-list"> - <div piwik-content-block content-title="{{ title|e('html_attr') }}" rate="true"> + <div piwik-content-block content-title="{{ title }}" rate="true"> <p>{{ 'API_PluginDescription'|translate }}</p> <p> @@ -21,10 +21,14 @@ <p> {{ 'API_UsingTokenAuth'|translate('','',"")|raw }}<br/> <pre piwik-select-on-focus id='token_auth'>&token_auth=<strong>{{ token_auth }}</strong></pre><br/> - {{ 'API_KeepTokenSecret'|translate('<b>','</b>')|raw }} + {{ 'API_KeepTokenSecret'|translate('<b>','</b>')|raw }}<br /> + {{ 'API_ChangeTokenHint'|translate('<a href="' ~ linkTo({ + 'module': 'UsersManager', + 'action': 'userSettings', + }) ~ '">', '</a>')|raw }} </p> </div> {{ list_api_methods_with_links|raw }} <br/> </div> -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/plugins/API/tests/Unit/JsonRendererTest.php b/plugins/API/tests/Unit/JsonRendererTest.php index 68ed45b9f3..ea7f5d69d4 100644 --- a/plugins/API/tests/Unit/JsonRendererTest.php +++ b/plugins/API/tests/Unit/JsonRendererTest.php @@ -356,17 +356,14 @@ class JsonRendererTest extends \PHPUnit_Framework_TestCase $this->assertNoJsonError($actual); } - /** - * backwards compatibility test - */ - public function test_oldJson_renderArray_ShouldConvertSingleDimensionalAssociativeArray() + public function test_json_renderArray_ShouldConvertSingleDimensionalAssociativeArray() { $input = array( "firstElement" => "isFirst", "secondElement" => "isSecond" ); - $expected = '[{"firstElement":"isFirst","secondElement":"isSecond"}]'; + $expected = '{"firstElement":"isFirst","secondElement":"isSecond"}'; $oldJsonBuilder = new Json($input); $actual = $oldJsonBuilder->renderArray($input); @@ -376,7 +373,7 @@ class JsonRendererTest extends \PHPUnit_Framework_TestCase private function makeBuilder($request) { - return new Json2($request); + return new Json($request); } private function assertNoJsonError($response) diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index fab89e6344..409940d495 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -8,12 +8,8 @@ */ namespace Piwik\Plugins\Actions; -use Piwik\ArchiveProcessor; -use Piwik\Db; -use Piwik\Plugins\CoreVisualizations\Visualizations\Sparklines; use Piwik\Site; use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable; /** * Actions plugin @@ -26,7 +22,7 @@ class Actions extends \Piwik\Plugin const ACTIONS_REPORT_ROWS_DISPLAY = 100; /** - * @see Piwik\Plugin::registerEvents + * @see \Piwik\Plugin::registerEvents */ public function registerEvents() { @@ -44,6 +40,7 @@ class Actions extends \Piwik\Plugin { $visitor['searches'] = $details['visit_total_searches']; $visitor['actions'] = $details['visit_total_actions']; + $visitor['interactions'] = $details['visit_total_interactions']; } public function addMetricTranslations(&$translations) diff --git a/plugins/Actions/Columns/InteractionPosition.php b/plugins/Actions/Columns/InteractionPosition.php new file mode 100644 index 0000000000..34bd9064f2 --- /dev/null +++ b/plugins/Actions/Columns/InteractionPosition.php @@ -0,0 +1,47 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\Actions\Columns; + +use Piwik\Tracker\Action; +use Piwik\Tracker\Request; +use Piwik\Tracker\Visitor; +use Piwik\Piwik; +use Piwik\Plugin\Dimension\ActionDimension; + +class InteractionPosition extends ActionDimension +{ + protected $columnName = 'interaction_position'; + protected $columnType = 'SMALLINT UNSIGNED DEFAULT NULL'; + + /** + * @param Request $request + * @param Visitor $visitor + * @param Action $action + * + * @return mixed|false + */ + public function onNewAction(Request $request, Visitor $visitor, Action $action) + { + $shouldCount = VisitTotalInteractions::shouldCountInteraction($action); + + if ($shouldCount && $visitor->isNewVisit()) { + return 1; + } else if ($shouldCount) { + return VisitTotalInteractions::getCurrentInteractionPosition($request); + } + + return false; + } + + public function getName() + { + return Piwik::translate('Actions_ColumnInteractionPosition'); + } + +}
\ No newline at end of file diff --git a/plugins/Actions/Columns/VisitTotalInteractions.php b/plugins/Actions/Columns/VisitTotalInteractions.php new file mode 100644 index 0000000000..ee8d4938d8 --- /dev/null +++ b/plugins/Actions/Columns/VisitTotalInteractions.php @@ -0,0 +1,106 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\Actions\Columns; + +use Piwik\Plugin\Dimension\VisitDimension; +use Piwik\Plugins\CoreHome\Segment; +use Piwik\Tracker\Action; +use Piwik\Tracker\Request; +use Piwik\Tracker\Visitor; + +class VisitTotalInteractions extends VisitDimension +{ + protected $columnName = 'visit_total_interactions'; + protected $columnType = 'SMALLINT UNSIGNED DEFAULT 0'; + + protected function configureSegments() + { + $segment = new Segment(); + $segment->setType(Segment::TYPE_METRIC); + $segment->setSegment('interactions'); + $segment->setName('General_NbInteractions'); + $segment->setAcceptedValues('Any positive integer'); + $segment->setSuggestedValuesCallback(function ($idSite, $maxValuesToReturn) { + $positions = range(1,50); + + return array_slice($positions, 0, $maxValuesToReturn); + }); + $this->addSegment($segment); + } + + /** + * @param Request $request + * @param Visitor $visitor + * @param Action|null $action + * @return int + */ + public function onNewVisit(Request $request, Visitor $visitor, $action) + { + if (self::shouldCountInteraction($action)) { + return 1; + } + + return 0; + } + + /** + * @param Request $request + * @param Visitor $visitor + * @param Action|null $action + * @return int + */ + public function onExistingVisit(Request $request, Visitor $visitor, $action) + { + $request->setMetadata('Actions', $this->columnName, $visitor->getVisitorColumn($this->columnName)); + + if (self::shouldCountInteraction($action)) { + return $this->columnName . ' + 1'; + } + + return false; + } + + /** + * @param Request $request + * @return int + */ + public static function getCurrentInteractionPosition($request) + { + $position = $request->getMetadata('Actions', 'visit_total_interactions'); + + return $position + 1; + } + + /** + * @param Action|null $action + * @return bool + */ + public static function shouldCountInteraction($action) + { + if (empty($action)) { + return false; + } + + $idActionUrl = $action->getIdActionUrlForEntryAndExitIds(); + + if ($idActionUrl !== false) { + return true; + } + + $actionType = $action->getActionType(); + $types = array(Action::TYPE_SITE_SEARCH); + + if (in_array($actionType, $types)) { + return true; + } + + return false; + } + +}
\ No newline at end of file diff --git a/plugins/Actions/lang/en.json b/plugins/Actions/lang/en.json index 259ce03ccf..c31dc264ec 100644 --- a/plugins/Actions/lang/en.json +++ b/plugins/Actions/lang/en.json @@ -27,6 +27,7 @@ "ColumnUniqueDownloads": "Unique Downloads", "ColumnUniqueOutlinks": "Unique Outlinks", "ColumnIdPageview": "Pageview ID", + "ColumnInteractionPosition": "Interaction Position", "DownloadsReportDocumentation": "In this report, you can see which files your visitors have downloaded. %s What Piwik counts as a download is the click on a download link. Whether the download was completed or not isn't known to Piwik.", "EntryPagesReportDocumentation": "This report contains information about the entry pages that were used during the specified period. An entry page is the first page that a user views during his visit. %s The entry URLs are displayed as a folder structure.", "EntryPageTitles": "Entry page titles", diff --git a/plugins/Annotations/lang/de.json b/plugins/Annotations/lang/de.json index f3fd1e64e6..95eef591f4 100644 --- a/plugins/Annotations/lang/de.json +++ b/plugins/Annotations/lang/de.json @@ -9,14 +9,14 @@ "ClickToStarOrUnstar": "Klicken Sie um die Markierung dieser Anmerkung zu setzen oder zu entfernen.", "CreateNewAnnotation": "Neue Anmerkung anlegen...", "EnterAnnotationText": "Geben Sie Ihre Notiz ein...", - "HideAnnotationsFor": "Anmerkungen für %s verbergen...", + "HideAnnotationsFor": "Anmerkungen für %s verbergen …", "IconDesc": "Notizen für diesen Zeitraum anzeigen.", "IconDescHideNotes": "Notizen für diesen Zeitraum verbergen.", "InlineQuickHelp": "Sie können Anmerkungen erstellen um spezielle Ereignisse (wie einen Blog-Eintrag, oder eine Neugestaltung der Website) zu markieren, Stichtage für die Datenanalyse zu speichern oder einfach alles zu speichern was Ihnen wichtig erscheint.", "LoginToAnnotate": "Sie müssen sich einloggen um eine Anmerkung hinzufügen zu können.", "NoAnnotations": "Für diesen Zeitraum sind keine Anmerkungen vorhanden.", "PluginDescription": "Erlaubt Ihnen Hinweise zu verschiedenen Tagen hinzuzufügen um Änderungen zu markieren die an der Website gemacht wurden, Analysen zu speichern die bezüglich Ihrer Daten gemacht wurden und um Ihre Gedanken mit Ihren Kollegen zu teilen. Durch das Hinzufügen von Hinweisen stellen Sie sicher, dass Sie sich daran erinnern warum die Daten so sind wie sie sind.", - "ViewAndAddAnnotations": "Anmerkungen zu %s ansehen und hinzufügen...", + "ViewAndAddAnnotations": "Anmerkungen zu %s ansehen und hinzufügen …", "YouCannotModifyThisNote": "Sie können diese Anmerkung nicht ändern, da Sie sie weder erstellt haben noch administrativen Zugang für diese Seite besitzen." } }
\ No newline at end of file diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement -Subproject 488c37f159f57186a6a1cefd43823e5972c9a13 +Subproject 5fe61c91a04524506b73dad0fae9aacff55a47a diff --git a/plugins/Bandwidth b/plugins/Bandwidth -Subproject dcd213ac739f1ad12e039e3aac24d154a041ed4 +Subproject b3db9b1d8d16704fc74afa6c5479c5ca2a8d160 diff --git a/plugins/BulkTracking/tests/Integration/RequestsTest.php b/plugins/BulkTracking/tests/Integration/RequestsTest.php index ab45204303..7f6236d82c 100644 --- a/plugins/BulkTracking/tests/Integration/RequestsTest.php +++ b/plugins/BulkTracking/tests/Integration/RequestsTest.php @@ -89,7 +89,7 @@ class RequestsTest extends IntegrationTestCase */ public function test_authenticateRequests_shouldThrowAnException_IfTokenIsNotValid() { - $dummyToken = API::getInstance()->getTokenAuth('test', UsersManager::getPasswordHash('2')); + $dummyToken = API::getInstance()->createTokenAuth('test'); $superUserToken = $this->getSuperUserToken(); $requests = array($this->buildDummyRequest($superUserToken), $this->buildDummyRequest($dummyToken)); diff --git a/plugins/Contents/Columns/ContentInteraction.php b/plugins/Contents/Columns/ContentInteraction.php index 1c3632d3cc..149ed94059 100644 --- a/plugins/Contents/Columns/ContentInteraction.php +++ b/plugins/Contents/Columns/ContentInteraction.php @@ -23,14 +23,14 @@ class ContentInteraction extends ActionDimension { $segment = new Segment(); $segment->setSegment('contentInteraction'); - $segment->setName('Contents_Interaction'); + $segment->setName('Contents_ContentInteraction'); $segment->setAcceptedValues('The type of interaction with the content. For instance "click" or "submit".'); $this->addSegment($segment); } public function getName() { - return Piwik::translate('Contents_Interaction'); + return Piwik::translate('Contents_ContentInteraction'); } public function getActionId() diff --git a/plugins/Contents/Contents.php b/plugins/Contents/Contents.php index a217e159c7..99e47bf8fd 100644 --- a/plugins/Contents/Contents.php +++ b/plugins/Contents/Contents.php @@ -27,7 +27,7 @@ class Contents extends \Piwik\Plugin public function addMetricTranslations(&$translations) { $translations['nb_impressions'] = 'Contents_Impressions'; - $translations['nb_interactions'] = 'Contents_Interactions'; + $translations['nb_interactions'] = 'Contents_ContentInteractions'; $translations['interaction_rate'] = 'Contents_InteractionRate'; } diff --git a/plugins/Contents/lang/en.json b/plugins/Contents/lang/en.json index 78e347eaaa..915b9d9746 100644 --- a/plugins/Contents/lang/en.json +++ b/plugins/Contents/lang/en.json @@ -2,8 +2,8 @@ "Contents": { "PluginDescription": "Content and banner tracking lets you measure the performance (views, clicks, CTR) of any piece of content on your pages (Banner ad, image, any item).", "Impressions": "Impressions", - "Interactions": "Interactions", - "Interaction": "Interaction", + "ContentInteraction": "Content Interaction", + "ContentInteractions": "Content Interactions", "InteractionRate": "Interaction Rate", "ContentName": "Content Name", "ContentPiece": "Content Piece", diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml index 35ee103b17..a7442f27b2 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml @@ -11,7 +11,7 @@ <dimension>Content Name</dimension> <metrics> <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> + <nb_interactions>Content Interactions</nb_interactions> </metrics> <metricsDocumentation> <nb_impressions>The number of times a content block, such as a banner or an ad, was displayed on a page.</nb_impressions> @@ -29,7 +29,7 @@ <columns> <label>Content Name</label> <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> + <nb_interactions>Content Interactions</nb_interactions> <interaction_rate>Interaction Rate</interaction_rate> </columns> <reportData> diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml index d7e5a543f8..0ed4eb891e 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml @@ -11,7 +11,7 @@ <dimension>Content Piece</dimension> <metrics> <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> + <nb_interactions>Content Interactions</nb_interactions> </metrics> <metricsDocumentation> <nb_impressions>The number of times a content block, such as a banner or an ad, was displayed on a page.</nb_impressions> @@ -29,7 +29,7 @@ <columns> <label>Content Piece</label> <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> + <nb_interactions>Content Interactions</nb_interactions> <interaction_rate>Interaction Rate</interaction_rate> </columns> <reportData> diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 38f9ab1424..292d9feadf 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -14,6 +14,7 @@ <pageId>1</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> @@ -42,6 +43,7 @@ <visitDurationPretty>4 min 31s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -117,6 +119,7 @@ <pageId>13</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> @@ -145,6 +148,7 @@ <visitDurationPretty>4 min 31s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 38f9ab1424..292d9feadf 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -14,6 +14,7 @@ <pageId>1</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> @@ -42,6 +43,7 @@ <visitDurationPretty>4 min 31s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -117,6 +119,7 @@ <pageId>13</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> @@ -145,6 +148,7 @@ <visitDurationPretty>4 min 31s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 38f9ab1424..292d9feadf 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -14,6 +14,7 @@ <pageId>1</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> @@ -42,6 +43,7 @@ <visitDurationPretty>4 min 31s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -117,6 +119,7 @@ <pageId>13</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> @@ -145,6 +148,7 @@ <visitDurationPretty>4 min 31s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 38f9ab1424..292d9feadf 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -14,6 +14,7 @@ <pageId>1</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> @@ -42,6 +43,7 @@ <visitDurationPretty>4 min 31s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -117,6 +119,7 @@ <pageId>13</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> @@ -145,6 +148,7 @@ <visitDurationPretty>4 min 31s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 38f9ab1424..292d9feadf 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -14,6 +14,7 @@ <pageId>1</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> @@ -42,6 +43,7 @@ <visitDurationPretty>4 min 31s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -117,6 +119,7 @@ <pageId>13</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> @@ -145,6 +148,7 @@ <visitDurationPretty>4 min 31s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index 7621aa1f78..3531623eef 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -114,7 +114,7 @@ class Controller extends ControllerAdmin return ''; } - $response = new ResponseBuilder('json2'); + $response = new ResponseBuilder('json'); try { $this->checkTokenInUrl(); diff --git a/plugins/CoreAdminHome/angularjs/trackingcode/jstrackingcode.controller.js b/plugins/CoreAdminHome/angularjs/trackingcode/jstrackingcode.controller.js index a7c8dbaeae..3758175751 100644 --- a/plugins/CoreAdminHome/angularjs/trackingcode/jstrackingcode.controller.js +++ b/plugins/CoreAdminHome/angularjs/trackingcode/jstrackingcode.controller.js @@ -80,11 +80,12 @@ groupPageTitlesByDomain: self.groupByDomain ? 1 : 0, mergeSubdomains: self.trackAllSubdomains ? 1 : 0, mergeAliasUrls: self.trackAllAliases ? 1 : 0, - visitorCustomVariables: getCustomVariables(self.customVars), + visitorCustomVariables: self.trackCustomVars ? getCustomVariables(self.customVars) : 0, customCampaignNameQueryParam: null, customCampaignKeywordParam: null, doNotTrack: self.doNotTrack ? 1 : 0, - disableCookies: self.disableCookies ? 1 : 0 + disableCookies: self.disableCookies ? 1 : 0, + trackNoScript: self.trackNoScript ? 1: 0 }; if (self.useCustomCampaignParams) { diff --git a/plugins/CoreAdminHome/lang/en.json b/plugins/CoreAdminHome/lang/en.json index 46003fe148..a5ee59a280 100644 --- a/plugins/CoreAdminHome/lang/en.json +++ b/plugins/CoreAdminHome/lang/en.json @@ -40,6 +40,7 @@ "JSTracking_MergeSubdomainsDesc": "So if one visitor visits %1$s and %2$s, they will be counted as a unique visitor.", "JSTracking_PageCustomVars": "Track a custom variable for each page view", "JSTracking_PageCustomVarsDesc": "For example, with variable name \"Category\" and value \"White Papers\".", + "JSTracking_TrackNoScript": "Track users with JavaScript disabled", "JSTracking_VisitorCustomVars": "Track custom variables for this visitor", "JSTracking_VisitorCustomVarsDesc": "For example, with variable name \"Type\" and value \"Customer\".", "JSTrackingIntro1": "You can track visitors to your website many different ways. The recommended way to do it is through JavaScript. To use this method you must make sure every webpage of your website has some JavaScript code, which you can generate here.", diff --git a/plugins/CoreAdminHome/lang/he.json b/plugins/CoreAdminHome/lang/he.json index e6153e70d4..99fd32b532 100644 --- a/plugins/CoreAdminHome/lang/he.json +++ b/plugins/CoreAdminHome/lang/he.json @@ -13,6 +13,7 @@ "LogoUpload": "בחירת קובץ לוגו", "MenuDiagnostic": "אבחון", "MenuGeneralSettings": "הגדרות כלליות", + "MenuMeasurables": "מדידים", "OptOutForYourVisitors": "התחמקות מ-Piwik עבור גולשיך", "PiwikIsInstalledAt": "Piwik מותקן ב", "TrackAGoal": "עקיבה אחר יעד", diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig index 5e0acb6169..64362a7bb2 100644 --- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig +++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig @@ -80,6 +80,14 @@ value="" inline-help="#jsTrackAllAliasesInlineHelp"> </div> + <div piwik-field uicontrol="checkbox" name="javascript-tracking-noscript" + ng-model="jsTrackingCode.trackNoScript" + ng-change="jsTrackingCode.updateTrackingCode()" + disabled="jsTrackingCode.isLoading" + title="{{ 'CoreAdminHome_JSTracking_TrackNoScript'|translate|e('html_attr') }}" + value="" inline-help=""> + </div> + <h3>{{ 'Mobile_Advanced'|translate }}</h3> <p> @@ -95,7 +103,6 @@ {# visitor custom variable #} <div piwik-field uicontrol="checkbox" name="javascript-tracking-visitor-cv-check" - class="section-toggler-link" ng-model="jsTrackingCode.trackCustomVars" ng-change="jsTrackingCode.updateTrackingCode()" disabled="jsTrackingCode.isLoading" diff --git a/plugins/CoreHome/angularjs/common/services/piwik-api.js b/plugins/CoreHome/angularjs/common/services/piwik-api.js index aeed3bfe2c..ab6ee9c30d 100644 --- a/plugins/CoreHome/angularjs/common/services/piwik-api.js +++ b/plugins/CoreHome/angularjs/common/services/piwik-api.js @@ -249,10 +249,10 @@ var hasBlockedContent = false; getParams.module = getParams.module || 'API'; if (!getParams.format) { - getParams.format = 'JSON2'; + getParams.format = 'JSON'; } - addParams(getParams, 'GET'); + addParams(getParams); var promise = send(options); @@ -272,6 +272,12 @@ var hasBlockedContent = false; return fetch(getParams, options); } + function addPostParams(_postParams_) { + if (_postParams_) { + angular.merge(postParams, _postParams_); + } + } + /** * Convenience method that will perform a bulk request using Piwik's API.getBulkRequest method. * Bulk requests allow you to execute multiple Piwik requests with one HTTP request. @@ -319,6 +325,7 @@ var hasBlockedContent = false; bulkFetch: bulkFetch, post: post, fetch: fetch, + addPostParams: addPostParams, /** * @deprecated */ diff --git a/plugins/CoreHome/angularjs/common/services/piwik-api.spec.js b/plugins/CoreHome/angularjs/common/services/piwik-api.spec.js index 1faf387ea3..a51067ea46 100644 --- a/plugins/CoreHome/angularjs/common/services/piwik-api.spec.js +++ b/plugins/CoreHome/angularjs/common/services/piwik-api.spec.js @@ -55,7 +55,7 @@ piwikApi.fetch({ method: "SomePlugin.action" }).then(function (response) { - expect(response).to.equal("Request url: index.php?date=&format=JSON2&idSite=1&method=SomePlugin.action&module=API&period=day"); + expect(response).to.equal("Request url: index.php?date=&format=JSON&idSite=1&method=SomePlugin.action&module=API&period=day"); done(); }).catch(function (ex) { @@ -115,7 +115,7 @@ piwikApi.fetch({ method: "SomePlugin.action" }).then(function (response) { - expect(response).to.equal("Request url: index.php?date=&format=JSON2&idSite=1&method=SomePlugin.action&module=API&period=day"); + expect(response).to.equal("Request url: index.php?date=&format=JSON&idSite=1&method=SomePlugin.action&module=API&period=day"); request1Done = true; @@ -127,7 +127,7 @@ piwikApi.fetch({ method: "SomeOtherPlugin.action" }).then(function (response) { - expect(response).to.equal("Request url: index.php?date=&format=JSON2&idSite=1&method=SomeOtherPlugin.action&module=API&period=day"); + expect(response).to.equal("Request url: index.php?date=&format=JSON&idSite=1&method=SomeOtherPlugin.action&module=API&period=day"); request2Done = true; @@ -160,7 +160,7 @@ piwikApi.fetch({ method: "SomeOtherPlugin.action" }).then(function (response) { - expect(response).to.equal("Request url: index.php?date=&format=JSON2&idSite=1&method=SomeOtherPlugin.action&module=API&period=day"); + expect(response).to.equal("Request url: index.php?date=&format=JSON&idSite=1&method=SomeOtherPlugin.action&module=API&period=day"); request2Done = true; @@ -216,7 +216,7 @@ method: "SomeOtherPlugin.action" } ]).then(function (response) { - var restOfExpected = "index.php?date=&format=JSON2&idSite=1&method=API.getBulkRequest&" + + var restOfExpected = "index.php?date=&format=JSON&idSite=1&method=API.getBulkRequest&" + "module=API&period=day - urls%5B%5D=%3Fmethod%3DSomePlugin.action%26param%3D" + "value&urls%5B%5D=%3Fmethod%3DSomeOtherPlugin.action&token_auth=100bf5eeeed1468f3f9d93750044d3dd"; diff --git a/plugins/CoreHome/angularjs/widget-container/widgetcontainer.directive.js b/plugins/CoreHome/angularjs/widget-container/widgetcontainer.directive.js index 5533b962ec..7e090d99cb 100644 --- a/plugins/CoreHome/angularjs/widget-container/widgetcontainer.directive.js +++ b/plugins/CoreHome/angularjs/widget-container/widgetcontainer.directive.js @@ -32,12 +32,13 @@ return function (scope, element, attrs, ngModel) { scope.$watch('container', function (container) { if (container && container.widgets && container.widgets[0] && container.widgets[0].parameters) { - var isWidgetized = container.widgets[0].parameters.widget == '1'; + var widget = container.widgets[0]; + var isWidgetized = widget.parameters.widget == '1'; - if (isWidgetized) { - container.widgets[0].parameters.showtitle = '0'; + if (isWidgetized && widget.viewDataTable && widget.viewDataTable == 'graphEvolution') { + // we hide the first title for Visits Overview with Graph and Goal Overview + widget.parameters.showtitle = '0'; } - } }); } diff --git a/plugins/CoreHome/javascripts/broadcast.js b/plugins/CoreHome/javascripts/broadcast.js index 3ec2a0821d..eecbc79a95 100644 --- a/plugins/CoreHome/javascripts/broadcast.js +++ b/plugins/CoreHome/javascripts/broadcast.js @@ -205,7 +205,11 @@ var broadcast = { // if the module is not 'Goals', we specifically unset the 'idGoal' parameter // this is to ensure that the URLs are clean (and that clicks on graphs work as expected - they are broken with the extra parameter) var action = broadcast.getParamValue('action', currentHashStr); - if (action != 'goalReport' && action != 'ecommerceReport' && action != 'products' && action != 'sales') { + if (action != 'goalReport' + && action != 'ecommerceReport' + && action != 'products' + && action != 'sales' + && (''+ ajaxUrl).indexOf('&idGoal=') === -1) { currentHashStr = broadcast.updateParamValue('idGoal=', currentHashStr); } // unset idDashboard if use doesn't display a dashboard diff --git a/plugins/CoreHome/javascripts/sparkline.js b/plugins/CoreHome/javascripts/sparkline.js index 8f10a9f1eb..32e23a12aa 100644 --- a/plugins/CoreHome/javascripts/sparkline.js +++ b/plugins/CoreHome/javascripts/sparkline.js @@ -55,16 +55,18 @@ window.initializeSparklines = function () { return; } - var sparklines = parent.find('div.sparkline'); + var sparklines = parent.find('div.sparkline:not(.notLinkable)'); // try to find sparklines and add them clickable behaviour sparklines.each(function () { // find the sparkline and get it's src attribute var sparklineUrl = $('img', this).attr('data-src'); + var $this = $(this); + if (sparklineUrl != "") { - $(this).addClass('linked'); + $this.addClass('linked'); var params = broadcast.getValuesFromUrl(sparklineUrl); for (var i = 0; i != sparklineUrlParamsToIgnore.length; ++i) { @@ -80,8 +82,8 @@ window.initializeSparklines = function () { } // on click, reload the graph with the new url - $(this).off('click.sparkline'); - $(this).on('click.sparkline', function () { + $this.off('click.sparkline'); + $this.on('click.sparkline', function () { var reportId = graph.attr('data-report'), dataTable = graph; diff --git a/plugins/CoreHome/lang/cs.json b/plugins/CoreHome/lang/cs.json index 88ff41eeb9..f4c412b7c0 100644 --- a/plugins/CoreHome/lang/cs.json +++ b/plugins/CoreHome/lang/cs.json @@ -65,6 +65,7 @@ "QuickAccessTitle": "Výsledky hledání pro %s. Pro navigaci ve výsledcích vyhledávání použijte šipky. Zkratka: Zmáčknout 'f' pro hledání.", "MenuEntries": "Položky menu", "Segments": "Segmenty", + "OneClickUpdateNotPossibleAsMultiServerEnvironment": "Aktualizace na jedno kliknutí není dostupná při nasazení Piwiku na několika serverech naráz. Stáhněte prosím nejnovější verzi z %1$s a pokračujte.", "AdblockIsMaybeUsed": "Pokud používáte blokovač reklam, zakažte ho pro tyto stránky, aby Piwik správně fungoval.", "ChangeCurrentWebsite": "Vyberte web, aktuálně vybraný web: %s" } diff --git a/plugins/CoreHome/lang/de.json b/plugins/CoreHome/lang/de.json index 215c3c4b52..77096795d9 100644 --- a/plugins/CoreHome/lang/de.json +++ b/plugins/CoreHome/lang/de.json @@ -7,6 +7,7 @@ "ClickToEditX": "Klicken Sie um %s zu bearbeiten", "CloseSearch": "Suche schließen", "CloseWidgetDirections": "Sie können das Widget schließen, indem Sie auf das 'X' oben im Widget klicken.", + "ChooseX": "Wähle %1$s", "DataForThisReportHasBeenPurged": "Die Daten für diesen Bericht sind älter als %s Monate und wurden gelöscht", "DataTableExcludeAggregateRows": "Aggregierte Zeilen werden angezeigt %s Ausschließen", "DataTableIncludeAggregateRows": "Aggregierte Zeilen sind ausgeschlossen %s Wieder anzeigen", @@ -14,6 +15,7 @@ "Default": "Standard", "DonateCall1": "Die Nutzung von Piwik wird immer kostenlos bleiben, was aber nicht heißt, dass es uns nichts kostet, es zu erstellen.", "DonateCall2": "Piwik braucht Ihre dauerhafte Unterstützung um zu wachsen und zu gedeihen.", + "DonateCall3": "Wenn Sie finden, dass Piwik einen deutlichen Mehrwert für Sie oder Ihr Unternehmen bringt, %1$sspenden Sie bitte%2$s oder %3$serwerben Sie ein Premium Feature%4$s.", "DonateFormInstructions": "Klicken Sie auf den Slider um den Betrag zu wählen, dann klicken Sie auf 'Subscribe' um zu spenden.", "ExcludeRowsWithLowPopulation": "Alle Zeilen werden angezeigt %s Niedrige Werte ausschließen", "ExternalHelp": "Hilfe (öffnet in neuem Tab)", @@ -63,6 +65,7 @@ "QuickAccessTitle": "Suche nach '%s'. Benutzen Sie die Pfeiltasten um durch die Ergebnisse zu navigieren. Tastenkürzel: Drücken Sie 'f' um zu suchen.", "MenuEntries": "Menüeinträge", "Segments": "Segmente", + "OneClickUpdateNotPossibleAsMultiServerEnvironment": "Das Ein-Klick-Update ist nicht verfügbar, weil Sie Piwik mit mehreren Servern einsetzen. Bitte laden Sie die neueste Version von %1$s herunter, um fortzufahren.", "AdblockIsMaybeUsed": "Für den Fall, dass Sie einen Ad-Blocker verwenden, deaktivieren Sie diesen bitte für diese Seite um sicherzustellen, dass Piwik problemlos läuft.", "ChangeCurrentWebsite": "Wählen Sie eine Webseite, aktuell gewählte Webseite: %s" } diff --git a/plugins/CoreHome/lang/el.json b/plugins/CoreHome/lang/el.json index 3a1c3531ec..4ce8adfe76 100644 --- a/plugins/CoreHome/lang/el.json +++ b/plugins/CoreHome/lang/el.json @@ -65,6 +65,7 @@ "QuickAccessTitle": "Αναζήτηση για %s. Χρησιμοποιήστε τα βελάκια για να πλοηγηθείτε μεταξύ των αποτελεσμάτων αναζήτησης. Συντόμευση πληκτρολογίου: πατήστε 'f' για αναζήτηση.", "MenuEntries": "Καταχωρήσεις μενού", "Segments": "Τμήματα", + "OneClickUpdateNotPossibleAsMultiServerEnvironment": "Η ενημέρωση με ένα κλικ δεν είναι διαθέσιμη καθώς χρησιμοποιείτε το Piwik με πολλαπλούς διακομιστές. Κατεβάστε την τελευταία έκδοση από %1$s για να συνεχίσετε.", "AdblockIsMaybeUsed": "Σε περίπτωση που χρησιμοποιείτε κάποια πρόγραμμα που μπλοκάρει τις διαφημίσεις, παρακαλούμε απενεργοποιήστε το για αυτόν τον ιστοτόπο για να είστε σίγουροι ότι το Piwik δουλεύει σωστά.", "ChangeCurrentWebsite": "Επιλέξτε ένα ιστοτόπο, επιλεγμένος ιστοτόπος αυτή τη στιγμή: %s" } diff --git a/plugins/CoreHome/lang/fr.json b/plugins/CoreHome/lang/fr.json index d0f4dd44d2..76712f6a9b 100644 --- a/plugins/CoreHome/lang/fr.json +++ b/plugins/CoreHome/lang/fr.json @@ -65,6 +65,7 @@ "QuickAccessTitle": "Recherche pour %s. Utilisez les flèches de navigation pour parcourir les résultats de recherche. Raccourci : appuyez sur 'f' pour rechercher.", "MenuEntries": "Entrées de menu", "Segments": "Segments", + "OneClickUpdateNotPossibleAsMultiServerEnvironment": "La mise à jour en un clic n'est pas disponible car vous utilisez Piwik sur plusieurs serveurs. Veuillez télécharger la dernière version depuis %1$s pour continuer.", "AdblockIsMaybeUsed": "Dans le cas où vous utiliseriez un bloqueur de publicités, veuillez le désactiver pour ce site afin de vous assurer que Piwik fonctionne correctement.", "ChangeCurrentWebsite": "Choisir un site web, site couramment sélectionné : %s" } diff --git a/plugins/CoreHome/lang/it.json b/plugins/CoreHome/lang/it.json index 8b52a1603d..f37cea95e7 100644 --- a/plugins/CoreHome/lang/it.json +++ b/plugins/CoreHome/lang/it.json @@ -7,6 +7,7 @@ "ClickToEditX": "Clicca per modificare %s", "CloseSearch": "Chiudi la ricerca", "CloseWidgetDirections": "Potete chiudere questo widget cliccando sull'icona 'X' nella parte alta del widget stesso.", + "ChooseX": "Scegli %1$s", "DataForThisReportHasBeenPurged": "I dati di questo report hanno più di un mese %s e sono stati eliminati.", "DataTableExcludeAggregateRows": "Le righe di aggregazione vengono visualizzate %s Nascondile", "DataTableIncludeAggregateRows": "Le righe di aggregazione sono nascoste %s Visualizzale", diff --git a/plugins/CoreHome/lang/ru.json b/plugins/CoreHome/lang/ru.json index 690f1ab9c9..4060f1ddf7 100644 --- a/plugins/CoreHome/lang/ru.json +++ b/plugins/CoreHome/lang/ru.json @@ -7,6 +7,7 @@ "ClickToEditX": "Редактировать %s", "CloseSearch": "Закрыть поиск", "CloseWidgetDirections": "Вы можете закрыть этот виджет, нажав на значок 'X' в верхней части виджета.", + "ChooseX": "Выберите %1$s", "DataForThisReportHasBeenPurged": "Данные для этого отчета хранятся более %s месяцев и были почищены.", "DataTableExcludeAggregateRows": "Выбранные строки отображены %s Скрыть их", "DataTableIncludeAggregateRows": "Выбранные строки скрыты %s Показать их", @@ -14,10 +15,11 @@ "Default": "по умолчанию", "DonateCall1": "Piwik всегда будет бесплатным для использования, но это не значит, что нам это ничего не стоит.", "DonateCall2": "Piwik нуждается в вашей постоянной поддержке, чтобы расти и процветать.", + "DonateCall3": "Если аналитика Piwik привнесла ценность для вашего бизнеса или деятельности, пожалуйста, %1$sсделайте пожертвование%2$s или %3$sсовершите покупку премиум-версии%4$s.", "DonateFormInstructions": "Выберите ползунком нужную сумму, а затем нажмите Subscribe для пожертвования и подписки.", "ExcludeRowsWithLowPopulation": "Все строки отображены %s Кроме низких показателей", "ExternalHelp": "Помощь (откроется в новой вкладке)", - "FlattenDataTable": "Отчет построен по иерархии %s Сделать его более конкретным", + "FlattenDataTable": "Отчет построен по иерархии %s Сделать его линейным", "HowMuchIsPiwikWorth": "Определите стоимость Piwik для вас", "IncludeRowsWithLowPopulation": "Строки с низкими показателями отображены %s Показать все", "InjectedHostEmailBody": "Привет, попытался зайти в Piwik сегодня и столкнулся с проблемой неизвестного хоста.", @@ -50,7 +52,9 @@ "WebAnalyticsReports": "Отчеты веб аналитики", "YouAreUsingTheLatestVersion": "У вас последняя версия Piwik!", "ClickRowToExpandOrContract": "Нажмите на эту строку, чтобы растянуть или сжать подтаблицу.", + "UndoPivotBySubtable": "Этот отчёт развёрнут %s Отменить горизонтальный отчёт", "NoSuchPage": "Запрашиваемая страница не существует.", + "PivotBySubtable": "Этот отчёт не развёрнут %1$s развернуть по параметру %2$s", "SystemSummaryWidget": "Системный отчёт", "SystemSummaryNWebsites": "%d веб-сайтов", "SystemSummaryNSegments": "%d сегментов", @@ -61,6 +65,7 @@ "QuickAccessTitle": "Поиск %s. Используйте клавиши со стрелками для переходов в пределах результатов поиска. Быстрый доступ: нажмите 'f' для поиска.", "MenuEntries": "Пункты меню", "Segments": "Сегменты", + "OneClickUpdateNotPossibleAsMultiServerEnvironment": "Автоматическое обновление недоступно так как вы используете Piwik с несколькими серверами. Пожалуйста, скачайте вручную последнюю версию с %1$s для продолжения.", "AdblockIsMaybeUsed": "В случае, если вы используете блокировщик рекламы, пожалуйста, отключите его, чтобы убедиться, что Piwik работает без проблем.", "ChangeCurrentWebsite": "Выбор вебсайта, сейчас выбран вебсайт: %s" } diff --git a/plugins/CoreHome/lang/sq.json b/plugins/CoreHome/lang/sq.json index d9114896d8..c756fd9412 100644 --- a/plugins/CoreHome/lang/sq.json +++ b/plugins/CoreHome/lang/sq.json @@ -65,6 +65,7 @@ "QuickAccessTitle": "Kërkoni për %s. Përdorni tastet shigjetë që të lëvizni nëpër përfundimet e kërkimit. Shkurtore tastiere: Shtypni 'f' që të kërkohet.", "MenuEntries": "Zëra menuje", "Segments": "Segmente", + "OneClickUpdateNotPossibleAsMultiServerEnvironment": "S’kryeni dot përditësim me një klikim, ngaqë po e përdorni Piwik-un me disa shërbyes. Ju lutemi, që të mund të vazhdohet, shkarkoni versionin më të ri prej %1$s.", "AdblockIsMaybeUsed": "Në rast se përdorni ndonjë bllokues reklamash, ju lutemi çaktivizojeni për këtë sajt, që të siguroni punën pa probleme të Piwik-ut.", "ChangeCurrentWebsite": "Zgjidhni një sajt, sajti i përzgjedhur tani: %s" } diff --git a/plugins/CoreHome/lang/sv.json b/plugins/CoreHome/lang/sv.json index 5c9784b5f4..01b67fa6a5 100644 --- a/plugins/CoreHome/lang/sv.json +++ b/plugins/CoreHome/lang/sv.json @@ -1,10 +1,13 @@ { "CoreHome": { "CategoryNoData": "Det finns ingen data i denna kategori. Försök att \"Inkludera alla träffar\".", + "ChangeVisualization": "Byt visualisering", "CheckForUpdates": "Sök efter uppdateringar", "CheckPiwikOut": "Kolla in Piwik!", "ClickToEditX": "Klicka för att redigera %s", + "CloseSearch": "Stäng sökning", "CloseWidgetDirections": "Du kan stänga widgeten genom att klicka på (X) på widgetens topp.", + "ChooseX": "Välj %1$s", "DataForThisReportHasBeenPurged": "Data för denna rapport är mer än %s månader gammal och har tagits bort.", "DataTableExcludeAggregateRows": "Aggregerade rader dolda %s Dölj dem", "DataTableIncludeAggregateRows": "Aggregerade rader dolda %s Visa dem", @@ -46,7 +49,15 @@ "YouAreUsingTheLatestVersion": "Du använder den senaste versionen av Piwik!", "ClickRowToExpandOrContract": "Klicka på denna rad för att visa eller dölja undertabeller.", "UndoPivotBySubtable": "Denna rapport har pivoterats %s Ångra pivotering", + "NoSuchPage": "Denna sida finns inte", "PivotBySubtable": "Denna rapport är inte pivoterad %1$s Pivotera med %2$s", + "SystemSummaryWidget": "Systemsammanfattning", + "SystemSummaryNWebsites": "%d webbplatser", + "SystemSummaryNSegments": "%d segment", + "SystemSummaryNActivatedPlugins": "%d aktiverade plugins", + "SystemSummaryPiwikVersion": "Piwik version", + "SystemSummaryMysqlVersion": "MySQL version", + "SystemSummaryPhpVersion": "PHP version", "QuickAccessTitle": "Sök efter %s. Använd piltangenterna för att navigera i sökresultatet. Genväg: Tryck på 'f' för att söka.", "MenuEntries": "Menyposter", "Segments": "Segment", diff --git a/plugins/CoreHome/lang/uk.json b/plugins/CoreHome/lang/uk.json index d58cc9953f..518cdd0e96 100644 --- a/plugins/CoreHome/lang/uk.json +++ b/plugins/CoreHome/lang/uk.json @@ -65,6 +65,7 @@ "QuickAccessTitle": "Пошук %s. Використовуйте клавіші зі стрілками для переходів в межах результатів пошуку. Швидкий доступ: натисніть 'f' для пошуку.", "MenuEntries": "Пункти меню", "Segments": "Сегменти", + "OneClickUpdateNotPossibleAsMultiServerEnvironment": "Оновлення одним клацанням миші не доступно, як ви використовуєте Piwik з декількома серверами. Будь ласка, завнтажте останню версію з %1$s щоб продовжити.", "AdblockIsMaybeUsed": "У разі, якщо ви використовуєте блокувальник реклами, будь ласка, вимкніть його, щоб переконатися, що Piwik працює без проблем.", "ChangeCurrentWebsite": "Вибір веб-сайту, зараз обраний вебсайт: %s" } diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js index 76c6ff566d..f3d9680819 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js +++ b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js @@ -83,6 +83,14 @@ } }); + scope.$watch('formField.uiControlAttributes.disabled', function (val, oldVal) { + if (val !== oldVal) { + $timeout(function () { + $select.material_select(); + }); + } + }); + } else if (hasUiControl(field, 'textarea')) { element.find('textarea').trigger('autoresize'); scope.$watch('formField.value', function (val, oldVal) { diff --git a/plugins/CorePluginsAdmin/lang/am.json b/plugins/CorePluginsAdmin/lang/am.json index f4e59be512..68558d64d4 100644 --- a/plugins/CorePluginsAdmin/lang/am.json +++ b/plugins/CorePluginsAdmin/lang/am.json @@ -6,7 +6,6 @@ "Deactivate": "አቦዝን", "Inactive": "ያልተመረጠ", "PluginHomepage": "የተሰኪ መነሻ ገፅ", - "PluginKeywords": "ቁልፍ ቃላት", "PluginsManagement": "ተሰኪዎች መመነጅ", "Status": "ሁኔታ", "Version": "ስሪት", diff --git a/plugins/CorePluginsAdmin/lang/ar.json b/plugins/CorePluginsAdmin/lang/ar.json index c6b9067f05..2925611878 100644 --- a/plugins/CorePluginsAdmin/lang/ar.json +++ b/plugins/CorePluginsAdmin/lang/ar.json @@ -1,50 +1,25 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "تفعيل الإضافة", - "ActionActivateTheme": "تفعيل الثيم", - "ActionInstall": "تنصيب", "ActionUninstall": "إلغاء التنصيب", "Activate": "تفعيل", "Activated": "تم تفعيله", "Active": "مفعل", "Activity": "النشاط", - "AllowedUploadFormats": "يمكنك رفع إضافة او ثيم بصيغة .zip عبر هذة الصفحة.", "AuthorHomepage": "صفحة الناشر", - "Authors": "المالكون", - "BackToExtendPiwik": "العودة الي سوق العرض", "Deactivate": "تعطيل", - "Developer": "المطور", - "FeaturedPlugin": "إضافات مميزة", "History": "التاريخ", "Inactive": "معطل", - "LastCommitTime": "(اخر تحديث %s)", - "LastUpdated": "أخر تحديث", "LicenseHomepage": "صفحة الرخصة", "PluginsExtendPiwik": "التطبيقات تزيد من إمكانيات Piwik.", "OncePluginIsInstalledYouMayActivateHere": "ما أن يتم تنصيب تطبيق، يمكنك تفعيل أو تعطيل التطبيق من هنا.", - "Marketplace": "سوق العرض", - "MarketplaceSellPluginSubject": "سوق العرض - بيع إضافة", "MenuPlatform": "المنصة", - "NoPluginsFound": "لم يتم العثور علي إضافات", - "NoThemesFound": "لم يتم العثور علي ثيمات", "OriginThirdParty": "طرف ثالث", "PluginHomepage": "صفحة التطبيقات الرئيسية", - "PluginKeywords": "كلمات دلالية", "PluginsManagement": "إدارة التطبيقات", - "PluginUpdateAvailable": "أنت تستخدم الإصدار %1$s %2$sويوجد إصدار جديد متاح", - "PluginWebsite": "الموقع الإلكتروني للإضافة", - "Screenshots": "صور العرض", "Status": "الحالة", - "StepUnzippingPlugin": "إستخراج الإضافة", - "StepUnzippingTheme": "إستخراج الثيم", - "Support": "الدعم", "Theme": "الثيم", "ThemesManagement": "إدارة الثيمات", - "Updated": "تم التحديث", - "UpdatingPlugin": "جاري تحديث %s", - "UploadZipFile": "رفع الملف المضغوط", "Version": "الإصدار", - "ViewRepositoryChangelog": "مشاهدة التعديلات", "Websites": "المواقع" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/be.json b/plugins/CorePluginsAdmin/lang/be.json index 68354cc10f..cd46cfab19 100644 --- a/plugins/CorePluginsAdmin/lang/be.json +++ b/plugins/CorePluginsAdmin/lang/be.json @@ -10,7 +10,6 @@ "PluginsExtendPiwik": "Плагіны пашыраюць функцыянальнасць Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Пасля ўсталёўкі плагіна Вы можаце актываваць ці дэактываваць яго тут.", "PluginHomepage": "Хатняя старонка плагіна", - "PluginKeywords": "Ключавыя словы", "PluginsManagement": "Кіраванне плагінамі", "Status": "Статус", "Version": "Версія", diff --git a/plugins/CorePluginsAdmin/lang/bg.json b/plugins/CorePluginsAdmin/lang/bg.json index f740354b04..649467e77b 100644 --- a/plugins/CorePluginsAdmin/lang/bg.json +++ b/plugins/CorePluginsAdmin/lang/bg.json @@ -1,90 +1,47 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Активиране на добавка", - "ActionActivateTheme": "Активирай тапет", - "ActionInstall": "Инсталиране", "ActionUninstall": "Деинсталиране", "Activate": "Активирай", "Activated": "Активиран", "Active": "Активна", "Activity": "Активност", - "AllowedUploadFormats": "Може да качите добавка или тапет в zip формат посредством тази страница.", "AuthorHomepage": "Начало на автор", - "Authors": "Автори", - "BackToExtendPiwik": "Връщане към магазина за приложения", - "BeCarefulUsingPlugins": "Бъдете внимателни с добавките, които не са създадени от екипа на Piwik: те не са проверени.", - "BeCarefulUsingThemes": "Бъдете внимателни с тапетите, които не са създадени от екипа на Piwik: те не са проверени.", - "ByXDevelopers": "от %s разработчици", "Changelog": "Списък с промените", "ChangeSettingsPossible": "Промяна на %1$sнастройките%2$s за тази добавка.", "CorePluginTooltip": "Основните добавки нямат версия, тъй като се разпространяват с Piwik.", "Deactivate": "Деактивирай", - "Developer": "Разработчик", "DoMoreContactPiwikAdmins": "За да се инсталира нова добавка или нова тема, трябва да се свържете с вашия администратор, който отговаря за Piwik.", - "FeaturedPlugin": "Препоръчана добавка", - "GetEarlyAccessForPaidPlugins": "Забележка: всички от наличните добавки са безплатни за използване; в бъдеще ще има платена секция в магазина за приложения (%1$sсвържете се с нас%2$s за предварителен достъп).", "History": "История", "Inactive": "Неактивна", "InfoPluginUpdateIsRecommended": "Обновете вашите добавки, за да се възползвате от най-новите подобрения.", "InfoThemeIsUsedByOtherUsersAsWell": "Забележка: други %1$s потребители регистрирани в този Piwik също използват тапет %2$s.", "InfoThemeUpdateIsRecommended": "Обновете вашите тапети, за да получите последната версия.", - "InstallingPlugin": "Инсталира се %s", "InstallNewPlugins": "Инсталиране на нови добавки", "InstallNewThemes": "Добави нови тапети", - "LastCommitTime": "(последен принос %s)", - "LastUpdated": "Последно обновена", "LicenseHomepage": "Начало на лиценз", "PluginsExtendPiwik": "Добавките разширяват функционалността на Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Веднъж инсталирана, добавката може да бъде активирана (пускана) или деактивирана (спирана).", - "Marketplace": "Магазин", - "MarketplaceSellPluginSubject": "Магазин – Продайте добавка", "MenuPlatform": "Платформа", "MissingRequirementsNotice": "Моля, обновете %1$s %2$s до по-нова версия, %1$s %3$s се изисква.", - "NoPluginsFound": "Не е намерена добавка", - "NotAllowedToBrowseMarketplacePlugins": "Може да разгледате списъка с добавки, които могат да бъдат инсталирани, за да настроите или разширите вашата Piwik платформа. Моля, свържете се с вашия системен администратор, ако желаете да бъде инсталирана някоя добавка.", - "NotAllowedToBrowseMarketplaceThemes": "Може да разгледате списъка с тапети, които могат да бъдат инсталирани, за да променят изгледа на Piwik. Моля, свържете се с вашия системен администратор, за да извърши инсталацията им.", - "NoThemesFound": "Не са намерени тапети", "NoZipFileSelected": "Моля, изберете zip файл.", - "NumDownloadsLatestVersion": "Последна версия:%s сваляния", "NumUpdatesAvailable": "Налични са обновления %s", "Origin": "Произход", "OriginCore": "Ядро", "OriginThirdParty": "Трета страна", "PluginHomepage": "Сайт на добавката", - "PluginKeywords": "Ключови думи", "PluginNotCompatibleWith": "%1$s добавка не е съвместима с %2$s.", "PluginNotWorkingAlternative": "Ако сте използвали тази добавка, може би ще намерите по-нова версия в магазина за приложения. В случай, че няма по-нова версия, може би ще желаете да деинсталирате добавката.", "PluginRequirement": "%1$s изисква %2$s.", "PluginsManagement": "Управление на добавките", - "PluginUpdateAvailable": "Използва се версия %1$s и е налична нова версия %2$s.", - "PluginVersionInfo": "%1$s от %2$s", - "PluginWebsite": "Сайт за добавки", - "Screenshots": "Екранни снимки", "Status": "Състояние", - "StepDownloadingPluginFromMarketplace": "Сваляне на добавка от магазина за приложения", - "StepDownloadingThemeFromMarketplace": "Сваляне на тапет от магазина за приложения", - "StepPluginSuccessfullyInstalled": "Успешно е инсталирана добавка %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Успешно е обновена добавка %1$s %2$s.", - "StepReplaceExistingPlugin": "Подмяна на съществуваща добавка", - "StepReplaceExistingTheme": "Замяна на съществуващ тапет", - "StepThemeSuccessfullyInstalled": "Вие успешно инсталирахте тапет %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Вие успешно обновихте тапет %1$s %2$s.", - "StepUnzippingPlugin": "Добавката се разархивира", - "StepUnzippingTheme": "Тапетът се разархивира", "SuccessfullyActicated": "Успешно беше активирано <strong>%s<\/strong>.", - "Support": "Поддръжка", "TeaserExtendPiwik": "Разширете възможностите на Piwik с добавки и тапети", - "TeaserExtendPiwikByUpload": "Разширяване на възможностите на Piwik, чрез добавяне на zip файл", "Theme": "Тапет", "Themes": "Тапети", "ThemesDescription": "Тапетите могат да променят въшншия вид на потребителския интерфейс на Piwik и да осигурят ново пълноценно визуално усещане, за да се насладите на Вашите статистики.", "ThemesManagement": "Управление на тапетите", "UninstallConfirm": "Вие сте на път да деинсталирате добавката %s. Добавката ще бъде напълно премахната от вашата платформа и няма да може да бъде възстановена. Наистина ли искате да направите това?", - "Updated": "Обновени", - "UpdatingPlugin": "Обновява се %s", - "UploadZipFile": "Качване на zip файл", "Version": "Версия", - "ViewRepositoryChangelog": "Преглед на промените", "Websites": "Сайтове" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/ca.json b/plugins/CorePluginsAdmin/lang/ca.json index 05d6a13fa5..56c011a6b5 100644 --- a/plugins/CorePluginsAdmin/lang/ca.json +++ b/plugins/CorePluginsAdmin/lang/ca.json @@ -1,19 +1,16 @@ { "CorePluginsAdmin": { - "ActionInstall": "Instal·la", "Activate": "Activa", "Activated": "Actiu", "Active": "Actiu", "Activity": "Activitat", "AuthorHomepage": "Pàgina de l'autor", - "Authors": "Autors", "Deactivate": "Desactiva", "Inactive": "Inactiu", "LicenseHomepage": "Pàgina de la llicència", "PluginsExtendPiwik": "Els connectors augmenten la funcionalitat del Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Un cop hi ha un connector instal·lat, podeu activar-lo i desactivar-lo aquí.", "PluginHomepage": "Pàgina web", - "PluginKeywords": "Paraules clau", "PluginsManagement": "Gestiona els connectors", "Status": "Estat", "Version": "Versió", diff --git a/plugins/CorePluginsAdmin/lang/cs.json b/plugins/CorePluginsAdmin/lang/cs.json index 7d29a7e7b3..3db91db438 100644 --- a/plugins/CorePluginsAdmin/lang/cs.json +++ b/plugins/CorePluginsAdmin/lang/cs.json @@ -1,43 +1,27 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Aktivovat zásuvný modul", - "ActionActivateTheme": "Aktivovat šablonu", - "ActionInstall": "Instalovat", "ActionUninstall": "Odinstalovat", "Activate": "Povolit", "Activated": "Aktivován", "Active": "Povolen", "Activity": "Aktivita", - "AllowedUploadFormats": "Na této stránce můžete nahrát zásuvný modul nebo šablonu ve formátu .zip.", + "AlwaysActivatedPluginsList": "Následující zásuvné moduly zůstávají vždy aktivní a nelze je vypnout: %s", "AuthorHomepage": "Domovská stránka autorů", - "Authors": "Autoři", - "BackToExtendPiwik": "Zpět na obchod", - "BeCarefulUsingPlugins": "Zásuvné moduly které nejsou tvořeny týmem Piwiku musí být používány opatrně: nekontrolovali jsme je.", - "BeCarefulUsingThemes": "Šablony které nejsou tvořeny týmem Piwiku musí být používány opatrně: nekontrolovali jsme je.", - "ByXDevelopers": "Od %s vývojářů", - "CannotInstall": "Nelze nainstalovat (nápověda)", "Changelog": "Protokol změn", "ChangeSettingsPossible": "Pro tento zásuvný modul můžete změnit %1$snastavení%2$s.", "CorePluginTooltip": "Jaderné zásuvné moduly nemají verzi, protože jsou distribuovány s Piwikem.", "Deactivate": "Zakázat", - "Developer": "Vývojář", - "DevelopersLearnHowToDevelopPlugins": "Vývojáři: naučte se, jak rozšířit Piwik vývojem %1$szásuvných modulů nebo témat vzhledu%2$s.", "DoMoreContactPiwikAdmins": "Pokud chcete nainstalovat nový zásuvný modul nebo šablonu,, kontaktujte vaše administrátory Piwiku.", - "FeaturedPlugin": "Doporučovaný zásuvný modul", "ChangeLookByManageThemes": "Vzhled Piwiku můžete změnit %1$sve správě motivů%2$s.", - "GetEarlyAccessForPaidPlugins": "Poznámka: Momentálně jsou všechny zásuvné moduly v obchodě zdarma. V budoucnu máme v plánu povolit placené zásuvné moduly. %1$sKontaktujte nás%2$s pro včasný přístup.", "History": "Historie", "Inactive": "Zakázán", + "InstalledPlugins": "Nainstalované zásuvné moduly", + "InstalledThemes": "Nainstalovaná témata vzhledu", "InfoPluginUpdateIsRecommended": "Aktualizujte vaše zásuvné moduly nyní, abyste mohli využít všechna vylepšení.", "InfoThemeIsUsedByOtherUsersAsWell": "Poznámka: Ostatní %1$suživatelé registrovaní v tomto Piwiku rovněž používají tuto šablonu %2$s.", "InfoThemeUpdateIsRecommended": "Aktualizujte vaše šablony a užívejte si poslední verzi.", - "InstallingPlugin": "Instalování %s", "InstallNewPlugins": "Instalovat nové zásuvné moduly", "InstallNewThemes": "Instalovat nové šablony", - "InstalledPlugins": "Nainstalované zásuvné moduly", - "InstalledThemes": "Nainstalovaná témata vzhledu", - "LastCommitTime": "(Poslední změna %s)", - "LastUpdated": "Naposledy aktualizován", "LicenseHomepage": "Licencovat domovskou stránku", "LikeThisPlugin": "Líbí se vám tento zásuvný modul?", "ConsiderDonating": "Zvažte dar", @@ -45,66 +29,38 @@ "ConsiderDonatingCreatorOf": "Zvažte dar pro tvůrce %s", "PluginsExtendPiwik": "Zásuvné moduly rozšiřují funkce Piwiku.", "OncePluginIsInstalledYouMayActivateHere": "Po instalaci zásuvného modulu jej můžete povolit nebo zakázat zde.", - "Marketplace": "Obchod", - "MarketplaceSellPluginSubject": "Obchod - prodat zásuvný modul", "MenuPlatform": "Platforma", "MissingRequirementsNotice": "Prosím aktualizujte %1$s%2$s na novější verzi, je vyžadována %1$s %3$s.", "MissingRequirementsPleaseInstallNotice": "Prosím nainstalujte %1$s %2$s, protože je vyžadován %3$s.", - "NewVersion": "nová verze", - "NoPluginsFound": "Žádné zásuvné moduly nenalezeny", - "NoPluginSettings": "Žádná nastavení zásuvného modulu, která by bylo možné nastavit", - "NotAllowedToBrowseMarketplacePlugins": "Můžete si projít zásuvné moduly, které rozšiřují možnosti Piwik platformy. Pokud některý z nich potřebujete, kontaktujte administrátora.", - "NotAllowedToBrowseMarketplaceThemes": "Můžete si projít seznam šablon, které mohou být instalovány k přizpůsobení vzhledu Piwik platformy. Pokud nějakou z nich chcete použít, kontaktujte administrátora.", - "NoThemesFound": "Nenalezeny žádné šablony", "NoZipFileSelected": "Prosím vyberte soubor .zip.", - "NumDownloadsLatestVersion": "Poslední verze: %s Stažení", "NumUpdatesAvailable": "%s Dostupné aktualizace", + "NoPluginSettings": "Žádná nastavení zásuvného modulu, která by bylo možné nastavit", "Origin": "Původ", "OriginCore": "Jádro", "OriginThirdParty": "Třetí strana", "PluginHomepage": "Domovská stránka zásuvného modulu", - "PluginKeywords": "Klíčová slova", "PluginNotCompatibleWith": "%1$s zásuvný modul není kompatibilní s %2$s", "PluginNotWorkingAlternative": "Pokud jste tento zásuvný modul používali, možná najdete v obchodě novější verzi. Pokud ne, možná ho chcete odinstalovat.", "PluginRequirement": "%1$s vyžaduje %2$s.", "PluginsManagement": "Správa zásuvných modulů", - "PluginUpdateAvailable": "Používáte verzi %1$s, ale je dostupná novější verze %2$s.", - "PluginVersionInfo": "%1$s z %2$s", - "PluginWebsite": "Stránky zásuvného modulu", - "Screenshots": "Snímky obrazovky", - "SortByAlpha": "Alfa", - "SortByNewest": "Nejnovější", - "SortByPopular": "Oblíbené", + "NotDownloadable": "Není ke stažení", + "PluginNotDownloadable": "Zásuvný modul není ke stažení.", + "PluginNotDownloadablePaidReason": "Možné důvody jsou vypršená, či překročená licence.", + "PluginActivated": "Modul aktivován", "Status": "Stav", - "StepDownloadingPluginFromMarketplace": "Stahování zásuvného modulu z obchodu", - "StepDownloadingThemeFromMarketplace": "Stahování šablony z obchodu", - "StepPluginSuccessfullyInstalled": "Úspěšně jste nainstalovali zásuvný modul %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Úspěšně jste aktualizovali zásuvný modul %1$s %2$s.", - "StepReplaceExistingPlugin": "Nahrazování existujícího zásuvného modulu", - "StepReplaceExistingTheme": "Nahrazování existující šablony", - "StepThemeSuccessfullyInstalled": "Úspěšně jste nainstalovali šablonu %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Úspěšně jste aktualizovali šablonu %1$s %2$s.", - "StepUnzippingPlugin": "Rozbalování zásuvného modulu", - "StepUnzippingTheme": "Rozbalování šablony", "SuccessfullyActicated": "Úspěšně jste aktivovali <strong>%s<\/strong>.", - "Support": "Podpora", "TeaserExtendPiwik": "Rozšiřte Piwik s použitím zásuvných modulů a šablon", "TeaserExtendPiwikByPlugin": "Rozšiřte Piwik %1$sinstalací nového zásuvného modulu%2$s.", "TeaserExtendPiwikByTheme": "Užijte si nový vzhled po %1$sinstalaci nového vzhledu%2$s.", - "TeaserExtendPiwikByUpload": "Rozšiřte Piwik nahráním zip souboru", "InstallingNewPluginViaMarketplaceOrUpload": "Můžete zásuvný modul nainstalovat automaticky z obchodu, %1$snebo ho nahrát%2$s ve formátu .zip.", "Theme": "Šablona", "Themes": "Šablony", "ThemesDescription": "Šablony mohou změnit vzhled uživatelského rozhraní Piwiku a přinést nový zážitek z vašich analytických hlášení.", "ThemesManagement": "Správce šablon", "UninstallConfirm": "Chystáte se odebrat zásuvný modul %s. Tento modul bude kompletně odebrán z platformy a akci nebude možné vrátit zpět. Jste si jisti, že to chcete provést?", - "Updated": "Aktualizováno", - "UpdatingPlugin": "Aktualizace %s", - "UploadZipFile": "Nahrát zip soubor", "Version": "Verze", - "ViewRepositoryChangelog": "Zobrazit změny", "ViewAllMarketplacePlugins": "Zobrazit všechny zásuvné moduly v marketplace zásuvných modulů", - "Websites": "Stránky", - "WeDeactivatedThePluginAsItHasMissingDependencies": "Zásuvný modul %s byl vypnut, chybí závislosti:" + "WeDeactivatedThePluginAsItHasMissingDependencies": "Zásuvný modul %s byl vypnut, chybí závislosti:", + "Websites": "Stránky" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/da.json b/plugins/CorePluginsAdmin/lang/da.json index 734ea080aa..c74ecf6f9f 100644 --- a/plugins/CorePluginsAdmin/lang/da.json +++ b/plugins/CorePluginsAdmin/lang/da.json @@ -1,41 +1,24 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Aktiver programudvidelse", - "ActionActivateTheme": "Aktiver tema", - "ActionInstall": "Installer", "ActionUninstall": "Afinstaller", "Activate": "Aktiver", "Activated": "Aktiveret", "Active": "Aktiv", "Activity": "Aktivitet", - "AllowedUploadFormats": "Du kan via denne side overføre en programudvidelse eller tema i .zip-format.", "AuthorHomepage": "Forfatter hjemmeside", - "Authors": "Forfattere", - "BackToExtendPiwik": "Tilbage til markedspladsen", - "BeCarefulUsingPlugins": "Programudvidelser, der ikke er forfattet af Piwik holdet skal anvendes med forsigtighed: vi har ikke kontrolleret dem.", - "BeCarefulUsingThemes": "Temaer, der ikke er forfattet af Piwik holdet skal anvendes med forsigtighed: vi har ikke kontrolleret dem.", - "ByXDevelopers": "af %s udviklere", - "CannotInstall": "Kan ikke installere (hjælp)", "Changelog": "Ændringslog", "ChangeSettingsPossible": "Du kan ændre %1$sindstillinger%2$s for denne programudvidelse", "CorePluginTooltip": "Kerne programudvidelser har ingen version, da de distribuereter med Piwik.", "Deactivate": "Deaktiver", - "Developer": "Udvikler", - "DevelopersLearnHowToDevelopPlugins": "Udviklere: Lær hvordan du kan udvide og tilpasse Piwik ved at %1$sudvikle udvidelser eller temaer%2$s.", "DoMoreContactPiwikAdmins": "For at installere en ny programudvidelse eller et nyt tema, kontakt Piwik administratoren.", - "FeaturedPlugin": "Udvalgte programudvidelser", "ChangeLookByManageThemes": "Skift udseendet på Piwik med %1$sAdministration af temaer%2$s.", - "GetEarlyAccessForPaidPlugins": "Bemærk: alle programudvidelser er tilgængelige gratis på nuværende tidspunkt; i fremtiden vil vi sætte betalte programudvidelser på markedspladsen (%1$skontakt os%2$s for tidlig adgang).", "History": "Historik", "Inactive": "Inaktiv", "InfoPluginUpdateIsRecommended": "Opdater dine programudvidelser nu og drag fordel af de seneste forbedringer.", "InfoThemeIsUsedByOtherUsersAsWell": "Bemærk: Den anden %1$s bruger der er registreret i denne Piwik bruger også temaet %2$s.", "InfoThemeUpdateIsRecommended": "Opdater dine temaer for at nyde den nyeste version.", - "InstallingPlugin": "Installerer %s", "InstallNewPlugins": "Installer nye udvidelser", "InstallNewThemes": "Installer nye temaer", - "LastCommitTime": "(last bidrag %s)", - "LastUpdated": "Sidst opdateret", "LicenseHomepage": "Licens hjemmeside", "LikeThisPlugin": "Kan du lide dette plugin?", "ConsiderDonating": "Overvej donation", @@ -43,58 +26,29 @@ "ConsiderDonatingCreatorOf": "Overvej venligst at donere et beløb til skaberne af %s", "PluginsExtendPiwik": "Programudvidelser udbygger og udvider funktionaliteten af Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Når en udvidelse er installeret, kan den aktiveres eller deaktiveres her.", - "Marketplace": "Markedsplads", - "MarketplaceSellPluginSubject": "Markedspladsen - Sælg programudvidelser", "MenuPlatform": "Platform", "MissingRequirementsNotice": "Husk at opdatere %1$s %2$s til en nyere version, %1$s %3$s er påkrævet.", "MissingRequirementsPleaseInstallNotice": "Installer %1$s %2$s, da det kræves af %3$s.", - "NewVersion": "ny version", - "NoPluginsFound": "Ingen udvidelsesmoduler fundet", - "NotAllowedToBrowseMarketplacePlugins": "Du kan gennemse listen over programudvidelser, der kan installeres for at tilpasse eller udvide din Piwik platform. Kontakt din administrator, hvis du har brug for nogen af disse installeret.", - "NotAllowedToBrowseMarketplaceThemes": "Du kan gennemse listen over temaer, der kan installeres for at tilpasse udseendet af Piwik platformen. Kontakt din administrator for at få nogen af disse installeret.", - "NoThemesFound": "Ingen temaer fundet", "NoZipFileSelected": "Vælg venligst en ZIP-fil.", - "NumDownloadsLatestVersion": "Nyeste version: %s Overførsler", "NumUpdatesAvailable": "%s opdateringer tilgængelige", "Origin": "Kilde", "OriginCore": "Kernen", "OriginThirdParty": "Tredjeparts", "PluginHomepage": "Udvidelsesmodul hjemmeside", - "PluginKeywords": "Nøgleord", "PluginNotCompatibleWith": "%1$s udvidelsesmodul er ikke kompatibelt med %2$s.", "PluginNotWorkingAlternative": "Hvis du har brugt programudvidelsen,kan du måske finde en nyere version på markedspladen. Hvis ikke, kan du afinstallere den.", "PluginRequirement": "%1$s kræver %2$s", "PluginsManagement": "Udvidelsesmodul administration", - "PluginUpdateAvailable": "Du bruger version %1$s en ny version %2$s er tilgængelig.", - "PluginVersionInfo": "%1$s fra %2$s", - "PluginWebsite": "Programudvidelsens hjemmeside", - "Screenshots": "Skærmbilleder", "Status": "Status", - "StepDownloadingPluginFromMarketplace": "Henter programudvidelse fra markedspladsen", - "StepDownloadingThemeFromMarketplace": "Henter tema fra markedspladsen", - "StepPluginSuccessfullyInstalled": "Du har installeret temaet %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Du har opdateret temaet %1$s %2$s.", - "StepReplaceExistingPlugin": "Erstatter eksisterende programudvidelse", - "StepReplaceExistingTheme": "Erstatter eksisterende tema", - "StepThemeSuccessfullyInstalled": "Du har installeret temaet %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Du har opdateret temaet %1$s %2$s.", - "StepUnzippingPlugin": "Udpakker programudvidelse", - "StepUnzippingTheme": "Udpakker tema", "SuccessfullyActicated": "Du har aktiveret <strong>%s<\/strong>.", - "Support": "Support", "TeaserExtendPiwik": "Udvid Piwik med programudvidelser og temaer", - "TeaserExtendPiwikByUpload": "Udvid Piwik ved at overføre en ZIP-fil", "InstallingNewPluginViaMarketplaceOrUpload": "De kan automatisk installere udvidelser fra markedspladsen eller %1$soverføre en udvidelse%2$s i .zip format.", "Theme": "Tema", "Themes": "Temaer", "ThemesDescription": "Temaer kan ændre udseendet af Piwik brugergrænsefladen,og giver en helt ny visuel oplevelse af dine analytiske rapporter.", "ThemesManagement": "Håndtere temaer", "UninstallConfirm": "Du er ved at afinstallere et udvidelsesmodul %s. Udvidelsesmodulet vil blive fjernet helt fra dit system og vil ikke kunne genskabes. Er du sikker på du vil gøre det?", - "Updated": "Opdateret", - "UpdatingPlugin": "Opdaterer %s", - "UploadZipFile": "Overfør ZIP-fil", "Version": "Version", - "ViewRepositoryChangelog": "Se ændringerne", "Websites": "Websteder" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/de.json b/plugins/CorePluginsAdmin/lang/de.json index 1696d929d7..e64637bf4f 100644 --- a/plugins/CorePluginsAdmin/lang/de.json +++ b/plugins/CorePluginsAdmin/lang/de.json @@ -1,43 +1,26 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Plugin aktivieren", - "ActionActivateTheme": "Theme aktivieren", - "ActionInstall": "Installieren", "ActionUninstall": "Deinstallieren", "Activate": "Aktivieren", "Activated": "Aktiviert", "Active": "Aktiv", "Activity": "Aktivität", - "AllowedUploadFormats": "Sie können über diese Seite ein Plugin oder Theme im .zip-Format hochladen.", "AuthorHomepage": "Website des Autors", - "Authors": "Autoren", - "BackToExtendPiwik": "Zurück zum Marketplace", - "BeCarefulUsingPlugins": "Bitte setzen Sie Plugins, die nicht vom Piwik Team entwickelt wurden mit Bedacht ein: Diese wurden nicht von uns überprüft.", - "BeCarefulUsingThemes": "Bitte setzen Sie Themes, die nicht vom Piwik Team entwickelt wurden mit Bedacht ein: Diese wurden nicht von uns überprüft.", - "ByXDevelopers": "von %s Entwicklern", - "CannotInstall": "Installation nicht möglich (Hilfe)", "Changelog": "Änderungsprotokoll", "ChangeSettingsPossible": "Sie können die %1$sEinstellungen%2$s für dieses Plugin ändern.", "CorePluginTooltip": "Core-Plugins haben keine Version, da diese mit Piwik ausgeliefert werden.", "Deactivate": "Deaktivieren", - "Developer": "Entwickler", - "DevelopersLearnHowToDevelopPlugins": "Für Entwickler: Lernen Sie wie Sie Piwik erweitern und personalisieren können, in dem Sie %1$sPlugins oder Themes entwickeln%2$s.", "DoMoreContactPiwikAdmins": "Um ein neues Plugin oder Theme zu installieren, treten Sie bitte in Kontakt mit Ihren Piwik-Admins.", - "FeaturedPlugin": "Top-Plugin", "ChangeLookByManageThemes": "Sie können das Erscheinungsbild von Piwik mit dem Einsatz von %1$sThemes%2$s ändern.", - "GetEarlyAccessForPaidPlugins": "Hinweis: Derzeit sind alle Plugins kostenlos erhältlich; In Zukunft werden wir auch bezahlte Plugins im Marketplace aktivieren (%1$sKontaktieren Sie uns%2$s für vorzeitigen Zugriff).", "History": "Entwicklung", "Inactive": "Inaktiv", + "InstalledPlugins": "Installierte Plugins", + "InstalledThemes": "Installierte Themes", "InfoPluginUpdateIsRecommended": "Aktualisieren Sie Ihre Plugins jetzt, um von den neuesten Verbesserungen zu profitieren.", "InfoThemeIsUsedByOtherUsersAsWell": "Hinweis: Die anderen %1$s Benutzer, die in diesem Piwik registriert sind, nutzen ebenfalls das Theme %2$s.", "InfoThemeUpdateIsRecommended": "Aktualisieren Sie Ihre Themes, um die neueste Version zu geniessen.", - "InstallingPlugin": "Installiere %s", "InstallNewPlugins": "Neue Plugins installieren", "InstallNewThemes": "Neue Themes installieren", - "InstalledPlugins": "Installierte Plugins", - "InstalledThemes": "Installierte Themes", - "LastCommitTime": "(letzter Commit %s)", - "LastUpdated": "Letzte Aktualisierung", "LicenseHomepage": "Lizenz-Website", "LikeThisPlugin": "Finden Sie dieses Plugin nützlich?", "ConsiderDonating": "Spenden Sie", @@ -45,64 +28,32 @@ "ConsiderDonatingCreatorOf": "Bitte ziehen Sie es in Erwägung dem Ersteller von %s etwas zu spenden.", "PluginsExtendPiwik": "Plugins erweitern die Funktionalität von Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Sobald ein Plugin installiert wurde, können Sie es hier aktivieren bzw. deaktivieren.", - "Marketplace": "Marketplace", - "MarketplaceSellPluginSubject": "Marketplace - Plugin verkaufen", "MenuPlatform": "Plattform", "MissingRequirementsNotice": "Bitte aktualisieren Sie %1$s %2$s auf eine neuere Version, %1$s %3$s wird benötigt.", "MissingRequirementsPleaseInstallNotice": "Bitte installiere %1$s %2$s da es von %3$s benötigt wird.", - "NewVersion": "Neue Version", - "NoPluginsFound": "Keine Plugins gefunden", - "NoPluginSettings": "Es gibt keine Einstellungen dieser Erweiterung, die konfiguriert werden können", - "NotAllowedToBrowseMarketplacePlugins": "Sie können die Liste der installierbaren Plugins durchforsten, um sie für Ihre Plattform anzupassen oder zu erweitern. Bitte kontaktieren Sie Ihren Administrator, wenn Sie eines dieser Plugins installiert haben möchten.", - "NotAllowedToBrowseMarketplaceThemes": "Sie können die Liste der installierbaren Themes durchforsten, um das Erscheinungsbild Ihrer Plattform anzupassen. Bitte kontaktieren Sie Ihren Administrator wenn Sie eines dieser Themes installiert haben möchten.", - "NoThemesFound": "Keine Themes gefunden", "NoZipFileSelected": "Bitte wählen Sie eine ZIP Datei.", - "NumDownloadsLatestVersion": "Letzte Version: %s Downloads", "NumUpdatesAvailable": "%s Aktualisierung(en) verfügbar", + "NoPluginSettings": "Es gibt keine Einstellungen dieser Erweiterung, die konfiguriert werden können", "Origin": "Quelle", "OriginCore": "Core", "OriginThirdParty": "Dritt-Anbieter", "PluginHomepage": "Plugin-Website", - "PluginKeywords": "Suchbegriffe", "PluginNotCompatibleWith": "Das Plugin %1$s ist nicht kompatibel mit %2$s.", "PluginNotWorkingAlternative": "Wenn Sie dieses Plugin eingesetzt haben, finden Sie möglicherweise eine neuere Version im Marketplace. Wenn nicht, sollten Sie es deinstallieren.", "PluginRequirement": "%1$s benötigt %2$s", "PluginsManagement": "Pluginverwaltung", - "PluginUpdateAvailable": "Sie verwenden Version %1$s und eine neue Version %2$s is verfügbar.", - "PluginVersionInfo": "%1$s vom %2$s", - "PluginWebsite": "Website des Plugins", - "Screenshots": "Screenshots", - "SortByAlpha": "Alpha", - "SortByNewest": "Neueste", - "SortByPopular": "Beliebt", "Status": "Status", - "StepDownloadingPluginFromMarketplace": "Download des Plugins aus dem Marketplace", - "StepDownloadingThemeFromMarketplace": "Download des Themes aus dem Marketplace", - "StepPluginSuccessfullyInstalled": "Sie haben erfolgreich das Plugin %1$s %2$s installiert.", - "StepPluginSuccessfullyUpdated": "Sie haben erfolgreich das Plugin %1$s %2$s aktualisiert.", - "StepReplaceExistingPlugin": "Ersetze bestehendes Plugin", - "StepReplaceExistingTheme": "Ersetze bestehendes Theme", - "StepThemeSuccessfullyInstalled": "Sie haben erfolgreich das Theme %1$s %2$s installiert.", - "StepThemeSuccessfullyUpdated": "Sie haben erfolgreich das Theme %1$s %2$s aktualisiert.", - "StepUnzippingPlugin": "Entpacke Plugin", - "StepUnzippingTheme": "Entpacke Theme", "SuccessfullyActicated": "Sie haben <strong>%s<\/strong> erfolgreich aktiviert.", - "Support": "Support", "TeaserExtendPiwik": "Erweitere Piwik mit Plugins und Themes", "TeaserExtendPiwikByPlugin": "Erweitern Sie Piwik durch die %1$sInstallation eines neuen Plugins%2$s.", "TeaserExtendPiwikByTheme": "Wechseln Sie das Erscheinungsbild durch die %1$sInstallation eines neuen Themes%2$s.", - "TeaserExtendPiwikByUpload": "Piwik durch den Upload einer ZIP Datei erweitern", "InstallingNewPluginViaMarketplaceOrUpload": "Sie können Plugins aus dem Marketplace automatisiert installieren oder ein Plugin im .zip Format %1$shochladen%2$s.", "Theme": "Theme", "Themes": "Themes", "ThemesDescription": "Themes können das Aussehen der Benutzeroberfläche für Piwik Anwender ändern, und bringen so ein komplett neues visuelles Erlebnis, das Ihnen die Analyse Ihrer Berichte angenehm gestaltet.", "ThemesManagement": "Themes verwalten", "UninstallConfirm": "Sie sind gerade dabei, das Plugin %s zu deinstallieren. Das Plugin wird vollständig von ihrer Plattform entfernt und kann nicht wiederhergestellt werden. Sind sie sicher, dass sie das tun wollen?", - "Updated": "Aktualisiert", - "UpdatingPlugin": "Aktualisiere %s", - "UploadZipFile": "Zip-Datei hochladen", "Version": "Version", - "ViewRepositoryChangelog": "Änderungen ansehen", "ViewAllMarketplacePlugins": "Alle Marketplace Plugins anzeigen", "Websites": "Websites" } diff --git a/plugins/CorePluginsAdmin/lang/el.json b/plugins/CorePluginsAdmin/lang/el.json index 09bdde35e1..15bbccc1c1 100644 --- a/plugins/CorePluginsAdmin/lang/el.json +++ b/plugins/CorePluginsAdmin/lang/el.json @@ -1,43 +1,27 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Ενεργοποίηση πρόσθετου", - "ActionActivateTheme": "Ενεργοποίηση θέματος", - "ActionInstall": "Εγκατάσταση", "ActionUninstall": "Απεγκατάσταση", "Activate": "Ενεργοποίηση", "Activated": "Ενεργοποιημένο", "Active": "Ενεργό", "Activity": "Δραστηριότητα", - "AllowedUploadFormats": "Μπορείτε να ανεβάσετε ένα πρόσθετο ή θέμα σε μορφή .zip από αυτή τη σελίδα.", + "AlwaysActivatedPluginsList": "Τα εξής πρόσθετα είναι πάντα ενεργοποιημένα και δεν μπορούν να απενεργοποιηθούν: %s", "AuthorHomepage": "Ιστοσελίδα Δημιουργού", - "Authors": "Συγγραφείς", - "BackToExtendPiwik": "Πίσω στην Αγορά", - "BeCarefulUsingPlugins": "Πρόσθετα που δεν έχουν αναπτυχθεί από την ομάδα του Piwik πρέπει να χρησιμοποιούνται με προσοχή: δεν τα ελέγξαμε.", - "BeCarefulUsingThemes": "Θέματα που δεν έχουν αναπτυχθεί από την ομάδα του Piwik πρέπει να χρησιμοποιούνται με προσοχή: δεν τα ελέγξαμε.", - "ByXDevelopers": "από %s προγραμματιστές", - "CannotInstall": "Δεν είναι δυνατή η εγκατάσταση (βοήθεια)", "Changelog": "Αρχείο αλλαγών", "ChangeSettingsPossible": "Μπορείτε να αλλάξετε τις %1$sρυθμίσεις%2$s για το πρόσθετο αυτό.", "CorePluginTooltip": "Τα πρόσθετα του πυρήνα δεν έχουν έκδοση από τη στιγμή που διανέμονται μαζί με το Piwik.", "Deactivate": "Απενεργοποίηση", - "Developer": "Προγραμματιστής", - "DevelopersLearnHowToDevelopPlugins": "Προγραμματιστές: Μάθετε πώς να επεκτείνετε και να προσαρμόζετε το Piwik %1$sδημιουργώντας πρόσθετα ή θέματα%2$s.", "DoMoreContactPiwikAdmins": "Για να εγκαταστήσετε ένα νέο πρόσθετο ή θέμα, ελάτε σε επαφή με τους διαχειριστές του Piwik.", - "FeaturedPlugin": "Προβαλλόμενο πρόσθετο", "ChangeLookByManageThemes": "Μπορείτε να αλλάξετε την εμφάνιση του Piwik από τη %1$sΔιαχείριση Θεμάτων%2$s.", - "GetEarlyAccessForPaidPlugins": "Σημείωση: Όλα τα πρόσθετα είναι διαθέσιμα δωρεάν αυτή τη στιγμή. Στο μέλλον θα ενεργοποιήσουμε τα Πρόσθετα επί Πληρωμή στην Αγορά (%1$sεπικοινωνήστε μαζί μας%2$s για νωρίτερη πρόσβαση).", "History": "Ιστορικό", "Inactive": "Ανενεργό", + "InstalledPlugins": "Εγκατεστημένα Πρόσθετα", + "InstalledThemes": "Εγκατεστημένα Θέματα", "InfoPluginUpdateIsRecommended": "Ενημερώστε τα πρόσθετά σας για να κερδίσετε από τις τελευταίες βελτιώσεις.", "InfoThemeIsUsedByOtherUsersAsWell": "Σημείωση: οι άλλοι %1$s χρήστες που έχουν εγγραφεί σε αυτό το Piwik επίσης χρησιμοποιούν το θέμα %2$s.", "InfoThemeUpdateIsRecommended": "Ενημερώστε τα θέματά σας για να απολαμβάνετε τις τελευταίες εκδόσεις.", - "InstallingPlugin": "Γίνεται εγκατάσταση του %s", "InstallNewPlugins": "Εγκατάσταση νέων πρόσθετων", "InstallNewThemes": "Εγκατάσταση νέων θεμάτων", - "InstalledPlugins": "Εγκατεστημένα Πρόσθετα", - "InstalledThemes": "Εγκατεστημένα Θέματα", - "LastCommitTime": "(τελευταία οριστικοποίηση %s)", - "LastUpdated": "Τελευταία Ενημέρωση", "LicenseHomepage": "Ιστοσελίδα Άδειας", "LikeThisPlugin": "Σας αρέσει το πρόσθετο αυτό;", "ConsiderDonating": "Σκεφτείτε να δωρήσετε", @@ -45,66 +29,38 @@ "ConsiderDonatingCreatorOf": "Παρακαλούμε σκεφτείτε να δωρήσετε στον δημιουργό του %s", "PluginsExtendPiwik": "Τα πρόσθετα (Plugins) επεκτείνουν και διευρύνουν την λειτουργικότητα του Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Αφού εγκατασταθεί ένα πρόσθετο, μπορείτε να το ενεργοποιήσετε ή να το απενεργοποιήσετε εδώ.", - "Marketplace": "Αγορά", - "MarketplaceSellPluginSubject": "Αγορά - Πουλήστε ένα πρόσθετο", "MenuPlatform": "Πλατφόρμα", "MissingRequirementsNotice": "Παρακαλούμε αναβαθμίστε το %1$s %2$s σε νεότερη έκδοση, απαιτείται το %1$s %3$s.", "MissingRequirementsPleaseInstallNotice": "Παρακαλούμε εγκαταστήστε τα %1$s %2$s καθώς απαιτούνται από το %3$s.", - "NewVersion": "νέα έκδοση", - "NoPluginsFound": "Δε βρέθηκαν πρόσθετα", - "NoPluginSettings": "Δεν υπάρχουν ρυθμίσεις που μπορούν να παραμετροποιηθούν", - "NotAllowedToBrowseMarketplacePlugins": "Μπορείτε να δείτε τη λίστα των πρόσθετων που μπορούν να εγκατασταθούν για να προσαρμόσετε ή να επεκτείνετε την πλατφόρμα του Piwik. Παρακαλούμε επικοινωνήστε με τον διαχειριστή σας αν χρειάζεστε κάποιο από αυτά να εγκατασταθεί.", - "NotAllowedToBrowseMarketplaceThemes": "Μπορείτε να δείτε τη λίστα των θεμάτων που μπορούν να εγκατασταθούν για να προσαρμόσετε την εμφάνιση της πλατφόρμας του Piwik. Παρακαλούμε επικοινωνήστε με τον διαχειριστή σας αν χρειάζεστε κάποιο από αυτά να εγκατασταθεί.", - "NoThemesFound": "Δε βρέθηκαν θέματα", "NoZipFileSelected": "Επιλέξτε ένα αρχείο ZIP.", - "NumDownloadsLatestVersion": "Τελευταία έκδοση: %s λήψεις", "NumUpdatesAvailable": "%s διαθέσιμες ενημερώσεις", + "NoPluginSettings": "Δεν υπάρχουν ρυθμίσεις που μπορούν να παραμετροποιηθούν", "Origin": "Προέλευση", "OriginCore": "Πυρήνας", "OriginThirdParty": "Από τρίτες πηγές", "PluginHomepage": "Ιστοσελίδα πρόσθετου", - "PluginKeywords": "Λέξεις κλειδιά", "PluginNotCompatibleWith": "Το πρόσθετο %1$s δεν είναι συμβατό με το %2$s.", "PluginNotWorkingAlternative": "Αν χρησιμοποιείτε αυτό το πρόσθετο, ενδέχεται να βρείτε νεότερη έκδοση στην Αγορά. Αν όχι, μπορείτε να το απεγκαταστήσετε.", "PluginRequirement": "Το %1$s απαιτεί το %2$s.", "PluginsManagement": "Διαχείριση προσθέτων", - "PluginUpdateAvailable": "Χρησιμοποιείτε την έκδοση %1$s και υπάρχει νεότερη έκδοση %2$s.", - "PluginVersionInfo": "%1$s από %2$s", - "PluginWebsite": "Ιστοτόπος πρόσθετου", - "Screenshots": "Παραδείγματα οθονών", - "SortByAlpha": "Άλφα", - "SortByNewest": "Νεότερα", - "SortByPopular": "Δημοφιλή", + "NotDownloadable": "Μη διαθέσιμα για κατέβασμα", + "PluginNotDownloadable": "Το πρόσθετο δεν είναι διαθέσιμο για κατέβασμα.", + "PluginNotDownloadablePaidReason": "Πιθανές αιτίες είναι μια ληγμένη ή εκτός ορίων άδεια.", + "PluginActivated": "Το πρόσθετο ενεργοποιήθηκε", "Status": "Κατάσταση", - "StepDownloadingPluginFromMarketplace": "Κατέβασμα του πρόσθετου από την Αγορά", - "StepDownloadingThemeFromMarketplace": "Κατέβασμα του θέματος από την Αγορά", - "StepPluginSuccessfullyInstalled": "Εγκαταστήσατε με επιτυχία το πρόσθετο %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Ενημερώσατε με επιτυχία το πρόσθετο %1$s %2$s.", - "StepReplaceExistingPlugin": "Γίνεται αντικατάσταση του υπάρχοντος πρόσθετου", - "StepReplaceExistingTheme": "Γίνεται αντικατάσταση του υπάρχοντος θέματος", - "StepThemeSuccessfullyInstalled": "Εγκαταστήσατε με επιτυχία το θέμα %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Ενημερώσατε με επιτυχία το θέμα %1$s %2$s.", - "StepUnzippingPlugin": "Γίνεται αποσυμπίεση του πρόσθετου", - "StepUnzippingTheme": "Αποσυμπίεση του θέματος", "SuccessfullyActicated": "Ενεργοποιήσατε με επιτυχία το <strong>%s<\/strong>.", - "Support": "Υποστήριξη", "TeaserExtendPiwik": "Επέκταση του Piwik με Πρόσθετα και Θέματα", "TeaserExtendPiwikByPlugin": "Επέκταση του Piwik με %1$sεγκατάσταση νέου πρόσθετου%2$s.", "TeaserExtendPiwikByTheme": "Χαρείτε μια άλλη όψη και αίσθηση %1$sεγκαθιστώντας ένα νέο θέμα%2$s.", - "TeaserExtendPiwikByUpload": "Επεκτείνετε το Piwik ανεβάζοντας ένα αρχείο ZIP", "InstallingNewPluginViaMarketplaceOrUpload": "Μπορείτε να εγκαθιστάτε αυτόματα πρόσθετα από την Αγορά ή %1$sνα ανεβάσετε ένα πρόσθετο%2$s σε μορφή .zip.", "Theme": "Θεματική παραλλαγή", "Themes": "Θεματικές παραλλαγές", "ThemesDescription": "Οι θεματικές παραλλαγές αλλάζουν την εμφάνιση διεπαφής χρήστη του Piwik και παρέχουν μια τελείως νέα οπτική εμπειρία προκειμένου να απολαμβάνετε τις αναφορές σας.", "ThemesManagement": "Διαχείριση θεματικών παραλλαγών", "UninstallConfirm": "Πρόκειται να απεγκαταστήσετε το πρόσθετο %s. Το πρόσθετο θα αφαιρεθεί εντελώς από την πλατφόρμα και δε θα είναι δυνατή η επανάκτησή του. Είστε σίγουροι για την ενέργεια αυτή;", - "Updated": "Ενημερώθηκε", - "UpdatingPlugin": "Γίνεται ενημέρωση του %s", - "UploadZipFile": "Ανέβασμα του αρχείου ZIP", "Version": "Έκδοση", - "ViewRepositoryChangelog": "Εμφάνιση των αλλαγών", "ViewAllMarketplacePlugins": "Εμφάνιση όλων των πρόσθετων στην Αγορά", - "Websites": "Ιστοτόποι", - "WeDeactivatedThePluginAsItHasMissingDependencies": "Απενεργοποιήθηκε το πρόσθετο %s καθώς έχει ελλιπείς εξαρτήσεις:" + "WeDeactivatedThePluginAsItHasMissingDependencies": "Απενεργοποιήθηκε το πρόσθετο %s καθώς έχει ελλιπείς εξαρτήσεις:", + "Websites": "Ιστοτόποι" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/es.json b/plugins/CorePluginsAdmin/lang/es.json index 43a5db73e2..662975b42e 100644 --- a/plugins/CorePluginsAdmin/lang/es.json +++ b/plugins/CorePluginsAdmin/lang/es.json @@ -1,43 +1,26 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Activare complemento", - "ActionActivateTheme": "Activare tema", - "ActionInstall": "Instalar", "ActionUninstall": "Desinstalar", "Activate": "Activar", "Activated": "Activado", "Active": "Activo", "Activity": "Actividad", - "AllowedUploadFormats": "Puede subir un complemento o tema en formato .zip vía esta página.", "AuthorHomepage": "Página de internet del autor", - "Authors": "Autores", - "BackToExtendPiwik": "Volver al Mercado", - "BeCarefulUsingPlugins": "Los complementos que no han sido creados por el Equipo de Piwik deben ser utilizados con cuidado, puesto que no los hemos revisado.", - "BeCarefulUsingThemes": "Los temas que no han sido creados por el equipo de Piwik deben ser utilizados con cuidado, puesto que no los hemos revisado.", - "ByXDevelopers": "por %s desarrolladores", - "CannotInstall": "No se puede instalar (ayuda)", "Changelog": "Registro de cambios", "ChangeSettingsPossible": "Puede cambiar la %1$sconfiguración%2$s de este complemento.", "CorePluginTooltip": "Los complementos centrales no tienen versión, puesto que han sido distribuidos por Piwik.", "Deactivate": "Desactivar", - "Developer": "Desarrollador", - "DevelopersLearnHowToDevelopPlugins": "Desarrolladores: Aprenda como extender y personalizar Piwik %1$sdesarrollando complementos o temas%2$s.", "DoMoreContactPiwikAdmins": "Para instalar un nuevo complemento o un nuevo tema, póngase en contacto con sus administradores de Piwik.", - "FeaturedPlugin": "Complemento destacado", "ChangeLookByManageThemes": "Puede cambiar la apariencia de Piwik %1$sgestionando temas%2$s.", - "GetEarlyAccessForPaidPlugins": "Nota: por el momento todos los complementos están disponibles gratuitamente, en el futuro habilitaremos la sección Complementos de Pago en el Mercado (%1$scontáctenos %2$s para tener acceso de un modo temprano).", "History": "Historial", "Inactive": "Inactivo", + "InstalledPlugins": "Complementos instalados", + "InstalledThemes": "Temas instalados", "InfoPluginUpdateIsRecommended": "Actualice sus complementos y aproveche de los últimos mejoramientos.", "InfoThemeIsUsedByOtherUsersAsWell": "Nota: los otros usuarios de %1$s registrados en este Piwik también están utilizando el tema %2$s.", "InfoThemeUpdateIsRecommended": "Actualice sus temas para disfrutar de la última versión.", - "InstallingPlugin": "Instalando %s", "InstallNewPlugins": "Instalar nuevos complementos", "InstallNewThemes": "Instalar nuevos temas", - "InstalledPlugins": "Complementos instalados", - "InstalledThemes": "Temas instalados", - "LastCommitTime": "(último cambio %s)", - "LastUpdated": "Última actualización", "LicenseHomepage": "Página de la licencia", "LikeThisPlugin": "¿Satisfecho con este complemento?", "ConsiderDonating": "Considere una donación", @@ -45,64 +28,32 @@ "ConsiderDonatingCreatorOf": "Por favor considere donar al creador de %s", "PluginsExtendPiwik": "Los complementos extienden y amplían las funcionalidades de Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Una vez que el complemento está instalado, puede activarlo o desactivarlo desde aquí.", - "Marketplace": "Mercado", - "MarketplaceSellPluginSubject": "Mercado - Vender complemento", "MenuPlatform": "Plataforma", "MissingRequirementsNotice": "Por favor actualice %1$s %2$s a una versión más reciente, se requiere %1$s %3$s.", "MissingRequirementsPleaseInstallNotice": "Por favor instale %1$s %2$s en tanto es requerido por %3$s.", - "NewVersion": "nueva versión", - "NoPluginsFound": "No se encontraron complementos", - "NoPluginSettings": "No hay ajustes para este complemento que puedan ser configurados", - "NotAllowedToBrowseMarketplacePlugins": "Puedes navegar la lista de complementos que se pueden instalar para personalizar o extender su plataforma Piwik. Por favor contáctese con el administrador si desea que sea instalado uno de ellos.", - "NotAllowedToBrowseMarketplaceThemes": "Puede navegar la lista de temas que se pueden instalar para personalizar el estilo de su plataforma Piwik. Por favor contáctese con el administrador si desea que sea instalado uno de ellos.", - "NoThemesFound": "No se encontraron temas", "NoZipFileSelected": "Por favor selecciona un archivo ZIP.", - "NumDownloadsLatestVersion": "Última versión: %s descargas", "NumUpdatesAvailable": "%s Actualizaciones(s) disponibles", + "NoPluginSettings": "No hay ajustes para este complemento que puedan ser configurados", "Origin": "Origen", "OriginCore": "Core", "OriginThirdParty": "De terceros", "PluginHomepage": "Página de internet del complemento", - "PluginKeywords": "Palabras claves", "PluginNotCompatibleWith": "%1$s complemento no es compatible con %2$s.", "PluginNotWorkingAlternative": "Si ha estado utilizando este complemento podrá encontrar una versión más reciente en el Mercado. Si no, quizá desee desinstalarlo.", "PluginRequirement": "%1$s requiere %2$s.", "PluginsManagement": "Administración de complementos", - "PluginUpdateAvailable": "Está utilizando la versión %1$s y hay una nueva versión %2$s disponible.", - "PluginVersionInfo": "%1$s de %2$s", - "PluginWebsite": "Sitio de internet del complemento", - "Screenshots": "Capturas de pantalla", - "SortByAlpha": "Alfa", - "SortByNewest": "Más reciente", - "SortByPopular": "Popular", "Status": "Estado", - "StepDownloadingPluginFromMarketplace": "Descargando complemento del Mercado", - "StepDownloadingThemeFromMarketplace": "Descargando tema del Mercado", - "StepPluginSuccessfullyInstalled": "El complemento %1$s %2$s ha sido instalado con éxito.", - "StepPluginSuccessfullyUpdated": "El complemento %1$s %2$s ha sido actualizado con éxito.", - "StepReplaceExistingPlugin": "Sustituyendo el complemento existente", - "StepReplaceExistingTheme": "Sustituyendo tema existente", - "StepThemeSuccessfullyInstalled": "El tema %1$s %2$s ha sido instalado con éxito.", - "StepThemeSuccessfullyUpdated": "El tema %1$s %2$s ha sido actualizado con éxito.", - "StepUnzippingPlugin": "Descomprimiendo el complemento", - "StepUnzippingTheme": "Descomprimiendo el tema", "SuccessfullyActicated": "<strong>%s<\/strong> ha sido activado con éxito.", - "Support": "Asistencia", "TeaserExtendPiwik": "Amplíe Piwik con complementos y temas", "TeaserExtendPiwikByPlugin": "Amplíe Piwik %1$sinstalando un nuevo complemento%2$s.", "TeaserExtendPiwikByTheme": "Disfrute de otra apariencia y estilo %1$sinstalado un nuevo tema%2$s.", - "TeaserExtendPiwikByUpload": "Amplíe Piwik cargando un archivo ZIP", "InstallingNewPluginViaMarketplaceOrUpload": "Puede automáticamente instalar complementos desde el Mercado o %1$scargar un complemento%2$s in formato .zip.", "Theme": "Tema", "Themes": "Temas", "ThemesDescription": "Los temas pueden cambiar la apariencia de la interfaz de Piwik, y ofrecer una nueva experiencia visual para disfrutar sus informes de análisis.", "ThemesManagement": "Gestionar Temas", "UninstallConfirm": "Estás a punto de desinstalar el complemento %s. El complemento será completamente eliminado de su plataforma y no será recuperable. ¿Está seguro que desea hacer esto?", - "Updated": "Actualizado", - "UpdatingPlugin": "Actualizando %s", - "UploadZipFile": "Carga un archivo ZIP", "Version": "Versión", - "ViewRepositoryChangelog": "Ver cambios", "ViewAllMarketplacePlugins": "Ver todos los complementos del Marketplace", "Websites": "Sitios de internet" } diff --git a/plugins/CorePluginsAdmin/lang/et.json b/plugins/CorePluginsAdmin/lang/et.json index 1d324dfac8..cb2effb38a 100644 --- a/plugins/CorePluginsAdmin/lang/et.json +++ b/plugins/CorePluginsAdmin/lang/et.json @@ -1,65 +1,34 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Aktiveeri lisatarkvara", - "ActionActivateTheme": "Aktiveeri kujundus", - "ActionInstall": "Paigalda", "ActionUninstall": "Eemalda", "Activate": "Aktiveeri", "Activated": "Aktiveeritud", "Active": "Aktiivne", "Activity": "Aktiivsus", "AuthorHomepage": "Autori veebileht", - "Authors": "Autorid", - "BackToExtendPiwik": "Tagasi Marketisse", - "ByXDevelopers": "arendajate %s poolt", "Changelog": "Muudatuste logi", "Deactivate": "Lülita välja", - "Developer": "Arendaja", - "FeaturedPlugin": "Esiletõstetud lisatarkvara", "History": "Ajalugu", "Inactive": "Mitteaktiivne", - "InstallingPlugin": "Paigaldan %s", "InstallNewPlugins": "Paigalda uut lisatarkvara", "InstallNewThemes": "Paigalda uusi kujundusi", - "LastCommitTime": "(viimane muudatus %s)", - "LastUpdated": "Viimati uuendatud", "LicenseHomepage": "Litsentsi koduleht", "PluginsExtendPiwik": "Plugins võimendavad ja suurendavad Piwik-i funktsionaalsust.", "OncePluginIsInstalledYouMayActivateHere": "Kui plugin on installeeritud ja aktiveeritud saad seda sisse ja välja lülitada siin.", - "Marketplace": "Market", - "MarketplaceSellPluginSubject": "Market - müü lisatarkvara", "MenuPlatform": "Platvorm", - "NoPluginsFound": "Lisatarkvara ei leitud", - "NoThemesFound": "Kujundusi ei leitud", "NoZipFileSelected": "Palun vali ZIP fail.", - "NumDownloadsLatestVersion": "Viimane versioon: %s allalaadimist", "NumUpdatesAvailable": "%s uuendus(t) saadaval", "Origin": "Päritolu", "OriginCore": "Tuumik", "OriginThirdParty": "Kolmanda osapoole", "PluginHomepage": "Lisatarkvara koduleht", - "PluginKeywords": "Võtmesõnad", "PluginsManagement": "Lisatarkvara haldus", - "PluginVersionInfo": "%1$s, tuli: %2$s", - "PluginWebsite": "Lisatarkvara veebileht", - "Screenshots": "Ekraanitõmmised", "Status": "Olek", - "StepDownloadingPluginFromMarketplace": "Laen marketist lisatarkvara alla", - "StepDownloadingThemeFromMarketplace": "Laen alla kujundust marketist", - "StepReplaceExistingPlugin": "Asendan olemasolevat lisatarkvara", - "StepReplaceExistingTheme": "Asendan olemasolevat kujundust", - "StepUnzippingPlugin": "Pakin lisatarkvara lahti", - "StepUnzippingTheme": "Pakin kujundust lahti", - "Support": "Tugi", "TeaserExtendPiwik": "Laienda Piwikut lisatarkvara ja kujunduste abil", "Theme": "Kujundus", "Themes": "Kujundused", "ThemesManagement": "Halda kujundusi", - "Updated": "Uuendatud", - "UpdatingPlugin": "Uuendan %s", - "UploadZipFile": "Lae üles ZIP arhiiv", "Version": "Versioon", - "ViewRepositoryChangelog": "Vaata muudatusi", "Websites": "Veebilehed" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/eu.json b/plugins/CorePluginsAdmin/lang/eu.json index 39c75ed9d1..98118c5870 100644 --- a/plugins/CorePluginsAdmin/lang/eu.json +++ b/plugins/CorePluginsAdmin/lang/eu.json @@ -8,7 +8,6 @@ "PluginsExtendPiwik": "Piwik-en funtzionaltasunak hedatu eta zabaltzen dituzte pluginek.", "OncePluginIsInstalledYouMayActivateHere": "Plugin bat instalatu ondoren, hemendik gaitu edo ezgaitu dezakezu.", "PluginHomepage": "Pluginaren hasiera-orria", - "PluginKeywords": "Gako-hitzak", "PluginsManagement": "Pluginen kudeaketa", "Status": "Egoera", "Version": "Bertsioa", diff --git a/plugins/CorePluginsAdmin/lang/fa.json b/plugins/CorePluginsAdmin/lang/fa.json index 0780821319..54f30e88d8 100644 --- a/plugins/CorePluginsAdmin/lang/fa.json +++ b/plugins/CorePluginsAdmin/lang/fa.json @@ -1,83 +1,43 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "فعال سازی افزونه", - "ActionActivateTheme": "فعال سازی قالب", - "ActionInstall": "نصب", "ActionUninstall": "پاک کردن برنامه", "Activate": "فعال کردن", "Activated": "فعال شد", "Active": "فعال", "Activity": "فعالیت", - "AllowedUploadFormats": "شما می توانید یک پلاگین یا زیمنه (تم) را در قالب فایل زیپ در این صفحه آپلود نمایید.", "AuthorHomepage": "صفحه خانگی نویسنده", - "Authors": "نویسنده ها", - "BackToExtendPiwik": "بازگشت به بازار", - "BeCarefulUsingPlugins": "پلاگین هایی که توسط Piwik تهیه نشده اند قابل اعتماد نبوده و باید با احتیاط استفاده گردند : ما آنها را چک نمی کنیم.", - "BeCarefulUsingThemes": "زمینه هایی که توسط Piwik تهیه نشده اند قابل اعتماد نبوده و باید با احتیاط استفاده گردند : ما آنها را چک نمی کنیم.", - "ByXDevelopers": "توسط %s برنامه نویس", "Changelog": "لاگ تغییرات", "ChangeSettingsPossible": "شما می توانید %1$ssettings%2$s را برای این پلاگین تغییر دهید.", "CorePluginTooltip": "پلاگین های هسته با برنامه توزیع شده اند", "Deactivate": "غیر فعال کردن", - "Developer": "توسعه دهنده ها", "DoMoreContactPiwikAdmins": "لطفا برای نصب قالب یا افزونه های جدید با تیم مدیریت پیویک تان در ارتباط باشید.", - "FeaturedPlugin": "افزونه ویژه", "History": "تاریخچه", "Inactive": "غیر فعال", "InfoPluginUpdateIsRecommended": "پلاگین هایتان را به روز رسانی نمایید تا از آخرین پیشرفت های آن ها استفاده نمایید.", "InfoThemeUpdateIsRecommended": "زمینه های خود را به روز رسانی نمایید تا از آخرین ورژن لذت ببرید.", - "InstallingPlugin": "نصب %s", "InstallNewPlugins": "نصب افزونه های جدید", "InstallNewThemes": "نصب قالب های جدید", - "LastCommitTime": "(آخرین ارسال %s)", - "LastUpdated": "آخرین بروزرسانی", "LicenseHomepage": "صفحه خانگی مجوز", "PluginsExtendPiwik": "افزونه ها عملکرد و کارایی پیویک را گسترش می دهند.", "OncePluginIsInstalledYouMayActivateHere": "هنگامی که یک افزونه نصب شد , شما می توانید آنها را در اینجا فعال یا غیر فعال کنید.", - "Marketplace": "بازار", - "MarketplaceSellPluginSubject": "بازار - فروش پلاگین", "MenuPlatform": "بستر های نرم افزاری", - "NoPluginsFound": "افزونه ای یافت نشد", - "NotAllowedToBrowseMarketplaceThemes": "شما می توانید لیستی از زمینه های قابل نصب را مشاهده نمایید ، با این زمینه ها می توانید ظاهر Piwik را به دلخواه تغییر دهید. لطفا با مدیر خود تماس بگیرید تا آن را برای شما نصب نماید.", - "NoThemesFound": "قالبی یافت نشد", "NoZipFileSelected": "لطفا یک فایل Zip را انتخاب کنید.", - "NumDownloadsLatestVersion": "آخرین نسخه: %s دانلودها", "NumUpdatesAvailable": "%s آپدیت(ها) موجود است", "Origin": "مبدا", "OriginCore": "هسته", "OriginThirdParty": "شخص ثالث", "PluginHomepage": "صفحه خانگی افزونه", - "PluginKeywords": "کلمات کلیدی", "PluginNotCompatibleWith": "%1$s این پلاگین سازگار نیست با %2$s.", "PluginNotWorkingAlternative": "اگر شما از این پلاگین استفاده می نمایید ، می توانید نسخه های جدید آن را در بازار پیدا نمایید. اگر استفاده نمی کنید ، می توانید آن را پاک نمایید.", "PluginsManagement": "مدیریت افزونه ها", - "PluginVersionInfo": "%1$s از %2$s", - "PluginWebsite": "سایت افزونه", - "Screenshots": "تصاویر", "Status": "وضعیت", - "StepDownloadingPluginFromMarketplace": "دانلود پلاگین از بازار", - "StepDownloadingThemeFromMarketplace": "دانلود زمینه از بازار", - "StepPluginSuccessfullyInstalled": "شما این پلاگین را با موفقیت نصب نمودید %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "شما این پلاگین را با موفقیت به روز رسانی نمودید %1$s %2$s.", - "StepReplaceExistingPlugin": "جایگزین کردن با پلاگین های موجود", - "StepReplaceExistingTheme": "جایگزین کردن با زمینه های موجود", - "StepThemeSuccessfullyInstalled": "شما با موفقیت این زمینه را نصب نمودید %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "شما این زمینه را با موفقیت به روز رسانی نمودید %1$s %2$s.", - "StepUnzippingPlugin": "خارج کردن پلاگین از حالت فشرده", - "StepUnzippingTheme": "خارج کردن زمینه از حالت فشرده", "SuccessfullyActicated": "شما با موفقیت <strong>%s<\/strong> را فعال کردید.", - "Support": "پشتیبانی", "TeaserExtendPiwik": "Piwik را با نصب پلاگین و زمینه های جدید گسترش دهید", - "TeaserExtendPiwikByUpload": "گسترش دهید Piwik را با آپلود کردن فایل زیپ", "Theme": "حالت نمایش", "Themes": "حالت های نمایش", "ThemesDescription": "حالت های نمایش برای زیبایی پیویک قابل تغییر هستند. برای درک بهتر استفاده کننده,وبرای کامل شدن لذت شما از انالیز گزارشات.", "ThemesManagement": "مدیریت حالت ها.", - "Updated": "بروزرسانی شد", - "UpdatingPlugin": "به روز رسانی %s", - "UploadZipFile": "بارگذاری فایل زیپ", "Version": "ویرایش", - "ViewRepositoryChangelog": "مشاهده تغییرات", "Websites": "وب سایت ها" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/fi.json b/plugins/CorePluginsAdmin/lang/fi.json index a417938185..1915fde78b 100644 --- a/plugins/CorePluginsAdmin/lang/fi.json +++ b/plugins/CorePluginsAdmin/lang/fi.json @@ -1,90 +1,47 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Aktivoi lisäosa", - "ActionActivateTheme": "Aktivoi teema", - "ActionInstall": "Asenna", "ActionUninstall": "Poista", "Activate": "Aktivoi", "Activated": "Aktivoitu", "Active": "Käytössä", "Activity": "Toiminnot", - "AllowedUploadFormats": "Tällä sivulla voit lisätä liitännäisen tai teeman .zip-formaatissa.", "AuthorHomepage": "Tekijän kotisivu", - "Authors": "Tekijät", - "BackToExtendPiwik": "Takaisin kauppaan", - "BeCarefulUsingPlugins": "Käytä harkitusti liitännäisiä, jotka eivät ole Piwikin luomia: emme ole tarkastaneet niitä.", - "BeCarefulUsingThemes": "Käytä harkitusti teemoja, jotka eivät ole Piwikin luomia: emme ole tarkastaneet niitä.", - "ByXDevelopers": "%s ohjelmoijalta", "Changelog": "Muutokset", "ChangeSettingsPossible": "Voit muuttaa tämän liitännäisen %1$sasetuksia%2$s", "CorePluginTooltip": "Standardiliitännäisillä ei ole versioita, koska ne ovat Piwikin levittämiä.", "Deactivate": "Poistettu käytöstä", - "Developer": "Kehittäjä", "DoMoreContactPiwikAdmins": "Asentaaksesi uuden liitännäisen tai uuden teeman, ota yhteyttä Piwikin ylläpitäjiin.", - "FeaturedPlugin": "Valittu liitännäinen", - "GetEarlyAccessForPaidPlugins": "Huomio: kaikki liitännäiset ovat tällä hetkellä ilmaisia; tulevaisuudessa sallimme maksulliset liitännäiset kauppatorilla (%1$sota yhteyttä%2$s saadaksesi aikainen pääsy).", "History": "Historia", "Inactive": "Ei käytössä", "InfoPluginUpdateIsRecommended": "Päivitä liitännäisesi nyt hyötyäksesi uusimmista parannuksista.", "InfoThemeIsUsedByOtherUsersAsWell": "Huomio: muut tälle Piwik-sivulle rekisteröityneet %1$s käyttäjät käyttävät myös teemaa %2$s.", "InfoThemeUpdateIsRecommended": "Päivitä teemasi nauttiaksesi viimeisimmästä versiosta.", - "InstallingPlugin": "Asenna %s", "InstallNewPlugins": "Asenna uusia liitännäisiä", "InstallNewThemes": "Asenna uusia teemoja", - "LastCommitTime": "(viimeisin lähetys %s)", - "LastUpdated": "Edellinen päivitys", "LicenseHomepage": "Lisenssisivu", "PluginsExtendPiwik": "Lisäosilla voi laajentaa ja parantaa Piwikin toiminnallisuutta.", "OncePluginIsInstalledYouMayActivateHere": "Kun lisäosa on asennettu, voit aktivoida ja poistaa käytöstä sen täällä.", - "Marketplace": "Kauppatori", - "MarketplaceSellPluginSubject": "Kauppatori - myy liitännäisiä", "MenuPlatform": "Sovellusalusta", "MissingRequirementsNotice": "Päivitä %1$s %2$s uudempaan versioon, %1$s %3$s vaaditaan.", - "NoPluginsFound": "Liitännäisiä ei löydetty", - "NotAllowedToBrowseMarketplacePlugins": "Voit selata asennettavien liitännäisten listaa, joilla voit mukauttaa tai laajentaaa Piwik sovellusalustaasi. Ota yhteyttä ylläpitäjääsi saadaksesi liitännäinen asennettua.", - "NotAllowedToBrowseMarketplaceThemes": "Voit selata listaa asennettavista teemoista, joilla voit muuttaa Piwikin ilmettä. Ota yhteyttä ylläpitäjääsi saadaksesi teema asennetuksi.", - "NoThemesFound": "Teemoja ei löydetty", "NoZipFileSelected": "Ole hyvä ja valitse ZIP-tiedosto.", - "NumDownloadsLatestVersion": "Viimeisin versio: %s latausta", "NumUpdatesAvailable": "%s päivitys\/päivityksiä saaatavilla", "Origin": "Lähde", "OriginCore": "Ydin", "OriginThirdParty": "Kolmas osapuoli", "PluginHomepage": "Lisäosan kotisivu", - "PluginKeywords": "Avainsanat", "PluginNotCompatibleWith": "%1$s liitännäinen ei sovi yhteen %2$s:n kanssa.", "PluginNotWorkingAlternative": "Jos olet käyttänyt tätä liitännäistä, voit ehkä löytää uudemman version kauppatorilta. Muussa tapauksessa haluat ehkä poistaa liitännäisen.", "PluginRequirement": "%1$s vaatii %2$s:n.", "PluginsManagement": "Lisäosien hallinta", - "PluginUpdateAvailable": "Käytät versiota %1$s ja uusi versio %2$s on saatavilla.", - "PluginVersionInfo": "%1$s %2$s:sta", - "PluginWebsite": "Liitännäissivu", - "Screenshots": "Ruudunkaappaukset", "Status": "Tila", - "StepDownloadingPluginFromMarketplace": "Lataa liitännäinen kauppatorilta", - "StepDownloadingThemeFromMarketplace": "Lataa teema kauppatorilta", - "StepPluginSuccessfullyInstalled": "Liitännäinen %1$s %2$s on asennettu onnistuneesti.", - "StepPluginSuccessfullyUpdated": "Liitännäinen %1$s %2$s on päivitetty onnnistuneesti.", - "StepReplaceExistingPlugin": "Korvaa nykyisen liitännäisen", - "StepReplaceExistingTheme": "Korvaa nykyisen teeman", - "StepThemeSuccessfullyInstalled": "Teema %1$s %2$s on asennettu onnistuneesti.", - "StepThemeSuccessfullyUpdated": "Teema %1$s %2$s on päivitetty onnistuneesti.", - "StepUnzippingPlugin": "Liitännäisen purku", - "StepUnzippingTheme": "Teeman purku", "SuccessfullyActicated": "<strong>%s<\/strong> on aktivoitu onnistuneesti.", - "Support": "Tuki", "TeaserExtendPiwik": "Laajenna Piwikiä liitännäisillä ja teemoilla", - "TeaserExtendPiwikByUpload": "Laajenna Piwikiä lisäämällä ZIP-tiedosto", "Theme": "Teema", "Themes": "Teemat", "ThemesDescription": "Teemat voivat muuttaa Piwikin ulkonäköä ja tarjoavat aivan uuden visuaalisen kokemuksen analyysiraporteillesi.", "ThemesManagement": "Hallitse teemoja", "UninstallConfirm": "Olet poistamassa %s-liitännäisen asennuksen. Liitännäinen poistetaan sovellusalustalta, eikä sitä voi enää palauttaa. Oletko verma, että haluat poistaa liitännäisen?", - "Updated": "Päivitetty", - "UpdatingPlugin": "%s:n päivitys", - "UploadZipFile": "Lisää ZIP-tiedosto", "Version": "Versio", - "ViewRepositoryChangelog": "Tarkastele muutoksia", "Websites": "Sivustot" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/fr.json b/plugins/CorePluginsAdmin/lang/fr.json index 46ec461c03..a4683c5d31 100644 --- a/plugins/CorePluginsAdmin/lang/fr.json +++ b/plugins/CorePluginsAdmin/lang/fr.json @@ -1,43 +1,27 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Activer le composant", - "ActionActivateTheme": "Activer le thème", - "ActionInstall": "Installer", "ActionUninstall": "Désinstaller", "Activate": "Activer", "Activated": "Activé", "Active": "Actif", "Activity": "Activité", - "AllowedUploadFormats": "Vous pouvez téléverser un composant additionnel ou un thème au format zip via cette page.", + "AlwaysActivatedPluginsList": "Les composants suivants sont toujours activés et ne peuvent être désactivés : %s", "AuthorHomepage": "Page de l'auteur", - "Authors": "Auteurs", - "BackToExtendPiwik": "Retour au Marché", - "BeCarefulUsingPlugins": "Les composants qui ne sont pas conçus par l'équipe de Piwik doivent être utilisés avec précaution : nous le les avons pas vérifiés.", - "BeCarefulUsingThemes": "Les thèmes qui ne sont pas conçus par l'équipe de Piwik doivent être utilisés avec précaution : nous les avons pas vérifiés.", - "ByXDevelopers": "par %s développeurs", - "CannotInstall": "Impossible d'installer (aide)", "Changelog": "Historique des changements", "ChangeSettingsPossible": "Vous pouvez modifier les %1$sparamètres%2$s de ce composant.", "CorePluginTooltip": "Les composants principaux n'ont pas de version puisqu'ils sont distribués avec Piwik.", "Deactivate": "Désactiver", - "Developer": "Développeur", - "DevelopersLearnHowToDevelopPlugins": "Développeurs : Apprenez comment vous pouvez étendre et personaliser Piwik en %1$sdévelopant des composants ou themes%2$s.", "DoMoreContactPiwikAdmins": "Pour installer un nouveau composant additionnel ou thème, veuillez contacter votre administrateur Piwik.", - "FeaturedPlugin": "Composant mis en avant", "ChangeLookByManageThemes": "Vous pouvez changer l'apparence de Piwik en %1$sgérant les thèmes%2$s.", - "GetEarlyAccessForPaidPlugins": "Note : tous les composants sont disponibles gratuitement à présent, dans le futur nous fourniront la possibilité de publier des composants payants sur le Marché (%1$scontactez-nous%2$s pour bénéficier d'un accès en avance)", "History": "Historique", "Inactive": "Inactif", + "InstalledPlugins": "Plugins installés", + "InstalledThemes": "Thèmes installés", "InfoPluginUpdateIsRecommended": "Mettez à jour vos composants pour bénéficier des dernières améliorations.", "InfoThemeIsUsedByOtherUsersAsWell": "Note : %1$s autres utilisateurs utilisant ce Piwik utilisent aussi le thème %2$s.", "InfoThemeUpdateIsRecommended": "Mettez à jour vos thèmes pour profiter de la dernière version.", - "InstallingPlugin": "Installation de %s", "InstallNewPlugins": "Installer les nouveaux composants", "InstallNewThemes": "Installer les nouveaux thèmes", - "InstalledPlugins": "Plugins installés", - "InstalledThemes": "Thèmes installés", - "LastCommitTime": "(dernier archivage %s)", - "LastUpdated": "A jour", "LicenseHomepage": "Page de la licence", "LikeThisPlugin": "Vous aimez ce composant?", "ConsiderDonating": "Pensez à effectuer une donation.", @@ -45,66 +29,38 @@ "ConsiderDonatingCreatorOf": "Pensez à effectuer une donation au créateur de %s", "PluginsExtendPiwik": "Les plugins étendent et ajoutent des fonctionnalités à Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Une fois un plugin installé, vous pouvez l'activer ou le désactiver ici.", - "Marketplace": "Marché", - "MarketplaceSellPluginSubject": "Marché - Vendre un composant", "MenuPlatform": "Plate-forme", "MissingRequirementsNotice": "Veuillez mettre à jour %1$s %2$s vers une nouvelle version, %1$s %3$s est requis.", "MissingRequirementsPleaseInstallNotice": "Veuillez installer %1$s %2$s qui est requis par %3$s.", - "NewVersion": "nouvelle version", - "NoPluginsFound": "Aucun composant trouvé", - "NoPluginSettings": "Aucun paramètre de plugin ne peut être configuré", - "NotAllowedToBrowseMarketplacePlugins": "Vous pouvez parcourir la liste des composants qui peuvent être installés pour personnaliser ou étendre votre plateforme Piwik. Veuillez contacter votre administrateur si vous avez besoin d'en installer.", - "NotAllowedToBrowseMarketplaceThemes": "Vous pouvez parcourir la liste des thèmes qui peuvent être installés pour personnaliser l'apparence de votre plateforme Piwik. Veuillez contacter votre administrateur pour qu'il les installe pour vous.", - "NoThemesFound": "Aucun thème trouvé", "NoZipFileSelected": "Veuillez sélectionner un fichier ZIP.", - "NumDownloadsLatestVersion": "Dernière version : %s téléchargements.", "NumUpdatesAvailable": "%s Mise(s) à jour disponible(s)", + "NoPluginSettings": "Aucun paramètre de plugin ne peut être configuré", "Origin": "Origine", "OriginCore": "Principal", "OriginThirdParty": "Tierce-Partie", "PluginHomepage": "Page d'accueil du plugin", - "PluginKeywords": "Mots-clés", "PluginNotCompatibleWith": "Le composant %1$s n'est pas compatible avec %2$s.", "PluginNotWorkingAlternative": "Si vous avez utilisé ce composant additionnel, peut être pourriez vous trouver une version plus récente sur le Marché. Le cas échéant vous devriez le désinstaller.", "PluginRequirement": "%1$s requiert %2$s.", "PluginsManagement": "Gestionnaire de plugins", - "PluginUpdateAvailable": "Vous utilisez la version %1$s et une nouvelle version %2$s est disponible.", - "PluginVersionInfo": "%1$s de %2$s", - "PluginWebsite": "Site du composant additionnel", - "Screenshots": "Captures d'écran", - "SortByAlpha": "Alpha", - "SortByNewest": "Plus récent", - "SortByPopular": "Populaire", + "NotDownloadable": "Non téléchargeable", + "PluginNotDownloadable": "Ce composant n'est pas téléchargeable.", + "PluginNotDownloadablePaidReason": "Certaines des raisons peuvent être une licence expirée ou insuffisante.", + "PluginActivated": "Composant activé", "Status": "État", - "StepDownloadingPluginFromMarketplace": "Téléchargement d'un composant additionnel depuis le Marché", - "StepDownloadingThemeFromMarketplace": "Téléchargement d'un thème depuis le Marché", - "StepPluginSuccessfullyInstalled": "Vous avez installé avec succès le composant additionnel %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Vous avez mis à jour avec succès le composant %1$s %2$s.", - "StepReplaceExistingPlugin": "Remplacement des composants additionnels existants", - "StepReplaceExistingTheme": "Remplacement du thème existant", - "StepThemeSuccessfullyInstalled": "Vous avez installé avec succès le thème %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Vous avez mis à jour avec succès le thème %1$s %2$s.", - "StepUnzippingPlugin": "Décompression du composant additionnel", - "StepUnzippingTheme": "Décompression du thème", "SuccessfullyActicated": "Vous avez activé avec succès <strong>%s<\/strong>.", - "Support": "Support", "TeaserExtendPiwik": "Etendre Piwik avec des composants additionnels et des thèmes", "TeaserExtendPiwikByPlugin": "Etendre Piwik en %1$sinstallant un nouveau composant additionnel%2$s.", "TeaserExtendPiwikByTheme": "Profitez d'une nouvelle charte graphique en %1$sinstallant un nouveau thème%2$s.", - "TeaserExtendPiwikByUpload": "Etendre Piwik en téléchargeant un fichier ZIP", "InstallingNewPluginViaMarketplaceOrUpload": "Vous pouvez installer automatiquement un plugin à partir du Marketplace ou %1$supload a plugin%2$s au format .zip.", "Theme": "Thème", "Themes": "Thèmes", "ThemesDescription": "Les thèmes peuvent modifier l'apparence de l'interface utilisateur et fournir une expérience visuelle nouvelle pour apprécier les rapports de suivi de trafic.", "ThemesManagement": "Gérer les thèmes", "UninstallConfirm": "Vous êtes sur le point de désinstaller le composant %s. Ce composant sera supprimé de manière définitive de votre plateforme et cette action est irréversible. Etes vous sûr(e) de vouloir effectuer cela?", - "Updated": "Mis à jour", - "UpdatingPlugin": "Mise à jour de %s", - "UploadZipFile": "Télécharger fichier ZIP", "Version": "Version", - "ViewRepositoryChangelog": "Afficher les changements", "ViewAllMarketplacePlugins": "Voir tous les plugins du marché", - "Websites": "Sites web", - "WeDeactivatedThePluginAsItHasMissingDependencies": "Nous avons désactiver le composant %s car certaines dépendances lui manquent :" + "WeDeactivatedThePluginAsItHasMissingDependencies": "Nous avons désactiver le composant %s car certaines dépendances lui manquent :", + "Websites": "Sites web" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/gl.json b/plugins/CorePluginsAdmin/lang/gl.json index cdf3284b11..d86f9ecff6 100644 --- a/plugins/CorePluginsAdmin/lang/gl.json +++ b/plugins/CorePluginsAdmin/lang/gl.json @@ -3,7 +3,6 @@ "Activate": "Activar", "Activated": "Activado", "Deactivate": "Desactivar", - "PluginKeywords": "Palabras clave", "Websites": "Sitios" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/he.json b/plugins/CorePluginsAdmin/lang/he.json index eaed4682b7..b7418e59d9 100644 --- a/plugins/CorePluginsAdmin/lang/he.json +++ b/plugins/CorePluginsAdmin/lang/he.json @@ -1,13 +1,10 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "הפעל תוסף", - "ActionInstall": "להתקין", "Activate": "הפעל", "Activated": "הופעל", "Active": "פעיל", "Activity": "פעילות", "AuthorHomepage": "אתר היוצר", - "Authors": "כותבים", "Deactivate": "כבה", "Inactive": "לא פעיל", "LicenseHomepage": "אתר רישון השימוש", @@ -15,7 +12,6 @@ "OncePluginIsInstalledYouMayActivateHere": "ברגע שתוסף מותקן, ניתן להפעילו או לבטלו כאן.", "MenuPlatform": "פלטפורמה", "PluginHomepage": "אתר התוסף", - "PluginKeywords": "מילות מפתח", "PluginsManagement": "ניהול תוספים", "Status": "מצב", "Theme": "ערכת עיצוב", diff --git a/plugins/CorePluginsAdmin/lang/hi.json b/plugins/CorePluginsAdmin/lang/hi.json index 48e1d13d8e..52fb030bb8 100644 --- a/plugins/CorePluginsAdmin/lang/hi.json +++ b/plugins/CorePluginsAdmin/lang/hi.json @@ -1,42 +1,26 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "प्लगइन सक्रिय", - "ActionActivateTheme": "विषय को सक्रिय करें", - "ActionInstall": "स्थापित करें", "ActionUninstall": "स्थापना रद्द करें", "Activate": "सक्रिय करें", "Activated": "सक्रिय", "Active": "सक्रिय", "Activity": "गतिविधि", - "AllowedUploadFormats": "आप इस पेज के माध्यम से ज़िप प्रारूप में एक प्लगइन या विषय अपलोड कर सकते हैं ।", "AuthorHomepage": "लेखक होमपेज", - "Authors": "लेखक", - "BackToExtendPiwik": "वापस बाज़ार में", - "ByXDevelopers": "%s के डेवलपर्स द्वारा", - "CannotInstall": "स्थापित नहीं कर सकते (मदद)", "Deactivate": "निष्क्रिय करें", - "FeaturedPlugin": "विशेष रुप से प्लगइन", "Inactive": "निष्क्रिय", "LicenseHomepage": "लाइसेंस होमपेज", "PluginsExtendPiwik": "प्लगइन्स Piwik का विस्तार और कार्यक्षमता का विस्तार करते है.", "OncePluginIsInstalledYouMayActivateHere": "एक प्लगइन स्थापित हो जाने के बाद, आप इसे सक्रिय करने या यहाँ इसे निष्क्रिय कर सकते हैं.", "MenuPlatform": "मंच", "PluginHomepage": "प्लगइन होमपेज", - "PluginKeywords": "खोजशब्द", "PluginsManagement": "प्लगइन्स प्रबंधन", - "PluginVersionInfo": "%1$s से %2$s", "Status": "स्थिति", - "Support": "सहयोग", "Theme": "विषय", "Themes": "विषय", "ThemesDescription": "थीम्स, Piwik यूजर इंटरफेस के स्वरूप को बदल सकते हैं और अपने विश्लेषण रिपोर्टों के आनंद के लिए एक पूरी तरह से नए दृश्य का अनुभव प्रदान करते हैं.", "ThemesManagement": "विषय प्रबंधन", "UninstallConfirm": "आप एक प्लगइन %s की स्थापना रद्द करने के बारे में हैं। प्लगइन पूरी तरह से अपने मंच से हटा दिया जाएगा और यह वसूली योग्य नहीं होगा। क्या आप वास्तव में इसे करना चाहते हैं?", - "Updated": "अद्यतन", - "UpdatingPlugin": "अद्यतन कर रहा है %s", - "UploadZipFile": "ZIP फ़ाइल अपलोड करें", "Version": "संस्करण", - "ViewRepositoryChangelog": "परिवर्तन देखें", "Websites": "वेबसाइटें" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/hu.json b/plugins/CorePluginsAdmin/lang/hu.json index edba527c22..6188d47803 100644 --- a/plugins/CorePluginsAdmin/lang/hu.json +++ b/plugins/CorePluginsAdmin/lang/hu.json @@ -10,7 +10,6 @@ "PluginsExtendPiwik": "A bővítmények kiterjesztik a Piwik alapfunkcióit.", "OncePluginIsInstalledYouMayActivateHere": "A már telepített bővítményeket itt kapcsolhatod ki vagy be.", "PluginHomepage": "Bővítmény honlapja", - "PluginKeywords": "Kulcsszavak", "PluginsManagement": "Bővítménykezelés", "Status": "Állapot", "Version": "Verzió", diff --git a/plugins/CorePluginsAdmin/lang/id.json b/plugins/CorePluginsAdmin/lang/id.json index 1e4ef37aaa..10a88e80ca 100644 --- a/plugins/CorePluginsAdmin/lang/id.json +++ b/plugins/CorePluginsAdmin/lang/id.json @@ -10,9 +10,7 @@ "PluginsExtendPiwik": "Pengaya menambah dan memperluas kegunaan dari Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Sekali pengaya terinstal, Anda dapat mengaktifkan dan mematikan di sini.", "PluginHomepage": "Alamat Pengaya", - "PluginKeywords": "Kata Kunci", "PluginsManagement": "Pengatur Pengaya", - "PluginVersionInfo": "%1$s dari %2$s", "Status": "Status", "Version": "Versi", "Websites": "Situs" diff --git a/plugins/CorePluginsAdmin/lang/is.json b/plugins/CorePluginsAdmin/lang/is.json index b1ad8c46ad..bd7c491f0c 100644 --- a/plugins/CorePluginsAdmin/lang/is.json +++ b/plugins/CorePluginsAdmin/lang/is.json @@ -10,7 +10,6 @@ "PluginsExtendPiwik": "Íbætur auka og víkka virknina í Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Hérna geturðu kveikteða slökkt á íbót þegar búið er að setja hana inn í kerfið.", "PluginHomepage": "Heimasíða íbótar", - "PluginKeywords": "Leitarorð", "PluginsManagement": "Íbótastjórnun", "Status": "Staða", "Version": "Útgáfa", diff --git a/plugins/CorePluginsAdmin/lang/it.json b/plugins/CorePluginsAdmin/lang/it.json index e2d21a1438..4cac39ae3b 100644 --- a/plugins/CorePluginsAdmin/lang/it.json +++ b/plugins/CorePluginsAdmin/lang/it.json @@ -1,43 +1,27 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Attiva plugin", - "ActionActivateTheme": "Attiva tema", - "ActionInstall": "Installa", "ActionUninstall": "Disinstalla", "Activate": "Attiva", "Activated": "Attivato", "Active": "Attivo", "Activity": "Attività", - "AllowedUploadFormats": "Tramite questa pagina puoi caricare un plugin o un tema nel formato .zip.", + "AlwaysActivatedPluginsList": "I seguenti plugin sono sempre attivati e non possono essere disabilitati: %s", "AuthorHomepage": "Homepage Autore", - "Authors": "Autori", - "BackToExtendPiwik": "Torna al Marketplace", - "BeCarefulUsingPlugins": "I plugin che non sono stati sviluppati dal team di Piwik devono essere utilizzati con cautela: non li abbiamo verificati.", - "BeCarefulUsingThemes": "I temi che non sono stati sviluppati dal team di Piwik devono essere utilizzati con cautela: non li abbiamo verificati.", - "ByXDevelopers": "da %s sviluppatori", - "CannotInstall": "Installazione impossibile (aiuto)", "Changelog": "Changelog", "ChangeSettingsPossible": "Puoi cambiare le %1$simpostazioni%2$s per questo plugin.", "CorePluginTooltip": "I plugins di base non hanno versione dato che sono distribuiti con Piweik.", "Deactivate": "Disattiva", - "Developer": "Sviluppatore", - "DevelopersLearnHowToDevelopPlugins": "Per gli sviluppatori: Imparate come ampliare e personalizzare Piwik %1$ssviluppando plugins e temi%2$s.", "DoMoreContactPiwikAdmins": "Per installare un nuovo plugin o un nuovo tema, rimani in contatto con il tuo amministratore di Piwik.", - "FeaturedPlugin": "Plugin rappresentativo", "ChangeLookByManageThemes": "Puoi cambiare l'aspetto di Piwik tramite %1$sGestione Temi%2$s.", - "GetEarlyAccessForPaidPlugins": "Nota: al momento tutti i plugin sono disponibili gratuitamente; in futuro abiliteremo sul Marketplace la sezione Plugin a Pagamento (%1$scontattaci%2$s per accedere anticipatamente).", "History": "Storia", "Inactive": "Inattivo", + "InstalledPlugins": "Plugin installati", + "InstalledThemes": "Temi installati", "InfoPluginUpdateIsRecommended": "Aggiorna i tuoi plugin per beneficiare dei nuovi miglioramenti.", "InfoThemeIsUsedByOtherUsersAsWell": "Nota: gli altri %1$s utenti che si sono registrati a questo Piwik stanno utilizzando il tema %2$s.", "InfoThemeUpdateIsRecommended": "Aggiorna i tuoi temi per godere dell'ultima versione.", - "InstallingPlugin": "Sto installando %s", "InstallNewPlugins": "Installa nuovi plugin", "InstallNewThemes": "Intalla nuovi temi", - "InstalledPlugins": "Plugin installati", - "InstalledThemes": "Temi installati", - "LastCommitTime": "ultima consegna %s", - "LastUpdated": "Ultimo aggiornamento", "LicenseHomepage": "Homepage della Licenza", "LikeThisPlugin": "Ti piace questo plugin?", "ConsiderDonating": "Considera una donazione", @@ -45,65 +29,38 @@ "ConsiderDonatingCreatorOf": "Considera di fare una donazione al creatore di %s", "PluginsExtendPiwik": "I plugins estendono e ampliano la funzionalità di Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Una volta installato un plugin, qui puoi attivarlo o disattivarlo.", - "Marketplace": "Marketplace", - "MarketplaceSellPluginSubject": "Marketplace - Vendita Plugin", "MenuPlatform": "Piattaforma", "MissingRequirementsNotice": "Aggiorna %1$s %2$s a una versione più recente, è richiesto %1$s %3$s.", "MissingRequirementsPleaseInstallNotice": "Si prega di installare %1$s %2$s come richiesto da %3$s.", - "NewVersion": "nuova versione", - "NoPluginsFound": "Non sono stati trovati plugin", - "NoPluginSettings": "Non ci sono plugin da configurare", - "NotAllowedToBrowseMarketplacePlugins": "Puoi esplorare la lista dei plugin che possono essere installati per personalizzare o espandere la tua piattaforma Piwik. Contatta il tuo amministratore se desideri installarne qualcuno.", - "NotAllowedToBrowseMarketplaceThemes": "Puoi esplorare la lista dei temi che possono essere installati per personalizzare l'aspetto della tua piattaforma Piwik. Contatta il tuo amministratore se desideri che ne installi qualcuno.", - "NoThemesFound": "Non sono stati trovati temi", "NoZipFileSelected": "Seleziona un file ZIP.", - "NumDownloadsLatestVersion": "Ultima versione: %s Downloads", "NumUpdatesAvailable": "%s Aggiornamenti disponibili", + "NoPluginSettings": "Non ci sono plugin da configurare", "Origin": "Origine", "OriginCore": "Core", "OriginThirdParty": "Terze-parti", "PluginHomepage": "Homepage Plugin", - "PluginKeywords": "Keywords", "PluginNotCompatibleWith": "Il plugin %1$s non è compatibile con %2$s.", "PluginNotWorkingAlternative": "Se hai utilizzato questo plugin puoi trovare una versione più recente nel Marketplace. Se no, puoi volere disinstallarlo.", "PluginRequirement": "%1$s richiede %2$s.", "PluginsManagement": "Amministra Plugin", - "PluginUpdateAvailable": "Stai utilizzando la versione %1$s ed è disponibile la nuova versione %2$s.", - "PluginVersionInfo": "%1$s da %2$s", - "PluginWebsite": "Sito Plugin", - "Screenshots": "Screenshots", - "SortByAlpha": "Alfa", - "SortByNewest": "Il più recente", - "SortByPopular": "Popolare", + "NotDownloadable": "Non scaricabile", + "PluginNotDownloadable": "Questo plugin non è scaricabile.", + "PluginNotDownloadablePaidReason": "Le possibili ragioni sono una licenza scaduta o superata.", + "PluginActivated": "Plugin attivato", "Status": "Stato", - "StepDownloadingPluginFromMarketplace": "Download del plugin dal Marketplace", - "StepDownloadingThemeFromMarketplace": "Download del tema dal Marketplace", - "StepPluginSuccessfullyInstalled": "Hai installato con successo il plugin %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Hai aggiornato con successo il plugin %1$s %2$s.", - "StepReplaceExistingPlugin": "Sto sostituendo il plugin esistente", - "StepReplaceExistingTheme": "Sostituzione del tema esistente", - "StepThemeSuccessfullyInstalled": "Hai installato con successo il tema %1$s %2$s", - "StepThemeSuccessfullyUpdated": "Hai aggiornato con successo il tema %1$s %2$s", - "StepUnzippingPlugin": "Sto scompattando il plugin", - "StepUnzippingTheme": "Sto scompattando il tema", "SuccessfullyActicated": "Hai attivato con successo <strong>%s<\/strong>.", - "Support": "Supportaci", "TeaserExtendPiwik": "Amplia Piwik con Plugin e Temi", "TeaserExtendPiwikByPlugin": "Estendi Piwik %1$sinstallando un nuovo plugin%2$s.", "TeaserExtendPiwikByTheme": "Prova un altro aspetto & atmosfera %1$sinstallando un nuovo tema%2$s.", - "TeaserExtendPiwikByUpload": "Estendi Piwik caricando un file ZIP", "InstallingNewPluginViaMarketplaceOrUpload": "Puoi installare automaticamente dei plugins dal Market o %1$scaricare un plugin%2$s in formato .zip.", "Theme": "Tema", "Themes": "Temi", "ThemesDescription": "I temi possono cambiare l'aspetto dell'interfaccia utente Piwik e fornire una nuova esperienza visiva per godere i tuoi reports statistici.", "ThemesManagement": "Gestisci i temi", "UninstallConfirm": "State per disinstallare un plugin %s. Questo verrà completamente rimosso dalla vostra piattaforma e non potrà essere recuperato. Siete sicuri di volerlo fare?", - "Updated": "Aggiornato", - "UpdatingPlugin": "Aggiornamento di %s", - "UploadZipFile": "Caricamento file ZIP", "Version": "Versione", - "ViewRepositoryChangelog": "Guarda i cambiamenti", "ViewAllMarketplacePlugins": "Scopri tutti i plugin del Marketplace", + "WeDeactivatedThePluginAsItHasMissingDependencies": "Abbiamo disabilitato il plugin %s perché ha delle dipendenze mancanti:", "Websites": "Siti web" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/ja.json b/plugins/CorePluginsAdmin/lang/ja.json index ae7be8850a..e4c188d3f9 100644 --- a/plugins/CorePluginsAdmin/lang/ja.json +++ b/plugins/CorePluginsAdmin/lang/ja.json @@ -1,41 +1,24 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "プラグインを有効にする", - "ActionActivateTheme": "テーマを有効にする", - "ActionInstall": "インストール", "ActionUninstall": "アンインストール", "Activate": "有効化", "Activated": "有効", "Active": "有効", "Activity": "アクティビティ", - "AllowedUploadFormats": "このページから ZIP 形式のプラグインやテーマをアップロードをすることができます", "AuthorHomepage": "作者のホームページ", - "Authors": "著者", - "BackToExtendPiwik": "マーケットプレイスへ戻る", - "BeCarefulUsingPlugins": "Piwik チームが作成していないプラグインは注意して使用して下さい：私たちはそれらを確認していません", - "BeCarefulUsingThemes": "Piwik チームが作成していないテーマは注意して使用して下さい：私たちはそれらを確認していません", - "ByXDevelopers": "%s の開発者", - "CannotInstall": "インストールできません ( ヘルプ )", "Changelog": "変更履歴", "ChangeSettingsPossible": "このプラグインのために、 %1$ssettings%2$s を変更できます。", "CorePluginTooltip": "コアプラグインは、 Piwik と一緒に配布されているため、バージョンはありません", "Deactivate": "無効化", - "Developer": "開発者", - "DevelopersLearnHowToDevelopPlugins": "デベロッパー：%1$s テーマやプラグイン %2$s を開発することでPiwikを拡張、カスタマイズする方法を学びます。", "DoMoreContactPiwikAdmins": "新しいプラグインやテーマをインストールするには、 Piwik の管理者に連絡をしてください", - "FeaturedPlugin": "注目のプラグイン", "ChangeLookByManageThemes": "%1$s テーマの管理 %2$sによって Piwik の外観を変更できます。", - "GetEarlyAccessForPaidPlugins": "注 : 現在、全てのプラグインは無料で利用できます。今後マーケットプレイスでは有料プラグインが有効になります。 (有料プラグインについて、誰よりも早く知りたい方は、%1$s こちら %2$s )", "History": "履歴", "Inactive": "無効", "InfoPluginUpdateIsRecommended": "最新の改良による恩恵を受けるには、今すぐプラグインをアップデートしてください。", "InfoThemeIsUsedByOtherUsersAsWell": "注 : Piwikに登録されている他の %1$s のユーザーは、テーマ %2$s も使用しています。", "InfoThemeUpdateIsRecommended": "最新バージョンを使用するするためにテーマを更新します。", - "InstallingPlugin": "%s のインストール", "InstallNewPlugins": "新しいプラグインをインストール", "InstallNewThemes": "新しいテーマをインストール", - "LastCommitTime": "(最終更新 %s)", - "LastUpdated": "最終更新日", "LicenseHomepage": "ライセンスのホームページ", "LikeThisPlugin": "このプラグインを気に入りましたか？", "ConsiderDonating": "寄付を検討", @@ -43,58 +26,29 @@ "ConsiderDonatingCreatorOf": "%s の作成者への寄付を検討", "PluginsExtendPiwik": "プラグインは Piwik の機能性を拡張します。", "OncePluginIsInstalledYouMayActivateHere": "プラグインをインストールすると、ここで有効化と無効化を行うことができます。", - "Marketplace": "マーケットプレイス", - "MarketplaceSellPluginSubject": "マーケットプレイス - プラグインの販売", "MenuPlatform": "プラットフォーム", "MissingRequirementsNotice": "%1$s %3$s が必要です。 %1$s %2$s を最新バージョンにアップデートしてください。", "MissingRequirementsPleaseInstallNotice": "%3$s で必要とされる、 %1$s %2$s をインストールしてください。", - "NewVersion": "新しいバージョン", - "NoPluginsFound": "プラグインは見つかりませんでした", - "NotAllowedToBrowseMarketplacePlugins": "Piwik プラットフォームのカスタマイズまたは拡張のために、インストール可能なプラグインのリストを閲覧することができます。もしこれらのいづれかのインストールが必要な場合は、管理者にお問い合わせください。", - "NotAllowedToBrowseMarketplaceThemes": "Piwik プラットフォームの外観をカスタマイズするのにインストール可能な Piwik テーマのリストをご確認ください。これらのいづれかをインストールしたい場合は、管理者にお問い合わせください。", - "NoThemesFound": "テーマは見つかりませんでした", "NoZipFileSelected": "ZIP ファイルを選択してください。", - "NumDownloadsLatestVersion": "最新バージョン：%s のダウンロード", "NumUpdatesAvailable": "%s アップデートがあります", "Origin": "開発元", "OriginCore": "コア", "OriginThirdParty": "サードパーティ", "PluginHomepage": "プラグインのホームページ", - "PluginKeywords": "キーワード", "PluginNotCompatibleWith": "%1$s plugin is not compatible with %2$s.", "PluginNotWorkingAlternative": "このプラグインを以前から使用している場合、マーケットプレイス上で、より最新のバージョンを見つけることができます。使用していない場合、アンインストールすることをお勧めします。", "PluginRequirement": "%1$s requires %2$s.", "PluginsManagement": "プラグインの管理", - "PluginUpdateAvailable": "あなたは現在、バージョン %1$s を使用しています。新しいバージョン %2$s が利用可能です。", - "PluginVersionInfo": "%2$s からの %1$s", - "PluginWebsite": "プラグインのウェブサイト", - "Screenshots": "スクリーンショット", "Status": "状態", - "StepDownloadingPluginFromMarketplace": "マーケットプレイスからプラグインをダウンロード", - "StepDownloadingThemeFromMarketplace": "マーケットプレイスからテーマをダウンロード", - "StepPluginSuccessfullyInstalled": "プラグイン %1$s %2$s のインストールに成功しました。", - "StepPluginSuccessfullyUpdated": "プラグイン %1$s %2$s のアップデートに成功しました。", - "StepReplaceExistingPlugin": "既存のプラグインを置き換える", - "StepReplaceExistingTheme": "既存のテーマを置き換える", - "StepThemeSuccessfullyInstalled": "テーマ %1$s %2$s のインストールに成功しました。", - "StepThemeSuccessfullyUpdated": "テーマ %1$s %2$s のアップデートに成功しました。", - "StepUnzippingPlugin": "プラグインを解凍", - "StepUnzippingTheme": "テーマを解凍", "SuccessfullyActicated": "<strong> %s <\/strong> の有効化に成功しました。", - "Support": "サポート", "TeaserExtendPiwik": "Piwik のプラグインとテーマを拡張", - "TeaserExtendPiwikByUpload": "ZIP ファイルをアップロードして Piwik を拡張", "InstallingNewPluginViaMarketplaceOrUpload": "自動的にマーケットプレイスからプラグインをインストールまたは.zip形式のプラグイン %1$s を %2$s アップロードすることができます。", "Theme": "テーマ", "Themes": "テーマ", "ThemesDescription": "テーマは Piwik ユーザインターフェイスの外観を変更するだけでなく、解析レポートを楽しむ新しいビジュアルを備えています", "ThemesManagement": "テーマの管理", "UninstallConfirm": "プラグイン %s をアンインストールしようとしています。実行されると、プラグインは完全にプラットフォームから削除され、回復できなくなります。本当にアンインストールを実行してもよろしいですか？", - "Updated": "更新済", - "UpdatingPlugin": "%s のアップデート", - "UploadZipFile": "ZIPファイルをアップロード", "Version": "バージョン", - "ViewRepositoryChangelog": "変更内容を表示", "Websites": "ウェブサイト" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/ka.json b/plugins/CorePluginsAdmin/lang/ka.json index 4c78df7af6..952ad5ca15 100644 --- a/plugins/CorePluginsAdmin/lang/ka.json +++ b/plugins/CorePluginsAdmin/lang/ka.json @@ -10,7 +10,6 @@ "PluginsExtendPiwik": "პლაგინები აფართოვებენ და ამრავალფეროვნებენ Piwik–ის ფუნქციებს.", "OncePluginIsInstalledYouMayActivateHere": "აქედან შესაძლებელია ერთხელ დაინსტალირებული პლაგინის ჩართვა და გამორთვა.", "PluginHomepage": "პლაგინის სათაო გვერდი", - "PluginKeywords": "საკვანძო სიტყვები", "PluginsManagement": "პლაგინების მენეჯმენტი", "Status": "სტატუსი", "Version": "ვერსია", diff --git a/plugins/CorePluginsAdmin/lang/ko.json b/plugins/CorePluginsAdmin/lang/ko.json index 8d6171e006..5458efa36c 100644 --- a/plugins/CorePluginsAdmin/lang/ko.json +++ b/plugins/CorePluginsAdmin/lang/ko.json @@ -1,56 +1,32 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "플러그인 활성화", - "ActionActivateTheme": "테마 활성화", - "ActionInstall": "설치", "ActionUninstall": "제거", "Activate": "활성화", "Activated": "활성화됨", "Active": "활성", "Activity": "활동", - "AllowedUploadFormats": "zip 포멧을 통해 플러그인이나 테마를 업로드 할 수 있습니다.", "AuthorHomepage": "작성자 홈페이지", - "Authors": "작성자", - "BackToExtendPiwik": "마켓플레이스로 돌아가", - "BeCarefulUsingPlugins": "Piwik 팀으로부터 검증되지 않은 플러그인은 사용 시 주의해주세요. 해당 플러그인을 리뷰하지 않았습니다.", - "BeCarefulUsingThemes": "Piwik 팀으로부터 검증되지 않은 플러그인은 사용 시 주의해주세요. 해당 플러그인을 리뷰하지 않았습니다.", "Changelog": "변", "Deactivate": "비활성화", - "Developer": "개발자", "DoMoreContactPiwikAdmins": "새로운 플러그인이나 테마를 설치하기 위해서, Piwik 관리자에게 연락해주세요.", - "GetEarlyAccessForPaidPlugins": "참고사항: 모든 플러그인은 현재 무료로 사용할 수 있습니다. 향후 유료 마켓플레이스를 제공할 예정입니다 (자세한 사항은 %1$s연락 주시길%2$s 바랍니다.).", "Inactive": "비활성", "InstallNewPlugins": "새로운 플러그인 설치", "InstallNewThemes": "새로운 테마 설치", - "LastUpdated": "최근 업데이트", "LicenseHomepage": "라이센스 홈페이지", "LikeThisPlugin": "플러그인 좋아요", "ConsiderDonating": "기부 고려하기", "PluginsExtendPiwik": "플러그인 확장과 Piwik의 기능성 확장페이지입니다.", "OncePluginIsInstalledYouMayActivateHere": "플러그인이 한번 설치되면 이곳에서 활성화하거나 비활성화할 수 있습니다.", - "Marketplace": "마켓플레이스", "MenuPlatform": "플랫폼", - "NewVersion": "새로운 버전", - "NoPluginsFound": "플러그인을 찾을 수 없습니다.", - "NoThemesFound": "테마를 찾을 수 없습니다.", "NoZipFileSelected": "ZIP 파일을 선택해주세요.", "OriginThirdParty": "서드파티", "PluginHomepage": "플러그인 홈페이지", - "PluginKeywords": "검색어", "PluginsManagement": "플러그인 관리", - "PluginWebsite": "플러그인 웹사이트", - "Screenshots": "스크린샷", "Status": "상태", - "StepDownloadingPluginFromMarketplace": "마켓플레이스에서 플러그인 다운로드 중", - "StepDownloadingThemeFromMarketplace": "마켓플레이스에서 테마 다운로드 중", - "StepUnzippingPlugin": "플러그인 압축 푸는 중", - "StepUnzippingTheme": "테마 압축 푸는 중", "Theme": "테마", "Themes": "테마", "ThemesManagement": "테마 관리", - "UploadZipFile": "ZIP 파일 업로드", "Version": "버전", - "ViewRepositoryChangelog": "변경사항 보기", "Websites": "웹사이트" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/lt.json b/plugins/CorePluginsAdmin/lang/lt.json index 5af99565dd..d05c7d0f3f 100644 --- a/plugins/CorePluginsAdmin/lang/lt.json +++ b/plugins/CorePluginsAdmin/lang/lt.json @@ -1,31 +1,19 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Aktyvuoti papildinį", "Activate": "Aktyvinti", "Activated": "Aktyvintas", "Active": "Aktyvus", - "AllowedUploadFormats": "Per šį puslapį galite įkelti papildinį ar temą .zip formatu.", "Changelog": "Keitimų žurnalas", "Deactivate": "Pasyvinti", - "Developer": "Kūrėjas", "Inactive": "Pasyvus", - "InstallingPlugin": "Įdiegiama %s", "LikeThisPlugin": "Patinka šis papildinys?", "PluginsExtendPiwik": "Papildiniai suteikia Piwik papildomų galimybių.", "OncePluginIsInstalledYouMayActivateHere": "Įdiegę papildinį, čia galite jį aktyvinti arba pasyvinti", - "NoPluginsFound": "Papildinių nerasta", - "NoThemesFound": "Temų nerasta", "NoZipFileSelected": "Prašome pasirinkti ZIP failą.", "PluginHomepage": "Papildinio svetainė", - "PluginKeywords": "Raktiniai žodžiai", "PluginRequirement": "%1$s reikalauja %2$s.", "PluginsManagement": "Papildinių valdymas", - "PluginWebsite": "Papildinio svetainė", - "Screenshots": "Ekrano kopijos", "Status": "Būsena", - "StepPluginSuccessfullyInstalled": "Jūs sėkmingai įdiegėte papildinį %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Jūs sėkmingai atnaujinote papildinį %1$s %2$s.", - "StepReplaceExistingPlugin": "Pakeičiamas esamas papildinys", "SuccessfullyActicated": "Jūs sėkmingai aktyvavote <strong>%s<\/strong>.", "Version": "Versija", "Websites": "Svetainės" diff --git a/plugins/CorePluginsAdmin/lang/lv.json b/plugins/CorePluginsAdmin/lang/lv.json index 0faebaa60b..0b0dc395b2 100644 --- a/plugins/CorePluginsAdmin/lang/lv.json +++ b/plugins/CorePluginsAdmin/lang/lv.json @@ -10,7 +10,6 @@ "PluginsExtendPiwik": "Spraudņi paplašina Piwik funkcionalitāti.", "OncePluginIsInstalledYouMayActivateHere": "Pēc spraudņa instalācijas, Jūs to varat aktivizēt (vai deaktivizēt) šeit.", "PluginHomepage": "Spraudņa vietne", - "PluginKeywords": "Atslēgvārdi", "PluginsManagement": "Spraudņu pārvaldība", "Status": "Statuss", "Version": "Versija", diff --git a/plugins/CorePluginsAdmin/lang/nb.json b/plugins/CorePluginsAdmin/lang/nb.json index f883b88eec..4074c8598a 100644 --- a/plugins/CorePluginsAdmin/lang/nb.json +++ b/plugins/CorePluginsAdmin/lang/nb.json @@ -1,43 +1,26 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Aktiver utvidelse", - "ActionActivateTheme": "Aktiver tema", - "ActionInstall": "Installer", "ActionUninstall": "Avinstaller", "Activate": "Aktiver", "Activated": "Aktivert", "Active": "Aktiv", "Activity": "Aktivitet", - "AllowedUploadFormats": "Du kan laste opp en utvidelse eller et tema i .zip-format via denne siden.", "AuthorHomepage": "Forfatterens hjemmeside", - "Authors": "Forfattere", - "BackToExtendPiwik": "Tilbake til markedsplassen", - "BeCarefulUsingPlugins": "Utvidelser som ikke er skrevet av Piwik-laget bør brukes med forsiktighet: Vi har ikke vurdert dem.", - "BeCarefulUsingThemes": "Tema som ikke er skrevet av Piwik-laget bør brukes med forsiktighet: Vi har ikke vurdert dem.", - "ByXDevelopers": "av %s utviklere", - "CannotInstall": "Kan ikke installere (hjelp)", "Changelog": "Endringslogg", "ChangeSettingsPossible": "Du kan endre %1$sinnstillingene%2$s for denne utvidelsen.", "CorePluginTooltip": "Kjerne-utvidelser har ingen versjon siden de distribueres med Piwik.", "Deactivate": "Deaktiver", - "Developer": "Utvikler", - "DevelopersLearnHowToDevelopPlugins": "Utviklere: Lær hvordan du kan utvide og tilpasse Piwik ved %1$så utvikle utvidelser og tema%2$s.", "DoMoreContactPiwikAdmins": "For å installer en ny utvidelse eller et nytt tema, kontakt administratoren for din Piwik.", - "FeaturedPlugin": "Fremhevet utvidelse", "ChangeLookByManageThemes": "Du kan endre utseendet til Piwik ved å %1$sHåndtere temaer%2$s.", - "GetEarlyAccessForPaidPlugins": "Merk. alle utvidelser er nå tilgjengelig gratis; i fremtiden vil vi også tilby utvidelser mot betaling i markedsplassen (%1$skontakt oss%2$s for tidlig tilgang).", "History": "Historikk", "Inactive": "Deaktivert", + "InstalledPlugins": "Installerte utvidelser", + "InstalledThemes": "Installerte temaer", "InfoPluginUpdateIsRecommended": "Oppdater dine utvidelser nå for å få glede av de siste forbedringene.", "InfoThemeIsUsedByOtherUsersAsWell": "Merk: de andre %1$s brukerne som er registrert i denne Piwiken bruker også temaet %2$s.", "InfoThemeUpdateIsRecommended": "Oppdater dine temaer for å få gleden av den siste versjonen.", - "InstallingPlugin": "Installerer %s", "InstallNewPlugins": "Installer nye utvidelser", "InstallNewThemes": "Installer nye tema", - "InstalledPlugins": "Installerte utvidelser", - "InstalledThemes": "Installerte temaer", - "LastCommitTime": "(siste bidrag %s)", - "LastUpdated": "Sist oppdatert", "LicenseHomepage": "Lisensside", "LikeThisPlugin": "Liker du denne utvidelsen?", "ConsiderDonating": "Vurder å donere", @@ -45,64 +28,32 @@ "ConsiderDonatingCreatorOf": "Vurder å donere til forfatteren av %s", "PluginsExtendPiwik": "Utvidelser kan utvide eller begrense funksjonaliteten i Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Når en utvidelse har blitt installert, kan du slå den av eller på her.", - "Marketplace": "Markedsplass", - "MarketplaceSellPluginSubject": "Markedsplass - selg utvidelse", "MenuPlatform": "Platform", "MissingRequirementsNotice": "Vennligst oppdater %1$s %2$s til en nyere versjon, %1$s %3$s er påkrevd.", "MissingRequirementsPleaseInstallNotice": "Vennligst installer %1$s %2$s da dette er påkrevd av %3$s.", - "NewVersion": "ny versjon", - "NoPluginsFound": "Ingen utvidelser funnet", - "NoPluginSettings": "Det er ingen utvidelsesinnstillinger som kan konfigureres", - "NotAllowedToBrowseMarketplacePlugins": "Du kan bla i listen over utvidelser som kan installeres for å utvide eller tilpasse din Piwik-plattform. Vennligst kontakt din admin hvis du trenger å installere noen av disse.", - "NotAllowedToBrowseMarketplaceThemes": "Du kan bla i listen over temaer som kan installeres for å tilpasse utseendet til Piwik-plattformen. Vennligst kontakt din admin for å få noen av disse installert.", - "NoThemesFound": "Ingen temaer funnet", "NoZipFileSelected": "Vennligst velg en ZIP-fil.", - "NumDownloadsLatestVersion": "Siste versjon: %s nedlastinger", "NumUpdatesAvailable": "%s oppdatering(er) tilgjengelig", + "NoPluginSettings": "Det er ingen utvidelsesinnstillinger som kan konfigureres", "Origin": "Opprinnelse", "OriginCore": "Kjerne", "OriginThirdParty": "Tredjepart", "PluginHomepage": "Hjemmeside for utvidelse", - "PluginKeywords": "Nøkkelord", "PluginNotCompatibleWith": "%1$s utvidelse ikke kompatibel med %2$s.", "PluginNotWorkingAlternative": "Hvis du bruker denne utvidelsen, kanskje du kan finne en nyere versjon i markedsplassen. Hvis ikke, vil du kanskje avinstallere den.", "PluginRequirement": "%1$s krever %2$s.", "PluginsManagement": "Administrasjon av utvidelser", - "PluginUpdateAvailable": "Du bruker versjon %1$s og en ny versjon %2$s er tilgjengelig.", - "PluginVersionInfo": "%1$s fra %2$s", - "PluginWebsite": "Nettsted for utvidelse", - "Screenshots": "Skjermbilder", - "SortByAlpha": "Alpha", - "SortByNewest": "Nyeste", - "SortByPopular": "Populære", "Status": "Status", - "StepDownloadingPluginFromMarketplace": "Laster ned utvidelse fra markedsplassen", - "StepDownloadingThemeFromMarketplace": "Laster ned tema fra markedsplassen", - "StepPluginSuccessfullyInstalled": "Du har installert utvidelsen %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Du har oppdatert utvidelsen %1$s %2$s.", - "StepReplaceExistingPlugin": "Erstatter eksisterende utvidelse", - "StepReplaceExistingTheme": "Erstatter eksisterende tema", - "StepThemeSuccessfullyInstalled": "Du har installert temaet %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Du har oppdatert temaet %1$s %2$s.", - "StepUnzippingPlugin": "Pakker ut utvidelse", - "StepUnzippingTheme": "Pakker ut tema", "SuccessfullyActicated": "Du har aktivert <strong>%s<\/strong>.", - "Support": "Støtte", "TeaserExtendPiwik": "Utvid Piwik med utvidelser og temaer", "TeaserExtendPiwikByPlugin": "Utvid Piwik ved å %1$sinstallere en ny utvidelse%2$s.", "TeaserExtendPiwikByTheme": "Prøv et nytt utseende ved å %1$sinstallere et nytt tema%2$s.", - "TeaserExtendPiwikByUpload": "Utvid Piwik ved å laste opp en ZIP-fil", "InstallingNewPluginViaMarketplaceOrUpload": "Du kan installere utvidelser fra markedsplassen automatisk eller %1$slaste opp en utvidelse%2$s i .zip-format.", "Theme": "Tema", "Themes": "Temaer", "ThemesDescription": "Temaer kan endre utseendet til Piwik, og gi en helt ny visuell opplevelse for dine analyserapporter.", "ThemesManagement": "Håndtere temaer", "UninstallConfirm": "Du er i ferd med å avinstallere utvidelsen %s. Denne utvidelsen vil bli helt slettet fra din plattform, og dette kan ikke angres. Er du sikker at du vil dette?", - "Updated": "Oppdatert", - "UpdatingPlugin": "Oppdaterer %s", - "UploadZipFile": "Last opp ZIP-fil", "Version": "Versjon", - "ViewRepositoryChangelog": "Vis endringene", "ViewAllMarketplacePlugins": "Se alle utvidelsene på Markedsplassen", "Websites": "Nettsteder" } diff --git a/plugins/CorePluginsAdmin/lang/nl.json b/plugins/CorePluginsAdmin/lang/nl.json index 6125114f35..21d85b8f71 100644 --- a/plugins/CorePluginsAdmin/lang/nl.json +++ b/plugins/CorePluginsAdmin/lang/nl.json @@ -1,41 +1,24 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Plugin inschakelen", - "ActionActivateTheme": "Thema activeren", - "ActionInstall": "Installeren", "ActionUninstall": "Installatie ongedaan maken", "Activate": "Inschakelen", "Activated": "Ingeschakeld", "Active": "Ingeschakeld", "Activity": "Activiteit", - "AllowedUploadFormats": "Je kunt een plugin of thema in .zip formaat uploaden via deze pagina.", "AuthorHomepage": "Auteur Startpagina", - "Authors": "Auteurs", - "BackToExtendPiwik": "Terug naar de Marktplaats", - "BeCarefulUsingPlugins": "Plugins die niet door het Piwik team zijn geschreven, wees daar voorzichtig mee: we hebben geen review gedaan.", - "BeCarefulUsingThemes": "Thema's die niet door het Piwik team zijn geschreven, wees daar voorzichtig mee: we hebben geen review gedaan.", - "ByXDevelopers": "door %s ontwikkelaars", - "CannotInstall": "Kan niet worden geïnstalleerd (help)", "Changelog": "Wijzigingen", "ChangeSettingsPossible": "Je kunt %1$sinstellingen%2$s aanpassen voor deze plugin.", "CorePluginTooltip": "Kern plugins hebben geen versie omdat deze met Piwik gedistribueerd worden.", "Deactivate": "Uitschakelen", - "Developer": "Ontwikkelaar", - "DevelopersLearnHowToDevelopPlugins": "Ontwikkelaars: Leer hoe Piwik kan worden uitgebreid en aangepast door het %1$sontwikkelen van plugins en thema's%2$s.", "DoMoreContactPiwikAdmins": "Neem contact op met je Piwik beheerder om een nieuwe plugin of thema te installeren.", - "FeaturedPlugin": "Aanbevolen plugin", "ChangeLookByManageThemes": "Je kan het uitelijk van Piwik wijzigen %1$sThema's%2$s", - "GetEarlyAccessForPaidPlugins": "Opmerking: op het moment zijn alle plugins gratis beschikbaar; in de toekomst activeren we Betaalde Plugins in de Marktplaats (%1$sneem contact op%2$s om eerder toegang te krijgen).", "History": "Historie", "Inactive": "Uitgeschakeld", "InfoPluginUpdateIsRecommended": "Update nu uw plugins om van de laatste verbeteringen te profiteren.", "InfoThemeIsUsedByOtherUsersAsWell": "Opmerking: de andere %1$s gebruikers van deze Piwik gebruiken ook het thema %2$s.", "InfoThemeUpdateIsRecommended": "Update je thema's om van de laatste versie te genieten.", - "InstallingPlugin": "Installeren %s", "InstallNewPlugins": "Nieuwe plugins installeren", "InstallNewThemes": "Nieuwe thema's installeren", - "LastCommitTime": "(laatste wijziging %s)", - "LastUpdated": "Laatst Bijgewerkt", "LicenseHomepage": "Licentie Startpagina", "LikeThisPlugin": "Vind je deze plugin handig?", "ConsiderDonating": "Overweeg te doneren", @@ -43,58 +26,29 @@ "ConsiderDonatingCreatorOf": "Overweeg om te doneren aan de maker van %s", "PluginsExtendPiwik": "Met plugins breidt je de functionaliteit van piwik uit.", "OncePluginIsInstalledYouMayActivateHere": "Wanneer een plugin geïnstalleerd is, kan deze hier aan- en uitgeschakeld worden.", - "Marketplace": "Marktplaats", - "MarketplaceSellPluginSubject": "Marktplaats - Verkoop Plugin", "MenuPlatform": "Platform", "MissingRequirementsNotice": "Update alstublieft %1$s %2$s naar een nieuwere versie, %1$s %3$s is vereist.", "MissingRequirementsPleaseInstallNotice": "Installeer %1$s %2$s omdat %3$s dat nodig heeft.", - "NewVersion": "Nieuwe versie", - "NoPluginsFound": "Geen plugins gevonden", - "NotAllowedToBrowseMarketplacePlugins": "Je kunt de lijst met beschikbare plugins bekijken om je Piwik platform te wijzigen of uit te breiden. Neem contact op met je Piwik beheerder wanneer je een van deze plugins wil installeren.", - "NotAllowedToBrowseMarketplaceThemes": "Je kunt de lijst met beschikbare thema's bekijken om je weergave van het Piwik platform aan te passen. Neem contact op met je Piwik beheerder wanneer je een van deze thema's wilt installeren.", - "NoThemesFound": "Geen thema's gevonden", "NoZipFileSelected": "Selecteer een ZIP-bestand.", - "NumDownloadsLatestVersion": "Laatste versie: %s Downloads", "NumUpdatesAvailable": "%s Update(s) beschikbaar", "Origin": "Herkomst", "OriginCore": "Kern", "OriginThirdParty": "Derden", "PluginHomepage": "Plugins", - "PluginKeywords": "Sleutelwoorden", "PluginNotCompatibleWith": "%1$s plugin is niet compatibel met %2$s.", "PluginNotWorkingAlternative": "Als je deze plugin hebt gebruikt, kun je wellicht een meer recente versie in de Marktplaats vinden. Zo niet, dan wil je deze plugin waarschijnlijk verwijderen.", "PluginRequirement": "%1$s vereist %2$s.", "PluginsManagement": "Plugin manager", - "PluginUpdateAvailable": "Je gebruikt versie %1$s en een nieuwe versie %2$s is beschikbaar.", - "PluginVersionInfo": "%1$s van %2$s", - "PluginWebsite": "Plugin Website", - "Screenshots": "Schermafbeeldingen", "Status": "Status", - "StepDownloadingPluginFromMarketplace": "Plugin van de Marktplaats aan het Downloaden", - "StepDownloadingThemeFromMarketplace": "Thema van de Marktplaats aan het Downloaden", - "StepPluginSuccessfullyInstalled": "Je hebt succesvol de plug-in %1$s %2$s geïnstalleerd.", - "StepPluginSuccessfullyUpdated": "Je hebt succesvol de plugin %1$s %2$s bijgewerkt.", - "StepReplaceExistingPlugin": "Vervang bestaande plugin", - "StepReplaceExistingTheme": "Vervang bestaande thema", - "StepThemeSuccessfullyInstalled": "Je hebt succesvol het thema %1$s %2$s geïnstalleerd.", - "StepThemeSuccessfullyUpdated": "Je hebt succesvol het thema %1$s %2$s bijgewerkt.", - "StepUnzippingPlugin": "Plugin uitpakken", - "StepUnzippingTheme": "Thema uitpakken", "SuccessfullyActicated": "Je hebt succesvol <strong>%s<\/strong> geactiveerd.", - "Support": "Ondersteuning", "TeaserExtendPiwik": "Breidt Piwik uit met plugins en thema's", - "TeaserExtendPiwikByUpload": "Breidt Piwik uit door een ZIP bestand te uploaden", "InstallingNewPluginViaMarketplaceOrUpload": "Je kunt automatisch plugins installeren van de Martkplaats, of een %1$splugin uploaden%2$s in een .zip bestand.", "Theme": "Thema", "Themes": "Thema's", "ThemesDescription": "Thema's kunnen de weergave van de Piwik interface aanpassen, en bieden je een compleet nieuwe visuele ervaring voor je analyse rapporten", "ThemesManagement": "Beheer thema's", "UninstallConfirm": "Je staat op het punt een plugin %s installatie ongedaan te maken. De plugin zal volledig worden verwijderd van het platform, dit kan niet ongedaan worden. Weet je zeker dat je dat wil?", - "Updated": "Bijgewerkt", - "UpdatingPlugin": "Bijwerken %s", - "UploadZipFile": "ZIP bestand uploaden", "Version": "Versie", - "ViewRepositoryChangelog": "Bekijk de veranderingen", "Websites": "Websites" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/nn.json b/plugins/CorePluginsAdmin/lang/nn.json index 2e3f8d880a..b52b6f5e12 100644 --- a/plugins/CorePluginsAdmin/lang/nn.json +++ b/plugins/CorePluginsAdmin/lang/nn.json @@ -10,7 +10,6 @@ "PluginsExtendPiwik": "Innstikk utvidar funksjonane til Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Når eit innstikk er lagt til, kan du slå det av og på her.", "PluginHomepage": "Nettsida til innstikket", - "PluginKeywords": "Nøkkelord", "PluginsManagement": "Innstikkstyring", "Status": "Status", "Version": "Versjon", diff --git a/plugins/CorePluginsAdmin/lang/pl.json b/plugins/CorePluginsAdmin/lang/pl.json index 8580c1bea1..b8233ec608 100644 --- a/plugins/CorePluginsAdmin/lang/pl.json +++ b/plugins/CorePluginsAdmin/lang/pl.json @@ -1,90 +1,47 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Włącz plugin", - "ActionActivateTheme": "Aktywuj szablon", - "ActionInstall": "Zainstaluj", "ActionUninstall": "Odinstaluj", "Activate": "Włącz", "Activated": "Aktywowano", "Active": "Aktywna", "Activity": "Aktywność", - "AllowedUploadFormats": "Możesz wysłać plugin lub skórę w formacie .zip poprzez tą stronę.", "AuthorHomepage": "Strona główna Piwik", - "Authors": "Autorzy", - "BackToExtendPiwik": "Wróć do Marketu", - "BeCarefulUsingPlugins": "Pluginy nie będące autorstwa zespołu Piwik'a powinny być używane z ostrożnością: nie sprawdzamy ich.", - "BeCarefulUsingThemes": "Szablonym, których autorem nie jest grupa Piwik, powinny by używane z rozwagą: nie sprawdzaliśmy ich.", - "ByXDevelopers": "przez %s deweloperów", "Changelog": "Log zmian", "ChangeSettingsPossible": "Możesz zmienić %1$sustawienia%2$s dla tego plugin'u.", "CorePluginTooltip": "Pluginy do Core nie mają wersji, ponieważ są rozpowszechniane z Piwik.", "Deactivate": "Wyłącz", - "Developer": "Deweloper", "DoMoreContactPiwikAdmins": "Aby zainstalować nowy plugin lub nową skórę, skontaktuj się z administratorami Piwik'a.", - "FeaturedPlugin": "Wyróżniony plugin", - "GetEarlyAccessForPaidPlugins": "Uwaga: wszystkie pluginy są obecnie dostępne za darmo; w przyszłości uruchomimy w Sklepie Płatne Pluginy (%1$sskontaktuj się%2$s dla wczesnego dostępu).", "History": "Historia", "Inactive": "Nieaktywna", "InfoPluginUpdateIsRecommended": "Zaktualizuj swoje pluginy teraz, w celu uzyskania korzyści z najnowszych ulepszeń.", "InfoThemeIsUsedByOtherUsersAsWell": "Uwaga: %1$s innych użytkowników zarejestrowanych w tym Piwik'u także używają skóry %2$s.", "InfoThemeUpdateIsRecommended": "Zaktualizuj swoje skóry aby cieszyć się najnowszymi wersjami.", - "InstallingPlugin": "Instalowanie %s", "InstallNewPlugins": "Zainstaluj nowe pluginy", "InstallNewThemes": "Zainstaluj nowe szablony", - "LastCommitTime": "(ostatnia aktualizacja %s)", - "LastUpdated": "Ostatnia aktualizacja", "LicenseHomepage": "Licencja strony głównej", "PluginsExtendPiwik": "Wtyczki zwiększają i rozszerzają funkcjonalność statystyk Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Po instalacji wtyczki, możesz ją tutaj włączyć lub wyłączyć.", - "Marketplace": "Sklep", - "MarketplaceSellPluginSubject": "Sklep - Sprzedaj Plugin", "MenuPlatform": "Platforma", "MissingRequirementsNotice": "Zaktualizuj %1$s %2$s do nowszej wersji, %1$s %3$s jest wymagana.", - "NoPluginsFound": "Nie znaleziono pluginów", - "NotAllowedToBrowseMarketplacePlugins": "Możesz przeglądać listę plugin'ów które mogą zostać zainstalowane aby zmodyfikować lub rozszerzyć Twoją platformę Piwik. Skontaktuj się z administratorem jeśli chcesz zainstalować któryś z nich.", - "NotAllowedToBrowseMarketplaceThemes": "Możesz przeglądać listę tematów, które mogą być zainstalowane, aby dostosować wygląd platformy Piwik. W celu instalacji porszę skontaktować się z administratorem.", - "NoThemesFound": "Nie znaleziono szablonów", "NoZipFileSelected": "Proszę wybrać plik ZIP.", - "NumDownloadsLatestVersion": "Ostatnia wersja: %s Pobrań", "NumUpdatesAvailable": "%s aktualizacji dostępnych", "Origin": "Pochodzenie", "OriginCore": "Jądro", "OriginThirdParty": "osoba trzecia", "PluginHomepage": "Strona główna Wtyczki", - "PluginKeywords": "Słowa kluczowe", "PluginNotCompatibleWith": "%1$s jest niekompatybilny z %2$s.", "PluginNotWorkingAlternative": "Przy użyciu tej wtyczki, może znajdziesz nowszą wersję w Marketplace. Jeśli nie, możesz ją odinstalować.", "PluginRequirement": "%1$s wymaga %2$s.", "PluginsManagement": "Zarządzanie wtyczkami", - "PluginUpdateAvailable": "Używasz wersji %1$s, nowa wersja %2$s jest dostępna.", - "PluginVersionInfo": "%1$s z %2$s", - "PluginWebsite": "Strona WWW", - "Screenshots": "Screenshoty", "Status": "Status", - "StepDownloadingPluginFromMarketplace": "Pobieranie wtyczki ze Sklepu", - "StepDownloadingThemeFromMarketplace": "Pobieranie szablonu ze Sklepu", - "StepPluginSuccessfullyInstalled": "Wtyczka %1$s %2$s została pomyślnie zainstalowana.", - "StepPluginSuccessfullyUpdated": "Wtyczka została %1$s %2$s zaaktualizowana.", - "StepReplaceExistingPlugin": "Zastępowanie istniejącego pluginu", - "StepReplaceExistingTheme": "Zastępowania obecnego motywu", - "StepThemeSuccessfullyInstalled": "Pomyślnie zainstalowano szablon %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Motyw został zaaktualizowany %1$s %2$s.", - "StepUnzippingPlugin": "Rozpakowywanie pluginu", - "StepUnzippingTheme": "Rozpakowuję szablon", "SuccessfullyActicated": "Pomyślnie aktywowano <strong>%s<\/strong>.", - "Support": "Wsparcie", "TeaserExtendPiwik": "Rozszerz Piwik o pluginy i szablony", - "TeaserExtendPiwikByUpload": "Rozbuduj Piwik poporzez wgranie plików ZIP", "Theme": "Szablon", "Themes": "Szablony", "ThemesDescription": "Skórki mogą zmienić wygląd interfejsu użytkownika Piwik , i zapewniają zupełnie nowe wrażenia wizualne w raportach Analytic", "ThemesManagement": "Zarządzaj szablonami", "UninstallConfirm": "Chcesz odinstalować wstyczkę %s. Wtyczka zostanie całokowicie i trwale usunięta z twojej platformy. Czy jesteś pewny, że chcesz to zrobić?", - "Updated": "Zaktualizowano", - "UpdatingPlugin": "Aktualizacja %s", - "UploadZipFile": "Wyślij plik ZIP", "Version": "Wersja", - "ViewRepositoryChangelog": "Zobacz zmiany", "Websites": "Serwisy internetowe" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/pt-br.json b/plugins/CorePluginsAdmin/lang/pt-br.json index 9356a2e109..6e3a455c16 100644 --- a/plugins/CorePluginsAdmin/lang/pt-br.json +++ b/plugins/CorePluginsAdmin/lang/pt-br.json @@ -1,43 +1,26 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Ativar plugin", - "ActionActivateTheme": "Ativar tema", - "ActionInstall": "Instalar", "ActionUninstall": "Desinstalar", "Activate": "Ativar", "Activated": "Ativado", "Active": "Ativo", "Activity": "Atividade", - "AllowedUploadFormats": "Você pode carregar um plugin ou tema em formato zip através desta página.", "AuthorHomepage": "Página do autor", - "Authors": "Autores", - "BackToExtendPiwik": "Voltar ao Marketplace", - "BeCarefulUsingPlugins": "Plugins que não são de autoria da equipe Piwik devem ser usados com cautela: nós não o revisamos.", - "BeCarefulUsingThemes": "Plugins que não são de autoria da equipe Piwik devem ser usados com cautela: nós não os revisamos.", - "ByXDevelopers": "por %s desenvolvedores", - "CannotInstall": "Não consegue instalar (ajuda)", "Changelog": "Changelog", "ChangeSettingsPossible": "Você pode alterar as %1$sconfigurações%2$s para este plugin.", "CorePluginTooltip": "Plugins core não possuem versão uma que são distribuídos com Piwik.", "Deactivate": "Desativar", - "Developer": "Desenvolvedor", - "DevelopersLearnHowToDevelopPlugins": "Desenvolvedores: Saibam como estender e personalizar o Piwik %1$sdesenvolvendo plugins ou temas%2$s.", "DoMoreContactPiwikAdmins": "Para instalar um novo plugin ou um novo tema, por favor, entrar em contato com os administradores do servidor Piwik.", - "FeaturedPlugin": "Plugin destaque", "ChangeLookByManageThemes": "Você pode alterar a aparência do Piwik %1$sGerenciando Temas%2$s.", - "GetEarlyAccessForPaidPlugins": "Nota: atualmente todos os plugins estão disponíveis gratuitamente; no futuro serão permitidos Plugins Pagos no Marketplace (%1$sentre em contato conosco%2$s para acesso antecipado).", "History": "Histórico", "Inactive": "Inativo", + "InstalledPlugins": "Plugins instalados", + "InstalledThemes": "Temas instalados", "InfoPluginUpdateIsRecommended": "Atualize seus plugins agora para se beneficiar das últimas melhorias.", "InfoThemeIsUsedByOtherUsersAsWell": "Nota: os outros %1$s usuários registrados neste Piwik também estão usando o tema %2$s.", "InfoThemeUpdateIsRecommended": "Atualize seus temas para desfrutas da versão mais recente.", - "InstallingPlugin": "Instalando %s", "InstallNewPlugins": "Instalar novos plugins", "InstallNewThemes": "Instalar novos temas", - "InstalledPlugins": "Plugins instalados", - "InstalledThemes": "Temas instalados", - "LastCommitTime": "(último commit %s)", - "LastUpdated": "Última Atualização", "LicenseHomepage": "Página de licenciamento", "LikeThisPlugin": "Curte esse plugin?", "ConsiderDonating": "Considere fazer uma doação", @@ -45,61 +28,29 @@ "ConsiderDonatingCreatorOf": "Por favor, considere fazer uma doação para o criador de %s", "PluginsExtendPiwik": "Plugins estendem e expandem a funcionalidade do Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Uma vez que um plugin for instalado, você pode ativá-lo ou desativá-lo aqui.", - "Marketplace": "Marketplace", - "MarketplaceSellPluginSubject": "Mercado - Venda Plugin", "MenuPlatform": "Plataforma", "MissingRequirementsNotice": "Por favor, atualize %1$s %2$s para uma nova versão, %1$s %3$s é necessária.", "MissingRequirementsPleaseInstallNotice": "Por favor instalar %1$s %2$s, como é exigido por %3$s.", - "NewVersion": "nova versão", - "NoPluginsFound": "Nenhum plugin encontrado", - "NotAllowedToBrowseMarketplacePlugins": "Você pode navegar na lista de plugins que podem ser instalados para personalizar ou estender a sua plataforma Piwik. Por favor, contate seu administrador se você precisar de qualquer um deles instalado.", - "NotAllowedToBrowseMarketplaceThemes": "Você pode navegar na lista de temas que podem ser instalados para personalizar a aparência da plataforma Piwik. Por favor, contate seu administrador para solicitar a instalação de qualquer um destes para você.", - "NoThemesFound": "Nenhum tema encontrado", "NoZipFileSelected": "Por favor, selecione um arquivo ZIP.", - "NumDownloadsLatestVersion": "Última versão: %s Downloads", "NumUpdatesAvailable": "%s Atualização(ões) disponível(is)", "Origin": "Origem", "OriginCore": "Core", "OriginThirdParty": "Terceiro", "PluginHomepage": "Página do Plugin", - "PluginKeywords": "Palavras-Chave", "PluginNotCompatibleWith": "O plugin %1$s não é compatível com %2$s.", "PluginNotWorkingAlternative": "Se você estiver usando este plugin, talvez você possa encontrar uma versão mais recente no Marketplace. Se não, você pode querer desinstalá-lo.", "PluginRequirement": "%1$s requer %2$s.", "PluginsManagement": "Gerenciamento de plugins", - "PluginUpdateAvailable": "Você está usando a versão %1$s e uma nova versão %2$s está disponível.", - "PluginVersionInfo": "%1$s de %2$s", - "PluginWebsite": "Site de Plugin", - "Screenshots": "Screenshots", - "SortByAlpha": "Alfa", - "SortByNewest": "Mais recente", - "SortByPopular": "Popular", "Status": "Status", - "StepDownloadingPluginFromMarketplace": "Transferindo plugin do Marketplace", - "StepDownloadingThemeFromMarketplace": "Transferindo tema do Marketplace", - "StepPluginSuccessfullyInstalled": "Você instalou com sucesso o plugin %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Você atualizou com sucesso o plugin %1$s %2$s.", - "StepReplaceExistingPlugin": "Substituindo plugin existente", - "StepReplaceExistingTheme": "Substituindo tema existente", - "StepThemeSuccessfullyInstalled": "Você instalou com sucesso o tema %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Você atualizou com sucesso o tema %1$s %2$s.", - "StepUnzippingPlugin": "Descompactando plugin", - "StepUnzippingTheme": "Descompactando tema", "SuccessfullyActicated": "Você ativou com sucesso <strong>%s<\/strong>.", - "Support": "Suporte", "TeaserExtendPiwik": "Estenda Piwik com plugins e temas", - "TeaserExtendPiwikByUpload": "Estenda o Piwik carregando um arquivo ZIP", "InstallingNewPluginViaMarketplaceOrUpload": "Você pode instalar automaticamente plugins do Marketplace ou %1$scarregar um plugin%2$s no formato .zip", "Theme": "Tema", "Themes": "Temas", "ThemesDescription": "Os temas podem alterar a aparência da interface do usuário do Piwik, e fornecer uma experiência completamente nova visual para desfrutar dos seus relatórios de análise.", "ThemesManagement": "Gerenciar Temas", "UninstallConfirm": "Você está prestes a desinstalar um plugin %s. O plugin será completamente removido da sua plataforma e isso não poderá ser desfeito. Tem certeza que deseja fazer isso?", - "Updated": "Atualizado(a)", - "UpdatingPlugin": "Atualizando %s", - "UploadZipFile": "Carregar arquivo ZIP", "Version": "Versão", - "ViewRepositoryChangelog": "Ver as mudanças", "ViewAllMarketplacePlugins": "Ver todos os plugins no Marketplace", "Websites": "Websites" } diff --git a/plugins/CorePluginsAdmin/lang/pt.json b/plugins/CorePluginsAdmin/lang/pt.json index aa0852ffaf..c3312c3e87 100644 --- a/plugins/CorePluginsAdmin/lang/pt.json +++ b/plugins/CorePluginsAdmin/lang/pt.json @@ -1,8 +1,5 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Ativar plugin", - "ActionActivateTheme": "Ativar tema", - "ActionInstall": "Instalar", "ActionUninstall": "Desinstalar", "Activate": "Activar", "Activated": "Activado", @@ -12,24 +9,18 @@ "Deactivate": "Desactivar", "History": "Histórico", "Inactive": "Inactivo", - "LastUpdated": "Ultima atualização", "LicenseHomepage": "Homepage da licença", "PluginsExtendPiwik": "Plugins estendem e expandem a funcionalidade de Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Quando um plugin é instalado, pode activá-lo ou desactivá-lo aqui.", - "Marketplace": "Mercado", "MenuPlatform": "Plataforma", "Origin": "Origem", "PluginHomepage": "Homepage do Plugin", - "PluginKeywords": "Palavras Chave", "PluginsManagement": "Gestão de Plugins", "Status": "Estado", - "Support": "Suporte", "Theme": "Tema", "Themes": "Temas", "ThemesManagement": "Gestão de temas", - "Updated": "Atualizado", "Version": "Versão", - "ViewRepositoryChangelog": "Ver alterações", "Websites": "Websites" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/ro.json b/plugins/CorePluginsAdmin/lang/ro.json index 1051a2ac07..69b9a5181b 100644 --- a/plugins/CorePluginsAdmin/lang/ro.json +++ b/plugins/CorePluginsAdmin/lang/ro.json @@ -1,90 +1,47 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Activeaza pluginul", - "ActionActivateTheme": "Activeaza tema", - "ActionInstall": "Instaleaza", "ActionUninstall": "Dezinstaleaza", "Activate": "Activare", "Activated": "Activat", "Active": "Activ", "Activity": "Activitate", - "AllowedUploadFormats": "Poti uploada un plugin sau o tema in formatul .zip prin intermediul acestei pagini.", "AuthorHomepage": "Pagina autorului", - "Authors": "Autori", - "BackToExtendPiwik": "Inapoi la Marketplace", - "BeCarefulUsingPlugins": "Pluginurile care nu au drept autor echipa Piwik trebuie folosite cu atentie: noi nu le-am verificat.", - "BeCarefulUsingThemes": "Temele al caror autor nu este Piwik trebuie utilizate cu precautie: noi nu le-am testat.", - "ByXDevelopers": "de către %s programatori", "Changelog": "Changelog", "ChangeSettingsPossible": "Poti schimba %1$ssetarile%2$s pentru acest plugin.", "CorePluginTooltip": "Pluginurile esentiale nu au nici o versiune din moment ce sunt distribuite cu Piwik.", "Deactivate": "Dezactivare", - "Developer": "Dezvoltator", "DoMoreContactPiwikAdmins": "Pentru a instala un nou plugin sau o tema noua, va rugam luati legatura cu administratorii Dvs. ai Piwik.", - "FeaturedPlugin": "Plugin promovat", - "GetEarlyAccessForPaidPlugins": "Nota: toate pluginurile sunt disponibile gratuit in acest moment; pe viitor activa sectiunea Pluginuri cu Plata in Marketplace (%1$scontacteaza-ne%2$s pentru a putea accesa mai devreme).", "History": "Istoric", "Inactive": "Inactiv", "InfoPluginUpdateIsRecommended": "Updateaza-ti pluginurile acum pentru a beneficia de ultimele imbunatatiri.", "InfoThemeIsUsedByOtherUsersAsWell": "Nota: ceilalti %1$s utilizatori inregistrati in acest Piwik folosesc, de asemenea, tema %2$s.", "InfoThemeUpdateIsRecommended": "Updateaza-ti temele pentru a beneficia de ultima versiune.", - "InstallingPlugin": "Se instaleaza %s", "InstallNewPlugins": "Instaleaza pluginuri noi", "InstallNewThemes": "Instaleaza teme noi", - "LastCommitTime": "(ultima data folosit %s)", - "LastUpdated": "Ultima data updatat", "LicenseHomepage": "Pagina Licenţa", "PluginsExtendPiwik": "Pluginurile extind functionaliatatea lui Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Orice plugin instalat, poate fi activat sau dezactivat aici.", - "Marketplace": "Marketplace", - "MarketplaceSellPluginSubject": "Marketplace - Vinde Plugin", "MenuPlatform": "Platformă", "MissingRequirementsNotice": "Va rugam faceti update %1$s %2$s catre versiune mai noua, %1$s %3$s este necesara.", - "NoPluginsFound": "Nici un plugin gasit.", - "NotAllowedToBrowseMarketplacePlugins": "Puteti rasfoi lista cu pluginurile care pot fi instalate pentru a customiza sau a extinde platforma Piwik. Va rugam sa contactati administratorul Dvs. daca aveti nevoie ca oricare din acestea sa fie instalata.", - "NotAllowedToBrowseMarketplaceThemes": "Puteti cauta prin lista de teme care pot fi instalate, pentru a customiza interfata platformei Piwik. Va rugam contactati administratorul dvs. pentru a instala oricare din aceste teme pentru dvs.", - "NoThemesFound": "Nici o tema gasita", "NoZipFileSelected": "Va rugam selectati un fisier ZIP.", - "NumDownloadsLatestVersion": "Ultima versiune: %s descărcări", "NumUpdatesAvailable": "%s Update(uri) disponibile", "Origin": "Origine", "OriginCore": "Baza", "OriginThirdParty": "Parti terte", "PluginHomepage": "Pagina Pluginurilor", - "PluginKeywords": "Cuvinte cheie", "PluginNotCompatibleWith": "%1$s pluginul nu este compatibil cu %2$s.", "PluginNotWorkingAlternative": "Daca ati folosit acest plugin, poate gasiti o versiune mai noua in Marketplace. Daca nu, poate doriti sa il dezinstalati.", "PluginRequirement": "%1$s cere %2$s.", "PluginsManagement": "Managementul pluginurilor", - "PluginUpdateAvailable": "Folositi versiunea %1$s iar o versiune noua %2$s este disponibila.", - "PluginVersionInfo": "%1$s de la %2$s", - "PluginWebsite": "Siteul pluginului", - "Screenshots": "Imagini", "Status": "Stare", - "StepDownloadingPluginFromMarketplace": "Se downloadeaza pluginul din Marketplace", - "StepDownloadingThemeFromMarketplace": "Se downloadeaza tema din Marketplace", - "StepPluginSuccessfullyInstalled": "Ati instalat cu succes pluginul %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Ati updatat cu succes pluginul %1$s %2$s.", - "StepReplaceExistingPlugin": "Inlocuind pluginul existent", - "StepReplaceExistingTheme": "Inlocuind tema existenta", - "StepThemeSuccessfullyInstalled": "Ati instalat cu succes tema %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Ati actualizat cu succes tema %1$s %2$s.", - "StepUnzippingPlugin": "Se dezarhiveaza pluginul", - "StepUnzippingTheme": "Se dezarhiveaza tema", "SuccessfullyActicated": "Ati activat cu succes <strong>%s<\/strong>.", - "Support": "Asistenta", "TeaserExtendPiwik": "Extinde Piwik cu Pluginuri si Teme", - "TeaserExtendPiwikByUpload": "Extinde Piwik uploadand un fisier ZIP", "Theme": "Temă", "Themes": "Teme", "ThemesDescription": "Temele pot schimba felul cum arata interfata de utilizare a Piwik si pot fot furniza o complet noua experienta vizuala pentru a va bucura de rapoartele de analytics.", "ThemesManagement": "Gestionează Teme", "UninstallConfirm": "Sunteti in curs de a dezinstala pluginul %s. Pluginul va fo complet sters de pe platforma dvs si nu va mai putea fi recuperat. Sunteti sigur ca doriti sa faceti asta?", - "Updated": "Updatat", - "UpdatingPlugin": "Se actualizeaza %s", - "UploadZipFile": "Incarca un fisier ZIP", "Version": "Versiune", - "ViewRepositoryChangelog": "Vezi modificarile", "Websites": "Siteuri" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/ru.json b/plugins/CorePluginsAdmin/lang/ru.json index e1531186b2..0a9f67844c 100644 --- a/plugins/CorePluginsAdmin/lang/ru.json +++ b/plugins/CorePluginsAdmin/lang/ru.json @@ -1,43 +1,27 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Активировать плагин", - "ActionActivateTheme": "Активировать тему", - "ActionInstall": "Установить", "ActionUninstall": "Удалить", "Activate": "Активировать", "Activated": "Активировано", "Active": "Активный", "Activity": "Активность", - "AllowedUploadFormats": "Вы можете загрузить плагин или тему в формате .zip на этой странице.", + "AlwaysActivatedPluginsList": "Следующие плагины всегда активированы и не могут быть отключены: %s", "AuthorHomepage": "Cтраница автора", - "Authors": "Авторы", - "BackToExtendPiwik": "Вернуться к Marketplace", - "BeCarefulUsingPlugins": "Плагины, которые разработаны не командой Piwik должны использоваться с осторожностью: мы не просматриваем их.", - "BeCarefulUsingThemes": "Темы, которые разработаны не командой Piwik должны использоваться с осторожностью: мы не просматриваем их.", - "ByXDevelopers": "разработчиками %s", - "CannotInstall": "Невозможно установить (помощь)", "Changelog": "История изменений", "ChangeSettingsPossible": "Вы можете %1$sизменить настройки%2$s для этого плагина.", "CorePluginTooltip": "Основные плагины не имеют версию, так как они распространяются с Piwik.", "Deactivate": "Деактивировать", - "Developer": "Разработчик", - "DevelopersLearnHowToDevelopPlugins": "Разработчикам: Изучите, как вы можете расширить и настроить Piwik при помощи плагинов для %1$sразработки или тем%2$s.", "DoMoreContactPiwikAdmins": "Для установки нового плагина или новой темы, пожалуйста свяжитесь с вашим Piwik-администратором", - "FeaturedPlugin": "Набирающий популярность плагин", "ChangeLookByManageThemes": "Вы можете изменить внешний вид Piwik: %1$sВыбор Темы%2$s.", - "GetEarlyAccessForPaidPlugins": "Примечание: в настоящее время все плагины доступны бесплатно, в будущем мы включим платные плагины на Marketplace (%1$sсвяжитесь с нами%2$s для раннего доступа).", "History": "История", "Inactive": "Неактивный", + "InstalledPlugins": "Установленные плагины", + "InstalledThemes": "Установленные темы", "InfoPluginUpdateIsRecommended": "Обновите плагины что бы воспользоваться последними улучшениями.", "InfoThemeIsUsedByOtherUsersAsWell": "Примечание: другие зарегистрированные пользователи (%1$s) используют эту же тему: %2$s.", "InfoThemeUpdateIsRecommended": "Обновите темы что бы насладиться последними улучшениями.", - "InstallingPlugin": "Установка %s", "InstallNewPlugins": "Установить новые плагины", "InstallNewThemes": "Установить новые темы", - "InstalledPlugins": "Установленные плагины", - "InstalledThemes": "Установленные темы", - "LastCommitTime": "(последний коммит %s)", - "LastUpdated": "Последнее обновление", "LicenseHomepage": "Дом. страница лицензии", "LikeThisPlugin": "Нравится этот плагин?", "ConsiderDonating": "Рассмотреть возможность пожертвования", @@ -45,65 +29,38 @@ "ConsiderDonatingCreatorOf": "Пожалуйста, рассмотрите возможность пожертвования автору %s", "PluginsExtendPiwik": "Плагины расширяют функциональность Piwik.", "OncePluginIsInstalledYouMayActivateHere": "После установки плагина Вы можете активировать или деактивировать его здесь.", - "Marketplace": "Marketplace", - "MarketplaceSellPluginSubject": "Marketplace – Продать плагин", "MenuPlatform": "Платформа", "MissingRequirementsNotice": "Пожалуйста, обновите %1$s %2$s до более новой версии, необходима версия %1$s %3$s.", "MissingRequirementsPleaseInstallNotice": "Пожалуйста, установите %1$s %2$s т. к. оно требуется для %3$s.", - "NewVersion": "новая версия", - "NoPluginsFound": "Плагины не найдены", - "NoPluginSettings": "Нет настроек плагинов, которые могут быть сконфигурированы", - "NotAllowedToBrowseMarketplacePlugins": "Можете посмотреть список плагинов, которые могут быть установлены для подстройки или расширения вашей платформы Piwik. Свяжитесь с администратором если вам потребуется установить один из них.", - "NotAllowedToBrowseMarketplaceThemes": "Вы можете посмотреть список тем, которые могут быть установлены для настройки внешнего вида платформы Piwik. Пожалуйста, свяжите с вашим администратором, чтобы установить любой из них.", - "NoThemesFound": "Темы не найдены", "NoZipFileSelected": "Выберете ZIP файл", - "NumDownloadsLatestVersion": "Последняя версия скачена: %s раз", "NumUpdatesAvailable": "%s Обновлений доступно", + "NoPluginSettings": "Нет настроек плагинов, которые могут быть сконфигурированы", "Origin": "Происхождение", "OriginCore": "Основные", "OriginThirdParty": "Сторонние", "PluginHomepage": "Дом. страница плагина", - "PluginKeywords": "Ключевые слова", "PluginNotCompatibleWith": "Плагин %1$s не совместим с %2$s.", "PluginNotWorkingAlternative": "Если вы используете этот плагин, может быть, вы сможете найти более новые версии в Marketplace. Если нет — можете удалить его.", "PluginRequirement": "%1$s требуется %2$s.", "PluginsManagement": "Управление плагинами", - "PluginUpdateAvailable": "Вы используете версию %1$s последняя доступная %2$s", - "PluginVersionInfo": "%1$s – %2$s", - "PluginWebsite": "Сайт плагина", - "Screenshots": "Скриншоты", - "SortByAlpha": "Альфа", - "SortByNewest": "Новейшие", - "SortByPopular": "Популярные", + "NotDownloadable": "Невозможно загрузить", + "PluginNotDownloadable": "Этот плагин невозможно загрузить.", + "PluginNotDownloadablePaidReason": "Возможные причины: истек срок действия лицензии.", + "PluginActivated": "Плагин активирован", "Status": "Статус", - "StepDownloadingPluginFromMarketplace": "Скачать плагин из Marketplace", - "StepDownloadingThemeFromMarketplace": "Скачать тему из Marketplace", - "StepPluginSuccessfullyInstalled": "Вы успешно установили плагин %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Вы успешно обновили плагин %1$s %2$s.", - "StepReplaceExistingPlugin": "Замена существующего плагина", - "StepReplaceExistingTheme": "Замена существующей темы", - "StepThemeSuccessfullyInstalled": "Вы успешно установили тему %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Вы успешно обновили тему %1$s %2$s.", - "StepUnzippingPlugin": "Распаковка плагина", - "StepUnzippingTheme": "Распаковка темы", "SuccessfullyActicated": "Вы успешно активировали <strong>%s<\/strong>.", - "Support": "Поддержка", "TeaserExtendPiwik": "Улучшение Piwik с помощью Плагинов и Тем", "TeaserExtendPiwikByPlugin": "Расширьте Piwik %1$sустановив новый плагин%2$s.", "TeaserExtendPiwikByTheme": "Насладитесь другим внешним видом %1$sустановив новую тему%2$s.", - "TeaserExtendPiwikByUpload": "Улучшение Piwik закачкой ZIP файла", "InstallingNewPluginViaMarketplaceOrUpload": "Вы автоматически можете установить плагины из Marketplace или %1$sзагрузить плагин%2$s в формате zip.", "Theme": "Тема", "Themes": "Темы", "ThemesDescription": "Темы могут изменить внешний вид Piwik пользовательского интерфейса, а также обеспечить совершенно новое визуальное восприятие, чтобы наслаждаться отчетами аналитики.", "ThemesManagement": "Управление темами", "UninstallConfirm": "Вы собираетесь удалить плагин %s. Плагин будет безвозвратно удалён из системы. Вы уверены, что хотите сделать это?", - "Updated": "Обновлено", - "UpdatingPlugin": "Обновляем %s", - "UploadZipFile": "Закачать ZIP файл", "Version": "Версия", - "ViewRepositoryChangelog": "Посмотреть изменения", "ViewAllMarketplacePlugins": "Посмотреть все плагины в Marketplace", + "WeDeactivatedThePluginAsItHasMissingDependencies": "Мы отключили плагин %s, потому что у него есть недостающие зависимости:", "Websites": "Сайты" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/sk.json b/plugins/CorePluginsAdmin/lang/sk.json index 010db1891d..d0eb8b5522 100644 --- a/plugins/CorePluginsAdmin/lang/sk.json +++ b/plugins/CorePluginsAdmin/lang/sk.json @@ -1,41 +1,24 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Aktivovať modul", - "ActionActivateTheme": "Aktivovať tému", - "ActionInstall": "Inštalovať", "ActionUninstall": "Odinštalovať", "Activate": "Aktivovať", "Activated": "Aktivovaný", "Active": "Aktívny", "Activity": "Aktivita", - "AllowedUploadFormats": "Môžete uploadovať plugin alebo motív v .zip formáte prostredníctvom tejto stránky.", "AuthorHomepage": "Stránka autora", - "Authors": "Autori", - "BackToExtendPiwik": "Naspäť na trh", - "BeCarefulUsingPlugins": "Pluginy ktoré nie sú autorizované Piwik tímom musia byť používané opatrne: my sme ich neprezerali.", - "BeCarefulUsingThemes": "Motívy ktoré nie sú autorizované Piwik tímom musia byť používané opatrne: my sme ich neprezerali.", - "ByXDevelopers": "%s vývojárov", - "CannotInstall": "Nedá sa nainštalovať (nápoveda)", "Changelog": "protokol zmien", "ChangeSettingsPossible": "Môžete zmeniť %1$s nastavenia %2$s pre tento plugin.", "CorePluginTooltip": "Jadrové pluginy nemajú žiadnu verziu odkedy sú distribuované s Piwikom.", "Deactivate": "Deaktivovať", - "Developer": "Vývojár", - "DevelopersLearnHowToDevelopPlugins": "Vývojári: Naučiť sa ako rozšíriť a prispôsobiť Piwik %1$s vývojarskými pluginmi alebo %2$s motívmi.", "DoMoreContactPiwikAdmins": "Pre nainštalovanie nového pluginu alebo motívu sa prosím spojte s Vašími Piwik administrátormi.", - "FeaturedPlugin": "Hlavný plugin", "ChangeLookByManageThemes": "Výzor Piwiku môžete zmeniť %1$s spravovaním motívov%2$s.", - "GetEarlyAccessForPaidPlugins": "Pozn.: všetky pluginy sú v súčasnosti voľne dostupné; v budúcnosti chceme zaviesť spoplatnené pluginy ktoré sa budú nachádzať na trhu (%1$s kontaktujte nás %2$s pre rýchly prístup).", "History": "História", "Inactive": "Neaktívny", "InfoPluginUpdateIsRecommended": "Aktualizujte teraz Vaše pluginy aby ste vyťažili z najnovších vylepšení.", "InfoThemeIsUsedByOtherUsersAsWell": "Pozn.: ostatní %1$s užívatelia registrovaní na tomto Piwiku používajú motív %2$s.", "InfoThemeUpdateIsRecommended": "Aktualizujte svoje motívy, aby ste si mohli vychutnať najnovšiu verziu.", - "InstallingPlugin": "Inštalácia %s", "InstallNewPlugins": "Inštalovanie nových pluginov", "InstallNewThemes": "Inštalovanie nových motívov", - "LastCommitTime": "(posledné rozhodnutie %s)", - "LastUpdated": "posledne aktualizované", "LicenseHomepage": "domovská stránka licencie", "LikeThisPlugin": "Páči sa vám modul?", "ConsiderDonating": "Zvážte príspevok", @@ -43,58 +26,29 @@ "ConsiderDonatingCreatorOf": "Prosím zvážte príspevok pre tvorcu %s", "PluginsExtendPiwik": "Moduly rozširujú funkcionalitu projektu Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Po nainštalovaní modulu ho tu môžete aktivovať, alebo deaktivovať.", - "Marketplace": "trh", - "MarketplaceSellPluginSubject": "trh - plugin predaja", "MenuPlatform": "platforma", "MissingRequirementsNotice": "Prosím aktualizujte %1$s %2$s na novšiu verziu, %1$s %3$s je požadovaná.", "MissingRequirementsPleaseInstallNotice": "Prosím nainštalujte %1$s %2$s ako je to požadované z %3$s.", - "NewVersion": "nová verzia", - "NoPluginsFound": "Nenájdený žiaden plugin", - "NotAllowedToBrowseMarketplacePlugins": "Môžete prehliadať zoznam pluginov, ktoré môžu byť nainštalované pre prispôsobenie alebo rozšírenie Piwik platformy. Prosím kontaktujte Vášho administrátora ak by ste potrebovali čokoľvek z toho nainštalovať.", - "NotAllowedToBrowseMarketplaceThemes": "Môžete prehliadať zoznam motívov, ktoré môžu byť nainštalované pre prispôsobenie vzhľadu Piwik platformy. Prosím kontaktujte Vášho administrátora ak by ste potrebovali čokoľvek z toho nainštalovať.", - "NoThemesFound": "Nenájdený žiaden motív.", "NoZipFileSelected": "Prosím vyberte ZIP súbor.", - "NumDownloadsLatestVersion": "Najnovšia verzia: %s sťahovania", "NumUpdatesAvailable": "%s aktualizácia(e) dostupná", "Origin": "Pôvod", "OriginCore": "Jadro", "OriginThirdParty": "Tretia strana", "PluginHomepage": "Domovská stránka modulu", - "PluginKeywords": "Kľúčové slová", "PluginNotCompatibleWith": "%1$s plugin nie je kompatibilný s %2$s.", "PluginNotWorkingAlternative": "Ak ste používali tento plugin, možno nájdete aj aktuálnejšiu verziu na trhu. Ak nie, možno ju budete chcieť odinštalovať.", "PluginRequirement": "%1$s potrebuje %2$s.", "PluginsManagement": "Správa modulov", - "PluginUpdateAvailable": "Používate verziu %1$s a nová verzia %2$s je dostupná.", - "PluginVersionInfo": "%1$s z %2$s", - "PluginWebsite": "Webstránka pluginu", - "Screenshots": "Screenshoty", "Status": "Stav", - "StepDownloadingPluginFromMarketplace": "Sťahovanie pluginu z trhu", - "StepDownloadingThemeFromMarketplace": "Sťahovanie motívu z trhu", - "StepPluginSuccessfullyInstalled": "Úspešne ste nainštalovali plugin %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Úspešne ste aktualizovali plugin %1$s %2$s.", - "StepReplaceExistingPlugin": "Nahradiť existujúci plugin", - "StepReplaceExistingTheme": "Nahradiť existujúci motív", - "StepThemeSuccessfullyInstalled": "Úspešne ste nainštalovali motív %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Úspešne ste aktualizovali motív %1$s %2$s.", - "StepUnzippingPlugin": "Rozbaliť plugin", - "StepUnzippingTheme": "Rozbaliť motív", "SuccessfullyActicated": "Úspešne ste aktivovali <strong>%s<\/strong>.", - "Support": "Podpora", "TeaserExtendPiwik": "Rozšíriť Piwik s pluginmi a motívmi", - "TeaserExtendPiwikByUpload": "Rozšíriť Piwik nahratím ZIP súboru", "InstallingNewPluginViaMarketplaceOrUpload": "Môžete automaticky nainštalovať plugin z trhu alebo %1$s nahrať plugin%2$s v .zip formáte.", "Theme": "Motív", "Themes": "Motívy", "ThemesDescription": "Motívy môžu zmeniť výzor Piwik uživateľského rozhrania, a poskytnúť úplne novú vizuálnu skúsenosť aby ste sa mohli tešiť z Vašich analytických reportov.", "ThemesManagement": "Spravovať motívy", "UninstallConfirm": "Práve sa chystáte odinštalovať plugin %s. Plugin bude kompletne odstránený z Vašej platformy a už nebude spätne návratný. Naozaj to chcete urobiť?", - "Updated": "Aktualizované", - "UpdatingPlugin": "Aktualizácia %s", - "UploadZipFile": "Nahrať ZIP súbor", "Version": "Verzia", - "ViewRepositoryChangelog": "Prezeranie zmien", "Websites": "Stránky" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/sl.json b/plugins/CorePluginsAdmin/lang/sl.json index 9d7889d23a..3d1423dbd3 100644 --- a/plugins/CorePluginsAdmin/lang/sl.json +++ b/plugins/CorePluginsAdmin/lang/sl.json @@ -1,6 +1,5 @@ { "CorePluginsAdmin": { - "ActionInstall": "Namesti", "ActionUninstall": "Odstrani", "Activate": "Omogoči", "Activated": "Omogočeno", @@ -13,9 +12,7 @@ "PluginsExtendPiwik": "Vtičniki razširjajo Piwik-ovo funkcionalnost.", "OncePluginIsInstalledYouMayActivateHere": "Ko je vtičnik enkrat nameščen, ga lahko tukaj aktivirate oziroma deaktivirate.", "PluginHomepage": "Spletna stran vtičnika", - "PluginKeywords": "Ključne Besede", "PluginsManagement": "Urejanje Vtičnikov", - "PluginVersionInfo": "%1$s from %2$s", "Status": "Status", "Version": "Različica", "Websites": "Spletne strani" diff --git a/plugins/CorePluginsAdmin/lang/sq.json b/plugins/CorePluginsAdmin/lang/sq.json index 141b60c1b7..3bc6306e4e 100644 --- a/plugins/CorePluginsAdmin/lang/sq.json +++ b/plugins/CorePluginsAdmin/lang/sq.json @@ -1,43 +1,27 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Aktivizoje shtojcën", - "ActionActivateTheme": "Aktivizojeni temën", - "ActionInstall": "Instaloje", "ActionUninstall": "Çinstalojeni", "Activate": "Aktivizoje", "Activated": "E aktivizuar", "Active": "Aktive", "Activity": "Veprimtari", - "AllowedUploadFormats": "Një shtojcë apo një temë mund ta ngarkoni në formatin .zip përmes kësaj faqeje.", + "AlwaysActivatedPluginsList": "Shtojcat vijuese janë përherë të aktivizuara dhe s’mund të çaktivizohen: %s", "AuthorHomepage": "Faqja Hyrëse e Autorit", - "Authors": "Autorë", - "BackToExtendPiwik": "Mbrapsht te Marketplace", - "BeCarefulUsingPlugins": "Shtojcat që s’janë krijuar nga ekipi Piwik duhet të përdoren me kujdes: nuk i kemi shqyrtuar ne.", - "BeCarefulUsingThemes": "Temat që s’janë krijuar nga ekipi Piwik duhet të përdoren me kujdes: nuk i kemi shqyrtuar ne.", - "ByXDevelopers": "nga zhvilluesit %s", - "CannotInstall": "S’instalohet dot (ndihmë)", "Changelog": "Regjistër ndryshimesh", "ChangeSettingsPossible": "Mund të ndryshoni %1$srregullimet%2$s për këtë shtojcë.", "CorePluginTooltip": "Shtojcat bazë nuk kanë version, ngaqë shpërndahen tok me Piwik-un.", "Deactivate": "Çaktivizoje", - "Developer": "Zhvillues", - "DevelopersLearnHowToDevelopPlugins": "Zhvillues: Mësoni se si ta thelloni dhe përshtatni Piwik-un përmes %1$shartimit të shtojcave ose temave%2$s.", "DoMoreContactPiwikAdmins": "Që të instaloni një shtojcë apo temë të re, ju lutemi, lidhuni me përgjegjësit e instalimit tuaj të Piwik-ut.", - "FeaturedPlugin": "Shtojcë e zgjedhur", "ChangeLookByManageThemes": "Pamjen e Piwik-ut mund ta ndryshoni që nga %1$sAdministrim Temash%2$s.", - "GetEarlyAccessForPaidPlugins": "Shënim: sot për sot, krejt shtojcat ofrohen falas; në të ardhmen, do të aktivizojmë në Marketplace Shtojca Me Pagesë (%1$slidhuni me ne%2$s që të jeni ndër të parët atje).", "History": "Historik", "Inactive": "Joaktive", + "InstalledPlugins": "Shtojca të instaluara", + "InstalledThemes": "Tema të instaluara", "InfoPluginUpdateIsRecommended": "Përditësoni shtojcat tuaja tani, që të përfitoni nga përmirësimet më të reja.", "InfoThemeIsUsedByOtherUsersAsWell": "Shënim: %1$s përdoruesit e tjerë të regjistruar në këtë instancë Piwik-u po përdorin gjithashtu temën %2$s.", "InfoThemeUpdateIsRecommended": "Përditësoni temat tuaja që të shijoni versionin më të ri.", - "InstallingPlugin": "Po instalohet %s", "InstallNewPlugins": "Instaloni shtojca të reja", "InstallNewThemes": "Instaloni tema të reja", - "InstalledPlugins": "Shtojca të instaluara", - "InstalledThemes": "Tema të instaluara", - "LastCommitTime": "(parashtrimi i fundit %s)", - "LastUpdated": "Përditësuar Së Fundi Më", "LicenseHomepage": "Faqja Hyrëse e Licencës", "LikeThisPlugin": "Ju pëlqen kjo shtojcë?", "ConsiderDonating": "Shihni mundësinë e dhurimit", @@ -45,66 +29,38 @@ "ConsiderDonatingCreatorOf": "Ju lutemi, shihni mundësinë e dhurimit për krijuesin e %s", "PluginsExtendPiwik": "Shtojcat zgjerojnë dhe thellojnë funksionet e Piwik-ut.", "OncePluginIsInstalledYouMayActivateHere": "Pasi një shtojcë të jetë instaluar, mund ta aktivizoni ose çaktivizoni prej këtu.", - "Marketplace": "Marketplace", - "MarketplaceSellPluginSubject": "Marketplace - Shisni Shtojca", "MenuPlatform": "Platformë", "MissingRequirementsNotice": "Ju lutemi, përditësojeni %1$s %2$s me një version më të ri, është i domosdoshëm %1$s %3$s.", "MissingRequirementsPleaseInstallNotice": "Ju lutemi, instaloni %1$s %2$s pasi është i domosdoshëm për %3$s.", - "NewVersion": "version i ri", - "NoPluginsFound": "S’u gjetën shtojca", - "NoPluginSettings": "S’ka rregullime shtojce që mund të formësohen", - "NotAllowedToBrowseMarketplacePlugins": "Mund të shfletoni listën e shtojcave që mund të instalohen për përshtatjen ose zgjerimin e platformës tuaj Piwik. Ju lutemi, lidhuni me përgjegjësin e instalimit tuaj, nëse keni nevojë të instalohet ndonjë prej këtyre.", - "NotAllowedToBrowseMarketplaceThemes": "Mund të shfletoni listën e temave që mund të instalohen për përshtatjen e pamjes së platformës tuaj Piwik. Ju lutemi, lidhuni me përgjegjësin e instalimit tuaj, nëse keni nevojë të instalohet ndonjë prej këtyre.", - "NoThemesFound": "S’u gjetën tema", "NoZipFileSelected": "Ju lutemi, përzgjidhni një kartelë ZIP.", - "NumDownloadsLatestVersion": "Versioni më i ri: %s Shkarkime", "NumUpdatesAvailable": "%s Përditësim(e) gati", + "NoPluginSettings": "S’ka rregullime shtojce që mund të formësohen", "Origin": "Origjina", "OriginCore": "Bazë", "OriginThirdParty": "Prej palësh të treta", "PluginHomepage": "Faqe Hyrëse e Shtojcës", - "PluginKeywords": "Fjalëkyçe", "PluginNotCompatibleWith": "Shtojca %1$s s’është e përputhshme me %2$s.", "PluginNotWorkingAlternative": "Nëse e përdorni këtë shtojcë, ndoshta mund të gjeni një version më të ri te Marketplace-i. Nëse jo, mund të donit ta çinstaloni.", "PluginRequirement": "%1$s lyp %2$s.", "PluginsManagement": "Administrim Shtojcash", - "PluginUpdateAvailable": "Po përdorni versionin %1$s dhe ka gati një version të ri %2$s.", - "PluginVersionInfo": "%1$s nga %2$s", - "PluginWebsite": "Sajt i Shtojcës", - "Screenshots": "Foto ekrani", - "SortByAlpha": "Alfa", - "SortByNewest": "Më të Rejat", - "SortByPopular": "Popullore", + "NotDownloadable": "E pashkarkueshme", + "PluginNotDownloadable": "Shtojca s’është e shkarkueshme.", + "PluginNotDownloadablePaidReason": "Arsye të mundshme mund të jenë licencë e skaduar ose tejkaluar.", + "PluginActivated": "Shtojca u aktivizua", "Status": "Gjendje", - "StepDownloadingPluginFromMarketplace": "Po shkarkohet shtojca që nga Marketplace-i", - "StepDownloadingThemeFromMarketplace": "Po shkarkohet tema që nga Marketplace-i", - "StepPluginSuccessfullyInstalled": "E instaluat me sukses shtojcën %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "E përditësuat me sukses shtojcën %1$s %2$s.", - "StepReplaceExistingPlugin": "Po zëvendësohet shtojca ekzistuese", - "StepReplaceExistingTheme": "Po zëvendësohet tema ekzistuese", - "StepThemeSuccessfullyInstalled": "E instaluat me sukses temën %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "E përditësuat me sukses temën %1$s %2$s.", - "StepUnzippingPlugin": "Po shpaketohet shtojca", - "StepUnzippingTheme": "Po shpaketohet tema", "SuccessfullyActicated": "E aktivizuat me sukses <strong>%s<\/strong>.", - "Support": "Asistencë", "TeaserExtendPiwik": "Zgjerojeni Piwik-un me Shtojca dhe Tema", "TeaserExtendPiwikByPlugin": "Zgjerojeni Piwik-un përmes %1$sinstalimit të një shtojce të re%2$s.", "TeaserExtendPiwikByTheme": "Shijoni pamje & ndjesi të reja përmes %1$sinstalimit të një teme të re%2$s.", - "TeaserExtendPiwikByUpload": "Zgjerojeni Piwik-un përmes ngarkimit të një kartele ZIP", "InstallingNewPluginViaMarketplaceOrUpload": "Shtojca mund të instaloni vetvetiu që prej Marketplace-it ose %1$sta ngarkoni një shtojcë%2$s në formatin .zip.", "Theme": "Temë", "Themes": "Tema", "ThemesDescription": "Temat mund të ndryshojnë pamjen e ndërfaqes së përdoruesit të Piwik-ut, dhe të sjellin një pamje të re për shijimin e raporteve tuaja analitike.", "ThemesManagement": "Administroni Tema", "UninstallConfirm": "Ju ndan një hap nga çinstalimi i shtojcës %s. Shtojca do të hiqet plotësisht nga platforma juaj dhe ky veprim s’mund të zhbëhet. Jeni i sigurt se doni të bëhet kështu?", - "Updated": "U përditësua", - "UpdatingPlugin": "Po përditësohet %s", - "UploadZipFile": "Ngarkoni kartelë ZIP", "Version": "Version", - "ViewRepositoryChangelog": "Shihni ndryshimet", "ViewAllMarketplacePlugins": "Shihni krejt shtojcat e Marketplace-it", - "Websites": "Sajte", - "WeDeactivatedThePluginAsItHasMissingDependencies": "E çaktivizuam shtojcën %s, ngaqë ka varësi të paplotësuara:" + "WeDeactivatedThePluginAsItHasMissingDependencies": "E çaktivizuam shtojcën %s, ngaqë ka varësi të paplotësuara:", + "Websites": "Sajte" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/sr.json b/plugins/CorePluginsAdmin/lang/sr.json index 3783879314..770600a0d5 100644 --- a/plugins/CorePluginsAdmin/lang/sr.json +++ b/plugins/CorePluginsAdmin/lang/sr.json @@ -1,43 +1,26 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Aktivacija dodatka", - "ActionActivateTheme": "Aktivacija teme", - "ActionInstall": "Instalacija", "ActionUninstall": "Deinstalacija", "Activate": "Aktivirati", "Activated": "Aktivirano", "Active": "Aktivno", "Activity": "Aktivnost", - "AllowedUploadFormats": "Preko ove stranice možete da postavite dodatak ili temu u .zip formatu.", "AuthorHomepage": "Autorov sajt", - "Authors": "Autori", - "BackToExtendPiwik": "Natrag na Market", - "BeCarefulUsingPlugins": "Dodatke koji nisu autorizovani od strane Piwik tima treba koristiti sa oprezom: mi ih nismo isprobali.", - "BeCarefulUsingThemes": "Teme koje nisu autorizovane od strane Piwik tima treba koristiti sa oprezom: mi ih nismo isprobali.", - "ByXDevelopers": "%s razvojnom timu", - "CannotInstall": "Ne mogu da instaliram (pomoć)", "Changelog": "Dnevnik promena", "ChangeSettingsPossible": "Možete izmeniti %1$spodešavanja%2$s za ovaj dodatak.", "CorePluginTooltip": "Osnovni dodaci oznaku verzije s obzirom na to da se distribuiraju zajedno sa Piwik-om.", "Deactivate": "Deaktivirati", - "Developer": "Programer", - "DevelopersLearnHowToDevelopPlugins": "Programeri: saznajte kako da proširite i prilagodite Piwik %1$spravljenjem dodataka i tema%2$s.", "DoMoreContactPiwikAdmins": "Ukoliko želite da instalirate novi dodatak ili temu, kontaktirajte vašeg Piwik administratora.", - "FeaturedPlugin": "Istaknuti dodatak", "ChangeLookByManageThemes": "Možete izmeniti izgled Piwik-a %1$supravljanjem temama%2$s.", - "GetEarlyAccessForPaidPlugins": "Svi dodaci su u ovom trenutku dostupni potpuno besplatno; u budućnosti ćemo na Marketu omogućiti i dodatke koji se plaćaju (%1$skontaktirajte na%2$s za rani pristup).", "History": "Istorijat", "Inactive": "Neaktivno", + "InstalledPlugins": "Instalirani dodaci", + "InstalledThemes": "Instalirane teme", "InfoPluginUpdateIsRecommended": "Ažurirajte dodatke kako biste iskoristili najnovija poboljšanja.", "InfoThemeIsUsedByOtherUsersAsWell": "%1$s registrovanih Piwik korisnika takođe koristi temu %2$s.", "InfoThemeUpdateIsRecommended": "Ažurirajte temu kako biste uživali u najnovijoj verziji.", - "InstallingPlugin": "Instaliranje %s", "InstallNewPlugins": "Instaliranje novog dodatka", "InstallNewThemes": "Instaliranje nove teme", - "InstalledPlugins": "Instalirani dodaci", - "InstalledThemes": "Instalirane teme", - "LastCommitTime": "(poslednja promena %s)", - "LastUpdated": "Poslednje ažuriranje", "LicenseHomepage": "Podaci o licenci", "LikeThisPlugin": "Sviđa vam se ovaj dodatak?", "ConsiderDonating": "Razmislite o donaciji", @@ -45,64 +28,32 @@ "ConsiderDonatingCreatorOf": "Molimo vas da razmislite o donaciji za %s", "PluginsExtendPiwik": "Dodaci proširuju funkcionalnost Piwik-a.", "OncePluginIsInstalledYouMayActivateHere": "Jednom instaliran dodatak se ovde može aktivirati ili deaktivirati.", - "Marketplace": "Market", - "MarketplaceSellPluginSubject": "Market - prodaja dodatka", "MenuPlatform": "Platforma", "MissingRequirementsNotice": "Molimo vas da ažurirate %1$s %2$s na noviju verziju, %1$s %3$s je neophodan.", "MissingRequirementsPleaseInstallNotice": "Molimo vas da instalirate %1$s %2$s pošto ga zahteva %3$s.", - "NewVersion": "nova verzija", - "NoPluginsFound": "Nije nađen nijedan dodatak", - "NoPluginSettings": "Ne postoje podešavanja ovog dodatka", - "NotAllowedToBrowseMarketplacePlugins": "Možete da pretražujete spisak dodataka koje je moguće instalirati kako biste podesili ili proširili vašu Piwik platformu. Kontaktirajte vašeg administratora ukoliko želite neki od njih da vidite instaliran.", - "NotAllowedToBrowseMarketplaceThemes": "Možete da pretražujete listu tema koje mogu biti instalirane kako biste podesili izgled vaše Piwik platforme. Kontaktirajte vašeg administratora ako želite da neku od njih vidite instaliranu.", - "NoThemesFound": "Nije nađena nijedna tema", "NoZipFileSelected": "Molimo vas da izaberete ZIP datoteku.", - "NumDownloadsLatestVersion": "Poslednja verzija: %s preuzimanja", "NumUpdatesAvailable": "Ažuriranja na raspolaganju: %s", + "NoPluginSettings": "Ne postoje podešavanja ovog dodatka", "Origin": "Izvor", "OriginCore": "Srž", "OriginThirdParty": "Treća strana", "PluginHomepage": "Sajt dodatka", - "PluginKeywords": "Ključne reči", "PluginNotCompatibleWith": "%1$s dodatak nije kompatibilan sa %2$s.", "PluginNotWorkingAlternative": "Ukoliko ste koristili ovaj dodatak, novu verziju možda možete naći na Marketu. Ukoliko niste, možda želite da ga deinstalirate.", "PluginRequirement": "%1$s zahteva %2$s.", "PluginsManagement": "Upravljanje dodacima", - "PluginUpdateAvailable": "Koristite verziju %1$s a novija verzija %2$s je na raspolaganju.", - "PluginVersionInfo": "%1$s sa %2$s", - "PluginWebsite": "Sajt sa dodacima", - "Screenshots": "Snimci ekrana", - "SortByAlpha": "Alfa", - "SortByNewest": "Najnoviji", - "SortByPopular": "Popularni", "Status": "Status", - "StepDownloadingPluginFromMarketplace": "Preuzmi dodatak sa Marketa", - "StepDownloadingThemeFromMarketplace": "Preuzmi temu sa Marketa", - "StepPluginSuccessfullyInstalled": "Uspešno ste instalirali dodatak %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Uspešno ste ažurirali dodatak %1$s %2$s.", - "StepReplaceExistingPlugin": "Zamena postojećeg dodatka", - "StepReplaceExistingTheme": "Zamena postojeće teme", - "StepThemeSuccessfullyInstalled": "Uspešno ste instalirali temu %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Uspešno ste ažurirali temu %1$s %2$s.", - "StepUnzippingPlugin": "Raspakivanje dodatka", - "StepUnzippingTheme": "Raspakivanje teme", "SuccessfullyActicated": "Uspešno ste aktivirali <strong>%s<\/strong>.", - "Support": "Podrška", "TeaserExtendPiwik": "Proširite Piwik dodacima i temama", "TeaserExtendPiwikByPlugin": "Proširite Piwik %1$sinstaliranjem novog dodatka%2$s.", "TeaserExtendPiwikByTheme": "Uživajte u novom izgledu %1$sinstaliranjem nove teme%2$s.", - "TeaserExtendPiwikByUpload": "Proširite Piwik postavljanjem ZIP datoteke", "InstallingNewPluginViaMarketplaceOrUpload": "Možete automatski instalirati dodatak sa Marketa ili ga možete %1$saploudovati%2$s u ZIP formatu.", "Theme": "Tema", "Themes": "Teme", "ThemesDescription": "Pomoću tema možete da izmenite izgled Piwik korisničkog interfejsa te da doživite potpuno novo vizuelno iskustvo i uživanje u vašim analitičkim izveštajima.", "ThemesManagement": "Upravljanje temama", "UninstallConfirm": "Ukoliko deinstalirate dodatak %s, on će biti uklonjen sa vaše platforme i više neće biti moguće vratiti ga. Da li ste sigurni da želite to da uradite?", - "Updated": "Ažurirano", - "UpdatingPlugin": "Ažuriranje %s", - "UploadZipFile": "Postavljanje ZIP datoteke", "Version": "Verzija", - "ViewRepositoryChangelog": "Prikaži promene", "ViewAllMarketplacePlugins": "Prikaži sve dodatke sa Marketa", "Websites": "Sajtovi" } diff --git a/plugins/CorePluginsAdmin/lang/sv.json b/plugins/CorePluginsAdmin/lang/sv.json index e02aa922ee..9e6ecfa3e9 100644 --- a/plugins/CorePluginsAdmin/lang/sv.json +++ b/plugins/CorePluginsAdmin/lang/sv.json @@ -1,41 +1,24 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Aktivera plugin", - "ActionActivateTheme": "Aktivt tema", - "ActionInstall": "Installera", "ActionUninstall": "Avinstallera", "Activate": "Aktivera", "Activated": "Aktiverad", "Active": "Aktiv", "Activity": "Aktivitet", - "AllowedUploadFormats": "På den här sidan kan du ladda upp ett plugin eller ett tema via .zipformat.", "AuthorHomepage": "Författarens webbplats", - "Authors": "Upphovsman", - "BackToExtendPiwik": "Tillbaka till butiken", - "BeCarefulUsingPlugins": "Plugin som inte är gjorda av Piwiks team bör användas med försiktighet: vi utvärderar dem inte.", - "BeCarefulUsingThemes": "Teman som inte gjorts av Piwik bör användas med försiktighet då vi inte utvärderar dessa.", - "ByXDevelopers": "av %s utvecklare", - "CannotInstall": "Kan inte installera (hjälp)", "Changelog": "Ändringslogg", "ChangeSettingsPossible": "Du kan ändra %1$sinställningar%2$s för det här pluginet.", "CorePluginTooltip": "Standardplugin har ingen version eftersom de distribueras av Piwik.", "Deactivate": "Inaktivera", - "Developer": "Utvecklare", - "DevelopersLearnHowToDevelopPlugins": "Utvecklare: Lär känna hur du kan bredda eller anpassa Piwik geonom %1$sutveckling av plugin eller teman%2$s", "DoMoreContactPiwikAdmins": "För att installera ett nytt plugin eller tema, gå till dina Piwik admins.", - "FeaturedPlugin": "Utvalda plugin", "ChangeLookByManageThemes": "Du kan ändra utseendet på Piwik genom %1$sHantera teman%2$s.", - "GetEarlyAccessForPaidPlugins": "Observera: Just nu är alla plugin gratis; framöver kommer det finnas Plugin som kostar i butiken. (%1$skontakta oss%2$s för tidig tillgång)", "History": "Historik", "Inactive": "Inaktiverad", "InfoPluginUpdateIsRecommended": "Uppdatera dina plugin så du kan ta del av de senaste förbättringarna.", "InfoThemeIsUsedByOtherUsersAsWell": "Observera: De andra %1$s användarna registrerade på den här Piwiksidan använder också tema %2$s.", "InfoThemeUpdateIsRecommended": "Uppdatera dina teman för att kunna ta del av den senaste versionen.", - "InstallingPlugin": "Installera %s", "InstallNewPlugins": "Installera nya plugin", "InstallNewThemes": "Installera ett nytt tema", - "LastCommitTime": "(senaste överföringen %s)", - "LastUpdated": "Senast uppdaterad", "LicenseHomepage": "Licens Hemsida", "LikeThisPlugin": "Gilla följande plugin?", "ConsiderDonating": "Överväg att donera", @@ -43,58 +26,29 @@ "ConsiderDonatingCreatorOf": "Vänlig överväg att donera till upphovsman av %s", "PluginsExtendPiwik": "Plugins breddar och utökar funktionerna i Piwik.", "OncePluginIsInstalledYouMayActivateHere": "När en plugin är installerad kan du aktivera eller inaktivera den här.", - "Marketplace": "Butik", - "MarketplaceSellPluginSubject": "Butik - Sälj Plugin", "MenuPlatform": "Plattform", "MissingRequirementsNotice": "Uppdatera %1$s och %2$s till en nyare version, %1$s %3$s är begärda.", "MissingRequirementsPleaseInstallNotice": "Vänligen installera %1$s %2$s då det krävs av %3$s.", - "NewVersion": "ny version", - "NoPluginsFound": "Inga plugin hittade", - "NotAllowedToBrowseMarketplacePlugins": "Du kan titta igenom listan med plugin som kan installeras för att skräddarsy eller utöka din Piwik plattform. Var vänlig och kontakta din administratör om du vill installera något av de plugin du hittar.", - "NotAllowedToBrowseMarketplaceThemes": "Du kan leta i listan efter teman som kan installeras för att skräddarsy din Piwik plattform. Kontakta din administratör så kan denne installera temat åt dig.", - "NoThemesFound": "Inga teman kunde hittas", "NoZipFileSelected": "Var vänlig och välj en ZIP fil.", - "NumDownloadsLatestVersion": "Sista versionen: %s Nedladdningar", "NumUpdatesAvailable": "%s uppdatering(s) tillgänglig", "Origin": "Ursprung", "OriginCore": "Kärna", "OriginThirdParty": "Tredje-part", "PluginHomepage": "Plugin Hemsida", - "PluginKeywords": "Nyckelord", "PluginNotCompatibleWith": "%1$s plugin är inte kompatibelt med %2$s.", "PluginNotWorkingAlternative": "Om du använt det här pluginet, kanske du kan hitta en nyare version i vår butik. Om inte så kanske du vill avinstallera det.", "PluginRequirement": "%1$s kräver %2$s", "PluginsManagement": "Pluginhantering", - "PluginUpdateAvailable": "Du använder version %1$s och en ny version %2$s finns tillgänglig.", - "PluginVersionInfo": "%1$s från %2$s", - "PluginWebsite": "Plugin sida", - "Screenshots": "Skärmdumpar", "Status": "Status", - "StepDownloadingPluginFromMarketplace": "Ladda ner plugin från Butiken.", - "StepDownloadingThemeFromMarketplace": "Ladda ner tema från Butiken", - "StepPluginSuccessfullyInstalled": "Du har nu installerat plugin %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Du har nu uppdaterat pluginen %1$s %2$s.", - "StepReplaceExistingPlugin": "Ersätter nuvarande plugin", - "StepReplaceExistingTheme": "Ersätt nuvarande tema", - "StepThemeSuccessfullyInstalled": "Du har nu installerat följande tema %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Du har nu uppdaterat tema %1$s %2$s.", - "StepUnzippingPlugin": "Packar upp tilläggsprogrammet", - "StepUnzippingTheme": "Packar upp temat", "SuccessfullyActicated": "Du har nu aktiverat <strong>%s<\/strong>.", - "Support": "Support", "TeaserExtendPiwik": "Få ut mer av Piwik med plugin och teman", - "TeaserExtendPiwikByUpload": "Utöka Piwik genom att ladda upp en ZIP fil", "InstallingNewPluginViaMarketplaceOrUpload": "Du kan automatiskt installera plugin från Butiken eller %1$sladda upp en plugin%2$s i .zip format.", "Theme": "Tema", "Themes": "Teman", "ThemesDescription": "Teman kan förändra utseendet på Piwiks gränssnitt, och erbjuda en helt ny visuell upplevelse där du kan ta del av dina analysrapporter.", "ThemesManagement": "Hantera teman", "UninstallConfirm": "Du är påväg att avinstallera ett plugin %s. Pluginet kommer att tas bort helt från din plattform och du kommer inte kunna återställa det. Är du säker på att du vill göra det?", - "Updated": "Uppdaterad", - "UpdatingPlugin": "Uppdaterar %s", - "UploadZipFile": "Uppladdad ZIP file", "Version": "Version", - "ViewRepositoryChangelog": "Se ändringar", "Websites": "Webbsidor" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/te.json b/plugins/CorePluginsAdmin/lang/te.json index a359dfda01..d5e30b15bf 100644 --- a/plugins/CorePluginsAdmin/lang/te.json +++ b/plugins/CorePluginsAdmin/lang/te.json @@ -5,7 +5,6 @@ "Active": "చేతనం", "Deactivate": "అచేతనించు", "Inactive": "అచేతనం", - "PluginKeywords": "కీపదాలు", "PluginsManagement": "ప్లగిన్ల నిర్వహణ", "Status": "స్థితి", "Version": "సంచిక", diff --git a/plugins/CorePluginsAdmin/lang/th.json b/plugins/CorePluginsAdmin/lang/th.json index afebb74a10..7eb476ed41 100644 --- a/plugins/CorePluginsAdmin/lang/th.json +++ b/plugins/CorePluginsAdmin/lang/th.json @@ -10,7 +10,6 @@ "PluginsExtendPiwik": "อธิบายการใช้งานปลั้กอินและแสดงการทำงานของ Piwik.", "OncePluginIsInstalledYouMayActivateHere": "เมื่อปลั๊กอินที่ติดตั้งอยู่คุณสามารถเปิดใช้งานหรือยกเลิกการใช้งานได้ ที่นี่", "PluginHomepage": "หน้าหลักของปลั๊กอิน", - "PluginKeywords": "คีย์เวิร์ด", "PluginsManagement": "จัดการปลั้กอิน", "Status": "สถานะ", "Version": "เวอร์ชั่น", diff --git a/plugins/CorePluginsAdmin/lang/tl.json b/plugins/CorePluginsAdmin/lang/tl.json index f2244988e8..7bbbd488ed 100644 --- a/plugins/CorePluginsAdmin/lang/tl.json +++ b/plugins/CorePluginsAdmin/lang/tl.json @@ -1,90 +1,47 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "I-activate ang plugin", - "ActionActivateTheme": "I-activate ang theme", - "ActionInstall": "I-install", "ActionUninstall": "I-uninstall", "Activate": "I-activate", "Activated": "Na activate na", "Active": "Aktibo", "Activity": "Aktibidad", - "AllowedUploadFormats": "Maaari kang mag-upload ng plugin o theme sa .zip format sa pamamagitan ng pahinang ito.", "AuthorHomepage": "Homepage ng Gumawa", - "Authors": "Mga Gumawa", - "BackToExtendPiwik": "Bumalik sa Marketplace", - "BeCarefulUsingPlugins": "Ang plugin na hindi nilikha ng Piwik team ay kailangang gamitin ng may kasamang pag-iingat, hindi namin nasuri ang mga ito.", - "BeCarefulUsingThemes": "Ang mga Theme na hindi nilikha ng Piwik team ay kailangang gamitin ng may pag-iingat, hindi namin nasuri ang mga ito.", - "ByXDevelopers": "sa %s mga nagdevelop", "Changelog": "Baguhin ang log", "ChangeSettingsPossible": "Maaari mong baguhin ang mga %1$s setting %2$s para sa plugin na ito.", "CorePluginTooltip": "Ang core plugin ay walang bersyon mula ng sila ay ipinamahagi sa Piwik.", "Deactivate": "I-deactivate", - "Developer": "Nagdevelop", "DoMoreContactPiwikAdmins": "Para ma-install ang bagong plugin o bagong theme, mangyaring makipag ugnayan sa mga admin ng Piwik", - "FeaturedPlugin": "Feature na plugin", - "GetEarlyAccessForPaidPlugins": "Tandaan: lahat ng mga plugin ay magagamit ng libre sa kasalukuyan; sa hinaharap ay i-eenable namin ang Bayad na Plugin sa Marketplace (%1$s makipag-ugnayan sa amin %2$s para sa maagang pag-access).", "History": "Kasaysayan", "Inactive": "Hindi aktibo", "InfoPluginUpdateIsRecommended": "I-update ang iyong mga plugin ngayon, upang makinabang mula sa mga bagong pagpapabuti.", "InfoThemeIsUsedByOtherUsersAsWell": "Tandaan: ang iba pang %1$s user na nakarehistro sa Piwik ay ginagamit din ang theme %2$s.", "InfoThemeUpdateIsRecommended": "I-update ang iyong theme upang maranasan ang mga pinakabagong bersyon.", - "InstallingPlugin": "Nag-iinstall %s", "InstallNewPlugins": "Mag-install ng mga bagong plugin", "InstallNewThemes": "Mag-install ng mga bagong theme", - "LastCommitTime": "(huling gumawa ng %s)", - "LastUpdated": "Huling In-update", "LicenseHomepage": "Homepage ng Lisensya", "PluginsExtendPiwik": "Ang mga plugin ay pinahaba at pinalawak ang functionality ng Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Sa sandaling ang plugin ay na-install, maari mo itong i-activate o i-deactivate dito.", - "Marketplace": "Marketplace", - "MarketplaceSellPluginSubject": "Marketplace - Magbenta ng Plugin", "MenuPlatform": "Plataporma", "MissingRequirementsNotice": "Paki-update ang %1$s %2$s sa bagong bersyon, %1$s %3$s ay kailangan.", - "NoPluginsFound": "Walang nakitang mga plugin", - "NotAllowedToBrowseMarketplacePlugins": "Maaari mong i-browse ang listahan ng mga plugin na maaaring i-install upang i-customize o palawakin ang iyong Piwik platform. Mangyaring makipag-ugnayan sa iyong administrator kung kailangan mo ng alinman sa mga naka-install.", - "NotAllowedToBrowseMarketplaceThemes": "Maaari mong i-browse ang listahan ng mga theme na maaaring i-install upang i-customize ang hitsura ng Piwik platform. Mangyaring makipag-ugnayan sa iyong administrator upang makakuha ng alinman sa mga naka-install para sa iyo.", - "NoThemesFound": "Walang nakitang mga theme", "NoZipFileSelected": "Pumili ng ZIP file", - "NumDownloadsLatestVersion": "Pinakabagong bersyon: %s na mga download", "NumUpdatesAvailable": "%s na (mga) Update ang available", "Origin": "Pinagmulan", "OriginCore": "Core", "OriginThirdParty": "Third-Party", "PluginHomepage": "Homepage ng Plugin", - "PluginKeywords": "Mga Keyword", "PluginNotCompatibleWith": "%1$s ang plugin na to ay hindi compatible sa %2$s.", "PluginNotWorkingAlternative": "Kung ginagamit nag plugin na ito, maari mong makita ang pinakabagong bersyon nito sa Marketplace. Kung hindi, maaari mong i-uninstall ito.", "PluginRequirement": "%1$s kailangan %2$s.", "PluginsManagement": "Pamamahala ng plugin", - "PluginUpdateAvailable": "Iyong ginagamit ang bersyon %1$s at ang pinaka bagong bersyon %2$s ay available.", - "PluginVersionInfo": "%1$s mula %2$s", - "PluginWebsite": "Plugin Website", - "Screenshots": "Screenshots", "Status": "Status", - "StepDownloadingPluginFromMarketplace": "Dina-download ang plugin mula sa Marketplace", - "StepDownloadingThemeFromMarketplace": "Dina-download ang theme mula sa Marketplace", - "StepPluginSuccessfullyInstalled": "Matagumpay mong na-install ang plugin ng %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Matagumpay mong na-update ang plugin ng %1$s %2$s.", - "StepReplaceExistingPlugin": "Pagpapalit ng umiiral na plugin", - "StepReplaceExistingTheme": "Pagpapalit ng umiiral na theme", - "StepThemeSuccessfullyInstalled": "Matagumpay mong na-install ang theme %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Matagumpay mong na-update ang theme %1$s %2$s.", - "StepUnzippingPlugin": "Unzipping plugin", - "StepUnzippingTheme": "Unzipping theme", "SuccessfullyActicated": "Matagumpay mong na-activate ang <strong> %s <\/ strong>.", - "Support": "Suporta", "TeaserExtendPiwik": "Palawakin ang Piwik sa Social na Plugin at Themes", - "TeaserExtendPiwikByUpload": "Palawakin ang Piwik sa pamamagitan ng pag-upload ng ZIP File", "Theme": "Theme", "Themes": "Themes", "ThemesDescription": "Ang theme ay maaring palitan ang anyo ng iyong Piwik user inteface, at magbigay ng isang ganap na bagong visual experience para mas kaaya-aya ang iyong ulat na pang analytics.", "ThemesManagement": "Pamamahala ng theme", "UninstallConfirm": "Iyong i-uninstall ang isang plugin %s. Ang plugin ay ganap na tatanggalin mula sa iyong platform at hindi na ito maibabalik. Sigurado ka bang gusto mong gawin ito?", - "Updated": "Updated", - "UpdatingPlugin": "Nag-uupdate %s", - "UploadZipFile": "Mag upload ng zip file", "Version": "Bersyon", - "ViewRepositoryChangelog": "Tignan ang mga pagbabago", "Websites": "Websites" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/tr.json b/plugins/CorePluginsAdmin/lang/tr.json index 799838b354..6246b8b5d3 100644 --- a/plugins/CorePluginsAdmin/lang/tr.json +++ b/plugins/CorePluginsAdmin/lang/tr.json @@ -1,68 +1,35 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Eklentiyi etkinleştir", - "ActionActivateTheme": "Temayı aktif et", - "ActionInstall": "Kur", "ActionUninstall": "Kaldır", "Activate": "Aktive et", "Activated": "Aktive edildi", "Active": "Aktif", "Activity": "Aktivite", - "AllowedUploadFormats": "Bu sayfa üzerinden .zip formatında bir eklenti veya tema yükleyebilirsiniz.", "AuthorHomepage": "Yazar Ana sayfası", - "Authors": "Yazarlar", - "BackToExtendPiwik": "Markete geri dön", - "BeCarefulUsingPlugins": "İncelemediğimiz için Piwik ekibi tarafından hazırlanmayan eklentiler dikkatli kullanılmalıdır.", - "ByXDevelopers": "şu geliştiriciler tarafından %s", "Changelog": "Değişiklikler", "Deactivate": "Devre dışı", - "Developer": "Geliştirici", "DoMoreContactPiwikAdmins": "Yeni bir eklenti yada tema kurmak için lütfen Piwik yöneticileri iletişime geçiniz.", "History": "Geçmiş", "Inactive": "Pasif", "InfoPluginUpdateIsRecommended": "Son gelişmelerden faydalanmak için şimdi eklentileri güncelleyin.", "InfoThemeUpdateIsRecommended": "Son versiyonun keyfini çıkarmak için temanızı güncelleyin.", - "InstallingPlugin": "Kuruluyor %s", "InstallNewPlugins": "Yeni eklenti kur", "InstallNewThemes": "Yeni tema kur", - "LastCommitTime": "(son işlem %s)", - "LastUpdated": "Son Güncelleme", "LicenseHomepage": "Lisans Ana sayfası", - "Marketplace": "Pazaryeri", - "MarketplaceSellPluginSubject": "Pazaryeri - Eklenti Sat", "MenuPlatform": "Platform", "MissingRequirementsNotice": "Lütfen %1$s'ı %2$s'a güncelleyin, %1$s %3$s gerekli.", - "NoPluginsFound": "Eklenti bulunamadı", - "NoThemesFound": "Tema bulunamadı", "NoZipFileSelected": "Lütfen bir ZIP dosyası seçin.", - "NumDownloadsLatestVersion": "Son versiyon: %s İndir", "NumUpdatesAvailable": "Uygun %s Güncelleme", "OriginCore": "Çekirdek", "OriginThirdParty": "Üçüncü parti", "PluginHomepage": "Eklenti Sayfası", - "PluginKeywords": "Anahtar Kelimeler", "PluginsManagement": "Eklenti Yönetimi", - "PluginUpdateAvailable": "Şuanda %1$s versiyonunu kullanıyorsunuz ve yeni %2$s versiyon mevcut.", - "PluginVersionInfo": "%2$s den %1$s e", - "PluginWebsite": "Eklenti Sitesi", - "Screenshots": "Ekran Görüntüleri", "Status": "Durum", - "StepDownloadingPluginFromMarketplace": "Pazaryerinden eklenti indirin", - "StepDownloadingThemeFromMarketplace": "Pazaryerinden tema indirin", - "StepReplaceExistingTheme": "Mevcut temayla yer değiştir", - "StepThemeSuccessfullyUpdated": "Temanızı başarılı bir şekilde güncellediniz %1$s %2$s.", - "StepUnzippingPlugin": "Eklenti çıkarılıyor", - "StepUnzippingTheme": "Tema çıkarılıyor", - "Support": "Destek", "TeaserExtendPiwik": "Piwik'i Eklenti ve Temalarla Genişlet", "Theme": "Tema", "Themes": "Temalar", "ThemesManagement": "Temaları Yönet", - "Updated": "Güncellendi", - "UpdatingPlugin": "Güncelleniyor %s", - "UploadZipFile": "ZIP dosyası yükle", "Version": "Versiyon", - "ViewRepositoryChangelog": "Değişikliklere bak", "Websites": "Websiteler" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/uk.json b/plugins/CorePluginsAdmin/lang/uk.json index 26733f6cf7..7bb00af459 100644 --- a/plugins/CorePluginsAdmin/lang/uk.json +++ b/plugins/CorePluginsAdmin/lang/uk.json @@ -1,43 +1,26 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Активувати плагін", - "ActionActivateTheme": "Активувати тему", - "ActionInstall": "Встановити", "ActionUninstall": "Видалити", "Activate": "Активувати", "Activated": "Активовано", "Active": "Активний", "Activity": "Активність", - "AllowedUploadFormats": "Ви можете завантажити плагін або тему у форматі .zip на цій сторінці.", "AuthorHomepage": "Сторінка автора", - "Authors": "Автори", - "BackToExtendPiwik": "Повернутися до Маркету", - "BeCarefulUsingPlugins": "Плагіни, які не розроблені командою Piwik повинні використовуватися з обережністю: ми не переглядаємо їх.", - "BeCarefulUsingThemes": "Теми, які розроблені не командою Piwik повинні використовуватися з обережністю: ми не переглядаємо їх.", - "ByXDevelopers": "розробниками %s", - "CannotInstall": "Неможливо встановити (допомога)", "Changelog": "Історія змін", "ChangeSettingsPossible": "Ви можете %1$sзмінити налаштування%2$s для цього плагіна.", "CorePluginTooltip": "Основні плагіни не мають версії, так як вони поширюються з Piwik.", "Deactivate": "Деактивувати", - "Developer": "Розробник", - "DevelopersLearnHowToDevelopPlugins": "Розробникам: Вивчіть, як ви можете розширити та персоналізувати Piwik за допомогою плагінів для %1$sрозробки або тем%2$s.", "DoMoreContactPiwikAdmins": "Для встановлення нового плагіну або нової темм, будь ласка зв'яжіться з вашим Piwik-адміністратором", - "FeaturedPlugin": "Плагін що набирає популярність", "ChangeLookByManageThemes": "Ви можете змінити зовнішній вигляд Piwik: %1$sВибір Теми%2$s.", - "GetEarlyAccessForPaidPlugins": "Примітка: в даний час всі плагіни доступні безкоштовно, в майбутньому ми включимо платні плагіни до Маркету (%1$sЗв'яжіться з нами%2$s для раннього доступу).", "History": "Історія", "Inactive": "Неактивний", + "InstalledPlugins": "Встановлені плагіни", + "InstalledThemes": "Встановлені теми", "InfoPluginUpdateIsRecommended": "Оновіть плагін що б скористатися останніми поліпшеннями.", "InfoThemeIsUsedByOtherUsersAsWell": "Примітка: інші зареєстровані користувачі (%1$s) використовують цю ж тему: %2$s.", "InfoThemeUpdateIsRecommended": "Оновіть тему що б насолодитися останніми поліпшеннями.", - "InstallingPlugin": "Встановлення %s", "InstallNewPlugins": "Встановити нові плагіни", "InstallNewThemes": "Встановити нові теми", - "InstalledPlugins": "Встановлені плагіни", - "InstalledThemes": "Встановлені теми", - "LastCommitTime": "(останній комміт %s)", - "LastUpdated": "Останнє оновлення", "LicenseHomepage": "Дом. сторінка ліцензії", "LikeThisPlugin": "Подобається цей плагін?", "ConsiderDonating": "Розглянути можливість пожертвування", @@ -45,66 +28,34 @@ "ConsiderDonatingCreatorOf": "Будь ласка, розгляньте можливість пожертвування автору %s", "PluginsExtendPiwik": "Плагіни розширюють функціональність Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Після встановлення плагіну Ви можете активувати або деактивувати його тут.", - "Marketplace": "Маркет", - "MarketplaceSellPluginSubject": "Маркет – продати плагін", "MenuPlatform": "Платформа", "MissingRequirementsNotice": "Будь ласка, поновіть %1$s %2$s до більш нової версії, необхідна версія %1$s %3$s.", "MissingRequirementsPleaseInstallNotice": "Будь ласка, встановіть %1$s %2$s так як воно потрібне для %3$s.", - "NewVersion": "нова версія", - "NoPluginsFound": "Плагіни не знайдені", - "NoPluginSettings": "Немає налаштувань плагінів, які можуть бути налаштовані", - "NotAllowedToBrowseMarketplacePlugins": "Можете подивитися список плагінів, які можуть бути встановлені для підстроювання або розширення вашої платформи Piwik. Зв'яжіться з адміністратором якщо вам буде потрібно встановити один з них.", - "NotAllowedToBrowseMarketplaceThemes": "Ви можете подивитися список тем, які можуть бути встановлені для налаштування зовнішнього вигляду платформи Piwik. Будь ласка, зв'яжіть з вашим адміністратором, щоб встановити будь-яку з них.", - "NoThemesFound": "Теми не знайдені", "NoZipFileSelected": "Ви берете ZIP файл", - "NumDownloadsLatestVersion": "Остання версія завантажена: %s разів", "NumUpdatesAvailable": "%s оновлення доступні", + "NoPluginSettings": "Немає налаштувань плагінів, які можуть бути налаштовані", "Origin": "Походження", "OriginCore": "Основні", "OriginThirdParty": "Сторонні", "PluginHomepage": "Дом. сторінка плагіна", - "PluginKeywords": "Ключові слова", "PluginNotCompatibleWith": "Плагін %1$s несумісний з %2$s.", "PluginNotWorkingAlternative": "Якщо ви використовуєте цей плагін, можливо ви зможете знайти більш нові версії в Маркеті. Якщо ні - можете видалити його.", "PluginRequirement": "%1$s потрібно %2$s.", "PluginsManagement": "Управління плагінами", - "PluginUpdateAvailable": "Ви використовуєте версію %1$s остання доступна %2$s", - "PluginVersionInfo": "%1$s – %2$s", - "PluginWebsite": "Сайт плагіну", - "Screenshots": "Скріншоти", - "SortByAlpha": "Альфа", - "SortByNewest": "Нові", - "SortByPopular": "Популярні", "Status": "Статус", - "StepDownloadingPluginFromMarketplace": "Завантажити плагін з Маркету", - "StepDownloadingThemeFromMarketplace": "Завантажити тему з Маркету", - "StepPluginSuccessfullyInstalled": "Ви успішно встановили плагін %1$s %2$s.", - "StepPluginSuccessfullyUpdated": "Ви успішно оновили плагін %1$s %2$s.", - "StepReplaceExistingPlugin": "Заміна існуючого плагіна", - "StepReplaceExistingTheme": "Заміна існуючої теми", - "StepThemeSuccessfullyInstalled": "Ви успішно встановили тему %1$s %2$s.", - "StepThemeSuccessfullyUpdated": "Ви успішно оновили тему %1$s %2$s.", - "StepUnzippingPlugin": "Розпакування плагіна", - "StepUnzippingTheme": "Розпакування теми", "SuccessfullyActicated": "Ви успішно активували <strong>%s<\/strong>.", - "Support": "Підтримка", "TeaserExtendPiwik": "Поліпшення Piwik за допомогою Плагінів і Тим", "TeaserExtendPiwikByPlugin": "Piwik продовжує %1$sвстановлювати новий плагін%2$s .", "TeaserExtendPiwikByTheme": "Насолоджуйтесь інший видом та відчувайте себе по-новому зі %1$sвстановленням нової теми%2$s.", - "TeaserExtendPiwikByUpload": "Поліпшення Piwik закачуванням ZIP файла", "InstallingNewPluginViaMarketplaceOrUpload": "Ви автоматично можете встановити плагіни з Маркету або %1$sзавантажити плагін%2$s в форматі zip.", "Theme": "Тема", "Themes": "Теми", "ThemesDescription": "Теми можуть змінити зовнішній вигляд Piwik призначеного для користувача інтерфейсу, а також забезпечити абсолютно нове візуальне сприйняття, щоб насолоджуватися звітами аналітики.", "ThemesManagement": "Управління темами", "UninstallConfirm": "Ви збираєтеся видалити плагін %s. Плагін буде безповоротно видалений з системи. Ви впевнені, що хочете зробити це?", - "Updated": "Оновлено", - "UpdatingPlugin": "Оновлення %s", - "UploadZipFile": "Завантажити ZIP файл", "Version": "Версія", - "ViewRepositoryChangelog": "Подивитися зміни", "ViewAllMarketplacePlugins": "Переглянути всі плагіни Маркету", - "Websites": "Сайти", - "WeDeactivatedThePluginAsItHasMissingDependencies": "Ми відключили плагін %s так як він має відсутні залежності:" + "WeDeactivatedThePluginAsItHasMissingDependencies": "Ми відключили плагін %s так як він має відсутні залежності:", + "Websites": "Сайти" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/vi.json b/plugins/CorePluginsAdmin/lang/vi.json index 8354dec65c..5d0d99ddee 100644 --- a/plugins/CorePluginsAdmin/lang/vi.json +++ b/plugins/CorePluginsAdmin/lang/vi.json @@ -1,61 +1,39 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "Kích hoạt tiện ích", - "ActionActivateTheme": "Kích hoạt giao diện", - "ActionInstall": "Cài đặt", "ActionUninstall": "Gỡ cài đặt", "Activate": "Kích hoạt", "Activated": "Đã kích hoạt", "Active": "Kích hoạt", "Activity": "Hoạt động", - "AllowedUploadFormats": "Bạn có thể tải tiện ích hoặc giao diện dưới định dạng .zip lên qua trang này", "AuthorHomepage": "Tác giả Trang chủ", - "Authors": "Tác giả", - "BackToExtendPiwik": "Quay lại Chợ ứng dụng", - "BeCarefulUsingPlugins": "Cẩn thận khi sử dụng các tiện ích không được tạo ra từ đội ngũ Piwik vì chúng tôi chưa kiểm tra chúng.", - "BeCarefulUsingThemes": "Cẩn thận khi sử dụng các giao diện không được tạo ra bởi đội ngũ Piwki vì chúng tôi chưa kiểm tra chúng.", "Changelog": "Lịch sử thay đổi", "Deactivate": "Ngừng hoạt động", - "Developer": "Người phát triển", "DoMoreContactPiwikAdmins": "Để cài thêm tiện ích hay giao diện mời, xin vui lòng liên lạc với quản lý Piwik của bạn.", - "GetEarlyAccessForPaidPlugins": "Lưu ý: hiện nay, mọi tiện ích đều được cung cấp miễn phí; Chúng tôi sẽ thêm Tiện ích trả phí tại Marketplace trong thời gian tới (%1$sliên hệ%2$s để được sử dụng sớm).", "History": "Lịch sử", "Inactive": "Không hoạt động", "InfoPluginUpdateIsRecommended": "Cập nhập tiện ích của bạn ngay để hưởng lợi từ những thay đổi mới nhất.", "InfoThemeIsUsedByOtherUsersAsWell": "Ghi chú: %1$s người dùng đăng ký Piwik đã sử dụng giao diện %2$s", "InfoThemeUpdateIsRecommended": "Cập nhập giao diện của bạn để tận hưởng phiên bản mới nhất.", - "InstallingPlugin": "Cài đặt %s", "InstallNewPlugins": "Cài đặt các plugin mới", "InstallNewThemes": "Cài đặt các theme mới", - "LastUpdated": "Lần cập nhật cuối", "LicenseHomepage": "Cấp giấy phép Trang chủ", "PluginsExtendPiwik": "Bổ sung mở rộng và mở rộng các chức năng của Piwik.", "OncePluginIsInstalledYouMayActivateHere": "Khi một plugin được cài đặt, bạn có thể kích hoạt hay ngừng kích hoạt nó tại đây.", - "Marketplace": "Chợ ứng dụng", "MenuPlatform": "Nền tảng", - "NoPluginsFound": "Tiện ích không tìm thấy", - "NoThemesFound": "Giao diện không tìm thấy", "NoZipFileSelected": "Hãy chọn một tập tin ZIP.", - "NumDownloadsLatestVersion": "Phiên bản mới nhất: %s lượt tải", "Origin": "Nguồn gốc", "OriginCore": "Lõi", "OriginThirdParty": "Bên thứ ba", "PluginHomepage": "Trang chủ Plugin.", - "PluginKeywords": "Từ khóa", "PluginNotCompatibleWith": "%1$s plugin là không tương thích với %2$s.", "PluginsManagement": "Quản lý các Plugin.", - "PluginVersionInfo": "%1$s từ %2$s", "Status": "Trạng thái", - "StepDownloadingThemeFromMarketplace": "Tải giao diện từ Chợ ứng dụng", - "Support": "Hỗ trợ", "Theme": "Chủ đề", "Themes": "Số chủ đề", "ThemesDescription": "Themes có thể làm thay đổi diện mạo của trang Piwik, và cung cấp một trải nghiệm hình ảnh hoàn toàn mới cho các báo cáo phân tích của bạn.", "ThemesManagement": "Quản lý các chủ đề.", "UninstallConfirm": "Bạn có thể gỡ bỏ một plugin %s. Plugin này sẽ được loại bỏ hoàn toàn ra khỏi nền tảng của bạn và nó không còn khả năng tự khôi phục nữa. Bạn có chắc rằng bạn muốn thực hiện điều này?", - "Updated": "Đã cập nhật", "Version": "Phiên bản", - "ViewRepositoryChangelog": "Xem các thay đổi", "Websites": "Websites" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/zh-cn.json b/plugins/CorePluginsAdmin/lang/zh-cn.json index e958a5b845..8dee344267 100644 --- a/plugins/CorePluginsAdmin/lang/zh-cn.json +++ b/plugins/CorePluginsAdmin/lang/zh-cn.json @@ -1,41 +1,24 @@ { "CorePluginsAdmin": { - "ActionActivatePlugin": "激活插件", - "ActionActivateTheme": "启用布景", - "ActionInstall": "安装", "ActionUninstall": "卸载", "Activate": "启用", "Activated": "已启用", "Active": "已启用", "Activity": "活动", - "AllowedUploadFormats": "您可以通过该页面上传.zip格式的插件或主题。", "AuthorHomepage": "作者主页", - "Authors": "作者", - "BackToExtendPiwik": "返回商城", - "BeCarefulUsingPlugins": "不是由Piwik小组撰写的插件必须小心使用：我们没有审查他们。", - "BeCarefulUsingThemes": "不是由Piwik小组撰写的主题必须小心使用：我们没有审查他们。", - "ByXDevelopers": "开发者： %s", - "CannotInstall": "无法安装（帮助）", "Changelog": "修改日志", "ChangeSettingsPossible": "你可以%1$s配置%2$s此插件。", "CorePluginTooltip": "核心插件没有版本，因为它们由Piwik分配。", "Deactivate": "停用", - "Developer": "程序员", - "DevelopersLearnHowToDevelopPlugins": "开发者：你可以学习如何扩展和定制 Piwik%1$s开发插件或主题%2$s。", "DoMoreContactPiwikAdmins": "要安装新插件或者一个新的主题，请与您的Piwik管理员联系。", - "FeaturedPlugin": "特色插件", "ChangeLookByManageThemes": "你可以进入%1$s管理主题%2$s来改变Piwik的外观。", - "GetEarlyAccessForPaidPlugins": "注意：目前所有插件都是免费的，但未来我们可能会在市场里开放付费插件。(%1$s联系我们%2$s)", "History": "历史记录", "Inactive": "已停用", "InfoPluginUpdateIsRecommended": "立即更新您的插件从最新改进中受益。", "InfoThemeIsUsedByOtherUsersAsWell": "注意：有其它%1$s个Piwik注册用户也在使用这个主题%2$s。", "InfoThemeUpdateIsRecommended": "更新你的主题，以享受最新版本。", - "InstallingPlugin": "正在安装 %s", "InstallNewPlugins": "安装新插件", "InstallNewThemes": "安装新主题", - "LastCommitTime": "(最后提交 %s)", - "LastUpdated": "最后更新", "LicenseHomepage": "许可首页", "LikeThisPlugin": "喜欢这个插件？", "ConsiderDonating": "考虑捐赠", @@ -43,58 +26,29 @@ "ConsiderDonatingCreatorOf": "请考虑捐赠给%s的作者", "PluginsExtendPiwik": "插件延伸并扩展了 Piwik 的功能。", "OncePluginIsInstalledYouMayActivateHere": "当一个插件安装了以后，您可以在这里启用或停用它。", - "Marketplace": "商城", - "MarketplaceSellPluginSubject": "商城 - 销售插件", "MenuPlatform": "平台", "MissingRequirementsNotice": "请升级%1$s %2$s到最新的版本， %1$s %3$s 是必需的。", "MissingRequirementsPleaseInstallNotice": "%3$s的前提是您要先安装 %1$s %2$s。", - "NewVersion": "新版本", - "NoPluginsFound": "没有插件", - "NotAllowedToBrowseMarketplacePlugins": "您可以浏览，可以安装定制或扩展您的Piwik平台插件列表。如果你有需要请联系您的管理员。", - "NotAllowedToBrowseMarketplaceThemes": "就可以浏览可以安装定制Piwik平台的外观的主题列表。如果你有需要请联系您的管理员。", - "NoThemesFound": "没有布景", "NoZipFileSelected": "请选择一个ZIP文件", - "NumDownloadsLatestVersion": "最新版本: %s次下载", "NumUpdatesAvailable": "%s 有更新", "Origin": "原始", "OriginCore": "核心", "OriginThirdParty": "第三方", "PluginHomepage": "插件首页", - "PluginKeywords": "关键词", "PluginNotCompatibleWith": "插件 %1$s 与 %2$s 不兼容。", "PluginNotWorkingAlternative": "如果您使用这个插件，可以到商城查找更新的版本。如果没有用，可以卸载。", "PluginRequirement": "%1$s需要%2$s。", "PluginsManagement": "插件管理", - "PluginUpdateAvailable": "您正在使用的版本号为 %1$s，现在有最新的版本%2$s。", - "PluginVersionInfo": "%1$s 来自 %2$s", - "PluginWebsite": "插件网站", - "Screenshots": "截屏", "Status": "状态", - "StepDownloadingPluginFromMarketplace": "正在从商城下载插件", - "StepDownloadingThemeFromMarketplace": "正在从商城下载布景", - "StepPluginSuccessfullyInstalled": "成功安装插件 %1$s %2$s。", - "StepPluginSuccessfullyUpdated": "成功更新插件 %1$s %2$s。", - "StepReplaceExistingPlugin": "正在更新现有插件", - "StepReplaceExistingTheme": "正在更新现有布景", - "StepThemeSuccessfullyInstalled": "成功安装布景 %1$s %2$s。", - "StepThemeSuccessfullyUpdated": "成功更新布景 %1$s %2$s。", - "StepUnzippingPlugin": "正在解压插件", - "StepUnzippingTheme": "正在解压布景", "SuccessfullyActicated": "您已成功激活<strong>%s<\/strong>。", - "Support": "支持", "TeaserExtendPiwik": "使用插件主题来扩展Piwik", - "TeaserExtendPiwikByUpload": "上传一个ZIP文件来扩展Piwik。", "InstallingNewPluginViaMarketplaceOrUpload": "你可以从市场里自动安装插件，或%1$s上传%2$s一个ZIP格式的插件。", "Theme": "主题", "Themes": "主题", "ThemesDescription": "主题可以改变Piwik外观，提供一个全新的视觉体验，让您享受分析报告。", "ThemesManagement": "管理主题", "UninstallConfirm": "你将卸载%s插件。插件将被彻底从您的平台删除，数据将无法恢复。你确定要这么做吗？", - "Updated": "已更新", - "UpdatingPlugin": "正在更新 %s", - "UploadZipFile": "上传 ZIP 文件", "Version": "版本", - "ViewRepositoryChangelog": "查看修改", "Websites": "网站" } }
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/lang/zh-tw.json b/plugins/CorePluginsAdmin/lang/zh-tw.json index 1e285e2c4c..ec6873a7a9 100644 --- a/plugins/CorePluginsAdmin/lang/zh-tw.json +++ b/plugins/CorePluginsAdmin/lang/zh-tw.json @@ -8,7 +8,6 @@ "PluginsExtendPiwik": "外掛延伸並擴展了 Piwik 的功能。", "OncePluginIsInstalledYouMayActivateHere": "當一個外掛安裝了以後，您可以在這裏啟用或停用它。", "PluginHomepage": "外掛首頁", - "PluginKeywords": "關鍵字", "PluginsManagement": "外掛管理", "Status": "狀態", "Version": "版本", diff --git a/plugins/CoreUpdater/lang/en.json b/plugins/CoreUpdater/lang/en.json index ad6d230ce9..531481230a 100644 --- a/plugins/CoreUpdater/lang/en.json +++ b/plugins/CoreUpdater/lang/en.json @@ -31,10 +31,10 @@ "Latest2XStableRelease": "Latest stable 2.X", "Latest2XBetaRelease": "Latest beta 2.X", "LtsSupportVersion": "Long Term Support version", + "ListOfSqlQueriesFYI": "FYI: these are the SQL queries that will be executed to upgrade your database to Piwik %s", "MajorUpdateWarning1": "This is a major update! It will take longer than usual.", "MajorUpdateWarning2": "The following advice is especially important for large installations.", "NoteForLargePiwikInstances": "Important notes for large Piwik installations", - "NoteItIsExpectedThatQueriesFail": "Note: if you manually execute these queries, it is expected that some of them fail. In this case, simply ignore the errors, and run the next ones in the list.", "NotificationClickToUpdatePlugins": "Click here to update your plugins now:", "NotificationClickToUpdateThemes": "Click here to update your themes now:", "NotificationSubjectAvailableCoreUpdate": "New Piwik %s is available", @@ -73,7 +73,6 @@ "WarningMessages": "Warning messages:", "WeAutomaticallyDeactivatedTheFollowingPlugins": "We automatically deactivated the following plugins: %s", "YouCanUpgradeAutomaticallyOrDownloadPackage": "You can update to version %s automatically or download the package and install it manually:", - "YouCouldManuallyExecuteSqlQueries": "If you are not able to use the command line updater and if Piwik fails to upgrade (due to a timeout of the database, a browser timeout, or any other issue), you could manually execute the SQL queries to update Piwik.", "YouMustDownloadPackageOrFixPermissions": "Piwik is unable to overwrite your current installation. You can either fix the directory\/file permissions, or download the package and install version %s manually:", "YourDatabaseIsOutOfDate": "Your Piwik database is out-of-date, and must be upgraded before you can continue.", "ViewVersionChangelog": "View the changelog for this version:" diff --git a/plugins/CoreUpdater/lang/zh-tw.json b/plugins/CoreUpdater/lang/zh-tw.json index 2df3b47752..da7d10b6dc 100644 --- a/plugins/CoreUpdater/lang/zh-tw.json +++ b/plugins/CoreUpdater/lang/zh-tw.json @@ -1,5 +1,6 @@ { "CoreUpdater": { + "CheckingForPluginUpdates": "正在檢查外掛新版本", "ClickHereToViewSqlQueries": "點選這裡來查看並複製即將執行的 SQL 語法列表", "CriticalErrorDuringTheUpgradeProcess": "在更新過程中發生嚴重的錯誤：", "DatabaseUpgradeRequired": "資料庫需要升級", @@ -23,7 +24,13 @@ "HelpMessageIntroductionWhenError": "以上是核心錯誤訊息。它應該有助於解釋原因，但如果你需要進一步的說明請至：", "HelpMessageIntroductionWhenWarning": "此次更新成功完成，但在過程中有發生一些問題。請閱讀以上說明的詳細內容。如需更進一步的說明：", "HighTrafficPiwikServerEnableMaintenance": "如果你管理一個高流量的Piwik伺服器，我們建議%1$s暫時禁用訪客追踪功能，並把Piwik用戶界面設定為維運模式%2$s。", + "IncompatbilePluginsWillBeDisabledInfo": "注意：部分外掛和 Piwik %s 不相容。若那些外掛在 Marketplace 上有更新我們將會進行更新，否則我們將會在您升級時禁用。", "InstallingTheLatestVersion": "正在安裝最新版本中", + "LatestBetaRelease": "最新 Beta 版本", + "LatestStableRelease": "最新穩定版本", + "Latest2XStableRelease": "2.X 最新穩定版本", + "Latest2XBetaRelease": "2.X 最新 Beta 版本", + "LtsSupportVersion": "長期支援版本", "MajorUpdateWarning1": "這是一個重大更新！這將需要比平常更長的時間。", "MajorUpdateWarning2": "下面的建議針對大量安裝時尤其重要。", "NoteForLargePiwikInstances": "大型 Piwik 網站重要注意事項", @@ -46,11 +53,13 @@ "UpdateAutomatically": "自動更新", "UpdateHasBeenCancelledExplanation": "Piwik 一鍵更新已被取消。如果你無法修正以上的錯誤訊息，建議你手動更新 Piwik。%1$s 請查看 %2$s更新文件%3$s 來開始吧！", "UpdateTitle": "Piwik › 更新", + "UpdatingPluginXToVersionY": "正在將外掛 %1$s 更新至版本 %2$s", "UpdateSuccessTitle": "Piwik 已成功更新！", "UpdateErrorTitle": "更新錯誤", "ThankYouUpdatePiwik": "感謝您使用Piwik並保持更新！", "PostUpdateMessage": "Piwik將永遠是免費下載並使用，但它需要你們繼續的支持成長及茁壯。", "PostUpdateSupport": "如果你需要幫助使用Piwik，你可以從作者那邊獲得支持：", + "ProfessionalServices": "專業級服務", "CloudHosting": "雲端代管", "Updating": "更新中", "UpdateUsingHttpsFailed": "在安全的HTTPS連線中下載最新的Piwik版本並沒有成功，因為下面的錯誤：", diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig index 168524487b..e5899117ce 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig @@ -52,11 +52,13 @@ <p>{{ 'CoreUpdater_TheUpgradeProcessMayFailExecuteCommand'|translate('') }}</p> <pre>{{ commandUpgradePiwik }}</pre> <p>{{ 'CoreUpdater_HighTrafficPiwikServerEnableMaintenance'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http%3A%2F%2Fpiwik.org%2Ffaq%2Fhow-to%2F%23faq_111">', '</a>')|raw }}</p> - <p>{{ 'CoreUpdater_YouCouldManuallyExecuteSqlQueries'|translate }}</p> - <p><a href="#" id="showSql">› {{ 'CoreUpdater_ClickHereToViewSqlQueries'|translate }}</a></p> - <div id="sqlQueries" style="display:none;"> - <pre># {{ 'CoreUpdater_NoteItIsExpectedThatQueriesFail'|translate }}<br/>{% for query in queries %}{{ query }}<br/>{% endfor %}</pre> - </div> + + {% if queries is not empty %} + <p><a href="#" id="showSql">› {{ 'CoreUpdater_ClickHereToViewSqlQueries'|translate }}</a></p> + <div id="sqlQueries" style="display:none;"> + <pre># {{ 'CoreUpdater_ListOfSqlQueriesFYI'|translate(piwik_version) }}<br/>{% for query in queries %}{{ query }}<br/>{% endfor %}</pre> + </div> + {% endif %} <h2>{{ 'CoreUpdater_ReadyToGo'|translate }}</h2> <p>{{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}</p> diff --git a/plugins/CoreVisualizations/Visualizations/Sparklines.php b/plugins/CoreVisualizations/Visualizations/Sparklines.php index 8ee6f60401..b0f8fbfcac 100644 --- a/plugins/CoreVisualizations/Visualizations/Sparklines.php +++ b/plugins/CoreVisualizations/Visualizations/Sparklines.php @@ -80,6 +80,8 @@ class Sparklines extends ViewDataTable $view->sparklines = $this->config->getSortedSparklines(); $view->isWidget = Common::getRequestVar('widget', 0, 'int'); $view->titleAttributes = $this->config->title_attributes; + $view->footerMessage = $this->config->show_footer_message; + $view->areSparklinesLinkable = $this->config->areSparklinesLinkable(); $view->title = ''; if ($this->config->show_title) { diff --git a/plugins/CoreVisualizations/Visualizations/Sparklines/Config.php b/plugins/CoreVisualizations/Visualizations/Sparklines/Config.php index a4dae712db..09e687fd4a 100644 --- a/plugins/CoreVisualizations/Visualizations/Sparklines/Config.php +++ b/plugins/CoreVisualizations/Visualizations/Sparklines/Config.php @@ -34,6 +34,12 @@ class Config extends \Piwik\ViewDataTable\Config private $sparklines = array(); /** + * If false, will not link them with any evolution graph + * @var bool + */ + private $evolutionGraphLinkable = true; + + /** * Adds possibility to set html attributes on the sparklines title / headline. For example can be used * to set an angular directive * @var string @@ -263,6 +269,25 @@ class Config extends \Piwik\ViewDataTable\Config } /** + * If there are sparklines and evolution graphs on one page, we try to connect them so that when you click on a + * sparkline, the evolution graph will update and show the evolution for that sparkline metric. In some cases + * we might falsely connect sparklines with an evolution graph that don't belong together. In this case you can + * mark all sparklines as "not linkable". This will prevent the sparklines being linked with an evolution graph. + */ + public function setNotLinkableWithAnyEvolutionGraph() + { + $this->evolutionGraphLinkable = false; + } + + /** + * Detect whether sparklines are linkable with an evolution graph. {@link setNotLinkableWithAnyEvolutionGraph()} + */ + public function areSparklinesLinkable() + { + return $this->evolutionGraphLinkable; + } + + /** * @return array * @ignore */ diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_sparklines.twig b/plugins/CoreVisualizations/templates/_dataTableViz_sparklines.twig index b0e29cc26a..5c8390d914 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_sparklines.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_sparklines.twig @@ -13,7 +13,7 @@ {% for key, sparkline in sparklines %} {% if key is even %} - {{ macros.singleSparkline(sparkline, allMetricsDocumentation) }} + {{ macros.singleSparkline(sparkline, allMetricsDocumentation, areSparklinesLinkable) }} {% endif %} {% endfor %} @@ -25,7 +25,7 @@ {% for key, sparkline in sparklines %} {% if key is odd %} - {{ macros.singleSparkline(sparkline, allMetricsDocumentation) }} + {{ macros.singleSparkline(sparkline, allMetricsDocumentation, areSparklinesLinkable) }} {% endif %} {% endfor %} @@ -36,7 +36,13 @@ </div> {% endif %} - {% include "_sparklineFooter.twig" %} + {% if areSparklinesLinkable %} + {% include "_sparklineFooter.twig" %} + {% endif %} + + {% if footerMessage is not empty %} + <div class='datatableFooterMessage'>{{ footerMessage | raw }}</div> + {% endif %} {% if not isWidget %} </div></div> {% endif %}
\ No newline at end of file diff --git a/plugins/CoreVisualizations/templates/macros.twig b/plugins/CoreVisualizations/templates/macros.twig index 43d8c2158e..ad9212978a 100644 --- a/plugins/CoreVisualizations/templates/macros.twig +++ b/plugins/CoreVisualizations/templates/macros.twig @@ -1,5 +1,6 @@ -{% macro singleSparkline(sparkline, allMetricsDocumentation) %} - <div class="sparkline"> +{% macro singleSparkline(sparkline, allMetricsDocumentation, areSparklinesLinkable) %} + + <div class="sparkline {% if areSparklinesLinkable is defined and not areSparklinesLinkable %}notLinkable{% endif %}"> {% if sparkline.url %}{{ sparkline(sparkline.url)|raw }}{% endif %} {% for metric in sparkline.metrics %} <span {% if allMetricsDocumentation[metric.column] is defined and allMetricsDocumentation[metric.column] %}title="{{ allMetricsDocumentation[metric.column] }}"{% endif %}> diff --git a/plugins/CoreVisualizations/tests/Integration/SparklinesConfigTest.php b/plugins/CoreVisualizations/tests/Integration/SparklinesConfigTest.php index 49a116b5cc..f3d00bc770 100644 --- a/plugins/CoreVisualizations/tests/Integration/SparklinesConfigTest.php +++ b/plugins/CoreVisualizations/tests/Integration/SparklinesConfigTest.php @@ -47,6 +47,17 @@ class SparklinesConfigTest extends IntegrationTestCase parent::tearDown(); } + public function test_areSparklinesLinkable_byDefaultSparklinesAreLinkable() + { + $this->assertTrue($this->config->areSparklinesLinkable()); + } + + public function test_setNotLinkableWithAnyEvolutionGraph_areSparklinesLinkable_sparklinesCanBeMadeNotLinkable() + { + $this->config->setNotLinkableWithAnyEvolutionGraph(); + $this->assertFalse($this->config->areSparklinesLinkable()); + } + public function test_addSparkline_shouldAddAMinimalSparklineWithOneValueAndUseDefaultOrder() { $this->config->addSparkline($this->sparklineParams(), $value = 10, $description = 'Visits'); diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 1463780470ab920c34968bb591675ad9c013ca2 +Subproject 49ae454fd7eae39e07300c83e0dff40dda2e427 diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 6a0c1dfa85612eaa02453d0b82aaea91ae5bef8 +Subproject 0a4fbedbc8a0366f3595469a110cf46763c75b3 diff --git a/plugins/CustomPiwikJs/lang/de.json b/plugins/CustomPiwikJs/lang/de.json index dc2914dbc4..ca08615a4c 100644 --- a/plugins/CustomPiwikJs/lang/de.json +++ b/plugins/CustomPiwikJs/lang/de.json @@ -1,7 +1,7 @@ { "CustomPiwikJs": { "DiagnosticPiwikJsWritable": "Schreibbarer JavaScript-Tracker (\"\/piwik.js\")", - "DiagnosticPiwikJsNotWritable": "Die Piwik-JavaScript-Tracker-Datei \"\/piwik.js\" ist nicht beschreibbar, das bedeutet, dass andere Plugins können den JavaScript-Tracker nicht benutzen. In Zukunft werden sogar einige Kernfunktionen nicht wie erwartet funktionieren.", - "DiagnosticPiwikJsMakeWritable": "Wir empfehlen, Piwik.js beschreibbar zu machen, indem Sie folgenden Befehl ausführen: %s" + "DiagnosticPiwikJsNotWritable": "Die Piwik-JavaScript-Tracker-Datei \"\/piwik.js\" ist nicht beschreibbar, das bedeutet, dass andere Plugins den JavaScript-Tracker nicht benutzen können. In Zukunft werden sogar einige Kernfunktionen nicht wie erwartet funktionieren.", + "DiagnosticPiwikJsMakeWritable": "Wir empfehlen, piwik.js beschreibbar zu machen, indem Sie folgenden Befehl ausführen: %s" } }
\ No newline at end of file diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml index ba763b7ed5..0660a4925d 100644 --- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml @@ -58,6 +58,7 @@ <customVariablePageValue8>Val_PAGE8</customVariablePageValue8> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -84,6 +85,7 @@ <visitDurationPretty>4s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> diff --git a/plugins/Dashboard/lang/zh-tw.json b/plugins/Dashboard/lang/zh-tw.json index 739e4c7112..4374ed2264 100644 --- a/plugins/Dashboard/lang/zh-tw.json +++ b/plugins/Dashboard/lang/zh-tw.json @@ -1,12 +1,36 @@ { "Dashboard": { + "AddAWidget": "新增小工具", "AddPreviewedWidget": "將組件加入展示板", + "ChangeDashboardLayout": "改變展示板版面", + "CopyDashboardToUser": "將展示板複製給使用者", + "CreateNewDashboard": "建立新的展示板", "Dashboard": "展示板", + "DashboardCopied": "已成功將目前的展示板複製給選擇的使用者", + "DashboardEmptyNotification": "您的展示板沒有任何小工具。開始添加一些小工具，或是直接重置展示板，顯示預選的小工具。", + "DashboardName": "展示板名稱：", + "DashboardOf": "%s 的展示板", + "DefaultDashboard": "預設展示板 - 使用預選小工具以及欄位排版", "DeleteWidgetConfirm": "您確定要從展示板中刪除此組件嗎？", + "EmptyDashboard": "空白展示板 - 依你的喜好選擇小工具", "LoadingWidget": "載入組件中，請稍候...", "ManageDashboard": "展示板管理", + "Maximise": "最大化", + "Minimise": "最小化", + "NotUndo": "您將無法還原此操作", + "PluginDescription": "您的網頁分析展示板。透過添加小工具來自定您的展示板，只需拖曳並放置即可改變展示板的欄位排版。每位使用者可以管理他們自己的展示板。", + "RemoveDashboard": "移除展示板", + "RemoveDashboardConfirm": "您確定要移除展示板：%s？", + "RemoveDefaultDashboardNotPossible": "無法移除預設展示板", + "RenameDashboard": "重新命名展示板", "ResetDashboard": "重置展示板", + "ResetDashboardConfirm": "您確定要重置您的展示板，還原為預選小工具排版？", + "SelectDashboardLayout": "請選擇您新展示板的排版", "SelectWidget": "請選取欲增加至展示板的組件", + "SetAsDefaultWidgets": "設定為預選小工具", + "SetAsDefaultWidgetsConfirm": "您確定您要將目前選擇的小工具和展示板排版設定為預設的展示板模板？", + "SetAsDefaultWidgetsConfirmHelp": "這個小工具和展示板排版將於使用者建立的新展示板，或是使用 %s 功能時套用。", + "TopLinkTooltip": "查看 %s 專屬的網頁分析報表。", "WidgetNotFound": "找不到組件", "WidgetPreview": "組件預覽" } diff --git a/plugins/DevicesDetection/Columns/DeviceBrand.php b/plugins/DevicesDetection/Columns/DeviceBrand.php index f10f5e5ca0..37d284fa83 100644 --- a/plugins/DevicesDetection/Columns/DeviceBrand.php +++ b/plugins/DevicesDetection/Columns/DeviceBrand.php @@ -69,6 +69,6 @@ class DeviceBrand extends Base */ public function onAnyGoalConversion(Request $request, Visitor $visitor, $action) { - return $visitor->getVisitorColumn('config_device_brand'); + return $visitor->getVisitorColumn($this->columnName); } } diff --git a/plugins/DevicesDetection/Columns/DeviceModel.php b/plugins/DevicesDetection/Columns/DeviceModel.php index f28693e290..5f74686795 100644 --- a/plugins/DevicesDetection/Columns/DeviceModel.php +++ b/plugins/DevicesDetection/Columns/DeviceModel.php @@ -45,6 +45,6 @@ class DeviceModel extends Base */ public function onAnyGoalConversion(Request $request, Visitor $visitor, $action) { - return $visitor->getVisitorColumn('config_device_model'); + return $visitor->getVisitorColumn($this->columnName); } } diff --git a/plugins/DevicesDetection/Columns/DeviceType.php b/plugins/DevicesDetection/Columns/DeviceType.php index 3cdf5a6ae5..6e18d7b3b0 100644 --- a/plugins/DevicesDetection/Columns/DeviceType.php +++ b/plugins/DevicesDetection/Columns/DeviceType.php @@ -11,7 +11,6 @@ namespace Piwik\Plugins\DevicesDetection\Columns; use Piwik\Piwik; use Piwik\Plugin\Segment; use Piwik\Tracker\Request; -use DeviceDetector; use Exception; use Piwik\Tracker\Visitor; use Piwik\Tracker\Action; @@ -70,6 +69,6 @@ class DeviceType extends Base */ public function onAnyGoalConversion(Request $request, Visitor $visitor, $action) { - return $visitor->getVisitorColumn('config_device_type'); + return $visitor->getVisitorColumn($this->columnName); } }
\ No newline at end of file diff --git a/plugins/DevicesDetection/tests/Fixtures/MultiDeviceGoalConversions.php b/plugins/DevicesDetection/tests/Fixtures/MultiDeviceGoalConversions.php new file mode 100644 index 0000000000..e5c1a597c5 --- /dev/null +++ b/plugins/DevicesDetection/tests/Fixtures/MultiDeviceGoalConversions.php @@ -0,0 +1,176 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ +namespace Piwik\Plugins\DevicesDetection\tests\Fixtures; + +use Piwik\Date; +use Piwik\Plugins\Goals\API; +use Piwik\Tests\Framework\Fixture; + +/** + * Fixture that adds one site with one goal and tracks some page views from different devices with some goal conversions + */ +class MultiDeviceGoalConversions extends Fixture +{ + public $dateTime = '2009-01-04 00:11:42'; + public $idSite = 1; + public $idGoal = 1; + + public function setUp() + { + $this->setUpWebsitesAndGoals(); + $this->trackSmartphoneVisits(); + $this->trackTabletVisits(); + $this->trackOtherVisits(); + } + + public function tearDown() + { + // empty + } + + private function setUpWebsitesAndGoals() + { + if (!self::siteCreated($idSite = 1)) { + self::createWebsite($this->dateTime, $ecommerce = 1); + } + + if (!self::goalExists($idSite = 1, $idGoal = 1)) { + API::getInstance()->addGoal( + $this->idSite, 'Goal 1 - Thank you', 'title', 'Thank you', 'contains', $caseSensitive = false, + $revenue = 10, $allowMultipleConversions = 1 + ); + } + } + + private function trackSmartphoneVisits() + { + // first visit (with conversion) + $t = self::getTracker($this->idSite, $this->dateTime, $defaultInit = true); + + $t->setUserAgent('Mozilla/5.0 (Linux; Android 4.2.2; HTC Butterfly Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Mobile Safari/537.36'); + + $t->setUrl('http://example.org/index.htm'); + self::checkResponse($t->doTrackPageView('0')); + + $t->setForceVisitDateTime($this->getAdjustedDateTime(0.3)); + + self::checkResponse($t->doTrackGoal($this->idGoal, $revenue = 42.256)); + + // second visit (without conversion) + $t = self::getTracker($this->idSite, $this->getAdjustedDateTime(0.2), $defaultInit = true); + + $t->setUserAgent('Mozilla/5.0 (Linux; Android 4.2.2; HTC Butterfly Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Mobile Safari/537.36'); + + $t->setUrl('http://example.org/anypage.php'); + self::checkResponse($t->doTrackPageView('mine')); + + + // third visit (with conversion) + $t = self::getTracker($this->idSite, $this->getAdjustedDateTime(0.2), $defaultInit = true); + + $t->setUserAgent('Mozilla/5.0 (iPhone; CPU iPhone OS 7_1 like Mac OS X) AppleWebKit/537.51.2 (KHTML, like Gecko) Mobile/11D167 iPhone6,1/N51AP Zite/2.6'); + + $t->setUrl('http://example.org/anypage.php'); + self::checkResponse($t->doTrackPageView('mine')); + + $t->setForceVisitDateTime($this->getAdjustedDateTime(1)); + + self::checkResponse($t->doTrackGoal($this->idGoal, $revenue = 0)); + } + + private function trackTabletVisits() + { + // first visit (with conversion) + $t = self::getTracker($this->idSite, $this->getAdjustedDateTime(1), $defaultInit = true); + + $t->setUserAgent('Mozilla/5.0 (iPad; CPU OS 6_0_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) CriOS/31.0.1650.18 Mobile/10A523 Safari/8536.25'); + + $t->setUrl('http://example.org/index.htm'); + self::checkResponse($t->doTrackPageView('0')); + + $t->setForceVisitDateTime($this->getAdjustedDateTime(1.6)); + + self::checkResponse($t->doTrackGoal($this->idGoal, $revenue = 42.256)); + + // second visit (without conversion) + $t = self::getTracker($this->idSite, $this->getAdjustedDateTime(0.6), $defaultInit = true); + + $t->setUserAgent('Mozilla/5.0 (Linux; Android 4.2.2; SM-T310 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.136 Safari/537.36'); + + $t->setUrl('http://example.org/index.htm'); + self::checkResponse($t->doTrackPageView('0')); + + + // third visit (with conversion) + $t = self::getTracker($this->idSite, $this->getAdjustedDateTime(1.6), $defaultInit = true); + + $t->setUserAgent('Mozilla/5.0 (Linux; U; Android 2.3;en-us; ViewSonic-ViewPad7e build/ERE27) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'); + + $t->setUrl('http://example.org/anypage.php'); + self::checkResponse($t->doTrackPageView('mine')); + + $t->setForceVisitDateTime($this->getAdjustedDateTime(1.9)); + + self::checkResponse($t->doTrackGoal($this->idGoal, $revenue = 0)); + } + + private function trackOtherVisits() + { + // unknown device visit (with conversion) + $t = self::getTracker($this->idSite, $this->getAdjustedDateTime(1), $defaultInit = true); + + $t->setUserAgent('not detectable'); + + $t->setUrl('http://example.org/anypage.php'); + self::checkResponse($t->doTrackPageView('mine')); + + $t->setForceVisitDateTime($this->getAdjustedDateTime(4)); + + self::checkResponse($t->doTrackGoal($this->idGoal, $revenue = 42.256)); + + // tv visit (without conversion) + $t = self::getTracker($this->idSite, $this->getAdjustedDateTime(3), $defaultInit = true); + + $t->setUserAgent('WebKit/3.7.6, (CE-HTML/1.0 NETTV/3.3.0 NewB) PHILIPS-AVM-2013/2.19 (Philips, BDP5600, wired)'); + + $t->setUrl('http://example.org/anypage.php'); + self::checkResponse($t->doTrackPageView('mine')); + + + // feature phone visit (with conversion) + $t = self::getTracker($this->idSite, $this->getAdjustedDateTime(4), $defaultInit = true); + + $t->setUserAgent('Fly_DS123/Q03C_MAUI_Browser/MIDP2.0 Configuration/CLDC-1.1'); + + $t->setUrl('http://example.org/index.htm'); + self::checkResponse($t->doTrackPageView('0')); + + $t->setForceVisitDateTime($this->getAdjustedDateTime(4.2)); + + self::checkResponse($t->doTrackGoal($this->idGoal, $revenue = 0)); + + + // desktop visit (with conversion) + $t = self::getTracker($this->idSite, $this->getAdjustedDateTime(1.6), $defaultInit = true); + + $t->setUserAgent('Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; Banca Caboto s.p.a.; rv:11.0) like Gecko'); + + $t->setUrl('http://example.org/index.htm'); + self::checkResponse($t->doTrackPageView('0')); + + $t->setForceVisitDateTime($this->getAdjustedDateTime(1.9)); + + self::checkResponse($t->doTrackGoal($this->idGoal, $revenue = 0)); + } + + + private function getAdjustedDateTime($addition) + { + return Date::factory($this->dateTime)->addHour($addition)->getDatetime(); + } +}
\ No newline at end of file diff --git a/plugins/DevicesDetection/tests/System/GoalReportForDevicesTest.php b/plugins/DevicesDetection/tests/System/GoalReportForDevicesTest.php new file mode 100644 index 0000000000..67024c1c7b --- /dev/null +++ b/plugins/DevicesDetection/tests/System/GoalReportForDevicesTest.php @@ -0,0 +1,53 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ +namespace Piwik\Plugins\DevicesDetection\tests\System; + +use Piwik\Plugins\DevicesDetection\tests\Fixtures\MultiDeviceGoalConversions; +use Piwik\Tests\Framework\TestCase\SystemTestCase; + +/** + * + * @group Plugins + * @group DevicesDetection + */ +class GoalReportForDevicesTest extends SystemTestCase +{ + public static $fixture = null; // initialized below class definition + + public static function getOutputPrefix() + { + return ''; + } + + public static function getPathToTestDirectory() + { + return dirname(__FILE__); + } + + public function getApiForTesting() + { + $idSite = self::$fixture->idSite; + $dateTime = self::$fixture->dateTime; + + return array( + array('DevicesDetection.getType', array('idSite' => $idSite, 'date' => $dateTime)), + array('DevicesDetection.getBrand', array('idSite' => $idSite, 'date' => $dateTime)), + array('DevicesDetection.getModel', array('idSite' => $idSite, 'date' => $dateTime)), + ); + } + + /** + * @dataProvider getApiForTesting + */ + public function testApi($api, $params) + { + $this->runApiTests($api, $params); + } +} + +GoalReportForDevicesTest::$fixture = new MultiDeviceGoalConversions();
\ No newline at end of file diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml new file mode 100644 index 0000000000..a225fdb0be --- /dev/null +++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Apple</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>4</nb_visits> + <nb_actions>2</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>4</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>52.26</revenue> + </row> + </goals> + <nb_conversions>2</nb_conversions> + <revenue>52.26</revenue> + <logo>plugins/DevicesDetection/images/brand/Apple.ico</logo> + <segment>deviceBrand==Apple</segment> + </row> + <row> + <label>Unknown</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>3</nb_visits> + <nb_actions>3</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>1808</sum_visit_length> + <bounce_count>3</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>3</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>62.26</revenue> + </row> + </goals> + <nb_conversions>3</nb_conversions> + <revenue>62.26</revenue> + <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> + <segment>deviceBrand==Unknown</segment> + </row> + <row> + <label>HTC</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <nb_users>0</nb_users> + <max_actions>2</max_actions> + <sum_visit_length>721</sum_visit_length> + <bounce_count>0</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>42.26</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>42.26</revenue> + <logo>plugins/DevicesDetection/images/brand/HTC.ico</logo> + <segment>deviceBrand==HTC</segment> + </row> + <row> + <label>Philips</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <logo>plugins/DevicesDetection/images/brand/Philips.ico</logo> + <segment>deviceBrand==Philips</segment> + </row> + <row> + <label>Samsung</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <logo>plugins/DevicesDetection/images/brand/Samsung.ico</logo> + <segment>deviceBrand==Samsung</segment> + </row> + <row> + <label>ViewSonic</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>1084</sum_visit_length> + <bounce_count>1</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>10</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>10</revenue> + <logo>plugins/DevicesDetection/images/brand/ViewSonic.ico</logo> + <segment>deviceBrand==ViewSonic</segment> + </row> +</result>
\ No newline at end of file diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml new file mode 100644 index 0000000000..3ed4a7857a --- /dev/null +++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Unknown</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>3</nb_visits> + <nb_actions>3</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>1808</sum_visit_length> + <bounce_count>3</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>3</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>62.26</revenue> + </row> + </goals> + <nb_conversions>3</nb_conversions> + <revenue>62.26</revenue> + </row> + <row> + <label>Apple - iPad</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>42.26</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>42.26</revenue> + </row> + <row> + <label>Apple - iPhone 5S</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>10</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>10</revenue> + </row> + <row> + <label>HTC - Butterfly</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <nb_users>0</nb_users> + <max_actions>2</max_actions> + <sum_visit_length>721</sum_visit_length> + <bounce_count>0</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>42.26</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>42.26</revenue> + </row> + <row> + <label>Philips - Blu-ray Player (BDP5600)</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + </row> + <row> + <label>Samsung - GALAXY Tab 3 8.0" WiFi</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + </row> + <row> + <label>ViewSonic - ViewPad 7e</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>1084</sum_visit_length> + <bounce_count>1</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>10</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>10</revenue> + </row> +</result>
\ No newline at end of file diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml new file mode 100644 index 0000000000..4f1c727203 --- /dev/null +++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml @@ -0,0 +1,141 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Tablet</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>4</nb_visits> + <nb_actions>3</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>1084</sum_visit_length> + <bounce_count>4</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>52.26</revenue> + </row> + </goals> + <nb_conversions>2</nb_conversions> + <revenue>52.26</revenue> + <segment>deviceType==tablet</segment> + <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> + </row> + <row> + <label>Smartphone</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>3</nb_visits> + <nb_actions>3</nb_actions> + <nb_users>0</nb_users> + <max_actions>2</max_actions> + <sum_visit_length>721</sum_visit_length> + <bounce_count>2</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>52.26</revenue> + </row> + </goals> + <nb_conversions>2</nb_conversions> + <revenue>52.26</revenue> + <segment>deviceType==smartphone</segment> + <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> + </row> + <row> + <label>Unknown</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>724</sum_visit_length> + <bounce_count>2</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>52.26</revenue> + </row> + </goals> + <nb_conversions>2</nb_conversions> + <revenue>52.26</revenue> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> + <row> + <label>Desktop</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>1084</sum_visit_length> + <bounce_count>1</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>10</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>10</revenue> + <segment>deviceType==desktop</segment> + <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> + </row> + <row> + <label>Tv</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <segment>deviceType==tv</segment> + <logo>plugins/DevicesDetection/images/screens/tv.png</logo> + </row> + <row> + <label>Camera</label> + <nb_visits>0</nb_visits> + <segment>deviceType==camera</segment> + <logo>plugins/DevicesDetection/images/screens/camera.png</logo> + </row> + <row> + <label>Car browser</label> + <nb_visits>0</nb_visits> + <segment>deviceType==car+browser</segment> + <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> + </row> + <row> + <label>Console</label> + <nb_visits>0</nb_visits> + <segment>deviceType==console</segment> + <logo>plugins/DevicesDetection/images/screens/console.gif</logo> + </row> + <row> + <label>Feature phone</label> + <nb_visits>0</nb_visits> + <segment>deviceType==feature+phone</segment> + <logo>plugins/DevicesDetection/images/screens/mobile.gif</logo> + </row> + <row> + <label>Phablet</label> + <nb_visits>0</nb_visits> + <segment>deviceType==phablet</segment> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> + <row> + <label>Portable media player</label> + <nb_visits>0</nb_visits> + <segment>deviceType==portable+media+player</segment> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> + <row> + <label>Smart display</label> + <nb_visits>0</nb_visits> + <segment>deviceType==smart+display</segment> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> +</result>
\ No newline at end of file diff --git a/plugins/Feedback/lang/ru.json b/plugins/Feedback/lang/ru.json index f77cb215ee..5fde100254 100644 --- a/plugins/Feedback/lang/ru.json +++ b/plugins/Feedback/lang/ru.json @@ -18,6 +18,15 @@ "ViewUserGuides": "Узнайте, как настроить Piwik и эффективно анализировать Ваши данные, используя %1$s руководства пользователя%2$s", "CommunityHelp": "Помощь сообщества", "ProfessionalHelp": "Помощь профессионала", + "ProfessionalServicesIntro": "Наша всемирная сеть профессиональных консультантов для технической поддержки клиентов Piwik, которые интегрируют Piwik в свою собственную инфраструктуру.", + "ProfessionalServicesOfferIntro": "Какими услугами вы можете воспользоваться?", + "ProfessionalServicesReviewPiwikSetup": "Аудит ваших настроек Piwik", + "ProfessionalServicesOptimizationMaintenance": "Услуги по оптимизации и техническому обслуживанию Piwik", + "ProfessionalServicesPhoneEmailSupport": "Поддержка по телефону и email.", + "ProfessionalServicesTraining": "Обучение пользователей, технических специалистов и разработчиков", + "ProfessionalServicesPremiumFeatures": "Премиальные особенности", + "ProfessionalServicesCustomDevelopment": "Индивидуальные услуги по разработке", + "ProfessionalServicesAnalystConsulting": "Консультации аналитиков", "ContactUs": "Свяжитесь с нами", "VisitTheForums": "Посетите %1$s Форумы%2$s и получите помощь от сообщества пользователей Piwik" } diff --git a/plugins/Goals/Pages.php b/plugins/Goals/Pages.php index 7366ebbd9e..7ec50e7e28 100644 --- a/plugins/Goals/Pages.php +++ b/plugins/Goals/Pages.php @@ -46,7 +46,7 @@ class Pages $config->forceViewDataTable(Evolution::ID); $config->setSubcategoryId($subcategory); $config->setAction('getEvolutionGraph'); - $config->setOrder(++$this->orderId); + $config->setOrder(5); $config->setIsNotWidgetizable(); $widgets[] = $config; @@ -54,7 +54,7 @@ class Pages $config->forceViewDataTable(Sparklines::ID); $config->setSubcategoryId($subcategory); $config->setName(''); - $config->setOrder(++$this->orderId); + $config->setOrder(15); $config->setIsNotWidgetizable(); $widgets[] = $config; @@ -67,7 +67,7 @@ class Pages $config->setSubcategoryId($subcategory); $config->forceViewDataTable(Sparklines::ID); $config->setParameters(array('idGoal' => $goal['idgoal'])); - $config->setOrder(++$this->orderId); + $config->setOrder(25); $config->setIsNotWidgetizable(); $config->addParameters(array('allow_multiple' => (int) $goal['allow_multiple'], 'only_summary' => '1')); $widgets[] = $config; @@ -78,7 +78,7 @@ class Pages $config = $this->factory->createContainerWidget('Goals'); $config->setSubcategoryId($subcategory); $config->setName('Goals_ConversionsOverviewBy'); - $config->setOrder(++$this->orderId); + $config->setOrder(35); $config->setIsNotWidgetizable(); $this->buildGoalByDimensionView('', $config); $config->setMiddlewareParameters(array( @@ -104,7 +104,7 @@ class Pages $config->setCategoryId($category); $config->setSubcategoryId($subcategory); $config->setAction('getEvolutionGraph'); - $config->setOrder(++$this->orderId); + $config->setOrder(5); $config->setIsNotWidgetizable(); $config->setParameters(array('idGoal' => $idGoal)); $widgets[] = $config; @@ -117,7 +117,7 @@ class Pages $config->setModule('Ecommerce'); $config->setAction('getSparklines'); $config->setParameters(array('idGoal' => $idGoal)); - $config->setOrder(++$this->orderId); + $config->setOrder(15); $config->setIsNotWidgetizable(); $widgets[] = $config; @@ -127,7 +127,7 @@ class Pages $config->setSubcategoryId($idGoal); $config->setName('Goals_ConversionsOverview'); $config->setParameters(array('idGoal' => $idGoal)); - $config->setOrder(++$this->orderId); + $config->setOrder(25); $config->setIsNotWidgetizable(); $config->setMiddlewareParameters(array( 'module' => 'Goals', @@ -154,7 +154,7 @@ class Pages $config->setSubcategoryId($subcategory); $config->setName(''); $config->setParameters(array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER)); - $config->setOrder(++$this->orderId); + $config->setOrder(5); $config->setIsNotWidgetizable(); $this->buildGoalByDimensionView(Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER, $config); @@ -178,7 +178,7 @@ class Pages $config->forceViewDataTable(Evolution::ID); $config->setAction('getEvolutionGraph'); $config->setParameters($params); - $config->setOrder(++$this->orderId); + $config->setOrder(5); $config->setIsNotWidgetizable(); $widgets[] = $config; @@ -188,8 +188,7 @@ class Pages $config->forceViewDataTable(Sparklines::ID); $config->setParameters($params); $config->addParameters(array('allow_multiple' => (int) $goal['allow_multiple'])); - $config->setOrder(++$this->orderId); - $config->setIsNotWidgetizable(); + $config->setOrder(15); $config->setIsNotWidgetizable(); $widgets[] = $config; @@ -198,7 +197,7 @@ class Pages $config->setSubcategoryId($idGoal); $config->setName('Goals_ConversionsOverview'); $config->setParameters($params); - $config->setOrder(++$this->orderId); + $config->setOrder(25); $config->setIsNotWidgetizable(); $config->setMiddlewareParameters(array( 'module' => 'Goals', @@ -215,7 +214,7 @@ class Pages $config->setName(Piwik::translate('Goals_GoalConversionsBy', array($name))); $config->setSubcategoryId($idGoal); $config->setParameters(array()); - $config->setOrder(++$this->orderId); + $config->setOrder(35); $config->setIsNotWidgetizable(); $config->setMiddlewareParameters(array( 'module' => 'Goals', diff --git a/plugins/Goals/angularjs/manage-goals/manage-goals.controller.js b/plugins/Goals/angularjs/manage-goals/manage-goals.controller.js index 3f0c4bfa8a..c2eb80eca1 100644 --- a/plugins/Goals/angularjs/manage-goals/manage-goals.controller.js +++ b/plugins/Goals/angularjs/manage-goals/manage-goals.controller.js @@ -7,9 +7,9 @@ (function () { angular.module('piwikApp').controller('ManageGoalsController', ManageGoalsController); - ManageGoalsController.$inject = ['piwik', 'piwikApi', '$timeout', '$location', 'reportingMenuModel']; + ManageGoalsController.$inject = ['piwik', 'piwikApi', '$timeout', '$location', 'reportingMenuModel', '$rootScope']; - function ManageGoalsController(piwik, piwikApi, $timeout, $location, reportingMenuModel) { + function ManageGoalsController(piwik, piwikApi, $timeout, $location, reportingMenuModel, $rootScope) { // remember to keep controller very simple. Create a service/factory (model) if needed var self = this; @@ -29,6 +29,8 @@ function initGoalForm(goalMethodAPI, submitText, goalName, description, matchAttribute, pattern, patternType, caseSensitive, revenue, allowMultiple, goalId) { + $rootScope.$emit('Goals.beforeInitGoalForm', goalMethodAPI, goalId); + self.goal = {}; self.goal.name = goalName; self.goal.description = description; @@ -100,6 +102,19 @@ parameters.idGoal = this.goal.goalId; parameters.method = this.goal.apiMethod; + var isCreate = parameters.method === 'Goals.addGoal'; + var isUpdate = parameters.method === 'Goals.updateGoal'; + + if (isUpdate) { + $rootScope.$emit('Goals.beforeUpdateGoal', parameters, piwikApi); + } else if (isCreate) { + $rootScope.$emit('Goals.beforeAddGoal', parameters, piwikApi); + } + + if (parameters && 'undefined' !== typeof parameters.cancelRequest && parameters.cancelRequest) { + return; + } + this.isLoading = true; piwikApi.fetch(parameters).then(function () { @@ -129,6 +144,8 @@ } this.showListOfReports = function (shouldScrollToTop) { + $rootScope.$emit('Goals.cancelForm'); + this.showGoalList = true; this.showEditGoal = false; scrollToTop(); diff --git a/plugins/Goals/lang/ru.json b/plugins/Goals/lang/ru.json index 1be3af16ea..cf5834f77d 100644 --- a/plugins/Goals/lang/ru.json +++ b/plugins/Goals/lang/ru.json @@ -14,6 +14,7 @@ "CategoryTextGeneral_Visitors": "Местоположение пользователя", "CategoryTextReferrers_Referrers": "Источники", "CategoryTextVisitsSummary_VisitsSummary": "Свойство пользователя", + "CategoryTextDevicesDetection_DevicesDetection": "Устройства", "CategoryTextGeneral_Visit": "Вовлеченность", "ClickOutlink": "Переходят по ссылке на внешний сайт", "SendEvent": "Отправляют событие", @@ -35,6 +36,7 @@ "ConversionByTypeReportDocumentation": "Этот отчет сожержит детальную информацию о целях (конверсия, процент конверсии и прибыль за посещение) по каждой доступной в левой панели категории. %1$s Пожалуйста, кликните на одну из категорий, чтобы увидеть детальный отчет. %2$s Больше информации в %3$sОтслеживании целей на piwik.org%4$s", "ConversionRate": "%s коэффициент конверсий", "Conversions": "%s конверсий", + "ConversionsDescription": "конверсии", "ConversionsOverview": "Обзор переходов", "ConversionsOverviewBy": "Обзор конверсий по типам посещения", "DaysToConv": "Конверсия по дням", @@ -78,6 +80,8 @@ "NoConversionsNoReportsMessage": "Отчеты не показаны, потому что данные преобразования для выбранных цели и периода отсутсвуют.", "NeedAccess": "Только Администратор или пользователь с доступом Суперпользователя может управлять целями для данного вебсайта.", "Optional": "(необязательно)", + "OverallConversionRate": "общий коэффициент конверсии (визиты с завершенной целью)", + "OverallRevenue": "общий доход", "PageTitle": "Заголовок страницы", "Pattern": "Шаблон", "PluginDescription": "Создайте Цели и смотрите детальные отчёты о целевых конверсиях: изменение по времени, доход от визита, конверсии со ссылки, с ключевого слова и др.", @@ -98,6 +102,7 @@ "VisitUrl": "Посещают данный URL (страницу или группу страниц)", "WhenVisitors": "посетители", "WhereThe": "где", + "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "Посещенные страницы должны содержать вызовы метода JavaScript 'trackGoal' (%1$sузнать больше%2$s)", "YouCanEnableEcommerceReports": "Вы можете активировать %1$s для этого сайта на странице %2$s." } }
\ No newline at end of file diff --git a/plugins/Goals/templates/_formAddGoal.twig b/plugins/Goals/templates/_formAddGoal.twig index 6b72514f34..9505ac1898 100644 --- a/plugins/Goals/templates/_formAddGoal.twig +++ b/plugins/Goals/templates/_formAddGoal.twig @@ -139,6 +139,8 @@ inline-help="{{ 'Goals_DefaultRevenueHelp'|translate|e('html_attr') }}"> </div> + {{ postEvent("Template.endGoalEditTable") }} + <input type="hidden" name="goalIdUpdate" value=""/> <div piwik-save-button saving="manageGoals.isLoading" diff --git a/plugins/Goals/templates/_listGoalEdit.twig b/plugins/Goals/templates/_listGoalEdit.twig index aab0b77ca0..4496f4fef6 100644 --- a/plugins/Goals/templates/_listGoalEdit.twig +++ b/plugins/Goals/templates/_listGoalEdit.twig @@ -28,6 +28,7 @@ <th>{{ 'General_Description'|translate }}</th> <th>{{ 'Goals_GoalIsTriggeredWhen'|translate }}</th> <th>{{ 'General_ColumnRevenue'|translate }}</th> + {{ postEvent("Template.beforeGoalListActionsHead") }} {% if userCanEditGoals %} <th>{{ 'General_Edit'|translate }}</th> <th>{{ 'General_Delete'|translate }}</th> @@ -44,7 +45,7 @@ </tr> {% else %} {% for goal in goals %} - <tr> + <tr id="{{ goal.idgoal }}"> <td class="first">{{ goal.idgoal }}</td> <td>{{ goal.name }}</td> <td>{{ goal.description }}</td> @@ -57,6 +58,7 @@ <td class="center"> {% if goal.revenue==0 %}-{% else %}{{ goal.revenue|money(idSite)|raw }}{% endif %} </td> + {{ postEvent("Template.beforeGoalListActionsBody", goal) }} {% if userCanEditGoals %} <td style="padding-top:2px"> <button ng-click="manageGoals.editGoal({{ goal.idgoal }})" class="table-action" title="{{ 'General_Edit'|translate }}"> diff --git a/plugins/Installation/ServerFilesGenerator.php b/plugins/Installation/ServerFilesGenerator.php index 91ada4e2ec..c3eab335f6 100644 --- a/plugins/Installation/ServerFilesGenerator.php +++ b/plugins/Installation/ServerFilesGenerator.php @@ -34,10 +34,12 @@ class ServerFilesGenerator $allow = self::getAllowHtaccessContent(); // more selective allow/deny filters + $noDirectoryListing = "Options -Indexes\n"; + $allowAny = "# Allow any file in this directory\n" . "<Files \"*\">\n" . - $allow . "\n" . + $allow . "\n" . "</Files>\n"; $allowStaticAssets = @@ -49,15 +51,15 @@ class ServerFilesGenerator "# Allow to serve static files which are safe\n" . "<Files ~ \"\\.(gif|ico|jpg|png|svg|js|css|htm|html|swf|mp3|mp4|wav|ogg|avi|ttf|eot|woff|woff2|json)$\">\n" . - $allow . "\n" . + $allow . "\n" . "</Files>\n"; $directoriesToProtect = array( - '/js' => $allowAny, - '/libs' => $denyAll . $allowStaticAssets, - '/vendor' => $denyAll . $allowStaticAssets, - '/plugins' => $denyAll . $allowStaticAssets, - '/misc/user' => $denyAll . $allowStaticAssets, + '/js' => $allowAny . $noDirectoryListing, + '/libs' => $denyAll . $allowStaticAssets . $noDirectoryListing, + '/vendor' => $denyAll . $allowStaticAssets . $noDirectoryListing, + '/plugins' => $denyAll . $allowStaticAssets . $noDirectoryListing, + '/misc/user' => $denyAll . $allowStaticAssets . $noDirectoryListing, ); foreach ($directoriesToProtect as $directoryToProtect => $content) { self::createHtAccess(PIWIK_INCLUDE_PATH . $directoryToProtect, $overwrite = true, $content); @@ -65,10 +67,10 @@ class ServerFilesGenerator // deny access to these folders $directoriesToProtect = array( - '/config' => $denyAll, - '/core' => $denyAll, - '/lang' => $denyAll, - '/tmp' => $denyAll, + '/config' => $denyAll . $noDirectoryListing, + '/core' => $denyAll . $noDirectoryListing, + '/lang' => $denyAll . $noDirectoryListing, + '/tmp' => $denyAll . $noDirectoryListing, ); foreach ($directoriesToProtect as $directoryToProtect => $content) { self::createHtAccess(PIWIK_INCLUDE_PATH . $directoryToProtect, $overwrite = true, $content); diff --git a/plugins/Installation/lang/ru.json b/plugins/Installation/lang/ru.json index 1fefc27866..8ed63da012 100644 --- a/plugins/Installation/lang/ru.json +++ b/plugins/Installation/lang/ru.json @@ -46,6 +46,7 @@ "PercentDone": "%s %% Завершено", "ProfessionalServicesAdTitle": "Продвинутая аналитика и сервисы", "ProfessionalServicesfessionalServicesAdText": "Наши эксперты могут помочь вашей организации показать всю мощь аналитики Piwik.", + "ProfessionalServicesfessionalDiscoverHow": "Узнать подробнее о %1$sдополнительных продуктах и услугах%2$s для Piwik и как увеличить вашу конверсию и общий доход.", "PleaseFixTheFollowingErrors": "Пожалуйста, исправьте следующие ошибки", "DefaultSettings": "Настройки Piwik по умолчанию", "DefaultSettingsHelp": "Piwik поставляется с настройками по умолчанию. Вы можете настроить их сейчас или сделать это позже в настройках администратора.", @@ -53,6 +54,7 @@ "RestartWebServer": "После этих изменений перезапустите браузер.", "ReusingTables": "Переиспользование таблиц", "PiwikOrgNewsletter": "послать мне email о новых обновления Piwik community", + "ProfessionalServicesNewsletter": "пришлите мне информацию о %1$sпрофессиональных услугах и продуктах%2$s для Piwik", "SeeBelowForMoreInfo": "Смотрите ниже для получения дополнительной информации.", "SetupWebsite": "Добавить сайт", "SetupWebsiteError": "Возникла ошибка при добавлении сайта", diff --git a/plugins/Intl/lang/am.json b/plugins/Intl/lang/am.json index e6fc689e52..4ea641a511 100644 --- a/plugins/Intl/lang/am.json +++ b/plugins/Intl/lang/am.json @@ -9,7 +9,7 @@ "Continent_eur": "አውሮፓ", "Continent_oce": "ኦሽኒአ", "Country_AD": "አንዶራ", - "Country_AE": "የተባበሩት አረብ ኤምሬትስ", + "Country_AE": "የተባበሩት ዓረብ ኤምሬትስ", "Country_AF": "አፍጋኒስታን", "Country_AG": "አንቲጓ እና ባሩዳ", "Country_AI": "አንጉኢላ", @@ -102,7 +102,7 @@ "Country_GU": "ጉዋም", "Country_GW": "ጊኒ ቢሳኦ", "Country_GY": "ጉያና", - "Country_HK": "ሆንግ ኮንግ SAR ቻይና", + "Country_HK": "ሆንግ ኮንግ ልዩ የአስተዳደር ክልል ቻይና", "Country_HM": "ኽርድ ደሴቶችና ማክዶናልድ ደሴቶች", "Country_HN": "ሆንዱራስ", "Country_HR": "ክሮኤሽያ", @@ -360,13 +360,14 @@ "Language_et": "ኢስቶኒያንኛ", "Language_eu": "ባስክኛ", "Language_fa": "ፐርሺያኛ", + "Language_ff": "ፉላህ", "Language_fi": "ፊኒሽ", "Language_fj": "ፊጂኛ", "Language_fo": "ፋሮኛ", "Language_fr": "ፈረንሳይኛ", "Language_fy": "የምዕራብ ፍሪስኛ", "Language_ga": "አይሪሽ", - "Language_gd": "እስኮትስ ጌልክኛ", + "Language_gd": "የስኮቲሽ ጌልክኛ", "Language_gl": "ጋሊሺያ", "Language_gn": "ጓራኒኛ", "Language_gu": "ጉጃርቲኛ", @@ -378,12 +379,14 @@ "Language_ht": "ሃይትኛ", "Language_hu": "ሀንጋሪኛ", "Language_hy": "አርመናዊ", + "Language_hz": "ሄሬሮ", "Language_ia": "ኢንቴርሊንጓ", "Language_id": "ኢንዶኔዥኛ", "Language_ie": "እንተርሊንግወ", "Language_ig": "ኢግቦኛ", "Language_ii": "ሲቹንዪኛ", "Language_ik": "እኑፒያቅኛ", + "Language_io": "ኢዶ", "Language_is": "አይስላንድኛ", "Language_it": "ጣሊያንኛ", "Language_iu": "እኑክቲቱትኛ", @@ -392,25 +395,30 @@ "Language_ka": "ጆርጂያን", "Language_kg": "ኮንጎኛ", "Language_ki": "ኪኩዩ", + "Language_kj": "ኩንያማ", "Language_kk": "ካዛክኛ", "Language_kl": "ካላሊሱትኛ", - "Language_km": "ክመርኛ ማእከላዊ", + "Language_km": "ክህመርኛ", "Language_kn": "ካናዳኛ", "Language_ko": "ኮሪያኛ", + "Language_kr": "ካኑሪ", "Language_ks": "ካሽሚርኛ", "Language_ku": "ኩርድሽኛ", + "Language_kv": "ኮሚ", "Language_kw": "ኮርኒሽ", "Language_ky": "ኪርጊዝኛ", "Language_la": "ላቲንኛ", "Language_lb": "ሉክዘምበርገርኛ", "Language_lg": "ጋንዳኛ", + "Language_li": "ሊምቡርጊሽ", "Language_ln": "ሊንጋላኛ", - "Language_lo": "ላውስኛ", + "Language_lo": "ላኦስኛ", "Language_lt": "ሉቴንያንኛ", "Language_lu": "ሉባ ካታንጋ", "Language_lv": "ላትቪያን", "Language_mg": "ማላጋስኛ", - "Language_mi": "ማዮሪኛ", + "Language_mh": "ማርሻሌዝኛ", + "Language_mi": "ማኦሪኛ", "Language_mk": "ማሴዶንኛ", "Language_ml": "ማላያላምኛ", "Language_mn": "ሞንጎላዊኛ", @@ -422,13 +430,16 @@ "Language_nb": "የኖርዌይ ቦክማል", "Language_nd": "ሰሜን ንዴብሌ", "Language_ne": "ኔፓሊኛ", + "Language_ng": "ንዶንጋ", "Language_nl": "ደች", "Language_nn": "የኖርዌይ ናይኖርስክ", "Language_no": "ኖርዌጂያን", + "Language_nr": "ደቡብ ንደቤሌ", + "Language_nv": "ናቫጆ", "Language_ny": "ንያንጃ", "Language_oc": "ኦኪታንኛ", "Language_om": "ኦሮሞኛ", - "Language_or": "ኦሪያኛ", + "Language_or": "ኦዲያኛ", "Language_os": "ኦሴቲክ", "Language_pa": "ፑንጃብኛ", "Language_pl": "ፖሊሽኛ", @@ -441,6 +452,7 @@ "Language_ru": "ራሽያኛ", "Language_rw": "ኪንያርዋንድኛ", "Language_sa": "ሳንስክሪትኛ", + "Language_sc": "ሳርዲንያንኛ", "Language_sd": "ሲንድሂኛ", "Language_se": "ሰሜናዊ ሳሚ", "Language_sg": "ሳንጎኛ", @@ -450,10 +462,10 @@ "Language_sm": "ሳሞአኛ", "Language_sn": "ሾናኛ", "Language_so": "ሱማልኛ", - "Language_sq": "ልቤኒኛ", + "Language_sq": "አልባንያንኛ", "Language_sr": "ሰርቢኛ", "Language_ss": "ስዋቲኛ", - "Language_st": "ሶዞኛ", + "Language_st": "ደቡባዊ ሶቶ", "Language_su": "ሱዳንኛ", "Language_sv": "ስዊድንኛ", "Language_sw": "ስዋሂሊኛ", @@ -462,7 +474,7 @@ "Language_tg": "ታጂኪኛ", "Language_th": "ታይኛ", "Language_ti": "ትግርኛ", - "Language_tk": "ቱርክመንኛ", + "Language_tk": "ቱርክሜንኛ", "Language_tl": "ታጋሎገኛ", "Language_tn": "ጽዋናዊኛ", "Language_to": "ቶንጋኛ", @@ -476,8 +488,9 @@ "Language_ur": "ኡርዱኛ", "Language_uz": "ኡዝቤክኛ", "Language_ve": "ቬንዳ", - "Language_vi": "ቪትናምኛ", + "Language_vi": "ቪየትናምኛ", "Language_vo": "ቮላፑክኛ", + "Language_wa": "ዋሎን", "Language_wo": "ዎሎፍኛ", "Language_xh": "ዞሳኛ", "Language_yi": "ይዲሽኛ", diff --git a/plugins/Intl/lang/ar.json b/plugins/Intl/lang/ar.json index be7becbd50..c82d41c5be 100644 --- a/plugins/Intl/lang/ar.json +++ b/plugins/Intl/lang/ar.json @@ -26,7 +26,7 @@ "Country_AZ": "أذربيجان", "Country_BA": "البوسنة والهرسك", "Country_BB": "بربادوس", - "Country_BD": "بنجلاديش", + "Country_BD": "بنغلاديش", "Country_BE": "بلجيكا", "Country_BF": "بوركينا فاسو", "Country_BG": "بلغاريا", @@ -68,7 +68,7 @@ "Country_DJ": "جيبوتي", "Country_DK": "الدانمرك", "Country_DM": "دومينيكا", - "Country_DO": "جمهورية الدومينيك", + "Country_DO": "جمهورية الدومينيكان", "Country_DZ": "الجزائر", "Country_EC": "الإكوادور", "Country_EE": "إستونيا", @@ -83,7 +83,7 @@ "Country_FM": "ميكرونيزيا", "Country_FO": "جزر فارو", "Country_FR": "فرنسا", - "Country_GA": "الجابون", + "Country_GA": "الغابون", "Country_GB": "المملكة المتحدة", "Country_GD": "غرينادا", "Country_GE": "جورجيا", @@ -95,7 +95,7 @@ "Country_GM": "غامبيا", "Country_GN": "غينيا", "Country_GP": "غوادلوب", - "Country_GQ": "غينيا الإستوائية", + "Country_GQ": "غينيا الاستوائية", "Country_GR": "اليونان", "Country_GS": "جورجيا الجنوبية وجزر ساندويتش الجنوبية", "Country_GT": "غواتيمالا", @@ -123,7 +123,7 @@ "Country_JO": "الأردن", "Country_JP": "اليابان", "Country_KE": "كينيا", - "Country_KG": "قرغيزستان", + "Country_KG": "قيرغيزستان", "Country_KH": "كمبوديا", "Country_KI": "كيريباتي", "Country_KM": "جزر القمر", @@ -131,7 +131,7 @@ "Country_KP": "كوريا الشمالية", "Country_KR": "كوريا الجنوبية", "Country_KW": "الكويت", - "Country_KY": "جزر الكايمن", + "Country_KY": "جزر كايمان", "Country_KZ": "كازاخستان", "Country_LA": "لاوس", "Country_LB": "لبنان", @@ -146,18 +146,18 @@ "Country_LY": "ليبيا", "Country_MA": "المغرب", "Country_MC": "موناكو", - "Country_MD": "مولدافيا", + "Country_MD": "مولدوفا", "Country_ME": "الجبل الأسود", "Country_MF": "سانت مارتن", "Country_MG": "مدغشقر", - "Country_MH": "جزر المارشال", + "Country_MH": "جزر مارشال", "Country_MK": "مقدونيا", "Country_ML": "مالي", - "Country_MM": "ميانمار -بورما", + "Country_MM": "ميانمار (بورما)", "Country_MN": "منغوليا", "Country_MO": "مكاو الصينية (منطقة إدارية خاصة)", "Country_MP": "جزر ماريانا الشمالية", - "Country_MQ": "مارتينيك", + "Country_MQ": "جزر المارتينيك", "Country_MR": "موريتانيا", "Country_MS": "مونتسرات", "Country_MT": "مالطا", @@ -170,7 +170,7 @@ "Country_NA": "ناميبيا", "Country_NC": "كاليدونيا الجديدة", "Country_NE": "النيجر", - "Country_NF": "جزيرة نورفوك", + "Country_NF": "جزيرة نورفولك", "Country_NG": "نيجيريا", "Country_NI": "نيكاراغوا", "Country_NL": "هولندا", @@ -206,7 +206,7 @@ "Country_SD": "السودان", "Country_SE": "السويد", "Country_SG": "سنغافورة", - "Country_SH": "سانت هيلنا", + "Country_SH": "سانت هيلانة", "Country_SI": "سلوفينيا", "Country_SJ": "سفالبارد وجان مايان", "Country_SK": "سلوفاكيا", @@ -228,7 +228,7 @@ "Country_TH": "تايلاند", "Country_TJ": "طاجيكستان", "Country_TK": "توكيلو", - "Country_TL": "تيمور الشرقية", + "Country_TL": "تيمور- ليشتي", "Country_TM": "تركمانستان", "Country_TN": "تونس", "Country_TO": "تونغا", @@ -244,10 +244,10 @@ "Country_UY": "أورغواي", "Country_UZ": "أوزبكستان", "Country_VA": "الفاتيكان", - "Country_VC": "سانت فنسنت وغرنادين", + "Country_VC": "سانت فنسنت وجزر غرينادين", "Country_VE": "فنزويلا", - "Country_VG": "جزر فرجين البريطانية", - "Country_VI": "جزر فرجين الأمريكية", + "Country_VG": "جزر فيرجن البريطانية", + "Country_VI": "جزر فيرجن التابعة للولايات المتحدة", "Country_VN": "فيتنام", "Country_VU": "فانواتو", "Country_WF": "جزر والس وفوتونا", @@ -347,7 +347,7 @@ "Language_cs": "التشيكية", "Language_cu": "سلافية كنسية", "Language_cv": "التشوفاشي", - "Language_cy": "الولزية", + "Language_cy": "الويلزية", "Language_da": "الدانماركية", "Language_de": "الألمانية", "Language_dv": "المالديفية", @@ -360,16 +360,16 @@ "Language_et": "الإستونية", "Language_eu": "لغة الباسك", "Language_fa": "الفارسية", - "Language_ff": "الفلة", + "Language_ff": "الفولانية", "Language_fi": "الفنلندية", "Language_fj": "الفيجية", - "Language_fo": "الفارويز", + "Language_fo": "الفاروية", "Language_fr": "الفرنسية", "Language_fy": "الفريزيان", "Language_ga": "الأيرلندية", "Language_gd": "الغيلية الأسكتلندية", "Language_gl": "الجاليكية", - "Language_gn": "الجواراني", + "Language_gn": "الغوارانية", "Language_gu": "الغوجاراتية", "Language_gv": "المنكية", "Language_ha": "الهوسا", @@ -377,7 +377,7 @@ "Language_hi": "الهندية", "Language_ho": "الهيري موتو", "Language_hr": "الكرواتية", - "Language_ht": "الهايتية", + "Language_ht": "الكريولية الهايتية", "Language_hu": "الهنغارية", "Language_hy": "الأرمينية", "Language_hz": "الهيريرو", @@ -388,7 +388,7 @@ "Language_ii": "السيتشيون يي", "Language_ik": "الإينبياك", "Language_io": "الإيدو", - "Language_is": "الأيسلاندية", + "Language_is": "الأيسلندية", "Language_it": "الإيطالية", "Language_iu": "الإينكتيتت", "Language_ja": "اليابانية", @@ -407,41 +407,41 @@ "Language_ku": "الكردية", "Language_kv": "الكومي", "Language_kw": "الكورنية", - "Language_ky": "القرغيزية", + "Language_ky": "القيرغيزية", "Language_la": "اللاتينية", - "Language_lb": "اللوكسمبرجية", + "Language_lb": "اللكسمبورغية", "Language_lg": "الجاندا", "Language_li": "الليمبرجيشية", "Language_ln": "اللينجالا", "Language_lo": "اللاوية", - "Language_lt": "اللتوانية", + "Language_lt": "الليتوانية", "Language_lu": "اللبا-كاتانجا", "Language_lv": "اللاتفية", "Language_mg": "المالاجاشية", "Language_mh": "المارشالية", "Language_mi": "الماورية", "Language_mk": "المقدونية", - "Language_ml": "الماليالام", + "Language_ml": "المالايالامية", "Language_mn": "المنغولية", - "Language_mr": "الماراثي", - "Language_ms": "لغة الملايو", + "Language_mr": "الماراثية", + "Language_ms": "الماليزية", "Language_mt": "المالطية", "Language_my": "البورمية", "Language_na": "النورو", - "Language_nb": "البوكمالية النرويجية", - "Language_nd": "النديبيل الشمالي", + "Language_nb": "النرويجية بوكمال", + "Language_nd": "النديبيل الشمالية", "Language_ne": "النيبالية", "Language_ng": "الندونجا", "Language_nl": "الهولندية", - "Language_nn": "النينورسك النرويجي", + "Language_nn": "النرويجية نينورسك", "Language_no": "النرويجية", "Language_nr": "النديبيل الجنوبي", "Language_nv": "النافاجو", "Language_ny": "النيانجا", "Language_oc": "الأوكيتانية", "Language_oj": "الأوجيبوا", - "Language_om": "الأورومو", - "Language_or": "الأورييا", + "Language_om": "الأورومية", + "Language_or": "اللغة الأورية", "Language_os": "الأوسيتيك", "Language_pa": "البنجابية", "Language_pi": "البالية", @@ -457,7 +457,7 @@ "Language_sa": "السنسكريتية", "Language_sc": "السردينية", "Language_sd": "السندية", - "Language_se": "السامي الشمالي", + "Language_se": "السامي الشمالية", "Language_sg": "السانجو", "Language_si": "السنهالية", "Language_sk": "السلوفاكية", @@ -473,7 +473,7 @@ "Language_sv": "السويدية", "Language_sw": "السواحلية", "Language_ta": "التاميلية", - "Language_te": "التيلجو", + "Language_te": "التيلوجو", "Language_tg": "الطاجيكية", "Language_th": "التايلاندية", "Language_ti": "التغرينية", @@ -483,18 +483,18 @@ "Language_to": "التونغية", "Language_tr": "التركية", "Language_ts": "السونجا", - "Language_tt": "التتارية", + "Language_tt": "التترية", "Language_tw": "التوي", "Language_ty": "التاهيتية", - "Language_ug": "الأغورية", + "Language_ug": "الأويغورية", "Language_uk": "الأوكرانية", - "Language_ur": "الأردية", + "Language_ur": "الأوردية", "Language_uz": "الأوزبكية", "Language_ve": "الفيندا", "Language_vi": "الفيتنامية", "Language_vo": "لغة الفولابوك", "Language_wa": "الولونية", - "Language_wo": "الولوف", + "Language_wo": "الولوفية", "Language_xh": "الخوسا", "Language_yi": "اليديشية", "Language_yo": "اليوروبية", @@ -557,14 +557,14 @@ "NMinutesShort": "%s د", "NSeconds": "%s ثانية", "NSecondsShort": "%s ث", - "NumberFormatCurrency": "¤ #,##0.00", + "NumberFormatCurrency": "#,##0.00 ¤", "NumberFormatNumber": "#,##0.###", - "NumberFormatPercent": "#,##0%", + "NumberFormatPercent": "#,##0 %", "NumberSymbolDecimal": "٫", "NumberSymbolGroup": "٬", - "NumberSymbolMinus": "-", - "NumberSymbolPercent": "٪", - "NumberSymbolPlus": "+", + "NumberSymbolMinus": "-", + "NumberSymbolPercent": "٪", + "NumberSymbolPlus": "+", "OneDay": "يوم", "OneMinute": "دقيقة", "OneMinuteShort": "1 د", diff --git a/plugins/Intl/lang/be.json b/plugins/Intl/lang/be.json index c5b8f8c826..49eaf85f47 100644 --- a/plugins/Intl/lang/be.json +++ b/plugins/Intl/lang/be.json @@ -46,10 +46,10 @@ "Country_BY": "Беларусь", "Country_BZ": "Беліз", "Country_CA": "Канада", - "Country_CC": "Какосавыя астравы", + "Country_CC": "Какосавыя (Кілінг) астравы", "Country_CD": "Конга (Кіншаса)", - "Country_CF": "Цэнтральна-Афрыканская Рэспубліка", - "Country_CG": "Конга (Бразавіль)", + "Country_CF": "Цэнтральнаафрыканская Рэспубліка", + "Country_CG": "Конга - Бразавіль", "Country_CH": "Швейцарыя", "Country_CI": "Кот-д’Івуар", "Country_CK": "Астравы Кука", @@ -60,8 +60,8 @@ "Country_CR": "Коста-Рыка", "Country_CU": "Куба", "Country_CV": "Каба-Вердэ", - "Country_CW": "Востраў Кюрасаа", - "Country_CX": "Востраў Раства", + "Country_CW": "Кюрасаа", + "Country_CX": "Востраў Каляд", "Country_CY": "Кіпр", "Country_CZ": "Чэхія", "Country_DE": "Германія", @@ -88,7 +88,7 @@ "Country_GD": "Грэнада", "Country_GE": "Грузія", "Country_GF": "Французская Гвіяна", - "Country_GG": "Востраў Гернсі", + "Country_GG": "Гернсі", "Country_GH": "Гана", "Country_GI": "Гібралтар", "Country_GL": "Грэнландыя", @@ -103,7 +103,7 @@ "Country_GW": "Гвінея-Бісау", "Country_GY": "Гаяна", "Country_HK": "Ганконг, САР (Кітай)", - "Country_HM": "Востраў Херд і астравы Макдональд", + "Country_HM": "Астравы Херд і Макдональд", "Country_HN": "Гандурас", "Country_HR": "Харватыя", "Country_HT": "Гаіці", @@ -118,7 +118,7 @@ "Country_IR": "Іран", "Country_IS": "Ісландыя", "Country_IT": "Італія", - "Country_JE": "Востраў Джэрсі", + "Country_JE": "Джэрсі", "Country_JM": "Ямайка", "Country_JO": "Іарданія", "Country_JP": "Японія", @@ -183,14 +183,14 @@ "Country_PA": "Панама", "Country_PE": "Перу", "Country_PF": "Французская Палінезія", - "Country_PG": "Папуа — Новая Гвінея", + "Country_PG": "Папуа-Новая Гвінея", "Country_PH": "Філіпіны", "Country_PK": "Пакістан", "Country_PL": "Польшча", "Country_PM": "Сен-П’ер і Мікелон", "Country_PN": "Астравы Піткэрн", "Country_PR": "Пуэрта-Рыка", - "Country_PS": "Палестынскія тэрыторыі", + "Country_PS": "Палесцінскія Тэрыторыі", "Country_PT": "Партугалія", "Country_PW": "Палау", "Country_PY": "Парагвай", @@ -208,7 +208,7 @@ "Country_SG": "Сінгапур", "Country_SH": "Востраў Святой Алены", "Country_SI": "Славенія", - "Country_SJ": "Свальбард (Паўночна-Усходняя Зямля) і Ян-Маен", + "Country_SJ": "Шпіцберген і Ян-Маен", "Country_SK": "Славакія", "Country_SL": "Сьера-Леонэ", "Country_SM": "Сан-Марына", @@ -228,7 +228,7 @@ "Country_TH": "Тайланд", "Country_TJ": "Таджыкістан", "Country_TK": "Такелау", - "Country_TL": "Усходні Тымор", + "Country_TL": "Тымор-Лешці", "Country_TM": "Туркменістан", "Country_TN": "Туніс", "Country_TO": "Тонга", @@ -239,7 +239,7 @@ "Country_TZ": "Танзанія", "Country_UA": "Украіна", "Country_UG": "Уганда", - "Country_UM": "Знешнія малыя астравы ЗША", + "Country_UM": "Малыя Аддаленыя астравы ЗША", "Country_US": "Злучаныя Штаты Амерыкі", "Country_UY": "Уругвай", "Country_UZ": "Узбекістан", @@ -253,8 +253,8 @@ "Country_WF": "Уоліс і Футуна", "Country_WS": "Самоа", "Country_YE": "Емен", - "Country_YT": "Востраў Маёта", - "Country_ZA": "Паўднёва-Афрыканская Рэспубліка", + "Country_YT": "Маёта", + "Country_ZA": "Паўднёваафрыканская Рэспубліка", "Country_ZM": "Замбія", "Country_ZW": "Зімбабвэ", "Day_Long_1": "Панядзелак", @@ -300,11 +300,11 @@ "Day_Short_StandAlone_6": "Сб", "Day_Short_StandAlone_7": "Нд", "EnglishLanguageName": "Belarusian", - "Format_DateTime_Long": "EEEE, d MMMM y {time}", - "Format_DateTime_Short": "d.M.y {time}", + "Format_DateTime_Long": "EEEE, d MMMM y 'г'. {time}", + "Format_DateTime_Short": "d.MM.y {time}", "Format_Date_Day_Month": "E, d MMM", - "Format_Date_Long": "EEEE, d MMMM y", - "Format_Date_Short": "d.M.y", + "Format_Date_Long": "EEEE, d MMMM y 'г'.", + "Format_Date_Short": "d.MM.y", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", @@ -314,10 +314,11 @@ "Format_Month_Long": "LLLL y", "Format_Month_Short": "LLL y", "Format_Time": "{time}", - "Format_Time_12": "hh.mm.ss a", - "Format_Time_24": "HH.mm.ss", + "Format_Time_12": "h:mm:ss a", + "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "гадзіны", + "Language_aa": "Афарская", "Language_ab": "Абхазская", "Language_af": "Афрыкаанс", "Language_ak": "Акан", @@ -331,6 +332,7 @@ "Language_ba": "Башкірская", "Language_be": "Беларуская", "Language_bg": "Балгарская", + "Language_bi": "Біслама", "Language_bm": "Бамбара", "Language_bn": "Бенгальская", "Language_bo": "Тыбецкая", @@ -338,13 +340,16 @@ "Language_bs": "Баснійская", "Language_ca": "Каталанская", "Language_ce": "Чачэнская", + "Language_ch": "Чамора", "Language_co": "Карсіканская", "Language_cs": "Чэшская", + "Language_cu": "Царкоўнаславянская", "Language_cv": "Чувашская", "Language_cy": "Валійская", "Language_da": "Дацкая", "Language_de": "Нямецкая", - "Language_dz": "Дзонгкха", + "Language_dv": "Мальдыўская", + "Language_dz": "Дзонг-кэ", "Language_ee": "Эве", "Language_el": "Грэчаская", "Language_en": "Англійская", @@ -353,54 +358,62 @@ "Language_et": "Эстонская", "Language_eu": "Баскская", "Language_fa": "Фарсі", + "Language_ff": "Фула", "Language_fi": "Фінская", "Language_fj": "Фіджыйская", "Language_fo": "Фарэрская", "Language_fr": "Французская", - "Language_fy": "Фрызская", + "Language_fy": "Заходняя фрызская", "Language_ga": "Ірландская", "Language_gd": "Шатландская гэльская", "Language_gl": "Галісійская", "Language_gn": "Гуарані", "Language_gu": "Гуджараці", "Language_gv": "Мэнская", - "Language_ha": "Хаўса", + "Language_ha": "Хауса", "Language_he": "Іўрыт", "Language_hi": "Хіндзі", "Language_hr": "Харвацкая", - "Language_ht": "Гаіцянская", + "Language_ht": "Гаіцянская крэольская", "Language_hu": "Венгерская", "Language_hy": "Армянская", + "Language_hz": "Герэра", "Language_ia": "Інтэрлінгва", "Language_id": "Інданезійская", - "Language_ie": "Інтэрлінгве", + "Language_ie": "Інтэрлінгвэ", "Language_ig": "Ігба", - "Language_ii": "Сычуань І", + "Language_ii": "Сычуаньская йі", + "Language_io": "Іда", "Language_is": "Ісландская", "Language_it": "Італьянская", "Language_iu": "Інуктытут", "Language_ja": "Японская", "Language_jv": "Яванская", "Language_ka": "Грузінская", - "Language_ki": "Кікую", + "Language_ki": "Кікуйю", + "Language_kj": "Куаньяма", "Language_kk": "Казахская", "Language_kl": "Грэнландская", "Language_km": "Кхмерская", "Language_kn": "Канада", "Language_ko": "Карэйская", + "Language_kr": "Кануры", "Language_ks": "Кашмірская", "Language_ku": "Курдская", + "Language_kv": "Комі", "Language_kw": "Корнская", "Language_ky": "Кіргізская", "Language_la": "Лацінская", "Language_lb": "Люксембургская", "Language_lg": "Ганда", + "Language_li": "Лімбургская", "Language_ln": "Лінгала", "Language_lo": "Лаоская", "Language_lt": "Літоўская", "Language_lu": "Луба-катанга", "Language_lv": "Латышская", "Language_mg": "Малагасійская", + "Language_mh": "Маршальская", "Language_mi": "Маары", "Language_mk": "Македонская", "Language_ml": "Малаялам", @@ -409,15 +422,22 @@ "Language_ms": "Малайская", "Language_mt": "Мальтыйская", "Language_my": "Бірманская", - "Language_nb": "Нарвежская (букмал)", + "Language_na": "Науру", + "Language_nb": "Нарвежская (букмол)", "Language_nd": "Паўночная ндэбеле", "Language_ne": "Непальская", - "Language_nl": "Галандская", - "Language_nn": "Нарвежская (нюнорск)", + "Language_ng": "Ндонга", + "Language_nl": "Нідэрландская", + "Language_nn": "Нарвежская (нюношк)", "Language_no": "Нарвежская", - "Language_oc": "Правансальская", + "Language_nr": "Паўднёвая ндэбеле", + "Language_nv": "Наваха", + "Language_ny": "Ньянджа", + "Language_oc": "Аксітанская", + "Language_oj": "Аджыбва", "Language_om": "Арома", "Language_or": "Орыя", + "Language_os": "Асецінская", "Language_pa": "Панджабі", "Language_pl": "Польская", "Language_ps": "Пушту", @@ -427,19 +447,23 @@ "Language_rn": "Рундзі", "Language_ro": "Румынская", "Language_ru": "Руская", - "Language_rw": "Кіньяруанда", + "Language_rw": "Руанда", "Language_sa": "Санскрыт", + "Language_sc": "Сардзінская", "Language_sd": "Сіндхі", "Language_se": "Паўночнасаамская", "Language_sg": "Санга", "Language_si": "Сінгальская", "Language_sk": "Славацкая", "Language_sl": "Славенская", + "Language_sm": "Самоа", "Language_sn": "Шона", - "Language_so": "Самалійская", + "Language_so": "Самалі", "Language_sq": "Албанская", "Language_sr": "Сербская", - "Language_su": "Сундская", + "Language_ss": "Суаці", + "Language_st": "Паўднёвая сота", + "Language_su": "Сунда", "Language_sv": "Шведская", "Language_sw": "Суахілі", "Language_ta": "Тамільская", @@ -448,14 +472,20 @@ "Language_th": "Тайская", "Language_ti": "Тыгрынья", "Language_tk": "Туркменская", + "Language_tn": "Тсвана", "Language_to": "Танганская", "Language_tr": "Турэцкая", + "Language_ts": "Тсонга", "Language_tt": "Татарская", + "Language_ty": "Таіці", "Language_ug": "Уйгурская", "Language_uk": "Украінская", "Language_ur": "Урду", "Language_uz": "Узбекская", + "Language_ve": "Венда", "Language_vi": "В’етнамская", + "Language_vo": "Валапюк", + "Language_wa": "Валонская", "Language_wo": "Валоф", "Language_xh": "Коса", "Language_yi": "Ідыш", @@ -513,11 +543,11 @@ "Month_Short_StandAlone_8": "Жні", "Month_Short_StandAlone_9": "Вер", "NDays": "%s сутак", - "NHoursShort": "%sгадз.", + "NHoursShort": "%s гадз", "NMinutes": "%s хвіліны", - "NMinutesShort": "%s хв.", + "NMinutesShort": "%s хв", "NSeconds": "%s секунды", - "NSecondsShort": "%sс", + "NSecondsShort": "%s с", "NumberFormatCurrency": "#,##0.00 ¤", "NumberFormatNumber": "#,##0.###", "NumberFormatPercent": "#,##0 %", @@ -528,19 +558,19 @@ "NumberSymbolPlus": "+", "OneDay": "1 суткі", "OneMinute": "1 хвіліна", - "OneMinuteShort": "1 хв.", + "OneMinuteShort": "1 хв", "OriginalLanguageName": "Беларуская", "PeriodDay": "дзень", "PeriodDays": "суткі", "PeriodMonth": "месяц", "PeriodMonths": "месяцы", - "PeriodWeek": "тыдзень", + "PeriodWeek": "тыд", "PeriodWeeks": "тыдні", "PeriodYear": "год", "PeriodYears": "гады", "Seconds": "секунды", - "Time_AM": "да паўдня", - "Time_PM": "пасля паўдня", + "Time_AM": "AM", + "Time_PM": "PM", "Today": "Сёння", "Year_Short": "г.", "Yesterday": "Учора" diff --git a/plugins/Intl/lang/bg.json b/plugins/Intl/lang/bg.json index 511e99fffd..c440f820e6 100644 --- a/plugins/Intl/lang/bg.json +++ b/plugins/Intl/lang/bg.json @@ -345,7 +345,7 @@ "Language_co": "Корсикански", "Language_cr": "Крии", "Language_cs": "Чешки", - "Language_cu": "Църковно славянски", + "Language_cu": "Църковнославянски", "Language_cv": "Чувашки", "Language_cy": "Уелски", "Language_da": "Датски", @@ -377,7 +377,7 @@ "Language_hi": "Хинди", "Language_ho": "Хири моту", "Language_hr": "Хърватски", - "Language_ht": "Хаитянски", + "Language_ht": "Хаитянски креолски", "Language_hu": "Унгарски", "Language_hy": "Арменски", "Language_hz": "Хереро", @@ -437,7 +437,7 @@ "Language_no": "Норвежки", "Language_nr": "Южен ндебеле", "Language_nv": "Навахо", - "Language_ny": "Чинянджа", + "Language_ny": "Нянджа", "Language_oc": "Окситански", "Language_oj": "Оджибва", "Language_om": "Оромо", @@ -454,7 +454,7 @@ "Language_ro": "Румънски", "Language_ru": "Руски", "Language_rw": "Киняруанда", - "Language_sa": "Санкскритски", + "Language_sa": "Санскрит", "Language_sc": "Сардински", "Language_sd": "Синдхи", "Language_se": "Северносаамски", @@ -467,8 +467,8 @@ "Language_so": "Сомалийски", "Language_sq": "Албански", "Language_sr": "Сръбски", - "Language_ss": "Суази", - "Language_st": "Сесуто", + "Language_ss": "Свати", + "Language_st": "Сесото", "Language_su": "Сундански", "Language_sv": "Шведски", "Language_sw": "Суахили", @@ -482,7 +482,7 @@ "Language_tn": "Тсвана", "Language_to": "Тонга", "Language_tr": "Турски", - "Language_ts": "Тсонга", + "Language_ts": "Цонга", "Language_tt": "Татарски", "Language_tw": "Туи", "Language_ty": "Таитянски", @@ -557,7 +557,7 @@ "NMinutesShort": "%s min", "NSeconds": "%s секунди", "NSecondsShort": "%s s", - "NumberFormatCurrency": "#,##0.00 ¤", + "NumberFormatCurrency": "#0.00 ¤", "NumberFormatNumber": "#,##0.###", "NumberFormatPercent": "#,##0%", "NumberSymbolDecimal": ",", diff --git a/plugins/Intl/lang/bn.json b/plugins/Intl/lang/bn.json index 92676e3ab4..9a19537976 100644 --- a/plugins/Intl/lang/bn.json +++ b/plugins/Intl/lang/bn.json @@ -8,12 +8,12 @@ "Continent_asi": "এশিয়া", "Continent_eur": "ইউরোপ", "Continent_oce": "ওশিয়ানিয়া", - "Country_AD": "এ্যান্ডোরা", + "Country_AD": "আন্ডোরা", "Country_AE": "সংযুক্ত আরব আমিরাত", "Country_AF": "আফগানিস্তান", "Country_AG": "এন্টিগুয়া ও বারবুডা", "Country_AI": "এ্যাঙ্গুইলা", - "Country_AL": "আলব্যানিয়া", + "Country_AL": "আলবেনিয়া", "Country_AM": "আর্মেনিয়া", "Country_AO": "অ্যাঙ্গোলা", "Country_AQ": "অ্যান্টার্কটিকা", @@ -36,17 +36,17 @@ "Country_BL": "সেন্ট বারথেলিমি", "Country_BM": "বারমুডা", "Country_BN": "ব্রুনেই", - "Country_BO": "বোলিভিয়া", + "Country_BO": "বলিভিয়া", "Country_BQ": "ক্যারিবিয়ান নেদারল্যান্ডস", "Country_BR": "ব্রাজিল", "Country_BS": "বাহামা দ্বীপপুঞ্জ", "Country_BT": "ভুটান", "Country_BV": "বোভেট দ্বীপ", "Country_BW": "বতসোয়ানা", - "Country_BY": "বেলোরুশিয়া", + "Country_BY": "বেলারুশ", "Country_BZ": "বেলিজ", "Country_CA": "কানাডা", - "Country_CC": "কোকোস (কিলিং)দ্বীপপুঞ্জ", + "Country_CC": "কোকোস (কিলিং) দ্বীপপুঞ্জ", "Country_CD": "কঙ্গো-কিনশাসা", "Country_CF": "মধ্য আফ্রিকার প্রজাতন্ত্র", "Country_CG": "কঙ্গো - ব্রাজাভিল", @@ -56,7 +56,7 @@ "Country_CL": "চিলি", "Country_CM": "ক্যামেরুন", "Country_CN": "চীন", - "Country_CO": "কোলোম্বিয়া", + "Country_CO": "কলম্বিয়া", "Country_CR": "কোস্টারিকা", "Country_CU": "কিউবা", "Country_CV": "কেপভার্দে", @@ -85,7 +85,7 @@ "Country_FR": "ফ্রান্স", "Country_GA": "গ্যাবন", "Country_GB": "যুক্তরাজ্য", - "Country_GD": "গ্রেনেডা", + "Country_GD": "গ্রেনাডা", "Country_GE": "জর্জিয়া", "Country_GF": "ফরাসী গায়ানা", "Country_GG": "গ্রাঞ্জি", @@ -98,7 +98,7 @@ "Country_GQ": "নিরক্ষীয় গিনি", "Country_GR": "গ্রীস", "Country_GS": "দক্ষিণ জর্জিয়া ও দক্ষিণ স্যান্ডউইচ দ্বীপপুঞ্জ", - "Country_GT": "গোয়াতেমালা", + "Country_GT": "গুয়াতেমালা", "Country_GU": "গুয়াম", "Country_GW": "গিনি-বিসাউ", "Country_GY": "গিয়ানা", @@ -117,13 +117,13 @@ "Country_IQ": "ইরাক", "Country_IR": "ইরান", "Country_IS": "আইসল্যান্ড", - "Country_IT": "ইতালী", + "Country_IT": "ইতালি", "Country_JE": "জার্সি", "Country_JM": "জামাইকা", "Country_JO": "জর্ডন", "Country_JP": "জাপান", "Country_KE": "কেনিয়া", - "Country_KG": "কির্গিজিয়া", + "Country_KG": "কিরগিজিস্তান", "Country_KH": "কম্বোডিয়া", "Country_KI": "কিরিবাতি", "Country_KM": "কমোরোস", @@ -155,7 +155,7 @@ "Country_ML": "মালি", "Country_MM": "মায়ানমার (বার্মা)", "Country_MN": "মঙ্গোলিয়া", - "Country_MO": "ম্যাকাও এস এ আর চায়না", + "Country_MO": "ম্যাকাও এসএআর চীনা", "Country_MP": "উত্তরাঞ্চলীয় মারিয়ানা দ্বীপপুঞ্জ", "Country_MQ": "মার্টিনিক", "Country_MR": "মরিতানিয়া", @@ -181,7 +181,7 @@ "Country_NZ": "নিউজিল্যান্ড", "Country_OM": "ওমান", "Country_PA": "পানামা", - "Country_PE": "পিরু", + "Country_PE": "পেরু", "Country_PF": "ফরাসী পলিনেশিয়া", "Country_PG": "পাপুয়া নিউ গিনি", "Country_PH": "ফিলিপাইন", @@ -196,7 +196,7 @@ "Country_PY": "প্যারাগুয়ে", "Country_QA": "কাতার", "Country_RE": "রিইউনিয়ন", - "Country_RO": "রুমানিয়া", + "Country_RO": "রোমানিয়া", "Country_RS": "সার্বিয়া", "Country_RU": "রাশিয়া", "Country_RW": "রুয়ান্ডা", @@ -209,13 +209,13 @@ "Country_SH": "সেন্ট হেলেনা", "Country_SI": "স্লোভানিয়া", "Country_SJ": "স্বালবার্ড ও জান মেয়েন", - "Country_SK": "শ্লোভাকিয়া", + "Country_SK": "স্লোভাকিয়া", "Country_SL": "সিয়েরালিওন", "Country_SM": "সান মারিনো", "Country_SN": "সেনেগাল", "Country_SO": "সোমালিয়া", "Country_SR": "সুরিনাম", - "Country_SS": "দক্ষিন সুদান", + "Country_SS": "দক্ষিণ সুদান", "Country_ST": "সাওটোমা ও প্রিন্সিপি", "Country_SV": "এল সালভেদর", "Country_SX": "সিন্ট মার্টেন", @@ -230,14 +230,14 @@ "Country_TK": "টোকেলাউ", "Country_TL": "তিমুর-লেস্তে", "Country_TM": "তুর্কমেনিস্তান", - "Country_TN": "তিউনিশিয়া", + "Country_TN": "তিউনিসিয়া", "Country_TO": "টোঙ্গা", "Country_TR": "তুরস্ক", "Country_TT": "ত্রিনিনাদ ও টোব্যাগো", "Country_TV": "টুভালু", "Country_TW": "তাইওয়ান", "Country_TZ": "তাঞ্জানিয়া", - "Country_UA": "ইউক্রেইন", + "Country_UA": "ইউক্রেন", "Country_UG": "উগান্ডা", "Country_UM": "যুক্তরাষ্ট্রের পার্শ্ববর্তী দ্বীপপুঞ্জ", "Country_US": "মার্কিন যুক্তরাষ্ট্র", @@ -247,7 +247,7 @@ "Country_VC": "সেন্ট ভিনসেন্ট ও দ্যা গ্রেনাডিনস", "Country_VE": "ভেনেজুয়েলা", "Country_VG": "ব্রিটিশ ভার্জিন দ্বীপপুঞ্জ", - "Country_VI": "মার্কিন ভার্জিন দ্বীপপুঞ্জ", + "Country_VI": "মার্কিন যুক্তরাষ্ট্রের ভার্জিন দ্বীপপুঞ্জ", "Country_VN": "ভিয়েতনাম", "Country_VU": "ভানুয়াটু", "Country_WF": "ওয়ালিস ও ফুটুনা", @@ -299,7 +299,7 @@ "Day_Short_StandAlone_5": "শুক্র", "Day_Short_StandAlone_6": "শনি", "Day_Short_StandAlone_7": "রবি", - "EnglishLanguageName": "Bengali", + "EnglishLanguageName": "Bangla", "Format_DateTime_Long": "EEEE, d MMMM, y {time}", "Format_DateTime_Short": "d MMM, y {time}", "Format_Date_Day_Month": "E d MMM", @@ -321,7 +321,7 @@ "Language_aa": "আফার", "Language_ab": "আবখাজিয়ান", "Language_ae": "আবেস্তীয়", - "Language_af": "আফ্রিকান্স", + "Language_af": "আফ্রিকান", "Language_ak": "আকান", "Language_am": "আমহারিক", "Language_an": "আর্গোনিজ", @@ -365,7 +365,7 @@ "Language_fj": "ফিজিআন", "Language_fo": "ফারোস", "Language_fr": "ফরাসি", - "Language_fy": "পশ্চিম ফ্রিসিআন", + "Language_fy": "পশ্চিম ফ্রিসিয়ান", "Language_ga": "আইরিশ", "Language_gd": "স্কটস-গ্যেলিক", "Language_gl": "গ্যালিশিয়", @@ -389,7 +389,7 @@ "Language_ik": "ইনুপিয়াক", "Language_io": "ইডো", "Language_is": "আইসল্যান্ডীয়", - "Language_it": "ইতালীয়", + "Language_it": "ইতালিয়", "Language_iu": "ইনুক্টিটুট", "Language_ja": "জাপানি", "Language_jv": "জাভানিজ", @@ -400,10 +400,10 @@ "Language_kk": "কাজাখ", "Language_kl": "ক্যালাল্লিসুট", "Language_km": "খমের", - "Language_kn": "কান্নাড়ী", + "Language_kn": "কন্নড়", "Language_ko": "কোরিয়ান", "Language_kr": "কানুরি", - "Language_ks": "কাশ্মীরী", + "Language_ks": "কাশ্মীরি", "Language_ku": "কুর্দিশ", "Language_kv": "কোমি", "Language_kw": "কর্ণিশ", @@ -454,7 +454,7 @@ "Language_ro": "রোমানীয়", "Language_ru": "রুশ", "Language_rw": "কিনয়ারোয়ান্ডা", - "Language_sa": "সংষ্কৃত", + "Language_sa": "সংস্কৃত", "Language_sc": "সার্ডিনিয়ান", "Language_sd": "সিন্ধি", "Language_se": "উত্তরাঞ্চলীয় সামি", @@ -464,12 +464,12 @@ "Language_sl": "স্লোভেনীয়", "Language_sm": "সামোয়ান", "Language_sn": "শোনা", - "Language_so": "সোমালী", + "Language_so": "সোমালি", "Language_sq": "আলবেনীয়", "Language_sr": "সার্বীয়", "Language_ss": "সোয়াতি", "Language_st": "দক্ষিন সোথো", - "Language_su": "সুন্দানী", + "Language_su": "সুদানী", "Language_sv": "সুইডিশ", "Language_sw": "সোয়াহিলি", "Language_ta": "তামিল", @@ -527,11 +527,11 @@ "Month_Long_StandAlone_7": "জুলাই", "Month_Long_StandAlone_8": "আগস্ট", "Month_Long_StandAlone_9": "সেপ্টেম্বর", - "Month_Short_1": "জানুয়ারী", + "Month_Short_1": "জানু", "Month_Short_10": "অক্টোবর", "Month_Short_11": "নভেম্বর", "Month_Short_12": "ডিসেম্বর", - "Month_Short_2": "ফেব্রুয়ারী", + "Month_Short_2": "ফেব", "Month_Short_3": "মার্চ", "Month_Short_4": "এপ্রিল", "Month_Short_5": "মে", @@ -552,14 +552,14 @@ "Month_Short_StandAlone_8": "আগস্ট", "Month_Short_StandAlone_9": "সেপ্টেম্বর", "NDays": "%s দিন", - "NHoursShort": "%s ঘন্টা", + "NHoursShort": "%s ঘঃ", "NMinutes": "%s মিনিট", "NMinutesShort": "%s মিনিট", "NSeconds": "%s সেকেন্ড", - "NSecondsShort": "%s সেকেন্ড", + "NSecondsShort": "%s সেঃ", "NumberFormatCurrency": "#,##,##0.00¤", "NumberFormatNumber": "#,##,##0.###", - "NumberFormatPercent": "#,##,##0%", + "NumberFormatPercent": "#,##0%", "NumberSymbolDecimal": ".", "NumberSymbolGroup": ",", "NumberSymbolMinus": "-", @@ -579,7 +579,7 @@ "PeriodYears": "বছর", "Seconds": "সেকেন্ড", "Time_AM": "AM", - "Time_PM": "অপরাহ্ণ", + "Time_PM": "PM", "Today": "আজ", "Year_Short": "বছর", "Yesterday": "গতকাল" diff --git a/plugins/Intl/lang/bs.json b/plugins/Intl/lang/bs.json index abd090f32c..3c776babd7 100644 --- a/plugins/Intl/lang/bs.json +++ b/plugins/Intl/lang/bs.json @@ -1,8 +1,8 @@ { "Intl": { "Continent_afr": "Afrika", - "Continent_amc": "Centralna Amerika", - "Continent_amn": "Sjevernoamerički kontinent", + "Continent_amc": "Srednja Amerika", + "Continent_amn": "Sjeverna Amerika", "Continent_ams": "Južna Amerika", "Continent_ant": "Antarktika", "Continent_asi": "Azija", @@ -14,7 +14,7 @@ "Country_AG": "Antigva i Barbuda", "Country_AI": "Angvila", "Country_AL": "Albanija", - "Country_AM": "Jermenija", + "Country_AM": "Armenija", "Country_AO": "Angola", "Country_AQ": "Antarktika", "Country_AR": "Argentina", @@ -22,7 +22,7 @@ "Country_AT": "Austrija", "Country_AU": "Australija", "Country_AW": "Aruba", - "Country_AX": "Alandska Ostrva", + "Country_AX": "Olandska Ostrva", "Country_AZ": "Azerbejdžan", "Country_BA": "Bosna i Hercegovina", "Country_BB": "Barbados", @@ -41,12 +41,12 @@ "Country_BR": "Brazil", "Country_BS": "Bahami", "Country_BT": "Butan", - "Country_BV": "Buve Ostrva", + "Country_BV": "Ostrvo Buve", "Country_BW": "Bocvana", "Country_BY": "Bjelorusija", "Country_BZ": "Belize", "Country_CA": "Kanada", - "Country_CC": "Kokosova (Kilingova) ostrva", + "Country_CC": "Kokosova (Kilingova) Ostrva", "Country_CD": "Demokratska Republika Kongo", "Country_CF": "Centralnoafrička Republika", "Country_CG": "Kongo", @@ -63,7 +63,7 @@ "Country_CW": "Kurasao", "Country_CX": "Božićna Ostrva", "Country_CY": "Kipar", - "Country_CZ": "Češka", + "Country_CZ": "Češka Republika", "Country_DE": "Njemačka", "Country_DJ": "Džibuti", "Country_DK": "Danska", @@ -94,16 +94,16 @@ "Country_GL": "Grenland", "Country_GM": "Gambija", "Country_GN": "Gvineja", - "Country_GP": "Gvadelupe", + "Country_GP": "Gvadalupe", "Country_GQ": "Ekvatorijalna Gvineja", "Country_GR": "Grčka", - "Country_GS": "Južna Džordžija i Južna Sendvič Ostrva", + "Country_GS": "Južna Džordžija i Južna Sendvička Ostrva", "Country_GT": "Gvatemala", "Country_GU": "Guam", "Country_GW": "Gvineja-Bisao", "Country_GY": "Gvajana", - "Country_HK": "Hong Kong (S. A. R. Kina)", - "Country_HM": "Heard i arhipelag McDonald", + "Country_HK": "Hong Kong (SAR Kina)", + "Country_HM": "Herd i arhipelag MekDonald", "Country_HN": "Honduras", "Country_HR": "Hrvatska", "Country_HT": "Haiti", @@ -113,21 +113,21 @@ "Country_IL": "Izrael", "Country_IM": "Ostrvo Man", "Country_IN": "Indija", - "Country_IO": "Britanska Territorija u Indijskom Okeanu", + "Country_IO": "Britanska Teritorija u Indijskom Okeanu", "Country_IQ": "Irak", "Country_IR": "Iran", "Country_IS": "Island", "Country_IT": "Italija", - "Country_JE": "Džersi", + "Country_JE": "Džerzi", "Country_JM": "Jamajka", "Country_JO": "Jordan", "Country_JP": "Japan", "Country_KE": "Kenija", - "Country_KG": "Kirgizstan", + "Country_KG": "Kirgistan", "Country_KH": "Kambodža", "Country_KI": "Kiribati", "Country_KM": "Komorska Ostrva", - "Country_KN": "Sent Kits i Nevis", + "Country_KN": "Sveti Kits i Nevis", "Country_KP": "Sjeverna Koreja", "Country_KR": "Južna Koreja", "Country_KW": "Kuvajt", @@ -142,7 +142,7 @@ "Country_LS": "Lesoto", "Country_LT": "Litvanija", "Country_LU": "Luksemburg", - "Country_LV": "Letonija", + "Country_LV": "Latvija", "Country_LY": "Libija", "Country_MA": "Maroko", "Country_MC": "Monako", @@ -150,18 +150,18 @@ "Country_ME": "Crna Gora", "Country_MF": "Sv. Martin", "Country_MG": "Madagaskar", - "Country_MH": "Maršalska Ostrva", + "Country_MH": "Maršalova Ostrva", "Country_MK": "Makedonija", "Country_ML": "Mali", "Country_MM": "Mijanmar", "Country_MN": "Mongolija", - "Country_MO": "Makao (S. A. R. Kina)", + "Country_MO": "Makao (SAR Kina)", "Country_MP": "Sjeverna Marijanska Ostrva", "Country_MQ": "Martinik", "Country_MR": "Mauritanija", "Country_MS": "Monserat", "Country_MT": "Malta", - "Country_MU": "Mauricius", + "Country_MU": "Mauricijus", "Country_MV": "Maldivi", "Country_MW": "Malavi", "Country_MX": "Meksiko", @@ -170,7 +170,7 @@ "Country_NA": "Namibija", "Country_NC": "Nova Kaledonija", "Country_NE": "Niger", - "Country_NF": "Norfolk Ostrvo", + "Country_NF": "Ostrvo Norfolk", "Country_NG": "Nigerija", "Country_NI": "Nikaragva", "Country_NL": "Holandija", @@ -188,14 +188,14 @@ "Country_PK": "Pakistan", "Country_PL": "Poljska", "Country_PM": "Sveti Petar i Mikelon", - "Country_PN": "Pitkern", + "Country_PN": "Pitkernska Ostrva", "Country_PR": "Porto Riko", "Country_PS": "Palestinska Teritorija", "Country_PT": "Portugal", "Country_PW": "Palau", "Country_PY": "Paragvaj", "Country_QA": "Katar", - "Country_RE": "Rejunion", + "Country_RE": "Reunion", "Country_RO": "Rumunija", "Country_RS": "Srbija", "Country_RU": "Rusija", @@ -221,14 +221,14 @@ "Country_SX": "Sint Marten", "Country_SY": "Sirija", "Country_SZ": "Svazilend", - "Country_TC": "Ostrva Turks i Caicos", + "Country_TC": "Ostrva Turks i Kaikos", "Country_TD": "Čad", "Country_TF": "Francuske Južne Teritorije", "Country_TG": "Togo", "Country_TH": "Tajland", "Country_TJ": "Tadžikistan", "Country_TK": "Tokelau", - "Country_TL": "Timor Leste", + "Country_TL": "Istočni Timor", "Country_TM": "Turkmenistan", "Country_TN": "Tunis", "Country_TO": "Tonga", @@ -239,18 +239,18 @@ "Country_TZ": "Tanzanija", "Country_UA": "Ukrajina", "Country_UG": "Uganda", - "Country_UM": "Udaljena ostrva SAD", + "Country_UM": "Američka Vanjska Ostrva", "Country_US": "Sjedinjene Američke Države", "Country_UY": "Urugvaj", "Country_UZ": "Uzbekistan", "Country_VA": "Vatikan", - "Country_VC": "Sveti Vincent i Grenadini", + "Country_VC": "Sveti Vinsent i Grenadin", "Country_VE": "Venecuela", "Country_VG": "Britanska Djevičanska Ostrva", - "Country_VI": "Djevičanska Ostrva SAD", + "Country_VI": "Američka Djevičanska Ostrva", "Country_VN": "Vijetnam", "Country_VU": "Vanuatu", - "Country_WF": "Wallis i Futuna", + "Country_WF": "Ostrva Valis i Futuna", "Country_WS": "Samoa", "Country_YE": "Jemen", "Country_YT": "Majote", @@ -300,17 +300,17 @@ "Day_Short_StandAlone_6": "Sub", "Day_Short_StandAlone_7": "Ned", "EnglishLanguageName": "Bosnian", - "Format_DateTime_Long": "EEEE, dd. MMMM y. {time}", - "Format_DateTime_Short": "dd. MMM. y. {time}", - "Format_Date_Day_Month": "E, dd. MMM", - "Format_Date_Long": "EEEE, dd. MMMM y.", - "Format_Date_Short": "dd. MMM. y.", - "Format_Interval_Long_D": "dd. – dd. MMMM y.", - "Format_Interval_Long_M": "dd. MMMM – dd. MMMM y.", - "Format_Interval_Long_Y": "dd. MMMM y. – dd. MMMM y.", - "Format_Interval_Short_D": "dd. – dd. MMM y.", - "Format_Interval_Short_M": "dd. MMM – dd. MMM y.", - "Format_Interval_Short_Y": "dd. MMM y. – dd. MMM y.", + "Format_DateTime_Long": "EEEE, d. MMMM y. {time}", + "Format_DateTime_Short": "d. MMM. y. {time}", + "Format_Date_Day_Month": "E, d. MMM", + "Format_Date_Long": "EEEE, d. MMMM y.", + "Format_Date_Short": "d. MMM. y.", + "Format_Interval_Long_D": "d. – d. MMMM y.", + "Format_Interval_Long_M": "d. MMMM – d. MMMM y.", + "Format_Interval_Long_Y": "d. MMMM y. – d. MMMM y.", + "Format_Interval_Short_D": "d. – d. MMM y.", + "Format_Interval_Short_M": "d. MMM – d. MMM y.", + "Format_Interval_Short_Y": "d. MMM y. – d. MMM y.", "Format_Month_Long": "LLLL y.", "Format_Month_Short": "MMM y.", "Format_Time": "{time}", @@ -319,14 +319,14 @@ "Format_Year": "y.", "Hours": "sati", "Language_aa": "Afarski", - "Language_ab": "Abhazijski", + "Language_ab": "Abhaski", "Language_ae": "Avestanski", - "Language_af": "Afrikanerski", + "Language_af": "Afrikans", "Language_ak": "Akan", "Language_am": "Amharski", - "Language_an": "Aragonežanski", + "Language_an": "Aragonski", "Language_ar": "Arapski", - "Language_as": "Asemijski", + "Language_as": "Asamski", "Language_av": "Avarski", "Language_ay": "Ajmara", "Language_az": "Azerbejdžanski", @@ -345,12 +345,12 @@ "Language_co": "Korzikanski", "Language_cr": "Kri", "Language_cs": "Češki", - "Language_cu": "Staroslovenski", + "Language_cu": "Staroslavenski", "Language_cv": "Čuvaški", "Language_cy": "Velški", "Language_da": "Danski", "Language_de": "Njemački", - "Language_dv": "Divehijski", + "Language_dv": "Divehi", "Language_dz": "Džonga", "Language_ee": "Eve", "Language_el": "Grčki", @@ -365,21 +365,21 @@ "Language_fj": "Fidžijski", "Language_fo": "Farski", "Language_fr": "Francuski", - "Language_fy": "Frizijski", + "Language_fy": "Zapadni frizijski", "Language_ga": "Irski", "Language_gd": "Škotski galski", - "Language_gl": "Galski", + "Language_gl": "Galicijski", "Language_gn": "Gvarani", "Language_gu": "Gudžarati", "Language_gv": "Manks", "Language_ha": "Hausa", "Language_he": "Hebrejski", - "Language_hi": "Hindi", + "Language_hi": "Hindu", "Language_ho": "Hiri motu", "Language_hr": "Hrvatski", "Language_ht": "Haićanski", "Language_hu": "Mađarski", - "Language_hy": "Jermenski", + "Language_hy": "Armenski", "Language_hz": "Herero", "Language_ia": "Interlingva", "Language_id": "Indonezijski", @@ -389,7 +389,7 @@ "Language_ik": "Inupiak", "Language_io": "Ido", "Language_is": "Islandski", - "Language_it": "Italijanski", + "Language_it": "Talijanski", "Language_iu": "Inuktitut", "Language_ja": "Japanski", "Language_jv": "Javanski", @@ -403,21 +403,21 @@ "Language_kn": "Kanada", "Language_ko": "Korejski", "Language_kr": "Kanuri", - "Language_ks": "Kašmiri", + "Language_ks": "Kašmirski", "Language_ku": "Kurdski", "Language_kv": "Komi", - "Language_kw": "Korniški", - "Language_ky": "Kirgiski", + "Language_kw": "Kornski", + "Language_ky": "Kirgiški", "Language_la": "Latinski", "Language_lb": "Luksemburški", "Language_lg": "Ganda", - "Language_li": "Limburgiš", + "Language_li": "Limburški", "Language_ln": "Lingala", "Language_lo": "Laoški", "Language_lt": "Litvanski", "Language_lu": "Luba-katanga", - "Language_lv": "Letonski", - "Language_mg": "Malagazijski", + "Language_lv": "Latvijski", + "Language_mg": "Malagaški", "Language_mh": "Maršalski", "Language_mi": "Maorski", "Language_mk": "Makedonski", @@ -428,27 +428,27 @@ "Language_mt": "Malteški", "Language_my": "Burmanski", "Language_na": "Nauru", - "Language_nb": "Norveški bokmal", + "Language_nb": "Norveški (Bokmal)", "Language_nd": "Sjeverni ndebele", "Language_ne": "Nepalski", "Language_ng": "Ndonga", "Language_nl": "Holandski", - "Language_nn": "Norveški njorsk", + "Language_nn": "Norveški (Nynorsk)", "Language_no": "Norveški", "Language_nr": "Južni ndebele", "Language_nv": "Navaho", "Language_ny": "Njanja", - "Language_oc": "Provansalski", + "Language_oc": "Oksitanski", "Language_oj": "Ojibva", "Language_om": "Oromo", "Language_or": "Orijski", "Language_os": "Osetski", - "Language_pa": "Pandžabski", + "Language_pa": "Pandžapski", "Language_pi": "Pali", "Language_pl": "Poljski", - "Language_ps": "Paštunski", + "Language_ps": "Paštu", "Language_pt": "Portugalski", - "Language_qu": "Kvenča", + "Language_qu": "Kečua", "Language_rm": "Reto-romanski", "Language_rn": "Rundi", "Language_ro": "Rumunski", @@ -459,16 +459,16 @@ "Language_sd": "Sindi", "Language_se": "Sjeverni sami", "Language_sg": "Sango", - "Language_si": "Singaleski", + "Language_si": "Sinhaleški", "Language_sk": "Slovački", - "Language_sl": "Slovenački", + "Language_sl": "Slovenski", "Language_sm": "Samoanski", "Language_sn": "Šona", "Language_so": "Somalski", "Language_sq": "Albanski", "Language_sr": "Srpski", "Language_ss": "Svati", - "Language_st": "Sesoto", + "Language_st": "Južni soto", "Language_su": "Sundanski", "Language_sv": "Švedski", "Language_sw": "Svahili", @@ -478,7 +478,7 @@ "Language_th": "Tajlandski", "Language_ti": "Tigrinja", "Language_tk": "Turkmenski", - "Language_tl": "Tagalski", + "Language_tl": "Tagalog", "Language_tn": "Tsvana", "Language_to": "Tonganski", "Language_tr": "Turski", @@ -492,17 +492,17 @@ "Language_uz": "Uzbečki", "Language_ve": "Venda", "Language_vi": "Vijetnamski", - "Language_vo": "Volapük", + "Language_vo": "Volapuk", "Language_wa": "Valun", "Language_wo": "Volof", - "Language_xh": "Kosa", + "Language_xh": "Hosa", "Language_yi": "Jidiš", "Language_yo": "Jorubanski", "Language_za": "Zuang", "Language_zh": "Kineski", "Language_zu": "Zulu", "LayoutDirection": "ltr", - "Minutes": "minuta", + "Minutes": "minute", "Month_Long_1": "Januar", "Month_Long_10": "Oktobar", "Month_Long_11": "Novembar", @@ -513,7 +513,7 @@ "Month_Long_5": "Maj", "Month_Long_6": "Juni", "Month_Long_7": "Juli", - "Month_Long_8": "August", + "Month_Long_8": "Avgust", "Month_Long_9": "Septembar", "Month_Long_StandAlone_1": "Januar", "Month_Long_StandAlone_10": "Oktobar", @@ -525,7 +525,7 @@ "Month_Long_StandAlone_5": "Maj", "Month_Long_StandAlone_6": "Juni", "Month_Long_StandAlone_7": "Juli", - "Month_Long_StandAlone_8": "August", + "Month_Long_StandAlone_8": "Avgust", "Month_Long_StandAlone_9": "Septembar", "Month_Short_1": "Jan", "Month_Short_10": "Okt", @@ -537,7 +537,7 @@ "Month_Short_5": "Maj", "Month_Short_6": "Jun", "Month_Short_7": "Jul", - "Month_Short_8": "Aug", + "Month_Short_8": "Avg", "Month_Short_9": "Sep", "Month_Short_StandAlone_1": "Jan", "Month_Short_StandAlone_10": "Okt", @@ -549,36 +549,36 @@ "Month_Short_StandAlone_5": "Maj", "Month_Short_StandAlone_6": "Jun", "Month_Short_StandAlone_7": "Jul", - "Month_Short_StandAlone_8": "Aug", + "Month_Short_StandAlone_8": "Avg", "Month_Short_StandAlone_9": "Sep", "NDays": "%s dana", - "NHoursShort": "%s sat", + "NHoursShort": "%s h", "NMinutes": "%s minuta", - "NMinutesShort": "%s min", + "NMinutesShort": "%s min.", "NSeconds": "%s sekundi", - "NSecondsShort": "%s sek", + "NSecondsShort": "%s s", "NumberFormatCurrency": "#,##0.00 ¤", "NumberFormatNumber": "#,##0.###", - "NumberFormatPercent": "#,##0%", + "NumberFormatPercent": "#,##0 %", "NumberSymbolDecimal": ",", "NumberSymbolGroup": ".", "NumberSymbolMinus": "-", "NumberSymbolPercent": "%", "NumberSymbolPlus": "+", "OneDay": "1 dan", - "OneMinute": "1 minut", - "OneMinuteShort": "1 min", + "OneMinute": "1 minuta", + "OneMinuteShort": "1 min.", "OriginalLanguageName": "Bosanski", "PeriodDay": "dan", - "PeriodDays": "dana", + "PeriodDays": "dani", "PeriodMonth": "mjesec", "PeriodMonths": "mjeseci", "PeriodWeek": "sedmica", - "PeriodWeeks": "sedmica", + "PeriodWeeks": "sedmice", "PeriodYear": "godina", - "PeriodYears": "godina", - "Seconds": "sekundi", - "Time_AM": "prije podne", + "PeriodYears": "godine", + "Seconds": "sekunde", + "Time_AM": "prijepodne", "Time_PM": "popodne", "Today": "Danas", "Year_Short": "g.", diff --git a/plugins/Intl/lang/ca.json b/plugins/Intl/lang/ca.json index 7a0b18b324..614fe35f72 100644 --- a/plugins/Intl/lang/ca.json +++ b/plugins/Intl/lang/ca.json @@ -190,7 +190,7 @@ "Country_PM": "Saint-Pierre-et-Miquelon", "Country_PN": "Illes Pitcairn", "Country_PR": "Puerto Rico", - "Country_PS": "Palestina", + "Country_PS": "Territoris palestins", "Country_PT": "Portugal", "Country_PW": "Palau", "Country_PY": "Paraguai", @@ -527,18 +527,18 @@ "Month_Long_StandAlone_7": "Juliol", "Month_Long_StandAlone_8": "Agost", "Month_Long_StandAlone_9": "Setembre", - "Month_Short_1": "Gen.", - "Month_Short_10": "Oct.", - "Month_Short_11": "Nov.", - "Month_Short_12": "Des.", - "Month_Short_2": "Febr.", - "Month_Short_3": "Març", - "Month_Short_4": "Abr.", - "Month_Short_5": "Maig", - "Month_Short_6": "Juny", - "Month_Short_7": "Jul.", - "Month_Short_8": "Ag.", - "Month_Short_9": "Set.", + "Month_Short_1": "De gen.", + "Month_Short_10": "D’oct.", + "Month_Short_11": "De nov.", + "Month_Short_12": "De des.", + "Month_Short_2": "De febr.", + "Month_Short_3": "De març", + "Month_Short_4": "D’abr.", + "Month_Short_5": "De maig", + "Month_Short_6": "De juny", + "Month_Short_7": "De jul.", + "Month_Short_8": "D’ag.", + "Month_Short_9": "De set.", "Month_Short_StandAlone_1": "Gen.", "Month_Short_StandAlone_10": "Oct.", "Month_Short_StandAlone_11": "Nov.", diff --git a/plugins/Intl/lang/cs.json b/plugins/Intl/lang/cs.json index 5d13f324a1..885d852428 100644 --- a/plugins/Intl/lang/cs.json +++ b/plugins/Intl/lang/cs.json @@ -84,7 +84,7 @@ "Country_FO": "Faerské ostrovy", "Country_FR": "Francie", "Country_GA": "Gabon", - "Country_GB": "Velká Británie", + "Country_GB": "Spojené království", "Country_GD": "Grenada", "Country_GE": "Gruzie", "Country_GF": "Francouzská Guyana", @@ -365,7 +365,7 @@ "Language_fj": "Fidžijština", "Language_fo": "Faerština", "Language_fr": "Francouzština", - "Language_fy": "Fríština", + "Language_fy": "Fríština (západní)", "Language_ga": "Irština", "Language_gd": "Skotská gaelština", "Language_gl": "Galicijština", diff --git a/plugins/Intl/lang/cy.json b/plugins/Intl/lang/cy.json index eea1cb48d6..4b98f7551a 100644 --- a/plugins/Intl/lang/cy.json +++ b/plugins/Intl/lang/cy.json @@ -386,6 +386,7 @@ "Language_ig": "Igbo", "Language_ii": "Nwosw", "Language_ik": "Inwpiaceg", + "Language_io": "Ido", "Language_is": "Islandeg", "Language_it": "Eidaleg", "Language_iu": "Inwctitwt", @@ -394,6 +395,7 @@ "Language_ka": "Georgeg", "Language_kg": "Congo", "Language_ki": "Kikuyu", + "Language_kj": "Kuanyama", "Language_kk": "Casacheg", "Language_kl": "Kalaallisut", "Language_km": "Chmereg", @@ -465,7 +467,7 @@ "Language_sq": "Albaneg", "Language_sr": "Serbeg", "Language_ss": "Swati", - "Language_st": "Sesotheg", + "Language_st": "Sesotheg Deheuol", "Language_su": "Swndaneg", "Language_sv": "Swedeg", "Language_sw": "Swahili", @@ -482,12 +484,14 @@ "Language_ts": "Tsongaeg", "Language_tt": "Tatareg", "Language_tw": "Twi", + "Language_ty": "Tahitïeg", "Language_ug": "Uighur", "Language_uk": "Wcreineg", "Language_ur": "Wrdw", "Language_uz": "Wsbeceg", "Language_ve": "Fendeg", "Language_vi": "Fietnameg", + "Language_vo": "Folapük", "Language_wa": "Walwneg", "Language_wo": "Woloff", "Language_xh": "Xhosa", @@ -572,8 +576,8 @@ "PeriodYear": "blwyddyn", "PeriodYears": "blynyddoedd", "Seconds": "eiliadau", - "Time_AM": "AM", - "Time_PM": "PM", + "Time_AM": "yb", + "Time_PM": "yh", "Today": "Heddiw", "Year_Short": "bl.", "Yesterday": "Ddoe" diff --git a/plugins/Intl/lang/da.json b/plugins/Intl/lang/da.json index 960a7be385..18fdff2299 100644 --- a/plugins/Intl/lang/da.json +++ b/plugins/Intl/lang/da.json @@ -37,7 +37,7 @@ "Country_BM": "Bermuda", "Country_BN": "Brunei", "Country_BO": "Bolivia", - "Country_BQ": "De Nederlandske Antiller", + "Country_BQ": "De tidligere Nederlandske Antiller", "Country_BR": "Brasilien", "Country_BS": "Bahamas", "Country_BT": "Bhutan", @@ -97,12 +97,12 @@ "Country_GP": "Guadeloupe", "Country_GQ": "Ækvatorialguinea", "Country_GR": "Grækenland", - "Country_GS": "South Georgia og South Sandwich Islands", + "Country_GS": "South Georgia og De Sydlige Sandwichøer", "Country_GT": "Guatemala", "Country_GU": "Guam", "Country_GW": "Guinea-Bissau", "Country_GY": "Guyana", - "Country_HK": "Hongkong SAR", + "Country_HK": "SAR Hongkong", "Country_HM": "Heard Island og McDonald Islands", "Country_HN": "Honduras", "Country_HR": "Kroatien", @@ -155,7 +155,7 @@ "Country_ML": "Mali", "Country_MM": "Myanmar (Burma)", "Country_MN": "Mongoliet", - "Country_MO": "Macao SAR", + "Country_MO": "SAR Macao", "Country_MP": "Nordmarianerne", "Country_MQ": "Martinique", "Country_MR": "Mauretanien", @@ -173,7 +173,7 @@ "Country_NF": "Norfolk Island", "Country_NG": "Nigeria", "Country_NI": "Nicaragua", - "Country_NL": "Nederlandene", + "Country_NL": "Holland", "Country_NO": "Norge", "Country_NP": "Nepal", "Country_NR": "Nauru", @@ -306,11 +306,11 @@ "Format_Date_Long": "EEEE 'den' d. MMMM y", "Format_Date_Short": "d. MMM y", "Format_Interval_Long_D": "d.–d. MMMM y", - "Format_Interval_Long_M": "d. MMMM – d. MMMM y", - "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", + "Format_Interval_Long_M": "d. MMMM.–d. MMMM y", + "Format_Interval_Long_Y": "d. MMMM y–d. MMMM y", "Format_Interval_Short_D": "d.–d. MMM y", - "Format_Interval_Short_M": "d. MMM – d. MMM y", - "Format_Interval_Short_Y": "d. MMM y – d. MMM y", + "Format_Interval_Short_M": "d. MMM.–d. MMM y", + "Format_Interval_Short_Y": "d. MMM y–d. MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", @@ -424,7 +424,7 @@ "Language_ml": "Malayalam", "Language_mn": "Mongolsk", "Language_mr": "Marathisk", - "Language_ms": "Malay", + "Language_ms": "Malajisk", "Language_mt": "Maltesisk", "Language_my": "Burmesisk", "Language_na": "Nauru", @@ -443,7 +443,7 @@ "Language_om": "Oromo", "Language_or": "Oriya", "Language_os": "Ossetisk", - "Language_pa": "Punjabi", + "Language_pa": "Punjabisk", "Language_pi": "Pali", "Language_pl": "Polsk", "Language_ps": "Pashto", @@ -474,7 +474,7 @@ "Language_sw": "Swahili", "Language_ta": "Tamilsk", "Language_te": "Telugu", - "Language_tg": "Tajik", + "Language_tg": "Tadsjikisk", "Language_th": "Thai", "Language_ti": "Tigrinya", "Language_tk": "Turkmensk", @@ -495,7 +495,7 @@ "Language_vo": "Volapyk", "Language_wa": "Vallonsk", "Language_wo": "Wolof", - "Language_xh": "Xhosa", + "Language_xh": "IsiXhosa", "Language_yi": "Jiddisch", "Language_yo": "Yoruba", "Language_za": "Zhuang", @@ -539,18 +539,18 @@ "Month_Short_7": "Jul.", "Month_Short_8": "Aug.", "Month_Short_9": "Sep.", - "Month_Short_StandAlone_1": "Jan", - "Month_Short_StandAlone_10": "Okt", - "Month_Short_StandAlone_11": "Nov", - "Month_Short_StandAlone_12": "Dec", - "Month_Short_StandAlone_2": "Feb", - "Month_Short_StandAlone_3": "Mar", - "Month_Short_StandAlone_4": "Apr", + "Month_Short_StandAlone_1": "Jan.", + "Month_Short_StandAlone_10": "Okt.", + "Month_Short_StandAlone_11": "Nov.", + "Month_Short_StandAlone_12": "Dec.", + "Month_Short_StandAlone_2": "Feb.", + "Month_Short_StandAlone_3": "Mar.", + "Month_Short_StandAlone_4": "Apr.", "Month_Short_StandAlone_5": "Maj", - "Month_Short_StandAlone_6": "Jun", - "Month_Short_StandAlone_7": "Jul", - "Month_Short_StandAlone_8": "Aug", - "Month_Short_StandAlone_9": "Sep", + "Month_Short_StandAlone_6": "Jun.", + "Month_Short_StandAlone_7": "Jul.", + "Month_Short_StandAlone_8": "Aug.", + "Month_Short_StandAlone_9": "Sep.", "NDays": "%s dage", "NHoursShort": "%s t", "NMinutes": "%s minutter", diff --git a/plugins/Intl/lang/de.json b/plugins/Intl/lang/de.json index d6a6e7e70b..8de4c29cef 100644 --- a/plugins/Intl/lang/de.json +++ b/plugins/Intl/lang/de.json @@ -59,7 +59,7 @@ "Country_CO": "Kolumbien", "Country_CR": "Costa Rica", "Country_CU": "Kuba", - "Country_CV": "Kap Verde", + "Country_CV": "Cabo Verde", "Country_CW": "Curaçao", "Country_CX": "Weihnachtsinsel", "Country_CY": "Zypern", @@ -208,7 +208,7 @@ "Country_SG": "Singapur", "Country_SH": "St. Helena", "Country_SI": "Slowenien", - "Country_SJ": "Svalbard und Jan Mayen", + "Country_SJ": "Spitzbergen", "Country_SK": "Slowakei", "Country_SL": "Sierra Leone", "Country_SM": "San Marino", @@ -228,7 +228,7 @@ "Country_TH": "Thailand", "Country_TJ": "Tadschikistan", "Country_TK": "Tokelau", - "Country_TL": "Timor-Leste", + "Country_TL": "Osttimor", "Country_TM": "Turkmenistan", "Country_TN": "Tunesien", "Country_TO": "Tonga", @@ -341,7 +341,7 @@ "Language_bs": "Bosnisch", "Language_ca": "Katalanisch", "Language_ce": "Tschetschenisch", - "Language_ch": "Chamorro-Sprache", + "Language_ch": "Chamorro", "Language_co": "Korsisch", "Language_cr": "Cree", "Language_cs": "Tschechisch", @@ -350,7 +350,7 @@ "Language_cy": "Walisisch", "Language_da": "Dänisch", "Language_de": "Deutsch", - "Language_dv": "Maledivisch", + "Language_dv": "Dhivehi", "Language_dz": "Dzongkha", "Language_ee": "Ewe", "Language_el": "Griechisch", @@ -368,7 +368,7 @@ "Language_fy": "Westfriesisch", "Language_ga": "Irisch", "Language_gd": "Schottisches Gälisch", - "Language_gl": "Galizisch", + "Language_gl": "Galicisch", "Language_gn": "Guarani", "Language_gu": "Gujarati", "Language_gv": "Manx", @@ -380,14 +380,14 @@ "Language_ht": "Haiti-Kreolisch", "Language_hu": "Ungarisch", "Language_hy": "Armenisch", - "Language_hz": "Herero-Sprache", + "Language_hz": "Herero", "Language_ia": "Interlingua", "Language_id": "Indonesisch", "Language_ie": "Interlingue", "Language_ig": "Igbo", "Language_ii": "Yi", "Language_ik": "Inupiak", - "Language_io": "Ido-Sprache", + "Language_io": "Ido", "Language_is": "Isländisch", "Language_it": "Italienisch", "Language_iu": "Inuktitut", @@ -402,10 +402,10 @@ "Language_km": "Khmer", "Language_kn": "Kannada", "Language_ko": "Koreanisch", - "Language_kr": "Kanuri-Sprache", + "Language_kr": "Kanuri", "Language_ks": "Kaschmiri", "Language_ku": "Kurdisch", - "Language_kv": "Komi-Sprache", + "Language_kv": "Komi", "Language_kw": "Kornisch", "Language_ky": "Kirgisisch", "Language_la": "Latein", @@ -435,11 +435,11 @@ "Language_nl": "Niederländisch", "Language_nn": "Norwegisch Nynorsk", "Language_no": "Norwegisch", - "Language_nr": "Süd-Ndebele-Sprache", + "Language_nr": "Süd-Ndebele", "Language_nv": "Navajo", - "Language_ny": "Nyanja-Sprache", + "Language_ny": "Nyanja", "Language_oc": "Okzitanisch", - "Language_oj": "Ojibwa-Sprache", + "Language_oj": "Ojibwa", "Language_om": "Oromo", "Language_or": "Oriya", "Language_os": "Ossetisch", @@ -468,7 +468,7 @@ "Language_sq": "Albanisch", "Language_sr": "Serbisch", "Language_ss": "Swazi", - "Language_st": "Süd-Sotho-Sprache", + "Language_st": "Süd-Sotho", "Language_su": "Sundanesisch", "Language_sv": "Schwedisch", "Language_sw": "Suaheli", @@ -479,7 +479,7 @@ "Language_ti": "Tigrinya", "Language_tk": "Turkmenisch", "Language_tl": "Tagalog", - "Language_tn": "Tswana-Sprache", + "Language_tn": "Tswana", "Language_to": "Tongaisch", "Language_tr": "Türkisch", "Language_ts": "Tsonga", @@ -490,7 +490,7 @@ "Language_uk": "Ukrainisch", "Language_ur": "Urdu", "Language_uz": "Usbekisch", - "Language_ve": "Venda-Sprache", + "Language_ve": "Venda", "Language_vi": "Vietnamesisch", "Language_vo": "Volapük", "Language_wa": "Wallonisch", diff --git a/plugins/Intl/lang/el.json b/plugins/Intl/lang/el.json index 49c3bf9897..c0fdc46284 100644 --- a/plugins/Intl/lang/el.json +++ b/plugins/Intl/lang/el.json @@ -311,7 +311,7 @@ "Format_Interval_Short_D": "dd–dd MMM y", "Format_Interval_Short_M": "dd MMM – dd MMM y", "Format_Interval_Short_Y": "dd MMM y – dd MMM y", - "Format_Month_Long": "MMMM y", + "Format_Month_Long": "LLLL y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", "Format_Time_12": "h:mm:ss a", @@ -429,16 +429,16 @@ "Language_my": "Βιρμανικά", "Language_na": "Ναούρου", "Language_nb": "Νορβηγικά Μποκμάλ", - "Language_nd": "Ντεμπέλε Βορρά", + "Language_nd": "Βόρεια Ντεμπέλε", "Language_ne": "Νεπάλι", "Language_ng": "Ντόνγκα", "Language_nl": "Ολλανδικά", "Language_nn": "Νορβηγικά Νινόρσκ", "Language_no": "Νορβηγικά", - "Language_nr": "Ντεμπέλε Νότου", + "Language_nr": "Νότια Ντέμπελε", "Language_nv": "Νάβαχο", "Language_ny": "Νιάντζα", - "Language_oc": "Οκσιτανικά", + "Language_oc": "Οξιτανικά", "Language_oj": "Οζιβίγουα", "Language_om": "Ορόμο", "Language_or": "Ορίγια", @@ -474,12 +474,12 @@ "Language_sw": "Σουαχίλι", "Language_ta": "Ταμίλ", "Language_te": "Τελούγκου", - "Language_tg": "Τατζίκ", + "Language_tg": "Τατζικικά", "Language_th": "Ταϊλανδικά", - "Language_ti": "Τιγκρίνυα", + "Language_ti": "Τιγκρινικά", "Language_tk": "Τουρκμενικά", - "Language_tl": "Ταγκαλόγκ", - "Language_tn": "Τσιγουάνα", + "Language_tl": "Τάγκαλογκ", + "Language_tn": "Τσουάνα", "Language_to": "Τονγκανικά", "Language_tr": "Τουρκικά", "Language_ts": "Τσόνγκα", diff --git a/plugins/Intl/lang/en.json b/plugins/Intl/lang/en.json index db73bc9a08..063bf9187c 100644 --- a/plugins/Intl/lang/en.json +++ b/plugins/Intl/lang/en.json @@ -335,7 +335,7 @@ "Language_bg": "Bulgarian", "Language_bi": "Bislama", "Language_bm": "Bambara", - "Language_bn": "Bengali", + "Language_bn": "Bangla", "Language_bo": "Tibetan", "Language_br": "Breton", "Language_bs": "Bosnian", @@ -441,7 +441,7 @@ "Language_oc": "Occitan", "Language_oj": "Ojibwa", "Language_om": "Oromo", - "Language_or": "Oriya", + "Language_or": "Odia", "Language_os": "Ossetic", "Language_pa": "Punjabi", "Language_pi": "Pali", diff --git a/plugins/Intl/lang/es.json b/plugins/Intl/lang/es.json index 4a08bbae01..edcde23bb1 100644 --- a/plugins/Intl/lang/es.json +++ b/plugins/Intl/lang/es.json @@ -51,7 +51,7 @@ "Country_CF": "República Centroafricana", "Country_CG": "República del Congo", "Country_CH": "Suiza", - "Country_CI": "Costa de Marfil", + "Country_CI": "Côte d’Ivoire", "Country_CK": "Islas Cook", "Country_CL": "Chile", "Country_CM": "Camerún", @@ -228,7 +228,7 @@ "Country_TH": "Tailandia", "Country_TJ": "Tayikistán", "Country_TK": "Tokelau", - "Country_TL": "Timor Oriental", + "Country_TL": "Timor-Leste", "Country_TM": "Turkmenistán", "Country_TN": "Túnez", "Country_TO": "Tonga", @@ -370,14 +370,14 @@ "Language_gd": "Gaélico escocés", "Language_gl": "Gallego", "Language_gn": "Guaraní", - "Language_gu": "Gujarati", + "Language_gu": "Guyaratí", "Language_gv": "Manés", "Language_ha": "Hausa", "Language_he": "Hebreo", "Language_hi": "Hindi", "Language_ho": "Hiri motu", "Language_hr": "Croata", - "Language_ht": "Haitiano", + "Language_ht": "Criollo haitiano", "Language_hu": "Húngaro", "Language_hy": "Armenio", "Language_hz": "Herero", @@ -413,7 +413,7 @@ "Language_lg": "Ganda", "Language_li": "Limburgués", "Language_ln": "Lingala", - "Language_lo": "Laosiano", + "Language_lo": "Lao", "Language_lt": "Lituano", "Language_lu": "Luba-katanga", "Language_lv": "Letón", @@ -449,8 +449,8 @@ "Language_ps": "Pastún", "Language_pt": "Portugués", "Language_qu": "Quechua", - "Language_rm": "Retorrománico", - "Language_rn": "Kiroundi", + "Language_rm": "Romanche", + "Language_rn": "Kirundi", "Language_ro": "Rumano", "Language_ru": "Ruso", "Language_rw": "Kinyarwanda", @@ -467,7 +467,7 @@ "Language_so": "Somalí", "Language_sq": "Albanés", "Language_sr": "Serbio", - "Language_ss": "Siswati", + "Language_ss": "Suazi", "Language_st": "Sesotho meridional", "Language_su": "Sundanés", "Language_sv": "Sueco", @@ -479,7 +479,7 @@ "Language_ti": "Tigriña", "Language_tk": "Turcomano", "Language_tl": "Tagalo", - "Language_tn": "Setchwana", + "Language_tn": "Setsuana", "Language_to": "Tongano", "Language_tr": "Turco", "Language_ts": "Tsonga", @@ -494,9 +494,9 @@ "Language_vi": "Vietnamita", "Language_vo": "Volapük", "Language_wa": "Valón", - "Language_wo": "Wolof", + "Language_wo": "Wólof", "Language_xh": "Xhosa", - "Language_yi": "Yídish", + "Language_yi": "Yidis", "Language_yo": "Yoruba", "Language_za": "Zhuang", "Language_zh": "Chino", diff --git a/plugins/Intl/lang/et.json b/plugins/Intl/lang/et.json index bb9cdd7b16..d1a921756b 100644 --- a/plugins/Intl/lang/et.json +++ b/plugins/Intl/lang/et.json @@ -4,7 +4,7 @@ "Continent_amc": "Kesk-Ameerika", "Continent_amn": "Põhja-Ameerika", "Continent_ams": "Lõuna-Ameerika", - "Continent_ant": "Antarktis", + "Continent_ant": "Antarktika", "Continent_asi": "Aasia", "Continent_eur": "Euroopa", "Continent_oce": "Okeaania", @@ -16,7 +16,7 @@ "Country_AL": "Albaania", "Country_AM": "Armeenia", "Country_AO": "Angola", - "Country_AQ": "Antarktis", + "Country_AQ": "Antarktika", "Country_AR": "Argentina", "Country_AS": "Ameerika Samoa", "Country_AT": "Austria", @@ -314,8 +314,8 @@ "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h:mm.ss a", - "Format_Time_24": "H:mm.ss", + "Format_Time_12": "h:mm:ss a", + "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "tunnid", "Language_aa": "Afari", @@ -323,7 +323,7 @@ "Language_ae": "Avesta", "Language_af": "Afrikaani", "Language_ak": "Akani", - "Language_am": "Amhari", + "Language_am": "Amhara", "Language_an": "Aragoni", "Language_ar": "Araabia", "Language_as": "Assami", @@ -438,7 +438,7 @@ "Language_nr": "Lõunandebele", "Language_nv": "Navaho", "Language_ny": "Njandža", - "Language_oc": "Provansi", + "Language_oc": "Oksitaani", "Language_oj": "Odžibvei", "Language_om": "Oromo", "Language_or": "Oria", diff --git a/plugins/Intl/lang/eu.json b/plugins/Intl/lang/eu.json index ec30c090f1..e61a18ea4d 100644 --- a/plugins/Intl/lang/eu.json +++ b/plugins/Intl/lang/eu.json @@ -148,12 +148,12 @@ "Country_MC": "Monako", "Country_MD": "Moldavia", "Country_ME": "Montenegro", - "Country_MF": "Saint Martin", + "Country_MF": "San Martin", "Country_MG": "Madagaskar", "Country_MH": "Marshall uharteak", "Country_MK": "Mazedonia", "Country_ML": "Mali", - "Country_MM": "Myanmar", + "Country_MM": "Myanmar (Birmania)", "Country_MN": "Mongolia", "Country_MO": "Macau AEB Txina", "Country_MP": "Iparraldeko Mariana uharteak", @@ -206,7 +206,7 @@ "Country_SD": "Sudan", "Country_SE": "Suedia", "Country_SG": "Singapur", - "Country_SH": "Saint Helena", + "Country_SH": "Santa Helena", "Country_SI": "Eslovenia", "Country_SJ": "Svalbard eta Jan Mayen uharteak", "Country_SK": "Eslovakia", @@ -221,7 +221,7 @@ "Country_SX": "Sint Maarten", "Country_SY": "Siria", "Country_SZ": "Swazilandia", - "Country_TC": "Turk eta Caicos uharteak", + "Country_TC": "Turk eta Caico uharteak", "Country_TD": "Txad", "Country_TF": "Hegoaldeko lurralde frantsesak", "Country_TG": "Togo", @@ -318,25 +318,33 @@ "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "ordu", + "Language_aa": "Afarera", "Language_ab": "Abkhazera", "Language_af": "Afrikaansa", "Language_ak": "Akanera", "Language_am": "Amharera", + "Language_an": "Aragoiera", "Language_ar": "Arabiera", "Language_as": "Assamera", + "Language_av": "Avarera", "Language_ay": "Aimara", "Language_az": "Azerbaijanera", "Language_ba": "Bashkirrera", "Language_be": "Bielorrusiera", "Language_bg": "Bulgariera", + "Language_bi": "Bislama", "Language_bm": "Bambarera", "Language_bn": "Bengalera", "Language_bo": "Tibetera", "Language_br": "Bretoiera", "Language_bs": "Bosniera", "Language_ca": "Katalana", + "Language_ce": "Txetxeniera", + "Language_ch": "Chamorrera", "Language_co": "Korsikera", "Language_cs": "Txekiera", + "Language_cu": "Elizako eslaviera", + "Language_cv": "Chuvashera", "Language_cy": "Galesera", "Language_da": "Daniera", "Language_de": "Alemana", @@ -350,6 +358,7 @@ "Language_et": "Estoniera", "Language_eu": "Euskara", "Language_fa": "Persiera", + "Language_ff": "Fula", "Language_fi": "Finlandiera", "Language_fj": "Fijiera", "Language_fo": "Faroera", @@ -365,14 +374,16 @@ "Language_he": "Hebreera", "Language_hi": "Hindia", "Language_hr": "Kroaziera", - "Language_ht": "Haitiera", + "Language_ht": "Haitiko kreolera", "Language_hu": "Hungariera", "Language_hy": "Armeniera", + "Language_hz": "Herera", "Language_ia": "Interlingua", "Language_id": "Indonesiera", "Language_ie": "Interlingue", "Language_ig": "Igboera", "Language_ii": "Sichuan yia", + "Language_io": "Ido", "Language_is": "Islandiera", "Language_it": "Italiera", "Language_iu": "Inuitera", @@ -381,24 +392,29 @@ "Language_ka": "Georgiera", "Language_kg": "Kikongoa", "Language_ki": "Kikuyuera", + "Language_kj": "Kuanyama", "Language_kk": "Kazakhera", "Language_kl": "Kalaallisutera", "Language_km": "Khemerera", "Language_kn": "Kannadera", "Language_ko": "Koreera", + "Language_kr": "Kanuriera", "Language_ks": "Kashmirera", "Language_ku": "Kurduera", + "Language_kv": "Komiera", "Language_kw": "Kornubiera", "Language_ky": "Kirgizera", "Language_la": "Latina", "Language_lb": "Luxenburgera", "Language_lg": "Gandera", + "Language_li": "Limburgera", "Language_ln": "Lingala", "Language_lo": "Laosera", "Language_lt": "Lituaniera", "Language_lu": "Luba-katangera", "Language_lv": "Letoniera", "Language_mg": "Malagasyera", + "Language_mh": "Marshallera", "Language_mi": "Maoriera", "Language_mk": "Mazedoniera", "Language_ml": "Malayalamera", @@ -407,16 +423,20 @@ "Language_ms": "Malaysiera", "Language_mt": "Maltera", "Language_my": "Burmatarra", + "Language_na": "Nauruera", "Language_nb": "Bokmala (Norvegia)", "Language_nd": "Iparraldeko ndebeleera", "Language_ne": "Nepalera", + "Language_ng": "Ndongera", "Language_nl": "Nederlandera", "Language_nn": "Nynorsk norvegiera", "Language_no": "Norvegiera", + "Language_nr": "Hegoaldeko ndebelera", + "Language_nv": "Navahoera", "Language_ny": "Nyanja", "Language_oc": "Okzitaniera", "Language_om": "Oromoera", - "Language_or": "Oriyera", + "Language_or": "Oriya", "Language_os": "Osetiera", "Language_pa": "Punjabera", "Language_pl": "Poloniera", @@ -429,6 +449,7 @@ "Language_ru": "Errusiera", "Language_rw": "Kinyaruanda", "Language_sa": "Sanskritoa", + "Language_sc": "Sardiniera", "Language_sd": "Sindhia", "Language_se": "Iparraldeko samiera", "Language_sg": "Sangoera", @@ -465,26 +486,28 @@ "Language_uz": "Uzbekera", "Language_ve": "Vendera", "Language_vi": "Vietnamera", + "Language_vo": "Volapüka", + "Language_wa": "Valoniera", "Language_wo": "Wolofera", "Language_xh": "Xhosera", - "Language_yi": "Jiddisha", + "Language_yi": "Yiddisha", "Language_yo": "Yorubera", "Language_zh": "Txinera", "Language_zu": "Zuluera", "LayoutDirection": "ltr", "Minutes": "minutu", - "Month_Long_1": "Urtarrilak", - "Month_Long_10": "Urriak", - "Month_Long_11": "Azaroak", - "Month_Long_12": "Abenduak", - "Month_Long_2": "Otsailak", - "Month_Long_3": "Martxoak", - "Month_Long_4": "Apirilak", - "Month_Long_5": "Maiatzak", - "Month_Long_6": "Ekainak", - "Month_Long_7": "Uztailak", - "Month_Long_8": "Abuztuak", - "Month_Long_9": "Irailak", + "Month_Long_1": "Urtarrila", + "Month_Long_10": "Urria", + "Month_Long_11": "Azaroa", + "Month_Long_12": "Abendua", + "Month_Long_2": "Otsaila", + "Month_Long_3": "Martxoa", + "Month_Long_4": "Apirila", + "Month_Long_5": "Maiatza", + "Month_Long_6": "Ekaina", + "Month_Long_7": "Uztaila", + "Month_Long_8": "Abuztua", + "Month_Long_9": "Iraila", "Month_Long_StandAlone_1": "Urtarrila", "Month_Long_StandAlone_10": "Urria", "Month_Long_StandAlone_11": "Azaroa", @@ -539,13 +562,13 @@ "OneMinute": "1 minutu", "OneMinuteShort": "1 min", "OriginalLanguageName": "Euskara", - "PeriodDay": "Eguna", + "PeriodDay": "eguna", "PeriodDays": "egun", - "PeriodMonth": "Hilabetea", + "PeriodMonth": "hilabetea", "PeriodMonths": "hilabete", - "PeriodWeek": "Astea", + "PeriodWeek": "astea", "PeriodWeeks": "aste", - "PeriodYear": "Urtea", + "PeriodYear": "urtea", "PeriodYears": "urte", "Seconds": "segundo", "Time_AM": "AM", diff --git a/plugins/Intl/lang/fa.json b/plugins/Intl/lang/fa.json index 992ec00575..9edb2ecb7f 100644 --- a/plugins/Intl/lang/fa.json +++ b/plugins/Intl/lang/fa.json @@ -97,7 +97,7 @@ "Country_GP": "گوادلوپ", "Country_GQ": "گینهٔ استوایی", "Country_GR": "یونان", - "Country_GS": "جورجیای جنوبی و جزایر ساندویچ جنوبی", + "Country_GS": "جزایر جورجیای جنوبی و ساندویچ جنوبی", "Country_GT": "گواتمالا", "Country_GU": "گوام", "Country_GW": "گینهٔ بیسائو", @@ -216,7 +216,7 @@ "Country_SO": "سومالی", "Country_SR": "سورینام", "Country_SS": "سودان جنوبی", - "Country_ST": "پرینسیپ و سائوتومه", + "Country_ST": "سائوتومه و پرینسیپ", "Country_SV": "السالوادور", "Country_SX": "سنت مارتن", "Country_SY": "سوریه", @@ -244,7 +244,7 @@ "Country_UY": "اروگوئه", "Country_UZ": "ازبکستان", "Country_VA": "واتیکان", - "Country_VC": "سنت وینسنت و گرنادینها", + "Country_VC": "سنت وینسنت و گرنادین", "Country_VE": "ونزوئلا", "Country_VG": "جزایر ویرجین بریتانیا", "Country_VI": "جزایر ویرجین ایالات متحده", @@ -350,7 +350,7 @@ "Language_cy": "ولزی", "Language_da": "دانمارکی", "Language_de": "آلمانی", - "Language_dv": "مالدیوی", + "Language_dv": "دیوهی", "Language_dz": "جونخایی", "Language_ee": "اوهای", "Language_el": "یونانی", @@ -471,7 +471,7 @@ "Language_st": "سوتویی جنوبی", "Language_su": "سوندایی", "Language_sv": "سوئدی", - "Language_sw": "سواحلی", + "Language_sw": "سواحیلی", "Language_ta": "تامیلی", "Language_te": "تلوگویی", "Language_tg": "تاجیکی", @@ -557,14 +557,14 @@ "NMinutesShort": "%s دقیقه", "NSeconds": "%s ثانیه", "NSecondsShort": "%s ث", - "NumberFormatCurrency": "¤#,##0.00", + "NumberFormatCurrency": "#,##0.00 ¤;-#,##0.00 ¤", "NumberFormatNumber": "#,##0.###", - "NumberFormatPercent": "#,##0%", + "NumberFormatPercent": "% #,##0;% -#,##0", "NumberSymbolDecimal": "٫", "NumberSymbolGroup": "٬", "NumberSymbolMinus": "−", - "NumberSymbolPercent": "٪", - "NumberSymbolPlus": "+", + "NumberSymbolPercent": "٪", + "NumberSymbolPlus": "+", "OneDay": "1 روز", "OneMinute": "1 دقیقه", "OneMinuteShort": "1 دقیقه", diff --git a/plugins/Intl/lang/fi.json b/plugins/Intl/lang/fi.json index ce88fa7bd5..c1ac3de33a 100644 --- a/plugins/Intl/lang/fi.json +++ b/plugins/Intl/lang/fi.json @@ -214,7 +214,7 @@ "Country_SM": "San Marino", "Country_SN": "Senegal", "Country_SO": "Somalia", - "Country_SR": "Surinam", + "Country_SR": "Suriname", "Country_SS": "Etelä-Sudan", "Country_ST": "São Tomé ja Príncipe", "Country_SV": "El Salvador", @@ -527,18 +527,18 @@ "Month_Long_StandAlone_7": "Heinäkuu", "Month_Long_StandAlone_8": "Elokuu", "Month_Long_StandAlone_9": "Syyskuu", - "Month_Short_1": "Tammikuuta", - "Month_Short_10": "Lokakuuta", - "Month_Short_11": "Marraskuuta", - "Month_Short_12": "Joulukuuta", - "Month_Short_2": "Helmikuuta", - "Month_Short_3": "Maaliskuuta", - "Month_Short_4": "Huhtikuuta", - "Month_Short_5": "Toukokuuta", - "Month_Short_6": "Kesäkuuta", - "Month_Short_7": "Heinäkuuta", - "Month_Short_8": "Elokuuta", - "Month_Short_9": "Syyskuuta", + "Month_Short_1": "Tammik.", + "Month_Short_10": "Lokak.", + "Month_Short_11": "Marrask.", + "Month_Short_12": "Jouluk.", + "Month_Short_2": "Helmik.", + "Month_Short_3": "Maalisk.", + "Month_Short_4": "Huhtik.", + "Month_Short_5": "Toukok.", + "Month_Short_6": "Kesäk.", + "Month_Short_7": "Heinäk.", + "Month_Short_8": "Elok.", + "Month_Short_9": "Syysk.", "Month_Short_StandAlone_1": "Tammi", "Month_Short_StandAlone_10": "Loka", "Month_Short_StandAlone_11": "Marras", diff --git a/plugins/Intl/lang/fr.json b/plugins/Intl/lang/fr.json index 3b66a6e02e..9a2fd48a53 100644 --- a/plugins/Intl/lang/fr.json +++ b/plugins/Intl/lang/fr.json @@ -370,8 +370,8 @@ "Language_gd": "Gaélique écossais", "Language_gl": "Galicien", "Language_gn": "Guarani", - "Language_gu": "Gujarati", - "Language_gv": "Manx", + "Language_gu": "Goudjerati", + "Language_gv": "Mannois", "Language_ha": "Haoussa", "Language_he": "Hébreu", "Language_hi": "Hindi", @@ -396,7 +396,7 @@ "Language_ka": "Géorgien", "Language_kg": "Kongo", "Language_ki": "Kikuyu", - "Language_kj": "Kuanyama", + "Language_kj": "Kouanyama", "Language_kk": "Kazakh", "Language_kl": "Groenlandais", "Language_km": "Khmer", @@ -418,7 +418,7 @@ "Language_lu": "Luba-katanga", "Language_lv": "Letton", "Language_mg": "Malgache", - "Language_mh": "Marshall", + "Language_mh": "Marshallais", "Language_mi": "Maori", "Language_mk": "Macédonien", "Language_ml": "Malayalam", @@ -468,7 +468,7 @@ "Language_sq": "Albanais", "Language_sr": "Serbe", "Language_ss": "Swati", - "Language_st": "Sesotho", + "Language_st": "Sotho du Sud", "Language_su": "Soundanais", "Language_sv": "Suédois", "Language_sw": "Swahili", diff --git a/plugins/Intl/lang/gl.json b/plugins/Intl/lang/gl.json index 91d274e898..4b500e2221 100644 --- a/plugins/Intl/lang/gl.json +++ b/plugins/Intl/lang/gl.json @@ -3,7 +3,7 @@ "Continent_afr": "África", "Continent_amc": "América Central", "Continent_amn": "Norteamérica", - "Continent_ams": "Sudamérica", + "Continent_ams": "Suramérica", "Continent_ant": "Antártida", "Continent_asi": "Asia", "Continent_eur": "Europa", @@ -24,20 +24,20 @@ "Country_AW": "Aruba", "Country_AX": "Illas Aland", "Country_AZ": "Acerbaixán", - "Country_BA": "Bosnia e Hercegovina", + "Country_BA": "Bosnia-Hercegovina", "Country_BB": "Barbados", - "Country_BD": "Bangladesh", + "Country_BD": "Bangladés", "Country_BE": "Bélxica", "Country_BF": "Burkina Faso", "Country_BG": "Bulgaria", - "Country_BH": "Bahrein", + "Country_BH": "Bahrain", "Country_BI": "Burundi", "Country_BJ": "Benin", - "Country_BL": "San Bartolomé", + "Country_BL": "Saint-Barthélemy", "Country_BM": "Bermudas", "Country_BN": "Brunei", "Country_BO": "Bolivia", - "Country_BQ": "Caribe neerlandés", + "Country_BQ": "Caribe Neerlandés", "Country_BR": "Brasil", "Country_BS": "Bahamas", "Country_BT": "Bután", @@ -49,19 +49,19 @@ "Country_CC": "Illas Cocos (Keeling)", "Country_CD": "República Democrática do Congo", "Country_CF": "República Centroafricana", - "Country_CG": "Congo", + "Country_CG": "República do Congo", "Country_CH": "Suíza", - "Country_CI": "Costa de Marfil", + "Country_CI": "Costa do Marfil", "Country_CK": "Illas Cook", "Country_CL": "Chile", "Country_CM": "Camerún", - "Country_CN": "China", + "Country_CN": "A China", "Country_CO": "Colombia", "Country_CR": "Costa Rica", "Country_CU": "Cuba", "Country_CV": "Cabo Verde", "Country_CW": "Curaçao", - "Country_CX": "Illa Christmas", + "Country_CX": "Illa de Nadal", "Country_CY": "Chipre", "Country_CZ": "República Checa", "Country_DE": "Alemaña", @@ -69,7 +69,7 @@ "Country_DK": "Dinamarca", "Country_DM": "Dominica", "Country_DO": "República Dominicana", - "Country_DZ": "Arxelia", + "Country_DZ": "Alxeria", "Country_EC": "Ecuador", "Country_EE": "Estonia", "Country_EG": "Exipto", @@ -78,7 +78,7 @@ "Country_ES": "España", "Country_ET": "Etiopía", "Country_FI": "Finlandia", - "Country_FJ": "Fixi", + "Country_FJ": "Fidxi", "Country_FK": "Illas Malvinas", "Country_FM": "Micronesia", "Country_FO": "Illas Feroe", @@ -89,18 +89,18 @@ "Country_GE": "Xeorxia", "Country_GF": "Güiana Francesa", "Country_GG": "Guernsey", - "Country_GH": "Gana", + "Country_GH": "Ghana", "Country_GI": "Xibraltar", - "Country_GL": "Grenlandia", + "Country_GL": "Groenlandia", "Country_GM": "Gambia", "Country_GN": "Guinea", "Country_GP": "Guadalupe", "Country_GQ": "Guinea Ecuatorial", "Country_GR": "Grecia", - "Country_GS": "Xeorxia do Sur e Illas Sandwich", + "Country_GS": "Illas Xeorxia do Sur e Sandwich do Sur", "Country_GT": "Guatemala", "Country_GU": "Guam", - "Country_GW": "Guinea-Bissau", + "Country_GW": "Guinea-Bisau", "Country_GY": "Güiana", "Country_HK": "Hong Kong RAE de China", "Country_HM": "Illa Heard e Illas McDonald", @@ -112,7 +112,7 @@ "Country_IE": "Irlanda", "Country_IL": "Israel", "Country_IM": "Illa de Man", - "Country_IN": "India", + "Country_IN": "A India", "Country_IO": "Territorio Británico do Océano Índico", "Country_IQ": "Iraq", "Country_IR": "Irán", @@ -121,42 +121,42 @@ "Country_JE": "Jersey", "Country_JM": "Xamaica", "Country_JO": "Xordania", - "Country_JP": "Xapón", + "Country_JP": "O Xapón", "Country_KE": "Kenya", "Country_KG": "Quirguicistán", - "Country_KH": "Cambodia", + "Country_KH": "Camboxa", "Country_KI": "Kiribati", "Country_KM": "Comores", - "Country_KN": "San Cristovo e Nevis", + "Country_KN": "Saint Kitts e Nevis", "Country_KP": "Corea do Norte", "Country_KR": "Corea do Sur", "Country_KW": "Kuwait", "Country_KY": "Illas Caimán", - "Country_KZ": "Kazakhstan", + "Country_KZ": "Casaquistán", "Country_LA": "Laos", "Country_LB": "Líbano", "Country_LC": "Santa Lucía", "Country_LI": "Liechtenstein", "Country_LK": "Sri Lanka", "Country_LR": "Liberia", - "Country_LS": "Lesotho", + "Country_LS": "Lesoto", "Country_LT": "Lituania", "Country_LU": "Luxemburgo", "Country_LV": "Letonia", "Country_LY": "Libia", "Country_MA": "Marrocos", "Country_MC": "Mónaco", - "Country_MD": "Moldova", + "Country_MD": "Moldavia", "Country_ME": "Montenegro", - "Country_MF": "San Martiño", + "Country_MF": "Saint-Martin", "Country_MG": "Madagascar", "Country_MH": "Illas Marshall", "Country_MK": "Macedonia", - "Country_ML": "Mali", + "Country_ML": "Malí", "Country_MM": "Myanmar (Birmania)", "Country_MN": "Mongolia", "Country_MO": "Macau RAE de China", - "Country_MP": "Illas Marianas do norte", + "Country_MP": "Illas Marianas do Norte", "Country_MQ": "Martinica", "Country_MR": "Mauritania", "Country_MS": "Montserrat", @@ -178,16 +178,16 @@ "Country_NP": "Nepal", "Country_NR": "Nauru", "Country_NU": "Niue", - "Country_NZ": "Nova Celandia", + "Country_NZ": "Nova Zelandia", "Country_OM": "Omán", "Country_PA": "Panamá", "Country_PE": "Perú", "Country_PF": "Polinesia Francesa", - "Country_PG": "Papúa Nova Guinea", + "Country_PG": "Papúa-Nova Guinea", "Country_PH": "Filipinas", "Country_PK": "Paquistán", "Country_PL": "Polonia", - "Country_PM": "San Pedro e Miguelón", + "Country_PM": "Saint Pierre e Miquelon", "Country_PN": "Illas Pitcairn", "Country_PR": "Porto Rico", "Country_PS": "Territorios palestinos", @@ -214,37 +214,37 @@ "Country_SM": "San Marino", "Country_SN": "Senegal", "Country_SO": "Somalia", - "Country_SR": "Surinam", + "Country_SR": "Suriname", "Country_SS": "Sudán do sur", "Country_ST": "San Tomé e Príncipe", - "Country_SV": "El Salvador", + "Country_SV": "O Salvador", "Country_SX": "Sint Maarten", "Country_SY": "Siria", "Country_SZ": "Suacilandia", "Country_TC": "Illas Turks e Caicos", "Country_TD": "Chad", - "Country_TF": "Territorios Franceses do Sul", + "Country_TF": "Territorios Austrais Franceses", "Country_TG": "Togo", "Country_TH": "Tailandia", "Country_TJ": "Taxiquistán", - "Country_TK": "Tokelau", + "Country_TK": "Toquelau", "Country_TL": "Timor Leste", - "Country_TM": "Turkmenistán", + "Country_TM": "Turcomenistán", "Country_TN": "Tunisia", "Country_TO": "Tonga", "Country_TR": "Turquía", - "Country_TT": "Trindade e Tobago", + "Country_TT": "Trinidad e Tobago", "Country_TV": "Tuvalu", "Country_TW": "Taiwán", "Country_TZ": "Tanzania", "Country_UA": "Ucraína", "Country_UG": "Uganda", - "Country_UM": "Illas Menores Distantes dos EUA.", + "Country_UM": "Illas Ultramarinas dos EUA", "Country_US": "Estados Unidos de América", "Country_UY": "Uruguai", "Country_UZ": "Uzbekistán", "Country_VA": "Cidade do Vaticano", - "Country_VC": "San Vicente e Granadinas", + "Country_VC": "San Vicente e as Granadinas", "Country_VE": "Venezuela", "Country_VG": "Illas Virxes Británicas", "Country_VI": "Illas Virxes Estadounidenses", @@ -254,7 +254,7 @@ "Country_WS": "Samoa", "Country_YE": "Iemen", "Country_YT": "Mayotte", - "Country_ZA": "Sudáfrica", + "Country_ZA": "Suráfrica", "Country_ZM": "Zambia", "Country_ZW": "Cimbabue", "Day_Long_1": "Luns", @@ -272,70 +272,75 @@ "Day_Long_StandAlone_6": "Sábado", "Day_Long_StandAlone_7": "Domingo", "Day_Min_1": "Luns", - "Day_Min_2": "Mt", - "Day_Min_3": "Mc", - "Day_Min_4": "Xv", - "Day_Min_5": "Ve", - "Day_Min_6": "Sáb", - "Day_Min_7": "Dom", - "Day_Min_StandAlone_1": "Luns", - "Day_Min_StandAlone_2": "Mt", - "Day_Min_StandAlone_3": "Mc", - "Day_Min_StandAlone_4": "Xv", - "Day_Min_StandAlone_5": "Ven", - "Day_Min_StandAlone_6": "Sáb", - "Day_Min_StandAlone_7": "Dom", + "Day_Min_2": "Mar.", + "Day_Min_3": "Mér.", + "Day_Min_4": "Xov.", + "Day_Min_5": "Ven.", + "Day_Min_6": "Sáb.", + "Day_Min_7": "Dom.", + "Day_Min_StandAlone_1": "Lu", + "Day_Min_StandAlone_2": "Ma", + "Day_Min_StandAlone_3": "Mé", + "Day_Min_StandAlone_4": "Xo", + "Day_Min_StandAlone_5": "Ve", + "Day_Min_StandAlone_6": "Sá", + "Day_Min_StandAlone_7": "Do", "Day_Short_1": "Luns", - "Day_Short_2": "Mar", - "Day_Short_3": "Mér", - "Day_Short_4": "Xov", - "Day_Short_5": "Ven", - "Day_Short_6": "Sáb", - "Day_Short_7": "Dom", - "Day_Short_StandAlone_1": "Lun", - "Day_Short_StandAlone_2": "Mar", - "Day_Short_StandAlone_3": "Mér", - "Day_Short_StandAlone_4": "Xov", - "Day_Short_StandAlone_5": "Ven", - "Day_Short_StandAlone_6": "Sáb", - "Day_Short_StandAlone_7": "Dom", + "Day_Short_2": "Mar.", + "Day_Short_3": "Mér.", + "Day_Short_4": "Xov.", + "Day_Short_5": "Ven.", + "Day_Short_6": "Sáb.", + "Day_Short_7": "Dom.", + "Day_Short_StandAlone_1": "Luns", + "Day_Short_StandAlone_2": "Mar.", + "Day_Short_StandAlone_3": "Mér.", + "Day_Short_StandAlone_4": "Xov.", + "Day_Short_StandAlone_5": "Ven.", + "Day_Short_StandAlone_6": "Sáb.", + "Day_Short_StandAlone_7": "Dom.", "EnglishLanguageName": "Galician", - "Format_DateTime_Long": "EEEE dd MMMM y {time}", - "Format_DateTime_Short": "d MMM, y {time}", - "Format_Date_Day_Month": "E d MMM", - "Format_Date_Long": "EEEE dd MMMM y", - "Format_Date_Short": "d MMM, y", - "Format_Interval_Long_D": "d–d MMMM, y", - "Format_Interval_Long_M": "d MMMM – d MMMM, y", - "Format_Interval_Long_Y": "d MMMM, y – d MMMM, y", - "Format_Interval_Short_D": "d–d MMM, y", - "Format_Interval_Short_M": "d MMM – d MMM, y", - "Format_Interval_Short_Y": "d MMM, y – d MMM, y", - "Format_Month_Long": "MMMM y", - "Format_Month_Short": "MMM y", + "Format_DateTime_Long": "EEEE, d 'de' MMMM 'de' y {time}", + "Format_DateTime_Short": "d 'de' MMM 'de' y {time}", + "Format_Date_Day_Month": "ccc, d 'de' MMM", + "Format_Date_Long": "EEEE, d 'de' MMMM 'de' y", + "Format_Date_Short": "d 'de' MMM 'de' y", + "Format_Interval_Long_D": "d–d 'de' MMMM 'de' y", + "Format_Interval_Long_M": "d MMMM – d MMMM 'de' y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Short_D": "d–d 'de' MMMM 'de' y", + "Format_Interval_Short_M": "d MMM – d MMM 'de' y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", + "Format_Month_Long": "LLLL 'de' y", + "Format_Month_Short": "LLL 'de' y", "Format_Time": "{time}", "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "horas", + "Language_aa": "Afar", "Language_ab": "Abkhazo", - "Language_af": "Afrikaans", + "Language_af": "Africáner", "Language_ak": "Akán", "Language_am": "Amárico", "Language_an": "Aragonés", "Language_ar": "Árabe", - "Language_as": "Assamés", + "Language_as": "Asamés", + "Language_av": "Avar", "Language_ay": "Aimará", "Language_az": "Acerbaixano", "Language_ba": "Baskir", "Language_be": "Bielorruso", "Language_bg": "Búlgaro", + "Language_bi": "Bislama", + "Language_bm": "Bambaro", "Language_bn": "Bengalí", "Language_bo": "Tibetano", "Language_br": "Bretón", - "Language_bs": "Bosnio", + "Language_bs": "Bosníaco", "Language_ca": "Catalán", "Language_ce": "Checheno", + "Language_ch": "Chamorro", "Language_co": "Corso", "Language_cs": "Checo", "Language_cu": "Eslavo eclesiástico", @@ -345,7 +350,7 @@ "Language_de": "Alemán", "Language_dv": "Divehi", "Language_dz": "Dzongkha", - "Language_ee": "Ewé", + "Language_ee": "Ewe", "Language_el": "Grego", "Language_en": "Inglés", "Language_eo": "Esperanto", @@ -353,16 +358,17 @@ "Language_et": "Estoniano", "Language_eu": "Éuscaro", "Language_fa": "Persa", + "Language_ff": "Fula", "Language_fi": "Finés", - "Language_fj": "Fixiano", - "Language_fo": "Faroés", + "Language_fj": "Fidxiano", + "Language_fo": "Feroés", "Language_fr": "Francés", "Language_fy": "Frisón", "Language_ga": "Irlandés", "Language_gd": "Gaélico escocés", "Language_gl": "Galego", "Language_gn": "Guaraní", - "Language_gu": "Guxaratiano", + "Language_gu": "Guxaratí", "Language_gv": "Manx", "Language_ha": "Hausa", "Language_he": "Hebreo", @@ -371,33 +377,43 @@ "Language_ht": "Haitiano", "Language_hu": "Húngaro", "Language_hy": "Armenio", + "Language_hz": "Herero", "Language_ia": "Interlingua", "Language_id": "Indonesio", "Language_ig": "Ibo", "Language_ii": "Yi sichuanés", + "Language_io": "Ido", "Language_is": "Islandés", "Language_it": "Italiano", + "Language_iu": "Inuktitut", "Language_ja": "Xaponés", "Language_jv": "Xavanés", "Language_ka": "Xeorxiano", "Language_kg": "Kongo", "Language_ki": "Kikuyu", + "Language_kj": "Kuanyama", "Language_kk": "Casaco", - "Language_km": "Cambodiano", - "Language_kn": "Kannada", + "Language_kl": "Groenlandés occidental", + "Language_km": "Khmer", + "Language_kn": "Canarés", "Language_ko": "Coreano", + "Language_kr": "Canuri", "Language_ks": "Cachemir", "Language_ku": "Kurdo", + "Language_kv": "Komi", + "Language_kw": "Córnico", "Language_ky": "Quirguiz", "Language_la": "Latín", "Language_lb": "Luxemburgués", "Language_lg": "Ganda", + "Language_li": "Limburgués", "Language_ln": "Lingala", - "Language_lo": "Laotiano", + "Language_lo": "Laosiano", "Language_lt": "Lituano", - "Language_lu": "Luba-Katanga", + "Language_lu": "Luba-katanga", "Language_lv": "Letón", "Language_mg": "Malgaxe", + "Language_mh": "Marshalés", "Language_mi": "Maorí", "Language_mk": "Macedonio", "Language_ml": "Malabar", @@ -406,20 +422,24 @@ "Language_ms": "Malaio", "Language_mt": "Maltés", "Language_my": "Birmano", + "Language_na": "Nauru", "Language_nb": "Noruegués bokmal", "Language_nd": "Ndebele do norte", "Language_ne": "Nepalí", + "Language_ng": "Ndonga", "Language_nl": "Holandés", "Language_nn": "Noruegués nynorsk", "Language_no": "Noruegués", + "Language_nr": "Ndebele do sur", + "Language_nv": "Navajo", "Language_ny": "Chewa", "Language_oc": "Occitano", "Language_om": "Oromo", "Language_or": "Oriya", "Language_os": "Osetio", - "Language_pa": "Punjabi", + "Language_pa": "Panxabiano", "Language_pl": "Polaco", - "Language_ps": "Paxtún", + "Language_ps": "Pashtu", "Language_pt": "Portugués", "Language_qu": "Quechua", "Language_rm": "Romanche", @@ -428,8 +448,9 @@ "Language_ru": "Ruso", "Language_rw": "Ruandés", "Language_sa": "Sánscrito", + "Language_sc": "Sardo", "Language_sd": "Sindhi", - "Language_se": "Sami do norte", + "Language_se": "Saami do norte", "Language_sg": "Sango", "Language_si": "Cingalés", "Language_sk": "Eslovaco", @@ -440,22 +461,23 @@ "Language_sq": "Albanés", "Language_sr": "Serbio", "Language_ss": "Swati", - "Language_st": "Sesoto", - "Language_su": "Sondanés", + "Language_st": "Sesotho", + "Language_su": "Sundanés", "Language_sv": "Sueco", - "Language_sw": "Swahili", - "Language_ta": "Tamil", - "Language_te": "Telugu", + "Language_sw": "Suahili", + "Language_ta": "Támil", + "Language_te": "Telugú", "Language_tg": "Taxico", "Language_th": "Tailandés", "Language_ti": "Tigriña", - "Language_tk": "Turcomano", + "Language_tk": "Turcomán", "Language_tl": "Tagalo", "Language_tn": "Tswana", "Language_to": "Tonganés", "Language_tr": "Turco", - "Language_ts": "Xitsonga", + "Language_ts": "Tsonga", "Language_tt": "Tártaro", + "Language_tw": "Twi", "Language_ty": "Tahitiano", "Language_ug": "Uigur", "Language_uk": "Ucraíno", @@ -463,10 +485,12 @@ "Language_uz": "Uzbeco", "Language_ve": "Venda", "Language_vi": "Vietnamita", + "Language_vo": "Volapuk", + "Language_wa": "Valón", "Language_wo": "Wólof", "Language_xh": "Xhosa", "Language_yi": "Yiddish", - "Language_yo": "Ioruba", + "Language_yo": "Yoruba", "Language_zh": "Chinés", "Language_zu": "Zulú", "LayoutDirection": "ltr", @@ -495,39 +519,39 @@ "Month_Long_StandAlone_7": "Xullo", "Month_Long_StandAlone_8": "Agosto", "Month_Long_StandAlone_9": "Setembro", - "Month_Short_1": "Xan", - "Month_Short_10": "Out", - "Month_Short_11": "Nov", - "Month_Short_12": "Dec", - "Month_Short_2": "Feb", - "Month_Short_3": "Mar", - "Month_Short_4": "Abr", - "Month_Short_5": "Mai", - "Month_Short_6": "Xuñ", - "Month_Short_7": "Xul", - "Month_Short_8": "Ago", - "Month_Short_9": "Set", - "Month_Short_StandAlone_1": "Xan", - "Month_Short_StandAlone_10": "Out", - "Month_Short_StandAlone_11": "Nov", - "Month_Short_StandAlone_12": "Dec", - "Month_Short_StandAlone_2": "Feb", - "Month_Short_StandAlone_3": "Mar", - "Month_Short_StandAlone_4": "Abr", - "Month_Short_StandAlone_5": "Mai", - "Month_Short_StandAlone_6": "Xuñ", - "Month_Short_StandAlone_7": "Xul", - "Month_Short_StandAlone_8": "Ago", - "Month_Short_StandAlone_9": "Set", + "Month_Short_1": "Xan.", + "Month_Short_10": "Out.", + "Month_Short_11": "Nov.", + "Month_Short_12": "Dec.", + "Month_Short_2": "Feb.", + "Month_Short_3": "Mar.", + "Month_Short_4": "Abr.", + "Month_Short_5": "Maio", + "Month_Short_6": "Xuño", + "Month_Short_7": "Xul.", + "Month_Short_8": "Ago.", + "Month_Short_9": "Set.", + "Month_Short_StandAlone_1": "Xan.", + "Month_Short_StandAlone_10": "Out.", + "Month_Short_StandAlone_11": "Nov.", + "Month_Short_StandAlone_12": "Dec.", + "Month_Short_StandAlone_2": "Feb.", + "Month_Short_StandAlone_3": "Mar.", + "Month_Short_StandAlone_4": "Abr.", + "Month_Short_StandAlone_5": "Maio", + "Month_Short_StandAlone_6": "Xuño", + "Month_Short_StandAlone_7": "Xul.", + "Month_Short_StandAlone_8": "Ago.", + "Month_Short_StandAlone_9": "Set.", "NDays": "%s días", "NHoursShort": "%s h", "NMinutes": "%s minutos", "NMinutesShort": "%s min", "NSeconds": "%s segundos", "NSecondsShort": "%s s", - "NumberFormatCurrency": "¤#,##0.00", + "NumberFormatCurrency": "#,##0.00 ¤", "NumberFormatNumber": "#,##0.###", - "NumberFormatPercent": "#,##0%", + "NumberFormatPercent": "#,##0 %", "NumberSymbolDecimal": ",", "NumberSymbolGroup": ".", "NumberSymbolMinus": "-", @@ -537,19 +561,19 @@ "OneMinute": "1 minuto", "OneMinuteShort": "1 min", "OriginalLanguageName": "Galego", - "PeriodDay": "Día", + "PeriodDay": "día", "PeriodDays": "días", - "PeriodMonth": "Mes", + "PeriodMonth": "mes", "PeriodMonths": "meses", - "PeriodWeek": "Semana", + "PeriodWeek": "semana", "PeriodWeeks": "semanas", - "PeriodYear": "Ano", + "PeriodYear": "ano", "PeriodYears": "anos", "Seconds": "segundos", "Time_AM": "a.m.", "Time_PM": "p.m.", "Today": "Hoxe", - "Year_Short": "Ano", + "Year_Short": "a.", "Yesterday": "Onte" } }
\ No newline at end of file diff --git a/plugins/Intl/lang/he.json b/plugins/Intl/lang/he.json index 78f07a3bc1..c3367fb439 100644 --- a/plugins/Intl/lang/he.json +++ b/plugins/Intl/lang/he.json @@ -42,7 +42,7 @@ "Country_BS": "איי בהאמה", "Country_BT": "בהוטן", "Country_BV": "איי בובה", - "Country_BW": "בוטסוואנה", + "Country_BW": "בוצוואנה", "Country_BY": "בלארוס", "Country_BZ": "בליז", "Country_CA": "קנדה", @@ -61,9 +61,9 @@ "Country_CU": "קובה", "Country_CV": "כף ורדה", "Country_CW": "קוראסאו", - "Country_CX": "אי חג המולד", + "Country_CX": "האי כריסטמס", "Country_CY": "קפריסין", - "Country_CZ": "צ׳כיה", + "Country_CZ": "הרפובליקה הצ׳כית", "Country_DE": "גרמניה", "Country_DJ": "ג׳יבוטי", "Country_DK": "דנמרק", @@ -83,7 +83,7 @@ "Country_FM": "מיקרונזיה", "Country_FO": "איי פארו", "Country_FR": "צרפת", - "Country_GA": "גאבון", + "Country_GA": "גבון", "Country_GB": "הממלכה המאוחדת", "Country_GD": "גרנדה", "Country_GE": "גאורגיה", @@ -93,17 +93,17 @@ "Country_GI": "גיברלטר", "Country_GL": "גרינלנד", "Country_GM": "גמביה", - "Country_GN": "גיניאה", + "Country_GN": "גינאה", "Country_GP": "גוואדלופ", - "Country_GQ": "גיניאה המשוונית", + "Country_GQ": "גינאה המשוונית", "Country_GR": "יוון", "Country_GS": "ג׳ורג׳יה הדרומית ואיי סנדוויץ׳ הדרומיים", "Country_GT": "גואטמלה", "Country_GU": "גואם", - "Country_GW": "גיניאה-ביסאו", + "Country_GW": "גינאה ביסאו", "Country_GY": "גיאנה", - "Country_HK": "הונג קונג - מחוז מנהלי מיוחד של סין", - "Country_HM": "האי הרד ואיי מקדונלד", + "Country_HK": "הונג קונג (מחוז מנהלי מיוחד של סין)", + "Country_HM": "איי הרד ומקדונלד", "Country_HN": "הונדורס", "Country_HR": "קרואטיה", "Country_HT": "האיטי", @@ -153,9 +153,9 @@ "Country_MH": "איי מרשל", "Country_MK": "מקדוניה", "Country_ML": "מאלי", - "Country_MM": "מיאנמאר (בורמה)", + "Country_MM": "מיאנמר (בורמה)", "Country_MN": "מונגוליה", - "Country_MO": "מקאו - מחוז מנהלי מיוחד של סין", + "Country_MO": "מקאו (מחוז מנהלי מיוחד של סין)", "Country_MP": "איי מריאנה הצפוניים", "Country_MQ": "מרטיניק", "Country_MR": "מאוריטניה", @@ -183,8 +183,8 @@ "Country_PA": "פנמה", "Country_PE": "פרו", "Country_PF": "פולינזיה הצרפתית", - "Country_PG": "פפואה גיניאה החדשה", - "Country_PH": "פיליפינים", + "Country_PG": "פפואה גינאה החדשה", + "Country_PH": "הפיליפינים", "Country_PK": "פקיסטן", "Country_PL": "פולין", "Country_PM": "סנט פייר ומיקלון", @@ -192,7 +192,7 @@ "Country_PR": "פוארטו ריקו", "Country_PS": "השטחים הפלסטיניים", "Country_PT": "פורטוגל", - "Country_PW": "פאלאו", + "Country_PW": "פלאו", "Country_PY": "פרגוואי", "Country_QA": "קטאר", "Country_RE": "ראוניון", @@ -223,23 +223,23 @@ "Country_SZ": "סווזילנד", "Country_TC": "איי טורקס וקאיקוס", "Country_TD": "צ׳אד", - "Country_TF": "טריטוריות דרומיות של צרפת", + "Country_TF": "הטריטוריות הדרומיות של צרפת", "Country_TG": "טוגו", "Country_TH": "תאילנד", "Country_TJ": "טג׳יקיסטן", "Country_TK": "טוקלאו", "Country_TL": "טימור לסטה", "Country_TM": "טורקמניסטן", - "Country_TN": "תוניסיה", + "Country_TN": "טוניסיה", "Country_TO": "טונגה", "Country_TR": "טורקיה", "Country_TT": "טרינידד וטובגו", - "Country_TV": "טובלו", + "Country_TV": "טובאלו", "Country_TW": "טייוואן", "Country_TZ": "טנזניה", "Country_UA": "אוקראינה", "Country_UG": "אוגנדה", - "Country_UM": "איים לחוף ארצות הברית", + "Country_UM": "האיים המרוחקים הקטנים של ארה״ב", "Country_US": "ארצות הברית", "Country_UY": "אורוגוואי", "Country_UZ": "אוזבקיסטן", @@ -256,7 +256,7 @@ "Country_YT": "מאיוט", "Country_ZA": "דרום אפריקה", "Country_ZM": "זמביה", - "Country_ZW": "זימבאבווה", + "Country_ZW": "זימבבואה", "Day_Long_1": "יום שני", "Day_Long_2": "יום שלישי", "Day_Long_3": "יום רביעי", @@ -347,7 +347,7 @@ "Language_cs": "צ׳כית", "Language_cu": "סלאבית כנסייתית עתיקה", "Language_cv": "צ׳ובאש", - "Language_cy": "ולשית", + "Language_cy": "וולשית", "Language_da": "דנית", "Language_de": "גרמנית", "Language_dv": "דיבהי", @@ -365,19 +365,19 @@ "Language_fj": "פיג׳ית", "Language_fo": "פארואזית", "Language_fr": "צרפתית", - "Language_fy": "פריזית", + "Language_fy": "פריזית מערבית", "Language_ga": "אירית", "Language_gd": "גאלית סקוטית", "Language_gl": "גליציאנית", "Language_gn": "גוארני", - "Language_gu": "גוג׳ראטית", + "Language_gu": "גוג׳ארטי", "Language_gv": "מאנית", "Language_ha": "האוסה", "Language_he": "עברית", "Language_hi": "הינדי", - "Language_ho": "הארי מוטו", + "Language_ho": "הירי מוטו", "Language_hr": "קרואטית", - "Language_ht": "האיטית", + "Language_ht": "קריאולית (האיטי)", "Language_hu": "הונגרית", "Language_hy": "ארמנית", "Language_hz": "הררו", @@ -385,21 +385,21 @@ "Language_id": "אינדונזית", "Language_ie": "אינטרלינגה", "Language_ig": "איגבו", - "Language_ii": "סיצ׳ואן יי", + "Language_ii": "סצ׳ואן יי", "Language_ik": "אינופיאק", "Language_io": "אידו", "Language_is": "איסלנדית", "Language_it": "איטלקית", "Language_iu": "אינוקטיטוט", "Language_ja": "יפנית", - "Language_jv": "יאוונית", + "Language_jv": "יאוואית", "Language_ka": "גאורגית", "Language_kg": "קונגו", "Language_ki": "קיקויו", "Language_kj": "קואניאמה", "Language_kk": "קזחית", - "Language_kl": "קאלאליסוטית", - "Language_km": "קמרית", + "Language_kl": "גרינלנדית", + "Language_km": "חמרית", "Language_kn": "קנאדה", "Language_ko": "קוריאנית", "Language_kr": "קאנורי", @@ -411,53 +411,53 @@ "Language_la": "לטינית", "Language_lb": "לוקסמבורגית", "Language_lg": "גאנדה", - "Language_li": "לימבורגיש", + "Language_li": "לימבורגית", "Language_ln": "לינגלה", - "Language_lo": "לאית", + "Language_lo": "לאו", "Language_lt": "ליטאית", "Language_lu": "לובה-קטנגה", "Language_lv": "לטבית", "Language_mg": "מלגשית", - "Language_mh": "מרשאלס", + "Language_mh": "מרשלית", "Language_mi": "מאורית", "Language_mk": "מקדונית", - "Language_ml": "מלאיאלם", + "Language_ml": "מליאלאם", "Language_mn": "מונגולית", - "Language_mr": "מרטהי", + "Language_mr": "מראטהי", "Language_ms": "מלאית", "Language_mt": "מלטית", "Language_my": "בורמזית", "Language_na": "נאורית", "Language_nb": "נורווגית ספרותית", - "Language_nd": "צפון נדבלה", + "Language_nd": "נדבלה צפונית", "Language_ne": "נפאלית", "Language_ng": "נדונגה", "Language_nl": "הולנדית", "Language_nn": "נורווגית חדשה", - "Language_no": "נורבגית", - "Language_nr": "דרום נדבלה", - "Language_nv": "נבחו", + "Language_no": "נורווגית", + "Language_nr": "נדבלה דרומית", + "Language_nv": "נאוואחו", "Language_ny": "ניאנג׳ה", "Language_oc": "אוקסיטנית", "Language_oj": "אוג׳יבווה", "Language_om": "אורומו", "Language_or": "אוריה", "Language_os": "אוסטית", - "Language_pa": "פנג׳אבית", + "Language_pa": "פנג׳אבי", "Language_pi": "פאלי", "Language_pl": "פולנית", "Language_ps": "פאשטו", - "Language_pt": "פורטוגלית", + "Language_pt": "פורטוגזית", "Language_qu": "קצ׳ואה", "Language_rm": "רומאנש", "Language_rn": "קירונדי", "Language_ro": "רומנית", "Language_ru": "רוסית", - "Language_rw": "קינירואנדה", + "Language_rw": "קנירואנדית", "Language_sa": "סנסקריט", "Language_sc": "סרדינית", "Language_sd": "סינדהית", - "Language_se": "לאפית צפונית", + "Language_se": "סמי צפונית", "Language_sg": "סנגו", "Language_si": "סינהלה", "Language_sk": "סלובקית", @@ -467,26 +467,26 @@ "Language_so": "סומלית", "Language_sq": "אלבנית", "Language_sr": "סרבית", - "Language_ss": "סיסוואטי", - "Language_st": "ססות׳ו", - "Language_su": "סונדנית", + "Language_ss": "סאווזי", + "Language_st": "סותו דרומית", + "Language_su": "סונדנזית", "Language_sv": "שוודית", - "Language_sw": "סווהילית", + "Language_sw": "סווהילי", "Language_ta": "טמילית", "Language_te": "טלוגו", "Language_tg": "טג׳יקית", "Language_th": "תאית", - "Language_ti": "טיגרינאית", + "Language_ti": "תיגרינית", "Language_tk": "טורקמנית", - "Language_tl": "טגלוג", - "Language_tn": "טוניסיה", - "Language_to": "טונגן", + "Language_tl": "טאגאלוג", + "Language_tn": "סוואנה", + "Language_to": "טונגאית", "Language_tr": "טורקית", "Language_ts": "טסונגה", "Language_tt": "טטרית", "Language_tw": "טווי", "Language_ty": "טהיטית", - "Language_ug": "אויגהור", + "Language_ug": "אויגור", "Language_uk": "אוקראינית", "Language_ur": "אורדו", "Language_uz": "אוזבקית", @@ -494,11 +494,11 @@ "Language_vi": "ויאטנמית", "Language_vo": "וולאפיק", "Language_wa": "וואלון", - "Language_wo": "ג׳ולוף", - "Language_xh": "קסוסה", + "Language_wo": "וולוף", + "Language_xh": "קוסה", "Language_yi": "יידיש", "Language_yo": "יורובה", - "Language_za": "ז׳ואנג", + "Language_za": "זואנג", "Language_zh": "סינית", "Language_zu": "זולו", "LayoutDirection": "rtl", @@ -557,7 +557,7 @@ "NMinutesShort": "%s דק׳", "NSeconds": "%s שניות", "NSecondsShort": "%s שנ׳", - "NumberFormatCurrency": "#,##0.00 ¤", + "NumberFormatCurrency": "#,##0.00 ¤;-#,##0.00 ¤", "NumberFormatNumber": "#,##0.###", "NumberFormatPercent": "#,##0%", "NumberSymbolDecimal": ".", @@ -565,7 +565,7 @@ "NumberSymbolMinus": "-", "NumberSymbolPercent": "%", "NumberSymbolPlus": "+", - "OneDay": "יום", + "OneDay": "יום 1", "OneMinute": "דקה", "OneMinuteShort": "דקה", "OriginalLanguageName": "עברית", diff --git a/plugins/Intl/lang/hi.json b/plugins/Intl/lang/hi.json index d9284fd761..8d84e5b37c 100644 --- a/plugins/Intl/lang/hi.json +++ b/plugins/Intl/lang/hi.json @@ -110,7 +110,7 @@ "Country_HU": "हंगरी", "Country_ID": "इंडोनेशिया", "Country_IE": "आयरलैंड", - "Country_IL": "इसराइल", + "Country_IL": "इज़राइल", "Country_IM": "आइल ऑफ़ मैन", "Country_IN": "भारत", "Country_IO": "ब्रिटिश हिंद महासागरीय क्षेत्र", @@ -226,7 +226,7 @@ "Country_TF": "फ़्रांसीसी दक्षिणी क्षेत्र", "Country_TG": "टोगो", "Country_TH": "थाईलैंड", - "Country_TJ": "ताजिकिस्तान", + "Country_TJ": "ताज़िकिस्तान", "Country_TK": "तोकेलाउ", "Country_TL": "तिमोर-लेस्त", "Country_TM": "तुर्कमेनिस्तान", @@ -367,7 +367,7 @@ "Language_fr": "फ़्रेंच", "Language_fy": "पश्चिमी फ़्रिसियाई", "Language_ga": "आइरिश", - "Language_gd": "स्काट्स् गायेलिक्", + "Language_gd": "स्कॉटिश गाएलिक", "Language_gl": "गैलिशियन", "Language_gn": "गुआरानी", "Language_gu": "गुजराती", @@ -422,7 +422,7 @@ "Language_mi": "माओरी", "Language_mk": "मैसिडोनियाई", "Language_ml": "मलयालम", - "Language_mn": "मंगोलीयाई", + "Language_mn": "मंगोलियाई", "Language_mr": "मराठी", "Language_ms": "मलय", "Language_mt": "माल्टीज़", @@ -478,7 +478,7 @@ "Language_th": "थाई", "Language_ti": "तिग्रीन्या", "Language_tk": "तुर्कमेन", - "Language_tl": "तागालोग", + "Language_tl": "टैगलॉग", "Language_tn": "सेत्स्वाना", "Language_to": "टोंगन", "Language_tr": "तुर्की", @@ -496,7 +496,7 @@ "Language_wa": "वाल्लून", "Language_wo": "वोलोफ़", "Language_xh": "ख़ोसा", - "Language_yi": "येहुदी", + "Language_yi": "यहूदी", "Language_yo": "योरूबा", "Language_za": "ज़ुआंग", "Language_zh": "चीनी", diff --git a/plugins/Intl/lang/hr.json b/plugins/Intl/lang/hr.json index 39f7d403d9..49c566262c 100644 --- a/plugins/Intl/lang/hr.json +++ b/plugins/Intl/lang/hr.json @@ -11,7 +11,7 @@ "Country_AD": "Andora", "Country_AE": "Ujedinjeni Arapski Emirati", "Country_AF": "Afganistan", - "Country_AG": "Antigua i Barbuda", + "Country_AG": "Antigva i Barbuda", "Country_AI": "Angvila", "Country_AL": "Albanija", "Country_AM": "Armenija", @@ -22,7 +22,7 @@ "Country_AT": "Austrija", "Country_AU": "Australija", "Country_AW": "Aruba", - "Country_AX": "Otoci Aland", + "Country_AX": "Ålandski otoci", "Country_AZ": "Azerbajdžan", "Country_BA": "Bosna i Hercegovina", "Country_BB": "Barbados", @@ -33,8 +33,8 @@ "Country_BH": "Bahrein", "Country_BI": "Burundi", "Country_BJ": "Benin", - "Country_BL": "Sveti Bartolomej", - "Country_BM": "Bermuda", + "Country_BL": "Saint Barthélemy", + "Country_BM": "Bermudi", "Country_BN": "Brunej", "Country_BO": "Bolivija", "Country_BQ": "Karipski otoci Nizozemske", @@ -46,7 +46,7 @@ "Country_BY": "Bjelorusija", "Country_BZ": "Belize", "Country_CA": "Kanada", - "Country_CC": "Kokosovi (Keeling) Otoci", + "Country_CC": "Kokosovi (Keelingovi) otoci", "Country_CD": "Kongo - Kinshasa", "Country_CF": "Srednjoafrička Republika", "Country_CG": "Kongo - Brazzaville", @@ -61,7 +61,7 @@ "Country_CU": "Kuba", "Country_CV": "Zelenortska Republika", "Country_CW": "Curaçao", - "Country_CX": "Božićni Otok", + "Country_CX": "Božićni otok", "Country_CY": "Cipar", "Country_CZ": "Češka Republika", "Country_DE": "Njemačka", @@ -79,22 +79,22 @@ "Country_ET": "Etiopija", "Country_FI": "Finska", "Country_FJ": "Fidži", - "Country_FK": "Falklandski Otoci", + "Country_FK": "Falklandski otoci", "Country_FM": "Mikronezija", - "Country_FO": "Farski Otoci", + "Country_FO": "Farski otoci", "Country_FR": "Francuska", "Country_GA": "Gabon", - "Country_GB": "Velika Britanija", + "Country_GB": "Ujedinjeno Kraljevstvo", "Country_GD": "Grenada", "Country_GE": "Gruzija", - "Country_GF": "Francuska Gvajana", + "Country_GF": "Francuska Gijana", "Country_GG": "Guernsey", "Country_GH": "Gana", "Country_GI": "Gibraltar", "Country_GL": "Grenland", "Country_GM": "Gambija", "Country_GN": "Gvineja", - "Country_GP": "Guadalupa", + "Country_GP": "Guadalupe", "Country_GQ": "Ekvatorska Gvineja", "Country_GR": "Grčka", "Country_GS": "Južna Georgija i Južni Sendvički Otoci", @@ -102,7 +102,7 @@ "Country_GU": "Guam", "Country_GW": "Gvineja Bisau", "Country_GY": "Gvajana", - "Country_HK": "Hong Kong PUP Kina", + "Country_HK": "PUP Hong Kong Kina", "Country_HM": "Otoci Heard i McDonald", "Country_HN": "Honduras", "Country_HR": "Hrvatska", @@ -113,7 +113,7 @@ "Country_IL": "Izrael", "Country_IM": "Otok Man", "Country_IN": "Indija", - "Country_IO": "Britanski Indijskooceanski Teritorij", + "Country_IO": "Britanski Indijskooceanski teritorij", "Country_IQ": "Irak", "Country_IR": "Iran", "Country_IS": "Island", @@ -131,7 +131,7 @@ "Country_KP": "Sjeverna Koreja", "Country_KR": "Južna Koreja", "Country_KW": "Kuvajt", - "Country_KY": "Kajmanski Otoci", + "Country_KY": "Kajmanski otoci", "Country_KZ": "Kazahstan", "Country_LA": "Laos", "Country_LB": "Libanon", @@ -148,17 +148,17 @@ "Country_MC": "Monako", "Country_MD": "Moldavija", "Country_ME": "Crna Gora", - "Country_MF": "Sveti Martin", + "Country_MF": "Saint Martin", "Country_MG": "Madagaskar", "Country_MH": "Maršalovi Otoci", "Country_MK": "Makedonija", "Country_ML": "Mali", - "Country_MM": "Mijanmar (Burma)", + "Country_MM": "Mjanmar (Burma)", "Country_MN": "Mongolija", - "Country_MO": "Makao PUP Kina", - "Country_MP": "Sjeverni Marijanski Otoci", + "Country_MO": "PUP Makao Kina", + "Country_MP": "Sjevernomarijanski otoci", "Country_MQ": "Martinique", - "Country_MR": "Mauritanija", + "Country_MR": "Mauretanija", "Country_MS": "Montserrat", "Country_MT": "Malta", "Country_MU": "Mauricijus", @@ -187,7 +187,7 @@ "Country_PH": "Filipini", "Country_PK": "Pakistan", "Country_PL": "Poljska", - "Country_PM": "Sveti Petar i Mikelon", + "Country_PM": "Saint-Pierre-et-Miquelon", "Country_PN": "Otoci Pitcairn", "Country_PR": "Portoriko", "Country_PS": "Palestinsko Područje", @@ -195,7 +195,7 @@ "Country_PW": "Palau", "Country_PY": "Paragvaj", "Country_QA": "Katar", - "Country_RE": "Reunion", + "Country_RE": "Réunion", "Country_RO": "Rumunjska", "Country_RS": "Srbija", "Country_RU": "Rusija", @@ -223,12 +223,12 @@ "Country_SZ": "Svazi", "Country_TC": "Otoci Turks i Caicos", "Country_TD": "Čad", - "Country_TF": "Francuske Južne i Antarktičke Zemlje", + "Country_TF": "Francuski južni i antarktički teritoriji", "Country_TG": "Togo", "Country_TH": "Tajland", "Country_TJ": "Tadžikistan", "Country_TK": "Tokelau", - "Country_TL": "Istočni Timor", + "Country_TL": "Timor-Leste", "Country_TM": "Turkmenistan", "Country_TN": "Tunis", "Country_TO": "Tonga", @@ -243,11 +243,11 @@ "Country_US": "Sjedinjene Američke Države", "Country_UY": "Urugvaj", "Country_UZ": "Uzbekistan", - "Country_VA": "Sveta Stolica", + "Country_VA": "Vatikanski Grad", "Country_VC": "Sveti Vincent i Grenadini", "Country_VE": "Venezuela", - "Country_VG": "Britanski Djevičanski Otoci", - "Country_VI": "Američki Djevičanski Otoci", + "Country_VG": "Britanski Djevičanski otoci", + "Country_VI": "Američki Djevičanski otoci", "Country_VN": "Vijetnam", "Country_VU": "Vanuatu", "Country_WF": "Wallis i Futuna", @@ -320,7 +320,7 @@ "Hours": "sati", "Language_aa": "Afarski", "Language_ab": "Abhaski", - "Language_ae": "Avestan", + "Language_ae": "Avestički", "Language_af": "Afrikaans", "Language_ak": "Akanski", "Language_am": "Amharski", @@ -328,15 +328,15 @@ "Language_ar": "Arapski", "Language_as": "Asamski", "Language_av": "Avarski", - "Language_ay": "Aymara", + "Language_ay": "Ajmarski", "Language_az": "Azerbajdžanski", "Language_ba": "Baškirski", "Language_be": "Bjeloruski", "Language_bg": "Bugarski", "Language_bi": "Bislama", "Language_bm": "Bambara", - "Language_bn": "Bengalski", - "Language_bo": "Tibetanski", + "Language_bn": "Bangla", + "Language_bo": "Tibetski", "Language_br": "Bretonski", "Language_bs": "Bosanski", "Language_ca": "Katalonski", @@ -346,7 +346,7 @@ "Language_cr": "Cree", "Language_cs": "Češki", "Language_cu": "Crkvenoslavenski", - "Language_cv": "Chuvash", + "Language_cv": "Čuvaški", "Language_cy": "Velški", "Language_da": "Danski", "Language_de": "Njemački", @@ -360,16 +360,16 @@ "Language_et": "Estonski", "Language_eu": "Baskijski", "Language_fa": "Perzijski", - "Language_ff": "Fulah", + "Language_ff": "Fula", "Language_fi": "Finski", "Language_fj": "Fidžijski", "Language_fo": "Ferojski", "Language_fr": "Francuski", "Language_fy": "Zapadnofrizijski", "Language_ga": "Irski", - "Language_gd": "Škotski-galski", + "Language_gd": "Škotski gaelski", "Language_gl": "Galicijski", - "Language_gn": "Guarani", + "Language_gn": "Gvaranski", "Language_gu": "Gudžaratski", "Language_gv": "Manski", "Language_ha": "Hausa", @@ -377,7 +377,7 @@ "Language_hi": "Hindski", "Language_ho": "Hiri motu", "Language_hr": "Hrvatski", - "Language_ht": "Kreolski", + "Language_ht": "Haićanski kreolski", "Language_hu": "Mađarski", "Language_hy": "Armenski", "Language_hz": "Herero", @@ -400,18 +400,18 @@ "Language_kk": "Kazaški", "Language_kl": "Kalaallisut", "Language_km": "Kmerski", - "Language_kn": "Kannadski", + "Language_kn": "Karnatački", "Language_ko": "Korejski", "Language_kr": "Kanuri", "Language_ks": "Kašmirski", "Language_ku": "Kurdski", "Language_kv": "Komi", "Language_kw": "Kornski", - "Language_ky": "Kirgiški", + "Language_ky": "Kirgiski", "Language_la": "Latinski", "Language_lb": "Luksemburški", "Language_lg": "Ganda", - "Language_li": "Limburgish", + "Language_li": "Limburški", "Language_ln": "Lingala", "Language_lo": "Laoski", "Language_lt": "Litavski", @@ -428,16 +428,16 @@ "Language_mt": "Malteški", "Language_my": "Burmanski", "Language_na": "Nauru", - "Language_nb": "Književni norveški", + "Language_nb": "Norveški bokmål", "Language_nd": "Sjeverni ndebele", "Language_ne": "Nepalski", "Language_ng": "Ndonga", "Language_nl": "Nizozemski", - "Language_nn": "Novonorveški", + "Language_nn": "Norveški nynorsk", "Language_no": "Norveški", "Language_nr": "Južni ndebele", "Language_nv": "Navajo", - "Language_ny": "Nyanja", + "Language_ny": "Njandža", "Language_oc": "Okcitanski", "Language_oj": "Ojibwa", "Language_om": "Oromski", @@ -446,18 +446,18 @@ "Language_pa": "Pandžapski", "Language_pi": "Pali", "Language_pl": "Poljski", - "Language_ps": "Paštu", + "Language_ps": "Paštunski", "Language_pt": "Portugalski", - "Language_qu": "Kečua", - "Language_rm": "Romanš", + "Language_qu": "Kečuanski", + "Language_rm": "Retoromanski", "Language_rn": "Rundi", "Language_ro": "Rumunjski", "Language_ru": "Ruski", "Language_rw": "Kinyarwanda", "Language_sa": "Sanskrtski", "Language_sc": "Sardski", - "Language_sd": "Sindhi", - "Language_se": "Južni sami", + "Language_sd": "Sindski", + "Language_se": "Sjeverni sami", "Language_sg": "Sango", "Language_si": "Sinhaleški", "Language_sk": "Slovački", @@ -473,7 +473,7 @@ "Language_sv": "Švedski", "Language_sw": "Svahili", "Language_ta": "Tamilski", - "Language_te": "Telugu", + "Language_te": "Teluški", "Language_tg": "Tadžički", "Language_th": "Tajlandski", "Language_ti": "Tigrinja", @@ -494,10 +494,10 @@ "Language_vi": "Vijetnamski", "Language_vo": "Volapük", "Language_wa": "Valonski", - "Language_wo": "Wolof", + "Language_wo": "Volof", "Language_xh": "Xhosa", "Language_yi": "Jidiš", - "Language_yo": "Joruba", + "Language_yo": "Jorupski", "Language_za": "Zhuang", "Language_zh": "Kineski", "Language_zu": "Zulu", diff --git a/plugins/Intl/lang/hu.json b/plugins/Intl/lang/hu.json index e730da6862..11c04ef705 100644 --- a/plugins/Intl/lang/hu.json +++ b/plugins/Intl/lang/hu.json @@ -43,10 +43,10 @@ "Country_BT": "Bhután", "Country_BV": "Bouvet-sziget", "Country_BW": "Botswana", - "Country_BY": "Fehéroroszország", + "Country_BY": "Belarusz", "Country_BZ": "Belize", "Country_CA": "Kanada", - "Country_CC": "Kókusz-szigetek", + "Country_CC": "Kókusz (Keeling)-szigetek", "Country_CD": "Kongó - Kinshasa", "Country_CF": "Közép-afrikai Köztársaság", "Country_CG": "Kongó - Brazzaville", @@ -102,7 +102,7 @@ "Country_GU": "Guam", "Country_GW": "Bissau-Guinea", "Country_GY": "Guyana", - "Country_HK": "Hongkong SAR Kína", + "Country_HK": "Hongkong KKT", "Country_HM": "Heard-sziget és McDonald-szigetek", "Country_HN": "Honduras", "Country_HR": "Horvátország", @@ -135,7 +135,7 @@ "Country_KZ": "Kazahsztán", "Country_LA": "Laosz", "Country_LB": "Libanon", - "Country_LC": "Santa Lucia", + "Country_LC": "Saint Lucia", "Country_LI": "Liechtenstein", "Country_LK": "Srí Lanka", "Country_LR": "Libéria", @@ -155,7 +155,7 @@ "Country_ML": "Mali", "Country_MM": "Mianmar (Burma)", "Country_MN": "Mongólia", - "Country_MO": "Makaó SAR Kína", + "Country_MO": "Makaó KKT", "Country_MP": "Északi Mariana-szigetek", "Country_MQ": "Martinique", "Country_MR": "Mauritánia", @@ -187,7 +187,7 @@ "Country_PH": "Fülöp-szigetek", "Country_PK": "Pakisztán", "Country_PL": "Lengyelország", - "Country_PM": "Saint Pierre és Miquelon", + "Country_PM": "Saint-Pierre és Miquelon", "Country_PN": "Pitcairn-szigetek", "Country_PR": "Puerto Rico", "Country_PS": "Palesztin Terület", @@ -195,7 +195,7 @@ "Country_PW": "Palau", "Country_PY": "Paraguay", "Country_QA": "Katar", - "Country_RE": "Reunion", + "Country_RE": "Réunion", "Country_RO": "Románia", "Country_RS": "Szerbia", "Country_RU": "Oroszország", @@ -208,7 +208,7 @@ "Country_SG": "Szingapúr", "Country_SH": "Szent Ilona", "Country_SI": "Szlovénia", - "Country_SJ": "Spitzbergák és Jan Mayen-szigetek", + "Country_SJ": "Svalbard és Jan Mayen", "Country_SK": "Szlovákia", "Country_SL": "Sierra Leone", "Country_SM": "San Marino", @@ -239,7 +239,7 @@ "Country_TZ": "Tanzánia", "Country_UA": "Ukrajna", "Country_UG": "Uganda", - "Country_UM": "Amerikai Csendes-óceáni Szigetek", + "Country_UM": "Az Amerikai Egyesült Államok lakatlan külbirtokai", "Country_US": "Egyesült Államok", "Country_UY": "Uruguay", "Country_UZ": "Üzbegisztán", @@ -250,7 +250,7 @@ "Country_VI": "Amerikai Virgin-szigetek", "Country_VN": "Vietnam", "Country_VU": "Vanuatu", - "Country_WF": "Wallis- és Futuna-szigetek", + "Country_WF": "Wallis és Futuna", "Country_WS": "Szamoa", "Country_YE": "Jemen", "Country_YT": "Mayotte", @@ -331,11 +331,11 @@ "Language_ay": "Ajmara", "Language_az": "Azerbajdzsáni", "Language_ba": "Baskír", - "Language_be": "Belorusz", + "Language_be": "Belarusz", "Language_bg": "Bolgár", "Language_bi": "Bislama", "Language_bm": "Bambara", - "Language_bn": "Bengáli", + "Language_bn": "Bangla", "Language_bo": "Tibeti", "Language_br": "Breton", "Language_bs": "Bosnyák", @@ -351,7 +351,7 @@ "Language_da": "Dán", "Language_de": "Német", "Language_dv": "Divehi", - "Language_dz": "Butáni", + "Language_dz": "Dzsonga", "Language_ee": "Eve", "Language_el": "Görög", "Language_en": "Angol", @@ -365,19 +365,19 @@ "Language_fj": "Fidzsi", "Language_fo": "Feröeri", "Language_fr": "Francia", - "Language_fy": "Fríz", + "Language_fy": "Nyugati fríz", "Language_ga": "Ír", - "Language_gd": "Skót gael", - "Language_gl": "Galíciai", + "Language_gd": "Skóciai kelta", + "Language_gl": "Gallego", "Language_gn": "Guarani", - "Language_gu": "Gudzsarati", + "Language_gu": "Gudzsaráti", "Language_gv": "Man-szigeti", "Language_ha": "Hausza", "Language_he": "Héber", "Language_hi": "Hindi", "Language_ho": "Hiri motu", "Language_hr": "Horvát", - "Language_ht": "Haiti", + "Language_ht": "Haiti kreol", "Language_hu": "Magyar", "Language_hy": "Örmény", "Language_hz": "Herero", @@ -399,11 +399,11 @@ "Language_kj": "Kuanyama", "Language_kk": "Kazah", "Language_kl": "Grönlandi", - "Language_km": "Kambodzsai", + "Language_km": "Khmer", "Language_kn": "Kannada", "Language_ko": "Koreai", "Language_kr": "Kanuri", - "Language_ks": "Kásmíri", + "Language_ks": "Kasmíri", "Language_ku": "Kurd", "Language_kv": "Komi", "Language_kw": "Korni", @@ -413,35 +413,35 @@ "Language_lg": "Ganda", "Language_li": "Limburgi", "Language_ln": "Lingala", - "Language_lo": "Laoszi", + "Language_lo": "Lao", "Language_lt": "Litván", "Language_lu": "Luba-katanga", "Language_lv": "Lett", - "Language_mg": "Málgas", + "Language_mg": "Malgas", "Language_mh": "Marshalli", "Language_mi": "Maori", "Language_mk": "Macedón", "Language_ml": "Malajálam", "Language_mn": "Mongol", - "Language_mr": "Marathi", + "Language_mr": "Maráthi", "Language_ms": "Maláj", "Language_mt": "Máltai", "Language_my": "Burmai", "Language_na": "Naurui", - "Language_nb": "Norvég bokmal", + "Language_nb": "Norvég (bokmál)", "Language_nd": "Északi ndebele", "Language_ne": "Nepáli", "Language_ng": "Ndonga", "Language_nl": "Holland", - "Language_nn": "Norvég nynorsk", + "Language_nn": "Norvég (nynrosk)", "Language_no": "Norvég", "Language_nr": "Déli ndebele", "Language_nv": "Navahó", - "Language_ny": "Nyanja", + "Language_ny": "Nyandzsa", "Language_oc": "Okszitán", "Language_oj": "Ojibva", - "Language_om": "Oromói", - "Language_or": "Orija", + "Language_om": "Oromo", + "Language_or": "Odia", "Language_os": "Oszét", "Language_pa": "Pandzsábi", "Language_pi": "Pali", @@ -449,11 +449,11 @@ "Language_ps": "Pastu", "Language_pt": "Portugál", "Language_qu": "Kecsua", - "Language_rm": "Réto-román", + "Language_rm": "Rétoromán", "Language_rn": "Kirundi", "Language_ro": "Román", "Language_ru": "Orosz", - "Language_rw": "Kiruanda", + "Language_rw": "Kinyarvanda", "Language_sa": "Szanszkrit", "Language_sc": "Szardíniai", "Language_sd": "Szindhi", @@ -464,11 +464,11 @@ "Language_sl": "Szlovén", "Language_sm": "Szamoai", "Language_sn": "Sona", - "Language_so": "Szomáliai", + "Language_so": "Szomáli", "Language_sq": "Albán", "Language_sr": "Szerb", "Language_ss": "Sziszuati", - "Language_st": "Szeszotó", + "Language_st": "Déli szeszotó", "Language_su": "Szundanéz", "Language_sv": "Svéd", "Language_sw": "Szuahéli", @@ -476,11 +476,11 @@ "Language_te": "Telugu", "Language_tg": "Tadzsik", "Language_th": "Thai", - "Language_ti": "Tigrinja", + "Language_ti": "Tigrinya", "Language_tk": "Türkmén", "Language_tl": "Tagalog", "Language_tn": "Szecsuáni", - "Language_to": "Tonga", + "Language_to": "Tongai", "Language_tr": "Török", "Language_ts": "Conga", "Language_tt": "Tatár", @@ -495,7 +495,7 @@ "Language_vo": "Volapük", "Language_wa": "Vallon", "Language_wo": "Volof", - "Language_xh": "Hosza", + "Language_xh": "Xhosza", "Language_yi": "Jiddis", "Language_yo": "Joruba", "Language_za": "Zsuang", diff --git a/plugins/Intl/lang/id.json b/plugins/Intl/lang/id.json index 2ed5145d34..eefdadfcf4 100644 --- a/plugins/Intl/lang/id.json +++ b/plugins/Intl/lang/id.json @@ -4,7 +4,7 @@ "Continent_amc": "Amerika Tengah", "Continent_amn": "Amerika Utara", "Continent_ams": "Amerika Selatan", - "Continent_ant": "Antarktika", + "Continent_ant": "Antartika", "Continent_asi": "Asia", "Continent_eur": "Eropa", "Continent_oce": "Oseania", @@ -16,7 +16,7 @@ "Country_AL": "Albania", "Country_AM": "Armenia", "Country_AO": "Angola", - "Country_AQ": "Antarktika", + "Country_AQ": "Antartika", "Country_AR": "Argentina", "Country_AS": "Samoa Amerika", "Country_AT": "Austria", @@ -33,7 +33,7 @@ "Country_BH": "Bahrain", "Country_BI": "Burundi", "Country_BJ": "Benin", - "Country_BL": "Saint Barthelemy", + "Country_BL": "Saint Barthélemy", "Country_BM": "Bermuda", "Country_BN": "Brunei", "Country_BO": "Bolivia", @@ -46,7 +46,7 @@ "Country_BY": "Belarus", "Country_BZ": "Belize", "Country_CA": "Kanada", - "Country_CC": "Kepulauan Cocos", + "Country_CC": "Kepulauan Cocos (Keeling)", "Country_CD": "Kongo - Kinshasa", "Country_CF": "Republik Afrika Tengah", "Country_CG": "Kongo - Brazzaville", @@ -55,7 +55,7 @@ "Country_CK": "Kepulauan Cook", "Country_CL": "Cile", "Country_CM": "Kamerun", - "Country_CN": "China", + "Country_CN": "Tiongkok", "Country_CO": "Kolombia", "Country_CR": "Kosta Rika", "Country_CU": "Kuba", @@ -84,7 +84,7 @@ "Country_FO": "Kepulauan Faroe", "Country_FR": "Prancis", "Country_GA": "Gabon", - "Country_GB": "Inggris", + "Country_GB": "Inggris Raya", "Country_GD": "Grenada", "Country_GE": "Georgia", "Country_GF": "Guyana Prancis", @@ -102,7 +102,7 @@ "Country_GU": "Guam", "Country_GW": "Guinea-Bissau", "Country_GY": "Guyana", - "Country_HK": "Hong Kong SAR China", + "Country_HK": "Hong Kong SAR Tiongkok", "Country_HM": "Pulau Heard dan Kepulauan McDonald", "Country_HN": "Honduras", "Country_HR": "Kroasia", @@ -155,7 +155,7 @@ "Country_ML": "Mali", "Country_MM": "Myanmar (Burma)", "Country_MN": "Mongolia", - "Country_MO": "Makau SAR China", + "Country_MO": "Makau SAR Tiongkok", "Country_MP": "Kepulauan Mariana Utara", "Country_MQ": "Martinik", "Country_MR": "Mauritania", @@ -329,7 +329,7 @@ "Language_as": "Assam", "Language_av": "Avar", "Language_ay": "Aymara", - "Language_az": "Azerbaijan", + "Language_az": "Azerbaijani", "Language_ba": "Bashkir", "Language_be": "Belarusia", "Language_bg": "Bulgaria", @@ -358,26 +358,26 @@ "Language_eo": "Esperanto", "Language_es": "Spanyol", "Language_et": "Esti", - "Language_eu": "Bask", + "Language_eu": "Basque", "Language_fa": "Persia", "Language_ff": "Fula", "Language_fi": "Suomi", "Language_fj": "Fiji", - "Language_fo": "Faro", + "Language_fo": "Faroe", "Language_fr": "Prancis", "Language_fy": "Frisia Barat", "Language_ga": "Irlandia", "Language_gd": "Gaelik Skotlandia", "Language_gl": "Galisia", "Language_gn": "Guarani", - "Language_gu": "Gujarati", + "Language_gu": "Gujarat", "Language_gv": "Manx", "Language_ha": "Hausa", "Language_he": "Ibrani", "Language_hi": "Hindi", "Language_ho": "Hiri Motu", "Language_hr": "Kroasia", - "Language_ht": "Haiti", + "Language_ht": "Kreol Haiti", "Language_hu": "Hungaria", "Language_hy": "Armenia", "Language_hz": "Herero", @@ -426,7 +426,7 @@ "Language_mr": "Marathi", "Language_ms": "Melayu", "Language_mt": "Malta", - "Language_my": "Myanmar", + "Language_my": "Burma", "Language_na": "Nauru", "Language_nb": "Bokmål Norwegia", "Language_nd": "Ndebele Utara", @@ -499,7 +499,7 @@ "Language_yi": "Yiddish", "Language_yo": "Yoruba", "Language_za": "Zhuang", - "Language_zh": "China", + "Language_zh": "Tionghoa", "Language_zu": "Zulu", "LayoutDirection": "ltr", "Minutes": "menit", @@ -552,11 +552,11 @@ "Month_Short_StandAlone_8": "Agt", "Month_Short_StandAlone_9": "Sep", "NDays": "%s hari", - "NHoursShort": "%s j", + "NHoursShort": "%sj", "NMinutes": "%s menit", "NMinutesShort": "%s mnt", "NSeconds": "%s detik", - "NSecondsShort": "%s dtk", + "NSecondsShort": "%sdtk", "NumberFormatCurrency": "¤#,##0.00", "NumberFormatNumber": "#,##0.###", "NumberFormatPercent": "#,##0%", diff --git a/plugins/Intl/lang/is.json b/plugins/Intl/lang/is.json index b27b8783aa..278e92d010 100644 --- a/plugins/Intl/lang/is.json +++ b/plugins/Intl/lang/is.json @@ -318,6 +318,7 @@ "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "klukkustundir", + "Language_aa": "Afár", "Language_ab": "Abkasíska", "Language_ae": "Avestíska", "Language_af": "Afríkanska", @@ -491,6 +492,7 @@ "Language_uz": "Úsbekska", "Language_ve": "Venda", "Language_vi": "Víetnamska", + "Language_vo": "Volapyk", "Language_wa": "Vallónska", "Language_wo": "Volof", "Language_xh": "Sósa", diff --git a/plugins/Intl/lang/it.json b/plugins/Intl/lang/it.json index a8fdaac903..73a419fc11 100644 --- a/plugins/Intl/lang/it.json +++ b/plugins/Intl/lang/it.json @@ -37,7 +37,7 @@ "Country_BM": "Bermuda", "Country_BN": "Brunei", "Country_BO": "Bolivia", - "Country_BQ": "Caraibi Olandesi", + "Country_BQ": "Caraibi olandesi", "Country_BR": "Brasile", "Country_BS": "Bahamas", "Country_BT": "Bhutan", @@ -97,7 +97,7 @@ "Country_GP": "Guadalupa", "Country_GQ": "Guinea Equatoriale", "Country_GR": "Grecia", - "Country_GS": "Georgia del Sud e isole Sandwich australi", + "Country_GS": "Georgia del Sud e Sandwich australi", "Country_GT": "Guatemala", "Country_GU": "Guam", "Country_GW": "Guinea-Bissau", @@ -411,7 +411,7 @@ "Language_la": "Latino", "Language_lb": "Lussemburghese", "Language_lg": "Ganda", - "Language_li": "Limburgese", + "Language_li": "Limburghese", "Language_ln": "Lingala", "Language_lo": "Lao", "Language_lt": "Lituano", diff --git a/plugins/Intl/lang/ja.json b/plugins/Intl/lang/ja.json index e63c4094d6..e6f685bfc1 100644 --- a/plugins/Intl/lang/ja.json +++ b/plugins/Intl/lang/ja.json @@ -127,7 +127,7 @@ "Country_KH": "カンボジア", "Country_KI": "キリバス", "Country_KM": "コモロ", - "Country_KN": "セントクリストファー・ネイビス", + "Country_KN": "セントクリストファー・ネーヴィス", "Country_KP": "朝鮮民主主義人民共和国", "Country_KR": "大韓民国", "Country_KW": "クウェート", @@ -141,7 +141,7 @@ "Country_LR": "リベリア", "Country_LS": "レソト", "Country_LT": "リトアニア", - "Country_LU": "ルクセンブルグ", + "Country_LU": "ルクセンブルク", "Country_LV": "ラトビア", "Country_LY": "リビア", "Country_MA": "モロッコ", @@ -177,7 +177,7 @@ "Country_NO": "ノルウェー", "Country_NP": "ネパール", "Country_NR": "ナウル", - "Country_NU": "ニウエ島", + "Country_NU": "ニウエ", "Country_NZ": "ニュージーランド", "Country_OM": "オマーン", "Country_PA": "パナマ", @@ -190,7 +190,7 @@ "Country_PM": "サンピエール島・ミクロン島", "Country_PN": "ピトケアン諸島", "Country_PR": "プエルトリコ", - "Country_PS": "パレスチナ", + "Country_PS": "パレスチナ自治区", "Country_PT": "ポルトガル", "Country_PW": "パラオ", "Country_PY": "パラグアイ", @@ -239,12 +239,12 @@ "Country_TZ": "タンザニア", "Country_UA": "ウクライナ", "Country_UG": "ウガンダ", - "Country_UM": "米領太平洋諸島", + "Country_UM": "合衆国領有小離島", "Country_US": "アメリカ合衆国", "Country_UY": "ウルグアイ", "Country_UZ": "ウズベキスタン", "Country_VA": "バチカン市国", - "Country_VC": "セントビンセント・グレナディーン諸島", + "Country_VC": "セントビンセント及びグレナディーン諸島", "Country_VE": "ベネズエラ", "Country_VG": "英領ヴァージン諸島", "Country_VI": "米領ヴァージン諸島", @@ -360,7 +360,7 @@ "Language_et": "エストニア語", "Language_eu": "バスク語", "Language_fa": "ペルシア語", - "Language_ff": "フラニ語", + "Language_ff": "フラ語", "Language_fi": "フィンランド語", "Language_fj": "フィジー語", "Language_fo": "フェロー語", @@ -426,7 +426,7 @@ "Language_mr": "マラーティー語", "Language_ms": "マレー語", "Language_mt": "マルタ語", - "Language_my": "ビルマ語", + "Language_my": "ミャンマー語", "Language_na": "ナウル語", "Language_nb": "ノルウェー語(ブークモール)", "Language_nd": "北ンデベレ語", @@ -453,7 +453,7 @@ "Language_rn": "ルンディ語", "Language_ro": "ルーマニア語", "Language_ru": "ロシア語", - "Language_rw": "ルワンダ語", + "Language_rw": "キニアルワンダ語", "Language_sa": "サンスクリット語", "Language_sc": "サルデーニャ語", "Language_sd": "シンド語", @@ -552,11 +552,11 @@ "Month_Short_StandAlone_8": "8月", "Month_Short_StandAlone_9": "9月", "NDays": "%s 日", - "NHoursShort": "%s時間", + "NHoursShort": "%sh", "NMinutes": "%s 分", "NMinutesShort": "%s 分", "NSeconds": "%s 秒", - "NSecondsShort": "%s秒", + "NSecondsShort": "%ss", "NumberFormatCurrency": "¤#,##0.00", "NumberFormatNumber": "#,##0.###", "NumberFormatPercent": "#,##0%", diff --git a/plugins/Intl/lang/ka.json b/plugins/Intl/lang/ka.json index 91af287421..f7ba2b9a72 100644 --- a/plugins/Intl/lang/ka.json +++ b/plugins/Intl/lang/ka.json @@ -2,8 +2,8 @@ "Intl": { "Continent_afr": "აფრიკა", "Continent_amc": "ცენტრალური ამერიკა", - "Continent_amn": "ჩრდილოეთი ამერიკა", - "Continent_ams": "სამხრეთი ამერიკა", + "Continent_amn": "ჩრდილოეთ ამერიკა", + "Continent_ams": "სამხრეთ ამერიკა", "Continent_ant": "ანტარქტიკა", "Continent_asi": "აზია", "Continent_eur": "ევროპა", @@ -12,7 +12,7 @@ "Country_AE": "არაბთა გაერთიანებული საამიროები", "Country_AF": "ავღანეთი", "Country_AG": "ანტიგუა და ბარბუდა", - "Country_AI": "ანგილია", + "Country_AI": "ანგვილა", "Country_AL": "ალბანეთი", "Country_AM": "სომხეთი", "Country_AO": "ანგოლა", @@ -34,19 +34,19 @@ "Country_BI": "ბურუნდი", "Country_BJ": "ბენინი", "Country_BL": "სენ-ბართელმი", - "Country_BM": "ბერმუდი", + "Country_BM": "ბერმუდა", "Country_BN": "ბრუნეი", "Country_BO": "ბოლივია", "Country_BQ": "კარიბის ნიდერლანდები", "Country_BR": "ბრაზილია", "Country_BS": "ბაჰამის კუნძულები", - "Country_BT": "ბჰუტანი", + "Country_BT": "ბუტანი", "Country_BV": "ბუვე", "Country_BW": "ბოტსვანა", "Country_BY": "ბელარუსი", "Country_BZ": "ბელიზი", "Country_CA": "კანადა", - "Country_CC": "ქოქოსის კუნძულები", + "Country_CC": "ქოქოსის (კილინგის) კუნძულები", "Country_CD": "კონგო - კინშასა", "Country_CF": "ცენტრალური აფრიკის რესპუბლიკა", "Country_CG": "კონგო - ბრაზავილი", @@ -73,7 +73,7 @@ "Country_EC": "ეკვადორი", "Country_EE": "ესტონეთი", "Country_EG": "ეგვიპტე", - "Country_EH": "დასავლეთი საჰარა", + "Country_EH": "დასავლეთ საჰარა", "Country_ER": "ერიტრეა", "Country_ES": "ესპანეთი", "Country_ET": "ეთიოპია", @@ -84,7 +84,7 @@ "Country_FO": "ფარერის კუნძულები", "Country_FR": "საფრანგეთი", "Country_GA": "გაბონი", - "Country_GB": "დიდი ბრიტანეთი", + "Country_GB": "გაერთიანებული სამეფო", "Country_GD": "გრენადა", "Country_GE": "საქართველო", "Country_GF": "საფრანგეთის გვიანა", @@ -97,7 +97,7 @@ "Country_GP": "გვადელუპა", "Country_GQ": "ეკვატორული გვინეა", "Country_GR": "საბერძნეთი", - "Country_GS": "სამხრეთი გეორგია და სამხრეთ სენდვიჩის კუნძულები", + "Country_GS": "სამხრეთ ჯორჯია და სამხრეთ სენდვიჩის კუნძულები", "Country_GT": "გვატემალა", "Country_GU": "გუამი", "Country_GW": "გვინეა-ბისაუ", @@ -113,7 +113,7 @@ "Country_IL": "ისრაელი", "Country_IM": "მენის კუნძული", "Country_IN": "ინდოეთი", - "Country_IO": "ბრიტ. ტერიტ. ინდ. ოკეანეში", + "Country_IO": "ბრიტანეთის ტერიტორია ინდოეთის ოკეანეში", "Country_IQ": "ერაყი", "Country_IR": "ირანი", "Country_IS": "ისლანდია", @@ -128,8 +128,8 @@ "Country_KI": "კირიბატი", "Country_KM": "კომორის კუნძულები", "Country_KN": "სენტ-კიტსი და ნევისი", - "Country_KP": "ჩრდილოეთი კორეა", - "Country_KR": "სამხრეთი კორეა", + "Country_KP": "ჩრდილოეთ კორეა", + "Country_KR": "სამხრეთ კორეა", "Country_KW": "ქუვეითი", "Country_KY": "კაიმანის კუნძულები", "Country_KZ": "ყაზახეთი", @@ -162,7 +162,7 @@ "Country_MS": "მონსერატი", "Country_MT": "მალტა", "Country_MU": "მავრიკი", - "Country_MV": "მალდივის რესპუბლიკა", + "Country_MV": "მალდივები", "Country_MW": "მალავი", "Country_MX": "მექსიკა", "Country_MY": "მალაიზია", @@ -215,20 +215,20 @@ "Country_SN": "სენეგალი", "Country_SO": "სომალი", "Country_SR": "სურინამი", - "Country_SS": "სამხრეთი სუდანი", + "Country_SS": "სამხრეთ სუდანი", "Country_ST": "სან-ტომე და პრინსიპი", "Country_SV": "სალვადორი", "Country_SX": "სინტ-მარტენი", "Country_SY": "სირია", "Country_SZ": "სვაზილენდი", - "Country_TC": "ტერქსისა და კაიკოსის კუნძულები", + "Country_TC": "თერქს-ქაიქოსის კუნძულები", "Country_TD": "ჩადი", "Country_TF": "ფრანგული სამხრეთის ტერიტორიები", "Country_TG": "ტოგო", "Country_TH": "ტაილანდი", "Country_TJ": "ტაჯიკეთი", "Country_TK": "ტოკელაუ", - "Country_TL": "აღმოსავლეთი ტიმორი", + "Country_TL": "ტიმორ-ლესტე", "Country_TM": "თურქმენეთი", "Country_TN": "ტუნისი", "Country_TO": "ტონგა", @@ -327,11 +327,13 @@ "Language_an": "არაგონული", "Language_ar": "არაბული", "Language_as": "ასამური", + "Language_av": "ხუნძური", "Language_ay": "აიმარა", "Language_az": "აზერბაიჯანული", "Language_ba": "ბაშკირული", "Language_be": "ბელორუსული", "Language_bg": "ბულგარული", + "Language_bi": "ბისლამა", "Language_bm": "ბამბარა", "Language_bn": "ბენგალური", "Language_bo": "ტიბეტური", @@ -339,6 +341,7 @@ "Language_bs": "ბოსნიური", "Language_ca": "კატალანური", "Language_ce": "ჩეჩნური", + "Language_ch": "ჩამორო", "Language_co": "კორსიკული", "Language_cr": "კრი", "Language_cs": "ჩეხური", @@ -357,6 +360,7 @@ "Language_et": "ესტონური", "Language_eu": "ბასკური", "Language_fa": "სპარსული", + "Language_ff": "ფულა", "Language_fi": "ფინური", "Language_fj": "ფიჯი", "Language_fo": "ფარერული", @@ -372,9 +376,10 @@ "Language_he": "ებრაული", "Language_hi": "ჰინდი", "Language_hr": "ხორვატული", - "Language_ht": "ჰაიტიური", + "Language_ht": "ჰაიტიური კრეოლი", "Language_hu": "უნგრული", "Language_hy": "სომხური", + "Language_hz": "ჰერერო", "Language_ia": "ინტერლინგუალური", "Language_id": "ინდონეზიური", "Language_ie": "ინტერლინგი", @@ -389,6 +394,7 @@ "Language_ka": "ქართული", "Language_kg": "კონგო", "Language_ki": "კიკუიუ", + "Language_kj": "კუნამა", "Language_kk": "ყაზახური", "Language_kl": "დასავლეთ გრენლანდიური", "Language_km": "ქმერული", @@ -410,6 +416,7 @@ "Language_lu": "ლუბა-კატანგა", "Language_lv": "ლატვიური", "Language_mg": "მალაგასიური", + "Language_mh": "მარშალური", "Language_mi": "მაორი", "Language_mk": "მაკედონური", "Language_ml": "მალაიალამური", @@ -422,9 +429,11 @@ "Language_nb": "ნორვეგიული ბუკმოლი", "Language_nd": "ჩრდილოეთ ნდებელე", "Language_ne": "ნეპალური", + "Language_ng": "ნდონგა", "Language_nl": "ნიდერლანდური", "Language_nn": "ნორვეგიული ნიუნორსკი", "Language_no": "ნორვეგიული", + "Language_nr": "სამხრეთ ნდებელური", "Language_nv": "ნავახო", "Language_ny": "ნიანჯა", "Language_oc": "ოქსიტანური", @@ -456,6 +465,7 @@ "Language_so": "სომალიური", "Language_sq": "ალბანური", "Language_sr": "სერბული", + "Language_ss": "სუატი", "Language_st": "სამხრეთ სოთოს ენა", "Language_su": "სუნდური", "Language_sv": "შვედური", @@ -464,18 +474,23 @@ "Language_te": "ტელუგუ", "Language_tg": "ტაჯიკური", "Language_th": "ტაი", - "Language_ti": "თიგრინია", + "Language_ti": "ტიგრინია", "Language_tk": "თურქმენული", "Language_tn": "ტსვანა", "Language_to": "ტონგანური", "Language_tr": "თურქული", + "Language_ts": "ტსონგა", "Language_tt": "თათრული", "Language_tw": "თუი", + "Language_ty": "ტაიტური", "Language_ug": "უიღურული", "Language_uk": "უკრაინული", "Language_ur": "ურდუ", "Language_uz": "უზბეკური", + "Language_ve": "ვენდა", "Language_vi": "ვიეტნამური", + "Language_vo": "ვოლაპუკი", + "Language_wa": "ვალონური", "Language_wo": "ვოლოფური", "Language_xh": "ქჰოსა", "Language_yi": "იდიში", diff --git a/plugins/Intl/lang/ko.json b/plugins/Intl/lang/ko.json index 229b1e6144..0855521b95 100644 --- a/plugins/Intl/lang/ko.json +++ b/plugins/Intl/lang/ko.json @@ -49,7 +49,7 @@ "Country_CC": "코코스 제도", "Country_CD": "콩고-킨샤사", "Country_CF": "중앙 아프리카 공화국", - "Country_CG": "콩고", + "Country_CG": "콩고-브라자빌", "Country_CH": "스위스", "Country_CI": "코트디부아르", "Country_CK": "쿡 제도", @@ -128,7 +128,7 @@ "Country_KI": "키리바시", "Country_KM": "코모로", "Country_KN": "세인트키츠 네비스", - "Country_KP": "조선민주주의인민공화국", + "Country_KP": "북한", "Country_KR": "대한민국", "Country_KW": "쿠웨이트", "Country_KY": "케이맨 제도", @@ -365,7 +365,7 @@ "Language_fj": "피지어", "Language_fo": "페로어", "Language_fr": "프랑스어", - "Language_fy": "서프리지아어", + "Language_fy": "서부 프리지아어", "Language_ga": "아일랜드어", "Language_gd": "스코틀랜드 게일어", "Language_gl": "갈리시아어", @@ -381,7 +381,7 @@ "Language_hu": "헝가리어", "Language_hy": "아르메니아어", "Language_hz": "헤레로어", - "Language_ia": "인테르링구아 (국제보조어협회)", + "Language_ia": "인터링구아", "Language_id": "인도네시아어", "Language_ie": "인테르링구에", "Language_ig": "이그보어", @@ -399,7 +399,7 @@ "Language_kj": "쿠안야마어", "Language_kk": "카자흐어", "Language_kl": "그린란드어", - "Language_km": "캄보디아어", + "Language_km": "크메르어", "Language_kn": "칸나다어", "Language_ko": "한국어", "Language_kr": "칸누리어", @@ -418,11 +418,11 @@ "Language_lu": "루바-카탄가어", "Language_lv": "라트비아어", "Language_mg": "말라가시어", - "Language_mh": "마셜제도어", + "Language_mh": "마셜어", "Language_mi": "마오리어", "Language_mk": "마케도니아어", "Language_ml": "말라얄람어", - "Language_mn": "몽고어", + "Language_mn": "몽골어", "Language_mr": "마라티어", "Language_ms": "말레이어", "Language_mt": "몰타어", @@ -437,9 +437,9 @@ "Language_no": "노르웨이어", "Language_nr": "남부 은데벨레어", "Language_nv": "나바호어", - "Language_ny": "니안자어; 치츄어; 츄어", + "Language_ny": "냔자어", "Language_oc": "오크어", - "Language_oj": "오지브웨이어", + "Language_oj": "오지브와어", "Language_om": "오로모어", "Language_or": "오리야어", "Language_os": "오세트어", @@ -468,7 +468,7 @@ "Language_sq": "알바니아어", "Language_sr": "세르비아어", "Language_ss": "시스와티어", - "Language_st": "소토어 (남부)", + "Language_st": "남부 소토어", "Language_su": "순다어", "Language_sv": "스웨덴어", "Language_sw": "스와힐리어", @@ -479,7 +479,7 @@ "Language_ti": "티그리냐어", "Language_tk": "투르크멘어", "Language_tl": "타갈로그어", - "Language_tn": "세츠와나어", + "Language_tn": "츠와나어", "Language_to": "통가어", "Language_tr": "터키어", "Language_ts": "총가어", diff --git a/plugins/Intl/lang/lt.json b/plugins/Intl/lang/lt.json index 2fefcf67dc..0df15e67f0 100644 --- a/plugins/Intl/lang/lt.json +++ b/plugins/Intl/lang/lt.json @@ -84,7 +84,7 @@ "Country_FO": "Farerų Salos", "Country_FR": "Prancūzija", "Country_GA": "Gabonas", - "Country_GB": "Didžioji Britanija", + "Country_GB": "Jungtinė Karalystė", "Country_GD": "Grenada", "Country_GE": "Gruzija", "Country_GF": "Prancūzijos Gviana", @@ -135,7 +135,7 @@ "Country_KZ": "Kazachstanas", "Country_LA": "Laosas", "Country_LB": "Libanas", - "Country_LC": "Šventoji Liucija", + "Country_LC": "Sent Lusija", "Country_LI": "Lichtenšteinas", "Country_LK": "Šri Lanka", "Country_LR": "Liberija", @@ -182,13 +182,13 @@ "Country_OM": "Omanas", "Country_PA": "Panama", "Country_PE": "Peru", - "Country_PF": "Prancūzų Polinezija", + "Country_PF": "Prancūzijos Polinezija", "Country_PG": "Papua Naujoji Gvinėja", "Country_PH": "Filipinai", "Country_PK": "Pakistanas", "Country_PL": "Lenkija", "Country_PM": "Sen Pjeras ir Mikelonas", - "Country_PN": "Pitkernas", + "Country_PN": "Pitkerno salos", "Country_PR": "Puerto Rikas", "Country_PS": "Palestinos teritorija", "Country_PT": "Portugalija", @@ -250,7 +250,7 @@ "Country_VI": "Jungtinių Valstijų Mergelių Salos", "Country_VN": "Vietnamas", "Country_VU": "Vanuatu", - "Country_WF": "Volisas ir Futuna", + "Country_WF": "Volisas ir Futūna", "Country_WS": "Samoa", "Country_YE": "Jemenas", "Country_YT": "Majotas", @@ -350,7 +350,7 @@ "Language_cy": "Valų", "Language_da": "Danų", "Language_de": "Vokiečių", - "Language_dv": "Divehi", + "Language_dv": "Divehų", "Language_dz": "Botijų", "Language_ee": "Evių", "Language_el": "Graikų", @@ -380,13 +380,13 @@ "Language_ht": "Haičio", "Language_hu": "Vengrų", "Language_hy": "Armėnų", - "Language_hz": "Herero", - "Language_ia": "Interlingva", + "Language_hz": "Hererų", + "Language_ia": "Tarpinė", "Language_id": "Indoneziečių", "Language_ie": "Interkalba", "Language_ig": "Igbų", "Language_ii": "Sičuan ji", - "Language_ik": "Inupiak", + "Language_ik": "Inupiakų", "Language_io": "Ido", "Language_is": "Islandų", "Language_it": "Italų", @@ -402,7 +402,7 @@ "Language_km": "Khmerų", "Language_kn": "Kanadų", "Language_ko": "Korėjiečių", - "Language_kr": "Kanuri", + "Language_kr": "Kanurių", "Language_ks": "Kašmyrų", "Language_ku": "Kurdų", "Language_kv": "Komi", @@ -411,7 +411,7 @@ "Language_la": "Lotynų", "Language_lb": "Liuksemburgiečių", "Language_lg": "Ganda", - "Language_li": "Limburgiš", + "Language_li": "Limburgiečių", "Language_ln": "Ngalų", "Language_lo": "Laosiečių", "Language_lt": "Lietuvių", @@ -428,7 +428,7 @@ "Language_mt": "Maltiečių", "Language_my": "Birmiečių", "Language_na": "Naurų", - "Language_nb": "Norvegijos rašytinė – būkmolų", + "Language_nb": "Norvegų bukmolas", "Language_nd": "Šiaurės ndebelų", "Language_ne": "Nepaliečių", "Language_ng": "Ndongų", @@ -437,11 +437,11 @@ "Language_no": "Norvegų", "Language_nr": "Pietų ndebele", "Language_nv": "Navajų", - "Language_ny": "Nianja", + "Language_ny": "Nianjų", "Language_oc": "Očitarų", "Language_oj": "Ojibva", "Language_om": "Oromų", - "Language_or": "Orijų", + "Language_or": "Odijų", "Language_os": "Osetinų", "Language_pa": "Pendžabų", "Language_pi": "Pali", @@ -467,8 +467,8 @@ "Language_so": "Somaliečių", "Language_sq": "Albanų", "Language_sr": "Serbų", - "Language_ss": "Svati", - "Language_st": "Pietų sesuto", + "Language_ss": "Svatų", + "Language_st": "Pietų Soto", "Language_su": "Sundų", "Language_sv": "Švedų", "Language_sw": "Suahilių", @@ -479,10 +479,10 @@ "Language_ti": "Tigrajų", "Language_tk": "Turkmėnų", "Language_tl": "Tagalogų", - "Language_tn": "Tsvana", + "Language_tn": "Tsvanų", "Language_to": "Tonganų", "Language_tr": "Turkų", - "Language_ts": "Tsonga", + "Language_ts": "Tsongų", "Language_tt": "Totorių", "Language_tw": "Tvi", "Language_ty": "Taitiečių", @@ -490,9 +490,9 @@ "Language_uk": "Ukrainiečių", "Language_ur": "Urdų", "Language_uz": "Uzbekų", - "Language_ve": "Venda", + "Language_ve": "Vendų", "Language_vi": "Vietnamiečių", - "Language_vo": "Volapiuk", + "Language_vo": "Volapiuko", "Language_wa": "Valonų", "Language_wo": "Volofų", "Language_xh": "Kosų", diff --git a/plugins/Intl/lang/lv.json b/plugins/Intl/lang/lv.json index 583d3e51a0..4a33374724 100644 --- a/plugins/Intl/lang/lv.json +++ b/plugins/Intl/lang/lv.json @@ -18,7 +18,7 @@ "Country_AO": "Angola", "Country_AQ": "Antarktika", "Country_AR": "Argentīna", - "Country_AS": "Amerikāņu Samoa", + "Country_AS": "ASV Samoa", "Country_AT": "Austrija", "Country_AU": "Austrālija", "Country_AW": "Aruba", @@ -31,7 +31,7 @@ "Country_BF": "Burkinafaso", "Country_BG": "Bulgārija", "Country_BH": "Bahreina", - "Country_BI": "Burundi", + "Country_BI": "Burundija", "Country_BJ": "Benina", "Country_BL": "Senbartelmī", "Country_BM": "Bermudu salas", @@ -46,10 +46,10 @@ "Country_BY": "Baltkrievija", "Country_BZ": "Beliza", "Country_CA": "Kanāda", - "Country_CC": "Kokosu jeb Kīlinga salas", - "Country_CD": "Kongo-Kinšasa", + "Country_CC": "Kokosu (Kīlinga) salas", + "Country_CD": "Kongo (Kinšasa)", "Country_CF": "Centrālāfrikas Republika", - "Country_CG": "Kongo - Brazavila", + "Country_CG": "Kongo (Brazavila)", "Country_CH": "Šveice", "Country_CI": "Kotdivuāra", "Country_CK": "Kuka salas", @@ -63,7 +63,7 @@ "Country_CW": "Kirasao", "Country_CX": "Ziemsvētku sala", "Country_CY": "Kipra", - "Country_CZ": "Čehija", + "Country_CZ": "Čehijas Republika", "Country_DE": "Vācija", "Country_DJ": "Džibutija", "Country_DK": "Dānija", @@ -81,13 +81,13 @@ "Country_FJ": "Fidži", "Country_FK": "Folklenda salas", "Country_FM": "Mikronēzija", - "Country_FO": "Fēru Salas", + "Country_FO": "Fēru salas", "Country_FR": "Francija", "Country_GA": "Gabona", "Country_GB": "Lielbritānija", "Country_GD": "Grenāda", "Country_GE": "Gruzija", - "Country_GF": "Franču Gviāna", + "Country_GF": "Francijas Gviāna", "Country_GG": "Gērnsija", "Country_GH": "Gana", "Country_GI": "Gibraltārs", @@ -103,7 +103,7 @@ "Country_GW": "Gvineja-Bisava", "Country_GY": "Gajāna", "Country_HK": "Ķīnas īpašās pārvaldes apgabals Honkonga", - "Country_HM": "Hērda un Makdonalda salas", + "Country_HM": "Hērda sala un Makdonalda salas", "Country_HN": "Hondurasa", "Country_HR": "Horvātija", "Country_HT": "Haiti", @@ -182,13 +182,13 @@ "Country_OM": "Omāna", "Country_PA": "Panama", "Country_PE": "Peru", - "Country_PF": "Franču Polinēzija", + "Country_PF": "Francijas Polinēzija", "Country_PG": "Papua-Jaungvineja", "Country_PH": "Filipīnas", "Country_PK": "Pakistāna", "Country_PL": "Polija", "Country_PM": "Senpjēra un Mikelona", - "Country_PN": "Pitkērna", + "Country_PN": "Pitkērnas salas", "Country_PR": "Puertoriko", "Country_PS": "Palestīna", "Country_PT": "Portugāle", @@ -202,7 +202,7 @@ "Country_RW": "Ruanda", "Country_SA": "Saūda Arābija", "Country_SB": "Zālamana salas", - "Country_SC": "Šeišelu salas", + "Country_SC": "Seišelu salas", "Country_SD": "Sudāna", "Country_SE": "Zviedrija", "Country_SG": "Singapūra", @@ -223,7 +223,7 @@ "Country_SZ": "Svazilenda", "Country_TC": "Tērksas un Kaikosas salas", "Country_TD": "Čada", - "Country_TF": "Francijas Dienvidjūru Zemes", + "Country_TF": "Francijas Dienvidjūru teritorija", "Country_TG": "Togo", "Country_TH": "Taizeme", "Country_TJ": "Tadžikistāna", @@ -239,7 +239,7 @@ "Country_TZ": "Tanzānija", "Country_UA": "Ukraina", "Country_UG": "Uganda", - "Country_UM": "ASV Aizjūras salas", + "Country_UM": "ASV Mazās Aizjūras salas", "Country_US": "Amerikas Savienotās Valstis", "Country_UY": "Urugvaja", "Country_UZ": "Uzbekistāna", @@ -250,7 +250,7 @@ "Country_VI": "ASV Virdžīnas", "Country_VN": "Vjetnama", "Country_VU": "Vanuatu", - "Country_WF": "Volisa un Futuna", + "Country_WF": "Volisa un Futunas salas", "Country_WS": "Samoa", "Country_YE": "Jemena", "Country_YT": "Majota", @@ -285,20 +285,20 @@ "Day_Min_StandAlone_5": "Pk", "Day_Min_StandAlone_6": "Se", "Day_Min_StandAlone_7": "Sv", - "Day_Short_1": "Pr", - "Day_Short_2": "Ot", - "Day_Short_3": "Tr", - "Day_Short_4": "Ce", - "Day_Short_5": "Pk", - "Day_Short_6": "Se", - "Day_Short_7": "Sv", - "Day_Short_StandAlone_1": "Pr", - "Day_Short_StandAlone_2": "Ot", - "Day_Short_StandAlone_3": "Tr", - "Day_Short_StandAlone_4": "Ce", - "Day_Short_StandAlone_5": "Pk", - "Day_Short_StandAlone_6": "Se", - "Day_Short_StandAlone_7": "Sv", + "Day_Short_1": "Pirmd.", + "Day_Short_2": "Otrd.", + "Day_Short_3": "Trešd.", + "Day_Short_4": "Ceturtd.", + "Day_Short_5": "Piektd.", + "Day_Short_6": "Sestd.", + "Day_Short_7": "Svētd.", + "Day_Short_StandAlone_1": "Pirmd.", + "Day_Short_StandAlone_2": "Otrd.", + "Day_Short_StandAlone_3": "Trešd.", + "Day_Short_StandAlone_4": "Ceturtd.", + "Day_Short_StandAlone_5": "Piektd.", + "Day_Short_StandAlone_6": "Sestd.", + "Day_Short_StandAlone_7": "Svētd.", "EnglishLanguageName": "Latvian", "Format_DateTime_Long": "EEEE, y. 'gada' d. MMMM {time}", "Format_DateTime_Short": "y. 'gada' d. MMM {time}", @@ -469,7 +469,7 @@ "Language_sr": "Serbu", "Language_ss": "Svatu", "Language_st": "Dienvidsotu", - "Language_su": "Sundaniešu", + "Language_su": "Zundu", "Language_sv": "Zviedru", "Language_sw": "Svahili", "Language_ta": "Tamilu", @@ -557,7 +557,7 @@ "NMinutesShort": "%s min.", "NSeconds": "%s sekundes", "NSecondsShort": "%ss", - "NumberFormatCurrency": "#0.00 ¤", + "NumberFormatCurrency": "#,##0.00 ¤", "NumberFormatNumber": "#,##0.###", "NumberFormatPercent": "#,##0%", "NumberSymbolDecimal": ",", diff --git a/plugins/Intl/lang/nb.json b/plugins/Intl/lang/nb.json index 812c461829..b7fa781a4d 100644 --- a/plugins/Intl/lang/nb.json +++ b/plugins/Intl/lang/nb.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Christmasøya", "Country_CY": "Kypros", - "Country_CZ": "Tsjekkia", + "Country_CZ": "Den tsjekkiske republikk", "Country_DE": "Tyskland", "Country_DJ": "Djibouti", "Country_DK": "Danmark", @@ -314,8 +314,8 @@ "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "{time}", - "Format_Time_12": "h.mm.ss a", - "Format_Time_24": "HH.mm.ss", + "Format_Time_12": "h:mm:ss a", + "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "timer", "Language_aa": "Afar", @@ -326,7 +326,7 @@ "Language_am": "Amharisk", "Language_an": "Aragonsk", "Language_ar": "Arabisk", - "Language_as": "Assamisk", + "Language_as": "Assamesisk", "Language_av": "Avarisk", "Language_ay": "Aymara", "Language_az": "Aserbajdsjansk", @@ -350,7 +350,7 @@ "Language_cy": "Walisisk", "Language_da": "Dansk", "Language_de": "Tysk", - "Language_dv": "Divehi", + "Language_dv": "Dhivehi", "Language_dz": "Dzongkha", "Language_ee": "Ewe", "Language_el": "Gresk", @@ -360,14 +360,14 @@ "Language_et": "Estisk", "Language_eu": "Baskisk", "Language_fa": "Persisk", - "Language_ff": "Fulani", + "Language_ff": "Fulfulde", "Language_fi": "Finsk", "Language_fj": "Fijiansk", "Language_fo": "Færøysk", "Language_fr": "Fransk", "Language_fy": "Vestfrisisk", "Language_ga": "Irsk", - "Language_gd": "Skotsk gælisk", + "Language_gd": "Skotsk-gælisk", "Language_gl": "Galisisk", "Language_gn": "Guarani", "Language_gu": "Gujarati", @@ -390,7 +390,7 @@ "Language_io": "Ido", "Language_is": "Islandsk", "Language_it": "Italiensk", - "Language_iu": "Inuktitut", + "Language_iu": "Inuittisk", "Language_ja": "Japansk", "Language_jv": "Javanesisk", "Language_ka": "Georgisk", @@ -411,7 +411,7 @@ "Language_la": "Latin", "Language_lb": "Luxemburgsk", "Language_lg": "Ganda", - "Language_li": "Limburgisk", + "Language_li": "Limburgsk", "Language_ln": "Lingala", "Language_lo": "Laotisk", "Language_lt": "Litauisk", @@ -455,7 +455,7 @@ "Language_ru": "Russisk", "Language_rw": "Kinyarwanda", "Language_sa": "Sanskrit", - "Language_sc": "Sardinsk", + "Language_sc": "Sardisk", "Language_sd": "Sindhi", "Language_se": "Nordsamisk", "Language_sg": "Sango", diff --git a/plugins/Intl/lang/nl.json b/plugins/Intl/lang/nl.json index 66398aa589..3d5fbab51d 100644 --- a/plugins/Intl/lang/nl.json +++ b/plugins/Intl/lang/nl.json @@ -131,7 +131,7 @@ "Country_KP": "Noord-Korea", "Country_KR": "Zuid-Korea", "Country_KW": "Koeweit", - "Country_KY": "Caymaneilanden", + "Country_KY": "Kaaimaneilanden", "Country_KZ": "Kazachstan", "Country_LA": "Laos", "Country_LB": "Libanon", @@ -581,7 +581,7 @@ "Time_AM": "a.m.", "Time_PM": "p.m.", "Today": "Vandaag", - "Year_Short": "jr.", + "Year_Short": "jr", "Yesterday": "Gisteren" } }
\ No newline at end of file diff --git a/plugins/Intl/lang/nn.json b/plugins/Intl/lang/nn.json index cbbc0bfdda..95406e4a67 100644 --- a/plugins/Intl/lang/nn.json +++ b/plugins/Intl/lang/nn.json @@ -35,7 +35,7 @@ "Country_BJ": "Benin", "Country_BL": "Saint Barthélemy", "Country_BM": "Bermuda", - "Country_BN": "Brunei Darussalam", + "Country_BN": "Brunei", "Country_BO": "Bolivia", "Country_BR": "Brasil", "Country_BS": "Bahamas", @@ -59,6 +59,7 @@ "Country_CR": "Costa Rica", "Country_CU": "Cuba", "Country_CV": "Kapp Verde", + "Country_CW": "Curaçao", "Country_CX": "Christmasøya", "Country_CY": "Kypros", "Country_CZ": "Tsjekkia", @@ -124,7 +125,7 @@ "Country_KG": "Kirgisistan", "Country_KH": "Kambodsja", "Country_KI": "Kiribati", - "Country_KM": "Komorene", + "Country_KM": "Komorane", "Country_KN": "St. Christopher og Nevis", "Country_KP": "Nord-Korea", "Country_KR": "Sør-Korea", @@ -151,7 +152,7 @@ "Country_MH": "Marshalløyane", "Country_MK": "Makedonia", "Country_ML": "Mali", - "Country_MM": "Myanmar", + "Country_MM": "Myanmar (Burma)", "Country_MN": "Mongolia", "Country_MO": "Macao S.A.R. Kina", "Country_MP": "Nord-Marianane", @@ -198,7 +199,7 @@ "Country_RS": "Serbia", "Country_RU": "Russland", "Country_RW": "Rwanda", - "Country_SA": "Saudi Arabia", + "Country_SA": "Saudi-Arabia", "Country_SB": "Salomonøyane", "Country_SC": "Seychellane", "Country_SD": "Sudan", @@ -213,18 +214,20 @@ "Country_SN": "Senegal", "Country_SO": "Somalia", "Country_SR": "Surinam", + "Country_SS": "Sør-Sudan", "Country_ST": "São Tomé og Príncipe", "Country_SV": "El Salvador", + "Country_SX": "Sint Maarten", "Country_SY": "Syria", "Country_SZ": "Swaziland", "Country_TC": "Turks- og Caicosøyane", - "Country_TD": "Tchad", + "Country_TD": "Tsjad", "Country_TF": "Franske sørområde", "Country_TG": "Togo", "Country_TH": "Thailand", "Country_TJ": "Tadsjikistan", "Country_TK": "Tokelau", - "Country_TL": "Aust-Timor", + "Country_TL": "Timor-Leste (Aust-Timor)", "Country_TM": "Turkmenistan", "Country_TN": "Tunisia", "Country_TO": "Tonga", @@ -248,7 +251,7 @@ "Country_VU": "Vanuatu", "Country_WF": "Wallis og Futuna", "Country_WS": "Samoa", - "Country_YE": "Yemen", + "Country_YE": "Jemen", "Country_YT": "Mayotte", "Country_ZA": "Sør-Afrika", "Country_ZM": "Zambia", @@ -288,13 +291,13 @@ "Day_Short_5": "Fr.", "Day_Short_6": "La.", "Day_Short_7": "Sø.", - "Day_Short_StandAlone_1": "Må.", - "Day_Short_StandAlone_2": "Ty.", - "Day_Short_StandAlone_3": "On.", - "Day_Short_StandAlone_4": "To.", - "Day_Short_StandAlone_5": "Fr.", - "Day_Short_StandAlone_6": "La.", - "Day_Short_StandAlone_7": "Sø.", + "Day_Short_StandAlone_1": "Mån", + "Day_Short_StandAlone_2": "Tys", + "Day_Short_StandAlone_3": "Ons", + "Day_Short_StandAlone_4": "Tor", + "Day_Short_StandAlone_5": "Fre", + "Day_Short_StandAlone_6": "Lau", + "Day_Short_StandAlone_7": "Søn", "EnglishLanguageName": "Norwegian Nynorsk", "Format_DateTime_Long": "EEEE d. MMMM y {time}", "Format_DateTime_Short": "d. MMM y {time}", @@ -322,7 +325,7 @@ "Language_am": "Amharisk", "Language_an": "Aragonsk", "Language_ar": "Arabisk", - "Language_as": "Assamisk", + "Language_as": "Assamesisk", "Language_av": "Avarisk", "Language_ay": "Aymara", "Language_az": "Aserbajdsjansk", @@ -356,7 +359,7 @@ "Language_et": "Estisk", "Language_eu": "Baskisk", "Language_fa": "Persisk", - "Language_ff": "Fulani", + "Language_ff": "Fulfulde", "Language_fi": "Finsk", "Language_fj": "Fijiansk", "Language_fo": "Færøysk", @@ -386,7 +389,7 @@ "Language_io": "Ido", "Language_is": "Islandsk", "Language_it": "Italiensk", - "Language_iu": "Inuktitut", + "Language_iu": "Inuittisk", "Language_ja": "Japansk", "Language_jv": "Javanesisk", "Language_ka": "Georgisk", @@ -394,7 +397,7 @@ "Language_ki": "Kikuyu", "Language_kj": "Kuanyama", "Language_kk": "Kasakhisk", - "Language_kl": "Kalaallisut; grønlandsk", + "Language_kl": "Grønlandsk (kalaallisut)", "Language_km": "Khmer", "Language_kn": "Kannada", "Language_ko": "Koreansk", @@ -437,7 +440,7 @@ "Language_oc": "Oksitansk", "Language_oj": "Ojibwa", "Language_om": "Oromo", - "Language_or": "Oriya", + "Language_or": "Odia", "Language_os": "Ossetisk", "Language_pa": "Panjabi", "Language_pi": "Pali", @@ -470,13 +473,13 @@ "Language_sw": "Swahili", "Language_ta": "Tamil", "Language_te": "Telugu", - "Language_tg": "Tatsjikisk", + "Language_tg": "Tadsjikisk", "Language_th": "Thai", "Language_ti": "Tigrinja", "Language_tk": "Turkmensk", "Language_tl": "Tagalog", "Language_tn": "Tswana", - "Language_to": "Tonga (Tonga-øyane)", + "Language_to": "Tongansk", "Language_tr": "Tyrkisk", "Language_ts": "Tsonga", "Language_tt": "Tatarisk", @@ -535,18 +538,18 @@ "Month_Short_7": "Juli", "Month_Short_8": "Aug.", "Month_Short_9": "Sep.", - "Month_Short_StandAlone_1": "Jan.", - "Month_Short_StandAlone_10": "Okt.", - "Month_Short_StandAlone_11": "Nov.", - "Month_Short_StandAlone_12": "Des.", - "Month_Short_StandAlone_2": "Feb.", - "Month_Short_StandAlone_3": "Mars", - "Month_Short_StandAlone_4": "Apr.", + "Month_Short_StandAlone_1": "Jan", + "Month_Short_StandAlone_10": "Okt", + "Month_Short_StandAlone_11": "Nov", + "Month_Short_StandAlone_12": "Des", + "Month_Short_StandAlone_2": "Feb", + "Month_Short_StandAlone_3": "Mar", + "Month_Short_StandAlone_4": "Apr", "Month_Short_StandAlone_5": "Mai", - "Month_Short_StandAlone_6": "Juni", - "Month_Short_StandAlone_7": "Juli", - "Month_Short_StandAlone_8": "Aug.", - "Month_Short_StandAlone_9": "Sep.", + "Month_Short_StandAlone_6": "Jun", + "Month_Short_StandAlone_7": "Jul", + "Month_Short_StandAlone_8": "Aug", + "Month_Short_StandAlone_9": "Sep", "NDays": "%s d", "NHoursShort": "%s h", "NMinutes": "%s min", diff --git a/plugins/Intl/lang/pl.json b/plugins/Intl/lang/pl.json index f190ed6d4d..b3bc1f32fd 100644 --- a/plugins/Intl/lang/pl.json +++ b/plugins/Intl/lang/pl.json @@ -35,7 +35,7 @@ "Country_BJ": "Benin", "Country_BL": "Saint-Barthélemy", "Country_BM": "Bermudy", - "Country_BN": "Brunei Darussalam", + "Country_BN": "Brunei", "Country_BO": "Boliwia", "Country_BQ": "Niderlandy Karaibskie", "Country_BR": "Brazylia", @@ -271,20 +271,20 @@ "Day_Long_StandAlone_5": "Piątek", "Day_Long_StandAlone_6": "Sobota", "Day_Long_StandAlone_7": "Niedziela", - "Day_Min_1": "Pon.", - "Day_Min_2": "Wt.", - "Day_Min_3": "Śr.", - "Day_Min_4": "Czw.", - "Day_Min_5": "Pt.", - "Day_Min_6": "Sob.", - "Day_Min_7": "Niedz.", - "Day_Min_StandAlone_1": "Pon.", - "Day_Min_StandAlone_2": "Wt.", - "Day_Min_StandAlone_3": "Śr.", - "Day_Min_StandAlone_4": "Czw.", - "Day_Min_StandAlone_5": "Pt.", - "Day_Min_StandAlone_6": "Sob.", - "Day_Min_StandAlone_7": "Niedz.", + "Day_Min_1": "Pon", + "Day_Min_2": "Wto", + "Day_Min_3": "Śro", + "Day_Min_4": "Czw", + "Day_Min_5": "Pią", + "Day_Min_6": "Sob", + "Day_Min_7": "Nie", + "Day_Min_StandAlone_1": "Pon", + "Day_Min_StandAlone_2": "Wto", + "Day_Min_StandAlone_3": "Śro", + "Day_Min_StandAlone_4": "Czw", + "Day_Min_StandAlone_5": "Pią", + "Day_Min_StandAlone_6": "Sob", + "Day_Min_StandAlone_7": "Nie", "Day_Short_1": "Pon.", "Day_Short_2": "Wt.", "Day_Short_3": "Śr.", @@ -301,18 +301,18 @@ "Day_Short_StandAlone_7": "Niedz.", "EnglishLanguageName": "Polish", "Format_DateTime_Long": "EEEE, d MMMM y {time}", - "Format_DateTime_Short": "dd.MM.y {time}", - "Format_Date_Day_Month": "E, d.MM", + "Format_DateTime_Short": "d MMM y {time}", + "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", - "Format_Date_Short": "dd.MM.y", + "Format_Date_Short": "d MMM y", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", - "Format_Interval_Short_D": "dd–dd.MM.y", - "Format_Interval_Short_M": "dd.MM–dd.MM.y", - "Format_Interval_Short_Y": "dd.MM.y–dd.MM.y", + "Format_Interval_Short_D": "d–d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "LLLL y", - "Format_Month_Short": "MM.y", + "Format_Month_Short": "LLL y", "Format_Time": "{time}", "Format_Time_12": "h:mm:ss a", "Format_Time_24": "HH:mm:ss", @@ -329,7 +329,7 @@ "Language_as": "Asamski", "Language_av": "Awarski", "Language_ay": "Ajmara", - "Language_az": "Azerski", + "Language_az": "Azerbejdżański", "Language_ba": "Baszkirski", "Language_be": "Białoruski", "Language_bg": "Bułgarski", @@ -341,11 +341,11 @@ "Language_bs": "Bośniacki", "Language_ca": "Kataloński", "Language_ce": "Czeczeński", - "Language_ch": "Chamorro", + "Language_ch": "Czamorro", "Language_co": "Korsykański", "Language_cr": "Kri", "Language_cs": "Czeski", - "Language_cu": "Staro-cerkiewno-słowiański", + "Language_cu": "Cerkiewnosłowiański", "Language_cv": "Czuwaski", "Language_cy": "Walijski", "Language_da": "Duński", @@ -370,14 +370,14 @@ "Language_gd": "Szkocki gaelicki", "Language_gl": "Galicyjski", "Language_gn": "Guarani", - "Language_gu": "Gudźaracki", + "Language_gu": "Gudżarati", "Language_gv": "Manx", "Language_ha": "Hausa", "Language_he": "Hebrajski", "Language_hi": "Hindi", "Language_ho": "Hiri motu", "Language_hr": "Chorwacki", - "Language_ht": "Haitański", + "Language_ht": "Kreolski haitański", "Language_hu": "Węgierski", "Language_hy": "Ormiański", "Language_hz": "Herero", @@ -411,14 +411,14 @@ "Language_la": "Łaciński", "Language_lb": "Luksemburski", "Language_lg": "Ganda", - "Language_li": "Limburgijski", + "Language_li": "Limburski", "Language_ln": "Lingala", "Language_lo": "Laotański", "Language_lt": "Litewski", "Language_lu": "Luba-katanga", "Language_lv": "Łotewski", "Language_mg": "Malgaski", - "Language_mh": "Marshall", + "Language_mh": "Marszalski", "Language_mi": "Maoryjski", "Language_mk": "Macedoński", "Language_ml": "Malajalam", @@ -438,9 +438,9 @@ "Language_nr": "Ndebele południowy", "Language_nv": "Nawaho", "Language_ny": "Njandża", - "Language_oc": "Prowansalski", + "Language_oc": "Oksytański", "Language_oj": "Odżibwa", - "Language_om": "Oromski", + "Language_om": "Oromo", "Language_or": "Orija", "Language_os": "Osetyjski", "Language_pa": "Pendżabski", @@ -457,17 +457,17 @@ "Language_sa": "Sanskryt", "Language_sc": "Sardyński", "Language_sd": "Sindhi", - "Language_se": "Lapoński północny", + "Language_se": "Północnolapoński", "Language_sg": "Sango", "Language_si": "Syngaleski", "Language_sk": "Słowacki", "Language_sl": "Słoweński", "Language_sm": "Samoański", - "Language_sn": "Szona", + "Language_sn": "Shona", "Language_so": "Somalijski", "Language_sq": "Albański", "Language_sr": "Serbski", - "Language_ss": "Siswati", + "Language_ss": "Suazi", "Language_st": "Sotho południowy", "Language_su": "Sundajski", "Language_sv": "Szwedzki", @@ -492,7 +492,7 @@ "Language_uz": "Uzbecki", "Language_ve": "Venda", "Language_vi": "Wietnamski", - "Language_vo": "Volapuk", + "Language_vo": "Wolapik", "Language_wa": "Waloński", "Language_wo": "Wolof", "Language_xh": "Khosa", diff --git a/plugins/Intl/lang/pt-br.json b/plugins/Intl/lang/pt-br.json index 9f2a028bb4..b52e1555a4 100644 --- a/plugins/Intl/lang/pt-br.json +++ b/plugins/Intl/lang/pt-br.json @@ -202,7 +202,7 @@ "Country_RW": "Ruanda", "Country_SA": "Arábia Saudita", "Country_SB": "Ilhas Salomão", - "Country_SC": "Seychelles", + "Country_SC": "Seicheles", "Country_SD": "Sudão", "Country_SE": "Suécia", "Country_SG": "Cingapura", @@ -442,7 +442,7 @@ "Language_oj": "Ojibwa", "Language_om": "Oromo", "Language_or": "Oriya", - "Language_os": "Ossetic", + "Language_os": "Osseto", "Language_pa": "Panjabi", "Language_pi": "Páli", "Language_pl": "Polonês", @@ -457,7 +457,7 @@ "Language_sa": "Sânscrito", "Language_sc": "Sardo", "Language_sd": "Sindi", - "Language_se": "Sami do norte", + "Language_se": "Sami setentrional", "Language_sg": "Sango", "Language_si": "Cingalês", "Language_sk": "Eslovaco", @@ -467,7 +467,7 @@ "Language_so": "Somali", "Language_sq": "Albanês", "Language_sr": "Sérvio", - "Language_ss": "Swati", + "Language_ss": "Suázi", "Language_st": "Soto do sul", "Language_su": "Sundanês", "Language_sv": "Sueco", @@ -476,7 +476,7 @@ "Language_te": "Telugu", "Language_tg": "Tajique", "Language_th": "Tailandês", - "Language_ti": "Tigrínia", + "Language_ti": "Tigrínio", "Language_tk": "Turcomeno", "Language_tl": "Tagalo", "Language_tn": "Tswana", @@ -497,7 +497,7 @@ "Language_wo": "Uólofe", "Language_xh": "Xosa", "Language_yi": "Iídiche", - "Language_yo": "Ioruba", + "Language_yo": "Iorubá", "Language_za": "Zhuang", "Language_zh": "Chinês", "Language_zu": "Zulu", @@ -568,7 +568,7 @@ "OneDay": "1 dia", "OneMinute": "1 minuto", "OneMinuteShort": "1 min", - "OriginalLanguageName": "Português do Brasil", + "OriginalLanguageName": "Português (Brasil)", "PeriodDay": "dia", "PeriodDays": "dias", "PeriodMonth": "mês", diff --git a/plugins/Intl/lang/pt.json b/plugins/Intl/lang/pt.json index 60270770df..d82075c57f 100644 --- a/plugins/Intl/lang/pt.json +++ b/plugins/Intl/lang/pt.json @@ -321,7 +321,7 @@ "Language_aa": "Afar", "Language_ab": "Abcázio", "Language_ae": "Avéstico", - "Language_af": "Africânder", + "Language_af": "Africanês", "Language_ak": "Akan", "Language_am": "Amárico", "Language_an": "Aragonês", @@ -394,7 +394,7 @@ "Language_ja": "Japonês", "Language_jv": "Javanês", "Language_ka": "Georgiano", - "Language_kg": "Conguês", + "Language_kg": "Congolês", "Language_ki": "Quicuio", "Language_kj": "Kuanyama", "Language_kk": "Cazaque", @@ -438,7 +438,7 @@ "Language_nr": "Ndebele do sul", "Language_nv": "Navajo", "Language_ny": "Nianja", - "Language_oc": "Provençal", + "Language_oc": "Occitano", "Language_oj": "Ojibwa", "Language_om": "Oromo", "Language_or": "Oriya", @@ -467,7 +467,7 @@ "Language_so": "Somali", "Language_sq": "Albanês", "Language_sr": "Sérvio", - "Language_ss": "Swati", + "Language_ss": "Suázi", "Language_st": "Soto do sul", "Language_su": "Sundanês", "Language_sv": "Sueco", diff --git a/plugins/Intl/lang/ro.json b/plugins/Intl/lang/ro.json index 8f5b576ffb..663d42f3ab 100644 --- a/plugins/Intl/lang/ro.json +++ b/plugins/Intl/lang/ro.json @@ -151,7 +151,7 @@ "Country_MF": "Sfântul Martin", "Country_MG": "Madagascar", "Country_MH": "Insulele Marshall", - "Country_MK": "Macedonia", + "Country_MK": "Republica Macedonia", "Country_ML": "Mali", "Country_MM": "Myanmar (Birmania)", "Country_MN": "Mongolia", @@ -216,7 +216,7 @@ "Country_SO": "Somalia", "Country_SR": "Suriname", "Country_SS": "Sudanul de Sud", - "Country_ST": "Sao Tome și Principe", + "Country_ST": "Sao Tomé și Príncipe", "Country_SV": "El Salvador", "Country_SX": "Sint-Maarten", "Country_SY": "Siria", @@ -247,7 +247,7 @@ "Country_VC": "Saint Vincent și Grenadinele", "Country_VE": "Venezuela", "Country_VG": "Insulele Virgine Britanice", - "Country_VI": "Insulele Virgine S.U.A.", + "Country_VI": "Insulele Virgine Americane", "Country_VN": "Vietnam", "Country_VU": "Vanuatu", "Country_WF": "Wallis și Futuna", @@ -274,17 +274,17 @@ "Day_Min_1": "Lu.", "Day_Min_2": "Ma.", "Day_Min_3": "Mi.", - "Day_Min_4": "Jo.", + "Day_Min_4": "Joi", "Day_Min_5": "Vi.", "Day_Min_6": "Sâ.", "Day_Min_7": "Du.", - "Day_Min_StandAlone_1": "Lu", - "Day_Min_StandAlone_2": "Ma", - "Day_Min_StandAlone_3": "Mi", - "Day_Min_StandAlone_4": "Jo", - "Day_Min_StandAlone_5": "Vi", - "Day_Min_StandAlone_6": "Sâ", - "Day_Min_StandAlone_7": "Du", + "Day_Min_StandAlone_1": "Lu.", + "Day_Min_StandAlone_2": "Ma.", + "Day_Min_StandAlone_3": "Mi.", + "Day_Min_StandAlone_4": "Joi", + "Day_Min_StandAlone_5": "Vi.", + "Day_Min_StandAlone_6": "Sâ.", + "Day_Min_StandAlone_7": "Du.", "Day_Short_1": "Lun.", "Day_Short_2": "Mar.", "Day_Short_3": "Mie.", @@ -357,7 +357,7 @@ "Language_en": "Engleză", "Language_eo": "Esperanto", "Language_es": "Spaniolă", - "Language_et": "Estoniană", + "Language_et": "Estonă", "Language_eu": "Bască", "Language_fa": "Persană", "Language_ff": "Fulah", @@ -426,7 +426,7 @@ "Language_mr": "Marathi", "Language_ms": "Malaeză", "Language_mt": "Malteză", - "Language_my": "Birmaneză", + "Language_my": "Birmană", "Language_na": "Nauru", "Language_nb": "Norvegiană bokmål", "Language_nd": "Ndebele de nord", @@ -459,7 +459,7 @@ "Language_sd": "Sindhi", "Language_se": "Sami de nord", "Language_sg": "Sango", - "Language_si": "Singhaleză", + "Language_si": "Singaleză", "Language_sk": "Slovacă", "Language_sl": "Slovenă", "Language_sm": "Samoană", @@ -480,7 +480,7 @@ "Language_tk": "Turkmenă", "Language_tl": "Tagalog", "Language_tn": "Setswana", - "Language_to": "Tonga", + "Language_to": "Tongană", "Language_tr": "Turcă", "Language_ts": "Tsonga", "Language_tt": "Tătară", @@ -569,13 +569,13 @@ "OneMinute": "1 minut", "OneMinuteShort": "1 min.", "OriginalLanguageName": "Română", - "PeriodDay": "Zi", + "PeriodDay": "zi", "PeriodDays": "zile", - "PeriodMonth": "Lună", + "PeriodMonth": "lună", "PeriodMonths": "luni", - "PeriodWeek": "Săptămână", + "PeriodWeek": "săptămână", "PeriodWeeks": "săptămâni", - "PeriodYear": "An", + "PeriodYear": "an", "PeriodYears": "ani", "Seconds": "secunde", "Time_AM": "a.m.", diff --git a/plugins/Intl/lang/ru.json b/plugins/Intl/lang/ru.json index 593daf525d..e3d47e4dc4 100644 --- a/plugins/Intl/lang/ru.json +++ b/plugins/Intl/lang/ru.json @@ -33,13 +33,13 @@ "Country_BH": "Бахрейн", "Country_BI": "Бурунди", "Country_BJ": "Бенин", - "Country_BL": "Сен-Бартельми", - "Country_BM": "Бермудские о-ва", + "Country_BL": "Сен-Бартелеми", + "Country_BM": "Бермуды", "Country_BN": "Бруней-Даруссалам", "Country_BO": "Боливия", "Country_BQ": "Бонэйр, Синт-Эстатиус и Саба", "Country_BR": "Бразилия", - "Country_BS": "Багамские о-ва", + "Country_BS": "Багамы", "Country_BT": "Бутан", "Country_BV": "О-в Буве", "Country_BW": "Ботсвана", @@ -52,7 +52,7 @@ "Country_CG": "Конго - Браззавиль", "Country_CH": "Швейцария", "Country_CI": "Кот-д’Ивуар", - "Country_CK": "О-ва Кука", + "Country_CK": "Острова Кука", "Country_CL": "Чили", "Country_CM": "Камерун", "Country_CN": "Китай", @@ -126,7 +126,7 @@ "Country_KG": "Киргизия", "Country_KH": "Камбоджа", "Country_KI": "Кирибати", - "Country_KM": "Коморские о-ва", + "Country_KM": "Коморы", "Country_KN": "Сент-Китс и Невис", "Country_KP": "КНДР", "Country_KR": "Республика Корея", @@ -150,7 +150,7 @@ "Country_ME": "Черногория", "Country_MF": "Сен-Мартен", "Country_MG": "Мадагаскар", - "Country_MH": "Маршалловы о-ва", + "Country_MH": "Маршалловы Острова", "Country_MK": "Македония", "Country_ML": "Мали", "Country_MM": "Мьянма (Бирма)", @@ -201,8 +201,8 @@ "Country_RU": "Россия", "Country_RW": "Руанда", "Country_SA": "Саудовская Аравия", - "Country_SB": "Соломоновы о-ва", - "Country_SC": "Сейшельские о-ва", + "Country_SB": "Соломоновы Острова", + "Country_SC": "Сейшельские Острова", "Country_SD": "Судан", "Country_SE": "Швеция", "Country_SG": "Сингапур", @@ -223,7 +223,7 @@ "Country_SZ": "Свазиленд", "Country_TC": "О-ва Тёркс и Кайкос", "Country_TD": "Чад", - "Country_TF": "Французские Южные Территории", + "Country_TF": "Французские Южные территории", "Country_TG": "Того", "Country_TH": "Таиланд", "Country_TJ": "Таджикистан", @@ -307,10 +307,10 @@ "Format_Date_Short": "d MMM y 'г'.", "Format_Interval_Long_D": "d–d MMMM y 'г'.", "Format_Interval_Long_M": "d MMMM – d MMMM y 'г'.", - "Format_Interval_Long_Y": "d MMMM y – d MMMM y 'г'.", + "Format_Interval_Long_Y": "d MMMM y 'г'. – d MMMM y 'г'.", "Format_Interval_Short_D": "d–d MMM y 'г'.", "Format_Interval_Short_M": "d MMM – d MMM y 'г'.", - "Format_Interval_Short_Y": "d MMM y – d MMM y 'г'.", + "Format_Interval_Short_Y": "d MMM y 'г'. – d MMM y 'г'.", "Format_Month_Long": "LLLL y 'г'.", "Format_Month_Short": "LLL y 'г'.", "Format_Time": "{time}", @@ -318,7 +318,7 @@ "Format_Time_24": "H:mm:ss", "Format_Year": "y", "Hours": "часы", - "Language_aa": "Афар", + "Language_aa": "Афарский", "Language_ab": "Абхазский", "Language_ae": "Авестийский", "Language_af": "Африкаанс", @@ -334,7 +334,7 @@ "Language_be": "Белорусский", "Language_bg": "Болгарский", "Language_bi": "Бислама", - "Language_bm": "Бамбарийский", + "Language_bm": "Бамбара", "Language_bn": "Бенгальский", "Language_bo": "Тибетский", "Language_br": "Бретонский", @@ -343,7 +343,7 @@ "Language_ce": "Чеченский", "Language_ch": "Чаморро", "Language_co": "Корсиканский", - "Language_cr": "Криийский", + "Language_cr": "Кри", "Language_cs": "Чешский", "Language_cu": "Церковнославянский", "Language_cv": "Чувашский", @@ -365,7 +365,7 @@ "Language_fj": "Фиджи", "Language_fo": "Фарерский", "Language_fr": "Французский", - "Language_fy": "Западно-фризский", + "Language_fy": "Западный фризский", "Language_ga": "Ирландский", "Language_gd": "Гэльский", "Language_gl": "Галисийский", @@ -385,7 +385,7 @@ "Language_id": "Индонезийский", "Language_ie": "Интерлингве", "Language_ig": "Игбо", - "Language_ii": "Сычуань", + "Language_ii": "Носу", "Language_ik": "Инупиак", "Language_io": "Идо", "Language_is": "Исландский", @@ -406,7 +406,7 @@ "Language_ks": "Кашмири", "Language_ku": "Курдский", "Language_kv": "Коми", - "Language_kw": "Корнийский", + "Language_kw": "Корнский", "Language_ky": "Киргизский", "Language_la": "Латинский", "Language_lb": "Люксембургский", @@ -429,13 +429,13 @@ "Language_my": "Бирманский", "Language_na": "Науру", "Language_nb": "Норвежский букмол", - "Language_nd": "Северный ндебели", + "Language_nd": "Северный ндебеле", "Language_ne": "Непальский", "Language_ng": "Ндонга", "Language_nl": "Нидерландский", - "Language_nn": "Норвежский нюнорск", + "Language_nn": "Нюнорск", "Language_no": "Норвежский", - "Language_nr": "Ндебели южный", + "Language_nr": "Южный ндебеле", "Language_nv": "Навахо", "Language_ny": "Ньянджа", "Language_oc": "Окситанский", @@ -468,7 +468,7 @@ "Language_sq": "Албанский", "Language_sr": "Сербский", "Language_ss": "Свази", - "Language_st": "Сото южный", + "Language_st": "Южный сото", "Language_su": "Сунданский", "Language_sv": "Шведский", "Language_sw": "Суахили", diff --git a/plugins/Intl/lang/sk.json b/plugins/Intl/lang/sk.json index db39d8d374..3efd518b7e 100644 --- a/plugins/Intl/lang/sk.json +++ b/plugins/Intl/lang/sk.json @@ -22,7 +22,7 @@ "Country_AT": "Rakúsko", "Country_AU": "Austrália", "Country_AW": "Aruba", - "Country_AX": "Ålandy", + "Country_AX": "Alandy", "Country_AZ": "Azerbajdžan", "Country_BA": "Bosna a Hercegovina", "Country_BB": "Barbados", @@ -47,9 +47,9 @@ "Country_BZ": "Belize", "Country_CA": "Kanada", "Country_CC": "Kokosové ostrovy", - "Country_CD": "Kongo - Kinshasa", + "Country_CD": "Konžská demokratická republika", "Country_CF": "Stredoafrická republika", - "Country_CG": "Kongo - Brazzaville", + "Country_CG": "Konžská republika", "Country_CH": "Švajčiarsko", "Country_CI": "Pobrežie Slonoviny", "Country_CK": "Cookove ostrovy", @@ -103,7 +103,7 @@ "Country_GW": "Guinea-Bissau", "Country_GY": "Guayana", "Country_HK": "Hongkong – OAO Číny", - "Country_HM": "Heardov ostrov a McDonaldove ostrovy", + "Country_HM": "Heardov ostrov a Macdonaldove ostrovy", "Country_HN": "Honduras", "Country_HR": "Chorvátsko", "Country_HT": "Haiti", @@ -148,7 +148,7 @@ "Country_MC": "Monako", "Country_MD": "Moldavsko", "Country_ME": "Čierna Hora", - "Country_MF": "Svätý Martin", + "Country_MF": "Svätý Martin (fr.)", "Country_MG": "Madagaskar", "Country_MH": "Marshallove ostrovy", "Country_MK": "Macedónsko", @@ -218,7 +218,7 @@ "Country_SS": "Južný Sudán", "Country_ST": "Svätý Tomáš a Princov ostrov", "Country_SV": "Salvádor", - "Country_SX": "Sint Maarten", + "Country_SX": "Svätý Martin (hol.)", "Country_SY": "Sýria", "Country_SZ": "Svazijsko", "Country_TC": "Turks a Caicos", @@ -350,8 +350,8 @@ "Language_cy": "Waleština", "Language_da": "Dánčina", "Language_de": "Nemčina", - "Language_dv": "Divehi", - "Language_dz": "Dzongkä", + "Language_dv": "Maldivčina", + "Language_dz": "Dzongkha", "Language_ee": "Eweština", "Language_el": "Gréčtina", "Language_en": "Angličtina", @@ -377,7 +377,7 @@ "Language_hi": "Hindčina", "Language_ho": "Hiri motu", "Language_hr": "Chorvátčina", - "Language_ht": "Haitčina", + "Language_ht": "Haitská kreolčina", "Language_hu": "Maďarčina", "Language_hy": "Arménčina", "Language_hz": "Herero", @@ -385,8 +385,8 @@ "Language_id": "Indonézština", "Language_ie": "Interlingue", "Language_ig": "Igboština", - "Language_ii": "S’čchuanská ioština", - "Language_ik": "Inupiaq", + "Language_ii": "S’čchuanská iovčina", + "Language_ik": "Inupik", "Language_io": "Ido", "Language_is": "Islandčina", "Language_it": "Taliančina", @@ -418,7 +418,7 @@ "Language_lu": "Lubčina (katanžská)", "Language_lv": "Lotyština", "Language_mg": "Malgaština", - "Language_mh": "Kajin-majol", + "Language_mh": "Marshallčina", "Language_mi": "Maorijčina", "Language_mk": "Macedónčina", "Language_ml": "Malajálamčina", @@ -427,17 +427,17 @@ "Language_ms": "Malajčina", "Language_mt": "Maltčina", "Language_my": "Barmčina", - "Language_na": "Nauru", - "Language_nb": "Nórčina (bokmål)", - "Language_nd": "Severné ndebele", + "Language_na": "Nauruština", + "Language_nb": "Nórčina (bokmal)", + "Language_nd": "Severná ndebelčina", "Language_ne": "Nepálčina", "Language_ng": "Ndonga", "Language_nl": "Holandčina", "Language_nn": "Nórčina (nynorsk)", "Language_no": "Nórčina", "Language_nr": "Južná ndebelčina", - "Language_nv": "Navajo", - "Language_ny": "Čewa", + "Language_nv": "Navaho", + "Language_ny": "Ňandža", "Language_oc": "Okcitánčina", "Language_oj": "Odžibva", "Language_om": "Oromčina", @@ -450,14 +450,14 @@ "Language_pt": "Portugalčina", "Language_qu": "Kečuánčina", "Language_rm": "Rétorománčina", - "Language_rn": "Kirundčina", + "Language_rn": "Rundčina", "Language_ro": "Rumunčina", "Language_ru": "Ruština", - "Language_rw": "Kiňarwanda", + "Language_rw": "Rwandčina", "Language_sa": "Sanskrit", "Language_sc": "Sardínčina", "Language_sd": "Sindhčina", - "Language_se": "Lapončina (severná)", + "Language_se": "Severná lapončina", "Language_sg": "Sango", "Language_si": "Sinhalčina", "Language_sk": "Slovenčina", @@ -471,7 +471,7 @@ "Language_st": "Južná sothčina", "Language_su": "Sundčina", "Language_sv": "Švédčina", - "Language_sw": "Svahilčina", + "Language_sw": "Swahilčina", "Language_ta": "Tamilčina", "Language_te": "Telugčina", "Language_tg": "Tadžičtina", @@ -482,7 +482,7 @@ "Language_tn": "Tswančina", "Language_to": "Tongčina", "Language_tr": "Turečtina", - "Language_ts": "Tsonga", + "Language_ts": "Tsongčina", "Language_tt": "Tatárčina", "Language_tw": "Twi", "Language_ty": "Tahitčina", diff --git a/plugins/Intl/lang/sl.json b/plugins/Intl/lang/sl.json index 2610cb1fa1..805a679a08 100644 --- a/plugins/Intl/lang/sl.json +++ b/plugins/Intl/lang/sl.json @@ -102,7 +102,7 @@ "Country_GU": "Guam", "Country_GW": "Gvineja Bissau", "Country_GY": "Gvajana", - "Country_HK": "Posebno administrativno območje LR Kitajske Hong Kong", + "Country_HK": "Posebno administrativno območje LR Kitajske Hongkong", "Country_HM": "Heardov otok in McDonaldovi otoki", "Country_HN": "Honduras", "Country_HR": "Hrvaška", @@ -221,14 +221,14 @@ "Country_SX": "Sint Maarten", "Country_SY": "Sirija", "Country_SZ": "Svazi", - "Country_TC": "Otočji Turks in Caicos", + "Country_TC": "Otoki Turks in Caicos", "Country_TD": "Čad", "Country_TF": "Francosko južno ozemlje", "Country_TG": "Togo", "Country_TH": "Tajska", "Country_TJ": "Tadžikistan", "Country_TK": "Tokelau", - "Country_TL": "Vzhodni Timor", + "Country_TL": "Timor-Leste", "Country_TM": "Turkmenistan", "Country_TN": "Tunizija", "Country_TO": "Tonga", @@ -239,7 +239,7 @@ "Country_TZ": "Tanzanija", "Country_UA": "Ukrajina", "Country_UG": "Uganda", - "Country_UM": "Druga ameriška ozemlja v Tihem oceanu", + "Country_UM": "Stranski zunanji otoki Združenih držav", "Country_US": "Združene države Amerike", "Country_UY": "Urugvaj", "Country_UZ": "Uzbekistan", @@ -292,13 +292,13 @@ "Day_Short_5": "Pet.", "Day_Short_6": "Sob.", "Day_Short_7": "Ned.", - "Day_Short_StandAlone_1": "Pon", - "Day_Short_StandAlone_2": "Tor", - "Day_Short_StandAlone_3": "Sre", - "Day_Short_StandAlone_4": "Čet", - "Day_Short_StandAlone_5": "Pet", - "Day_Short_StandAlone_6": "Sob", - "Day_Short_StandAlone_7": "Ned", + "Day_Short_StandAlone_1": "Pon.", + "Day_Short_StandAlone_2": "Tor.", + "Day_Short_StandAlone_3": "Sre.", + "Day_Short_StandAlone_4": "Čet.", + "Day_Short_StandAlone_5": "Pet.", + "Day_Short_StandAlone_6": "Sob.", + "Day_Short_StandAlone_7": "Ned.", "EnglishLanguageName": "Slovenian", "Format_DateTime_Long": "EEEE, dd. MMMM y {time}", "Format_DateTime_Short": "d. MMM y {time}", @@ -365,7 +365,7 @@ "Language_fj": "Fidžijščina", "Language_fo": "Ferščina", "Language_fr": "Francoščina", - "Language_fy": "Frizijščina", + "Language_fy": "Zahodna frizijščina", "Language_ga": "Irščina", "Language_gd": "Škotska gelščina", "Language_gl": "Galicijščina", @@ -393,7 +393,7 @@ "Language_iu": "Inuktitutščina", "Language_ja": "Japonščina", "Language_jv": "Javanščina", - "Language_ka": "Gruzinščina", + "Language_ka": "Gruzijščina", "Language_kg": "Kongovščina", "Language_ki": "Kikujščina", "Language_kj": "Kvanjama", @@ -431,6 +431,7 @@ "Language_nb": "Knjižna norveščina", "Language_nd": "Severna ndebelščina", "Language_ne": "Nepalščina", + "Language_ng": "Ndonga", "Language_nl": "Nizozemščina", "Language_nn": "Novonorveščina", "Language_no": "Norveščina", @@ -440,7 +441,7 @@ "Language_oc": "Okcitanščina", "Language_oj": "Anašinabščina", "Language_om": "Oromo", - "Language_or": "Orijščina", + "Language_or": "Odijščina", "Language_os": "Osetinščina", "Language_pa": "Pandžabščina", "Language_pi": "Palijščina", @@ -458,7 +459,7 @@ "Language_sd": "Sindščina", "Language_se": "Severna samijščina", "Language_sg": "Sango", - "Language_si": "Singalščina", + "Language_si": "Sinhalščina", "Language_sk": "Slovaščina", "Language_sl": "Slovenščina", "Language_sm": "Samoanščina", @@ -537,18 +538,18 @@ "Month_Short_7": "Jul.", "Month_Short_8": "Avg.", "Month_Short_9": "Sep.", - "Month_Short_StandAlone_1": "Jan", - "Month_Short_StandAlone_10": "Okt", - "Month_Short_StandAlone_11": "Nov", - "Month_Short_StandAlone_12": "Dec", - "Month_Short_StandAlone_2": "Feb", - "Month_Short_StandAlone_3": "Mar", - "Month_Short_StandAlone_4": "Apr", + "Month_Short_StandAlone_1": "Jan.", + "Month_Short_StandAlone_10": "Okt.", + "Month_Short_StandAlone_11": "Nov.", + "Month_Short_StandAlone_12": "Dec.", + "Month_Short_StandAlone_2": "Feb.", + "Month_Short_StandAlone_3": "Mar.", + "Month_Short_StandAlone_4": "Apr.", "Month_Short_StandAlone_5": "Maj", - "Month_Short_StandAlone_6": "Jun", - "Month_Short_StandAlone_7": "Jul", - "Month_Short_StandAlone_8": "Avg", - "Month_Short_StandAlone_9": "Sep", + "Month_Short_StandAlone_6": "Jun.", + "Month_Short_StandAlone_7": "Jul.", + "Month_Short_StandAlone_8": "Avg.", + "Month_Short_StandAlone_9": "Sep.", "NDays": "%s dni", "NHoursShort": "%s h", "NMinutes": "%s minut", @@ -557,17 +558,17 @@ "NSecondsShort": "%s s", "NumberFormatCurrency": "#,##0.00 ¤", "NumberFormatNumber": "#,##0.###", - "NumberFormatPercent": "#,##0%", + "NumberFormatPercent": "#,##0 %", "NumberSymbolDecimal": ",", "NumberSymbolGroup": ".", - "NumberSymbolMinus": "-", + "NumberSymbolMinus": "–", "NumberSymbolPercent": "%", "NumberSymbolPlus": "+", "OneDay": "1 dan", "OneMinute": "1 minuta", "OneMinuteShort": "1 min", "OriginalLanguageName": "Slovenščina", - "PeriodDay": "Dan", + "PeriodDay": "dan", "PeriodDays": "dni", "PeriodMonth": "mesec", "PeriodMonths": "mesecev", diff --git a/plugins/Intl/lang/sq.json b/plugins/Intl/lang/sq.json index 1c9acf73d3..6a5954b2df 100644 --- a/plugins/Intl/lang/sq.json +++ b/plugins/Intl/lang/sq.json @@ -30,29 +30,29 @@ "Country_BE": "Belgjikë", "Country_BF": "Burkina-Faso", "Country_BG": "Bullgari", - "Country_BH": "Bahrein", - "Country_BI": "Burund", + "Country_BH": "Bahrejn", + "Country_BI": "Burundi", "Country_BJ": "Benin", - "Country_BL": "Shën-Bartolemeo", + "Country_BL": "Shën Bartolomeu", "Country_BM": "Bermudë", - "Country_BN": "Brunej", + "Country_BN": "Brunei", "Country_BO": "Bolivi", "Country_BQ": "Karaibet holandeze", "Country_BR": "Brazil", "Country_BS": "Bahamas", "Country_BT": "Butan", - "Country_BV": "Ishujt Bove’", - "Country_BW": "Botsuanë", + "Country_BV": "Ishulli Bove’", + "Country_BW": "Botsvanë", "Country_BY": "Bjellorusi", "Country_BZ": "Belizë", "Country_CA": "Kanada", - "Country_CC": "Ishujt Kokosë", + "Country_CC": "Ishujt Kokos", "Country_CD": "Kongo-Kinshasa", - "Country_CF": "Republika Afrikano-Qendrore", + "Country_CF": "Repubika e Afrikës Qendrore", "Country_CG": "Kongo-Brazavilë", "Country_CH": "Zvicër", - "Country_CI": "Bregu i Fildishtë", - "Country_CK": "Ishujt Kukë", + "Country_CI": "Côte d’Ivoire", + "Country_CK": "Ishujt Kuk", "Country_CL": "Kili", "Country_CM": "Kamerun", "Country_CN": "Kinë", @@ -65,7 +65,7 @@ "Country_CY": "Qipro", "Country_CZ": "Republika Çeke", "Country_DE": "Gjermani", - "Country_DJ": "Xhibut", + "Country_DJ": "Xhibuti", "Country_DK": "Danimarkë", "Country_DM": "Dominikë", "Country_DO": "Republika Dominikane", @@ -79,7 +79,7 @@ "Country_ET": "Etiopi", "Country_FI": "Finlandë", "Country_FJ": "Fixhi", - "Country_FK": "Ishujt Folklandë", + "Country_FK": "Ishujt Falkland", "Country_FM": "Mikronezi", "Country_FO": "Ishujt Faroe", "Country_FR": "Francë", @@ -88,11 +88,11 @@ "Country_GD": "Grenadë", "Country_GE": "Gjeorgji", "Country_GF": "Guajana Franceze", - "Country_GG": "Guernsej", + "Country_GG": "Gernsej", "Country_GH": "Ganë", "Country_GI": "Gjibraltar", "Country_GL": "Grenlandë", - "Country_GM": "Gambi", + "Country_GM": "Gambia", "Country_GN": "Guine", "Country_GP": "Guadalupe", "Country_GQ": "Guineja Ekuatoriale", @@ -103,7 +103,7 @@ "Country_GW": "Guine-Bisau", "Country_GY": "Guajanë", "Country_HK": "RVAK i Hong Kongut", - "Country_HM": "Ishulli Hërd dhe Ishujt Mekdonaldë", + "Country_HM": "Ishulli Hërd dhe Ishujt Mekdonald", "Country_HN": "Honduras", "Country_HR": "Kroaci", "Country_HT": "Haiti", @@ -125,18 +125,18 @@ "Country_KE": "Kenia", "Country_KG": "Kirgistan", "Country_KH": "Kamboxhia", - "Country_KI": "Qiribati", + "Country_KI": "Kiribati", "Country_KM": "Komore", - "Country_KN": "Shën-Kits dhe Nevis", + "Country_KN": "Shën Kits dhe Nevis", "Country_KP": "Koreja e Veriut", "Country_KR": "Koreja e Jugut", "Country_KW": "Kuvajt", - "Country_KY": "Ishujt Kajmanë", + "Country_KY": "Ishujt Kajman", "Country_KZ": "Kazakistan", "Country_LA": "Laos", "Country_LB": "Liban", "Country_LC": "Shën-Luçia", - "Country_LI": "Lihtënshtajn", + "Country_LI": "Lihtenshtajn", "Country_LK": "Sri-Lankë", "Country_LR": "Liberi", "Country_LS": "Lesoto", @@ -147,17 +147,17 @@ "Country_MA": "Marok", "Country_MC": "Monako", "Country_MD": "Moldavi", - "Country_ME": "Mali i Zi", + "Country_ME": "Mal i Zi", "Country_MF": "Shën-Martin", "Country_MG": "Madagaskar", - "Country_MH": "Ishujt Marshallë", + "Country_MH": "Ishujt Marshall", "Country_MK": "Maqedoni", "Country_ML": "Mali", "Country_MM": "Mianmar (Burma)", "Country_MN": "Mongoli", "Country_MO": "RVAK i Makaos", "Country_MP": "Ishujt e Marianës Veriore", - "Country_MQ": "Martinik", + "Country_MQ": "Martinikë", "Country_MR": "Mauritani", "Country_MS": "Montserat", "Country_MT": "Maltë", @@ -178,7 +178,7 @@ "Country_NP": "Nepal", "Country_NR": "Nauru", "Country_NU": "Niue", - "Country_NZ": "Zelanda e Re", + "Country_NZ": "Zelandë e Re", "Country_OM": "Oman", "Country_PA": "Panama", "Country_PE": "Peru", @@ -187,8 +187,8 @@ "Country_PH": "Filipine", "Country_PK": "Pakistan", "Country_PL": "Poloni", - "Country_PM": "Shën-Peir dhe Mikuelon", - "Country_PN": "Ishujt Pitkernë", + "Country_PM": "Shën Pier dhe Mikelon", + "Country_PN": "Ishujt Pitkern", "Country_PR": "Porto-Riko", "Country_PS": "Territoret Palestineze", "Country_PT": "Portugali", @@ -201,34 +201,34 @@ "Country_RU": "Rusi", "Country_RW": "Ruandë", "Country_SA": "Arabia Saudite", - "Country_SB": "Ishujt Solomonë", - "Country_SC": "Sishel", + "Country_SB": "Ishujt Solomon", + "Country_SC": "Sejshelle", "Country_SD": "Sudan", "Country_SE": "Suedi", "Country_SG": "Singapor", - "Country_SH": "Shën-Helena", + "Country_SH": "Shën-Helenë", "Country_SI": "Slloveni", - "Country_SJ": "Svalbard e Zhan-Majen", + "Country_SJ": "Svalbard e Jan-Majen", "Country_SK": "Sllovaki", "Country_SL": "Siera-Leone", "Country_SM": "San-Marino", - "Country_SN": "Senegali", + "Country_SN": "Senegal", "Country_SO": "Somali", "Country_SR": "Surinami", "Country_SS": "Sudani i Jugut", "Country_ST": "Sao-Tome e Prinsipe", - "Country_SV": "El Salvador", - "Country_SX": "Shën-Martin (Sint Maarten - pjesa e Mbretërisë së Holandës)", + "Country_SV": "Salvador", + "Country_SX": "Sint Marten", "Country_SY": "Siri", - "Country_SZ": "Suazilandë", - "Country_TC": "Ishujt Turke dhe Kaike", + "Country_SZ": "Svazilandë", + "Country_TC": "Ishujt Turks dhe Kaikos", "Country_TD": "Çad", - "Country_TF": "Territoret Australiane Franceze", + "Country_TF": "Territoret Jugore Franceze", "Country_TG": "Togo", "Country_TH": "Tajlandë", "Country_TJ": "Taxhikistan", "Country_TK": "Tokelau", - "Country_TL": "Timori Lindor", + "Country_TL": "Timor-Leste", "Country_TM": "Turkmenistan", "Country_TN": "Tunizi", "Country_TO": "Tonga", @@ -244,18 +244,18 @@ "Country_UY": "Uruguai", "Country_UZ": "Uzbekistan", "Country_VA": "Vatikan", - "Country_VC": "Shën-Vinsent dhe Grenadinet", + "Country_VC": "Shën Vincent dhe Grenadine", "Country_VE": "Venezuelë", "Country_VG": "Ishujt e Virgjër Britanikë", "Country_VI": "Ishujt e Virgjër Amerikanë", "Country_VN": "Vietnam", "Country_VU": "Vanuatu", - "Country_WF": "Uollis e Futina", + "Country_WF": "Uollis e Futuna", "Country_WS": "Samoa", "Country_YE": "Jemen", "Country_YT": "Majotë", "Country_ZA": "Afrika e Jugut", - "Country_ZM": "Zambi", + "Country_ZM": "Zambia", "Country_ZW": "Zimbabve", "Day_Long_1": "E hënë", "Day_Long_2": "E martë", @@ -318,16 +318,21 @@ "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "orë", + "Language_aa": "Afarisht", "Language_ab": "Abkazisht", "Language_af": "Afrikanisht", "Language_ak": "Akanisht", - "Language_am": "Amarikisht", + "Language_am": "Amarisht", + "Language_an": "Aragonezisht", "Language_ar": "Arabisht", "Language_as": "Asamezisht", + "Language_av": "Avarikisht", + "Language_ay": "Ajmarisht", "Language_az": "Azerbajxhanisht", "Language_ba": "Bashkirisht", "Language_be": "Bjellorusisht", "Language_bg": "Bullgarisht", + "Language_bi": "Bislamisht", "Language_bm": "Bambarisht", "Language_bn": "Bengalisht", "Language_bo": "Tibetisht", @@ -335,14 +340,17 @@ "Language_bs": "Boshnjakisht", "Language_ca": "Katalonisht", "Language_ce": "Çeçenisht", - "Language_co": "Korsikanisht", + "Language_ch": "Kamoroisht", + "Language_co": "Korsikisht", "Language_cs": "Çekisht", + "Language_cu": "Sllavishte kishe", "Language_cv": "Çuvashisht", "Language_cy": "Uellsisht", "Language_da": "Danisht", "Language_de": "Gjermanisht", + "Language_dv": "Divehisht", "Language_dz": "Xhongaisht", - "Language_ee": "Juisht", + "Language_ee": "Eveisht", "Language_el": "Greqisht", "Language_en": "Anglisht", "Language_eo": "Esperanto", @@ -350,13 +358,15 @@ "Language_et": "Estonisht", "Language_eu": "Baskisht", "Language_fa": "Persisht", + "Language_ff": "Fulaisht", "Language_fi": "Finlandisht", "Language_fj": "Fixhianisht", "Language_fo": "Faroisht", "Language_fr": "Frëngjisht", - "Language_fy": "Frizianisht", + "Language_fy": "Frizianishte perëndimore", "Language_ga": "Irlandisht", - "Language_gl": "Galike", + "Language_gd": "Galishte skoceze", + "Language_gl": "Galicisht", "Language_gn": "Guaranisht", "Language_gu": "Guxharatisht", "Language_gv": "Manksisht", @@ -364,12 +374,16 @@ "Language_he": "Hebraisht", "Language_hi": "Indisht", "Language_hr": "Kroatisht", - "Language_ht": "Haitianisht", + "Language_ht": "Haitisht", "Language_hu": "Hungarisht", "Language_hy": "Armenisht", + "Language_hz": "Hereroisht", + "Language_ia": "Interlingua", "Language_id": "Indonezisht", + "Language_ie": "Gjuha oksidentale", "Language_ig": "Igboisht", "Language_ii": "Sishuanisht", + "Language_io": "Idoisht", "Language_is": "Islandisht", "Language_it": "Italisht", "Language_iu": "Inuktitutisht", @@ -377,24 +391,29 @@ "Language_jv": "Javanisht", "Language_ka": "Gjeorgjisht", "Language_ki": "Kikujuisht", + "Language_kj": "Kuanjamaisht", "Language_kk": "Kazakisht", "Language_kl": "Kalalisutisht", - "Language_km": "Kmere", - "Language_kn": "Kanade", + "Language_km": "Kmerisht", + "Language_kn": "Kanadisht", "Language_ko": "Koreanisht", - "Language_ks": "Kashmire", - "Language_ku": "Kurde", - "Language_kw": "Kornishisht", + "Language_kr": "Kanurisht", + "Language_ks": "Kashmirisht", + "Language_ku": "Kurdisht", + "Language_kv": "Komisht", + "Language_kw": "Kornisht", "Language_ky": "Kirgizisht", "Language_la": "Latinisht", - "Language_lb": "Luksemburgase", - "Language_lg": "Gandisht", + "Language_lb": "Luksemburgisht", + "Language_lg": "Gandaisht", + "Language_li": "Limburgisht", "Language_ln": "Lingalisht", "Language_lo": "Laosisht", "Language_lt": "Lituanisht", - "Language_lu": "Lubakatangisht", + "Language_lu": "Luba-katangaisht", "Language_lv": "Letonisht", "Language_mg": "Malagezisht", + "Language_mh": "Marshallisht", "Language_mi": "Maorisht", "Language_mk": "Maqedonisht", "Language_ml": "Malajalamisht", @@ -403,54 +422,74 @@ "Language_ms": "Malajisht", "Language_mt": "Maltisht", "Language_my": "Birmanisht", - "Language_nb": "Bokmalishte norvegjeze", + "Language_na": "Nauruisht", + "Language_nb": "Norvegjishte letrare", "Language_nd": "Ndebelishte veriore", "Language_ne": "Nepalisht", + "Language_ng": "Ndongaisht", "Language_nl": "Holandisht", - "Language_nn": "Ninorske norvegjeze", + "Language_nn": "Norvegjishte nynorsk", + "Language_no": "Norvegjisht", + "Language_nr": "Ndebelishte jugore", + "Language_nv": "Navahoisht", + "Language_ny": "Nianjisht", + "Language_oc": "Oksitanisht", "Language_om": "Oromoisht", - "Language_or": "Orijaisht", + "Language_or": "Odisht", + "Language_os": "Osetisht", "Language_pa": "Panxhabisht", "Language_pl": "Polonisht", "Language_ps": "Pashtoisht", "Language_pt": "Portugalisht", "Language_qu": "Keçuaisht", - "Language_rm": "Rome", + "Language_rm": "Retoromanisht", "Language_rn": "Rundisht", "Language_ro": "Rumanisht", "Language_ru": "Rusisht", "Language_rw": "Kiniaruandisht", "Language_sa": "Sanskritisht", + "Language_sc": "Sardenjisht", "Language_sd": "Sindisht", "Language_se": "Samishte veriore", "Language_sg": "Sangoisht", "Language_si": "Sinhalisht", "Language_sk": "Sllovakisht", "Language_sl": "Sllovenisht", + "Language_sm": "Samoanisht", "Language_sn": "Shonisht", "Language_so": "Somalisht", "Language_sq": "Shqip", "Language_sr": "Serbisht", + "Language_ss": "Suatisht", + "Language_st": "Sotoishte jugore", "Language_su": "Sundanisht", "Language_sv": "Suedisht", "Language_sw": "Suahilisht", - "Language_ta": "Tamile", - "Language_te": "Teluge", + "Language_ta": "Tamilisht", + "Language_te": "Teluguisht", "Language_tg": "Taxhikisht", "Language_th": "Tajlandisht", - "Language_ti": "Tigrinje", + "Language_ti": "Tigrinjaisht", "Language_tk": "Turkmenisht", + "Language_tn": "Cuanaisht", "Language_to": "Tonganisht", "Language_tr": "Turqisht", + "Language_ts": "Congaisht", "Language_tt": "Tatarisht", - "Language_ug": "Ujgure", + "Language_tw": "Tuisht", + "Language_ty": "Tahitisht", + "Language_ug": "Ujgurisht", "Language_uk": "Ukrainisht", - "Language_ur": "Urdu", - "Language_uz": "Uzbeke", + "Language_ur": "Urduisht", + "Language_uz": "Uzbekisht", + "Language_ve": "Vendaisht", "Language_vi": "Vietnamisht", + "Language_vo": "Volapykisht", + "Language_wa": "Ualunisht", "Language_wo": "Ulufisht", - "Language_xh": "Xhozaisht", - "Language_yo": "Jorubisht", + "Language_xh": "Kosaisht", + "Language_yi": "Jidisht", + "Language_yo": "Jorubaisht", "Language_zh": "Kinezisht", "Language_zu": "Zuluisht", "LayoutDirection": "ltr", diff --git a/plugins/Intl/lang/sr.json b/plugins/Intl/lang/sr.json index 3e59d08f33..aaf5b36f1f 100644 --- a/plugins/Intl/lang/sr.json +++ b/plugins/Intl/lang/sr.json @@ -22,7 +22,7 @@ "Country_AT": "Аустрија", "Country_AU": "Аустралија", "Country_AW": "Аруба", - "Country_AX": "Оландска острва", + "Country_AX": "Оландска Острва", "Country_AZ": "Азербејџан", "Country_BA": "Босна и Херцеговина", "Country_BB": "Барбадос", @@ -33,7 +33,7 @@ "Country_BH": "Бахреин", "Country_BI": "Бурунди", "Country_BJ": "Бенин", - "Country_BL": "Свети Бартоломеј", + "Country_BL": "Сен Бартелеми", "Country_BM": "Бермуда", "Country_BN": "Брунеј", "Country_BO": "Боливија", @@ -61,7 +61,7 @@ "Country_CU": "Куба", "Country_CV": "Зеленортска Острва", "Country_CW": "Курасао", - "Country_CX": "Божићно острво", + "Country_CX": "Божићно Острво", "Country_CY": "Кипар", "Country_CZ": "Чешка", "Country_DE": "Немачка", @@ -79,31 +79,31 @@ "Country_ET": "Етиопија", "Country_FI": "Финска", "Country_FJ": "Фиџи", - "Country_FK": "Фокландска острва", + "Country_FK": "Фокландска Острва", "Country_FM": "Микронезија", "Country_FO": "Фарска Острва", "Country_FR": "Француска", "Country_GA": "Габон", - "Country_GB": "Велика Британија", + "Country_GB": "Уједињено Краљевство", "Country_GD": "Гренада", "Country_GE": "Грузија", "Country_GF": "Француска Гвајана", - "Country_GG": "Гурнси", + "Country_GG": "Гернзи", "Country_GH": "Гана", "Country_GI": "Гибралтар", "Country_GL": "Гренланд", "Country_GM": "Гамбија", "Country_GN": "Гвинеја", - "Country_GP": "Гваделупе", + "Country_GP": "Гваделуп", "Country_GQ": "Екваторијална Гвинеја", "Country_GR": "Грчка", - "Country_GS": "Јужна Џорџија и Јужна Сендвич Острва", + "Country_GS": "Јужна Џорџија и Јужна Сендвичка Острва", "Country_GT": "Гватемала", "Country_GU": "Гуам", "Country_GW": "Гвинеја-Бисао", "Country_GY": "Гвајана", "Country_HK": "САР Хонгконг (Кина)", - "Country_HM": "Острва Херд и Мекдоналд", + "Country_HM": "Острво Херд и Мекдоналдова острва", "Country_HN": "Хондурас", "Country_HR": "Хрватска", "Country_HT": "Хаити", @@ -113,12 +113,12 @@ "Country_IL": "Израел", "Country_IM": "Острво Ман", "Country_IN": "Индија", - "Country_IO": "Британска територија у Индијском океану", + "Country_IO": "Британска територија Индијског океана", "Country_IQ": "Ирак", "Country_IR": "Иран", "Country_IS": "Исланд", "Country_IT": "Италија", - "Country_JE": "Џерси", + "Country_JE": "Џерзи", "Country_JM": "Јамајка", "Country_JO": "Јордан", "Country_JP": "Јапан", @@ -148,7 +148,7 @@ "Country_MC": "Монако", "Country_MD": "Молдавија", "Country_ME": "Црна Гора", - "Country_MF": "Сент Мартин", + "Country_MF": "Свети Мартин (Француска)", "Country_MG": "Мадагаскар", "Country_MH": "Маршалска Острва", "Country_MK": "Македонија", @@ -191,7 +191,7 @@ "Country_PN": "Питкерн", "Country_PR": "Порторико", "Country_PS": "Палестинске територије", - "Country_PT": "Португал", + "Country_PT": "Португалија", "Country_PW": "Палау", "Country_PY": "Парагвај", "Country_QA": "Катар", @@ -218,7 +218,7 @@ "Country_SS": "Јужни Судан", "Country_ST": "Сао Томе и Принципе", "Country_SV": "Салвадор", - "Country_SX": "Свети Мартин", + "Country_SX": "Свети Мартин (Холандија)", "Country_SY": "Сирија", "Country_SZ": "Свазиленд", "Country_TC": "Острва Туркс и Каикос", @@ -240,7 +240,7 @@ "Country_UA": "Украјина", "Country_UG": "Уганда", "Country_UM": "Удаљена острва САД", - "Country_US": "Сједињене Америчке Државе", + "Country_US": "Сједињене Државе", "Country_UY": "Уругвај", "Country_UZ": "Узбекистан", "Country_VA": "Ватикан", @@ -271,13 +271,13 @@ "Day_Long_StandAlone_5": "Петак", "Day_Long_StandAlone_6": "Субота", "Day_Long_StandAlone_7": "Недеља", - "Day_Min_1": "Пон", - "Day_Min_2": "Уто", - "Day_Min_3": "Сре", - "Day_Min_4": "Чет", - "Day_Min_5": "Пет", - "Day_Min_6": "Суб", - "Day_Min_7": "Нед", + "Day_Min_1": "По", + "Day_Min_2": "Ут", + "Day_Min_3": "Ср", + "Day_Min_4": "Че", + "Day_Min_5": "Пе", + "Day_Min_6": "Су", + "Day_Min_7": "Не", "Day_Min_StandAlone_1": "По", "Day_Min_StandAlone_2": "Ут", "Day_Min_StandAlone_3": "Ср", @@ -314,17 +314,17 @@ "Format_Month_Long": "MMMM y.", "Format_Month_Short": "MMM y.", "Format_Time": "{time}", - "Format_Time_12": "hh.mm.ss a", - "Format_Time_24": "HH.mm.ss", + "Format_Time_12": "h:mm:ss a", + "Format_Time_24": "HH:mm:ss", "Format_Year": "y.", "Hours": "сати", "Language_aa": "Афарски", "Language_ab": "Абхаски", "Language_ae": "Авестански", "Language_af": "Африканс", - "Language_ak": "Акан", + "Language_ak": "Акански", "Language_am": "Амхарски", - "Language_an": "Арагонежански", + "Language_an": "Арагонски", "Language_ar": "Арапски", "Language_as": "Асамски", "Language_av": "Аварски", @@ -345,12 +345,12 @@ "Language_co": "Корзикански", "Language_cr": "Кри", "Language_cs": "Чешки", - "Language_cu": "Старословенски", + "Language_cu": "Црквенословенски", "Language_cv": "Чувашки", "Language_cy": "Велшки", "Language_da": "Дански", "Language_de": "Немачки", - "Language_dv": "Дивехијски", + "Language_dv": "Малдивски", "Language_dz": "Џонга", "Language_ee": "Еве", "Language_el": "Грчки", @@ -360,22 +360,22 @@ "Language_et": "Естонски", "Language_eu": "Баскијски", "Language_fa": "Персијски", - "Language_ff": "Фулах", + "Language_ff": "Фула", "Language_fi": "Фински", "Language_fj": "Фиџијски", "Language_fo": "Фарски", "Language_fr": "Француски", "Language_fy": "Западни фризијски", "Language_ga": "Ирски", - "Language_gd": "Шкотски Галски", + "Language_gd": "Шкотски гелски", "Language_gl": "Галицијски", "Language_gn": "Гварани", "Language_gu": "Гуџарати", - "Language_gv": "Мански", + "Language_gv": "Манкс", "Language_ha": "Хауса", "Language_he": "Хебрејски", "Language_hi": "Хинди", - "Language_ho": "Хири Моту", + "Language_ho": "Хири моту", "Language_hr": "Хрватски", "Language_ht": "Хаићански", "Language_hu": "Мађарски", @@ -383,22 +383,22 @@ "Language_hz": "Хереро", "Language_ia": "Интерлингва", "Language_id": "Индонежански", - "Language_ie": "Међујезички", + "Language_ie": "Интерлингве", "Language_ig": "Игбо", - "Language_ii": "Сечуан ји", - "Language_ik": "Унупиак", + "Language_ii": "Сечуански ји", + "Language_ik": "Инупик", "Language_io": "Идо", "Language_is": "Исландски", "Language_it": "Италијански", - "Language_iu": "Инуктитут", + "Language_iu": "Инуитски", "Language_ja": "Јапански", "Language_jv": "Јавански", "Language_ka": "Грузијски", "Language_kg": "Конго", "Language_ki": "Кикују", - "Language_kj": "Куањама", + "Language_kj": "Квањама", "Language_kk": "Казашки", - "Language_kl": "Калалисут", + "Language_kl": "Гренландски", "Language_km": "Кмерски", "Language_kn": "Канада", "Language_ko": "Корејски", @@ -411,9 +411,9 @@ "Language_la": "Латински", "Language_lb": "Луксембуршки", "Language_lg": "Ганда", - "Language_li": "Лимбургиш", + "Language_li": "Лимбуршки", "Language_ln": "Лингала", - "Language_lo": "Лаошки", + "Language_lo": "Лаоски", "Language_lt": "Литвански", "Language_lu": "Луба-катанга", "Language_lv": "Летонски", @@ -427,8 +427,8 @@ "Language_ms": "Малајски", "Language_mt": "Малтешки", "Language_my": "Бурмански", - "Language_na": "Науру", - "Language_nb": "Норвешки бокмал", + "Language_na": "Науруски", + "Language_nb": "Норвешки букмол", "Language_nd": "Северни ндебеле", "Language_ne": "Непалски", "Language_ng": "Ндонга", @@ -437,29 +437,29 @@ "Language_no": "Норвешки", "Language_nr": "Јужни ндебеле", "Language_nv": "Навахо", - "Language_ny": "Њања", - "Language_oc": "Провансалски", - "Language_oj": "Ојибва", + "Language_ny": "Њанџа", + "Language_oc": "Окситански", + "Language_oj": "Оџибве", "Language_om": "Оромо", - "Language_or": "Орија", - "Language_os": "Осетски", - "Language_pa": "Панџаби", + "Language_or": "Одија", + "Language_os": "Осетински", + "Language_pa": "Пенџапски", "Language_pi": "Пали", "Language_pl": "Пољски", "Language_ps": "Паштунски", "Language_pt": "Португалски", "Language_qu": "Кечуа", - "Language_rm": "Рето-романски", - "Language_rn": "Рунди", + "Language_rm": "Романш", + "Language_rn": "Кирунди", "Language_ro": "Румунски", "Language_ru": "Руски", - "Language_rw": "Кинјаруанда", + "Language_rw": "Кињаруанда", "Language_sa": "Санскрит", - "Language_sc": "Сардињаски", + "Language_sc": "Сардински", "Language_sd": "Синди", "Language_se": "Северни сами", "Language_sg": "Санго", - "Language_si": "Синхалски", + "Language_si": "Синхалешки", "Language_sk": "Словачки", "Language_sl": "Словеначки", "Language_sm": "Самоански", @@ -467,7 +467,7 @@ "Language_so": "Сомалски", "Language_sq": "Албански", "Language_sr": "Српски", - "Language_ss": "Свати", + "Language_ss": "Свази", "Language_st": "Сесото", "Language_su": "Сундански", "Language_sv": "Шведски", @@ -475,14 +475,14 @@ "Language_ta": "Тамилски", "Language_te": "Телугу", "Language_tg": "Таџички", - "Language_th": "Тајландски", + "Language_th": "Тајски", "Language_ti": "Тигриња", "Language_tk": "Туркменски", - "Language_tl": "Тагалски", - "Language_tn": "Тсвана", - "Language_to": "Тонга", + "Language_tl": "Тагалог", + "Language_tn": "Цвана", + "Language_to": "Тонгански", "Language_tr": "Турски", - "Language_ts": "Тсонга", + "Language_ts": "Цонга", "Language_tt": "Татарски", "Language_tw": "Тви", "Language_ty": "Тахићански", @@ -492,13 +492,13 @@ "Language_uz": "Узбечки", "Language_ve": "Венда", "Language_vi": "Вијетнамски", - "Language_vo": "Волапук", - "Language_wa": "Валун", + "Language_vo": "Волапик", + "Language_wa": "Валонски", "Language_wo": "Волоф", "Language_xh": "Коса", "Language_yi": "Јидиш", "Language_yo": "Јоруба", - "Language_za": "Жуанг", + "Language_za": "Џуаншки", "Language_zh": "Кинески", "Language_zu": "Зулу", "LayoutDirection": "ltr", @@ -552,11 +552,11 @@ "Month_Short_StandAlone_8": "Авг", "Month_Short_StandAlone_9": "Сеп", "NDays": "%s дана", - "NHoursShort": "%s сати", + "NHoursShort": "%s ч", "NMinutes": "%s минута", "NMinutesShort": "%s мин", "NSeconds": "%s секунди", - "NSecondsShort": "%s сек", + "NSecondsShort": "%s с", "NumberFormatCurrency": "#,##0.00 ¤", "NumberFormatNumber": "#,##0.###", "NumberFormatPercent": "#,##0%", diff --git a/plugins/Intl/lang/sv.json b/plugins/Intl/lang/sv.json index 6652fd399b..5313dded02 100644 --- a/plugins/Intl/lang/sv.json +++ b/plugins/Intl/lang/sv.json @@ -148,7 +148,7 @@ "Country_MC": "Monaco", "Country_MD": "Moldavien", "Country_ME": "Montenegro", - "Country_MF": "S:t Martin", + "Country_MF": "Saint-Martin", "Country_MG": "Madagaskar", "Country_MH": "Marshallöarna", "Country_MK": "Makedonien", @@ -351,7 +351,7 @@ "Language_da": "Danska", "Language_de": "Tyska", "Language_dv": "Divehi", - "Language_dz": "Bhutanesiska", + "Language_dz": "Dzongkha", "Language_ee": "Ewe", "Language_el": "Grekiska", "Language_en": "Engelska", @@ -428,7 +428,7 @@ "Language_mt": "Maltesiska", "Language_my": "Burmesiska", "Language_na": "Nauru", - "Language_nb": "Norskt bokmål", + "Language_nb": "Bokmål", "Language_nd": "Nordndebele", "Language_ne": "Nepalesiska", "Language_ng": "Ndonga", @@ -455,7 +455,7 @@ "Language_ru": "Ryska", "Language_rw": "Kinjarwanda", "Language_sa": "Sanskrit", - "Language_sc": "Sardiska", + "Language_sc": "Sardinska", "Language_sd": "Sindhi", "Language_se": "Nordsamiska", "Language_sg": "Sango", @@ -473,7 +473,7 @@ "Language_sv": "Svenska", "Language_sw": "Swahili", "Language_ta": "Tamil", - "Language_te": "Telugiska", + "Language_te": "Telugu", "Language_tg": "Tadzjikiska", "Language_th": "Thailändska", "Language_ti": "Tigrinja", diff --git a/plugins/Intl/lang/ta.json b/plugins/Intl/lang/ta.json index a24fad18e1..35dbccb1e9 100644 --- a/plugins/Intl/lang/ta.json +++ b/plugins/Intl/lang/ta.json @@ -35,7 +35,7 @@ "Country_BJ": "பெனின்", "Country_BL": "செயின்ட் பார்தேலெமி", "Country_BM": "பெர்முடா", - "Country_BN": "புரூனேய்", + "Country_BN": "புருனே", "Country_BO": "பொலிவியா", "Country_BQ": "கரீபியன் நெதர்லாந்து", "Country_BR": "பிரேசில்", @@ -76,7 +76,7 @@ "Country_EH": "மேற்கு சஹாரா", "Country_ER": "எரிட்ரியா", "Country_ES": "ஸ்பெயின்", - "Country_ET": "எதியோப்பியா", + "Country_ET": "எத்தியோப்பியா", "Country_FI": "பின்லாந்து", "Country_FJ": "ஃபிஜி", "Country_FK": "ஃபாக்லாந்து தீவுகள்", @@ -84,7 +84,7 @@ "Country_FO": "ஃபாரோ தீவுகள்", "Country_FR": "பிரான்ஸ்", "Country_GA": "கேபான்", - "Country_GB": "ஐக்கிய பேரரசு", + "Country_GB": "யுனைடெட் கிங்டம்", "Country_GD": "கிரனெடா", "Country_GE": "ஜார்ஜியா", "Country_GF": "பிரெஞ்சு கயானா", @@ -97,7 +97,7 @@ "Country_GP": "க்வாதேலோப்", "Country_GQ": "ஈக்வடோரியல் கினியா", "Country_GR": "கிரீஸ்", - "Country_GS": "தென் ஜியார்ஜியா மற்றும் தென் சான்ட்விச் தீவுகள்", + "Country_GS": "தெற்கு ஜார்ஜியா மற்றும் தெற்கு சாண்ட்விச் தீவுகள்", "Country_GT": "கவுதமாலா", "Country_GU": "குவாம்", "Country_GW": "கினியா-பிஸ்ஸாவ்", @@ -108,7 +108,7 @@ "Country_HR": "குரேஷியா", "Country_HT": "ஹைட்டி", "Country_HU": "ஹங்கேரி", - "Country_ID": "இந்தோனேஷியா", + "Country_ID": "இந்தோனேசியா", "Country_IE": "அயர்லாந்து", "Country_IL": "இஸ்ரேல்", "Country_IM": "ஐல் ஆஃப் மேன்", @@ -125,7 +125,7 @@ "Country_KE": "கென்யா", "Country_KG": "கிர்கிஸ்தான்", "Country_KH": "கம்போடியா", - "Country_KI": "கிரிபடி", + "Country_KI": "கிரிபாட்டி", "Country_KM": "கோமரோஸ்", "Country_KN": "செயின்ட் கிட்ஸ் & நெவிஸ்", "Country_KP": "வட கொரியா", @@ -199,7 +199,7 @@ "Country_RO": "ருமேனியா", "Country_RS": "செர்பியா", "Country_RU": "ரஷ்யா", - "Country_RW": "ருவான்டா", + "Country_RW": "ருவாண்டா", "Country_SA": "சவூதி அரேபியா", "Country_SB": "சாலமன் தீவுகள்", "Country_SC": "சீஷெல்ஸ்", @@ -226,20 +226,20 @@ "Country_TF": "பிரெஞ்சு தெற்கு பிரதேசங்கள்", "Country_TG": "டோகோ", "Country_TH": "தாய்லாந்து", - "Country_TJ": "தாஜிகிஸ்தான்", + "Country_TJ": "தஜிகிஸ்தான்", "Country_TK": "டோகேலோ", "Country_TL": "தைமூர்-லெஸ்தே", "Country_TM": "துர்க்மெனிஸ்தான்", "Country_TN": "டுனிசியா", "Country_TO": "டோங்கா", "Country_TR": "துருக்கி", - "Country_TT": "ட்ரினிடாட் & டொபாகோ", + "Country_TT": "டிரினிடாட் & டொபாகோ", "Country_TV": "துவாலூ", "Country_TW": "தைவான்", "Country_TZ": "தான்சானியா", "Country_UA": "உக்ரைன்", "Country_UG": "உகாண்டா", - "Country_UM": "யூ.எஸ். வெளிப்புற தீவுகள்", + "Country_UM": "யூ.எஸ். வெளிப்புறத் தீவுகள்", "Country_US": "அமெரிக்கா", "Country_UY": "உருகுவே", "Country_UZ": "உஸ்பெகிஸ்தான்", @@ -369,7 +369,7 @@ "Language_ga": "ஐரிஷ்", "Language_gd": "ஸ்காட்ஸ் கேலிக்", "Language_gl": "காலிஸியன்", - "Language_gn": "குரானி", + "Language_gn": "க்வாரனி", "Language_gu": "குஜராத்தி", "Language_gv": "மேங்க்ஸ்", "Language_ha": "ஹௌஸா", @@ -377,11 +377,11 @@ "Language_hi": "இந்தி", "Language_ho": "ஹிரி மோட்டு", "Language_hr": "குரோஷியன்", - "Language_ht": "ஹைத்தியன்", + "Language_ht": "ஹைத்தியன் க்ரியோலி", "Language_hu": "ஹங்கேரியன்", "Language_hy": "ஆர்மேனியன்", "Language_hz": "ஹெரேரோ", - "Language_ia": "இண்டர்லிங்வா", + "Language_ia": "இன்டர்லிங்வா", "Language_id": "இந்தோனேஷியன்", "Language_ie": "இன்டர்லிங்", "Language_ig": "இக்போ", @@ -405,7 +405,7 @@ "Language_kr": "கனுரி", "Language_ks": "காஷ்மிரி", "Language_ku": "குர்திஷ்", - "Language_kv": "கோமி", + "Language_kv": "கொமி", "Language_kw": "கார்னிஷ்", "Language_ky": "கிர்கிஸ்", "Language_la": "லத்தின்", @@ -418,7 +418,7 @@ "Language_lu": "லுபா-கடாங்கா", "Language_lv": "லாட்வியன்", "Language_mg": "மலகாஸி", - "Language_mh": "மார்ஷெலிஷ்", + "Language_mh": "மார்ஷெலீஸ்", "Language_mi": "மௌரி", "Language_mk": "மாஸிடோனியன்", "Language_ml": "மலையாளம்", @@ -434,35 +434,35 @@ "Language_ng": "தோங்கா", "Language_nl": "டச்சு", "Language_nn": "நார்வேஜியன் நியூநார்ஸ்க்", - "Language_no": "நார்வே", + "Language_no": "நார்வேஜியன்", "Language_nr": "தெற்கு தெபெலே", "Language_nv": "நவாஜோ", "Language_ny": "நயன்ஜா", "Language_oc": "ஒக்கிடன்", - "Language_oj": "ஓஜிபவா", + "Language_oj": "ஒஜிப்வா", "Language_om": "ஒரோமோ", - "Language_or": "ஒரியா", + "Language_or": "ஒடியா", "Language_os": "ஒசெட்டிக்", "Language_pa": "பஞ்சாபி", "Language_pi": "பாலி", "Language_pl": "போலிஷ்", "Language_ps": "பஷ்தோ", "Language_pt": "போர்ச்சுக்கீஸ்", - "Language_qu": "கிவேசுவா", + "Language_qu": "க்வெச்சுவா", "Language_rm": "ரோமான்ஷ்", "Language_rn": "ருண்டி", "Language_ro": "ரோமேனியன்", "Language_ru": "ரஷியன்", "Language_rw": "கின்யாருவான்டா", "Language_sa": "சமஸ்கிருதம்", - "Language_sc": "சாடினியன்", + "Language_sc": "சார்தீனியன்", "Language_sd": "சிந்தி", "Language_se": "வடக்கு சமி", "Language_sg": "சாங்கோ", "Language_si": "சிங்களம்", "Language_sk": "ஸ்லோவாக்", "Language_sl": "ஸ்லோவேனியன்", - "Language_sm": "ஸாமோவான்", + "Language_sm": "சமோவான்", "Language_sn": "ஷோனா", "Language_so": "சோமாலி", "Language_sq": "அல்பேனியன்", @@ -471,10 +471,10 @@ "Language_st": "தெற்கு ஸோதோ", "Language_su": "சுண்டானீஸ்", "Language_sv": "ஸ்வீடிஷ்", - "Language_sw": "சுவாஹிலி", + "Language_sw": "ஸ்வாஹிலி", "Language_ta": "தமிழ்", "Language_te": "தெலுங்கு", - "Language_tg": "தாஜிக்", + "Language_tg": "தஜிக்", "Language_th": "தாய்", "Language_ti": "டிக்ரின்யா", "Language_tk": "துருக்மென்", @@ -485,18 +485,18 @@ "Language_ts": "ஸோங்கா", "Language_tt": "டாடர்", "Language_tw": "ட்வி", - "Language_ty": "டஹிதியான்", + "Language_ty": "தஹிதியன்", "Language_ug": "உய்குர்", "Language_uk": "உக்ரைனியன்", "Language_ur": "உருது", "Language_uz": "உஸ்பெக்", "Language_ve": "வென்டா", - "Language_vi": "வியட்நாமிஸ்", + "Language_vi": "வியட்நாமீஸ்", "Language_vo": "ஒலாபூக்", "Language_wa": "ஒவாலூன்", - "Language_wo": "ஒலூஃப்", + "Language_wo": "ஓலோஃப்", "Language_xh": "ஹோசா", - "Language_yi": "இத்திஷ்", + "Language_yi": "யெட்டிஷ்", "Language_yo": "யோருபா", "Language_za": "ஜுவாங்", "Language_zh": "சீனம்", @@ -525,7 +525,7 @@ "Month_Long_StandAlone_5": "மே", "Month_Long_StandAlone_6": "ஜூன்", "Month_Long_StandAlone_7": "ஜூலை", - "Month_Long_StandAlone_8": "ஆகஸ்டு", + "Month_Long_StandAlone_8": "ஆகஸ்ட்", "Month_Long_StandAlone_9": "செப்டம்பர்", "Month_Short_1": "ஜன.", "Month_Short_10": "அக்.", diff --git a/plugins/Intl/lang/te.json b/plugins/Intl/lang/te.json index 9122d011da..2442a474f5 100644 --- a/plugins/Intl/lang/te.json +++ b/plugins/Intl/lang/te.json @@ -7,7 +7,7 @@ "Continent_ant": "అంటార్కటికా", "Continent_asi": "ఆసియా", "Continent_eur": "యూరోప్", - "Continent_oce": "ఒషీనియ", + "Continent_oce": "ఓషినియా", "Country_AD": "అండొర్రా", "Country_AE": "యునైటెడ్ అరబ్ ఎమిరేట్స్", "Country_AF": "ఆఫ్ఘనిస్తాన్", @@ -51,7 +51,7 @@ "Country_CF": "సెంట్రల్ ఆఫ్రికన్ రిపబ్లిక్", "Country_CG": "కాంగో- బ్రాజావిల్లి", "Country_CH": "స్విట్జర్లాండ్", - "Country_CI": "ఐవరీ కోస్ట్", + "Country_CI": "కోటెడ్ ఐవోయిర్", "Country_CK": "కుక్ దీవులు", "Country_CL": "చిలీ", "Country_CM": "కామెరూన్", @@ -67,7 +67,7 @@ "Country_DE": "జర్మనీ", "Country_DJ": "జిబౌటి", "Country_DK": "డెన్మార్క్", - "Country_DM": "డోమెనిక", + "Country_DM": "డొమెనికా", "Country_DO": "డొమెనికన్ రిపబ్లిక్", "Country_DZ": "అల్జీరియా", "Country_EC": "ఈక్వడార్", @@ -80,7 +80,7 @@ "Country_FI": "ఫిన్లాండ్", "Country_FJ": "ఫిజీ", "Country_FK": "ఫాక్ల్యాండ్ దీవులు", - "Country_FM": "మైక్రోనేశియ", + "Country_FM": "మైక్రోనేషియా", "Country_FO": "ఫారో దీవులు", "Country_FR": "ఫ్రాన్స్", "Country_GA": "గాబన్", @@ -144,7 +144,7 @@ "Country_LU": "లక్సంబర్గ్", "Country_LV": "లాత్వియా", "Country_LY": "లిబియా", - "Country_MA": "మొరాక్కో", + "Country_MA": "మొరాకో", "Country_MC": "మొనాకో", "Country_MD": "మోల్డోవా", "Country_ME": "మోంటేనేగ్రో", @@ -155,7 +155,7 @@ "Country_ML": "మాలి", "Country_MM": "మయన్మార్ (బర్మా)", "Country_MN": "మంగోలియా", - "Country_MO": "మాకావ్ ఎస్ఏఆర్ చైనా", + "Country_MO": "మకావు ఎస్ఏఆర్ చైనా", "Country_MP": "ఉత్తర మరియానా దీవులు", "Country_MQ": "మార్టినిక్", "Country_MR": "మౌరిటేనియా", @@ -170,7 +170,7 @@ "Country_NA": "నమీబియా", "Country_NC": "క్రొత్త కాలెడోనియా", "Country_NE": "నైజర్", - "Country_NF": "నార్ఫాక్ దీవి", + "Country_NF": "నార్ఫోక్ దీవి", "Country_NG": "నైజీరియా", "Country_NI": "నికరాగువా", "Country_NL": "నెదర్లాండ్స్", @@ -194,7 +194,7 @@ "Country_PT": "పోర్చుగల్", "Country_PW": "పలావు", "Country_PY": "పరాగ్వే", - "Country_QA": "కతర్", + "Country_QA": "ఖతర్", "Country_RE": "రియూనియన్", "Country_RO": "రోమానియా", "Country_RS": "సెర్బియా", @@ -206,7 +206,7 @@ "Country_SD": "సూడాన్", "Country_SE": "స్వీడన్", "Country_SG": "సింగపూర్", - "Country_SH": "సెంట్ హెలినా", + "Country_SH": "సెయింట్ హెలినా", "Country_SI": "స్లోవేనియా", "Country_SJ": "స్వాల్బార్డ్ మరియు యాన్ మాయేన్", "Country_SK": "స్లోవేకియా", @@ -214,9 +214,9 @@ "Country_SM": "సాన్ మారినో", "Country_SN": "సెనెగల్", "Country_SO": "సోమాలియా", - "Country_SR": "సురినామ్", + "Country_SR": "సూరినామ్", "Country_SS": "దక్షిణ సూడాన్", - "Country_ST": "సావోటోమ్ మరియు ప్రిన్సిపే", + "Country_ST": "సావోటోమ్ & ప్రిన్సిపే", "Country_SV": "ఎల్ సాల్వడోర్", "Country_SX": "సింట్ మార్టెన్", "Country_SY": "సిరియా", @@ -241,16 +241,16 @@ "Country_UG": "ఉగాండా", "Country_UM": "సంయుక్త రాజ్య అమెరికా బయట ఉన్న దీవులు", "Country_US": "అమెరికా సంయుక్త రాష్ట్రాలు", - "Country_UY": "ఉరుగువే", + "Country_UY": "ఊరుగ్వే", "Country_UZ": "ఉజ్బెకిస్తాన్", "Country_VA": "వాటికన్ నగరం", "Country_VC": "సెంట్ విన్సెంట్ మరియు గ్రెనడీన్స్", - "Country_VE": "వెనుజువేలా", + "Country_VE": "వెనుజులా", "Country_VG": "బ్రిటిష్ వర్జిన్ దీవులు", "Country_VI": "యు.ఎస్. వర్జిన్ దీవులు", "Country_VN": "వియత్నాం", "Country_VU": "వనాటు", - "Country_WF": "వాలిస్ మరియు ఫ్యుత్యునా", + "Country_WF": "వాలిస్ & ఫ్యుత్యునా", "Country_WS": "సమోవా", "Country_YE": "యెమెన్", "Country_YT": "మాయొట్టి", @@ -326,16 +326,16 @@ "Language_am": "అమ్హారిక్", "Language_an": "అరగోనిస్", "Language_ar": "అరబిక్", - "Language_as": "అస్సామీ", + "Language_as": "అస్సామీస్", "Language_av": "అవారిక్", "Language_ay": "ఐమారా", "Language_az": "అజర్బైజాని", "Language_ba": "బష్కిర్", - "Language_be": "బెలరుశియన్", + "Language_be": "బెలరుషియన్", "Language_bg": "బల్గేరియన్", "Language_bi": "బిస్లామా", "Language_bm": "బంబారా", - "Language_bn": "బెంగాలీ", + "Language_bn": "బాంగ్లా", "Language_bo": "టిబెటన్", "Language_br": "బ్రెటన్", "Language_bs": "బోస్నియన్", @@ -348,17 +348,17 @@ "Language_cu": "చర్చ స్లావిక్", "Language_cv": "చువాష్", "Language_cy": "వెల్ష్", - "Language_da": "డేనిష్", + "Language_da": "డానిష్", "Language_de": "జర్మన్", "Language_dv": "దివేహి", - "Language_dz": "జొన్ఖా", + "Language_dz": "జోంఖా", "Language_ee": "ఈవీ", "Language_el": "గ్రీక్", "Language_en": "ఆంగ్లం", - "Language_eo": "ఎస్పరెన్టొ", + "Language_eo": "ఎస్పెరాంటో", "Language_es": "స్పానిష్", - "Language_et": "ఈస్టొనియన్", - "Language_eu": "బాస్క్", + "Language_et": "ఈస్టోనియన్", + "Language_eu": "బాస్క్యూ", "Language_fa": "పర్షియన్", "Language_ff": "ఫ్యుల", "Language_fi": "ఫిన్నిష్", @@ -368,30 +368,30 @@ "Language_fy": "పశ్చిమ ఫ్రిసియన్", "Language_ga": "ఐరిష్", "Language_gd": "స్కాటిష్ గేలిక్", - "Language_gl": "గెలిషియన్", + "Language_gl": "గాలిషియన్", "Language_gn": "గురాని", "Language_gu": "గుజరాతి", "Language_gv": "మంకస్", "Language_ha": "హౌసా", - "Language_he": "హీబ్రు", + "Language_he": "హీబ్రూ", "Language_hi": "హిందీ", "Language_ho": "హిరి మోటు", - "Language_hr": "క్రొయెషియన్", - "Language_ht": "హైతియన్", - "Language_hu": "హన్గేరియన్", + "Language_hr": "క్రోయేషియన్", + "Language_ht": "హైటియన్ క్రియోల్", + "Language_hu": "హంగేరియన్", "Language_hy": "ఆర్మేనియన్", "Language_hz": "హిరేరో", "Language_ia": "ఇంటర్లింగ్వా", "Language_id": "ఇండోనేషియన్", - "Language_ie": "ఇంటర్ లింగ్", + "Language_ie": "ఇంటర్లింగ్", "Language_ig": "ఇగ్బో", "Language_ii": "శిషువన్ ఈ", - "Language_ik": "ఇనూపైఏక్", + "Language_ik": "ఇనుపైయాక్", "Language_io": "ఈడౌ", "Language_is": "ఐస్లాండిక్", "Language_it": "ఇటాలియన్", - "Language_iu": "ఇనుక్టిటుట్", - "Language_ja": "జాపనీస్", + "Language_iu": "ఇంక్టిటుట్", + "Language_ja": "జపనీస్", "Language_jv": "జావనీస్", "Language_ka": "జార్జియన్", "Language_kg": "కోంగో", @@ -428,20 +428,20 @@ "Language_mt": "మాల్టీస్", "Language_my": "బర్మీస్", "Language_na": "నౌరు", - "Language_nb": "నార్వీజియన్ బొక్మాల్", + "Language_nb": "నార్వేజియన్ బొక్మాల్", "Language_nd": "ఉత్తర దెబెలె", "Language_ne": "నేపాలి", "Language_ng": "దోంగా", "Language_nl": "డచ్", - "Language_nn": "నార్విజియాన్ న్యోర్స్క్", - "Language_no": "నార్విజియాన్", + "Language_nn": "నార్వేజియాన్ న్యోర్స్క్", + "Language_no": "నార్వేజియన్", "Language_nr": "దక్షిణ దెబెలె", - "Language_nv": "నవాహో", + "Language_nv": "నవాజొ", "Language_ny": "న్యాన్జా", "Language_oc": "ఆక్సిటన్", "Language_oj": "చేవా", "Language_om": "ఒరోమో", - "Language_or": "ఒరియా", + "Language_or": "ఒడియా", "Language_os": "ఒసేటిక్", "Language_pa": "పంజాబీ", "Language_pi": "పాలీ", @@ -478,7 +478,7 @@ "Language_th": "థాయ్", "Language_ti": "తిగ్రిన్యా", "Language_tk": "తుర్కమెన్", - "Language_tl": "తగలోగ్", + "Language_tl": "టగలాగ్", "Language_tn": "సెటస్వానా", "Language_to": "టాంగాన్", "Language_tr": "టర్కిష్", @@ -578,8 +578,8 @@ "PeriodYear": "సంవత్సరం", "PeriodYears": "సంవత్సరాలు", "Seconds": "సెకన్లు", - "Time_AM": "[AM]", - "Time_PM": "[PM]", + "Time_AM": "AM", + "Time_PM": "PM", "Today": "ఈ రోజు", "Year_Short": "సం.", "Yesterday": "నిన్న" diff --git a/plugins/Intl/lang/th.json b/plugins/Intl/lang/th.json index 52034808c2..f31a27b455 100644 --- a/plugins/Intl/lang/th.json +++ b/plugins/Intl/lang/th.json @@ -51,7 +51,7 @@ "Country_CF": "สาธารณรัฐแอฟริกากลาง", "Country_CG": "คองโก-บราซซาวิล", "Country_CH": "สวิตเซอร์แลนด์", - "Country_CI": "ไอวอรี่โคสต์", + "Country_CI": "โกตดิวัวร์", "Country_CK": "หมู่เกาะคุก", "Country_CL": "ชิลี", "Country_CM": "แคเมอรูน", @@ -153,7 +153,7 @@ "Country_MH": "หมู่เกาะมาร์แชลล์", "Country_MK": "มาซิโดเนีย", "Country_ML": "มาลี", - "Country_MM": "เมียนม่าร์ (พม่า)", + "Country_MM": "เมียนมาร์ (พม่า)", "Country_MN": "มองโกเลีย", "Country_MO": "เขตปกครองพิเศษมาเก๊าแห่งสาธารณรัฐประชาชนจีน", "Country_MP": "หมู่เกาะนอร์เทิร์นมาเรียนา", @@ -482,7 +482,7 @@ "Language_tn": "บอตสวานา", "Language_to": "ตองกา", "Language_tr": "ตุรกี", - "Language_ts": "ซิิตซองกา", + "Language_ts": "ซิตซองกา", "Language_tt": "ตาตาร์", "Language_tw": "ทวิ", "Language_ty": "ตาฮิตี", diff --git a/plugins/Intl/lang/tl.json b/plugins/Intl/lang/tl.json index 793664da58..50f776d514 100644 --- a/plugins/Intl/lang/tl.json +++ b/plugins/Intl/lang/tl.json @@ -318,26 +318,32 @@ "Format_Time_24": "HH:mm:ss", "Format_Year": "y", "Hours": "mga oras", + "Language_aa": "Afar", "Language_ab": "Abkhazian", "Language_af": "Afrikaans", "Language_ak": "Akan", "Language_am": "Amharic", - "Language_ar": "Arabe", + "Language_an": "Aragonese", + "Language_ar": "Arabic", "Language_as": "Assamese", + "Language_av": "Avaric", "Language_ay": "Aymara", "Language_az": "Azerbaijani", "Language_ba": "Bashkir", "Language_be": "Belarusian", "Language_bg": "Bulgarian", + "Language_bi": "Bislama", "Language_bm": "Bambara", - "Language_bn": "Bengali", + "Language_bn": "Bangla", "Language_bo": "Tibetan", "Language_br": "Breton", "Language_bs": "Bosnian", "Language_ca": "Catalan", "Language_ce": "Chechen", + "Language_ch": "Chamorro", "Language_co": "Corsican", "Language_cs": "Czech", + "Language_cu": "Church Slavic", "Language_cv": "Chuvash", "Language_cy": "Welsh", "Language_da": "Danish", @@ -348,10 +354,11 @@ "Language_el": "Greek", "Language_en": "Ingles", "Language_eo": "Esperanto", - "Language_es": "Espanyol", + "Language_es": "Spanish", "Language_et": "Estonian", "Language_eu": "Basque", "Language_fa": "Persian", + "Language_ff": "Fulah", "Language_fi": "Finnish", "Language_fj": "Fijian", "Language_fo": "Faroese", @@ -370,11 +377,13 @@ "Language_ht": "Haitian", "Language_hu": "Hungarian", "Language_hy": "Armenian", + "Language_hz": "Herero", "Language_ia": "Interlingua", "Language_id": "Indonesian", "Language_ie": "Interlingue", "Language_ig": "Igbo", "Language_ii": "Sichuan Yi", + "Language_io": "Ido", "Language_is": "Icelandic", "Language_it": "Italian", "Language_iu": "Inuktitut", @@ -383,24 +392,29 @@ "Language_ka": "Georgian", "Language_kg": "Kongo", "Language_ki": "Kikuyu", + "Language_kj": "Kuanyama", "Language_kk": "Kazakh", "Language_kl": "Kalaallisut", "Language_km": "Khmer", "Language_kn": "Kannada", "Language_ko": "Korean", + "Language_kr": "Kanuri", "Language_ks": "Kashmiri", "Language_ku": "Kurdish", + "Language_kv": "Komi", "Language_kw": "Cornish", "Language_ky": "Kirghiz", "Language_la": "Latin", "Language_lb": "Luxembourgish", "Language_lg": "Ganda", + "Language_li": "Limburgish", "Language_ln": "Lingala", "Language_lo": "Lao", "Language_lt": "Lithuanian", "Language_lu": "Luba-Katanga", "Language_lv": "Latvian", "Language_mg": "Malagasy", + "Language_mh": "Marshallese", "Language_mi": "Maori", "Language_mk": "Macedonian", "Language_ml": "Malayalam", @@ -409,21 +423,25 @@ "Language_ms": "Malay", "Language_mt": "Maltese", "Language_my": "Burmese", - "Language_nb": "Norwegian Bokmal", + "Language_na": "Nauru", + "Language_nb": "Norwegian Bokmål", "Language_nd": "Hilagang Ndebele", "Language_ne": "Nepali", + "Language_ng": "Ndonga", "Language_nl": "Dutch", "Language_nn": "Norwegian Nynorsk", "Language_no": "Norwegian", + "Language_nr": "South Ndebele", + "Language_nv": "Navajo", "Language_ny": "Nyanja", "Language_oc": "Occitan", "Language_om": "Oromo", - "Language_or": "Oriya", + "Language_or": "Odia", "Language_os": "Ossetic", "Language_pa": "Punjabi", "Language_pl": "Polish", "Language_ps": "Pashto", - "Language_pt": "Portuges", + "Language_pt": "Portuguese", "Language_qu": "Quechua", "Language_rm": "Romansh", "Language_rn": "Rundi", @@ -431,6 +449,7 @@ "Language_ru": "Russian", "Language_rw": "Kinyarwanda", "Language_sa": "Sanskrit", + "Language_sc": "Sardinian", "Language_sd": "Sindhi", "Language_se": "Hilagang Sami", "Language_sg": "Sango", @@ -443,7 +462,7 @@ "Language_sq": "Albanian", "Language_sr": "Serbian", "Language_ss": "Swati", - "Language_st": "Southern Sotho", + "Language_st": "Katimugang Sotho", "Language_su": "Sundanese", "Language_sv": "Swedish", "Language_sw": "Swahili", @@ -453,11 +472,13 @@ "Language_th": "Thai", "Language_ti": "Tigrinya", "Language_tk": "Turkmen", + "Language_tl": "Tagalog", "Language_tn": "Tswana", "Language_to": "Tongan", "Language_tr": "Turkish", "Language_ts": "Tsonga", "Language_tt": "Tatar", + "Language_tw": "Twi", "Language_ty": "Tahitian", "Language_ug": "Uyghur", "Language_uk": "Ukranian", @@ -465,6 +486,8 @@ "Language_uz": "Uzbek", "Language_ve": "Venda", "Language_vi": "Vietnamese", + "Language_vo": "Volapük", + "Language_wa": "Walloon", "Language_wo": "Wolof", "Language_xh": "Xhosa", "Language_yi": "Yiddish", @@ -538,7 +561,7 @@ "OneDay": "1 araw", "OneMinute": "1 minuto", "OneMinuteShort": "1 min.", - "OriginalLanguageName": "Filipino", + "OriginalLanguageName": "Tagalog", "PeriodDay": "araw", "PeriodDays": "araw", "PeriodMonth": "buwan", diff --git a/plugins/Intl/lang/tr.json b/plugins/Intl/lang/tr.json index 3ceb15c281..f94ba5e001 100644 --- a/plugins/Intl/lang/tr.json +++ b/plugins/Intl/lang/tr.json @@ -24,7 +24,7 @@ "Country_AW": "Aruba", "Country_AX": "Åland Adaları", "Country_AZ": "Azerbaycan", - "Country_BA": "Bosna Hersek", + "Country_BA": "Bosna-Hersek", "Country_BB": "Barbados", "Country_BD": "Bangladeş", "Country_BE": "Belçika", @@ -43,7 +43,7 @@ "Country_BT": "Butan", "Country_BV": "Bouvet Adası", "Country_BW": "Botsvana", - "Country_BY": "Beyaz Rusya", + "Country_BY": "Belarus", "Country_BZ": "Belize", "Country_CA": "Kanada", "Country_CC": "Cocos (Keeling) Adaları", @@ -62,7 +62,7 @@ "Country_CV": "Cape Verde", "Country_CW": "Curaçao", "Country_CX": "Christmas Adası", - "Country_CY": "Güney Kıbrıs Rum Kesimi", + "Country_CY": "Kıbrıs", "Country_CZ": "Çek Cumhuriyeti", "Country_DE": "Almanya", "Country_DJ": "Cibuti", @@ -73,7 +73,7 @@ "Country_EC": "Ekvador", "Country_EE": "Estonya", "Country_EG": "Mısır", - "Country_EH": "Batı Sahara", + "Country_EH": "Batı Sahra", "Country_ER": "Eritre", "Country_ES": "İspanya", "Country_ET": "Etiyopya", @@ -102,7 +102,7 @@ "Country_GU": "Guam", "Country_GW": "Gine-Bissau", "Country_GY": "Guyana", - "Country_HK": "Çin Hong Kong ÖYB", + "Country_HK": "Çin Hong Kong ÖİB", "Country_HM": "Heard Adası ve McDonald Adaları", "Country_HN": "Honduras", "Country_HR": "Hırvatistan", @@ -139,7 +139,7 @@ "Country_LI": "Liechtenstein", "Country_LK": "Sri Lanka", "Country_LR": "Liberya", - "Country_LS": "Lesoto", + "Country_LS": "Lesotho", "Country_LT": "Litvanya", "Country_LU": "Lüksemburg", "Country_LV": "Letonya", @@ -155,7 +155,7 @@ "Country_ML": "Mali", "Country_MM": "Myanmar (Burma)", "Country_MN": "Moğolistan", - "Country_MO": "Çin Makao ÖYB", + "Country_MO": "Çin Makao ÖİB", "Country_MP": "Kuzey Mariana Adaları", "Country_MQ": "Martinik", "Country_MR": "Moritanya", @@ -208,7 +208,7 @@ "Country_SG": "Singapur", "Country_SH": "Saint Helena", "Country_SI": "Slovenya", - "Country_SJ": "Svalbard ve Jan Mayen Adaları", + "Country_SJ": "Svalbard ve Jan Mayen", "Country_SK": "Slovakya", "Country_SL": "Sierra Leone", "Country_SM": "San Marino", @@ -240,7 +240,7 @@ "Country_UA": "Ukrayna", "Country_UG": "Uganda", "Country_UM": "ABD Uzak Adaları", - "Country_US": "ABD", + "Country_US": "Amerika Birleşik Devletleri", "Country_UY": "Uruguay", "Country_UZ": "Özbekistan", "Country_VA": "Vatikan", @@ -250,7 +250,7 @@ "Country_VI": "ABD Virjin Adaları", "Country_VN": "Vietnam", "Country_VU": "Vanuatu", - "Country_WF": "Wallis ve Futuna Adaları", + "Country_WF": "Wallis ve Futuna", "Country_WS": "Samoa", "Country_YE": "Yemen", "Country_YT": "Mayotte", @@ -331,7 +331,7 @@ "Language_ay": "Aymara", "Language_az": "Azerice", "Language_ba": "Başkırtça", - "Language_be": "Beyaz Rusça", + "Language_be": "Belarusça", "Language_bg": "Bulgarca", "Language_bi": "Bislama", "Language_bm": "Bambara", @@ -341,17 +341,17 @@ "Language_bs": "Boşnakça", "Language_ca": "Katalanca", "Language_ce": "Çeçence", - "Language_ch": "Chamorro", + "Language_ch": "Çamorro dili", "Language_co": "Korsikaca", - "Language_cr": "Cree", + "Language_cr": "Krice", "Language_cs": "Çekçe", "Language_cu": "Kilise Slavcası", "Language_cv": "Çuvaşça", "Language_cy": "Galce", "Language_da": "Danca", "Language_de": "Almanca", - "Language_dv": "Divehi", - "Language_dz": "Butan Dili", + "Language_dv": "Divehi dili", + "Language_dz": "Dzongkha", "Language_ee": "Ewe", "Language_el": "Yunanca", "Language_en": "İngilizce", @@ -360,50 +360,50 @@ "Language_et": "Estonca", "Language_eu": "Baskça", "Language_fa": "Farsça", - "Language_ff": "Fulah", + "Language_ff": "Fula dili", "Language_fi": "Fince", "Language_fj": "Fiji Dili", "Language_fo": "Faroe Dili", "Language_fr": "Fransızca", "Language_fy": "Batı Frizcesi", "Language_ga": "İrlandaca", - "Language_gd": "İskoç Gal Dili", + "Language_gd": "İskoç Gaelcesi", "Language_gl": "Galiçyaca", - "Language_gn": "Guarani Dili", + "Language_gn": "Guarani dili", "Language_gu": "Güceratça", "Language_gv": "Manks", - "Language_ha": "Hausa", + "Language_ha": "Hausa dili", "Language_he": "İbranice", "Language_hi": "Hintçe", "Language_ho": "Hiri Motu", "Language_hr": "Hırvatça", - "Language_ht": "Haiti Dili", + "Language_ht": "Haiti Kreyolu", "Language_hu": "Macarca", "Language_hy": "Ermenice", - "Language_hz": "Herero", + "Language_hz": "Herero dili", "Language_ia": "Interlingua", "Language_id": "Endonezce", "Language_ie": "Interlingue", - "Language_ig": "İbo Dili", + "Language_ig": "İbo dili", "Language_ii": "Sichuan Yi", - "Language_ik": "Inupiak", + "Language_ik": "İnyupikçe", "Language_io": "Ido", "Language_is": "İzlandaca", "Language_it": "İtalyanca", - "Language_iu": "Inuktitut", + "Language_iu": "İnuit dili", "Language_ja": "Japonca", "Language_jv": "Cava Dili", "Language_ka": "Gürcüce", - "Language_kg": "Kongo", + "Language_kg": "Kongo dili", "Language_ki": "Kikuyu", "Language_kj": "Kuanyama", "Language_kk": "Kazakça", - "Language_kl": "Grönland Dili", + "Language_kl": "Grönland dili", "Language_km": "Kmerce", - "Language_kn": "Kannada", + "Language_kn": "Kannada dili", "Language_ko": "Korece", - "Language_kr": "Kanuri", - "Language_ks": "Keşmirce", + "Language_kr": "Kanuri dili", + "Language_ks": "Keşmir dili", "Language_ku": "Kürtçe", "Language_kv": "Komi", "Language_kw": "Kernevekçe", @@ -413,34 +413,34 @@ "Language_lg": "Ganda", "Language_li": "Limburgca", "Language_ln": "Lingala", - "Language_lo": "Laoca", + "Language_lo": "Lao dili", "Language_lt": "Litvanca", "Language_lu": "Luba-Katanga", "Language_lv": "Letonca", "Language_mg": "Malgaşça", - "Language_mh": "Marshall Adaları Dili", - "Language_mi": "Maori Dili", + "Language_mh": "Marshall Adaları dili", + "Language_mi": "Maori dili", "Language_mk": "Makedonca", - "Language_ml": "Malayalam", + "Language_ml": "Malayalam dili", "Language_mn": "Moğolca", "Language_mr": "Marathi", "Language_ms": "Malayca", "Language_mt": "Maltaca", "Language_my": "Burmaca", - "Language_na": "Nauru Dili", + "Language_na": "Nauru dili", "Language_nb": "Norveççe Bokmål", "Language_nd": "Kuzey Ndebele", "Language_ne": "Nepalce", "Language_ng": "Ndonga", - "Language_nl": "Hollandaca", + "Language_nl": "Felemenkçe", "Language_nn": "Norveççe Nynorsk", "Language_no": "Norveççe", "Language_nr": "Güney Ndebele", - "Language_nv": "Navaho Dili", + "Language_nv": "Navaho dili", "Language_ny": "Nyanja", - "Language_oc": "Occitan", - "Language_oj": "Ojibva Dili", - "Language_om": "Oromo", + "Language_oc": "Oksitan dili", + "Language_oj": "Ojibva dili", + "Language_om": "Oromo dili", "Language_or": "Oriya Dili", "Language_os": "Osetçe", "Language_pa": "Pencapça", @@ -448,57 +448,57 @@ "Language_pl": "Lehçe", "Language_ps": "Peştuca", "Language_pt": "Portekizce", - "Language_qu": "Keçuvaca", + "Language_qu": "Keçuva dili", "Language_rm": "Romanşça", "Language_rn": "Kirundi", - "Language_ro": "Romence", + "Language_ro": "Rumence", "Language_ru": "Rusça", "Language_rw": "Kinyarwanda", - "Language_sa": "Sanskritçe", - "Language_sc": "Sardunya Dili", + "Language_sa": "Sanskrit", + "Language_sc": "Sardunya dili", "Language_sd": "Sindhi", - "Language_se": "Kuzey Sami", + "Language_se": "Kuzey Laponcası", "Language_sg": "Sango", "Language_si": "Seylanca", "Language_sk": "Slovakça", "Language_sl": "Slovence", - "Language_sm": "Samoa Dili", + "Language_sm": "Samoa dili", "Language_sn": "Shona", "Language_so": "Somalice", "Language_sq": "Arnavutça", "Language_sr": "Sırpça", "Language_ss": "Sisvati", - "Language_st": "Güney Sotho", + "Language_st": "Güney Sotho dili", "Language_su": "Sunda Dili", "Language_sv": "İsveççe", "Language_sw": "Svahili", "Language_ta": "Tamilce", - "Language_te": "Telugu Dili", + "Language_te": "Telugu dili", "Language_tg": "Tacikçe", "Language_th": "Tayca", "Language_ti": "Tigrinya", "Language_tk": "Türkmence", - "Language_tl": "Takalotça", + "Language_tl": "Tagalogca", "Language_tn": "Setsvana", - "Language_to": "Tongaca", + "Language_to": "Tonga dili", "Language_tr": "Türkçe", "Language_ts": "Tsonga", "Language_tt": "Tatarca", "Language_tw": "Tvi", - "Language_ty": "Tahiti Dili", + "Language_ty": "Tahiti dili", "Language_ug": "Uygurca", "Language_uk": "Ukraynaca", "Language_ur": "Urduca", "Language_uz": "Özbekçe", - "Language_ve": "Venda", + "Language_ve": "Venda dili", "Language_vi": "Vietnamca", "Language_vo": "Volapük", "Language_wa": "Valonca", "Language_wo": "Volofça", - "Language_xh": "Zosa", + "Language_xh": "Zosa dili", "Language_yi": "Yidiş", "Language_yo": "Yorubaca", - "Language_za": "Zhuang", + "Language_za": "Zhuangca", "Language_zh": "Çince", "Language_zu": "Zuluca", "LayoutDirection": "ltr", @@ -557,7 +557,7 @@ "NMinutesShort": "%s dk.", "NSeconds": "%s saniye", "NSecondsShort": "%ssn", - "NumberFormatCurrency": "#,##0.00 ¤", + "NumberFormatCurrency": "¤#,##0.00", "NumberFormatNumber": "#,##0.###", "NumberFormatPercent": "%#,##0", "NumberSymbolDecimal": ",", @@ -569,13 +569,13 @@ "OneMinute": "1 dakika", "OneMinuteShort": "1 dk.", "OriginalLanguageName": "Türkçe", - "PeriodDay": "Gün", + "PeriodDay": "gün", "PeriodDays": "gün", - "PeriodMonth": "Ay", + "PeriodMonth": "ay", "PeriodMonths": "ay", - "PeriodWeek": "Hafta", + "PeriodWeek": "hafta", "PeriodWeeks": "hafta", - "PeriodYear": "Yıl", + "PeriodYear": "yıl", "PeriodYears": "yıl", "Seconds": "saniye", "Time_AM": "ÖÖ", diff --git a/plugins/Intl/lang/uk.json b/plugins/Intl/lang/uk.json index 44d6c12e92..e6f3e902e5 100644 --- a/plugins/Intl/lang/uk.json +++ b/plugins/Intl/lang/uk.json @@ -59,11 +59,11 @@ "Country_CO": "Колумбія", "Country_CR": "Коста-Рика", "Country_CU": "Куба", - "Country_CV": "Кабо Верде", + "Country_CV": "Кабо-Верде", "Country_CW": "Кюрасао", "Country_CX": "Острів Різдва", "Country_CY": "Кіпр", - "Country_CZ": "Чехія", + "Country_CZ": "Чеська Республіка", "Country_DE": "Німеччина", "Country_DJ": "Джибуті", "Country_DK": "Данія", @@ -81,7 +81,7 @@ "Country_FJ": "Фіджі", "Country_FK": "Фолклендські острови", "Country_FM": "Мікронезія", - "Country_FO": "Фарерські острови", + "Country_FO": "Фарерські Острови", "Country_FR": "Франція", "Country_GA": "Габон", "Country_GB": "Велика Британія", @@ -156,7 +156,7 @@ "Country_MM": "Мʼянма (Бірма)", "Country_MN": "Монголія", "Country_MO": "Макао, О.А.Р Китаю", - "Country_MP": "Північні Маріанські острови", + "Country_MP": "Північні Маріанські Острови", "Country_MQ": "Мартиніка", "Country_MR": "Мавританія", "Country_MS": "Монтсеррат", @@ -202,7 +202,7 @@ "Country_RW": "Руанда", "Country_SA": "Саудівська Аравія", "Country_SB": "Соломонові Острови", - "Country_SC": "Сейшельські острови", + "Country_SC": "Сейшельські Острови", "Country_SD": "Судан", "Country_SE": "Швеція", "Country_SG": "Сінгапур", @@ -345,7 +345,7 @@ "Language_co": "Корсиканська", "Language_cr": "Крі", "Language_cs": "Чеська", - "Language_cu": "Церковнослов’янська", + "Language_cu": "Церковнословʼянська", "Language_cv": "Чуваська", "Language_cy": "Валлійська", "Language_da": "Данська", @@ -492,7 +492,7 @@ "Language_uz": "Узбецька", "Language_ve": "Венда", "Language_vi": "Вʼєтнамська", - "Language_vo": "Волап’юк", + "Language_vo": "Волапʼюк", "Language_wa": "Валлонська", "Language_wo": "Волоф", "Language_xh": "Кхоса", diff --git a/plugins/Intl/lang/vi.json b/plugins/Intl/lang/vi.json index 9da64b533a..d90239f519 100644 --- a/plugins/Intl/lang/vi.json +++ b/plugins/Intl/lang/vi.json @@ -9,18 +9,18 @@ "Continent_eur": "Châu Âu", "Continent_oce": "Châu Đại Dương", "Country_AD": "Andorra", - "Country_AE": "Các Tiểu V.quốc Ả Rập T.nhất", + "Country_AE": "Các Tiểu Vương quốc Ả Rập Thống nhất", "Country_AF": "Afghanistan", "Country_AG": "Antigua và Barbuda", "Country_AI": "Anguilla", - "Country_AL": "Albani", + "Country_AL": "Albania", "Country_AM": "Armenia", "Country_AO": "Angola", "Country_AQ": "Nam Cực", "Country_AR": "Argentina", "Country_AS": "Đảo Somoa thuộc Mỹ", "Country_AT": "Áo", - "Country_AU": "Úc", + "Country_AU": "Australia", "Country_AW": "Aruba", "Country_AX": "Quần đảo Åland", "Country_AZ": "Azerbaijan", @@ -29,7 +29,7 @@ "Country_BD": "Bangladesh", "Country_BE": "Bỉ", "Country_BF": "Burkina Faso", - "Country_BG": "Bungari", + "Country_BG": "Bulgaria", "Country_BH": "Bahrain", "Country_BI": "Burundi", "Country_BJ": "Benin", @@ -51,7 +51,7 @@ "Country_CF": "Cộng hòa Trung Phi", "Country_CG": "Congo - Brazzaville", "Country_CH": "Thụy Sĩ", - "Country_CI": "Bờ Biển Ngà", + "Country_CI": "Côte d’Ivoire", "Country_CK": "Quần đảo Cook", "Country_CL": "Chile", "Country_CM": "Cameroon", @@ -86,7 +86,7 @@ "Country_GA": "Gabon", "Country_GB": "Vương quốc Anh", "Country_GD": "Grenada", - "Country_GE": "Georgia", + "Country_GE": "Gruzia", "Country_GF": "Guiana thuộc Pháp", "Country_GG": "Guernsey", "Country_GH": "Ghana", @@ -107,14 +107,14 @@ "Country_HN": "Honduras", "Country_HR": "Croatia", "Country_HT": "Haiti", - "Country_HU": "Hungari", + "Country_HU": "Hungary", "Country_ID": "Indonesia", - "Country_IE": "Ai-len", + "Country_IE": "Ireland", "Country_IL": "Israel", "Country_IM": "Đảo Man", "Country_IN": "Ấn Độ", - "Country_IO": "Thuộc địa Anh tại Ấn Độ Dương", - "Country_IQ": "I-rắc", + "Country_IO": "Lãnh thổ Anh tại Ấn Độ Dương", + "Country_IQ": "Iraq", "Country_IR": "Iran", "Country_IS": "Iceland", "Country_IT": "Ý", @@ -130,7 +130,7 @@ "Country_KN": "St. Kitts và Nevis", "Country_KP": "Triều Tiên", "Country_KR": "Hàn Quốc", - "Country_KW": "Cô-oét", + "Country_KW": "Kuwait", "Country_KY": "Quần đảo Cayman", "Country_KZ": "Kazakhstan", "Country_LA": "Lào", @@ -140,10 +140,10 @@ "Country_LK": "Sri Lanka", "Country_LR": "Liberia", "Country_LS": "Lesotho", - "Country_LT": "Lít-va", + "Country_LT": "Litva", "Country_LU": "Luxembourg", "Country_LV": "Latvia", - "Country_LY": "Li-bi", + "Country_LY": "Libya", "Country_MA": "Ma-rốc", "Country_MC": "Monaco", "Country_MD": "Moldova", @@ -184,7 +184,7 @@ "Country_PE": "Peru", "Country_PF": "Polynesia thuộc Pháp", "Country_PG": "Papua New Guinea", - "Country_PH": "Philippin", + "Country_PH": "Philippines", "Country_PK": "Pakistan", "Country_PL": "Ba Lan", "Country_PM": "Saint Pierre và Miquelon", @@ -213,7 +213,7 @@ "Country_SL": "Sierra Leone", "Country_SM": "San Marino", "Country_SN": "Senegal", - "Country_SO": "Somali", + "Country_SO": "Somalia", "Country_SR": "Suriname", "Country_SS": "Nam Sudan", "Country_ST": "São Tomé và Príncipe", @@ -223,12 +223,12 @@ "Country_SZ": "Swaziland", "Country_TC": "Quần đảo Turk và Caicos", "Country_TD": "Chad", - "Country_TF": "Lãnh thổ miền nam nước Pháp", + "Country_TF": "Lãnh thổ phía Nam Thuộc Pháp", "Country_TG": "Togo", "Country_TH": "Thái Lan", "Country_TJ": "Tajikistan", "Country_TK": "Tokelau", - "Country_TL": "Đông Timor", + "Country_TL": "Timor-Leste", "Country_TM": "Turkmenistan", "Country_TN": "Tunisia", "Country_TO": "Tonga", @@ -239,7 +239,7 @@ "Country_TZ": "Tanzania", "Country_UA": "Ukraina", "Country_UG": "Uganda", - "Country_UM": "Các đảo nhỏ xa t.tâm thuộc Mỹ", + "Country_UM": "Các đảo xa thuộc Hoa Kỳ", "Country_US": "Hoa Kỳ", "Country_UY": "Uruguay", "Country_UZ": "Uzbekistan", @@ -300,10 +300,10 @@ "Day_Short_StandAlone_6": "Th 7", "Day_Short_StandAlone_7": "CN", "EnglishLanguageName": "Vietnamese", - "Format_DateTime_Long": "EEEE, 'ngày' dd MMMM 'năm' y {time}", + "Format_DateTime_Long": "EEEE, d MMMM, y {time}", "Format_DateTime_Short": "d MMM, y {time}", "Format_Date_Day_Month": "E, d MMM", - "Format_Date_Long": "EEEE, 'ngày' dd MMMM 'năm' y", + "Format_Date_Long": "EEEE, d MMMM, y", "Format_Date_Short": "d MMM, y", "Format_Interval_Long_D": "d – d MMMM, y", "Format_Interval_Long_M": "d MMMM – d MMMM, y", @@ -321,7 +321,7 @@ "Language_aa": "Tiếng Afar", "Language_ab": "Tiếng Abkhazia", "Language_ae": "Tiếng Avestan", - "Language_af": "Tiếng Nam Phi", + "Language_af": "Tiếng Afrikaans", "Language_ak": "Tiếng Akan", "Language_am": "Tiếng Amharic", "Language_an": "Tiếng Aragon", @@ -335,10 +335,10 @@ "Language_bg": "Tiếng Bulgaria", "Language_bi": "Tiếng Bislama", "Language_bm": "Tiếng Bambara", - "Language_bn": "Tiếng Bengali", + "Language_bn": "Tiếng Bangla", "Language_bo": "Tiếng Tây Tạng", "Language_br": "Tiếng Breton", - "Language_bs": "Tiếng Nam Tư", + "Language_bs": "Tiếng Bosnia", "Language_ca": "Tiếng Catalan", "Language_ce": "Tiếng Chechen", "Language_ch": "Tiếng Chamorro", @@ -363,11 +363,11 @@ "Language_ff": "Tiếng Fulah", "Language_fi": "Tiếng Phần Lan", "Language_fj": "Tiếng Fiji", - "Language_fo": "Tiếng Faore", + "Language_fo": "Tiếng Faroe", "Language_fr": "Tiếng Pháp", "Language_fy": "Tiếng Frisia", - "Language_ga": "Tiếng Ai-len", - "Language_gd": "Tiếng Xentơ (Xcốt len)", + "Language_ga": "Tiếng Ireland", + "Language_gd": "Tiếng Gael Scotland", "Language_gl": "Tiếng Galician", "Language_gn": "Tiếng Guarani", "Language_gu": "Tiếng Gujarati", @@ -403,7 +403,7 @@ "Language_kn": "Tiếng Kannada", "Language_ko": "Tiếng Hàn", "Language_kr": "Tiếng Kanuri", - "Language_ks": "Tiếng Kashmiri", + "Language_ks": "Tiếng Kashmir", "Language_ku": "Tiếng Kurd", "Language_kv": "Tiếng Komi", "Language_kw": "Tiếng Cornwall", @@ -414,7 +414,7 @@ "Language_li": "Tiếng Limburg", "Language_ln": "Tiếng Lingala", "Language_lo": "Tiếng Lào", - "Language_lt": "Tiếng Lít-va", + "Language_lt": "Tiếng Litva", "Language_lu": "Tiếng Luba-Katanga", "Language_lv": "Tiếng Latvia", "Language_mg": "Tiếng Malagasy", @@ -424,8 +424,8 @@ "Language_ml": "Tiếng Malayalam", "Language_mn": "Tiếng Mông Cổ", "Language_mr": "Tiếng Marathi", - "Language_ms": "Tiếng Malaysia", - "Language_mt": "Tiếng Malt", + "Language_ms": "Tiếng Mã Lai", + "Language_mt": "Tiếng Malta", "Language_my": "Tiếng Miến Điện", "Language_na": "Tiếng Nauru", "Language_nb": "Tiếng Na Uy (Bokmål)", @@ -441,7 +441,7 @@ "Language_oc": "Tiếng Occitan", "Language_oj": "Tiếng Ojibwa", "Language_om": "Tiếng Oromo", - "Language_or": "Tiếng Oriya", + "Language_or": "Tiếng Odia", "Language_os": "Tiếng Ossetic", "Language_pa": "Tiếng Punjab", "Language_pi": "Tiếng Pali", @@ -451,7 +451,7 @@ "Language_qu": "Tiếng Quechua", "Language_rm": "Tiếng Romansh", "Language_rn": "Tiếng Rundi", - "Language_ro": "Tiếng Rumani", + "Language_ro": "Tiếng Romania", "Language_ru": "Tiếng Nga", "Language_rw": "Tiếng Kinyarwanda", "Language_sa": "Tiếng Phạn", @@ -465,10 +465,10 @@ "Language_sm": "Tiếng Samoa", "Language_sn": "Tiếng Shona", "Language_so": "Tiếng Somali", - "Language_sq": "Tiếng An-ba-ni", + "Language_sq": "Tiếng Albania", "Language_sr": "Tiếng Serbia", "Language_ss": "Tiếng Swati", - "Language_st": "Tiếng Sesotho", + "Language_st": "Tiếng Sotho Miền Nam", "Language_su": "Tiếng Sunda", "Language_sv": "Tiếng Thụy Điển", "Language_sw": "Tiếng Swahili", @@ -476,8 +476,8 @@ "Language_te": "Tiếng Telugu", "Language_tg": "Tiếng Tajik", "Language_th": "Tiếng Thái", - "Language_ti": "Tiếng Tigrigya", - "Language_tk": "Tiếng Turk", + "Language_ti": "Tiếng Tigrinya", + "Language_tk": "Tiếng Turkmen", "Language_tl": "Tiếng Tagalog", "Language_tn": "Tiếng Tswana", "Language_to": "Tiếng Tonga", @@ -486,9 +486,9 @@ "Language_tt": "Tiếng Tatar", "Language_tw": "Tiếng Twi", "Language_ty": "Tiếng Tahiti", - "Language_ug": "Tiếng Uyghur", + "Language_ug": "Tiếng Duy Ngô Nhĩ", "Language_uk": "Tiếng Ucraina", - "Language_ur": "Tiếng Uđu", + "Language_ur": "Tiếng Urdu", "Language_uz": "Tiếng Uzbek", "Language_ve": "Tiếng Venda", "Language_vi": "Tiếng Việt", @@ -496,9 +496,9 @@ "Language_wa": "Tiếng Walloon", "Language_wo": "Tiếng Wolof", "Language_xh": "Tiếng Xhosa", - "Language_yi": "Tiếng Y-đit", + "Language_yi": "Tiếng Yiddish", "Language_yo": "Tiếng Yoruba", - "Language_za": "Tiếng Zhuang", + "Language_za": "Tiếng Choang", "Language_zh": "Tiếng Trung", "Language_zu": "Tiếng Zulu", "LayoutDirection": "ltr", diff --git a/plugins/Intl/lang/zh-cn.json b/plugins/Intl/lang/zh-cn.json index 5cd4c2c680..954b5b4d13 100644 --- a/plugins/Intl/lang/zh-cn.json +++ b/plugins/Intl/lang/zh-cn.json @@ -37,11 +37,11 @@ "Country_BM": "百慕大", "Country_BN": "文莱", "Country_BO": "玻利维亚", - "Country_BQ": "荷兰加勒比区", + "Country_BQ": "荷属加勒比区", "Country_BR": "巴西", "Country_BS": "巴哈马", "Country_BT": "不丹", - "Country_BV": "布维岛", + "Country_BV": "布韦岛", "Country_BW": "博茨瓦纳", "Country_BY": "白俄罗斯", "Country_BZ": "伯利兹", @@ -88,7 +88,7 @@ "Country_GD": "格林纳达", "Country_GE": "格鲁吉亚", "Country_GF": "法属圭亚那", - "Country_GG": "根西岛", + "Country_GG": "格恩西岛", "Country_GH": "加纳", "Country_GI": "直布罗陀", "Country_GL": "格陵兰", @@ -97,7 +97,7 @@ "Country_GP": "瓜德罗普", "Country_GQ": "赤道几内亚", "Country_GR": "希腊", - "Country_GS": "南乔治亚岛和南桑威齐群岛", + "Country_GS": "南乔治亚和南桑威奇群岛", "Country_GT": "危地马拉", "Country_GU": "关岛", "Country_GW": "几内亚比绍", @@ -111,7 +111,7 @@ "Country_ID": "印度尼西亚", "Country_IE": "爱尔兰", "Country_IL": "以色列", - "Country_IM": "曼岛", + "Country_IM": "马恩岛", "Country_IN": "印度", "Country_IO": "英属印度洋领地", "Country_IQ": "伊拉克", @@ -148,7 +148,7 @@ "Country_MC": "摩纳哥", "Country_MD": "摩尔多瓦", "Country_ME": "黑山", - "Country_MF": "法属圣马丁", + "Country_MF": "圣马丁岛", "Country_MG": "马达加斯加", "Country_MH": "马绍尔群岛", "Country_MK": "马其顿", @@ -208,7 +208,7 @@ "Country_SG": "新加坡", "Country_SH": "圣赫勒拿", "Country_SI": "斯洛文尼亚", - "Country_SJ": "斯瓦尔巴特和扬马延", + "Country_SJ": "斯瓦尔巴和扬马延", "Country_SK": "斯洛伐克", "Country_SL": "塞拉利昂", "Country_SM": "圣马力诺", @@ -246,8 +246,8 @@ "Country_VA": "梵蒂冈", "Country_VC": "圣文森特和格林纳丁斯", "Country_VE": "委内瑞拉", - "Country_VG": "英属维京群岛", - "Country_VI": "美属维京群岛", + "Country_VG": "英属维尔京群岛", + "Country_VI": "美属维尔京群岛", "Country_VN": "越南", "Country_VU": "瓦努阿图", "Country_WF": "瓦利斯和富图纳", @@ -318,86 +318,86 @@ "Format_Time_24": "HH:mm:ss", "Format_Year": "y年", "Hours": "小时", - "Language_aa": "阿法文", - "Language_ab": "阿布哈西亚文", + "Language_aa": "阿法尔文", + "Language_ab": "阿布哈西亚语", "Language_ae": "阿维斯塔文", - "Language_af": "南非荷兰文", + "Language_af": "南非荷兰语", "Language_ak": "阿肯文", "Language_am": "阿姆哈拉文", "Language_an": "阿拉贡文", - "Language_ar": "阿拉伯文", + "Language_ar": "阿拉伯语", "Language_as": "阿萨姆文", "Language_av": "阿瓦尔文", "Language_ay": "艾马拉文", - "Language_az": "阿塞拜疆文", - "Language_ba": "巴什客尔文", - "Language_be": "白俄罗斯文", - "Language_bg": "保加利亚文", + "Language_az": "阿塞拜疆语", + "Language_ba": "巴什基尔文", + "Language_be": "白俄罗斯语", + "Language_bg": "保加利亚语", "Language_bi": "比斯拉马文", "Language_bm": "班巴拉文", - "Language_bn": "孟加拉文", - "Language_bo": "藏文", - "Language_br": "布里多尼文", - "Language_bs": "波斯尼亚文", - "Language_ca": "加泰罗尼亚文", + "Language_bn": "孟加拉语", + "Language_bo": "藏语", + "Language_br": "布列塔尼文", + "Language_bs": "波斯尼亚语", + "Language_ca": "加泰罗尼亚语", "Language_ce": "车臣文", "Language_ch": "查莫罗文", "Language_co": "科西嘉文", "Language_cr": "克里族文", - "Language_cs": "捷克文", - "Language_cu": "宗教斯拉夫文", + "Language_cs": "捷克语", + "Language_cu": "教会斯拉夫文", "Language_cv": "楚瓦什文", - "Language_cy": "威尔士文", - "Language_da": "丹麦文", + "Language_cy": "威尔士语", + "Language_da": "丹麦语", "Language_de": "德文", "Language_dv": "迪维希文", - "Language_dz": "不丹文", + "Language_dz": "宗卡文", "Language_ee": "埃维文", - "Language_el": "希腊文", - "Language_en": "英文", - "Language_eo": "世界文", + "Language_el": "希腊语", + "Language_en": "英语", + "Language_eo": "世界语", "Language_es": "西班牙文", - "Language_et": "爱沙尼亚文", + "Language_et": "爱沙尼亚语", "Language_eu": "巴斯克文", "Language_fa": "波斯文", - "Language_ff": "夫拉文", - "Language_fi": "芬兰文", + "Language_ff": "富拉文", + "Language_fi": "芬兰语", "Language_fj": "斐济文", "Language_fo": "法罗文", - "Language_fr": "法文", + "Language_fr": "法语", "Language_fy": "西弗里西亚文", - "Language_ga": "爱尔兰文", + "Language_ga": "爱尔兰语", "Language_gd": "苏格兰盖尔文", - "Language_gl": "加利西亚文", + "Language_gl": "加利西亚语", "Language_gn": "瓜拉尼文", - "Language_gu": "古吉拉特文", + "Language_gu": "古吉拉特语", "Language_gv": "马恩岛文", "Language_ha": "豪萨文", - "Language_he": "希伯来文", - "Language_hi": "印地文", + "Language_he": "希伯来语", + "Language_hi": "印地语", "Language_ho": "希里莫图文", - "Language_hr": "克罗地亚文", - "Language_ht": "海地文", - "Language_hu": "匈牙利文", - "Language_hy": "亚美尼亚文", + "Language_hr": "克罗地亚语", + "Language_ht": "海地克里奥尔文", + "Language_hu": "匈牙利语", + "Language_hy": "亚美尼亚语", "Language_hz": "赫雷罗文", - "Language_ia": "国际文字", - "Language_id": "印度尼西亚文", + "Language_ia": "国际语", + "Language_id": "印度尼西亚语", "Language_ie": "国际文字（E）", "Language_ig": "伊布文", "Language_ii": "四川彝文", - "Language_ik": "依奴皮维克文", + "Language_ik": "伊努皮克文", "Language_io": "伊多文", - "Language_is": "冰岛文", - "Language_it": "意大利文", - "Language_iu": "因纽特文", - "Language_ja": "日文", - "Language_jv": "爪哇文", - "Language_ka": "格鲁吉亚文", - "Language_kg": "刚果文", + "Language_is": "冰岛语", + "Language_it": "意大利语", + "Language_iu": "因纽特语", + "Language_ja": "日语", + "Language_jv": "爪哇语", + "Language_ka": "格鲁吉亚语", + "Language_kg": "刚果语", "Language_ki": "吉库尤文", "Language_kj": "宽亚玛文", - "Language_kk": "哈萨克文", + "Language_kk": "哈萨克语", "Language_kl": "格陵兰文", "Language_km": "高棉文", "Language_kn": "卡纳达文", @@ -408,36 +408,36 @@ "Language_kv": "科米文", "Language_kw": "凯尔特文", "Language_ky": "吉尔吉斯文", - "Language_la": "拉丁文", - "Language_lb": "卢森堡文", + "Language_la": "拉丁语", + "Language_lb": "卢森堡语", "Language_lg": "卢干达文", - "Language_li": "淋布尔吉文", + "Language_li": "林堡文", "Language_ln": "林加拉文", - "Language_lo": "老挝文", - "Language_lt": "立陶宛文", + "Language_lo": "老挝语", + "Language_lt": "立陶宛语", "Language_lu": "鲁巴加丹加文", - "Language_lv": "拉脱维亚文", + "Language_lv": "拉脱维亚语", "Language_mg": "马尔加什文", "Language_mh": "马绍尔文", "Language_mi": "毛利文", "Language_mk": "马其顿文", - "Language_ml": "马拉雅拉姆文", + "Language_ml": "马拉雅拉姆语", "Language_mn": "蒙古文", "Language_mr": "马拉地文", - "Language_ms": "马来文", + "Language_ms": "马来语", "Language_mt": "马耳他文", - "Language_my": "缅甸文", + "Language_my": "缅甸语", "Language_na": "瑙鲁文", - "Language_nb": "挪威博克马尔文", + "Language_nb": "挪威博克马尔语", "Language_nd": "北恩德贝勒文", - "Language_ne": "尼泊尔文", + "Language_ne": "尼泊尔语", "Language_ng": "恩东加文", - "Language_nl": "荷兰文", + "Language_nl": "荷兰语", "Language_nn": "挪威尼诺斯克文", - "Language_no": "挪威文", + "Language_no": "挪威语", "Language_nr": "南恩德贝勒文", "Language_nv": "纳瓦霍文", - "Language_ny": "尼扬扎文", + "Language_ny": "尼昂加文", "Language_oc": "奥克西唐文", "Language_oj": "奥吉布瓦文", "Language_om": "奥洛莫文", @@ -450,10 +450,10 @@ "Language_pt": "葡萄牙文", "Language_qu": "盖丘亚文", "Language_rm": "罗曼什文", - "Language_rn": "基隆迪文", + "Language_rn": "隆迪文", "Language_ro": "罗马尼亚文", "Language_ru": "俄文", - "Language_rw": "卢旺达文", + "Language_rw": "卢旺达语", "Language_sa": "梵文", "Language_sc": "萨丁文", "Language_sd": "信德文", @@ -467,40 +467,40 @@ "Language_so": "索马里文", "Language_sq": "阿尔巴尼亚文", "Language_sr": "塞尔维亚文", - "Language_ss": "斯瓦特文", + "Language_ss": "斯瓦蒂文", "Language_st": "南索托文", "Language_su": "巽他文", - "Language_sv": "瑞典文", + "Language_sv": "瑞典语", "Language_sw": "斯瓦希里文", - "Language_ta": "泰米尔文", - "Language_te": "泰卢固文", - "Language_tg": "塔吉克文", - "Language_th": "泰文", - "Language_ti": "提格里尼亚文", + "Language_ta": "泰米尔语", + "Language_te": "泰卢固语", + "Language_tg": "塔吉克语", + "Language_th": "泰语", + "Language_ti": "提格利尼亚文", "Language_tk": "土库曼文", - "Language_tl": "塔加洛文", - "Language_tn": "塞茨瓦纳文", + "Language_tl": "他加禄文", + "Language_tn": "茨瓦纳文", "Language_to": "汤加文", "Language_tr": "土耳其文", - "Language_ts": "宗加文", - "Language_tt": "塔塔尔文", - "Language_tw": "特威文", + "Language_ts": "聪加文", + "Language_tt": "鞑靼文", + "Language_tw": "契维文", "Language_ty": "塔西提文", - "Language_ug": "维吾尔文", - "Language_uk": "乌克兰文", - "Language_ur": "乌尔都文", - "Language_uz": "乌兹别克文", + "Language_ug": "维吾尔语", + "Language_uk": "乌克兰语", + "Language_ur": "乌尔都语", + "Language_uz": "乌兹别克语", "Language_ve": "文达文", - "Language_vi": "越南文", + "Language_vi": "越南语", "Language_vo": "沃拉普克文", "Language_wa": "瓦隆文", "Language_wo": "沃洛夫文", "Language_xh": "科萨文", - "Language_yi": "依地文", + "Language_yi": "意第绪文", "Language_yo": "约鲁巴文", - "Language_za": "壮文", + "Language_za": "壮语", "Language_zh": "中文", - "Language_zu": "祖鲁文", + "Language_zu": "祖鲁语", "LayoutDirection": "ltr", "Minutes": "分钟", "Month_Long_1": "一月", diff --git a/plugins/Intl/lang/zh-tw.json b/plugins/Intl/lang/zh-tw.json index 1bc630d29a..c4a345a33a 100644 --- a/plugins/Intl/lang/zh-tw.json +++ b/plugins/Intl/lang/zh-tw.json @@ -55,7 +55,7 @@ "Country_CK": "庫克群島", "Country_CL": "智利", "Country_CM": "喀麥隆", - "Country_CN": "中華人民共和國", + "Country_CN": "中國", "Country_CO": "哥倫比亞", "Country_CR": "哥斯大黎加", "Country_CU": "古巴", @@ -86,9 +86,9 @@ "Country_GA": "加彭", "Country_GB": "英國", "Country_GD": "格瑞那達", - "Country_GE": "喬治亞共和國", + "Country_GE": "喬治亞", "Country_GF": "法屬圭亞那", - "Country_GG": "根西島", + "Country_GG": "根息", "Country_GH": "迦納", "Country_GI": "直布羅陀", "Country_GL": "格陵蘭", @@ -102,7 +102,7 @@ "Country_GU": "關島", "Country_GW": "幾內亞比索", "Country_GY": "蓋亞那", - "Country_HK": "中華人民共和國香港特別行政區", + "Country_HK": "中國香港特別行政區", "Country_HM": "赫德島和麥克唐納群島", "Country_HN": "宏都拉斯", "Country_HR": "克羅埃西亞", @@ -155,7 +155,7 @@ "Country_ML": "馬利", "Country_MM": "緬甸", "Country_MN": "蒙古", - "Country_MO": "中華人民共和國澳門特別行政區", + "Country_MO": "中國澳門特別行政區", "Country_MP": "北馬里亞納群島", "Country_MQ": "馬丁尼克島", "Country_MR": "茅利塔尼亞", @@ -208,7 +208,7 @@ "Country_SG": "新加坡", "Country_SH": "聖赫勒拿島", "Country_SI": "斯洛維尼亞", - "Country_SJ": "冷岸及央麥恩群島", + "Country_SJ": "冷岸及央棉", "Country_SK": "斯洛伐克", "Country_SL": "獅子山", "Country_SM": "聖馬利諾", @@ -250,7 +250,7 @@ "Country_VI": "美屬維京群島", "Country_VN": "越南", "Country_VU": "萬那杜", - "Country_WF": "瓦利斯和富圖納群島", + "Country_WF": "瓦利斯群島和富圖那群島", "Country_WS": "薩摩亞", "Country_YE": "葉門", "Country_YT": "馬約特", @@ -320,7 +320,7 @@ "Hours": "小時", "Language_aa": "阿法文", "Language_ab": "阿布哈茲文", - "Language_ae": "阿緯斯陀文", + "Language_ae": "阿維斯塔文", "Language_af": "南非荷蘭文", "Language_ak": "阿坎文", "Language_am": "阿姆哈拉文", @@ -330,7 +330,7 @@ "Language_av": "阿瓦爾文", "Language_ay": "艾馬拉文", "Language_az": "亞塞拜然文", - "Language_ba": "巴什客爾文", + "Language_ba": "巴什喀爾文", "Language_be": "白俄羅斯文", "Language_bg": "保加利亞文", "Language_bi": "比斯拉馬文", @@ -339,11 +339,11 @@ "Language_bo": "藏文", "Language_br": "布列塔尼文", "Language_bs": "波士尼亞文", - "Language_ca": "加泰羅尼亞文", + "Language_ca": "加泰蘭文", "Language_ce": "車臣文", "Language_ch": "查莫洛文", "Language_co": "科西嘉文", - "Language_cr": "克裡文", + "Language_cr": "克里文", "Language_cs": "捷克文", "Language_cu": "宗教斯拉夫文", "Language_cv": "楚瓦什文", @@ -374,7 +374,7 @@ "Language_gv": "曼島文", "Language_ha": "豪撒文", "Language_he": "希伯來文", - "Language_hi": "北印度文", + "Language_hi": "印地文", "Language_ho": "西里莫圖土文", "Language_hr": "克羅埃西亞文", "Language_ht": "海地文", @@ -402,9 +402,9 @@ "Language_km": "高棉文", "Language_kn": "坎那達文", "Language_ko": "韓文", - "Language_kr": "卡努裡文", + "Language_kr": "卡努里文", "Language_ks": "喀什米爾文", - "Language_ku": "庫爾德文", + "Language_ku": "庫德文", "Language_kv": "科米文", "Language_kw": "康瓦耳文", "Language_ky": "吉爾吉斯文", @@ -441,7 +441,7 @@ "Language_oc": "奧克西坦文", "Language_oj": "奧杰布瓦文", "Language_om": "奧羅莫文", - "Language_or": "歐利亞文", + "Language_or": "歐迪亞文", "Language_os": "奧塞提文", "Language_pa": "旁遮普文", "Language_pi": "巴利文", @@ -457,13 +457,13 @@ "Language_sa": "梵文", "Language_sc": "撒丁文", "Language_sd": "信德文", - "Language_se": "北方薩米文", + "Language_se": "北薩米文", "Language_sg": "桑戈文", "Language_si": "僧伽羅文", "Language_sk": "斯洛伐克文", "Language_sl": "斯洛維尼亞文", "Language_sm": "薩摩亞文", - "Language_sn": "塞內加爾文", + "Language_sn": "紹納文", "Language_so": "索馬利文", "Language_sq": "阿爾巴尼亞文", "Language_sr": "塞爾維亞文", diff --git a/plugins/Live/API.php b/plugins/Live/API.php index e52410d8e5..39fa33f361 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -12,16 +12,10 @@ use Exception; use Piwik\Common; use Piwik\Config; use Piwik\DataTable; -use Piwik\DataTable\Row; use Piwik\Date; -use Piwik\Db; -use Piwik\Metrics\Formatter; -use Piwik\Period; use Piwik\Piwik; use Piwik\Plugins\SitesManager\API as APISitesManager; -use Piwik\Segment; use Piwik\Site; -use Piwik\Tracker; use Psr\Log\LoggerInterface; /** diff --git a/plugins/Live/Model.php b/plugins/Live/Model.php index 81b7119e87..60d0a2d0cc 100644 --- a/plugins/Live/Model.php +++ b/plugins/Live/Model.php @@ -52,7 +52,8 @@ class Model log_link_visit_action.server_time as serverTimePretty, log_link_visit_action.time_spent_ref_action as timeSpentRef, log_link_visit_action.idlink_va AS pageId, - log_link_visit_action.custom_float + log_link_visit_action.custom_float, + log_link_visit_action.interaction_position " . $sqlCustomVariables . ", log_action_event_category.name AS eventCategory, log_action_event_action.name as eventAction diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index 86ae4fcb66..112a3221d7 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -315,6 +315,9 @@ class Visitor implements VisitorInterface unset($actionDetail['eventAction']); } + $actionDetail['interactionPosition'] = $actionDetail['interaction_position']; + unset($actionDetail['interaction_position']); + // Reconstruct url from prefix $url = Tracker\PageUrl::reconstructNormalizedUrl($actionDetail['url'], $actionDetail['url_prefix']); $url = Common::unsanitizeInputValue($url); diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml index 5a85f3d795..53edd3b829 100644 --- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml @@ -45,14 +45,14 @@ <firstVisit> - <daysAgo>2148</daysAgo> + <referrerType>direct</referrerType> <referralSummary>Direct Entry</referralSummary> </firstVisit> <lastVisit> - <daysAgo>2118</daysAgo> + <referrerType>direct</referrerType> <referralSummary>Direct Entry</referralSummary> </lastVisit> @@ -73,6 +73,7 @@ <pageIdAction>6</pageIdAction> <pageId>31</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -99,6 +100,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -173,6 +175,7 @@ <pageIdAction>4</pageIdAction> <pageId>30</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -199,6 +202,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -273,6 +277,7 @@ <pageIdAction>2</pageIdAction> <pageId>29</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -299,6 +304,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -373,6 +379,7 @@ <pageIdAction>7</pageIdAction> <pageId>28</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -399,6 +406,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -473,6 +481,7 @@ <pageIdAction>6</pageIdAction> <pageId>27</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -499,6 +508,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -573,6 +583,7 @@ <pageIdAction>4</pageIdAction> <pageId>26</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -599,6 +610,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -673,6 +685,7 @@ <pageIdAction>2</pageIdAction> <pageId>25</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -699,6 +712,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -773,6 +787,7 @@ <pageIdAction>7</pageIdAction> <pageId>24</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -799,6 +814,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -873,6 +889,7 @@ <pageIdAction>6</pageIdAction> <pageId>23</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -899,6 +916,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -973,6 +991,7 @@ <pageIdAction>4</pageIdAction> <pageId>22</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -999,6 +1018,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml index 135d6e020a..ef8519446f 100644 --- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml @@ -45,14 +45,14 @@ <firstVisit> - <daysAgo>2148</daysAgo> + <referrerType>direct</referrerType> <referralSummary>Direct Entry</referralSummary> </firstVisit> <lastVisit> - <daysAgo>2118</daysAgo> + <referrerType>direct</referrerType> <referralSummary>Direct Entry</referralSummary> </lastVisit> @@ -73,6 +73,7 @@ <pageIdAction>6</pageIdAction> <pageId>31</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -99,6 +100,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -173,6 +175,7 @@ <pageIdAction>4</pageIdAction> <pageId>30</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -199,6 +202,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -273,6 +277,7 @@ <pageIdAction>2</pageIdAction> <pageId>29</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -299,6 +304,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -373,6 +379,7 @@ <pageIdAction>7</pageIdAction> <pageId>28</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -399,6 +406,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -473,6 +481,7 @@ <pageIdAction>6</pageIdAction> <pageId>27</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -499,6 +508,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -573,6 +583,7 @@ <pageIdAction>4</pageIdAction> <pageId>26</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -599,6 +610,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -673,6 +685,7 @@ <pageIdAction>2</pageIdAction> <pageId>25</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -699,6 +712,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -773,6 +787,7 @@ <pageIdAction>7</pageIdAction> <pageId>24</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -799,6 +814,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -873,6 +889,7 @@ <pageIdAction>6</pageIdAction> <pageId>23</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -899,6 +916,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -973,6 +991,7 @@ <pageIdAction>4</pageIdAction> <pageId>22</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -999,6 +1018,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1073,6 +1093,7 @@ <pageIdAction>2</pageIdAction> <pageId>21</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1099,6 +1120,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1173,6 +1195,7 @@ <pageIdAction>7</pageIdAction> <pageId>20</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1199,6 +1222,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1273,6 +1297,7 @@ <pageIdAction>6</pageIdAction> <pageId>19</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1299,6 +1324,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1373,6 +1399,7 @@ <pageIdAction>4</pageIdAction> <pageId>18</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1399,6 +1426,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1473,6 +1501,7 @@ <pageIdAction>2</pageIdAction> <pageId>17</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1499,6 +1528,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1573,6 +1603,7 @@ <pageIdAction>7</pageIdAction> <pageId>16</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1599,6 +1630,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1673,6 +1705,7 @@ <pageIdAction>6</pageIdAction> <pageId>15</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1699,6 +1732,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1773,6 +1807,7 @@ <pageIdAction>4</pageIdAction> <pageId>14</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1799,6 +1834,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1873,6 +1909,7 @@ <pageIdAction>2</pageIdAction> <pageId>13</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1899,6 +1936,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1973,6 +2011,7 @@ <pageIdAction>7</pageIdAction> <pageId>12</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1999,6 +2038,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/plugins/LogViewer b/plugins/LogViewer -Subproject a79a661c0e967c5c57cd57f0aabb115caa33682 +Subproject a9a0e5ac1fd22a2eaf981f49e882de28479536d diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php index 2de99c6934..08bb693108 100644 --- a/plugins/Login/Auth.php +++ b/plugins/Login/Auth.php @@ -8,13 +8,11 @@ */ namespace Piwik\Plugins\Login; -use Exception; use Piwik\AuthResult; -use Piwik\Db; +use Piwik\Auth\Password; use Piwik\Piwik; use Piwik\Plugins\UsersManager\Model; use Piwik\Plugins\UsersManager\UsersManager; -use Piwik\Session; class Auth implements \Piwik\Auth { @@ -27,9 +25,15 @@ class Auth implements \Piwik\Auth */ private $userModel; + /** + * @var Password + */ + private $passwordHelper; + public function __construct() { - $this->userModel = new Model(); + $this->userModel = new Model(); + $this->passwordHelper = new Password(); } /** @@ -49,7 +53,7 @@ class Auth implements \Piwik\Auth */ public function authenticate() { - if (!empty($this->hashedPassword)) { // favor authenticating by password + if (!empty($this->hashedPassword)) { return $this->authenticateWithPassword($this->login, $this->getTokenAuthSecret()); } elseif (is_null($this->login)) { return $this->authenticateWithToken($this->token_auth); @@ -64,7 +68,17 @@ class Auth implements \Piwik\Auth { $user = $this->userModel->getUser($login); - if (!empty($user['login']) && $user['password'] === $passwordHash) { + if (empty($user['login'])) { + return new AuthResult(AuthResult::FAILURE, $login, null); + } + + if ($this->passwordHelper->verify($passwordHash, $user['password'])) { + if ($this->passwordHelper->needsRehash($user['password'])) { + $newPasswordHash = $this->passwordHelper->hash($passwordHash); + + $this->userModel->updateUser($login, $newPasswordHash, $user['email'], $user['alias'], $user['token_auth']); + } + return $this->authenticationSuccess($user); } diff --git a/plugins/Login/PasswordResetter.php b/plugins/Login/PasswordResetter.php index ebbc7577cd..a9190ed659 100644 --- a/plugins/Login/PasswordResetter.php +++ b/plugins/Login/PasswordResetter.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\Login; use Exception; use Piwik\Access; +use Piwik\Auth\Password; use Piwik\Common; use Piwik\Config; use Piwik\IP; @@ -60,6 +61,11 @@ use Piwik\Url; class PasswordResetter { /** + * @var Password + */ + protected $passwordHelper; + + /** * @var UsersManagerAPI */ protected $usersManagerApi; @@ -104,9 +110,10 @@ class PasswordResetter * @param string|null $confirmPasswordAction * @param string|null $emailFromName * @param string|null $emailFromAddress + * @param Password $passwordHelper */ public function __construct($usersManagerApi = null, $confirmPasswordModule = null, $confirmPasswordAction = null, - $emailFromName = null, $emailFromAddress = null) + $emailFromName = null, $emailFromAddress = null, $passwordHelper = null) { if (empty($usersManagerApi)) { $usersManagerApi = UsersManagerAPI::getInstance(); @@ -130,6 +137,11 @@ class PasswordResetter $emailFromAddress = Config::getInstance()->General['login_password_recovery_email_address']; } $this->emailFromAddress = $emailFromAddress; + + if (empty($passwordHelper)) { + $passwordHelper = new Password(); + } + $this->passwordHelper = $passwordHelper; } /** @@ -383,7 +395,11 @@ class PasswordResetter */ protected function checkPasswordHash($passwordHash) { - UsersManager::checkPasswordHash($passwordHash, Piwik::translate('Login_ExceptionPasswordMD5HashExpected')); + $hashInfo = $this->passwordHelper->info($passwordHash); + + if (!isset($hashInfo['algo']) || 0 >= $hashInfo['algo']) { + throw new Exception(Piwik::translate('Login_ExceptionPasswordMD5HashExpected')); + } } /** @@ -436,7 +452,7 @@ class PasswordResetter private function savePasswordResetInfo($login, $newPassword) { $optionName = $this->getPasswordResetInfoOptionName($login); - $optionData = UsersManager::getPasswordHash($newPassword); + $optionData = $this->passwordHelper->hash(UsersManager::getPasswordHash($newPassword)); Option::set($optionName, $optionData); } diff --git a/plugins/Login/tests/Integration/LoginTest.php b/plugins/Login/tests/Integration/LoginTest.php index f199ae7069..4aac46dbc1 100644 --- a/plugins/Login/tests/Integration/LoginTest.php +++ b/plugins/Login/tests/Integration/LoginTest.php @@ -433,7 +433,10 @@ class LoginTest extends IntegrationTestCase API::getInstance()->addUser($user['login'], $user['password'], $user['email'], $user['alias']); - $user['tokenAuth'] = API::getInstance()->getTokenAuth($user['login'], md5($user['password'])); + $model = new \Piwik\Plugins\UsersManager\Model(); + $dbUser = $model->getUser($user['login']); + + $user['tokenAuth'] = $dbUser['token_auth']; return $user; } diff --git a/plugins/LoginHttpAuth b/plugins/LoginHttpAuth -Subproject d9226082e7cf08172d6b21932d4a9de6d37bda0 +Subproject 81f18035aad49a8fcbd33590e7c478c3dc4ac63 diff --git a/plugins/Marketplace/Plugins/InvalidLicenses.php b/plugins/Marketplace/Plugins/InvalidLicenses.php index 1a0a198f67..7ad01eefd2 100644 --- a/plugins/Marketplace/Plugins/InvalidLicenses.php +++ b/plugins/Marketplace/Plugins/InvalidLicenses.php @@ -189,6 +189,9 @@ class InvalidLicenses if (!empty($paidPlugins)) { foreach ($paidPlugins as $plugin) { + if (!empty($plugin['isFree'])) { + continue; + } $pluginName = $plugin['name']; if ($this->isPluginActivated($pluginName)) { if (empty($plugin['consumer']['license'])) { diff --git a/plugins/Marketplace/lang/am.json b/plugins/Marketplace/lang/am.json new file mode 100644 index 0000000000..4ddbf2b7da --- /dev/null +++ b/plugins/Marketplace/lang/am.json @@ -0,0 +1,6 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "አግብር", + "PluginKeywords": "ቁልፍ ቃላት" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/ar.json b/plugins/Marketplace/lang/ar.json new file mode 100644 index 0000000000..34f104baed --- /dev/null +++ b/plugins/Marketplace/lang/ar.json @@ -0,0 +1,29 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "تفعيل", + "ActionActivatePlugin": "تفعيل الإضافة", + "ActionActivateTheme": "تفعيل الثيم", + "ActionInstall": "تنصيب", + "AllowedUploadFormats": "يمكنك رفع إضافة او ثيم بصيغة .zip عبر هذة الصفحة.", + "Authors": "المالكون", + "BackToMarketplace": "العودة الي سوق العرض", + "Developer": "المطور", + "Marketplace": "سوق العرض", + "FeaturedPlugin": "إضافات مميزة", + "LastCommitTime": "(اخر تحديث %s)", + "LastUpdated": "أخر تحديث", + "NoPluginsFound": "لم يتم العثور علي إضافات", + "NoThemesFound": "لم يتم العثور علي ثيمات", + "PluginKeywords": "كلمات دلالية", + "PluginUpdateAvailable": "أنت تستخدم الإصدار %1$s %2$sويوجد إصدار جديد متاح", + "PluginWebsite": "الموقع الإلكتروني للإضافة", + "Screenshots": "صور العرض", + "StepUnzippingPlugin": "إستخراج الإضافة", + "StepUnzippingTheme": "إستخراج الثيم", + "SubscriptionType": "النوع", + "Support": "الدعم", + "Updated": "تم التحديث", + "UploadZipFile": "رفع الملف المضغوط", + "ViewRepositoryChangelog": "مشاهدة التعديلات" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/be.json b/plugins/Marketplace/lang/be.json new file mode 100644 index 0000000000..6f904c306f --- /dev/null +++ b/plugins/Marketplace/lang/be.json @@ -0,0 +1,7 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Актываваць", + "PluginKeywords": "Ключавыя словы", + "SubscriptionType": "Тып" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/bg.json b/plugins/Marketplace/lang/bg.json new file mode 100644 index 0000000000..a9b9a28064 --- /dev/null +++ b/plugins/Marketplace/lang/bg.json @@ -0,0 +1,44 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Активирай", + "ActionActivatePlugin": "Активиране на добавка", + "ActionActivateTheme": "Активирай тапет", + "ActionInstall": "Инсталиране", + "AllowedUploadFormats": "Може да качите добавка или тапет в zip формат посредством тази страница.", + "Authors": "Автори", + "BackToMarketplace": "Връщане към магазина за приложения", + "ByXDevelopers": "от %s разработчици", + "Developer": "Разработчик", + "Marketplace": "Магазин", + "FeaturedPlugin": "Препоръчана добавка", + "InstallingPlugin": "Инсталира се %s", + "LastCommitTime": "(последен принос %s)", + "LastUpdated": "Последно обновена", + "NotAllowedToBrowseMarketplacePlugins": "Може да разгледате списъка с добавки, които могат да бъдат инсталирани, за да настроите или разширите вашата Piwik платформа. Моля, свържете се с вашия системен администратор, ако желаете да бъде инсталирана някоя добавка.", + "NotAllowedToBrowseMarketplaceThemes": "Може да разгледате списъка с тапети, които могат да бъдат инсталирани, за да променят изгледа на Piwik. Моля, свържете се с вашия системен администратор, за да извърши инсталацията им.", + "NoPluginsFound": "Не е намерена добавка", + "NoThemesFound": "Не са намерени тапети", + "NumDownloadsLatestVersion": "Последна версия:%s сваляния", + "PluginKeywords": "Ключови думи", + "PluginUpdateAvailable": "Използва се версия %1$s и е налична нова версия %2$s.", + "PluginVersionInfo": "%1$s от %2$s", + "PluginWebsite": "Сайт за добавки", + "Screenshots": "Екранни снимки", + "StepDownloadingPluginFromMarketplace": "Сваляне на добавка от магазина за приложения", + "StepDownloadingThemeFromMarketplace": "Сваляне на тапет от магазина за приложения", + "StepUnzippingPlugin": "Добавката се разархивира", + "StepUnzippingTheme": "Тапетът се разархивира", + "StepThemeSuccessfullyInstalled": "Вие успешно инсталирахте тапет %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Успешно е инсталирана добавка %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Успешно е обновена добавка %1$s %2$s.", + "StepReplaceExistingPlugin": "Подмяна на съществуваща добавка", + "StepReplaceExistingTheme": "Замяна на съществуващ тапет", + "StepThemeSuccessfullyUpdated": "Вие успешно обновихте тапет %1$s %2$s.", + "SubscriptionType": "Тип", + "Support": "Поддръжка", + "TeaserExtendPiwikByUpload": "Разширяване на възможностите на Piwik, чрез добавяне на zip файл", + "Updated": "Обновени", + "UploadZipFile": "Качване на zip файл", + "ViewRepositoryChangelog": "Преглед на промените" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/bn.json b/plugins/Marketplace/lang/bn.json new file mode 100644 index 0000000000..09297ff6a2 --- /dev/null +++ b/plugins/Marketplace/lang/bn.json @@ -0,0 +1,5 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "সক্রিয় করুন" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/bs.json b/plugins/Marketplace/lang/bs.json new file mode 100644 index 0000000000..d0e49af92b --- /dev/null +++ b/plugins/Marketplace/lang/bs.json @@ -0,0 +1,5 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Aktiviraj" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/ca.json b/plugins/Marketplace/lang/ca.json new file mode 100644 index 0000000000..398420af57 --- /dev/null +++ b/plugins/Marketplace/lang/ca.json @@ -0,0 +1,9 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Activa", + "ActionInstall": "Instal·la", + "Authors": "Autors", + "PluginKeywords": "Paraules clau", + "SubscriptionType": "Tipus" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/cs.json b/plugins/Marketplace/lang/cs.json new file mode 100644 index 0000000000..c8ae76a0a2 --- /dev/null +++ b/plugins/Marketplace/lang/cs.json @@ -0,0 +1,112 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Povolit", + "ActionActivatePlugin": "Aktivovat zásuvný modul", + "ActionActivateTheme": "Aktivovat šablonu", + "ActionInstall": "Instalovat", + "AddToCart": "Přidat do košíku", + "AllowedUploadFormats": "Na této stránce můžete nahrát zásuvný modul nebo šablonu ve formátu .zip.", + "Authors": "Autoři", + "BackToMarketplace": "Zpět na obchod", + "BrowseMarketplace": "Procházet obchod", + "ByXDevelopers": "Od %s vývojářů", + "CannotInstall": "Nelze nainstalovat", + "CannotUpdate": "Nelze aktualizovat", + "ClickToCompletePurchase": "Kliknout pro dokončení nákupu.", + "CurrentNumPiwikUsers": "Tento Piwik má aktuálně %1$s registrovaných uživatelů.", + "ConfirmRemoveLicense": "Opravdu chcete odstranit svůj licenční klíč? Poté již nebudete dostávat aktualizace pro žádné ze svých zakoupených zásuvných modulů.", + "Developer": "Vývojář", + "DevelopersLearnHowToDevelopPlugins": "Vývojáři: naučte se, jak rozšířit Piwik vývojem %1$szásuvných modulů nebo témat vzhledu%2$s.", + "Marketplace": "Obchod", + "PaidPlugins": "Prémiové funkce", + "FeaturedPlugin": "Doporučovaný zásuvný modul", + "InstallingNewPluginViaMarketplaceOrUpload": "Můžete automaticky nainstalovat %1$s z obchodu nebo %2$snahrát %3$s%4$s v .zip formátu.", + "InstallingPlugin": "Instalování %s", + "InstallPurchasedPlugins": "Instalovata zakoupené zásuvné moduly", + "LastCommitTime": "(Poslední změna %s)", + "LastUpdated": "Naposledy aktualizován", + "License": "Licence", + "LicenseKey": "Licenční klíč", + "LicenseKeyActivatedSuccess": "Licenční klíč úspěšně aktivován!", + "LicenseKeyDeletedSuccess": "Licenční klíč úspěšně smazán.", + "Exceeded": "Překročena", + "LicenseMissing": "Licence chybí", + "LicenseMissingDescription": "Následující moduly používáte bez řádné licence: %1$s. %2$sPro vyřešení tohoto problému buď aktualizujte svůj licenční klíč, %3$szakupte předplatné%4$s nebo deaktivujte zásuvný modul.", + "PluginLicenseMissingDescription": "Nemáte povolení stáhnout tento zásuvný modul, protože pro něj nemáte licenci. Pro vyřešení tohoto problému buď aktualizujte svůj licenční klíč, zakupte předplatné nebo odinstalujte zásuvný modul.", + "LicenseExceeded": "Licence překročena", + "LicenseExceededDescription": "Licence pro následující zásuvné moduly již nejsou platné, protože počet přihlášených uživatelů překročilo licenci: %1$s. %2$sPro tyto moduly nebude možné stahovat aktualizace. Pro vyřešení této situace buď smažte nějaké uživatele nebo %3$spovyšte své předplatné%4$s.", + "PluginLicenseExceededDescription": "Nemáte povolení stáhnout tento zásuvný modul. Licence pro následující zásuvný modul již nejní platná, protože počet přihlášených uživatelů překročil licenci. Pro vyřešení této situace buď smažte nějaké uživatele nebo povyšte své předplatné.", + "LicenseExpired": "Licence vypršela", + "LicenseExpiredDescription": "Licence následujících zásuvných modulů vypršely: %1$s. %2$sPro tyto moduly již nebudete dostávat žádné aktualizace. Pro vyřešení tohoto problému buď %3$sobnovte své předplatné%4$s, nebo deaktivujte modul, pokud ho již nebudete používat.", + "LicenseRenewsNextPaymentDate": "Bude obnovena v den příští platby", + "UpgradeSubscription": "Povýšit předplatné", + "ViewSubscriptionsSummary": "%1$sZobrazit předplatné svých zásuvných modulů.%2$s", + "ViewSubscriptions": "Zobrazit předplatné", + "ExceptionLinceseKeyIsExpired": "Licenční klíč vypršel.", + "ExceptionLinceseKeyIsNotValid": "Licenční klíč není platný.", + "LicenseKeyIsValidShort": "Licenční klíč je platný!", + "RemoveLicenseKey": "Odstranit licenční klíč", + "InstallAllPurchasedPlugins": "Instalovat všechny zakoupené zásuvné moduly najednou", + "InstallAllPurchasedPluginsAction": "Instalovat a aktivovat %d zakoupených modulů", + "InstallThesePlugins": "Toto nainstaluje a aktivuje následující zásuvné moduly:", + "AllPaidPluginsInstalledAndActivated": "Všechny moduly byly úspěšně nainstalovány a aktivovány.", + "OnlySomePaidPluginsInstalledAndActivated": "Některé zaplacené moduly nebyly úspěšně nainstalovány.", + "NewVersion": "nová verze", + "NotAllowedToBrowseMarketplacePlugins": "Můžete si projít zásuvné moduly, které rozšiřují možnosti Piwik platformy. Pokud některý z nich potřebujete, kontaktujte administrátora.", + "NotAllowedToBrowseMarketplaceThemes": "Můžete si projít seznam šablon, které mohou být instalovány k přizpůsobení vzhledu Piwik platformy. Pokud nějakou z nich chcete použít, kontaktujte administrátora.", + "NoPluginsFound": "Žádné zásuvné moduly nenalezeny", + "NoThemesFound": "Nenalezeny žádné šablony", + "NoSubscriptionsFound": "Předplatné nenalezeno", + "NumDownloadsLatestVersion": "Poslední verze: %s Stažení", + "OverviewPluginSubscriptions": "Přehled předplatného vašich modulů", + "OverviewPluginSubscriptionsMissingLicense": "Nemáte nastaven licenční klíč. Pokud jste zakoupili předplatné modulu, přejděte do %1$sObchodu%2$s a zadejte svůj licenční klíč.", + "OverviewPluginSubscriptionsAllDetails": "Pro změnu detailů nebo změnu předplatného se přihlašte do svého účtu.", + "OverviewPluginSubscriptionsMissingInfo": "Je možné, že předplatné chybí například z důvodu nedošlé platby. V takovém případě zkuste znovu po několika hodinách, nebo kontaktujte Piwik tým.", + "NoValidSubscriptionNoUpdates": "Poté co předplatné vyprší, nebudete dostávat aktualizace pro žádný ze svých zakoupených zásuvných modulů.", + "PluginSubscriptionsList": "Toto je seznam předplatného, navázaný na váš licenční klíč.", + "PaidPluginsNoLicenseKeyIntro": "Pokud jste zakoupili %1$splacený prémiový zásuvný modul%2$s, zadejte prosím níže obdržený licenční klíč.", + "PaidPluginsWithLicenseKeyIntro": "Byl nastaven platný licenční klíč. Z bezpečnostních důvodů ho zde nezobrazujeme. Pokud jste svůj licenční klíč ztratili, kontaktujte prosím Piwik tým.", + "PaidPluginsNoLicenseKeyIntroNoSuperUserAccess": "V případě, že jste zakoupili %1$splacený prémiový zásuvný modul%2$s v obchodě, požádejte administrátora ať vloží licenční klíč.", + "PluginDescription": "Rozšiřte a zlepšete funkčnost Piwiku pomocí Obchodu a dalšími staženými zásuvnými moduly a vzhledy.", + "PluginKeywords": "Klíčová slova", + "PluginUpdateAvailable": "Používáte verzi %1$s, ale je dostupná novější verze %2$s.", + "PluginVersionInfo": "%1$s z %2$s", + "PluginWebsite": "Stránky zásuvného modulu", + "PriceExclTax": "%1$s %2$s bez daně.", + "PriceFromPerPeriod": "Od %1$s \/ %2$s", + "Reviews": "Hodnocení", + "ShownPriceIsExclTax": "Zobrazená cena nezahrnuje daň.", + "Screenshots": "Snímky obrazovky", + "SortByNewest": "Nejnovější", + "SortByAlpha": "Alfa", + "SortByLastUpdated": "Naposledy aktualizován", + "SortByPopular": "Oblíbené", + "StepDownloadingPluginFromMarketplace": "Stahování zásuvného modulu z obchodu", + "StepDownloadingThemeFromMarketplace": "Stahování šablony z obchodu", + "StepUnzippingPlugin": "Rozbalování zásuvného modulu", + "StepUnzippingTheme": "Rozbalování šablony", + "StepThemeSuccessfullyInstalled": "Úspěšně jste nainstalovali šablonu %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Úspěšně jste nainstalovali zásuvný modul %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Úspěšně jste aktualizovali zásuvný modul %1$s %2$s.", + "StepReplaceExistingPlugin": "Nahrazování existujícího zásuvného modulu", + "StepReplaceExistingTheme": "Nahrazování existující šablony", + "StepThemeSuccessfullyUpdated": "Úspěšně jste aktualizovali šablonu %1$s %2$s.", + "SubscriptionType": "Typ", + "SubscriptionStartDate": "Počáteční datum", + "SubscriptionEndDate": "Koncové datum", + "SubscriptionNextPaymentDate": "Datum další platby", + "SubscriptionInvalid": "Toto předplatné je neplatné nebo vypršelo", + "SubscriptionExpiresSoon": "Toto předplatné brzy vyprší", + "Support": "Podpora", + "TeaserExtendPiwikByUpload": "Rozšiřte Piwik nahráním zip souboru", + "LicenseExceededPossibleCause": "Licence je překročena. Nejspíše tuto Piwik instalaci používá více uživatelů, než povoluje předplatné.", + "Updated": "Aktualizováno", + "UpdatingPlugin": "Aktualizace %1$s", + "UploadZipFile": "Nahrát zip soubor", + "LicenseKeyExpiresSoon": "Váš licenční klíč brzy vyprší, kontaktujte prosím %1$s.", + "LicenseKeyIsExpired": "Váš licenční klíč vypršel, kontaktujte prosím %1$s.", + "MultiServerEnvironmentWarning": "Zásuvný modul nelze instalovat nebo aktualizovat přímo, protože používáte Piwik na několika serverech. Modul by byl nainstalován pouze na jednom serveru. Namísto toho modul stáhněte a ručně nainstalujte na všechny své servery.", + "AutoUpdateDisabledWarning": "Zásuvný modul nelze instalovat nebo aktualizovat přímo, protože jsou v nastavení automatické instalace vypnuty. Pro povolení automatických aktualizací nastavte %1$s v %2$s.", + "ViewRepositoryChangelog": "Zobrazit změny" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/da.json b/plugins/Marketplace/lang/da.json new file mode 100644 index 0000000000..2c59052ed0 --- /dev/null +++ b/plugins/Marketplace/lang/da.json @@ -0,0 +1,46 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Aktiver", + "ActionActivatePlugin": "Aktiver programudvidelse", + "ActionActivateTheme": "Aktiver tema", + "ActionInstall": "Installer", + "AllowedUploadFormats": "Du kan via denne side overføre en programudvidelse eller tema i .zip-format.", + "Authors": "Forfattere", + "BackToMarketplace": "Tilbage til markedspladsen", + "ByXDevelopers": "af %s udviklere", + "Developer": "Udvikler", + "DevelopersLearnHowToDevelopPlugins": "Udviklere: Lær hvordan du kan udvide og tilpasse Piwik ved at %1$sudvikle udvidelser eller temaer%2$s.", + "Marketplace": "Markedsplads", + "FeaturedPlugin": "Udvalgte programudvidelser", + "InstallingPlugin": "Installerer %s", + "LastCommitTime": "(last bidrag %s)", + "LastUpdated": "Sidst opdateret", + "NewVersion": "ny version", + "NotAllowedToBrowseMarketplacePlugins": "Du kan gennemse listen over programudvidelser, der kan installeres for at tilpasse eller udvide din Piwik platform. Kontakt din administrator, hvis du har brug for nogen af disse installeret.", + "NotAllowedToBrowseMarketplaceThemes": "Du kan gennemse listen over temaer, der kan installeres for at tilpasse udseendet af Piwik platformen. Kontakt din administrator for at få nogen af disse installeret.", + "NoPluginsFound": "Ingen udvidelsesmoduler fundet", + "NoThemesFound": "Ingen temaer fundet", + "NumDownloadsLatestVersion": "Nyeste version: %s Overførsler", + "PluginKeywords": "Søgeord", + "PluginUpdateAvailable": "Du bruger version %1$s en ny version %2$s er tilgængelig.", + "PluginVersionInfo": "%1$s fra %2$s", + "PluginWebsite": "Programudvidelsens hjemmeside", + "Screenshots": "Skærmbilleder", + "StepDownloadingPluginFromMarketplace": "Henter programudvidelse fra markedspladsen", + "StepDownloadingThemeFromMarketplace": "Henter tema fra markedspladsen", + "StepUnzippingPlugin": "Udpakker programudvidelse", + "StepUnzippingTheme": "Udpakker tema", + "StepThemeSuccessfullyInstalled": "Du har installeret temaet %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Du har installeret temaet %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Du har opdateret temaet %1$s %2$s.", + "StepReplaceExistingPlugin": "Erstatter eksisterende programudvidelse", + "StepReplaceExistingTheme": "Erstatter eksisterende tema", + "StepThemeSuccessfullyUpdated": "Du har opdateret temaet %1$s %2$s.", + "SubscriptionType": "Type", + "Support": "Support", + "TeaserExtendPiwikByUpload": "Udvid Piwik ved at overføre en ZIP-fil", + "Updated": "Opdateret", + "UploadZipFile": "Overfør ZIP-fil", + "ViewRepositoryChangelog": "Se ændringerne" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/el.json b/plugins/Marketplace/lang/el.json new file mode 100644 index 0000000000..f8e2dbac7d --- /dev/null +++ b/plugins/Marketplace/lang/el.json @@ -0,0 +1,112 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Ενεργοποίηση", + "ActionActivatePlugin": "Ενεργοποίηση πρόσθετου", + "ActionActivateTheme": "Ενεργοποίηση θέματος", + "ActionInstall": "Εγκατάσταση", + "AddToCart": "Προσθήκη στο καλάθι", + "AllowedUploadFormats": "Μπορείτε να ανεβάσετε ένα πρόσθετο ή θέμα σε μορφή .zip από αυτή τη σελίδα.", + "Authors": "Συγγραφείς", + "BackToMarketplace": "Πίσω στην Αγορά", + "BrowseMarketplace": "Περιήγηση στην Αγορά", + "ByXDevelopers": "από %s προγραμματιστές", + "CannotInstall": "Δεν είναι δυνατή η εγκατάσταση", + "CannotUpdate": "Δεν είναι δυνατή η ενημέρωση", + "ClickToCompletePurchase": "Κάντε κλικ για να ολοκληρώσετε την αγορά.", + "CurrentNumPiwikUsers": "Το Piwik σας αυτή τη στιγμή έχει %1$s εγγεγραμμένους χρήστες.", + "ConfirmRemoveLicense": "Είστε σίγουροι ότι επιθυμείτε να αφαιρέσετε την άδειά σας; Δε θα λαμβάνετε πλέον ενημερώσεις για οποιοδήποτε από τα αγορασμένα πρόσθετα.", + "Developer": "Προγραμματιστής", + "DevelopersLearnHowToDevelopPlugins": "Προγραμματιστές: Μάθετε πώς να επεκτείνετε και να προσαρμόζετε το Piwik %1$sδημιουργώντας πρόσθετα ή θέματα%2$s.", + "Marketplace": "Αγορά", + "PaidPlugins": "Χαρακτηριστικά Επί Πληρωμή", + "FeaturedPlugin": "Προβαλλόμενο πρόσθετο", + "InstallingNewPluginViaMarketplaceOrUpload": "Μπορείτε αυτόματα να εγκαταστήσετε το %1$s από την Αγορά ή να %2$sανεβάσετε ένα %3$s%4$s σε μορφή .zip.", + "InstallingPlugin": "Γίνεται εγκατάσταση του %s", + "InstallPurchasedPlugins": "Εγκατάσταση αγορασμένων πρόσθετων", + "LastCommitTime": "(τελευταία οριστικοποίηση %s)", + "LastUpdated": "Τελευταία Ενημέρωση", + "License": "Άδεια", + "LicenseKey": "Κλειδί άδειας", + "LicenseKeyActivatedSuccess": "Το κλειδί της άδειας ενεργοποιήθηκε με επιτυχία!", + "LicenseKeyDeletedSuccess": "Το κλειδί της άδειας διαγράφηκε με επιτυχία.", + "Exceeded": "Εκτός ορίων", + "LicenseMissing": "Άδεια ελλιπής", + "LicenseMissingDescription": "Χρησιμοποιείτε τα εξής πρόσθετα χωρίς άδεια: %1$s. %2$sΓια να επιλύσετε το θέμα πρέπει είτε να ενημερώσετε το κλειδί άδειας, %3$sνα πάρετε μια συνδρομή τώρα%4$s ή να απενεργοποιήσετε το πρόσθετο.", + "PluginLicenseMissingDescription": "Δεν επιτρέπεται να κατεβάσετε το πρόσθετο επειδή δεν υπάρχει άδεια γι' αυτό. Για να λύσετε το πρόβλημα, ενημερώστε το κλειδί της άδειάς σας, αποκτήστε μια συνδρομή ή απεγκαταστήστε το πρόσθετο.", + "LicenseExceeded": "Άδεια εκτός ορίων", + "LicenseExceededDescription": "Οι άδειες για τα εξής πρόσθετα δεν είναι πλέον έγκυρες, καθώς έχει ξεπεραστεί ο αριθμός των επιτρεπόμενων χρηστών της άδειας: %1$s. %2$sΔε θα μπορείτε να κατεβάσετε ενημερώσεις για αυτά τα πρόσθετα. Για να λύσετε το θέμα, διαγράψτε κάποιους χρήστες ή %3$sαναβαθμίστε την συνδρομή σας τώρα%4$s.", + "PluginLicenseExceededDescription": "Δεν επιτρέπεται να κατεβάσετε το πρόσθετο. Η άδεια για το πρόσθετο δεν είναι πλέον έγκυρη, καθώς ο αριθμός των επιτρεπόμενων χρηστών έχει ξεπεραστεί. Για να λύσετε το θέμα, διαγράψτε κάποιους χρήστες ή αναβαθμίστε την συνδρομή σας τώρα.", + "LicenseExpired": "Η άδεια έληξε", + "LicenseExpiredDescription": "Οι άδειες για τα εξής πρόσθετα έχουν λήξει: %1$s. %2$sΔεν μπορείτε να κατεβάσετε ενημερώσεις για αυτά τα πρόσθετα. Για να λύσετε το θέμα, %3$sανανεώστε την συνδρομή σας τώρα%4$s ή απενεργοποιήστε το πρόσθετο αν δεν το χρησιμοποιείτε πλέον.", + "LicenseRenewsNextPaymentDate": "Ανανεώνεται στην επόμενη ημερομηνία πληρωμής", + "UpgradeSubscription": "Αναβάθμιση της εγγραφής", + "ViewSubscriptionsSummary": "%1$sΔείτε τις συνδρομές για τα πρόσθετά σας%2$s", + "ViewSubscriptions": "Εμφάνιση των συνδρομών", + "ExceptionLinceseKeyIsExpired": "Το κλειδί έχει λήξει.", + "ExceptionLinceseKeyIsNotValid": "Το κλειδί δεν είναι έγκυρο.", + "LicenseKeyIsValidShort": "Το κλειδί είναι έγκυρο!", + "RemoveLicenseKey": "Αφαίρεση κλειδιού άδειας", + "InstallAllPurchasedPlugins": "Εγκατάσταση όλων των αγορασμένων πρόσθετων με τη μία", + "InstallAllPurchasedPluginsAction": "Εγκατάσταση και ενεργοποίηση %d αγορασμένων πρόσθετων", + "InstallThesePlugins": "Αυτό θα εγκαταστήσει και ενεργοποιήσει τα εξής πρόσθετα:", + "AllPaidPluginsInstalledAndActivated": "Όλα τα αγορασμένα πρόσθετα εγκαταστάθηκαν και ενεργοποιήθηκαν με επιτυχία.", + "OnlySomePaidPluginsInstalledAndActivated": "Ορισμένα αγορασμένα πρόσθετα δεν εγκαταστάθηκαν επιτυχώς.", + "NewVersion": "νέα έκδοση", + "NotAllowedToBrowseMarketplacePlugins": "Μπορείτε να δείτε τη λίστα των πρόσθετων που μπορούν να εγκατασταθούν για να προσαρμόσετε ή να επεκτείνετε την πλατφόρμα του Piwik. Παρακαλούμε επικοινωνήστε με τον διαχειριστή σας αν χρειάζεστε κάποιο από αυτά να εγκατασταθεί.", + "NotAllowedToBrowseMarketplaceThemes": "Μπορείτε να δείτε τη λίστα των θεμάτων που μπορούν να εγκατασταθούν για να προσαρμόσετε την εμφάνιση της πλατφόρμας του Piwik. Παρακαλούμε επικοινωνήστε με τον διαχειριστή σας αν χρειάζεστε κάποιο από αυτά να εγκατασταθεί.", + "NoPluginsFound": "Δε βρέθηκαν πρόσθετα", + "NoThemesFound": "Δε βρέθηκαν θέματα", + "NoSubscriptionsFound": "Δε βρέθηκαν συνδρομές", + "NumDownloadsLatestVersion": "Τελευταία έκδοση: %s λήψεις", + "OverviewPluginSubscriptions": "Σύνοψη συνδρομών για πρόσθετα", + "OverviewPluginSubscriptionsMissingLicense": "Δεν έχετε ορίσει κλειδί άδειας. Αν έχετε αγοράσει μια συνδρομή για πρόσθετο, πηγαίνετε στην %1$sΑγορά%2$s και εισάγετε το κλειδί της άδειάς σας.", + "OverviewPluginSubscriptionsAllDetails": "Για να δείτε όλες τις λεπτομέρειες, ή να αλλάξετε μια συνδρομή, κάνετε είσοδο με το λογαριασμό σας.", + "OverviewPluginSubscriptionsMissingInfo": "Είναι πιθανόν να λείπει μια συνδρομή, για παράδειγμα να μην έχει εκκαθαριστεί ακόμη μια πληρωμή. Σε μια τέτοια περίπτωση, δοκιμάστε πάλι μετά από λίγες ώρες ή επικοινωνήστε με την ομάδα του Piwik.", + "NoValidSubscriptionNoUpdates": "Αφού λήξει μια συνδρομή δε θα λαμβάνετε πλέον οποιεσδήποτε ενημερώσεις για το πρόσθετο.", + "PluginSubscriptionsList": "Αυτή είναι μια λίστα από συνδρομές που έχουν συσχετιστεί με το κλειδί της άδειάς σας.", + "PaidPluginsNoLicenseKeyIntro": "Αν έχετε αγοράσει ένα %1$sεπί πληρωμή πρόσθετο%2$s, εισάγετε το κλειδί άδειας που έχετε παραλάβει.", + "PaidPluginsWithLicenseKeyIntro": "Έχει οριστεί ένα έγκυρο κλειδί άδειας. Για λόγους ασφαλείας δεν εμφανίζεται το κλειδί της άδειας εδώ. Αν το έχετε χάσει, επικοινωνήστε με την ομάδα του Piwik.", + "PaidPluginsNoLicenseKeyIntroNoSuperUserAccess": "Σε περίπτωση που αγοράσατε ένα %1$sεπί πληρωμή πρόσθετο%2$s από την Αγορά, ζητήστε από κάποιο χρήστη με δικαίωμα Υπερ-Χρήστη να προσθέσει το κλειδί της άδειας.", + "PluginDescription": "Επεκτείνετε και αυξήστε την λειτουργικότητα του Piwik από την Αγορά με κατέβασμα πρόσθετων και θεμάτων.", + "PluginKeywords": "Λέξεις κλειδιά", + "PluginUpdateAvailable": "Χρησιμοποιείτε την έκδοση %1$s και υπάρχει νεότερη έκδοση %2$s.", + "PluginVersionInfo": "%1$s από %2$s", + "PluginWebsite": "Ιστοτόπος πρόσθετου", + "PriceExclTax": "%1$s %2$s χωρίς φόρους.", + "PriceFromPerPeriod": "Από %1$s \/ %2$s", + "Reviews": "Κριτικές", + "ShownPriceIsExclTax": "Η εμφανιζόμενη τιμή είναι χωρίς φόρους.", + "Screenshots": "Παραδείγματα οθονών", + "SortByNewest": "Νεότερα", + "SortByAlpha": "Άλφα", + "SortByLastUpdated": "Τελευταία ενημέρωση", + "SortByPopular": "Δημοφιλή", + "StepDownloadingPluginFromMarketplace": "Κατέβασμα του πρόσθετου από την Αγορά", + "StepDownloadingThemeFromMarketplace": "Κατέβασμα του θέματος από την Αγορά", + "StepUnzippingPlugin": "Γίνεται αποσυμπίεση του πρόσθετου", + "StepUnzippingTheme": "Αποσυμπίεση του θέματος", + "StepThemeSuccessfullyInstalled": "Εγκαταστήσατε με επιτυχία το θέμα %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Εγκαταστήσατε με επιτυχία το πρόσθετο %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Ενημερώσατε με επιτυχία το πρόσθετο %1$s %2$s.", + "StepReplaceExistingPlugin": "Γίνεται αντικατάσταση του υπάρχοντος πρόσθετου", + "StepReplaceExistingTheme": "Γίνεται αντικατάσταση του υπάρχοντος θέματος", + "StepThemeSuccessfullyUpdated": "Ενημερώσατε με επιτυχία το θέμα %1$s %2$s.", + "SubscriptionType": "Τύπος", + "SubscriptionStartDate": "Ημερομηνία έναρξης", + "SubscriptionEndDate": "Ημερομηνία λήξης", + "SubscriptionNextPaymentDate": "Επόμενη ημερομηνία πληρωμής", + "SubscriptionInvalid": "Η συνδρομή είναι άκυρη ή έχει λήξει", + "SubscriptionExpiresSoon": "Η συνδρομή λήγει σύντομα", + "Support": "Υποστήριξη", + "TeaserExtendPiwikByUpload": "Επεκτείνετε το Piwik ανεβάζοντας ένα αρχείο ZIP", + "LicenseExceededPossibleCause": "Η άδεια είναι εκτός ορίων. Υπάρχουν πιθανώς περισσότεροι χρήστες στην εγκατάσταση του Piwik από όσους η συνδρομή επιτρέπει.", + "Updated": "Ενημερώθηκε", + "UpdatingPlugin": "Γίνεται ενημέρωση του %1$s", + "UploadZipFile": "Ανέβασμα του αρχείου ZIP", + "LicenseKeyExpiresSoon": "Η άδειά σας λήγει σύντομα, επικοινωνήστε με %1$s.", + "LicenseKeyIsExpired": "Η άδειά σας έληξε, επικοινωνήστε με %1$s.", + "MultiServerEnvironmentWarning": "Δεν μπορείτε να εγκαταστήσετε το πρόσθετο κατευθείαν, καθώς χρησιμοποιείτε το Piwik σε πολλαπλούς διακομιστές. Το πρόσθετο εγκαθίσταται σε ένα μόνο διακομιστή. Εναλλακτικά κατεβάστε το και εγκαταστήστε το χειροκίνητα σε όλους τους διακομιστές σας.", + "AutoUpdateDisabledWarning": "Δεν μπορείτε να εγκαταστήσετε ή ενημερώσετε το πρόσθετο απευθείας, καθώς οι αυτόματες ενημερώσεις έχουν απενεργοποιηθεί στο αρχείο ρυθμίσεων. Για να ενεργοποιήσετε τις αυτόματες ενημερώσεις, ορίστε το %1$s στο %2$s.", + "ViewRepositoryChangelog": "Εμφάνιση των αλλαγών" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/es.json b/plugins/Marketplace/lang/es.json new file mode 100644 index 0000000000..c63d728ba0 --- /dev/null +++ b/plugins/Marketplace/lang/es.json @@ -0,0 +1,49 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Activar", + "ActionActivatePlugin": "Activare complemento", + "ActionActivateTheme": "Activare tema", + "ActionInstall": "Instalar", + "AllowedUploadFormats": "Puede subir un complemento o tema en formato .zip vía esta página.", + "Authors": "Autores", + "BackToMarketplace": "Volver al Mercado", + "ByXDevelopers": "por %s desarrolladores", + "Developer": "Desarrollador", + "DevelopersLearnHowToDevelopPlugins": "Desarrolladores: Aprenda como extender y personalizar Piwik %1$sdesarrollando complementos o temas%2$s.", + "Marketplace": "Mercado", + "FeaturedPlugin": "Complemento destacado", + "InstallingPlugin": "Instalando %s", + "LastCommitTime": "(último cambio %s)", + "LastUpdated": "Última actualización", + "NewVersion": "nueva versión", + "NotAllowedToBrowseMarketplacePlugins": "Puedes navegar la lista de complementos que se pueden instalar para personalizar o extender su plataforma Piwik. Por favor contáctese con el administrador si desea que sea instalado uno de ellos.", + "NotAllowedToBrowseMarketplaceThemes": "Puede navegar la lista de temas que se pueden instalar para personalizar el estilo de su plataforma Piwik. Por favor contáctese con el administrador si desea que sea instalado uno de ellos.", + "NoPluginsFound": "No se encontraron complementos", + "NoThemesFound": "No se encontraron temas", + "NumDownloadsLatestVersion": "Última versión: %s descargas", + "PluginKeywords": "Palabras claves", + "PluginUpdateAvailable": "Está utilizando la versión %1$s y hay una nueva versión %2$s disponible.", + "PluginVersionInfo": "%1$s de %2$s", + "PluginWebsite": "Sitio de internet del complemento", + "Screenshots": "Capturas de pantalla", + "SortByNewest": "Más reciente", + "SortByAlpha": "Alfa", + "SortByPopular": "Popular", + "StepDownloadingPluginFromMarketplace": "Descargando complemento del Mercado", + "StepDownloadingThemeFromMarketplace": "Descargando tema del Mercado", + "StepUnzippingPlugin": "Descomprimiendo el complemento", + "StepUnzippingTheme": "Descomprimiendo el tema", + "StepThemeSuccessfullyInstalled": "El tema %1$s %2$s ha sido instalado con éxito.", + "StepPluginSuccessfullyInstalled": "El complemento %1$s %2$s ha sido instalado con éxito.", + "StepPluginSuccessfullyUpdated": "El complemento %1$s %2$s ha sido actualizado con éxito.", + "StepReplaceExistingPlugin": "Sustituyendo el complemento existente", + "StepReplaceExistingTheme": "Sustituyendo tema existente", + "StepThemeSuccessfullyUpdated": "El tema %1$s %2$s ha sido actualizado con éxito.", + "SubscriptionType": "Tipo", + "Support": "Asistencia", + "TeaserExtendPiwikByUpload": "Amplíe Piwik cargando un archivo ZIP", + "Updated": "Actualizado", + "UploadZipFile": "Carga un archivo ZIP", + "ViewRepositoryChangelog": "Ver cambios" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/et.json b/plugins/Marketplace/lang/et.json new file mode 100644 index 0000000000..ecda36197d --- /dev/null +++ b/plugins/Marketplace/lang/et.json @@ -0,0 +1,35 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Aktiveeri", + "ActionActivatePlugin": "Aktiveeri lisatarkvara", + "ActionActivateTheme": "Aktiveeri kujundus", + "ActionInstall": "Paigalda", + "Authors": "Autorid", + "BackToMarketplace": "Tagasi Marketisse", + "ByXDevelopers": "arendajate %s poolt", + "Developer": "Arendaja", + "Marketplace": "Market", + "FeaturedPlugin": "Esiletõstetud lisatarkvara", + "InstallingPlugin": "Paigaldan %s", + "LastCommitTime": "(viimane muudatus %s)", + "LastUpdated": "Viimati uuendatud", + "NoPluginsFound": "Lisatarkvara ei leitud", + "NoThemesFound": "Kujundusi ei leitud", + "NumDownloadsLatestVersion": "Viimane versioon: %s allalaadimist", + "PluginKeywords": "Võtmesõnad", + "PluginVersionInfo": "%1$s, tuli: %2$s", + "PluginWebsite": "Lisatarkvara veebileht", + "Screenshots": "Ekraanitõmmised", + "StepDownloadingPluginFromMarketplace": "Laen marketist lisatarkvara alla", + "StepDownloadingThemeFromMarketplace": "Laen alla kujundust marketist", + "StepUnzippingPlugin": "Pakin lisatarkvara lahti", + "StepUnzippingTheme": "Pakin kujundust lahti", + "StepReplaceExistingPlugin": "Asendan olemasolevat lisatarkvara", + "StepReplaceExistingTheme": "Asendan olemasolevat kujundust", + "SubscriptionType": "Tüüp", + "Support": "Tugi", + "Updated": "Uuendatud", + "UploadZipFile": "Lae üles ZIP arhiiv", + "ViewRepositoryChangelog": "Vaata muudatusi" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/eu.json b/plugins/Marketplace/lang/eu.json new file mode 100644 index 0000000000..e6d15ad857 --- /dev/null +++ b/plugins/Marketplace/lang/eu.json @@ -0,0 +1,6 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Gaitu", + "PluginKeywords": "Gako-hitzak" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/fa.json b/plugins/Marketplace/lang/fa.json new file mode 100644 index 0000000000..a9b5f8aea2 --- /dev/null +++ b/plugins/Marketplace/lang/fa.json @@ -0,0 +1,42 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "فعال کردن", + "ActionActivatePlugin": "فعال سازی افزونه", + "ActionActivateTheme": "فعال سازی قالب", + "ActionInstall": "نصب", + "AllowedUploadFormats": "شما می توانید یک پلاگین یا زیمنه (تم) را در قالب فایل زیپ در این صفحه آپلود نمایید.", + "Authors": "نویسنده ها", + "BackToMarketplace": "بازگشت به بازار", + "ByXDevelopers": "توسط %s برنامه نویس", + "Developer": "توسعه دهنده ها", + "Marketplace": "بازار", + "FeaturedPlugin": "افزونه ویژه", + "InstallingPlugin": "نصب %s", + "LastCommitTime": "(آخرین ارسال %s)", + "LastUpdated": "آخرین بروزرسانی", + "NotAllowedToBrowseMarketplaceThemes": "شما می توانید لیستی از زمینه های قابل نصب را مشاهده نمایید ، با این زمینه ها می توانید ظاهر Piwik را به دلخواه تغییر دهید. لطفا با مدیر خود تماس بگیرید تا آن را برای شما نصب نماید.", + "NoPluginsFound": "افزونه ای یافت نشد", + "NoThemesFound": "قالبی یافت نشد", + "NumDownloadsLatestVersion": "آخرین نسخه: %s دانلودها", + "PluginKeywords": "کلمات کلیدی", + "PluginVersionInfo": "%1$s از %2$s", + "PluginWebsite": "سایت افزونه", + "Screenshots": "تصاویر", + "StepDownloadingPluginFromMarketplace": "دانلود پلاگین از بازار", + "StepDownloadingThemeFromMarketplace": "دانلود زمینه از بازار", + "StepUnzippingPlugin": "خارج کردن پلاگین از حالت فشرده", + "StepUnzippingTheme": "خارج کردن زمینه از حالت فشرده", + "StepThemeSuccessfullyInstalled": "شما با موفقیت این زمینه را نصب نمودید %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "شما این پلاگین را با موفقیت نصب نمودید %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "شما این پلاگین را با موفقیت به روز رسانی نمودید %1$s %2$s.", + "StepReplaceExistingPlugin": "جایگزین کردن با پلاگین های موجود", + "StepReplaceExistingTheme": "جایگزین کردن با زمینه های موجود", + "StepThemeSuccessfullyUpdated": "شما این زمینه را با موفقیت به روز رسانی نمودید %1$s %2$s.", + "SubscriptionType": "نوع", + "Support": "پشتیبانی", + "TeaserExtendPiwikByUpload": "گسترش دهید Piwik را با آپلود کردن فایل زیپ", + "Updated": "بروزرسانی شد", + "UploadZipFile": "بارگذاری فایل زیپ", + "ViewRepositoryChangelog": "مشاهده تغییرات" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/fi.json b/plugins/Marketplace/lang/fi.json new file mode 100644 index 0000000000..c4bfc9e120 --- /dev/null +++ b/plugins/Marketplace/lang/fi.json @@ -0,0 +1,44 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Aktivoi", + "ActionActivatePlugin": "Aktivoi lisäosa", + "ActionActivateTheme": "Aktivoi teema", + "ActionInstall": "Asenna", + "AllowedUploadFormats": "Tällä sivulla voit lisätä liitännäisen tai teeman .zip-formaatissa.", + "Authors": "Tekijät", + "BackToMarketplace": "Takaisin kauppaan", + "ByXDevelopers": "%s ohjelmoijalta", + "Developer": "Kehittäjä", + "Marketplace": "Kauppatori", + "FeaturedPlugin": "Valittu liitännäinen", + "InstallingPlugin": "Asenna %s", + "LastCommitTime": "(viimeisin lähetys %s)", + "LastUpdated": "Edellinen päivitys", + "NotAllowedToBrowseMarketplacePlugins": "Voit selata asennettavien liitännäisten listaa, joilla voit mukauttaa tai laajentaaa Piwik sovellusalustaasi. Ota yhteyttä ylläpitäjääsi saadaksesi liitännäinen asennettua.", + "NotAllowedToBrowseMarketplaceThemes": "Voit selata listaa asennettavista teemoista, joilla voit muuttaa Piwikin ilmettä. Ota yhteyttä ylläpitäjääsi saadaksesi teema asennetuksi.", + "NoPluginsFound": "Liitännäisiä ei löydetty", + "NoThemesFound": "Teemoja ei löydetty", + "NumDownloadsLatestVersion": "Viimeisin versio: %s latausta", + "PluginKeywords": "Avainsanat", + "PluginUpdateAvailable": "Käytät versiota %1$s ja uusi versio %2$s on saatavilla.", + "PluginVersionInfo": "%1$s %2$s:sta", + "PluginWebsite": "Liitännäissivu", + "Screenshots": "Ruudunkaappaukset", + "StepDownloadingPluginFromMarketplace": "Lataa liitännäinen kauppatorilta", + "StepDownloadingThemeFromMarketplace": "Lataa teema kauppatorilta", + "StepUnzippingPlugin": "Liitännäisen purku", + "StepUnzippingTheme": "Teeman purku", + "StepThemeSuccessfullyInstalled": "Teema %1$s %2$s on asennettu onnistuneesti.", + "StepPluginSuccessfullyInstalled": "Liitännäinen %1$s %2$s on asennettu onnistuneesti.", + "StepPluginSuccessfullyUpdated": "Liitännäinen %1$s %2$s on päivitetty onnnistuneesti.", + "StepReplaceExistingPlugin": "Korvaa nykyisen liitännäisen", + "StepReplaceExistingTheme": "Korvaa nykyisen teeman", + "StepThemeSuccessfullyUpdated": "Teema %1$s %2$s on päivitetty onnistuneesti.", + "SubscriptionType": "Tyyppi", + "Support": "Tuki", + "TeaserExtendPiwikByUpload": "Laajenna Piwikiä lisäämällä ZIP-tiedosto", + "Updated": "Päivitetty", + "UploadZipFile": "Lisää ZIP-tiedosto", + "ViewRepositoryChangelog": "Tarkastele muutoksia" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/fr.json b/plugins/Marketplace/lang/fr.json new file mode 100644 index 0000000000..55a0af2cbf --- /dev/null +++ b/plugins/Marketplace/lang/fr.json @@ -0,0 +1,112 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Activer", + "ActionActivatePlugin": "Activer le composant", + "ActionActivateTheme": "Activer le thème", + "ActionInstall": "Installer", + "AddToCart": "Ajoutier au panier", + "AllowedUploadFormats": "Vous pouvez téléverser un composant additionnel ou un thème au format zip via cette page.", + "Authors": "Auteurs", + "BackToMarketplace": "Retour au Marché", + "BrowseMarketplace": "Parcourir le marché", + "ByXDevelopers": "par %s développeurs", + "CannotInstall": "Impossible d'installer", + "CannotUpdate": "Impossible de mettre à jour", + "ClickToCompletePurchase": "Cliquez pour terminer l'achat.", + "CurrentNumPiwikUsers": "Votre Piwik contient actuellement %1$s utilisateurs enregistrés.", + "ConfirmRemoveLicense": "Êtes-vous sûr(e) de vouloir supprimer votre clef de licence? Vous ne recevrez plus aucune mise à jour des composants achetés.", + "Developer": "Développeur", + "DevelopersLearnHowToDevelopPlugins": "Développeurs : Apprenez comment vous pouvez étendre et personaliser Piwik en %1$sdévelopant des composants ou themes%2$s.", + "Marketplace": "Marché", + "PaidPlugins": "Fonctionnalités prenium", + "FeaturedPlugin": "Composant mis en avant", + "InstallingNewPluginViaMarketplaceOrUpload": "Vous pouvez installer automatiquement %1$s depuis le marché our %2$stéléverser un %3$s%4$s au format .zip.", + "InstallingPlugin": "Installation de %s", + "InstallPurchasedPlugins": "Installer les composants achetés", + "LastCommitTime": "(dernier archivage %s)", + "LastUpdated": "A jour", + "License": "Licence", + "LicenseKey": "Clef de licence", + "LicenseKeyActivatedSuccess": "Clef de licence activée avec succès!", + "LicenseKeyDeletedSuccess": "Clef de licence supprimée avec succès.", + "Exceeded": "Dépassé", + "LicenseMissing": "Licence manquante", + "LicenseMissingDescription": "Vous utilisez les composants suivants sans licence: %1$s. %2$sPour résoudre ce problème veuillez mettre à jour votre clef de licence, %3$sobtenez une souscription maintenant%4$s ou désactivez le composant.", + "PluginLicenseMissingDescription": "Vous n'êtes pas autorisé(e) à télécharger ce composant car vous n'avez pas de licence pour ce composant. Pour résoudre ce problème mettez à jour votre clef de licence, obtenez une souscription ou désinstallez ce composant.", + "LicenseExceeded": "Licence dépassée", + "LicenseExceededDescription": "Les licences pour les composants suivants ne sont plus valides car le nombre d'utilisateurs authorisés est dépassé: %1$s. %2$sVous ne serez pas capable de télécharger les mises à jour de ces composants. Pour résoudre ce problème supprimez certains des utilisateurs ou %3$smettez à jour la souscription maintenant%4$s.", + "PluginLicenseExceededDescription": "Vous n'êtes pas autorisé(e) à télécharger ce composant. La licence pour ce composant n'est plus valide car le nombre d'utilisateurs autorisés est dépassé. Pour résoudre ce porblème supprimez quelques utilisateurs ou mettez à jour votre souscription maintenant.", + "LicenseExpired": "Licence expirée", + "LicenseExpiredDescription": "Les licences pour les composants suivants sont expirées: %1$s. %2$sVous ne recevrez plus les mises à jour pour ces composants. Pour résoudre ce problème %3$srenouvelez votre souscription maintenant%4$s ou désactivez ce composant si vous ne l'utilisez plus.", + "LicenseRenewsNextPaymentDate": "Se renouvelle à la prochaine date de paiement", + "UpgradeSubscription": "Mettre à jour votre souscription", + "ViewSubscriptionsSummary": "%1$sAfficher vos souscriptions à des composants.%2$s", + "ViewSubscriptions": "Afficher les souscriptions", + "ExceptionLinceseKeyIsExpired": "Cette clef de licence est expirée.", + "ExceptionLinceseKeyIsNotValid": "La clef de licence n'est pas valide.", + "LicenseKeyIsValidShort": "La clef de licence est valide!", + "RemoveLicenseKey": "Supprimer la clef de licence", + "InstallAllPurchasedPlugins": "Installer tous les composants achetés d'un coup", + "InstallAllPurchasedPluginsAction": "Installer et activer %d composants achetés", + "InstallThesePlugins": "Ceci va installer et activer les composants suivants:", + "AllPaidPluginsInstalledAndActivated": "Tous les composants achetés ont été installés et activés avec succès.", + "OnlySomePaidPluginsInstalledAndActivated": "Certains des composants achetés n'ont pas été installés avec succès.", + "NewVersion": "nouvelle version", + "NotAllowedToBrowseMarketplacePlugins": "Vous pouvez parcourir la liste des composants qui peuvent être installés pour personnaliser ou étendre votre plateforme Piwik. Veuillez contacter votre administrateur si vous avez besoin d'en installer.", + "NotAllowedToBrowseMarketplaceThemes": "Vous pouvez parcourir la liste des thèmes qui peuvent être installés pour personnaliser l'apparence de votre plateforme Piwik. Veuillez contacter votre administrateur pour qu'il les installe pour vous.", + "NoPluginsFound": "Aucun composant trouvé", + "NoThemesFound": "Aucun thème trouvé", + "NoSubscriptionsFound": "Aucune souscription trouvée", + "NumDownloadsLatestVersion": "Dernière version : %s téléchargements.", + "OverviewPluginSubscriptions": "Vue d'ensemble de vos souscriptions de composants", + "OverviewPluginSubscriptionsMissingLicense": "Vous n'avez aucune clef de licence de configurée. Si vous avez acheté un composant, rendez-vous sur le %1$smarché%2$s et entrez votre clef de licence.", + "OverviewPluginSubscriptionsAllDetails": "Pour afficher tous les details, our changer de souscription, veuillez vous connecter à votre compte.", + "OverviewPluginSubscriptionsMissingInfo": "Il est possible qu'une souscription soit manquante, par exemple si le paiement n'est pas encore passé. Dans ce cas là, veuillez réessayer à nouveau dans quelques heures ou contacter l'équipe Piwik.", + "NoValidSubscriptionNoUpdates": "Des lors qu'une souscription est expirée vous n'allez plus recevoir de mise à jour pour ce composant.", + "PluginSubscriptionsList": "Ceci est une liste de vos souscription associée à votre clef de licence.", + "PaidPluginsNoLicenseKeyIntro": "Si vous avez acheté un %1$scomposant payant prenium%2$s, veuillez insérer la clef de licence ci-dessous.", + "PaidPluginsWithLicenseKeyIntro": "Une clef de licence valide a été configurée. Pour des raisons de sécurité nous n'affichons pas la clef de licence ici. Si vous avez perdu votre clef de licence veuillez contacter l'équipe Piwik s'il-vous-plait.", + "PaidPluginsNoLicenseKeyIntroNoSuperUserAccess": "Dans le cas où vous avez acheté un %1$scomposant payé prenium%2$s sur le marché veuillez demander à un utilisateur avec l'accès super utilisateur d'ajouter la clef de licence.", + "PluginDescription": "Étendez et augmentez les fonctionnalités de Piwik via le Marché en téléchargeant des composants et les thèmes.", + "PluginKeywords": "Mots-clés", + "PluginUpdateAvailable": "Vous utilisez la version %1$s et une nouvelle version %2$s est disponible.", + "PluginVersionInfo": "%1$s de %2$s", + "PluginWebsite": "Site du composant additionnel", + "PriceExclTax": "%1$s %2$s tax. exc.", + "PriceFromPerPeriod": "Pour %1$s \/ %2$s", + "Reviews": "Revues", + "ShownPriceIsExclTax": "Les prix affichés n'incluent pas les taxes.", + "Screenshots": "Captures d'écran", + "SortByNewest": "Plus récent", + "SortByAlpha": "Alpha", + "SortByLastUpdated": "Dernière mise à jour", + "SortByPopular": "Populaire", + "StepDownloadingPluginFromMarketplace": "Téléchargement d'un composant additionnel depuis le Marché", + "StepDownloadingThemeFromMarketplace": "Téléchargement d'un thème depuis le Marché", + "StepUnzippingPlugin": "Décompression du composant additionnel", + "StepUnzippingTheme": "Décompression du thème", + "StepThemeSuccessfullyInstalled": "Vous avez installé avec succès le thème %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Vous avez installé avec succès le composant additionnel %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Vous avez mis à jour avec succès le composant %1$s %2$s.", + "StepReplaceExistingPlugin": "Remplacement des composants additionnels existants", + "StepReplaceExistingTheme": "Remplacement du thème existant", + "StepThemeSuccessfullyUpdated": "Vous avez mis à jour avec succès le thème %1$s %2$s.", + "SubscriptionType": "Type", + "SubscriptionStartDate": "Date de début", + "SubscriptionEndDate": "Date de fin", + "SubscriptionNextPaymentDate": "Prochaine date de paiement", + "SubscriptionInvalid": "Cette souscription est invalide ou expirée", + "SubscriptionExpiresSoon": "Cette souscription expire bientôt", + "Support": "Support", + "TeaserExtendPiwikByUpload": "Etendre Piwik en téléchargeant un fichier ZIP", + "LicenseExceededPossibleCause": "Votre licence est insuffisante. Il y a probablement plus d'utilisateurs sur ce Piwik que ce que la souscription permet.", + "Updated": "Mis à jour", + "UpdatingPlugin": "Mise à jour de %1$s", + "UploadZipFile": "Télécharger fichier ZIP", + "LicenseKeyExpiresSoon": "Votre clef de licence expire bientôt, veuillez contacter %1$s.", + "LicenseKeyIsExpired": "Votre clef de licence est expirée, veuillez contacter %1$s.", + "MultiServerEnvironmentWarning": "Vous ne pouvez pas installer ou mettre à jour le composant directement car vous utilisez Piwik sur plusieurs serveurs. Ce composant serait installé sur un seul serveur. A la place téléchargez et déployez le composant manuellement sur tous les serveurs.", + "AutoUpdateDisabledWarning": "Vous ne pouvez pas installer ou mettre à jour ce composant directement car les mises à jour automatiques sont désactivées dans la configuration. Pour activer les mises à jour automatiques configurez %1$s dans %2$s.", + "ViewRepositoryChangelog": "Afficher les changements" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/gl.json b/plugins/Marketplace/lang/gl.json new file mode 100644 index 0000000000..8d94301600 --- /dev/null +++ b/plugins/Marketplace/lang/gl.json @@ -0,0 +1,6 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Activar", + "PluginKeywords": "Palabras clave" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/he.json b/plugins/Marketplace/lang/he.json new file mode 100644 index 0000000000..cff91d1ef2 --- /dev/null +++ b/plugins/Marketplace/lang/he.json @@ -0,0 +1,10 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "הפעל", + "ActionActivatePlugin": "הפעל תוסף", + "ActionInstall": "להתקין", + "Authors": "כותבים", + "PluginKeywords": "מילות מפתח", + "PluginVersionInfo": "%1$s מתוך %2$s" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/hi.json b/plugins/Marketplace/lang/hi.json new file mode 100644 index 0000000000..633d54a168 --- /dev/null +++ b/plugins/Marketplace/lang/hi.json @@ -0,0 +1,20 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "सक्रिय करें", + "ActionActivatePlugin": "प्लगइन सक्रिय", + "ActionActivateTheme": "विषय को सक्रिय करें", + "ActionInstall": "स्थापित करें", + "AllowedUploadFormats": "आप इस पेज के माध्यम से ज़िप प्रारूप में एक प्लगइन या विषय अपलोड कर सकते हैं ।", + "Authors": "लेखक", + "BackToMarketplace": "वापस बाज़ार में", + "ByXDevelopers": "%s के डेवलपर्स द्वारा", + "FeaturedPlugin": "विशेष रुप से प्लगइन", + "PluginKeywords": "खोजशब्द", + "PluginVersionInfo": "%1$s से %2$s", + "SubscriptionType": "प्रकार", + "Support": "सहयोग", + "Updated": "अद्यतन", + "UploadZipFile": "ZIP फ़ाइल अपलोड करें", + "ViewRepositoryChangelog": "परिवर्तन देखें" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/hr.json b/plugins/Marketplace/lang/hr.json new file mode 100644 index 0000000000..315b36029b --- /dev/null +++ b/plugins/Marketplace/lang/hr.json @@ -0,0 +1,6 @@ +{ + "Marketplace": { + "ActionInstall": "Instaliraj", + "SubscriptionType": "Vrsta" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/hu.json b/plugins/Marketplace/lang/hu.json new file mode 100644 index 0000000000..4ee83e108f --- /dev/null +++ b/plugins/Marketplace/lang/hu.json @@ -0,0 +1,7 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Bekapcsol", + "PluginKeywords": "Kulcsszavak", + "SubscriptionType": "Típus" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/id.json b/plugins/Marketplace/lang/id.json new file mode 100644 index 0000000000..d743bf436b --- /dev/null +++ b/plugins/Marketplace/lang/id.json @@ -0,0 +1,8 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Diaktifkan", + "PluginKeywords": "Kata Kunci", + "PluginVersionInfo": "%1$s dari %2$s", + "SubscriptionType": "Jenis" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/is.json b/plugins/Marketplace/lang/is.json new file mode 100644 index 0000000000..5b340dd145 --- /dev/null +++ b/plugins/Marketplace/lang/is.json @@ -0,0 +1,7 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Kveikja", + "PluginKeywords": "Leitarorð", + "SubscriptionType": "Tegund" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/it.json b/plugins/Marketplace/lang/it.json new file mode 100644 index 0000000000..550fba3f8a --- /dev/null +++ b/plugins/Marketplace/lang/it.json @@ -0,0 +1,106 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Attiva", + "ActionActivatePlugin": "Attiva plugin", + "ActionActivateTheme": "Attiva tema", + "ActionInstall": "Installa", + "AddToCart": "Aggiungi al carrello", + "AllowedUploadFormats": "Tramite questa pagina puoi caricare un plugin o un tema nel formato .zip.", + "Authors": "Autori", + "BackToMarketplace": "Torna al Marketplace", + "BrowseMarketplace": "Guarda nel Marketplace", + "ByXDevelopers": "da %s sviluppatori", + "CannotInstall": "Impossibile installare", + "CannotUpdate": "Impossibile aggiornare", + "ClickToCompletePurchase": "Clicca per completare l'acquisto.", + "CurrentNumPiwikUsers": "Il tuo Piwik ha, al momento, %1$s utenti registrati.", + "ConfirmRemoveLicense": "Sei sicuro di voler rimuovere la tua chiave di licenza? Non potrai più ricevere gli aggiornamenti per nessuno dei plugin acquistati.", + "Developer": "Sviluppatore", + "DevelopersLearnHowToDevelopPlugins": "Per gli sviluppatori: Imparate come ampliare e personalizzare Piwik %1$ssviluppando plugins e temi%2$s.", + "Marketplace": "Marketplace", + "PaidPlugins": "Funzionalità Premium", + "FeaturedPlugin": "Plugin rappresentativo", + "InstallingNewPluginViaMarketplaceOrUpload": "Puoi installare automaticamente %1$s dal Marketplace o %2$scaricare un %3$s%4$s in formato .zip.", + "InstallingPlugin": "Sto installando %s", + "InstallPurchasedPlugins": "Installa i plugin acquistati", + "LastCommitTime": "ultima consegna %s", + "LastUpdated": "Ultimo aggiornamento", + "License": "Licenza", + "LicenseKey": "Chiave di licenza", + "LicenseKeyActivatedSuccess": "Chiave di licenza attivata con successo!", + "LicenseKeyDeletedSuccess": "Chiave di licenza eliminata con successo!", + "Exceeded": "Superata", + "LicenseMissing": "Licenza mancante", + "LicenseMissingDescription": "Stai utilizzando senza licenza i seguenti plugin: %1$s. %2$sPer risolvere questo problema puoi aggiornare la tua chiave di licenza, %3$sfare ora un abbonamento%4$s o disattivare il plugin.", + "PluginLicenseMissingDescription": "Non puoi scaricare questo plugin perché non hai per esso alcuna licenza. Per risolvere questo problema puoi aggiornare la tua chiave di licenza, fare un abbonamento o disinstallare il plugin.", + "LicenseExceeded": "Licenza superata", + "LicenseExceededDescription": "Le licenze per i seguenti plugin non sono più valide perché il numero degli utenti autorizzati dalla licenza è eccessivo: %1$s. %2$sNon potrai scaricare gli aggiornamenti per questi plugin. Per risolvere questo problema cancella alcuni utenti o %3$saggiorna ora l'abbonamento%4$s.", + "PluginLicenseExceededDescription": "Non puoi scaricare questo plugin. La sua chiave di licenza non è più valida perché il numero degli utenti autorizzati dalla licenza è eccessivo. Per risolvere questo problema cancella alcuni utenti o aggiorna ora il tuo abbonamento.", + "LicenseExpired": "Licenza scaduta", + "LicenseExpiredDescription": "Le licenze per i seguenti plugin sono scadute: %1$s. %2$sNon riceverai più alcun aggiornamento per questi plugin. Per risolvere il problema %3$srinnova il tuo ora abbonamento%4$s o disattiva il plugin se non lo utilizzi più.", + "LicenseRenewsNextPaymentDate": "Rinnovi alla prossima data di pagamento", + "UpgradeSubscription": "Aggiorna Abbonamento", + "ViewSubscriptionsSummary": "%1$sGuarda i tuoi abbonamenti ai plugin.%2$s", + "ViewSubscriptions": "Guarda abbonmenti", + "ExceptionLinceseKeyIsExpired": "Questa chiave di licenza è scaduta.", + "ExceptionLinceseKeyIsNotValid": "Questa chiave di licenza non è valida.", + "LicenseKeyIsValidShort": "Chiave di licenza valida!", + "RemoveLicenseKey": "Rimuovi chiave di lcenza", + "InstallAllPurchasedPlugins": "Installa tutti i plugin acquistati in una volta sola", + "InstallAllPurchasedPluginsAction": "Installa e attiva %d plugin acquistati", + "InstallThesePlugins": "Questa operazione installerà e attiverà i seguenti plugin:", + "AllPaidPluginsInstalledAndActivated": "Tutti i plugin che hai pagato sono stati installati e attivati con successo.", + "OnlySomePaidPluginsInstalledAndActivated": "Alcuni plugin che hai pagato non sono stati installati con successo.", + "NewVersion": "nuova versione", + "NotAllowedToBrowseMarketplacePlugins": "Puoi esplorare la lista dei plugin che possono essere installati per personalizzare o espandere la tua piattaforma Piwik. Contatta il tuo amministratore se desideri installarne qualcuno.", + "NotAllowedToBrowseMarketplaceThemes": "Puoi esplorare la lista dei temi che possono essere installati per personalizzare l'aspetto della tua piattaforma Piwik. Contatta il tuo amministratore se desideri che ne installi qualcuno.", + "NoPluginsFound": "Non sono stati trovati plugin", + "NoThemesFound": "Non sono stati trovati temi", + "NoSubscriptionsFound": "Non sono stati trovati abbonamenti", + "NumDownloadsLatestVersion": "Ultima versione: %s Downloads", + "OverviewPluginSubscriptions": "Panoramica dei tuoi abbonamenti ai plugin", + "OverviewPluginSubscriptionsAllDetails": "Per vedere tutti i dettagli o per cambiare un abbonamento, accedi al tuo account.", + "NoValidSubscriptionNoUpdates": "Una volta che un abbonamento è scaduto non potrai più ricevere alcun aggiornamento per questo plugin.", + "PluginSubscriptionsList": "Questo è un elenco di abbonamenti collegati alla tua chiave di licenza.", + "PaidPluginsNoLicenseKeyIntro": "Se hai acquistato un %1$sabbonamento a pagamento premium%2$s, si prega di inserire qui sotto la chiave di licenza che hai ricevuto.", + "PaidPluginsWithLicenseKeyIntro": "È stata impostata una chiave di licenza valida. Per ragioni di sicurezza non la mostriamo qui. Se hai perso la tua chiave di licenza ti preghiamo di contattare il team di Piwik.", + "PluginDescription": "Estendi ed espandi le funzioni di Piwik tramite il Marketplace scaricando plugin e temi.", + "PluginKeywords": "Keywords", + "PluginUpdateAvailable": "Stai utilizzando la versione %1$s ed è disponibile la nuova versione %2$s.", + "PluginVersionInfo": "%1$s da %2$s", + "PluginWebsite": "Sito Plugin", + "PriceExclTax": "%1$s %2$s tasse escl.", + "PriceFromPerPeriod": "Da %1$s \/ %2$s", + "ShownPriceIsExclTax": "Il prezzo indicato non comprende le tasse.", + "Screenshots": "Screenshots", + "SortByNewest": "Il più recente", + "SortByAlpha": "Alfa", + "SortByLastUpdated": "Ultimo aggiornamento", + "SortByPopular": "Popolare", + "StepDownloadingPluginFromMarketplace": "Download del plugin dal Marketplace", + "StepDownloadingThemeFromMarketplace": "Download del tema dal Marketplace", + "StepUnzippingPlugin": "Sto scompattando il plugin", + "StepUnzippingTheme": "Sto scompattando il tema", + "StepThemeSuccessfullyInstalled": "Hai installato con successo il tema %1$s %2$s", + "StepPluginSuccessfullyInstalled": "Hai installato con successo il plugin %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Hai aggiornato con successo il plugin %1$s %2$s.", + "StepReplaceExistingPlugin": "Sto sostituendo il plugin esistente", + "StepReplaceExistingTheme": "Sostituzione del tema esistente", + "StepThemeSuccessfullyUpdated": "Hai aggiornato con successo il tema %1$s %2$s", + "SubscriptionType": "Tipo", + "SubscriptionStartDate": "Data d'inizio", + "SubscriptionEndDate": "Data di fine", + "SubscriptionNextPaymentDate": "Prossima data di pagamento", + "SubscriptionInvalid": "Questo abbonamento non è valido o è scaduto", + "SubscriptionExpiresSoon": "Questo abbonamento scadrà a breve", + "Support": "Supportaci", + "TeaserExtendPiwikByUpload": "Estendi Piwik caricando un file ZIP", + "LicenseExceededPossibleCause": "La licenza è stata superata. Probabilmente ci sono più utenti in questa installazione di Piwik di quelli autorizzati dall'abbonamento.", + "Updated": "Aggiornato", + "UpdatingPlugin": "Aggiornamento di %1$s", + "UploadZipFile": "Caricamento file ZIP", + "LicenseKeyExpiresSoon": "La tua chiave di licenza scadrà a breve, si prega di contattare %1$s.", + "LicenseKeyIsExpired": "La tua chiave di licenza è scaduta, si prega di contattare %1$s.", + "ViewRepositoryChangelog": "Guarda i cambiamenti" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/ja.json b/plugins/Marketplace/lang/ja.json new file mode 100644 index 0000000000..134b4c8e88 --- /dev/null +++ b/plugins/Marketplace/lang/ja.json @@ -0,0 +1,46 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "有効化", + "ActionActivatePlugin": "プラグインを有効にする", + "ActionActivateTheme": "テーマを有効にする", + "ActionInstall": "インストール", + "AllowedUploadFormats": "このページから ZIP 形式のプラグインやテーマをアップロードをすることができます", + "Authors": "著者", + "BackToMarketplace": "マーケットプレイスへ戻る", + "ByXDevelopers": "%s の開発者", + "Developer": "開発者", + "DevelopersLearnHowToDevelopPlugins": "デベロッパー：%1$s テーマやプラグイン %2$s を開発することでPiwikを拡張、カスタマイズする方法を学びます。", + "Marketplace": "マーケットプレイス", + "FeaturedPlugin": "注目のプラグイン", + "InstallingPlugin": "%s のインストール", + "LastCommitTime": "(最終更新 %s)", + "LastUpdated": "最終更新日", + "NewVersion": "新しいバージョン", + "NotAllowedToBrowseMarketplacePlugins": "Piwik プラットフォームのカスタマイズまたは拡張のために、インストール可能なプラグインのリストを閲覧することができます。もしこれらのいづれかのインストールが必要な場合は、管理者にお問い合わせください。", + "NotAllowedToBrowseMarketplaceThemes": "Piwik プラットフォームの外観をカスタマイズするのにインストール可能な Piwik テーマのリストをご確認ください。これらのいづれかをインストールしたい場合は、管理者にお問い合わせください。", + "NoPluginsFound": "プラグインは見つかりませんでした", + "NoThemesFound": "テーマは見つかりませんでした", + "NumDownloadsLatestVersion": "最新バージョン：%s のダウンロード", + "PluginKeywords": "キーワード", + "PluginUpdateAvailable": "あなたは現在、バージョン %1$s を使用しています。新しいバージョン %2$s が利用可能です。", + "PluginVersionInfo": "%2$s からの %1$s", + "PluginWebsite": "プラグインのウェブサイト", + "Screenshots": "スクリーンショット", + "StepDownloadingPluginFromMarketplace": "マーケットプレイスからプラグインをダウンロード", + "StepDownloadingThemeFromMarketplace": "マーケットプレイスからテーマをダウンロード", + "StepUnzippingPlugin": "プラグインを解凍", + "StepUnzippingTheme": "テーマを解凍", + "StepThemeSuccessfullyInstalled": "テーマ %1$s %2$s のインストールに成功しました。", + "StepPluginSuccessfullyInstalled": "プラグイン %1$s %2$s のインストールに成功しました。", + "StepPluginSuccessfullyUpdated": "プラグイン %1$s %2$s のアップデートに成功しました。", + "StepReplaceExistingPlugin": "既存のプラグインを置き換える", + "StepReplaceExistingTheme": "既存のテーマを置き換える", + "StepThemeSuccessfullyUpdated": "テーマ %1$s %2$s のアップデートに成功しました。", + "SubscriptionType": "タイプ", + "Support": "サポート", + "TeaserExtendPiwikByUpload": "ZIP ファイルをアップロードして Piwik を拡張", + "Updated": "更新済", + "UploadZipFile": "ZIPファイルをアップロード", + "ViewRepositoryChangelog": "変更内容を表示" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/ka.json b/plugins/Marketplace/lang/ka.json new file mode 100644 index 0000000000..32472a25c2 --- /dev/null +++ b/plugins/Marketplace/lang/ka.json @@ -0,0 +1,7 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "ჩართვა", + "PluginKeywords": "საკვანძო სიტყვები", + "SubscriptionType": "ტიპი" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/ko.json b/plugins/Marketplace/lang/ko.json new file mode 100644 index 0000000000..0ad0ba7567 --- /dev/null +++ b/plugins/Marketplace/lang/ko.json @@ -0,0 +1,27 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "활성화", + "ActionActivatePlugin": "플러그인 활성화", + "ActionActivateTheme": "테마 활성화", + "ActionInstall": "설치", + "AllowedUploadFormats": "zip 포멧을 통해 플러그인이나 테마를 업로드 할 수 있습니다.", + "Authors": "작성자", + "BackToMarketplace": "마켓플레이스로 돌아가", + "Developer": "개발자", + "Marketplace": "마켓플레이스", + "LastUpdated": "최근 업데이트", + "NewVersion": "새로운 버전", + "NoPluginsFound": "플러그인을 찾을 수 없습니다.", + "NoThemesFound": "테마를 찾을 수 없습니다.", + "PluginKeywords": "검색어", + "PluginWebsite": "플러그인 웹사이트", + "Screenshots": "스크린샷", + "StepDownloadingPluginFromMarketplace": "마켓플레이스에서 플러그인 다운로드 중", + "StepDownloadingThemeFromMarketplace": "마켓플레이스에서 테마 다운로드 중", + "StepUnzippingPlugin": "플러그인 압축 푸는 중", + "StepUnzippingTheme": "테마 압축 푸는 중", + "SubscriptionType": "유형", + "UploadZipFile": "ZIP 파일 업로드", + "ViewRepositoryChangelog": "변경사항 보기" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/lt.json b/plugins/Marketplace/lang/lt.json new file mode 100644 index 0000000000..0624336b66 --- /dev/null +++ b/plugins/Marketplace/lang/lt.json @@ -0,0 +1,18 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Aktyvinti", + "ActionActivatePlugin": "Aktyvuoti papildinį", + "AllowedUploadFormats": "Per šį puslapį galite įkelti papildinį ar temą .zip formatu.", + "Developer": "Kūrėjas", + "InstallingPlugin": "Įdiegiama %s", + "NoPluginsFound": "Papildinių nerasta", + "NoThemesFound": "Temų nerasta", + "PluginKeywords": "Raktiniai žodžiai", + "PluginWebsite": "Papildinio svetainė", + "Screenshots": "Ekrano kopijos", + "StepPluginSuccessfullyInstalled": "Jūs sėkmingai įdiegėte papildinį %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Jūs sėkmingai atnaujinote papildinį %1$s %2$s.", + "StepReplaceExistingPlugin": "Pakeičiamas esamas papildinys", + "SubscriptionType": "Tipas" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/lv.json b/plugins/Marketplace/lang/lv.json new file mode 100644 index 0000000000..2d2648b871 --- /dev/null +++ b/plugins/Marketplace/lang/lv.json @@ -0,0 +1,7 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Aktivizēt", + "PluginKeywords": "Atslēgvārdi", + "SubscriptionType": "Tips" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/nb.json b/plugins/Marketplace/lang/nb.json new file mode 100644 index 0000000000..bce2f6bd08 --- /dev/null +++ b/plugins/Marketplace/lang/nb.json @@ -0,0 +1,49 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Aktiver", + "ActionActivatePlugin": "Aktiver utvidelse", + "ActionActivateTheme": "Aktiver tema", + "ActionInstall": "Installer", + "AllowedUploadFormats": "Du kan laste opp en utvidelse eller et tema i .zip-format via denne siden.", + "Authors": "Forfattere", + "BackToMarketplace": "Tilbake til markedsplassen", + "ByXDevelopers": "av %s utviklere", + "Developer": "Utvikler", + "DevelopersLearnHowToDevelopPlugins": "Utviklere: Lær hvordan du kan utvide og tilpasse Piwik ved %1$så utvikle utvidelser og tema%2$s.", + "Marketplace": "Markedsplass", + "FeaturedPlugin": "Fremhevet utvidelse", + "InstallingPlugin": "Installerer %s", + "LastCommitTime": "(siste bidrag %s)", + "LastUpdated": "Sist oppdatert", + "NewVersion": "ny versjon", + "NotAllowedToBrowseMarketplacePlugins": "Du kan bla i listen over utvidelser som kan installeres for å utvide eller tilpasse din Piwik-plattform. Vennligst kontakt din admin hvis du trenger å installere noen av disse.", + "NotAllowedToBrowseMarketplaceThemes": "Du kan bla i listen over temaer som kan installeres for å tilpasse utseendet til Piwik-plattformen. Vennligst kontakt din admin for å få noen av disse installert.", + "NoPluginsFound": "Ingen utvidelser funnet", + "NoThemesFound": "Ingen temaer funnet", + "NumDownloadsLatestVersion": "Siste versjon: %s nedlastinger", + "PluginKeywords": "Nøkkelord", + "PluginUpdateAvailable": "Du bruker versjon %1$s og en ny versjon %2$s er tilgjengelig.", + "PluginVersionInfo": "%1$s fra %2$s", + "PluginWebsite": "Nettsted for utvidelse", + "Screenshots": "Skjermbilder", + "SortByNewest": "Nyeste", + "SortByAlpha": "Alpha", + "SortByPopular": "Populære", + "StepDownloadingPluginFromMarketplace": "Laster ned utvidelse fra markedsplassen", + "StepDownloadingThemeFromMarketplace": "Laster ned tema fra markedsplassen", + "StepUnzippingPlugin": "Pakker ut utvidelse", + "StepUnzippingTheme": "Pakker ut tema", + "StepThemeSuccessfullyInstalled": "Du har installert temaet %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Du har installert utvidelsen %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Du har oppdatert utvidelsen %1$s %2$s.", + "StepReplaceExistingPlugin": "Erstatter eksisterende utvidelse", + "StepReplaceExistingTheme": "Erstatter eksisterende tema", + "StepThemeSuccessfullyUpdated": "Du har oppdatert temaet %1$s %2$s.", + "SubscriptionType": "Type", + "Support": "Støtte", + "TeaserExtendPiwikByUpload": "Utvid Piwik ved å laste opp en ZIP-fil", + "Updated": "Oppdatert", + "UploadZipFile": "Last opp ZIP-fil", + "ViewRepositoryChangelog": "Vis endringene" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/nl.json b/plugins/Marketplace/lang/nl.json new file mode 100644 index 0000000000..1c3d6d5097 --- /dev/null +++ b/plugins/Marketplace/lang/nl.json @@ -0,0 +1,46 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Inschakelen", + "ActionActivatePlugin": "Plugin inschakelen", + "ActionActivateTheme": "Thema activeren", + "ActionInstall": "Installeren", + "AllowedUploadFormats": "Je kunt een plugin of thema in .zip formaat uploaden via deze pagina.", + "Authors": "Auteurs", + "BackToMarketplace": "Terug naar de Marktplaats", + "ByXDevelopers": "door %s ontwikkelaars", + "Developer": "Ontwikkelaar", + "DevelopersLearnHowToDevelopPlugins": "Ontwikkelaars: Leer hoe Piwik kan worden uitgebreid en aangepast door het %1$sontwikkelen van plugins en thema's%2$s.", + "Marketplace": "Marktplaats", + "FeaturedPlugin": "Aanbevolen plugin", + "InstallingPlugin": "Installeren %s", + "LastCommitTime": "(laatste wijziging %s)", + "LastUpdated": "Laatst Bijgewerkt", + "NewVersion": "Nieuwe versie", + "NotAllowedToBrowseMarketplacePlugins": "Je kunt de lijst met beschikbare plugins bekijken om je Piwik platform te wijzigen of uit te breiden. Neem contact op met je Piwik beheerder wanneer je een van deze plugins wil installeren.", + "NotAllowedToBrowseMarketplaceThemes": "Je kunt de lijst met beschikbare thema's bekijken om je weergave van het Piwik platform aan te passen. Neem contact op met je Piwik beheerder wanneer je een van deze thema's wilt installeren.", + "NoPluginsFound": "Geen plugins gevonden", + "NoThemesFound": "Geen thema's gevonden", + "NumDownloadsLatestVersion": "Laatste versie: %s Downloads", + "PluginKeywords": "Zoektermen", + "PluginUpdateAvailable": "Je gebruikt versie %1$s en een nieuwe versie %2$s is beschikbaar.", + "PluginVersionInfo": "%1$s van %2$s", + "PluginWebsite": "Plugin Website", + "Screenshots": "Schermafbeeldingen", + "StepDownloadingPluginFromMarketplace": "Plugin van de Marktplaats aan het Downloaden", + "StepDownloadingThemeFromMarketplace": "Thema van de Marktplaats aan het Downloaden", + "StepUnzippingPlugin": "Plugin uitpakken", + "StepUnzippingTheme": "Thema uitpakken", + "StepThemeSuccessfullyInstalled": "Je hebt succesvol het thema %1$s %2$s geïnstalleerd.", + "StepPluginSuccessfullyInstalled": "Je hebt succesvol de plug-in %1$s %2$s geïnstalleerd.", + "StepPluginSuccessfullyUpdated": "Je hebt succesvol de plugin %1$s %2$s bijgewerkt.", + "StepReplaceExistingPlugin": "Vervang bestaande plugin", + "StepReplaceExistingTheme": "Vervang bestaande thema", + "StepThemeSuccessfullyUpdated": "Je hebt succesvol het thema %1$s %2$s bijgewerkt.", + "SubscriptionType": "Type", + "Support": "Ondersteuning", + "TeaserExtendPiwikByUpload": "Breidt Piwik uit door een ZIP bestand te uploaden", + "Updated": "Bijgewerkt", + "UploadZipFile": "ZIP bestand uploaden", + "ViewRepositoryChangelog": "Bekijk de veranderingen" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/nn.json b/plugins/Marketplace/lang/nn.json new file mode 100644 index 0000000000..4b5061e33d --- /dev/null +++ b/plugins/Marketplace/lang/nn.json @@ -0,0 +1,8 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Slå på", + "PluginKeywords": "Nøkkelord", + "PluginVersionInfo": "%1$s van %2$s", + "SubscriptionType": "Type" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/pl.json b/plugins/Marketplace/lang/pl.json new file mode 100644 index 0000000000..e91edac339 --- /dev/null +++ b/plugins/Marketplace/lang/pl.json @@ -0,0 +1,44 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Włącz", + "ActionActivatePlugin": "Włącz plugin", + "ActionActivateTheme": "Aktywuj szablon", + "ActionInstall": "Zainstaluj", + "AllowedUploadFormats": "Możesz wysłać plugin lub skórę w formacie .zip poprzez tą stronę.", + "Authors": "Autorzy", + "BackToMarketplace": "Wróć do Marketu", + "ByXDevelopers": "przez %s deweloperów", + "Developer": "Deweloper", + "Marketplace": "Sklep", + "FeaturedPlugin": "Wyróżniony plugin", + "InstallingPlugin": "Instalowanie %s", + "LastCommitTime": "(ostatnia aktualizacja %s)", + "LastUpdated": "Ostatnia aktualizacja", + "NotAllowedToBrowseMarketplacePlugins": "Możesz przeglądać listę plugin'ów które mogą zostać zainstalowane aby zmodyfikować lub rozszerzyć Twoją platformę Piwik. Skontaktuj się z administratorem jeśli chcesz zainstalować któryś z nich.", + "NotAllowedToBrowseMarketplaceThemes": "Możesz przeglądać listę tematów, które mogą być zainstalowane, aby dostosować wygląd platformy Piwik. W celu instalacji porszę skontaktować się z administratorem.", + "NoPluginsFound": "Nie znaleziono pluginów", + "NoThemesFound": "Nie znaleziono szablonów", + "NumDownloadsLatestVersion": "Ostatnia wersja: %s Pobrań", + "PluginKeywords": "Słowa kluczowe", + "PluginUpdateAvailable": "Używasz wersji %1$s, nowa wersja %2$s jest dostępna.", + "PluginVersionInfo": "%1$s z %2$s", + "PluginWebsite": "Strona WWW", + "Screenshots": "Screenshoty", + "StepDownloadingPluginFromMarketplace": "Pobieranie wtyczki ze Sklepu", + "StepDownloadingThemeFromMarketplace": "Pobieranie szablonu ze Sklepu", + "StepUnzippingPlugin": "Rozpakowywanie pluginu", + "StepUnzippingTheme": "Rozpakowuję szablon", + "StepThemeSuccessfullyInstalled": "Pomyślnie zainstalowano szablon %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Wtyczka %1$s %2$s została pomyślnie zainstalowana.", + "StepPluginSuccessfullyUpdated": "Wtyczka została %1$s %2$s zaaktualizowana.", + "StepReplaceExistingPlugin": "Zastępowanie istniejącego pluginu", + "StepReplaceExistingTheme": "Zastępowania obecnego motywu", + "StepThemeSuccessfullyUpdated": "Motyw został zaaktualizowany %1$s %2$s.", + "SubscriptionType": "Rodzaj", + "Support": "Wsparcie", + "TeaserExtendPiwikByUpload": "Rozbuduj Piwik poporzez wgranie plików ZIP", + "Updated": "Zaktualizowano", + "UploadZipFile": "Wyślij plik ZIP", + "ViewRepositoryChangelog": "Zobacz zmiany" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/pt-br.json b/plugins/Marketplace/lang/pt-br.json new file mode 100644 index 0000000000..ddf109f3dc --- /dev/null +++ b/plugins/Marketplace/lang/pt-br.json @@ -0,0 +1,49 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Ativar", + "ActionActivatePlugin": "Ativar plugin", + "ActionActivateTheme": "Ativar tema", + "ActionInstall": "Instalar", + "AllowedUploadFormats": "Você pode carregar um plugin ou tema em formato zip através desta página.", + "Authors": "Autores", + "BackToMarketplace": "Voltar ao Marketplace", + "ByXDevelopers": "por %s desenvolvedores", + "Developer": "Desenvolvedor", + "DevelopersLearnHowToDevelopPlugins": "Desenvolvedores: Saibam como estender e personalizar o Piwik %1$sdesenvolvendo plugins ou temas%2$s.", + "Marketplace": "Marketplace", + "FeaturedPlugin": "Plugin destaque", + "InstallingPlugin": "Instalando %s", + "LastCommitTime": "(último commit %s)", + "LastUpdated": "Última Atualização", + "NewVersion": "nova versão", + "NotAllowedToBrowseMarketplacePlugins": "Você pode navegar na lista de plugins que podem ser instalados para personalizar ou estender a sua plataforma Piwik. Por favor, contate seu administrador se você precisar de qualquer um deles instalado.", + "NotAllowedToBrowseMarketplaceThemes": "Você pode navegar na lista de temas que podem ser instalados para personalizar a aparência da plataforma Piwik. Por favor, contate seu administrador para solicitar a instalação de qualquer um destes para você.", + "NoPluginsFound": "Nenhum plugin encontrado", + "NoThemesFound": "Nenhum tema encontrado", + "NumDownloadsLatestVersion": "Última versão: %s Downloads", + "PluginKeywords": "Palavras-Chave", + "PluginUpdateAvailable": "Você está usando a versão %1$s e uma nova versão %2$s está disponível.", + "PluginVersionInfo": "%1$s de %2$s", + "PluginWebsite": "Site de Plugin", + "Screenshots": "Screenshots", + "SortByNewest": "Mais recente", + "SortByAlpha": "Alfa", + "SortByPopular": "Popular", + "StepDownloadingPluginFromMarketplace": "Transferindo plugin do Marketplace", + "StepDownloadingThemeFromMarketplace": "Transferindo tema do Marketplace", + "StepUnzippingPlugin": "Descompactando plugin", + "StepUnzippingTheme": "Descompactando tema", + "StepThemeSuccessfullyInstalled": "Você instalou com sucesso o tema %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Você instalou com sucesso o plugin %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Você atualizou com sucesso o plugin %1$s %2$s.", + "StepReplaceExistingPlugin": "Substituindo plugin existente", + "StepReplaceExistingTheme": "Substituindo tema existente", + "StepThemeSuccessfullyUpdated": "Você atualizou com sucesso o tema %1$s %2$s.", + "SubscriptionType": "Tipo", + "Support": "Suporte", + "TeaserExtendPiwikByUpload": "Estenda o Piwik carregando um arquivo ZIP", + "Updated": "Atualizado(a)", + "UploadZipFile": "Carregar arquivo ZIP", + "ViewRepositoryChangelog": "Ver as mudanças" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/pt.json b/plugins/Marketplace/lang/pt.json new file mode 100644 index 0000000000..621496880c --- /dev/null +++ b/plugins/Marketplace/lang/pt.json @@ -0,0 +1,15 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Activar", + "ActionActivatePlugin": "Ativar plugin", + "ActionActivateTheme": "Ativar tema", + "ActionInstall": "Instalar", + "Marketplace": "Mercado", + "LastUpdated": "Ultima atualização", + "PluginKeywords": "Palavras Chave", + "SubscriptionType": "Tipo", + "Support": "Suporte", + "Updated": "Atualizado", + "ViewRepositoryChangelog": "Ver alterações" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/ro.json b/plugins/Marketplace/lang/ro.json new file mode 100644 index 0000000000..4a48adc57b --- /dev/null +++ b/plugins/Marketplace/lang/ro.json @@ -0,0 +1,44 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Activare", + "ActionActivatePlugin": "Activeaza pluginul", + "ActionActivateTheme": "Activeaza tema", + "ActionInstall": "Instaleaza", + "AllowedUploadFormats": "Poti uploada un plugin sau o tema in formatul .zip prin intermediul acestei pagini.", + "Authors": "Autori", + "BackToMarketplace": "Inapoi la Marketplace", + "ByXDevelopers": "de către %s programatori", + "Developer": "Dezvoltator", + "Marketplace": "Marketplace", + "FeaturedPlugin": "Plugin promovat", + "InstallingPlugin": "Se instaleaza %s", + "LastCommitTime": "(ultima data folosit %s)", + "LastUpdated": "Ultima data updatat", + "NotAllowedToBrowseMarketplacePlugins": "Puteti rasfoi lista cu pluginurile care pot fi instalate pentru a customiza sau a extinde platforma Piwik. Va rugam sa contactati administratorul Dvs. daca aveti nevoie ca oricare din acestea sa fie instalata.", + "NotAllowedToBrowseMarketplaceThemes": "Puteti cauta prin lista de teme care pot fi instalate, pentru a customiza interfata platformei Piwik. Va rugam contactati administratorul dvs. pentru a instala oricare din aceste teme pentru dvs.", + "NoPluginsFound": "Nici un plugin gasit.", + "NoThemesFound": "Nici o tema gasita", + "NumDownloadsLatestVersion": "Ultima versiune: %s descărcări", + "PluginKeywords": "Cuvinte cheie", + "PluginUpdateAvailable": "Folositi versiunea %1$s iar o versiune noua %2$s este disponibila.", + "PluginVersionInfo": "%1$s de la %2$s", + "PluginWebsite": "Siteul pluginului", + "Screenshots": "Imagini", + "StepDownloadingPluginFromMarketplace": "Se downloadeaza pluginul din Marketplace", + "StepDownloadingThemeFromMarketplace": "Se downloadeaza tema din Marketplace", + "StepUnzippingPlugin": "Se dezarhiveaza pluginul", + "StepUnzippingTheme": "Se dezarhiveaza tema", + "StepThemeSuccessfullyInstalled": "Ati instalat cu succes tema %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Ati instalat cu succes pluginul %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Ati updatat cu succes pluginul %1$s %2$s.", + "StepReplaceExistingPlugin": "Inlocuind pluginul existent", + "StepReplaceExistingTheme": "Inlocuind tema existenta", + "StepThemeSuccessfullyUpdated": "Ati actualizat cu succes tema %1$s %2$s.", + "SubscriptionType": "Tip", + "Support": "Asistenta", + "TeaserExtendPiwikByUpload": "Extinde Piwik uploadand un fisier ZIP", + "Updated": "Updatat", + "UploadZipFile": "Incarca un fisier ZIP", + "ViewRepositoryChangelog": "Vezi modificarile" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/ru.json b/plugins/Marketplace/lang/ru.json new file mode 100644 index 0000000000..8d89e49702 --- /dev/null +++ b/plugins/Marketplace/lang/ru.json @@ -0,0 +1,50 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Активировать", + "ActionActivatePlugin": "Активировать плагин", + "ActionActivateTheme": "Активировать тему", + "ActionInstall": "Установить", + "AllowedUploadFormats": "Вы можете загрузить плагин или тему в формате .zip на этой странице.", + "Authors": "Авторы", + "BackToMarketplace": "Вернуться к Marketplace", + "ByXDevelopers": "разработчиками %s", + "Developer": "Разработчик", + "DevelopersLearnHowToDevelopPlugins": "Разработчикам: Изучите, как вы можете расширить и настроить Piwik при помощи плагинов для %1$sразработки или тем%2$s.", + "Marketplace": "Marketplace", + "FeaturedPlugin": "Набирающий популярность плагин", + "InstallingPlugin": "Установка %s", + "LastCommitTime": "(последний коммит %s)", + "LastUpdated": "Последнее обновление", + "NewVersion": "новая версия", + "NotAllowedToBrowseMarketplacePlugins": "Можете посмотреть список плагинов, которые могут быть установлены для подстройки или расширения вашей платформы Piwik. Свяжитесь с администратором если вам потребуется установить один из них.", + "NotAllowedToBrowseMarketplaceThemes": "Вы можете посмотреть список тем, которые могут быть установлены для настройки внешнего вида платформы Piwik. Пожалуйста, свяжите с вашим администратором, чтобы установить любой из них.", + "NoPluginsFound": "Плагины не найдены", + "NoThemesFound": "Темы не найдены", + "NumDownloadsLatestVersion": "Последняя версия скачена: %s раз", + "PluginKeywords": "Ключевые слова", + "PluginUpdateAvailable": "Вы используете версию %1$s последняя доступная %2$s", + "PluginVersionInfo": "%1$s – %2$s", + "PluginWebsite": "Сайт плагина", + "Screenshots": "Скриншоты", + "SortByNewest": "Новейшие", + "SortByAlpha": "Альфа", + "SortByPopular": "Популярные", + "StepDownloadingPluginFromMarketplace": "Скачать плагин из Marketplace", + "StepDownloadingThemeFromMarketplace": "Скачать тему из Marketplace", + "StepUnzippingPlugin": "Распаковка плагина", + "StepUnzippingTheme": "Распаковка темы", + "StepThemeSuccessfullyInstalled": "Вы успешно установили тему %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Вы успешно установили плагин %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Вы успешно обновили плагин %1$s %2$s.", + "StepReplaceExistingPlugin": "Замена существующего плагина", + "StepReplaceExistingTheme": "Замена существующей темы", + "StepThemeSuccessfullyUpdated": "Вы успешно обновили тему %1$s %2$s.", + "SubscriptionType": "Тип", + "Support": "Поддержка", + "TeaserExtendPiwikByUpload": "Улучшение Piwik закачкой ZIP файла", + "Updated": "Обновлено", + "UpdatingPlugin": "Обновление %1$s", + "UploadZipFile": "Закачать ZIP файл", + "ViewRepositoryChangelog": "Посмотреть изменения" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/sk.json b/plugins/Marketplace/lang/sk.json new file mode 100644 index 0000000000..2221b62003 --- /dev/null +++ b/plugins/Marketplace/lang/sk.json @@ -0,0 +1,46 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Aktivovať", + "ActionActivatePlugin": "Aktivovať modul", + "ActionActivateTheme": "Aktivovať tému", + "ActionInstall": "Inštalovať", + "AllowedUploadFormats": "Môžete uploadovať plugin alebo motív v .zip formáte prostredníctvom tejto stránky.", + "Authors": "Autori", + "BackToMarketplace": "Naspäť na trh", + "ByXDevelopers": "%s vývojárov", + "Developer": "Vývojár", + "DevelopersLearnHowToDevelopPlugins": "Vývojári: Naučiť sa ako rozšíriť a prispôsobiť Piwik %1$s vývojarskými pluginmi alebo %2$s motívmi.", + "Marketplace": "trh", + "FeaturedPlugin": "Hlavný plugin", + "InstallingPlugin": "Inštalácia %s", + "LastCommitTime": "(posledné rozhodnutie %s)", + "LastUpdated": "posledne aktualizované", + "NewVersion": "nová verzia", + "NotAllowedToBrowseMarketplacePlugins": "Môžete prehliadať zoznam pluginov, ktoré môžu byť nainštalované pre prispôsobenie alebo rozšírenie Piwik platformy. Prosím kontaktujte Vášho administrátora ak by ste potrebovali čokoľvek z toho nainštalovať.", + "NotAllowedToBrowseMarketplaceThemes": "Môžete prehliadať zoznam motívov, ktoré môžu byť nainštalované pre prispôsobenie vzhľadu Piwik platformy. Prosím kontaktujte Vášho administrátora ak by ste potrebovali čokoľvek z toho nainštalovať.", + "NoPluginsFound": "Nenájdený žiaden plugin", + "NoThemesFound": "Nenájdený žiaden motív.", + "NumDownloadsLatestVersion": "Najnovšia verzia: %s sťahovania", + "PluginKeywords": "Kľúčové slová", + "PluginUpdateAvailable": "Používate verziu %1$s a nová verzia %2$s je dostupná.", + "PluginVersionInfo": "%1$s z %2$s", + "PluginWebsite": "Webstránka pluginu", + "Screenshots": "Screenshoty", + "StepDownloadingPluginFromMarketplace": "Sťahovanie pluginu z trhu", + "StepDownloadingThemeFromMarketplace": "Sťahovanie motívu z trhu", + "StepUnzippingPlugin": "Rozbaliť plugin", + "StepUnzippingTheme": "Rozbaliť motív", + "StepThemeSuccessfullyInstalled": "Úspešne ste nainštalovali motív %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Úspešne ste nainštalovali plugin %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Úspešne ste aktualizovali plugin %1$s %2$s.", + "StepReplaceExistingPlugin": "Nahradiť existujúci plugin", + "StepReplaceExistingTheme": "Nahradiť existujúci motív", + "StepThemeSuccessfullyUpdated": "Úspešne ste aktualizovali motív %1$s %2$s.", + "SubscriptionType": "Typ", + "Support": "Podpora", + "TeaserExtendPiwikByUpload": "Rozšíriť Piwik nahratím ZIP súboru", + "Updated": "Aktualizované", + "UploadZipFile": "Nahrať ZIP súbor", + "ViewRepositoryChangelog": "Prezeranie zmien" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/sl.json b/plugins/Marketplace/lang/sl.json new file mode 100644 index 0000000000..cbaa83296b --- /dev/null +++ b/plugins/Marketplace/lang/sl.json @@ -0,0 +1,9 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Omogoči", + "ActionInstall": "Namesti", + "PluginKeywords": "Ključne Besede", + "PluginVersionInfo": "%1$s from %2$s", + "SubscriptionType": "Tip" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/sq.json b/plugins/Marketplace/lang/sq.json new file mode 100644 index 0000000000..cb1efb6021 --- /dev/null +++ b/plugins/Marketplace/lang/sq.json @@ -0,0 +1,112 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Aktivizoje", + "ActionActivatePlugin": "Aktivizoje shtojcën", + "ActionActivateTheme": "Aktivizojeni temën", + "ActionInstall": "Instaloje", + "AddToCart": "Shtoje në shportë", + "AllowedUploadFormats": "Një shtojcë apo një temë mund ta ngarkoni në formatin .zip përmes kësaj faqeje.", + "Authors": "Autorë", + "BackToMarketplace": "Mbrapsht te Marketplace", + "BrowseMarketplace": "Shfletoni në Marketplace", + "ByXDevelopers": "nga zhvilluesit %s", + "CannotInstall": "S’instalohet dot", + "CannotUpdate": "S’përditësohet dot", + "ClickToCompletePurchase": "Klikoni që të plotësoni blerjen.", + "CurrentNumPiwikUsers": "Piwik-u juaj hëpërhë ka %1$s përdorues të regjistruar.", + "ConfirmRemoveLicense": "Jeni i sigurt se doni të hiqe kyçi juaj i licencës? Nuk do të merrni më përditësime për cilëndo nga shtojcat që keni blerë.", + "Developer": "Zhvillues", + "DevelopersLearnHowToDevelopPlugins": "Zhvillues: Mësoni se si ta thelloni dhe përshtatni Piwik-un përmes %1$shartimit të shtojcave ose temave%2$s.", + "Marketplace": "Marketplace", + "PaidPlugins": "Veçori Me Pagesë", + "FeaturedPlugin": "Shtojcë e zgjedhur", + "InstallingNewPluginViaMarketplaceOrUpload": "%1$s mund ta instaloni vetvetiu prej Marketplace-it ose %2$stë ngarkoni një %3$s%4$s në formatin .zip.", + "InstallingPlugin": "Po instalohet %s", + "InstallPurchasedPlugins": "Instalo shtojcat e blera", + "LastCommitTime": "(parashtrimi i fundit %s)", + "LastUpdated": "Përditësuar Së Fundi Më", + "License": "Licencë", + "LicenseKey": "Kyç licence", + "LicenseKeyActivatedSuccess": "Kyçi i licencës u aktivizua me sukses!", + "LicenseKeyDeletedSuccess": "Kyçi i licencës u çaktivizua me sukses.", + "Exceeded": "E tejkaluar", + "LicenseMissing": "Mungon licenca", + "LicenseMissingDescription": "Po i përdorni shtojcat vijuese pa një licencë: %1$s. %2$sQë ta zgjidhni këtë problem, ose përditësoni kyçin tuaj të licencës, %3$smerrni një pajtim tani%4$s ose çaktivizojeni shtojcën.", + "PluginLicenseMissingDescription": "Nuk keni leje ta shkarkoni këtë shtojcë, ngaqë për të s’ka licencë. Që ta zgjidhni këtë problem, ose përditësoni kyçin tuaj të licencës, merrni një kyç të ri ose çinstalojeni shtojcën.", + "LicenseExceeded": "Licencë e tejkaluar", + "LicenseExceededDescription": "Licencat për shtojcat vijuese s’janë më të vlefshme, ngaqë është tejkaluar numri i përdoruesve të autorizuar për licencë: %1$s. %2$sS’do të jeni në gjendje të shkarkoni përditësime për këto shtojca. Që ta zgjidhni këtë problem, ose fshini disa nga përdoruesit ose %3$spërmirësojeni pajtimin tani%4$s.", + "PluginLicenseExceededDescription": "S’keni leje ta shkarkoni këtë shtojcë. Licenca për këtë shtojcë s’është më e vlefshme, ngaqë është tejkaluar numri i përdoruesve të autorizuar për licencë. Që ta zgjidhni këtë problem, ose fshini disa nga përdoruesit, ose përmirësojeni pajtimin tuaj tani.", + "LicenseExpired": "Licenca ka skaduar", + "LicenseExpiredDescription": "Licencat për shtojcat vijuese kanë skaduar: %1$s. %2$sS’do të merrni më përditësime për këto shtojca. Që ta zgjidhni këtë problem, %3$srinovojeni pajtimin tuaj tani%4$s, ose çaktivizojeni shtojcën, nëse nuk e përdorni më.", + "LicenseRenewsNextPaymentDate": "Rinovohet datën e pagesës së ardhshme", + "UpgradeSubscription": "Përmirësoje Pajtimin", + "ViewSubscriptionsSummary": "%1$sShihni pajtimet tuaja për shtojca.%2$s", + "ViewSubscriptions": "Shihni pajtime", + "ExceptionLinceseKeyIsExpired": "Ky kyç licence ka skaduar.", + "ExceptionLinceseKeyIsNotValid": "Ky kyç licence s’është i vlefshëm.", + "LicenseKeyIsValidShort": "Kyçi i licencës është i vlefshëm!", + "RemoveLicenseKey": "Hiqe kyçin e licencës", + "InstallAllPurchasedPlugins": "Instaloji krejt shtojcat e blera njëherazi", + "InstallAllPurchasedPluginsAction": "Instalo dhe aktivizo %d shtojcat e blera", + "InstallThesePlugins": "Kjo do të instalojë dhe aktivizojë shtojcat vijuese:", + "AllPaidPluginsInstalledAndActivated": "Krejt shtojcat e paguara u instaluan dhe aktivizuan me sukses.", + "OnlySomePaidPluginsInstalledAndActivated": "Disa shtojca të paguara s’u instaluan dot me sukses.", + "NewVersion": "version i ri", + "NotAllowedToBrowseMarketplacePlugins": "Mund të shfletoni listën e shtojcave që mund të instalohen për përshtatjen ose zgjerimin e platformës tuaj Piwik. Ju lutemi, lidhuni me përgjegjësin e instalimit tuaj, nëse keni nevojë të instalohet ndonjë prej këtyre.", + "NotAllowedToBrowseMarketplaceThemes": "Mund të shfletoni listën e temave që mund të instalohen për përshtatjen e pamjes së platformës tuaj Piwik. Ju lutemi, lidhuni me përgjegjësin e instalimit tuaj, nëse keni nevojë të instalohet ndonjë prej këtyre.", + "NoPluginsFound": "S’u gjetën shtojca", + "NoThemesFound": "S’u gjetën tema", + "NoSubscriptionsFound": "S’u gjetën pajtime", + "NumDownloadsLatestVersion": "Versioni më i ri: %s Shkarkime", + "OverviewPluginSubscriptions": "Përmbledhje e pajtimeve tuaja në shtojca", + "OverviewPluginSubscriptionsMissingLicense": "S’keni caktuar ndonjë kyç licence. Nëse keni blerë një pajtim shtojce, shkoni te %1$sMarketplace%2$s dhe jepni kyçin tuaj të licencës.", + "OverviewPluginSubscriptionsAllDetails": "Që të shihni krejt hollësitë, ose të ndryshoni një pajtim, hyni te llogaria juaj.", + "OverviewPluginSubscriptionsMissingInfo": "Mundet që mungon një pajtim, për shembull, nëse s’është përfunduar ende një pagesë. Në një rast të tillë riprovoni pas pak orësh, ose lidhuni me ekipin e Piwik-ut.", + "NoValidSubscriptionNoUpdates": "Pasi të ketë skaduar një pajtim, s’do të jeni më në gjendje të merrni përditësime për këtë shtojcë.", + "PluginSubscriptionsList": "Kjo është një listë pajtimesh përshoqëruar kyçit tuaj të licencës.", + "PaidPluginsNoLicenseKeyIntro": "Nëse keni blerë një %1$sshtojcë nga ato me pagesë%2$s, ju lutemi, futni më poshtë kyçin e licencës që morët.", + "PaidPluginsWithLicenseKeyIntro": "Është rregulluar një kyç i vlefshëm licence. Për arsye sigurie kyçin e licencës nuk e shfaqim këtu. Nëse keni humbur kyçin tuaj të licencës, ju lutemi, lidhuni me ekipin e Piwik-ut.", + "PaidPluginsNoLicenseKeyIntroNoSuperUserAccess": "Nëse keni blerë një %1$sshtojcë nga ato me pagesë%2$s në Marketplace, ju lutemi, kërkojini një përdoruesi me të drejta Superpërdoruesi të shtojë kyçin e licencës.", + "PluginDescription": "Thelloni dhe zgjeroni funksionimin e Piwik-ut, përmesMarketplace-it, duke shkarkuar prej andej shtojca dhe tema grafike.", + "PluginKeywords": "Fjalëkyçe", + "PluginUpdateAvailable": "Po përdorni versionin %1$s dhe ka gati një version të ri %2$s.", + "PluginVersionInfo": "%1$s nga %2$s", + "PluginWebsite": "Sajt i Shtojcës", + "PriceExclTax": "%1$s %2$s pa taksat.", + "PriceFromPerPeriod": "Nga %1$s \/ %2$s", + "Reviews": "Shqyrtime", + "ShownPriceIsExclTax": "Çmimi i treguar është pa taksat.", + "Screenshots": "Foto ekrani", + "SortByNewest": "Më të Rejat", + "SortByAlpha": "Alfa", + "SortByLastUpdated": "Përditësuar së fundi", + "SortByPopular": "Popullore", + "StepDownloadingPluginFromMarketplace": "Po shkarkohet shtojca që nga Marketplace-i", + "StepDownloadingThemeFromMarketplace": "Po shkarkohet tema që nga Marketplace-i", + "StepUnzippingPlugin": "Po shpaketohet shtojca", + "StepUnzippingTheme": "Po shpaketohet tema", + "StepThemeSuccessfullyInstalled": "E instaluat me sukses temën %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "E instaluat me sukses shtojcën %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "E përditësuat me sukses shtojcën %1$s %2$s.", + "StepReplaceExistingPlugin": "Po zëvendësohet shtojca ekzistuese", + "StepReplaceExistingTheme": "Po zëvendësohet tema ekzistuese", + "StepThemeSuccessfullyUpdated": "E përditësuat me sukses temën %1$s %2$s.", + "SubscriptionType": "Lloj", + "SubscriptionStartDate": "Datë fillimi", + "SubscriptionEndDate": "Datë mbarimi", + "SubscriptionNextPaymentDate": "Datë e pagesës pasuese", + "SubscriptionInvalid": "Ky pajtim është i pavlefshëm ose ka skaduar", + "SubscriptionExpiresSoon": "Ky pajtim skadon së shpejti", + "Support": "Asistencë", + "TeaserExtendPiwikByUpload": "Zgjerojeni Piwik-un përmes ngarkimit të një kartele ZIP", + "LicenseExceededPossibleCause": "Licenca është tejkaluar. Në këtë instalim Piwik-u ka gjasa të ketë më shumë përdorues se sa autorizon pajtimi.", + "Updated": "U përditësua", + "UpdatingPlugin": "Po përditësohet %1$s", + "UploadZipFile": "Ngarkoni kartelë ZIP", + "LicenseKeyExpiresSoon": "Kyçi juaj i licencës skadon së shpejti, ju lutemi, lidhuni me %1$s.", + "LicenseKeyIsExpired": "Kyçi juaj i licencës ka skaduar, Ju lutemi, lidhuni me %1$s.", + "MultiServerEnvironmentWarning": "S’mundeni ta instaloni apo përditësoni shtojcën drejtpërsëdrejti, ngaqë po përdorni Piwik-un në disa shërbyes. Shtojca do të duhej të instalohej vetëm në një shërbyes. Në vend të kësaj, shkarkojeni shtojcën dhe instalojeni dorazi te krejt shërbyesit tuaj.", + "AutoUpdateDisabledWarning": "S’mundeni ta instaloni ose përditësoni shtojcën drejtpërsëdrejti, ngaqë përditësimet e vetvetishme janë çaktivizuar te formësimi. Që të aktivizoni përditësimet e vetvetishme vëreni %1$s si %2$s.", + "ViewRepositoryChangelog": "Shihni ndryshimet" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/sr.json b/plugins/Marketplace/lang/sr.json new file mode 100644 index 0000000000..3f3343e3a5 --- /dev/null +++ b/plugins/Marketplace/lang/sr.json @@ -0,0 +1,49 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Aktivirati", + "ActionActivatePlugin": "Aktivacija dodatka", + "ActionActivateTheme": "Aktivacija teme", + "ActionInstall": "Instalacija", + "AllowedUploadFormats": "Preko ove stranice možete da postavite dodatak ili temu u .zip formatu.", + "Authors": "Autori", + "BackToMarketplace": "Natrag na Market", + "ByXDevelopers": "%s razvojnom timu", + "Developer": "Programer", + "DevelopersLearnHowToDevelopPlugins": "Programeri: saznajte kako da proširite i prilagodite Piwik %1$spravljenjem dodataka i tema%2$s.", + "Marketplace": "Market", + "FeaturedPlugin": "Istaknuti dodatak", + "InstallingPlugin": "Instaliranje %s", + "LastCommitTime": "(poslednja promena %s)", + "LastUpdated": "Poslednje ažuriranje", + "NewVersion": "nova verzija", + "NotAllowedToBrowseMarketplacePlugins": "Možete da pretražujete spisak dodataka koje je moguće instalirati kako biste podesili ili proširili vašu Piwik platformu. Kontaktirajte vašeg administratora ukoliko želite neki od njih da vidite instaliran.", + "NotAllowedToBrowseMarketplaceThemes": "Možete da pretražujete listu tema koje mogu biti instalirane kako biste podesili izgled vaše Piwik platforme. Kontaktirajte vašeg administratora ako želite da neku od njih vidite instaliranu.", + "NoPluginsFound": "Nije nađen nijedan dodatak", + "NoThemesFound": "Nije nađena nijedna tema", + "NumDownloadsLatestVersion": "Poslednja verzija: %s preuzimanja", + "PluginKeywords": "Ključne reči", + "PluginUpdateAvailable": "Koristite verziju %1$s a novija verzija %2$s je na raspolaganju.", + "PluginVersionInfo": "%1$s sa %2$s", + "PluginWebsite": "Sajt sa dodacima", + "Screenshots": "Snimci ekrana", + "SortByNewest": "Najnoviji", + "SortByAlpha": "Alfa", + "SortByPopular": "Popularni", + "StepDownloadingPluginFromMarketplace": "Preuzmi dodatak sa Marketa", + "StepDownloadingThemeFromMarketplace": "Preuzmi temu sa Marketa", + "StepUnzippingPlugin": "Raspakivanje dodatka", + "StepUnzippingTheme": "Raspakivanje teme", + "StepThemeSuccessfullyInstalled": "Uspešno ste instalirali temu %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Uspešno ste instalirali dodatak %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Uspešno ste ažurirali dodatak %1$s %2$s.", + "StepReplaceExistingPlugin": "Zamena postojećeg dodatka", + "StepReplaceExistingTheme": "Zamena postojeće teme", + "StepThemeSuccessfullyUpdated": "Uspešno ste ažurirali temu %1$s %2$s.", + "SubscriptionType": "Tip", + "Support": "Podrška", + "TeaserExtendPiwikByUpload": "Proširite Piwik postavljanjem ZIP datoteke", + "Updated": "Ažurirano", + "UploadZipFile": "Postavljanje ZIP datoteke", + "ViewRepositoryChangelog": "Prikaži promene" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/sv.json b/plugins/Marketplace/lang/sv.json new file mode 100644 index 0000000000..214b05e609 --- /dev/null +++ b/plugins/Marketplace/lang/sv.json @@ -0,0 +1,46 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Aktivera", + "ActionActivatePlugin": "Aktivera plugin", + "ActionActivateTheme": "Aktivt tema", + "ActionInstall": "Installera", + "AllowedUploadFormats": "På den här sidan kan du ladda upp ett plugin eller ett tema via .zipformat.", + "Authors": "Upphovsman", + "BackToMarketplace": "Tillbaka till butiken", + "ByXDevelopers": "av %s utvecklare", + "Developer": "Utvecklare", + "DevelopersLearnHowToDevelopPlugins": "Utvecklare: Lär känna hur du kan bredda eller anpassa Piwik geonom %1$sutveckling av plugin eller teman%2$s", + "Marketplace": "Butik", + "FeaturedPlugin": "Utvalda plugin", + "InstallingPlugin": "Installera %s", + "LastCommitTime": "(senaste överföringen %s)", + "LastUpdated": "Senast uppdaterad", + "NewVersion": "ny version", + "NotAllowedToBrowseMarketplacePlugins": "Du kan titta igenom listan med plugin som kan installeras för att skräddarsy eller utöka din Piwik plattform. Var vänlig och kontakta din administratör om du vill installera något av de plugin du hittar.", + "NotAllowedToBrowseMarketplaceThemes": "Du kan leta i listan efter teman som kan installeras för att skräddarsy din Piwik plattform. Kontakta din administratör så kan denne installera temat åt dig.", + "NoPluginsFound": "Inga plugin hittade", + "NoThemesFound": "Inga teman kunde hittas", + "NumDownloadsLatestVersion": "Sista versionen: %s Nedladdningar", + "PluginKeywords": "Nyckelord", + "PluginUpdateAvailable": "Du använder version %1$s och en ny version %2$s finns tillgänglig.", + "PluginVersionInfo": "%1$s från %2$s", + "PluginWebsite": "Plugin sida", + "Screenshots": "Skärmdumpar", + "StepDownloadingPluginFromMarketplace": "Ladda ner plugin från Butiken.", + "StepDownloadingThemeFromMarketplace": "Ladda ner tema från Butiken", + "StepUnzippingPlugin": "Packar upp tilläggsprogrammet", + "StepUnzippingTheme": "Packar upp temat", + "StepThemeSuccessfullyInstalled": "Du har nu installerat följande tema %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Du har nu installerat plugin %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Du har nu uppdaterat pluginen %1$s %2$s.", + "StepReplaceExistingPlugin": "Ersätter nuvarande plugin", + "StepReplaceExistingTheme": "Ersätt nuvarande tema", + "StepThemeSuccessfullyUpdated": "Du har nu uppdaterat tema %1$s %2$s.", + "SubscriptionType": "Typ", + "Support": "Support", + "TeaserExtendPiwikByUpload": "Utöka Piwik genom att ladda upp en ZIP fil", + "Updated": "Uppdaterad", + "UploadZipFile": "Uppladdad ZIP file", + "ViewRepositoryChangelog": "Se ändringar" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/ta.json b/plugins/Marketplace/lang/ta.json new file mode 100644 index 0000000000..02431b885c --- /dev/null +++ b/plugins/Marketplace/lang/ta.json @@ -0,0 +1,5 @@ +{ + "Marketplace": { + "SubscriptionType": "வகை" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/te.json b/plugins/Marketplace/lang/te.json new file mode 100644 index 0000000000..1e824bb1c3 --- /dev/null +++ b/plugins/Marketplace/lang/te.json @@ -0,0 +1,7 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "చేతనించు", + "PluginKeywords": "కీపదాలు", + "SubscriptionType": "రకం" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/th.json b/plugins/Marketplace/lang/th.json new file mode 100644 index 0000000000..9dedf4ab93 --- /dev/null +++ b/plugins/Marketplace/lang/th.json @@ -0,0 +1,7 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "เปิดใช้งาน", + "PluginKeywords": "คีย์เวิร์ด", + "SubscriptionType": "รูปแบบ" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/tl.json b/plugins/Marketplace/lang/tl.json new file mode 100644 index 0000000000..cc0cfcb983 --- /dev/null +++ b/plugins/Marketplace/lang/tl.json @@ -0,0 +1,44 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "I-activate", + "ActionActivatePlugin": "I-activate ang plugin", + "ActionActivateTheme": "I-activate ang theme", + "ActionInstall": "I-install", + "AllowedUploadFormats": "Maaari kang mag-upload ng plugin o theme sa .zip format sa pamamagitan ng pahinang ito.", + "Authors": "Mga Gumawa", + "BackToMarketplace": "Bumalik sa Marketplace", + "ByXDevelopers": "sa %s mga nagdevelop", + "Developer": "Nagdevelop", + "Marketplace": "Marketplace", + "FeaturedPlugin": "Feature na plugin", + "InstallingPlugin": "Nag-iinstall %s", + "LastCommitTime": "(huling gumawa ng %s)", + "LastUpdated": "Huling In-update", + "NotAllowedToBrowseMarketplacePlugins": "Maaari mong i-browse ang listahan ng mga plugin na maaaring i-install upang i-customize o palawakin ang iyong Piwik platform. Mangyaring makipag-ugnayan sa iyong administrator kung kailangan mo ng alinman sa mga naka-install.", + "NotAllowedToBrowseMarketplaceThemes": "Maaari mong i-browse ang listahan ng mga theme na maaaring i-install upang i-customize ang hitsura ng Piwik platform. Mangyaring makipag-ugnayan sa iyong administrator upang makakuha ng alinman sa mga naka-install para sa iyo.", + "NoPluginsFound": "Walang nakitang mga plugin", + "NoThemesFound": "Walang nakitang mga theme", + "NumDownloadsLatestVersion": "Pinakabagong bersyon: %s na mga download", + "PluginKeywords": "Mga Keyword", + "PluginUpdateAvailable": "Iyong ginagamit ang bersyon %1$s at ang pinaka bagong bersyon %2$s ay available.", + "PluginVersionInfo": "%1$s mula %2$s", + "PluginWebsite": "Plugin Website", + "Screenshots": "Screenshots", + "StepDownloadingPluginFromMarketplace": "Dina-download ang plugin mula sa Marketplace", + "StepDownloadingThemeFromMarketplace": "Dina-download ang theme mula sa Marketplace", + "StepUnzippingPlugin": "Unzipping plugin", + "StepUnzippingTheme": "Unzipping theme", + "StepThemeSuccessfullyInstalled": "Matagumpay mong na-install ang theme %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Matagumpay mong na-install ang plugin ng %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Matagumpay mong na-update ang plugin ng %1$s %2$s.", + "StepReplaceExistingPlugin": "Pagpapalit ng umiiral na plugin", + "StepReplaceExistingTheme": "Pagpapalit ng umiiral na theme", + "StepThemeSuccessfullyUpdated": "Matagumpay mong na-update ang theme %1$s %2$s.", + "SubscriptionType": "Uri", + "Support": "Suporta", + "TeaserExtendPiwikByUpload": "Palawakin ang Piwik sa pamamagitan ng pag-upload ng ZIP File", + "Updated": "Updated", + "UploadZipFile": "Mag upload ng zip file", + "ViewRepositoryChangelog": "Tignan ang mga pagbabago" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/tr.json b/plugins/Marketplace/lang/tr.json new file mode 100644 index 0000000000..a3380fd335 --- /dev/null +++ b/plugins/Marketplace/lang/tr.json @@ -0,0 +1,36 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Aktive et", + "ActionActivatePlugin": "Eklentiyi etkinleştir", + "ActionActivateTheme": "Temayı aktif et", + "ActionInstall": "Kur", + "AllowedUploadFormats": "Bu sayfa üzerinden .zip formatında bir eklenti veya tema yükleyebilirsiniz.", + "Authors": "Yazarlar", + "BackToMarketplace": "Markete geri dön", + "ByXDevelopers": "şu geliştiriciler tarafından %s", + "Developer": "Geliştirici", + "Marketplace": "Pazaryeri", + "InstallingPlugin": "Kuruluyor %s", + "LastCommitTime": "(son işlem %s)", + "LastUpdated": "Son Güncelleme", + "NoPluginsFound": "Eklenti bulunamadı", + "NoThemesFound": "Tema bulunamadı", + "NumDownloadsLatestVersion": "Son versiyon: %s İndir", + "PluginKeywords": "Anahtar Kelimeler", + "PluginUpdateAvailable": "Şuanda %1$s versiyonunu kullanıyorsunuz ve yeni %2$s versiyon mevcut.", + "PluginVersionInfo": "%2$s den %1$s e", + "PluginWebsite": "Eklenti Sitesi", + "Screenshots": "Ekran Görüntüleri", + "StepDownloadingPluginFromMarketplace": "Pazaryerinden eklenti indirin", + "StepDownloadingThemeFromMarketplace": "Pazaryerinden tema indirin", + "StepUnzippingPlugin": "Eklenti çıkarılıyor", + "StepUnzippingTheme": "Tema çıkarılıyor", + "StepReplaceExistingTheme": "Mevcut temayla yer değiştir", + "StepThemeSuccessfullyUpdated": "Temanızı başarılı bir şekilde güncellediniz %1$s %2$s.", + "SubscriptionType": "Tür", + "Support": "Destek", + "Updated": "Güncellendi", + "UploadZipFile": "ZIP dosyası yükle", + "ViewRepositoryChangelog": "Değişikliklere bak" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/uk.json b/plugins/Marketplace/lang/uk.json new file mode 100644 index 0000000000..af593a7b8d --- /dev/null +++ b/plugins/Marketplace/lang/uk.json @@ -0,0 +1,112 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Активувати", + "ActionActivatePlugin": "Активувати плагін", + "ActionActivateTheme": "Активувати тему", + "ActionInstall": "Встановити", + "AddToCart": "Додати в кошик", + "AllowedUploadFormats": "Ви можете завантажити плагін або тему у форматі .zip на цій сторінці.", + "Authors": "Автори", + "BackToMarketplace": "Повернутися до Маркету", + "BrowseMarketplace": "Перегляд Маркету", + "ByXDevelopers": "розробниками %s", + "CannotInstall": "Неможливо встановити", + "CannotUpdate": "Неможливо оновити", + "ClickToCompletePurchase": "Натисніть для завершення покупки.", + "CurrentNumPiwikUsers": "Ваш Piwik в даний час має %1$s зареєстрованих користувачів.", + "ConfirmRemoveLicense": "Ви впевнені, що хочете видалити ліцензійний ключ? Ви більше не будете отримувати оновлення для будь-якого з ваших придбаних плагінів.", + "Developer": "Розробник", + "DevelopersLearnHowToDevelopPlugins": "Розробникам: Вивчіть, як ви можете розширити та персоналізувати Piwik за допомогою плагінів для %1$sрозробки або тем%2$s.", + "Marketplace": "Маркет", + "PaidPlugins": "Преміум-функції", + "FeaturedPlugin": "Плагін що набирає популярність", + "InstallingNewPluginViaMarketplaceOrUpload": "Ви можете автоматично встановити %1$s від Маркету або %2$sзавантажте %3$s%4$s в .zip форматі.", + "InstallingPlugin": "Встановлення %s", + "InstallPurchasedPlugins": "Встановити куплені плагіни", + "LastCommitTime": "(останній комміт %s)", + "LastUpdated": "Останнє оновлення", + "License": "Ліцензія", + "LicenseKey": "Ліцензійний ключ", + "LicenseKeyActivatedSuccess": "Ліцензійний ключ успішно активований!", + "LicenseKeyDeletedSuccess": "Ліцензійний ключ успішно видалений.", + "Exceeded": "Перевищено", + "LicenseMissing": "Ліцензія відсутня", + "LicenseMissingDescription": "Ви використовуєте наступні плагіни без ліцензії: %1$s. %2$sЩоб усунути цю проблему, або оновити ліцензійний ключ, %3$sотримайте підписку прямо зараз%4$s або відключіть плагін.", + "PluginLicenseMissingDescription": "Ви не можете завантажити цей плагін, тому що немає ніякої ліцензії для цього плагіна. Щоб усунути цю проблему, або оновіть ліцензійний ключ, отримавши підписку або видаліть плагін.", + "LicenseExceeded": "Ліцензія перевищена", + "LicenseExceededDescription": "Немає ліцензії для наступних плагінів, і вони більше не дійсні, оскільки кількість авторизованих користувачів для ліцензії перевищено: %1$s. %2$sВи не зможете завантажувати оновлення для цих плагінів. Щоб усунути цю проблему, або видаліть деяких користувачів або %3$sоновіть підписку прямо зараз%4$s.", + "PluginLicenseExceededDescription": "Ви не можете завантажити цей плагін .Ліцензія на цей плагін вже не діє, як і число авторизованих користувачів на отримання ліцензії. Щоб усунути цю проблему, або видаліть деяких користувачів або оновіть підписку прямо зараз.", + "LicenseExpired": "Термін дії ліцензії закінчився", + "LicenseExpiredDescription": "Ліцензії на наступні плагіни закінчилася: %1$s. %2$sВи більше не будете отримувати оновлення для цих плагінів. Щоб усунути цю проблему, або %3$sпродовжіть передплату прямо зараз%4$s, або відключіть плагін, якщо ви більше не використовуватиме його.", + "LicenseRenewsNextPaymentDate": "Відновлює на наступну дату платежу", + "UpgradeSubscription": "Оновлення підписки", + "ViewSubscriptionsSummary": "%1$sПерегляд плагінів з підпискою.%2$s", + "ViewSubscriptions": "Перегляд підписки", + "ExceptionLinceseKeyIsExpired": "Цей ключ ліцензії закінчився.", + "ExceptionLinceseKeyIsNotValid": "Цей ліцензійний ключ не є дійсним.", + "LicenseKeyIsValidShort": "Ліцензійний ключ дійсний!", + "RemoveLicenseKey": "Видалити ліцензійний ключ", + "InstallAllPurchasedPlugins": "Встановити всі куплені плагіни відразу", + "InstallAllPurchasedPluginsAction": "Установка і активація %d придбаних плагінів", + "InstallThesePlugins": "Це дозволить встановити і активувати такі плагіни", + "AllPaidPluginsInstalledAndActivated": "Усі платні плагіни були успішно встановлені і активовані.", + "OnlySomePaidPluginsInstalledAndActivated": "Деякі платні плагіни були успішно встановлені.", + "NewVersion": "нова версія", + "NotAllowedToBrowseMarketplacePlugins": "Можете подивитися список плагінів, які можуть бути встановлені для підстроювання або розширення вашої платформи Piwik. Зв'яжіться з адміністратором якщо вам буде потрібно встановити один з них.", + "NotAllowedToBrowseMarketplaceThemes": "Ви можете подивитися список тем, які можуть бути встановлені для налаштування зовнішнього вигляду платформи Piwik. Будь ласка, зв'яжіть з вашим адміністратором, щоб встановити будь-яку з них.", + "NoPluginsFound": "Плагіни не знайдені", + "NoThemesFound": "Теми не знайдені", + "NoSubscriptionsFound": "Підписок не знайдено", + "NumDownloadsLatestVersion": "Остання версія завантажена: %s разів", + "OverviewPluginSubscriptions": "Огляд ваших плагінів з підпискою", + "OverviewPluginSubscriptionsMissingLicense": "У вас немає ліцензійного ключа. Якщо ви придбали підписку на плагін, перейдіть до %1$sМаркету%2$s і введіть ліцензійний ключ.", + "OverviewPluginSubscriptionsAllDetails": "Для того щоб побачити всі деталі, або змінити підписку, необхідно увійти в свій аккаунт.", + "OverviewPluginSubscriptionsMissingInfo": "Можливо не вистачає підписки, наприклад, якщо платіж ще не завершився. У такому випадку спробуйте ще раз через кілька годин, або зв'яжіться з командою Piwik.", + "NoValidSubscriptionNoUpdates": "Після закінчення підписки ви більше не будете отримувати оновлення для цього плагіна.", + "PluginSubscriptionsList": "Це список користувачів, пов'язаних з вашим ліцензійним ключем.", + "PaidPluginsNoLicenseKeyIntro": "Якщо ви придбали %1$sсплатний преміум плагін%2$s, будь ласка, введіть отриманий ліцензійний ключ нижче.", + "PaidPluginsWithLicenseKeyIntro": "Ліцензійний ключ був створений. З міркувань безпеки ми не показуємо ліцензійний ключ тут. Якщо ви втратили свій ліцензійний ключ, будь ласка, зв'яжіться з командою Piwik.", + "PaidPluginsNoLicenseKeyIntroNoSuperUserAccess": "У разі, якщо Ви придбали %1$sплатний премум плагін%2$s в Маркеті, попросіть користувача з супер доступом, щоб він додав ліцензійний ключ.", + "PluginDescription": "Розширити і розширити функціональні можливості Piwik через Маркет шляхом завантаження плагінів і тем.", + "PluginKeywords": "Ключові слова", + "PluginUpdateAvailable": "Ви використовуєте версію %1$s остання доступна %2$s", + "PluginVersionInfo": "%1$s – %2$s", + "PluginWebsite": "Сайт плагіну", + "PriceExclTax": "%1$s %2$s включаючи податок.", + "PriceFromPerPeriod": "З %1$s \/ %2$s", + "Reviews": "Відгуки", + "ShownPriceIsExclTax": "Показана ціна з податком.", + "Screenshots": "Скріншоти", + "SortByNewest": "Нові", + "SortByAlpha": "Альфа", + "SortByLastUpdated": "Останнє оновлення", + "SortByPopular": "Популярні", + "StepDownloadingPluginFromMarketplace": "Завантажити плагін з Маркету", + "StepDownloadingThemeFromMarketplace": "Завантажити тему з Маркету", + "StepUnzippingPlugin": "Розпакування плагіна", + "StepUnzippingTheme": "Розпакування теми", + "StepThemeSuccessfullyInstalled": "Ви успішно встановили тему %1$s %2$s.", + "StepPluginSuccessfullyInstalled": "Ви успішно встановили плагін %1$s %2$s.", + "StepPluginSuccessfullyUpdated": "Ви успішно оновили плагін %1$s %2$s.", + "StepReplaceExistingPlugin": "Заміна існуючого плагіна", + "StepReplaceExistingTheme": "Заміна існуючої теми", + "StepThemeSuccessfullyUpdated": "Ви успішно оновили тему %1$s %2$s.", + "SubscriptionType": "Тип", + "SubscriptionStartDate": "Дата початку", + "SubscriptionEndDate": "Дата закінчення", + "SubscriptionNextPaymentDate": "Наступна дата оплати", + "SubscriptionInvalid": "Ця підписка є недійсною або закінчилася", + "SubscriptionExpiresSoon": "Ця підписка закінчується найближчим часом", + "Support": "Підтримка", + "TeaserExtendPiwikByUpload": "Поліпшення Piwik закачуванням ZIP файла", + "LicenseExceededPossibleCause": "Ліцензію перевищено. Є, можливо, більше користувачів на цій установці Piwik, ніж дозволено підпискою.", + "Updated": "Оновлено", + "UpdatingPlugin": "Оновлення %1$s", + "UploadZipFile": "Завантажити ZIP файл", + "LicenseKeyExpiresSoon": "Ваш ключ ліцензії закінчується найближчим часом, будь ласка, зв'яжіться з %1$s.", + "LicenseKeyIsExpired": "Ваш ключ ліцензії закінчився, будь ласка, зв'яжіться з %1$s.", + "MultiServerEnvironmentWarning": "Ви не можете встановити або оновити плагін безпосередньо, якщо ви використовуєте Piwik на декількох серверах. Плагін буде встановлений тільки на одному сервері. Замість того, щоб завантажити плагін і встановити його вручну на всіх серверах.", + "AutoUpdateDisabledWarning": "Ви не можете встановити або оновити плагін безпосередньо в якості автоматичного оновлення відключеного в конфігурації. Для включення автоматичного оновлення встановлених %1$s в %2$s.", + "ViewRepositoryChangelog": "Подивитися зміни" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/vi.json b/plugins/Marketplace/lang/vi.json new file mode 100644 index 0000000000..5c5fb7ec6f --- /dev/null +++ b/plugins/Marketplace/lang/vi.json @@ -0,0 +1,25 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "Kích hoạt", + "ActionActivatePlugin": "Kích hoạt tiện ích", + "ActionActivateTheme": "Kích hoạt giao diện", + "ActionInstall": "Cài đặt", + "AllowedUploadFormats": "Bạn có thể tải tiện ích hoặc giao diện dưới định dạng .zip lên qua trang này", + "Authors": "Tác giả", + "BackToMarketplace": "Quay lại Chợ ứng dụng", + "Developer": "Người phát triển", + "Marketplace": "Chợ ứng dụng", + "InstallingPlugin": "Cài đặt %s", + "LastUpdated": "Lần cập nhật cuối", + "NoPluginsFound": "Tiện ích không tìm thấy", + "NoThemesFound": "Giao diện không tìm thấy", + "NumDownloadsLatestVersion": "Phiên bản mới nhất: %s lượt tải", + "PluginKeywords": "Từ khóa", + "PluginVersionInfo": "%1$s từ %2$s", + "StepDownloadingThemeFromMarketplace": "Tải giao diện từ Chợ ứng dụng", + "SubscriptionType": "Kiểu", + "Support": "Hỗ trợ", + "Updated": "Đã cập nhật", + "ViewRepositoryChangelog": "Xem các thay đổi" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/zh-cn.json b/plugins/Marketplace/lang/zh-cn.json new file mode 100644 index 0000000000..e66d3382c0 --- /dev/null +++ b/plugins/Marketplace/lang/zh-cn.json @@ -0,0 +1,46 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "启用", + "ActionActivatePlugin": "激活插件", + "ActionActivateTheme": "启用布景", + "ActionInstall": "安装", + "AllowedUploadFormats": "您可以通过该页面上传.zip格式的插件或主题。", + "Authors": "作者", + "BackToMarketplace": "返回商城", + "ByXDevelopers": "开发者： %s", + "Developer": "程序员", + "DevelopersLearnHowToDevelopPlugins": "开发者：你可以学习如何扩展和定制 Piwik%1$s开发插件或主题%2$s。", + "Marketplace": "商城", + "FeaturedPlugin": "特色插件", + "InstallingPlugin": "正在安装 %s", + "LastCommitTime": "(最后提交 %s)", + "LastUpdated": "最后更新", + "NewVersion": "新版本", + "NotAllowedToBrowseMarketplacePlugins": "您可以浏览，可以安装定制或扩展您的Piwik平台插件列表。如果你有需要请联系您的管理员。", + "NotAllowedToBrowseMarketplaceThemes": "就可以浏览可以安装定制Piwik平台的外观的主题列表。如果你有需要请联系您的管理员。", + "NoPluginsFound": "没有插件", + "NoThemesFound": "没有布景", + "NumDownloadsLatestVersion": "最新版本: %s次下载", + "PluginKeywords": "关键词", + "PluginUpdateAvailable": "您正在使用的版本号为 %1$s，现在有最新的版本%2$s。", + "PluginVersionInfo": "%1$s 从 %2$s", + "PluginWebsite": "插件网站", + "Screenshots": "截屏", + "StepDownloadingPluginFromMarketplace": "正在从商城下载插件", + "StepDownloadingThemeFromMarketplace": "正在从商城下载布景", + "StepUnzippingPlugin": "正在解压插件", + "StepUnzippingTheme": "正在解压布景", + "StepThemeSuccessfullyInstalled": "成功安装布景 %1$s %2$s。", + "StepPluginSuccessfullyInstalled": "成功安装插件 %1$s %2$s。", + "StepPluginSuccessfullyUpdated": "成功更新插件 %1$s %2$s。", + "StepReplaceExistingPlugin": "正在更新现有插件", + "StepReplaceExistingTheme": "正在更新现有布景", + "StepThemeSuccessfullyUpdated": "成功更新布景 %1$s %2$s。", + "SubscriptionType": "类型", + "Support": "支持", + "TeaserExtendPiwikByUpload": "上传一个ZIP文件来扩展Piwik。", + "Updated": "已更新", + "UploadZipFile": "上传 ZIP 文件", + "ViewRepositoryChangelog": "查看修改" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/lang/zh-tw.json b/plugins/Marketplace/lang/zh-tw.json new file mode 100644 index 0000000000..8fffe1a052 --- /dev/null +++ b/plugins/Marketplace/lang/zh-tw.json @@ -0,0 +1,6 @@ +{ + "Marketplace": { + "ActivateLicenseKey": "啟用", + "PluginKeywords": "關鍵字" + } +}
\ No newline at end of file diff --git a/plugins/Marketplace/templates/plugin-details.twig b/plugins/Marketplace/templates/plugin-details.twig index bed0a19d14..f2b2726a30 100644 --- a/plugins/Marketplace/templates/plugin-details.twig +++ b/plugins/Marketplace/templates/plugin-details.twig @@ -63,7 +63,7 @@ {% if isMultiServerEnvironment %} <div class="alert alert-warning">{{ 'Marketplace_MultiServerEnvironmentWarning'|translate }}</div> {% elseif not isAutoUpdateEnabled %} - <div class="alert alert-warning">{{ 'Marketplace_AutoUpdateDisabledWarning'|translate("'[General]enable_auto_updates=1'", "'config/config.ini.php'") }}</div> + <div class="alert alert-warning">{{ 'Marketplace_AutoUpdateDisabledWarning'|translate("'[General]enable_auto_update=1'", "'config/config.ini.php'") }}</div> {% endif %} {% endif %} diff --git a/plugins/MobileAppMeasurable/lang/ru.json b/plugins/MobileAppMeasurable/lang/ru.json index 30652510a8..459b4b7a79 100644 --- a/plugins/MobileAppMeasurable/lang/ru.json +++ b/plugins/MobileAppMeasurable/lang/ru.json @@ -1,5 +1,6 @@ { "MobileAppMeasurable": { - "MobileApp": "Мобильное приложение" + "MobileApp": "Мобильное приложение", + "MobileApps": "Мобильные приложения" } }
\ No newline at end of file diff --git a/plugins/Morpheus/stylesheets/ui/_components.less b/plugins/Morpheus/stylesheets/ui/_components.less index 9116ef17f0..675f4a87f6 100644 --- a/plugins/Morpheus/stylesheets/ui/_components.less +++ b/plugins/Morpheus/stylesheets/ui/_components.less @@ -77,7 +77,7 @@ color: @theme-color-text; font-weight: 600; margin: 0; - height: 30px; + height: 32px; } } } diff --git a/plugins/Morpheus/templates/javascriptCode.twig b/plugins/Morpheus/templates/javascriptCode.twig index da29f9b6b8..f54bbf1960 100644 --- a/plugins/Morpheus/templates/javascriptCode.twig +++ b/plugins/Morpheus/templates/javascriptCode.twig @@ -1,6 +1,7 @@ <!-- Piwik --> <script type="text/javascript"> var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" {$options} _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { @@ -14,5 +15,6 @@ </script> {% if not loadAsync %}<script type='text/javascript' src="{$protocol}{$piwikUrl}/piwik.js"></script> {% endif %} -<noscript><p><img src="{$protocol}{$piwikUrl}/piwik.php?idsite={$idSite}" style="border:0;" alt="" /></p></noscript> +{% if trackNoScript %}<noscript><p><img src="{$protocol}{$piwikUrl}/piwik.php?idsite={$idSite}&rec=1" style="border:0;" alt="" /></p></noscript> +{% endif %} <!-- End Piwik Code --> diff --git a/plugins/MultiSites/lang/he.json b/plugins/MultiSites/lang/he.json new file mode 100644 index 0000000000..1a254fd4e2 --- /dev/null +++ b/plugins/MultiSites/lang/he.json @@ -0,0 +1,5 @@ +{ + "MultiSites": { + "Pagination": "%1$s - %2$s of %3$s" + } +}
\ No newline at end of file diff --git a/plugins/PrivacyManager/lang/de.json b/plugins/PrivacyManager/lang/de.json index ae7c2f0785..b9be6e79e0 100644 --- a/plugins/PrivacyManager/lang/de.json +++ b/plugins/PrivacyManager/lang/de.json @@ -5,6 +5,7 @@ "AnonymizeIpExtendedHelp": "Wenn Benutzer Ihre Website besuchen, wird Piwik nicht die komplette IP Adresse (so wie %1$s) benützen, sondern sie stattdessen zuerst anonymisieren (zu %2$s). Die Anonymisierung der IP Adresse ist in einigen Ländern eine gesetzliche Pflicht, zum Beispiel in Deutschland vorgegeben durch das Datenschutzrecht.", "AnonymizeIpMaskLengtDescription": "Wählen Sie aus, wieviele Bytes der Besucher-IP maskiert werden sollen.", "AnonymizeIpMaskLength": "%1$s byte(s) - z.B. %2$s", + "CannotLockSoDeleteLogActions": "Die log_action Tabelle wird nicht geleert: Bitte geben Sie dem MySQL Benutzer '%s' das LOCK TABLES Privileg.", "ClickHereSettings": "Hier klicken, um die %s Einstellungen zu bearbeiten.", "CurrentDBSize": "Aktuelle Größe der Datenbank", "DBPurged": "Datenbank bereinigt.", diff --git a/plugins/PrivacyManager/lang/it.json b/plugins/PrivacyManager/lang/it.json index 1182a1572f..c19768aed6 100644 --- a/plugins/PrivacyManager/lang/it.json +++ b/plugins/PrivacyManager/lang/it.json @@ -5,6 +5,7 @@ "AnonymizeIpExtendedHelp": "Quando gli utenti visitano il tuo sito web, Piwik non userà l'indirizzo IP completo (come %1$s) ma lo renderà prima anonimo (così: %2$s). Questo è uno dei requisiti definiti dalle leggi sulla privacy in alcuni paesi come la Germania.", "AnonymizeIpMaskLengtDescription": "Seleziona quanti byte degli indirizzi IP dei visitatori devono essere nascosti.", "AnonymizeIpMaskLength": "%1$s byte(s) - es. %2$s", + "CannotLockSoDeleteLogActions": "La tabella log_action non sarà svuotata: si prega di assicurare i privilegi LOCK TABLES all'utente MySQL '%s'.", "ClickHereSettings": "Accedi alle impostazioni %s.", "CurrentDBSize": "Dimensione corrente del database", "DBPurged": "DB ripulito.", diff --git a/plugins/ProfessionalServices/ProfessionalServices.php b/plugins/ProfessionalServices/ProfessionalServices.php index 442f29edfe..dab1c2af2d 100644 --- a/plugins/ProfessionalServices/ProfessionalServices.php +++ b/plugins/ProfessionalServices/ProfessionalServices.php @@ -13,14 +13,14 @@ use Piwik\Common; class ProfessionalServices extends \Piwik\Plugin { /** - * @see Piwik\Plugin::registerEvents + * @see \Piwik\Plugin::registerEvents */ public function registerEvents() { return array( 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles', 'Request.getRenamedModuleAndAction' => 'renameProfessionalServicesModule', - 'Template.afterGoalConversionOverviewReport' => 'getGoalOverviewPromo', + 'Template.afterGoalConversionOverviewReport' => array('function' => 'getGoalOverviewPromo', 'after' => true), 'Template.afterEventsReport' => 'getEventsPromo', ); } diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking -Subproject b179eb06839c038b549059660fc1b86533c8c97 +Subproject 0547d18cbfa6497ea082321aa7498191ecb3479 diff --git a/plugins/Referrers/lang/ru.json b/plugins/Referrers/lang/ru.json index bff83d1cf3..681f9977a2 100644 --- a/plugins/Referrers/lang/ru.json +++ b/plugins/Referrers/lang/ru.json @@ -20,6 +20,7 @@ "EvolutionDocumentationMoreInfo": "Больше информации о различных типах источников см. в документации по таблице %s.", "Keywords": "Ключевые слова", "KeywordsReportDocumentation": "Этот отчет показывает ключевые слова, которые посетители ващего сайта вводили в поисковике, прежде чем попасть на ваш сайт. %s Кликнув на конкретный ряд таблицы, вы увидите распределение ключевого слова по поисковым системам.", + "PluginDescription": "Отчёты по источникам: поисковые системы, ключевые слова, вебсайты, компании, социальные сети, прямые входы.", "Referrer": "Источник", "ReferrerName": "Имя источника", "Referrers": "Источники трафика", @@ -28,6 +29,7 @@ "SearchEngines": "Поисковые движки", "SearchEnginesDocumentation": "Посетитель перешел на ваш сайт с поисковой системы. %1$s Детальная информация в отчете %2$s.", "SearchEnginesReportDocumentation": "Этот отчет показывает, с каких поисковых систем пришли посетители. %s Кликнув на конкретный ряд таблицы, вы увидите, что посетитель искал в поисковой систем и что привело его на ваш сайт.", + "SocialFooterMessage": "Слева отчёт по веб-сайтам. Он фильтрует другие сайты, чтобы вы могли сравнить социальные сети как источники.", "Socials": "Социальные сети", "SocialsReportDocumentation": "Этот отчет показывает, какие социальные сети привели посетителей на ваш сайт.<br \/>Кликнув на конкретную строку таблицы, вы можете увидить, с каких именно страниц соц. сетей перешли эти посетители.", "SubmenuSearchEngines": "Поисковые системы и ключевые слова", diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php index 9e54c6baa6..c4ab3e20c0 100644 --- a/plugins/ScheduledReports/API.php +++ b/plugins/ScheduledReports/API.php @@ -15,6 +15,8 @@ use Piwik\Config; use Piwik\Container\StaticContainer; use Piwik\Date; use Piwik\Db; +use Piwik\Development; +use Piwik\Filesystem; use Piwik\Log; use Piwik\NoAccessException; use Piwik\Piwik; @@ -609,10 +611,9 @@ class API extends \Piwik\Plugin\API $now = Date::now()->getDatetime(); $this->getModel()->updateReport($report['idreport'], array('ts_last_sent' => $now)); - // If running from piwik.php with debug, do not delete the PDF after sending the email - $tracker = new Tracker(); - if (!$tracker->isDebugModeEnabled()) { + if (!Development::isEnabled()) { @chmod($outputFilename, 0600); + Filesystem::deleteFileIfExists($outputFilename); } } diff --git a/plugins/ScheduledReports/lang/ru.json b/plugins/ScheduledReports/lang/ru.json index 41d1577dc8..6ff8d2fe4a 100644 --- a/plugins/ScheduledReports/lang/ru.json +++ b/plugins/ScheduledReports/lang/ru.json @@ -1,5 +1,6 @@ { "ScheduledReports": { + "AggregateReportsFormat": "Настройки отображения", "AggregateReportsFormat_GraphsOnly": "Отображать только графики (без отчетных таблиц)", "AggregateReportsFormat_TablesAndGraphs": "Отображать таблицы и графики для всех отчетов", "AggregateReportsFormat_TablesOnly": "(по умолчанию) Отображать таблицы отчетов (графики только для ключевых показетелей)", @@ -25,6 +26,7 @@ "PleaseFindBelow": "Пожалуйста, ниже вашего %1$s отчет за %2$s.", "PluginDescription": "Создаёт пользовательские отчёты и планирует их отправку по почте ежедневно, еженедельно или ежемесячно для одного или нескольких людей. Поддерживает некоторые форматы отчётов (html, pdf, csv, изображения).", "ReportFormat": "Формат отчета", + "ReportHour": "Высылать отчёт в %s часов", "ReportIncludeNWebsites": "Отчет будет содержать основные показатели для всех сайтов, у которых было хотя бы одно посещение (всего сейчас доступно %s сайтов).", "ReportSent": "Отправить отчет", "ReportsIncluded": "Данные, включенные в отчет", diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo -Subproject 25f687ceb89664789b419e0bcbf48f8c7ca476a +Subproject 0863b58a1c357a1ba1089a45ca80cd62843e407 diff --git a/plugins/SegmentEditor/stylesheets/segmentation.less b/plugins/SegmentEditor/stylesheets/segmentation.less index 9b5dc195bc..a4e291ed46 100644 --- a/plugins/SegmentEditor/stylesheets/segmentation.less +++ b/plugins/SegmentEditor/stylesheets/segmentation.less @@ -531,6 +531,8 @@ div.scrollable { .segmentEditorPanel.expanded .add_new_segment { width: 100%; margin: 16px 0 8px 0; + height: auto; + min-height: 36px; } .segmentationContainer > ul.submenu > li { diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index a28093ed98..736cf1fc9c 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -95,12 +95,13 @@ class API extends \Piwik\Plugin\API * @param bool $customCampaignKeywordParam * @param bool $doNotTrack * @param bool $disableCookies + * @param bool $trackNoScript * @return string The Javascript tag ready to be included on the HTML pages */ public function getJavascriptTag($idSite, $piwikUrl = '', $mergeSubdomains = false, $groupPageTitlesByDomain = false, $mergeAliasUrls = false, $visitorCustomVariables = false, $pageCustomVariables = false, $customCampaignNameQueryParam = false, $customCampaignKeywordParam = false, - $doNotTrack = false, $disableCookies = false) + $doNotTrack = false, $disableCookies = false, $trackNoScript = false) { Piwik::checkUserHasViewAccess($idSite); @@ -120,7 +121,7 @@ class API extends \Piwik\Plugin\API $code = $generator->generate($idSite, $piwikUrl, $mergeSubdomains, $groupPageTitlesByDomain, $mergeAliasUrls, $visitorCustomVariables, $pageCustomVariables, $customCampaignNameQueryParam, $customCampaignKeywordParam, - $doNotTrack, $disableCookies); + $doNotTrack, $disableCookies, $trackNoScript); $code = str_replace(array('<br>', '<br />', '<br/>'), '', $code); return $code; } diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json index 21b4e2cb67..898b257a82 100644 --- a/plugins/SitesManager/lang/en.json +++ b/plugins/SitesManager/lang/en.json @@ -43,7 +43,7 @@ "KeepURLFragmentsLong": "Keep Page URL fragments when tracking Page URLs", "ListOfIpsToBeExcludedOnAllWebsites": "The IPs below will be excluded from being tracked on all websites.", "ListOfQueryParametersToBeExcludedOnAllWebsites": "The Query URLs parameters below will be excluded from URLs on all websites.", - "ListOfQueryParametersToExclude": "Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports.", + "ListOfQueryParametersToExclude": "Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports. Regular expressions such as %s are suported.", "MainDescription": "Your Web Analytics reports need Websites! Add, update, delete Websites, and show the JavaScript to insert in your pages.", "MenuManage": "Manage", "NotAnEcommerceSite": "Not an Ecommerce site", diff --git a/plugins/SitesManager/lang/ru.json b/plugins/SitesManager/lang/ru.json index f4b1a26d6d..a6846b0ac7 100644 --- a/plugins/SitesManager/lang/ru.json +++ b/plugins/SitesManager/lang/ru.json @@ -44,6 +44,7 @@ "ListOfQueryParametersToBeExcludedOnAllWebsites": "Запросы URL-параметров ниже будут исключены и не будут учитываться при сборе статистики на всех сайтах.", "ListOfQueryParametersToExclude": "Введите список запросов URL-параметров по одному на каждую строку, чтобы исключить их со страницы с отчетами по URL.", "MainDescription": "Для ведения статистики требуется добавить сайты. Добавляйте, обновляйте, удаляйте информацию о сайтах, а также просмотрите JavaScript-код для вставки на ваши страницы.", + "MenuManage": "Управление", "NotAnEcommerceSite": "Сайт без эл. коммерции", "NotFound": "Не найдено сайтов для", "NoWebsites": "Вы не имеете ни одного сайта на учете.", diff --git a/plugins/SitesManager/templates/help/excluded-query-parameters-help.html b/plugins/SitesManager/templates/help/excluded-query-parameters-help.html index 39fed1cf89..c316c38737 100644 --- a/plugins/SitesManager/templates/help/excluded-query-parameters-help.html +++ b/plugins/SitesManager/templates/help/excluded-query-parameters-help.html @@ -1,5 +1,5 @@ <div> - {{ 'SitesManager_ListOfQueryParametersToExclude'|translate }} + {{ 'SitesManager_ListOfQueryParametersToExclude'|translate:'/^sess.*|.*[dD]ate$/' }} <br/><br/> diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml index e530794c52..d12382f18e 100644 --- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml +++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml @@ -96,7 +96,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports.<br /><br />Piwik will automatically exclude the common session parameters (phpsessid, sessionid, ...).</inlineHelp> + <inlineHelp>Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports. Regular expressions such as /^sess.*|.*[dD]ate$/ are suported.<br /><br />Piwik will automatically exclude the common session parameters (phpsessid, sessionid, ...).</inlineHelp> <introduction /> <condition /> </row> diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable -Subproject 393f5eac779ec981630dcd74316e8c2acd236f1 +Subproject ba305a46f9ca2b02fc6a0ffca141d2be2c3ee5a diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization -Subproject d062754c862f69c31787890dd9b718ed48e9452 +Subproject 1b92d94a0a927563accf9507664f40a7c3eb2d2 diff --git a/plugins/UserId/lang/ru.json b/plugins/UserId/lang/ru.json index 353190053a..b325299e3b 100644 --- a/plugins/UserId/lang/ru.json +++ b/plugins/UserId/lang/ru.json @@ -1,5 +1,7 @@ { "UserId": { - "UserReportTitle": "Пользователи" + "UserId": "UserId", + "UserReportTitle": "Пользователи", + "PluginDescription": "Показать пользовательские отчёты" } }
\ No newline at end of file diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php index c1f5965f96..ae9189e653 100644 --- a/plugins/UsersManager/API.php +++ b/plugins/UsersManager/API.php @@ -10,12 +10,14 @@ namespace Piwik\Plugins\UsersManager; use Exception; use Piwik\Access; +use Piwik\Auth\Password; use Piwik\Common; use Piwik\Config; use Piwik\Container\StaticContainer; use Piwik\Date; use Piwik\Option; use Piwik\Piwik; +use Piwik\SettingsPiwik; use Piwik\Site; use Piwik\Tracker\Cache; @@ -41,6 +43,11 @@ class API extends \Piwik\Plugin\API private $model; /** + * @var Password + */ + private $password; + + /** * @var UserAccessFilter */ private $userFilter; @@ -50,10 +57,11 @@ class API extends \Piwik\Plugin\API private static $instance = null; - public function __construct(Model $model, UserAccessFilter $filter) + public function __construct(Model $model, UserAccessFilter $filter, Password $password) { $this->model = $model; $this->userFilter = $filter; + $this->password = $password; } /** @@ -208,6 +216,7 @@ class API extends \Piwik\Plugin\API $users = $this->model->getUsers($logins); $users = $this->userFilter->filterUsers($users); + $users = $this->enrichUsers($users); // Non Super user can only access login & alias if (!Piwik::hasUserSuperUserAccess()) { @@ -355,7 +364,10 @@ class API extends \Piwik\Plugin\API $user = $this->model->getUser($userLogin); - return $this->userFilter->filterUser($user); + $user = $this->userFilter->filterUser($user); + $user = $this->enrichUser($user); + + return $user; } /** @@ -372,7 +384,10 @@ class API extends \Piwik\Plugin\API $user = $this->model->getUserByEmail($userEmail); - return $this->userFilter->filterUser($user); + $user = $this->userFilter->filterUser($user); + $user = $this->enrichUser($user); + + return $user; } private function checkLogin($userLogin) @@ -436,9 +451,9 @@ class API extends \Piwik\Plugin\API $passwordTransformed = $password; } - $alias = $this->getCleanAlias($alias, $userLogin); - - $token_auth = $this->getTokenAuth($userLogin, $passwordTransformed); + $alias = $this->getCleanAlias($alias, $userLogin); + $passwordTransformed = $this->password->hash($passwordTransformed); + $token_auth = $this->createTokenAuth($userLogin); $this->model->addUser($userLogin, $passwordTransformed, $email, $alias, $token_auth, Date::now()->getDatetime()); @@ -500,11 +515,7 @@ class API extends \Piwik\Plugin\API Piwik::checkUserIsNotAnonymous(); $users = $this->model->getUsersHavingSuperUserAccess(); - - foreach($users as &$user) { - // remove token_auth in API response - unset($user['token_auth']); - } + $users = $this->enrichUsers($users); // we do not filter these users by access and return them all since we need to print this information in the // UI and they are allowed to see this. @@ -512,11 +523,52 @@ class API extends \Piwik\Plugin\API return $users; } + private function enrichUsers($users) + { + if (!empty($users)) { + foreach ($users as $index => $user) { + $users[$index] = $this->enrichUser($user); + } + } + return $users; + } + + private function enrichUser($user) + { + if (!empty($user)) { + unset($user['token_auth']); + } + + return $user; + } + + /** + * Regenerate the token_auth associated with a user. + * + * If the user currently logged in regenerates his own token, he will be logged out. + * His previous token will be rendered invalid. + * + * @param string $userLogin + * @throws Exception + */ + public function regenerateTokenAuth($userLogin) + { + $this->checkUserIsNotAnonymous($userLogin); + + Piwik::checkUserHasSuperUserAccessOrIsTheUser($userLogin); + + $this->model->updateUserTokenAuth( + $userLogin, + $this->createTokenAuth($userLogin) + ); + } + /** * Updates a user in the database. * Only login and password are required (case when we update the password). - * When the password changes, the key token for this user will change, which could break - * its API calls. + * + * If the password changes and the user has an old token_auth (legacy MD5 format) associated, + * the token will be regenerated. This could break a user's API calls. * * @see addUser() for all the parameters */ @@ -525,18 +577,30 @@ class API extends \Piwik\Plugin\API { Piwik::checkUserHasSuperUserAccessOrIsTheUser($userLogin); $this->checkUserIsNotAnonymous($userLogin); - $userInfo = $this->getUser($userLogin); + $this->checkUserExists($userLogin); + + $userInfo = $this->model->getUser($userLogin); + $token_auth = $userInfo['token_auth']; + $passwordHasBeenUpdated = false; if (empty($password)) { $password = $userInfo['password']; } else { $password = Common::unsanitizeInputValue($password); + if (!$_isPasswordHashed) { UsersManager::checkPassword($password); $password = UsersManager::getPasswordHash($password); } + $passwordInfo = $this->password->info($password); + + if (!isset($passwordInfo['algo']) || 0 >= $passwordInfo['algo']) { + // password may have already been fully hashed + $password = $this->password->hash($password); + } + $passwordHasBeenUpdated = true; } @@ -552,8 +616,7 @@ class API extends \Piwik\Plugin\API $this->checkEmail($email); } - $alias = $this->getCleanAlias($alias, $userLogin); - $token_auth = $this->getTokenAuth($userLogin, $password); + $alias = $this->getCleanAlias($alias, $userLogin); $this->model->updateUser($userLogin, $password, $email, $alias, $token_auth); @@ -780,7 +843,20 @@ class API extends \Piwik\Plugin\API } /** - * Generates a unique MD5 for the given login & password + * Generates a new random authentication token. + * + * @param string $userLogin Login + * @return string + */ + public function createTokenAuth($userLogin) + { + return md5($userLogin . microtime(true) . Common::generateUniqId() . SettingsPiwik::getSalt()); + } + + /** + * Returns the user's API token. + * + * If the username/password combination is incorrect an invalid token will be returned. * * @param string $userLogin Login * @param string $md5Password hashed string of the password (using current hash function; MD5-named for historical reasons) @@ -790,6 +866,16 @@ class API extends \Piwik\Plugin\API { UsersManager::checkPasswordHash($md5Password, Piwik::translate('UsersManager_ExceptionPasswordMD5HashExpected')); - return md5($userLogin . $md5Password); + $user = $this->model->getUser($userLogin); + + if (!$this->password->verify($md5Password, $user['password'])) { + return md5($userLogin . microtime(true) . Common::generateUniqId()); + } + + if ($this->password->needsRehash($user['password'])) { + $this->updateUser($userLogin, $this->password->hash($md5Password)); + } + + return $user['token_auth']; } } diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php index 189b6f58dd..0be04abda4 100644 --- a/plugins/UsersManager/Controller.php +++ b/plugins/UsersManager/Controller.php @@ -240,6 +240,7 @@ class Controller extends ControllerAdmin $user = Request::processRequest('UsersManager.getUser', array('userLogin' => $userLogin)); $view->userAlias = $user['alias']; $view->userEmail = $user['email']; + $view->userTokenAuth = Piwik::getCurrentUserTokenAuth(); $view->ignoreSalt = $this->getIgnoreCookieSalt(); diff --git a/plugins/UsersManager/Model.php b/plugins/UsersManager/Model.php index db0285eab6..a45aebaf2d 100644 --- a/plugins/UsersManager/Model.php +++ b/plugins/UsersManager/Model.php @@ -8,6 +8,7 @@ */ namespace Piwik\Plugins\UsersManager; +use Piwik\Auth\Password; use Piwik\Common; use Piwik\Db; use Piwik\Piwik; @@ -29,8 +30,14 @@ class Model private static $rawPrefix = 'user'; private $table; + /** + * @var Password + */ + private $passwordHelper; + public function __construct() { + $this->passwordHelper = new Password(); $this->table = Common::prefixTable(self::$rawPrefix); } @@ -183,11 +190,11 @@ class Model return $db->fetchRow('SELECT * FROM ' . $this->table . ' WHERE token_auth = ?', $tokenAuth); } - public function addUser($userLogin, $passwordTransformed, $email, $alias, $tokenAuth, $dateRegistered) + public function addUser($userLogin, $hashedPassword, $email, $alias, $tokenAuth, $dateRegistered) { $user = array( 'login' => $userLogin, - 'password' => $passwordTransformed, + 'password' => $hashedPassword, 'alias' => $alias, 'email' => $email, 'token_auth' => $tokenAuth, @@ -238,13 +245,20 @@ class Model return $users; } - public function updateUser($userLogin, $password, $email, $alias, $tokenAuth) + public function updateUser($userLogin, $hashedPassword, $email, $alias, $tokenAuth) + { + $this->updateUserFields($userLogin, array( + 'password' => $hashedPassword, + 'alias' => $alias, + 'email' => $email, + 'token_auth' => $tokenAuth + )); + } + + public function updateUserTokenAuth($userLogin, $tokenAuth) { $this->updateUserFields($userLogin, array( - 'password' => $password, - 'alias' => $alias, - 'email' => $email, - 'token_auth' => $tokenAuth + 'token_auth' => $tokenAuth )); } diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php index b8840276d4..e4c3673fa4 100644 --- a/plugins/UsersManager/UsersManager.php +++ b/plugins/UsersManager/UsersManager.php @@ -9,7 +9,6 @@ namespace Piwik\Plugins\UsersManager; use Exception; -use Piwik\Db; use Piwik\Option; use Piwik\Piwik; use Piwik\SettingsPiwik; @@ -23,7 +22,7 @@ class UsersManager extends \Piwik\Plugin const PASSWORD_MIN_LENGTH = 6; /** - * @see Piwik\Plugin::registerEvents + * @see \Piwik\Plugin::registerEvents */ public function registerEvents() { @@ -56,7 +55,14 @@ class UsersManager extends \Piwik\Plugin public function recordAdminUsersInCache(&$attributes, $idSite) { // add the 'hosts' entry in the website array - $users = API::getInstance()->getUsersWithSiteAccess($idSite, 'admin'); + $model = new Model(); + $logins = $model->getUsersLoginWithSiteAccess($idSite, 'admin'); + + if (empty($logins)) { + return; + } + + $users = $model->getUsers($logins); $tokens = array(); foreach ($users as $user) { @@ -87,7 +93,7 @@ class UsersManager extends \Piwik\Plugin /** * Return list of plug-in specific JavaScript files to be imported by the asset manager * - * @see Piwik\AssetManager + * @see \Piwik\AssetManager */ public function getJsFiles(&$jsFiles) { diff --git a/plugins/UsersManager/angularjs/manage-users/manage-users.controller.js b/plugins/UsersManager/angularjs/manage-users/manage-users.controller.js index 6e561a6ea5..621113355c 100644 --- a/plugins/UsersManager/angularjs/manage-users/manage-users.controller.js +++ b/plugins/UsersManager/angularjs/manage-users/manage-users.controller.js @@ -124,14 +124,9 @@ }) ).prepend($('<input type="submit" class="btn updateuser" value="' + _pk_translate('General_Save') + '" />') .click(function () { - var onValidate = function () { - sendUpdateUserAJAX($('tr#' + idRow)); - }; - if ($('tr#' + idRow).find('input#password').val() != '-') { - piwikHelper.modalConfirm('#confirmPasswordChange', {yes: onValidate}); - } else { - onValidate(); - } + var $tr = $('tr#' + idRow); + + sendUpdateUserAJAX($tr); }) ); } @@ -176,6 +171,29 @@ }}); }; + this.regenerateUserTokenAuth = function (userLogin) { + var parameters = { userLogin: userLogin }; + var confirm = '#confirmTokenRegenerate'; + + if (userLogin == piwik.userLogin) { + confirm = '#confirmTokenRegenerateSelf'; + } + + piwikHelper.modalConfirm(confirm, {yes: function () { + setIsLoading(); + + piwikApi.post({ + module: 'API', + method: 'UsersManager.regenerateTokenAuth' + }, parameters).then(function () { + piwik.helper.redirect(); + self.isLoading = false; + }, function () { + self.isLoading = false; + }); + }}); + }; + $(document).ready(function () { var alreadyEdited = []; // when click on edituser, the cells become editable @@ -183,8 +201,9 @@ // Show the token_auth $('.token_auth').click(function () { var token = $(this).data('token'); - if ($(this).text() != token) { - $(this).text(token); + + if ($('.token_auth_content', this).text() != token) { + $('.token_auth_content', this).text(token); } }); }); diff --git a/plugins/UsersManager/angularjs/personal-settings/personal-settings.controller.js b/plugins/UsersManager/angularjs/personal-settings/personal-settings.controller.js index a14c47390a..811fd9466e 100644 --- a/plugins/UsersManager/angularjs/personal-settings/personal-settings.controller.js +++ b/plugins/UsersManager/angularjs/personal-settings/personal-settings.controller.js @@ -7,13 +7,13 @@ (function () { angular.module('piwikApp').controller('PersonalSettingsController', PersonalSettingsController); - PersonalSettingsController.$inject = ['piwikApi']; + PersonalSettingsController.$inject = ['piwikApi', '$window']; - function PersonalSettingsController(piwikApi) { + function PersonalSettingsController(piwikApi, $window) { // remember to keep controller very simple. Create a service/factory (model) if needed var self = this; - + function updateSettings(postParams) { self.loading = true; @@ -34,6 +34,26 @@ }); } + this.regenerateTokenAuth = function () { + var parameters = { userLogin: piwik.userLogin }; + + self.loading = true; + + piwikHelper.modalConfirm('#confirmTokenRegenerate', {yes: function () { + piwikApi.withTokenInUrl(); + piwikApi.post({ + module: 'API', + method: 'UsersManager.regenerateTokenAuth' + }, parameters).then(function (success) { + $window.location.reload(); + + self.loading = false; + }, function (errorMessage) { + self.loading = false; + }); + }}); + }; + this.save = function () { var postParams = { @@ -49,16 +69,7 @@ postParams.passwordBis = this.passwordBis; } - if (this.password) { - postParams.password = this.password; - - piwikHelper.modalConfirm('#confirmPasswordChange', {yes: function () { - updateSettings(postParams); - }}); - } else { - updateSettings(postParams); - } - + updateSettings(postParams); }; } })();
\ No newline at end of file diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json index 6c9f8cb170..3fdedcc01f 100644 --- a/plugins/UsersManager/lang/en.json +++ b/plugins/UsersManager/lang/en.json @@ -8,7 +8,6 @@ "AnonymousUserHasViewAccess2": "Your analytics reports and your visitors information are publicly viewable.", "ApplyToAllWebsites": "Apply to all websites", "ChangeAllConfirm": "Are you sure you want to give '%s' access to all the websites?", - "ChangePasswordConfirm": "Changing the password will also change the user's token_auth. Do you really want to continue?", "ClickHereToDeleteTheCookie": "Click here to delete the cookie and have Piwik track your visits", "ClickHereToSetTheCookieOnDomain": "Click here to set a cookie that will exclude your visits on websites tracked by Piwik on %s", "ConfirmGrantSuperUserAccess": "Do you really want to grant '%s' Super User access? Warning: the user will have access to all websites and will be able to perform administrative tasks.", @@ -63,6 +62,11 @@ "SuperUserAccessManagementMainDescription": "Super users have the highest permissions. They can perform all administrative tasks such as adding new websites to monitor, adding users, changing user permissions, activating and deactivating plugins and even installing new plugins from the Marketplace.", "TheLoginScreen": "The login screen", "ThereAreCurrentlyNRegisteredUsers": "There are currently %s registered users.", + "TokenAuth": "API Authentication Token", + "TokenRegenerateConfirm": "Changing the API authentication token will invalidate the user's current token. If the user is currently logged in, he may be required to log in again. Do you really want to continue?", + "TokenRegenerateConfirmSelf": "Changing the API authentication token will invalidate your own token. You may be required to log in again if you proceed. Do you really want to change your authentication token?", + "TokenRegenerateLogoutWarning": "When you re-generate your token you will be logged out and need to log in again.", + "TokenRegenerateTitle": "Regenerate", "TypeYourPasswordAgain": "Type your new password again.", "User": "User", "UsersManagement": "Users Management", diff --git a/plugins/UsersManager/lang/he.json b/plugins/UsersManager/lang/he.json index 1939d9fef9..318cae8223 100644 --- a/plugins/UsersManager/lang/he.json +++ b/plugins/UsersManager/lang/he.json @@ -6,6 +6,7 @@ "MenuUsers": "משתמשים", "MenuUserSettings": "הגדרות משתמש", "PrivNone": "אין הרשאות", + "PrivView": "הצג", "User": "משתמש", "UsersManagement": "ניהול משתמשים" } diff --git a/plugins/UsersManager/stylesheets/usersManager.less b/plugins/UsersManager/stylesheets/usersManager.less index 90355b5b4f..f4b22ced4a 100644 --- a/plugins/UsersManager/stylesheets/usersManager.less +++ b/plugins/UsersManager/stylesheets/usersManager.less @@ -26,10 +26,6 @@ } } -#users #token_auth_user { - border-color: @theme-color-background-tinyContrast; -} - #users .canceluser { margin-top: 10px; margin-bottom: 10px; diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig index b4f75df6cc..4b232c63e5 100644 --- a/plugins/UsersManager/templates/index.twig +++ b/plugins/UsersManager/templates/index.twig @@ -154,11 +154,18 @@ <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/> <input role="no" type="button" value="{{ 'General_No'|translate }}"/> </div> - <div class="ui-confirm" id="confirmPasswordChange"> - <h2>{{ 'UsersManager_ChangePasswordConfirm'|translate }}</h2> + + <div class="ui-confirm" id="confirmTokenRegenerate"> + <h2>{{ 'UsersManager_TokenRegenerateConfirm'|translate }}</h2> <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/> <input role="no" type="button" value="{{ 'General_No'|translate }}"/> </div> + <div class="ui-confirm" id="confirmTokenRegenerateSelf"> + <h2>{{ 'UsersManager_TokenRegenerateConfirmSelf'|translate }}</h2> + <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/> + <input role="no" type="button" value="{{ 'General_No'|translate }}"/> + </div> + <br/> <p>{{ 'UsersManager_UsersManagementMainDescription'|translate }} {{ 'UsersManager_ThereAreCurrentlyNRegisteredUsers'|translate("<b>"~usersCount~"</b>")|raw }}</p> @@ -174,7 +181,6 @@ <th>{{ 'General_Password'|translate }}</th> <th>{{ 'UsersManager_Email'|translate }}</th> <th>{{ 'UsersManager_Alias'|translate }}</th> - <th>token_auth</th> {% if showLastSeen is defined and showLastSeen %} <th>{{ 'UsersManager_LastSeen'|translate }}</th> {% endif %} @@ -191,7 +197,6 @@ <td id="password" class="editable" ng-click='manageUsers.editUser("row{{ i|e('js') }}")'>-</td> <td id="email" class="editable" ng-click='manageUsers.editUser("row{{ i|e('js') }}")'>{{ user.email }}</td> <td id="alias" class="editable" ng-click='manageUsers.editUser("row{{ i|e('js') }}")'>{{ user.alias|raw }}</td> - <td id="token_auth_user" class="token_auth" data-token="{{ user.token_auth }}">{{ user.token_auth|slice(0, 8) }}…</td> {% if user.last_seen is defined %} <td id="last_seen">{% if user.last_seen is empty %}-{% else %}{{ 'General_TimeAgo'|translate(user.last_seen)|raw }}{% endif %}</td> {% endif %} diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig index 53f46d20e6..2824262acd 100644 --- a/plugins/UsersManager/templates/userSettings.twig +++ b/plugins/UsersManager/templates/userSettings.twig @@ -4,8 +4,8 @@ {% block content %} -<div class="ui-confirm" id="confirmPasswordChange"> - <h2>{{ 'UsersManager_ChangePasswordConfirm'|translate }}</h2> +<div class="ui-confirm" id="confirmTokenRegenerate"> + <h2>{{ 'UsersManager_TokenRegenerateConfirmSelf'|translate }}</h2> <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/> <input role="no" type="button" value="{{ 'General_No'|translate }}"/> </div> @@ -107,6 +107,16 @@ </form> </div> +<div piwik-content-block + content-title="{{ 'UsersManager_TokenAuth'|translate|e('html_attr') }}"> + <pre piwik-select-on-focus id="token_auth_user">{{ userTokenAuth }}</pre> + + <p>{{ 'UsersManager_TokenRegenerateLogoutWarning'|translate }}</p> + <button class="btn btn-link" + ng-controller="PersonalSettingsController as personalSettings" + ng-click="personalSettings.regenerateTokenAuth()">{{ 'UsersManager_TokenRegenerateTitle'|translate }}</button> +</div> + <div piwik-plugin-settings mode="user"></div> <div piwik-content-block diff --git a/plugins/UsersManager/tests/Fixtures/ManyUsers.php b/plugins/UsersManager/tests/Fixtures/ManyUsers.php index b9c6821f67..b2be04550d 100644 --- a/plugins/UsersManager/tests/Fixtures/ManyUsers.php +++ b/plugins/UsersManager/tests/Fixtures/ManyUsers.php @@ -8,6 +8,7 @@ namespace Piwik\Plugins\UsersManager\tests\Fixtures; use Piwik\Plugins\UsersManager\API; +use Piwik\Plugins\UsersManager\Model; use Piwik\Tests\Framework\Fixture; /** @@ -51,6 +52,7 @@ class ManyUsers extends Fixture protected function setUpUsers() { + $model = new Model(); $api = API::getInstance(); foreach ($this->users as $login => $permissions) { $api->addUser($login, 'password', $login . '@example.com'); @@ -59,7 +61,8 @@ class ManyUsers extends Fixture $api->setUserAccess($login, $access, $idSites); } } - $user = $api->getUser($login); + + $user = $model->getUser($login); $this->users[$login]['token'] = $user['token_auth']; } diff --git a/plugins/UsersManager/tests/Integration/APITest.php b/plugins/UsersManager/tests/Integration/APITest.php index 892deedc58..91f8e0f49f 100644 --- a/plugins/UsersManager/tests/Integration/APITest.php +++ b/plugins/UsersManager/tests/Integration/APITest.php @@ -8,9 +8,11 @@ namespace Piwik\Plugins\UsersManager\tests; +use Piwik\Auth\Password; use Piwik\Option; use Piwik\Piwik; use Piwik\Plugins\UsersManager\API; +use Piwik\Plugins\UsersManager\UsersManager; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\Mock\FakeAccess; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; @@ -184,9 +186,12 @@ class APITest extends IntegrationTestCase $user = $this->api->getUser($this->login); - $this->assertSame('14a88b9d2f52c55b5fbcf9c5d9c11875', $user['password']); $this->assertSame('email@example.com', $user['email']); $this->assertSame('newAlias', $user['alias']); + + $passwordHelper = new Password(); + + $this->assertTrue($passwordHelper->verify(UsersManager::getPasswordHash('newPassword'), $user['password'])); } public function test_getSitesAccessFromUser_forSuperUser() diff --git a/plugins/UsersManager/tests/Integration/UsersManagerTest.php b/plugins/UsersManager/tests/Integration/UsersManagerTest.php index 0d24d5f5b2..4a849cb155 100644 --- a/plugins/UsersManager/tests/Integration/UsersManagerTest.php +++ b/plugins/UsersManager/tests/Integration/UsersManagerTest.php @@ -9,9 +9,11 @@ namespace Piwik\Plugins\UsersManager\tests\Integration; use Piwik\Access; +use Piwik\Auth\Password; use Piwik\Plugins\SitesManager\API as APISitesManager; use Piwik\Plugins\UsersManager\API; use Piwik\Plugins\UsersManager\Model; +use Piwik\Plugins\UsersManager\UsersManager; use Piwik\Tests\Framework\Mock\FakeAccess; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use Exception; @@ -74,14 +76,20 @@ class UsersManagerTest extends IntegrationTestCase } $userAfter = $this->api->getUser($user["login"]); unset($userAfter['date_registered']); + unset($userAfter['password']); + + // implicitly checks password! + $userModel = $this->model->getUser($user['login']); + $userAfter['token_auth'] = $userModel['token_auth']; - // we now compute what the token auth should be, it should always be a hash of the login and the current password - // if the password has changed then the token_auth has changed! $user['token_auth'] = $this->api->getTokenAuth($user["login"], md5($newPassword)); - $user['password'] = md5($newPassword); - $user['email'] = $newEmail; - $user['alias'] = $newAlias; + + $user['email'] = $newEmail; + $user['alias'] = $newAlias; $user['superuser_access'] = 0; + + unset($user['password']); + $this->assertEquals($user, $userAfter); } @@ -238,17 +246,23 @@ class UsersManagerTest extends IntegrationTestCase "the date_registered " . strtotime($user['date_registered']) . " is different from the time() " . time()); $this->assertTrue($user['date_registered'] <= time()); - // check that token is 32 chars - $this->assertEquals(32, strlen($user['password'])); + // check that password and token are properly set + $this->assertEquals(60, strlen($user['password'])); - // that the password has been md5 - $this->assertEquals(md5($login . md5($password)), $user['token_auth']); + $userModel = $this->model->getUser($login); + $this->assertEquals(32, strlen($userModel['token_auth'])); + + $userModel = $this->model->getUser($login); + $this->assertEquals($userModel['token_auth'], $this->api->getTokenAuth($login, UsersManager::getPasswordHash($password))); // check that all fields are the same $this->assertEquals($login, $user['login']); - $this->assertEquals(md5($password), $user['password']); $this->assertEquals($email, $user['email']); $this->assertEquals($alias, $user['alias']); + + $passwordHelper = new Password(); + + $this->assertTrue($passwordHelper->verify(UsersManager::getPasswordHash($password), $user['password'])); } /** @@ -381,9 +395,9 @@ class UsersManagerTest extends IntegrationTestCase $users = $this->api->getUsers(); $users = $this->_removeNonTestableFieldsFromUsers($users); - $user1 = array('login' => "gegg4564eqgeqag", 'password' => md5("geqgegagae"), 'alias' => "alias", 'email' => "tegst@tesgt.com", 'superuser_access' => 0); - $user2 = array('login' => "geggeqge632ge56a4qag", 'password' => md5("geqgegeagae"), 'alias' => "alias", 'email' => "tesggt@tesgt.com", 'superuser_access' => 0); - $user3 = array('login' => "geggeqgeqagqegg", 'password' => md5("geqgeaggggae"), 'alias' => 'geggeqgeqagqegg', 'email' => "tesgggt@tesgt.com", 'superuser_access' => 0); + $user1 = array('login' => "gegg4564eqgeqag", 'alias' => "alias", 'email' => "tegst@tesgt.com", 'superuser_access' => 0); + $user2 = array('login' => "geggeqge632ge56a4qag", 'alias' => "alias", 'email' => "tesggt@tesgt.com", 'superuser_access' => 0); + $user3 = array('login' => "geggeqgeqagqegg", 'alias' => 'geggeqgeqagqegg', 'email' => "tesgggt@tesgt.com", 'superuser_access' => 0); $expectedUsers = array($user1, $user2, $user3); $this->assertEquals($expectedUsers, $users); $this->assertEquals(array($user1), $this->_removeNonTestableFieldsFromUsers($this->api->getUsers('gegg4564eqgeqag'))); @@ -408,6 +422,7 @@ class UsersManagerTest extends IntegrationTestCase protected function _removeNonTestableFieldsFromUsers($users) { foreach ($users as &$user) { + unset($user['password']); unset($user['token_auth']); unset($user['date_registered']); } diff --git a/plugins/UsersManager/tests/System/ApiTest.php b/plugins/UsersManager/tests/System/ApiTest.php index b72a956e10..4192b62d0c 100644 --- a/plugins/UsersManager/tests/System/ApiTest.php +++ b/plugins/UsersManager/tests/System/ApiTest.php @@ -38,8 +38,9 @@ class ApiTest extends SystemTestCase // login1 = super user, login2 = some admin access, login4 = only view access foreach ($logins as $login => $appendix) { $params['token_auth'] = self::$fixture->users[$login]['token']; + $xmlFieldsToRemove = array('date_registered', 'password', 'token_auth'); - $this->runAnyApiTest($api, $apiId . '_' . $appendix, $params, array('xmlFieldsToRemove' => array('date_registered'))); + $this->runAnyApiTest($api, $apiId . '_' . $appendix, $params, array('xmlFieldsToRemove' => $xmlFieldsToRemove)); } } diff --git a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login1_when_superuseraccess.xml b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login1_when_superuseraccess.xml index b96941238e..e233776f69 100644 --- a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login1_when_superuseraccess.xml +++ b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login1_when_superuseraccess.xml @@ -2,10 +2,9 @@ <result> <row> <login>login1</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login1</alias> <email>login1@example.com</email> - <token_auth>367ea0b18ee1e641089e5d0a4d5f276d</token_auth> <superuser_access>1</superuser_access> </row> diff --git a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login2_when_adminaccess.xml b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login2_when_adminaccess.xml index 3516ee8eab..7b9a2b37ca 100644 --- a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login2_when_adminaccess.xml +++ b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login2_when_adminaccess.xml @@ -2,10 +2,9 @@ <result> <row> <login>login2</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login2</alias> <email>login2@example.com</email> - <token_auth>ef3cb848005bffc2e2f3c8edbd95c58f</token_auth> <superuser_access>0</superuser_access> </row> diff --git a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login2_when_superuseraccess.xml b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login2_when_superuseraccess.xml index 3516ee8eab..7b9a2b37ca 100644 --- a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login2_when_superuseraccess.xml +++ b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login2_when_superuseraccess.xml @@ -2,10 +2,9 @@ <result> <row> <login>login2</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login2</alias> <email>login2@example.com</email> - <token_auth>ef3cb848005bffc2e2f3c8edbd95c58f</token_auth> <superuser_access>0</superuser_access> </row> diff --git a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login4_when_superuseraccess.xml b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login4_when_superuseraccess.xml index 16caa1d378..28d1197732 100644 --- a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login4_when_superuseraccess.xml +++ b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login4_when_superuseraccess.xml @@ -2,10 +2,9 @@ <result> <row> <login>login4</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login4</alias> <email>login4@example.com</email> - <token_auth>dc6fb0514c143d97c72b8be165e7ee0a</token_auth> <superuser_access>0</superuser_access> </row> diff --git a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login4_when_viewaccess.xml b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login4_when_viewaccess.xml index 16caa1d378..28d1197732 100644 --- a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login4_when_viewaccess.xml +++ b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login4_when_viewaccess.xml @@ -2,10 +2,9 @@ <result> <row> <login>login4</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login4</alias> <email>login4@example.com</email> - <token_auth>dc6fb0514c143d97c72b8be165e7ee0a</token_auth> <superuser_access>0</superuser_access> </row> diff --git a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login6_when_superuseraccess.xml b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login6_when_superuseraccess.xml index 2cd79e6cd4..ebf69209da 100644 --- a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login6_when_superuseraccess.xml +++ b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUser_login6_when_superuseraccess.xml @@ -2,10 +2,9 @@ <result> <row> <login>login6</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login6</alias> <email>login6@example.com</email> - <token_auth>2cafd6512d8b2739a7b2b01ab6609272</token_auth> <superuser_access>0</superuser_access> </row> diff --git a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUsersWithSiteAccess_3_admin_when_superuseraccess.xml b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUsersWithSiteAccess_3_admin_when_superuseraccess.xml index 9af31e8a0c..aa93d367ad 100644 --- a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUsersWithSiteAccess_3_admin_when_superuseraccess.xml +++ b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUsersWithSiteAccess_3_admin_when_superuseraccess.xml @@ -2,19 +2,17 @@ <result> <row> <login>login5</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login5</alias> <email>login5@example.com</email> - <token_auth>4550293427ba5d0a0c96d6123429e9d3</token_auth> <superuser_access>0</superuser_access> </row> <row> <login>login6</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login6</alias> <email>login6@example.com</email> - <token_auth>2cafd6512d8b2739a7b2b01ab6609272</token_auth> <superuser_access>0</superuser_access> </row> diff --git a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUsers__when_superuseraccess.xml b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUsers__when_superuseraccess.xml index af284f900d..e8eb10f4b1 100644 --- a/plugins/UsersManager/tests/System/expected/test___UsersManager.getUsers__when_superuseraccess.xml +++ b/plugins/UsersManager/tests/System/expected/test___UsersManager.getUsers__when_superuseraccess.xml @@ -2,82 +2,73 @@ <result> <row> <login>login1</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login1</alias> <email>login1@example.com</email> - <token_auth>367ea0b18ee1e641089e5d0a4d5f276d</token_auth> <superuser_access>1</superuser_access> </row> <row> <login>login2</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login2</alias> <email>login2@example.com</email> - <token_auth>ef3cb848005bffc2e2f3c8edbd95c58f</token_auth> <superuser_access>0</superuser_access> </row> <row> <login>login3</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login3</alias> <email>login3@example.com</email> - <token_auth>4298f4654bddcccac23e3d38c7d8a79d</token_auth> <superuser_access>0</superuser_access> </row> <row> <login>login4</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login4</alias> <email>login4@example.com</email> - <token_auth>dc6fb0514c143d97c72b8be165e7ee0a</token_auth> <superuser_access>0</superuser_access> </row> <row> <login>login5</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login5</alias> <email>login5@example.com</email> - <token_auth>4550293427ba5d0a0c96d6123429e9d3</token_auth> <superuser_access>0</superuser_access> </row> <row> <login>login6</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login6</alias> <email>login6@example.com</email> - <token_auth>2cafd6512d8b2739a7b2b01ab6609272</token_auth> <superuser_access>0</superuser_access> </row> <row> <login>login7</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login7</alias> <email>login7@example.com</email> - <token_auth>8bda247657d9b13c20843fd97c3fb427</token_auth> <superuser_access>0</superuser_access> </row> <row> <login>login8</login> - <password>5f4dcc3b5aa765d61d8327deb882cf99</password> + <alias>login8</alias> <email>login8@example.com</email> - <token_auth>8fdfef11755e29a8369a57fe2709445b</token_auth> <superuser_access>0</superuser_access> </row> <row> <login>superUserLogin</login> - <password>1e56c228742c0189d261500852e27a02</password> + <alias>superUserLogin</alias> <email>hello@example.org</email> - <token_auth>9ad1de7f8b329ab919d854c556f860c1</token_auth> <superuser_access>1</superuser_access> </row> diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator -Subproject e6fdb3d448b3bba29874ce49fdd7ab1678c6e2f +Subproject 3e49303e43f59027f0a7fd7fcfb5ca9060902a5 diff --git a/plugins/WebsiteMeasurable/MeasurableSettings.php b/plugins/WebsiteMeasurable/MeasurableSettings.php index 7af270b0f9..95e4187f73 100644 --- a/plugins/WebsiteMeasurable/MeasurableSettings.php +++ b/plugins/WebsiteMeasurable/MeasurableSettings.php @@ -183,7 +183,7 @@ class MeasurableSettings extends \Piwik\Settings\Measurable\MeasurableSettings $self = $this; return $this->makeProperty('excluded_parameters', $default = array(), FieldConfig::TYPE_ARRAY, function (FieldConfig $field) use ($self) { $field->title = Piwik::translate('SitesManager_ExcludedParameters'); - $field->inlineHelp = Piwik::translate('SitesManager_ListOfQueryParametersToExclude') + $field->inlineHelp = Piwik::translate('SitesManager_ListOfQueryParametersToExclude', "/^sess.*|.*[dD]ate$/") . '<br /><br />' . Piwik::translate('SitesManager_PiwikWillAutomaticallyExcludeCommonSessionParameters', array('phpsessid, sessionid, ...')); $field->uiControl = FieldConfig::UI_CONTROL_TEXTAREA; diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index 3a107c26bd..f89fc4948b 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -41,6 +41,8 @@ class ManySitesImportedLogs extends Fixture GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files'; LocationProvider::setCurrentProvider('geoip_php'); + self::createSuperUser(); + $this->trackVisits(); $this->setupSegments(); } diff --git a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php index d7fe5e51a6..c190cb2f77 100644 --- a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php +++ b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php @@ -13,6 +13,7 @@ use Piwik\Db; use Piwik\Plugins\Goals\API as APIGoals; use Piwik\Plugins\SitesManager\API as APISitesManager; use Piwik\Tests\Framework\Fixture; +use Piwik\Tracker\Cache; /** * This fixture adds one website and tracks two visits by one visitor. @@ -84,8 +85,12 @@ class OneVisitorTwoVisits extends Fixture APISitesManager::getInstance()->setSiteSpecificUserAgentExcludeEnabled(false); } + self::createSuperUser(); $t = self::getTracker($idSite, $dateTime, $defaultInit = true); + Cache::clearCacheGeneral(); + Cache::regenerateCacheWebsiteAttributes(array($idSite)); + if ($this->useThirdPartyCookies) { $t->DEBUG_APPEND_URL = '&forceUseThirdPartyCookie=1'; } diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index c0ea0ce4cd..131af64a0f 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -12,6 +12,7 @@ use Piwik\Application\Environment; use Piwik\Archive; use Piwik\ArchiveProcessor\PluginsArchiver; use Piwik\Auth; +use Piwik\Auth\Password; use Piwik\Cache\Backend\File; use Piwik\Cache as PiwikCache; use Piwik\Common; @@ -663,34 +664,38 @@ class Fixture extends \PHPUnit_Framework_Assert */ public static function getTokenAuth() { - return APIUsersManager::getInstance()->getTokenAuth( - self::ADMIN_USER_LOGIN, - UsersManager::getPasswordHash(self::ADMIN_USER_PASSWORD) - ); + $model = new \Piwik\Plugins\UsersManager\Model(); + $user = $model->getUser(self::ADMIN_USER_LOGIN); + + return $user['token_auth']; } public static function createSuperUser($removeExisting = true) { - $login = self::ADMIN_USER_LOGIN; - $password = UsersManager::getPasswordHash(self::ADMIN_USER_PASSWORD); - $token = self::getTokenAuth(); + $passwordHelper = new Password(); + + $login = self::ADMIN_USER_LOGIN; + $password = $passwordHelper->hash(UsersManager::getPasswordHash(self::ADMIN_USER_PASSWORD)); + $token = APIUsersManager::getInstance()->createTokenAuth($login); $model = new \Piwik\Plugins\UsersManager\Model(); + $user = $model->getUser($login); + if ($removeExisting) { $model->deleteUserOnly($login); } - $user = $model->getUser($login); - - if (empty($user)) { + if (!empty($user) && !$removeExisting) { + $token = $user['token_auth']; + } + if (empty($user) || $removeExisting) { $model->addUser($login, $password, 'hello@example.org', $login, $token, Date::now()->getDatetime()); } else { $model->updateUser($login, $password, 'hello@example.org', $login, $token); } - if (empty($user['superuser_access'])) { - $model->setSuperUserAccess($login, true); - } + $setSuperUser = empty($user) || !empty($user['superuser_access']); + $model->setSuperUserAccess($login, $setSuperUser); return $model->getUserByTokenAuth($token); } diff --git a/tests/PHPUnit/Integration/HttpTest.php b/tests/PHPUnit/Integration/HttpTest.php index 272c36c0e1..823b6037be 100644 --- a/tests/PHPUnit/Integration/HttpTest.php +++ b/tests/PHPUnit/Integration/HttpTest.php @@ -230,12 +230,17 @@ class HttpTest extends \PHPUnit_Framework_TestCase } /** + * erroe message can be: + * curl_exec: server certificate verification failed. CAfile: /home/travis/build/piwik/piwik/core/DataFiles/cacert.pem CRLfile: none. Hostname requested was: self-signed.badssl.com + * or + * curl_exec: SSL certificate problem: self signed certificate. Hostname requested was: self-signed.badssl.com * @expectedException \Exception - * @expectedExceptionMessage curl_exec: SSL + * @expectedExceptionMessageRegExp /curl_exec: .*certificate.* / */ public function testCurlHttpsFailsWithInvalidCertificate() { - Http::sendHttpRequestBy('curl', 'https://www.virtual-drums.com', 10); + // use a domain from https://badssl.com/ + Http::sendHttpRequestBy('curl', 'https://self-signed.badssl.com/', 10); } /** @@ -244,7 +249,8 @@ class HttpTest extends \PHPUnit_Framework_TestCase */ public function testFopenHttpsFailsWithInvalidCertificate() { - Http::sendHttpRequestBy('fopen', 'https://www.virtual-drums.com', 10); + // use a domain from https://badssl.com/ + Http::sendHttpRequestBy('fopen', 'https://self-signed.badssl.com/', 10); } /** diff --git a/tests/PHPUnit/Integration/NumberFormatterTest.php b/tests/PHPUnit/Integration/NumberFormatterTest.php index dc546ef9d8..c420b4bcb2 100644 --- a/tests/PHPUnit/Integration/NumberFormatterTest.php +++ b/tests/PHPUnit/Integration/NumberFormatterTest.php @@ -121,10 +121,10 @@ class NumberFormatterTest extends \PHPUnit_Framework_TestCase array('en', -5000000, 0, 0, '-5,000,000%'), // foreign languages - array('ar', 51239.56, 3, 0, '51٬239٫56٪'), + array('ar', 51239.56, 3, 0, '51٬239٫56 ٪'), array('be', 51239.56, 3, 0, '51 239,56 %'), array('de', 51239.56, 3, 0, '51.239,56 %'), - array('bn', 152551239.56, 3, 0, '15,25,51,239.56%'), + array('bn', 152551239.56, 3, 0, '152,551,239.56%'), array('hi', 152551239.56, 0, 0, '15,25,51,240%'), array('lt', -152551239.56, 0, 0, '−152 551 240 %'), ); diff --git a/tests/PHPUnit/Integration/SegmentTest.php b/tests/PHPUnit/Integration/SegmentTest.php index 9558cc0929..20b23065db 100644 --- a/tests/PHPUnit/Integration/SegmentTest.php +++ b/tests/PHPUnit/Integration/SegmentTest.php @@ -426,6 +426,92 @@ class SegmentTest extends IntegrationTestCase $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query)); } + public function test_getSelectQuery_whenJoiningManyCustomTablesItShouldKeepTheOrderAsDefined() + { + $actionType = 3; + $idSite = 1; + $select = 'log_link_visit_action.custom_dimension_1, + log_action.name as url, + sum(log_link_visit_action.time_spent) as `13`, + sum(case log_visit.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as `6`'; + $from = array( + 'log_link_visit_action', + array( + 'table' => 'log_link_visit_action', + 'tableAlias' => 'log_link_visit_action_foo', + 'joinOn' => 'log_link_visit_action.idvisit = log_link_visit_action_foo.idvisit', + ), + array( + 'table' => 'log_action', + 'tableAlias' => 'log_action_foo', + 'joinOn' => 'log_link_visit_action_foo.idaction_url = log_action_foo.idaction', + ), + array( + 'table' => 'log_link_visit_action', + 'tableAlias' => 'log_link_visit_action_bar', + 'joinOn' => "log_link_visit_action.idvisit = log_link_visit_action_bar.idvisit" + ), + array( + 'table' => 'log_action', + 'tableAlias' => 'log_action_bar', + 'joinOn' => "log_link_visit_action_bar.idaction_url = log_action_bar.idaction" + ), + array( + 'table' => 'log_link_visit_action', + 'tableAlias' => 'log_link_visit_action_baz', + 'joinOn' => "log_link_visit_action.idvisit = log_link_visit_action_baz.idvisit" + ), + array( + 'table' => 'log_action', + 'tableAlias' => 'log_action_baz', + 'joinOn' => "log_link_visit_action_baz.idaction_url = log_action_baz.idaction" + ), + 'log_action', + ); + + $where = 'log_link_visit_action.server_time >= ? + AND log_link_visit_action.server_time <= ? + AND log_link_visit_action.idsite = ?'; + $bind = array('2015-11-30 11:00:00', '2015-12-01 10:59:59', $idSite); + + $segment = 'actionType==' . $actionType; + $segment = new Segment($segment, $idSites = array()); + + $query = $segment->getSelectQuery($select, $from, $where, $bind); + + $logActionTable = Common::prefixTable('log_action'); + $logLinkVisitActionTable = Common::prefixTable('log_link_visit_action'); + + $expected = array( + "sql" => " + SELECT log_link_visit_action.custom_dimension_1, + log_action.name as url, + sum(log_link_visit_action.time_spent) as `13`, + sum(case log_visit.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as `6` + FROM $logLinkVisitActionTable AS log_link_visit_action + LEFT JOIN $logLinkVisitActionTable AS log_link_visit_action_foo + ON log_link_visit_action.idvisit = log_link_visit_action_foo.idvisit + LEFT JOIN $logActionTable AS log_action_foo + ON log_link_visit_action_foo.idaction_url = log_action_foo.idaction + LEFT JOIN $logLinkVisitActionTable AS log_link_visit_action_bar + ON log_link_visit_action.idvisit = log_link_visit_action_bar.idvisit + LEFT JOIN $logActionTable AS log_action_bar + ON log_link_visit_action_bar.idaction_url = log_action_bar.idaction + LEFT JOIN $logLinkVisitActionTable AS log_link_visit_action_baz + ON log_link_visit_action.idvisit = log_link_visit_action_baz.idvisit + LEFT JOIN $logActionTable AS log_action_baz + ON log_link_visit_action_baz.idaction_url = log_action_baz.idaction + LEFT JOIN $logActionTable AS log_action + ON log_link_visit_action.idaction_url = log_action.idaction + WHERE ( log_link_visit_action.server_time >= ? + AND log_link_visit_action.server_time <= ? + AND log_link_visit_action.idsite = ? ) + AND ( log_action.type = ? )", + "bind" => array('2015-11-30 11:00:00', '2015-12-01 10:59:59', $idSite, $actionType)); + + $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query)); + } + public function test_getSelectQuery_whenJoinLogLinkVisitActionOnActionOnVisit_WithSameTableAliasButDifferentJoin() { $actionType = 3; diff --git a/tests/PHPUnit/Integration/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Tracker/ActionTest.php index 5eab999b66..724fe963a0 100644 --- a/tests/PHPUnit/Integration/Tracker/ActionTest.php +++ b/tests/PHPUnit/Integration/Tracker/ActionTest.php @@ -174,6 +174,21 @@ class ActionTest extends IntegrationTestCase } /** + * Testing with some website specific parameters excluded using regular expressions + * @dataProvider getTestUrls + */ + public function testExcludeQueryParametersRegExSiteExcluded($url, $filteredUrl) + { + $excludedQueryParameters = '/p[4|2]/, /^var.*/'; + $this->setUpRootAccess(); + $idSite = API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0, + $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, + $excludedIps = '', $excludedQueryParameters, $timezone = null, $currency = null, + $group = null, $startDate = null, $excludedUserAgents = null, $keepURLFragments = 1); + $this->assertEquals($filteredUrl[1], PageUrl::excludeQueryParametersFromUrl($url, $idSite)); + } + + /** * Testing with some website specific and some global excluded query parameters * @dataProvider getTestUrls */ diff --git a/tests/PHPUnit/Integration/Tracker/RequestTest.php b/tests/PHPUnit/Integration/Tracker/RequestTest.php index bff3c80b08..05eee7ea30 100644 --- a/tests/PHPUnit/Integration/Tracker/RequestTest.php +++ b/tests/PHPUnit/Integration/Tracker/RequestTest.php @@ -293,7 +293,7 @@ class RequestTest extends IntegrationTestCase $login = 'myadmin'; $passwordHash = UsersManager::getPasswordHash('password'); - $token = API::getInstance()->getTokenAuth($login, $passwordHash); + $token = API::getInstance()->createTokenAuth($login); $user = new Model(); $user->addUser($login, $passwordHash, 'admin@piwik', 'alias', $token, '2014-01-01 00:00:00'); diff --git a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php index a8787cc5ee..f596684d92 100644 --- a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php +++ b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php @@ -26,11 +26,12 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $visitorCustomVariables = array(array("name", "value"), array("name 2", "value 2")), $pageCustomVariables = array(array("page cvar", "page cvar value")), $customCampaignNameQueryParam = "campaignKey", $customCampaignKeywordParam = "keywordKey", - $doNotTrack = true); + $doNotTrack = true, $disableCookies = false, $trackNoScript = true); $expected = "<!-- Piwik --> <script type="text/javascript"> var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]); // you can set up to 5 custom variables for each visitor _paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]); @@ -50,7 +51,33 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<noscript><p><img src="//localhost/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> +<noscript><p><img src="//localhost/piwik/piwik.php?idsite=1&rec=1" style="border:0;" alt="" /></p></noscript> +<!-- End Piwik Code --> +"; + + $this->assertEquals($expected, $jsTag); + } + + public function testJavascriptTrackingCode_noScriptTrackingDisabled_defaultTrackingCode() + { + $generator = new TrackerCodeGenerator(); + + $jsTag = $generator->generate($idSite = 1, $piwikUrl = 'http://localhost/piwik'); + + $expected = "<!-- Piwik --> +<script type="text/javascript"> + var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" + _paq.push(['trackPageView']); + _paq.push(['enableLinkTracking']); + (function() { + var u="//localhost/piwik/"; + _paq.push(['setTrackerUrl', u+'piwik.php']); + _paq.push(['setSiteId', '1']); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); + })(); +</script> <!-- End Piwik Code --> "; @@ -78,6 +105,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $expected = "<!-- Piwik --> <script type="text/javascript"> var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]); // you can set up to 5 custom variables for each visitor _paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]); @@ -97,7 +125,6 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<noscript><p><img src="https://localhost/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> "; @@ -125,6 +152,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $expected = "<!-- Piwik --> <script type="text/javascript"> var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]); // you can set up to 5 custom variables for each visitor _paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]); @@ -145,7 +173,6 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<noscript><p><img src="//localhost/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> "; @@ -169,6 +196,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $expected = "<!-- Piwik --> <script type="text/javascript"> var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); @@ -180,7 +208,6 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase })(); </script> <script type='text/javascript' src="//localhost/piwik/piwik.js"></script> -<noscript><p><img src="//localhost/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> "; @@ -206,6 +233,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $expected = '<!-- Piwik --> <script type="text/javascript"> var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" _paq.push(["setDocumentTitle", document.domain + "/" + document.title]); // you can set up to 5 custom variables for each visitor _paq.push(["setCustomVariable", 1, "abc\"def", "abc\"def", "visit"]); @@ -223,7 +251,6 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase g.type=\'text/javascript\'; g.async=true; g.defer=true; g.src=u+\'piwik.js\'; s.parentNode.insertBefore(g,s); })(); </script> -<noscript><p><img src="//abc"def/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> '; diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml index ca6aa942fb..b42228ab18 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml @@ -30,6 +30,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -56,6 +57,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -136,6 +138,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -162,6 +165,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -242,6 +246,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -268,6 +273,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -348,6 +354,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -374,6 +381,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -454,6 +462,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -480,6 +489,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -560,6 +570,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -586,6 +597,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -666,6 +678,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -692,6 +705,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -772,6 +786,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -798,6 +813,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -878,6 +894,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -904,6 +921,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index 0a45cfa38e..dea1215c4e 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -20,6 +20,7 @@ </row> </customVariables> <generationTime>0.12s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -50,6 +51,7 @@ </row> </customVariables> <generationTime>0.12s</generationTime> + <interactionPosition>5</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -69,6 +71,7 @@ </row> </customVariables> <generationTime>0.02s</generationTime> + <interactionPosition>9</interactionPosition> <timeSpent>52</timeSpent> <timeSpentPretty>52s</timeSpentPretty> <icon /> @@ -88,6 +91,7 @@ </row> </customVariables> <generationTime>0.23s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>50</timeSpent> <timeSpentPretty>50s</timeSpentPretty> <icon /> @@ -107,6 +111,7 @@ </row> </customVariables> <generationTime>0.29s</generationTime> + <interactionPosition>6</interactionPosition> <timeSpent>49</timeSpent> <timeSpentPretty>49s</timeSpentPretty> <icon /> @@ -126,6 +131,7 @@ </row> </customVariables> <generationTime>0.24s</generationTime> + <interactionPosition>10</interactionPosition> <timeSpent>26</timeSpent> <timeSpentPretty>26s</timeSpentPretty> <icon /> @@ -145,6 +151,7 @@ </row> </customVariables> <generationTime>1.32s</generationTime> + <interactionPosition>3</interactionPosition> <timeSpent>26</timeSpent> <timeSpentPretty>26s</timeSpentPretty> <icon /> @@ -164,6 +171,7 @@ </row> </customVariables> <generationTime>0.62s</generationTime> + <interactionPosition>7</interactionPosition> <timeSpent>7</timeSpent> <timeSpentPretty>7s</timeSpentPretty> <icon /> @@ -183,6 +191,7 @@ </row> </customVariables> <generationTime>0.54s</generationTime> + <interactionPosition>4</interactionPosition> <timeSpent>8</timeSpent> <timeSpentPretty>8s</timeSpentPretty> <icon /> @@ -202,6 +211,7 @@ </row> </customVariables> <generationTime>0.34s</generationTime> + <interactionPosition>8</interactionPosition> <icon /> </row> @@ -228,6 +238,7 @@ <visitDurationPretty>54s</visitDurationPretty> <searches>0</searches> <actions>10</actions> + <interactions>10</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -316,6 +327,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -342,6 +354,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>piwik.org</referrerName> @@ -435,6 +448,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -461,6 +475,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -545,6 +560,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -571,6 +587,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -644,6 +661,7 @@ <customVariablePageValue1>301</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -673,6 +691,7 @@ <customVariablePageValue1>307</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -699,6 +718,7 @@ <visitDurationPretty>3 min 2s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -772,6 +792,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <timeSpent>61</timeSpent> <timeSpentPretty>1 min 1s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -790,6 +811,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <timeSpent>61</timeSpent> <timeSpentPretty>1 min 1s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -808,6 +830,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/download.png</icon> </row> @@ -834,6 +857,7 @@ <visitDurationPretty>2 min 3s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -918,6 +942,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -944,6 +969,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1028,6 +1054,7 @@ <customVariablePageValue1>500</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1054,6 +1081,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1127,6 +1155,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/download.png</icon> </row> @@ -1153,6 +1182,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1237,6 +1267,7 @@ <customVariablePageValue1>404</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1263,6 +1294,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index df849a8f3f..9079f5d43c 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -20,10 +20,11 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s pitch black...</pageTitle> + <pageTitle>It's pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>95</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -50,6 +51,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -124,6 +126,7 @@ <pageIdAction>4</pageIdAction> <pageId>46</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -153,6 +156,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -173,9 +177,10 @@ <type>download</type> <url>http://example.org/path/file8.zip</url> <pageTitle /> - <pageIdAction>46</pageIdAction> + <pageIdAction>47</pageIdAction> <pageId>48</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -185,9 +190,10 @@ <type>outlink</type> <url>http://example-outlink.org/8.html</url> <pageTitle /> - <pageIdAction>47</pageIdAction> + <pageIdAction>48</pageIdAction> <pageId>49</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -196,13 +202,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>50</pageId> <eventCategory>Cat8</eventCategory> <eventAction>Action8</eventAction> <eventName>Name8</eventName> <eventValue>353.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -229,6 +236,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -318,7 +326,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>45</pageId> @@ -332,6 +340,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -358,6 +367,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -440,6 +450,7 @@ <pageIdAction>4</pageIdAction> <pageId>41</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -471,9 +482,10 @@ <type>download</type> <url>http://example.org/path/file7.zip</url> <pageTitle /> - <pageIdAction>41</pageIdAction> + <pageIdAction>42</pageIdAction> <pageId>42</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -483,9 +495,10 @@ <type>outlink</type> <url>http://example-outlink.org/7.html</url> <pageTitle /> - <pageIdAction>42</pageIdAction> + <pageIdAction>43</pageIdAction> <pageId>43</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -494,13 +507,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>44</pageId> <eventCategory>Cat7</eventCategory> <eventAction>Action7</eventAction> <eventName>Name7</eventName> <eventValue>352.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -527,6 +541,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -616,7 +631,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>40</pageId> @@ -630,6 +645,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -656,6 +672,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -738,6 +755,7 @@ <pageIdAction>4</pageIdAction> <pageId>35</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -767,6 +785,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -787,9 +806,10 @@ <type>download</type> <url>http://example.org/path/file6.zip</url> <pageTitle /> - <pageIdAction>36</pageIdAction> + <pageIdAction>37</pageIdAction> <pageId>37</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -799,9 +819,10 @@ <type>outlink</type> <url>http://example-outlink.org/6.html</url> <pageTitle /> - <pageIdAction>37</pageIdAction> + <pageIdAction>38</pageIdAction> <pageId>38</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -810,13 +831,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>39</pageId> <eventCategory>Cat6</eventCategory> <eventAction>Action6</eventAction> <eventName>Name6</eventName> <eventValue>351.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -843,6 +865,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -932,7 +955,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>34</pageId> @@ -946,6 +969,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -972,6 +996,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1054,6 +1079,7 @@ <pageIdAction>4</pageIdAction> <pageId>30</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -1085,9 +1111,10 @@ <type>download</type> <url>http://example.org/path/file5.zip</url> <pageTitle /> - <pageIdAction>31</pageIdAction> + <pageIdAction>32</pageIdAction> <pageId>31</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -1097,9 +1124,10 @@ <type>outlink</type> <url>http://example-outlink.org/5.html</url> <pageTitle /> - <pageIdAction>32</pageIdAction> + <pageIdAction>33</pageIdAction> <pageId>32</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -1108,13 +1136,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>33</pageId> <eventCategory>Cat5</eventCategory> <eventAction>Action5</eventAction> <eventName>Name5</eventName> <eventValue>350.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1141,6 +1170,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1230,7 +1260,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>29</pageId> @@ -1244,6 +1274,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 5</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1270,6 +1301,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1352,6 +1384,7 @@ <pageIdAction>4</pageIdAction> <pageId>24</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -1381,6 +1414,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -1401,9 +1435,10 @@ <type>download</type> <url>http://example.org/path/file4.zip</url> <pageTitle /> - <pageIdAction>26</pageIdAction> + <pageIdAction>27</pageIdAction> <pageId>26</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -1413,9 +1448,10 @@ <type>outlink</type> <url>http://example-outlink.org/4.html</url> <pageTitle /> - <pageIdAction>27</pageIdAction> + <pageIdAction>28</pageIdAction> <pageId>27</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -1424,13 +1460,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>28</pageId> <eventCategory>Cat4</eventCategory> <eventAction>Action4</eventAction> <eventName>Name4</eventName> <eventValue>349.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1457,6 +1494,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1546,7 +1584,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>23</pageId> @@ -1560,6 +1598,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 4</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1586,6 +1625,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1668,6 +1708,7 @@ <pageIdAction>4</pageIdAction> <pageId>19</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -1699,9 +1740,10 @@ <type>download</type> <url>http://example.org/path/file3.zip</url> <pageTitle /> - <pageIdAction>21</pageIdAction> + <pageIdAction>22</pageIdAction> <pageId>20</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -1711,9 +1753,10 @@ <type>outlink</type> <url>http://example-outlink.org/3.html</url> <pageTitle /> - <pageIdAction>22</pageIdAction> + <pageIdAction>23</pageIdAction> <pageId>21</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -1722,13 +1765,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>22</pageId> <eventCategory>Cat3</eventCategory> <eventAction>Action3</eventAction> <eventName>Name3</eventName> <eventValue>348.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1755,6 +1799,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1837,6 +1882,7 @@ <pageIdAction>4</pageIdAction> <pageId>80</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -1868,9 +1914,10 @@ <type>download</type> <url>http://example.org/path/file3.zip</url> <pageTitle /> - <pageIdAction>21</pageIdAction> + <pageIdAction>22</pageIdAction> <pageId>81</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -1880,9 +1927,10 @@ <type>outlink</type> <url>http://example-outlink.org/3.html</url> <pageTitle /> - <pageIdAction>22</pageIdAction> + <pageIdAction>23</pageIdAction> <pageId>82</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -1891,13 +1939,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>83</pageId> <eventCategory>Cat3</eventCategory> <eventAction>Action3</eventAction> <eventName>Name3</eventName> <eventValue>348.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1924,6 +1973,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1961,7 +2011,7 @@ <city>Lhasa</city> <location>Lhasa, Unknown, Tibet</location> <latitude>29.650000</latitude> - <longitude>91.099998</longitude> + <longitude>91.100000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> @@ -2005,7 +2055,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>18</pageId> @@ -2019,6 +2069,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 3</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2045,6 +2096,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2134,7 +2186,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>79</pageId> @@ -2148,6 +2200,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 3</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2174,6 +2227,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2184,22 +2238,22 @@ <referrerSearchEngineIcon /> <languageCode /> <language>Unknown</language> - <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemVersion>UNK</operatingSystemVersion> - <browserFamily /> - <browserFamilyDescription>Unknown</browserFamilyDescription> - <browser>Unknown</browser> - <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> + <deviceType>Tablet</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/tablet.png</deviceTypeIcon> + <deviceBrand>Sony</deviceBrand> + <deviceModel>Xperia Tablet S</deviceModel> + <operatingSystem>Android 4.1</operatingSystem> + <operatingSystemName>Android</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>4.1</operatingSystemVersion> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 34.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>34.0</browserVersion> <events>0</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -2211,7 +2265,7 @@ <city>Lhasa</city> <location>Lhasa, Unknown, Tibet</location> <latitude>29.650000</latitude> - <longitude>91.099998</longitude> + <longitude>91.100000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> @@ -2256,6 +2310,7 @@ <pageIdAction>4</pageIdAction> <pageId>13</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -2285,6 +2340,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -2305,9 +2361,10 @@ <type>download</type> <url>http://example.org/path/file2.zip</url> <pageTitle /> - <pageIdAction>16</pageIdAction> + <pageIdAction>17</pageIdAction> <pageId>15</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -2317,9 +2374,10 @@ <type>outlink</type> <url>http://example-outlink.org/2.html</url> <pageTitle /> - <pageIdAction>17</pageIdAction> + <pageIdAction>18</pageIdAction> <pageId>16</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -2328,13 +2386,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>17</pageId> <eventCategory>Cat2</eventCategory> <eventAction>Action2</eventAction> <eventName>Name2</eventName> <eventValue>347.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -2361,6 +2420,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2397,8 +2457,8 @@ <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> - <latitude>124.456001</latitude> - <longitude>22.231001</longitude> + <latitude>124.456000</latitude> + <longitude>22.231000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> @@ -2443,6 +2503,7 @@ <pageIdAction>4</pageIdAction> <pageId>74</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -2472,6 +2533,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -2492,9 +2554,10 @@ <type>download</type> <url>http://example.org/path/file2.zip</url> <pageTitle /> - <pageIdAction>16</pageIdAction> + <pageIdAction>17</pageIdAction> <pageId>76</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -2504,9 +2567,10 @@ <type>outlink</type> <url>http://example-outlink.org/2.html</url> <pageTitle /> - <pageIdAction>17</pageIdAction> + <pageIdAction>18</pageIdAction> <pageId>77</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -2515,13 +2579,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>78</pageId> <eventCategory>Cat2</eventCategory> <eventAction>Action2</eventAction> <eventName>Name2</eventName> <eventValue>347.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -2548,6 +2613,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2629,7 +2695,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>12</pageId> @@ -2643,6 +2709,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 2</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2669,6 +2736,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2705,8 +2773,8 @@ <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> - <latitude>124.456001</latitude> - <longitude>22.231001</longitude> + <latitude>124.456000</latitude> + <longitude>22.231000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> @@ -2758,7 +2826,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>73</pageId> @@ -2772,6 +2840,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 2</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2798,6 +2867,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2808,22 +2878,22 @@ <referrerSearchEngineIcon /> <languageCode /> <language>Unknown</language> - <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceBrand>Dell</deviceBrand> <deviceModel /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemVersion>UNK</operatingSystemVersion> - <browserFamily /> - <browserFamilyDescription>Unknown</browserFamilyDescription> - <browser>Unknown</browser> - <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> + <browserFamily>Trident</browserFamily> + <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 11.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>11.0</browserVersion> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -2880,6 +2950,7 @@ <pageIdAction>4</pageIdAction> <pageId>8</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -2911,9 +2982,10 @@ <type>download</type> <url>http://example.org/path/file1.zip</url> <pageTitle /> - <pageIdAction>11</pageIdAction> + <pageIdAction>12</pageIdAction> <pageId>9</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -2923,9 +2995,10 @@ <type>outlink</type> <url>http://example-outlink.org/1.html</url> <pageTitle /> - <pageIdAction>12</pageIdAction> + <pageIdAction>13</pageIdAction> <pageId>10</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -2934,13 +3007,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>11</pageId> <eventCategory>Cat1</eventCategory> <eventAction>Action1</eventAction> <eventName>Name1</eventName> <eventValue>346.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -2967,6 +3041,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3049,6 +3124,7 @@ <pageIdAction>4</pageIdAction> <pageId>58</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -3080,9 +3156,10 @@ <type>download</type> <url>http://example.org/path/file1.zip</url> <pageTitle /> - <pageIdAction>11</pageIdAction> + <pageIdAction>12</pageIdAction> <pageId>59</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -3092,9 +3169,10 @@ <type>outlink</type> <url>http://example-outlink.org/1.html</url> <pageTitle /> - <pageIdAction>12</pageIdAction> + <pageIdAction>13</pageIdAction> <pageId>60</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -3103,13 +3181,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>61</pageId> <eventCategory>Cat1</eventCategory> <eventAction>Action1</eventAction> <eventName>Name1</eventName> <eventValue>346.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -3136,6 +3215,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3146,22 +3226,22 @@ <referrerSearchEngineIcon /> <languageCode>fr</languageCode> <language>French</language> - <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <deviceType>Smartphone</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/smartphone.png</deviceTypeIcon> + <deviceBrand>HTC</deviceBrand> + <deviceModel>Desire</deviceModel> + <operatingSystem>MildWild 8.0</operatingSystem> + <operatingSystemName>MildWild</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>MLD</operatingSystemCode> + <operatingSystemVersion>8.0</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Android Browser</browser> + <browserName>Android Browser</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserCode>AN</browserCode> + <browserVersion /> <events>1</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -3173,7 +3253,7 @@ <city>Vancouver</city> <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> + <longitude>-123.133000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> @@ -3218,6 +3298,7 @@ <pageIdAction>4</pageIdAction> <pageId>69</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -3249,9 +3330,10 @@ <type>download</type> <url>http://example.org/path/file1.zip</url> <pageTitle /> - <pageIdAction>11</pageIdAction> + <pageIdAction>12</pageIdAction> <pageId>70</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -3261,9 +3343,10 @@ <type>outlink</type> <url>http://example-outlink.org/1.html</url> <pageTitle /> - <pageIdAction>12</pageIdAction> + <pageIdAction>13</pageIdAction> <pageId>71</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -3272,13 +3355,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>72</pageId> <eventCategory>Cat1</eventCategory> <eventAction>Action1</eventAction> <eventName>Name1</eventName> <eventValue>346.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -3305,6 +3389,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3342,7 +3427,7 @@ <city>Vancouver</city> <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> + <longitude>-123.133000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> @@ -3379,6 +3464,7 @@ <pageIdAction>4</pageIdAction> <pageId>91</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -3410,9 +3496,10 @@ <type>download</type> <url>http://example.org/path/file1.zip</url> <pageTitle /> - <pageIdAction>11</pageIdAction> + <pageIdAction>12</pageIdAction> <pageId>92</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -3422,9 +3509,10 @@ <type>outlink</type> <url>http://example-outlink.org/1.html</url> <pageTitle /> - <pageIdAction>12</pageIdAction> + <pageIdAction>13</pageIdAction> <pageId>93</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -3433,13 +3521,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>94</pageId> <eventCategory>Cat1</eventCategory> <eventAction>Action1</eventAction> <eventName>Name1</eventName> <eventValue>346.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -3466,6 +3555,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3480,18 +3570,18 @@ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> + <operatingSystem>Ubuntu 9.04</operatingSystem> + <operatingSystemName>Ubuntu</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.gif</operatingSystemIcon> + <operatingSystemCode>UBT</operatingSystemCode> + <operatingSystemVersion>9.04</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> + <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <browserVersion>3.0</browserVersion> <events>1</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -3555,7 +3645,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>7</pageId> @@ -3569,6 +3659,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3595,6 +3686,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3684,7 +3776,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>57</pageId> @@ -3698,6 +3790,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3724,6 +3817,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3734,22 +3828,22 @@ <referrerSearchEngineIcon /> <languageCode>fr</languageCode> <language>French</language> - <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <deviceType>Smartphone</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/smartphone.png</deviceTypeIcon> + <deviceBrand>HTC</deviceBrand> + <deviceModel>Desire</deviceModel> + <operatingSystem>MildWild 8.0</operatingSystem> + <operatingSystemName>MildWild</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>MLD</operatingSystemCode> + <operatingSystemVersion>8.0</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Android Browser</browser> + <browserName>Android Browser</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserCode>AN</browserCode> + <browserVersion /> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -3761,7 +3855,7 @@ <city>Vancouver</city> <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> + <longitude>-123.133000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> @@ -3813,7 +3907,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>68</pageId> @@ -3827,6 +3921,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3853,6 +3948,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3863,22 +3959,22 @@ <referrerSearchEngineIcon /> <languageCode /> <language>Unknown</language> - <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemVersion>UNK</operatingSystemVersion> - <browserFamily /> - <browserFamilyDescription>Unknown</browserFamilyDescription> - <browser>Unknown</browser> - <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> + <operatingSystem>Windows Vista</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>Vista</operatingSystemVersion> + <browserFamily>Trident</browserFamily> + <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 8.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>8.0</browserVersion> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -3890,7 +3986,7 @@ <city>Vancouver</city> <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> + <longitude>-123.133000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>11</daysSinceLastVisit> @@ -3942,7 +4038,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>90</pageId> @@ -3956,6 +4052,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3982,6 +4079,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3996,18 +4094,18 @@ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> + <operatingSystem>Ubuntu 9.04</operatingSystem> + <operatingSystemName>Ubuntu</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.gif</operatingSystemIcon> + <operatingSystemCode>UBT</operatingSystemCode> + <operatingSystemVersion>9.04</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> + <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <browserVersion>3.0</browserVersion> <events>0</events> <continent>Asia</continent> <continentCode>asi</continentCode> @@ -4064,6 +4162,7 @@ <pageIdAction>4</pageIdAction> <pageId>2</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -4093,6 +4192,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -4116,6 +4216,7 @@ <pageIdAction>6</pageIdAction> <pageId>4</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -4128,6 +4229,7 @@ <pageIdAction>7</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -4136,13 +4238,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>6</pageId> <eventCategory>Cat0</eventCategory> <eventAction>Action0</eventAction> <eventName>Name0</eventName> <eventValue>345.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -4169,6 +4272,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4205,8 +4309,8 @@ <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> - <latitude>123.456001</latitude> - <longitude>21.320999</longitude> + <latitude>123.456000</latitude> + <longitude>21.321000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> @@ -4251,6 +4355,7 @@ <pageIdAction>4</pageIdAction> <pageId>52</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -4280,6 +4385,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -4303,6 +4409,7 @@ <pageIdAction>6</pageIdAction> <pageId>54</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -4315,6 +4422,7 @@ <pageIdAction>7</pageIdAction> <pageId>55</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -4323,13 +4431,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>56</pageId> <eventCategory>Cat0</eventCategory> <eventAction>Action0</eventAction> <eventName>Name0</eventName> <eventValue>345.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -4356,6 +4465,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4366,22 +4476,22 @@ <referrerSearchEngineIcon /> <languageCode>fr</languageCode> <language>French</language> - <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <deviceType>Smartphone</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/smartphone.png</deviceTypeIcon> + <deviceBrand>Google</deviceBrand> + <deviceModel>Nexus 4</deviceModel> + <operatingSystem>Android 4.4</operatingSystem> + <operatingSystemName>Android</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>4.4</operatingSystemVersion> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome Mobile 33.0</browser> + <browserName>Chrome Mobile</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/CM.gif</browserIcon> + <browserCode>CM</browserCode> + <browserVersion>33.0</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -4392,7 +4502,7 @@ <regionCode>A6</regionCode> <city>Besançon</city> <location>Besançon, Franche-Comte, France</location> - <latitude>47.249001</latitude> + <latitude>47.249000</latitude> <longitude>6.018000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> @@ -4438,6 +4548,7 @@ <pageIdAction>4</pageIdAction> <pageId>63</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -4467,6 +4578,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -4490,6 +4602,7 @@ <pageIdAction>6</pageIdAction> <pageId>65</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -4502,6 +4615,7 @@ <pageIdAction>7</pageIdAction> <pageId>66</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -4510,13 +4624,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>67</pageId> <eventCategory>Cat0</eventCategory> <eventAction>Action0</eventAction> <eventName>Name0</eventName> <eventValue>345.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -4543,6 +4658,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4580,7 +4696,7 @@ <city>Vancouver</city> <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> + <longitude>-123.133000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>10</daysSinceLastVisit> @@ -4617,6 +4733,7 @@ <pageIdAction>4</pageIdAction> <pageId>85</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -4646,6 +4763,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -4669,6 +4787,7 @@ <pageIdAction>6</pageIdAction> <pageId>87</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -4681,6 +4800,7 @@ <pageIdAction>7</pageIdAction> <pageId>88</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -4689,13 +4809,14 @@ <row> <type>event</type> <url>http://piwik.net/space/quest/iv</url> - <pageIdAction>4</pageIdAction> + <pageIdAction>8</pageIdAction> <pageId>89</pageId> <eventCategory>Cat0</eventCategory> <eventAction>Action0</eventAction> <eventName>Name0</eventName> <eventValue>345.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -4722,6 +4843,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4732,22 +4854,22 @@ <referrerSearchEngineIcon /> <languageCode>fr</languageCode> <language>French</language> - <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <deviceType>Phablet</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceBrand>Samsung</deviceBrand> + <deviceModel>GALAXY Note 3</deviceModel> + <operatingSystem>Android 4.3</operatingSystem> + <operatingSystemName>Android</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>4.3</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>QQ Browser 5.0</browser> + <browserName>QQ Browser</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/QQ.gif</browserIcon> + <browserCode>QQ</browserCode> + <browserVersion>5.0</browserVersion> <events>1</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -4811,7 +4933,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>1</pageId> @@ -4825,6 +4947,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4851,6 +4974,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4887,8 +5011,8 @@ <regionCode>P3</regionCode> <city>Stratford-upon-Avon</city> <location>Stratford-upon-Avon, Warwickshire, United Kingdom</location> - <latitude>123.456001</latitude> - <longitude>21.320999</longitude> + <latitude>123.456000</latitude> + <longitude>21.321000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -4940,7 +5064,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>51</pageId> @@ -4954,6 +5078,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4980,6 +5105,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4990,22 +5116,22 @@ <referrerSearchEngineIcon /> <languageCode>fr</languageCode> <language>French</language> - <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <deviceType>Smartphone</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/smartphone.png</deviceTypeIcon> + <deviceBrand>Google</deviceBrand> + <deviceModel>Nexus 4</deviceModel> + <operatingSystem>Android 4.4</operatingSystem> + <operatingSystemName>Android</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>4.4</operatingSystemVersion> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome Mobile 33.0</browser> + <browserName>Chrome Mobile</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/CM.gif</browserIcon> + <browserCode>CM</browserCode> + <browserVersion>33.0</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -5016,7 +5142,7 @@ <regionCode>A6</regionCode> <city>Besançon</city> <location>Besançon, Franche-Comte, France</location> - <latitude>47.249001</latitude> + <latitude>47.249000</latitude> <longitude>6.018000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> @@ -5069,7 +5195,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>62</pageId> @@ -5083,6 +5209,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5109,6 +5236,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5123,18 +5251,18 @@ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> + <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemName>Windows</operatingSystemName> <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <operatingSystemVersion>8.1</operatingSystemVersion> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 32.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>32.0</browserVersion> <events>0</events> <continent>North America</continent> <continentCode>amn</continentCode> @@ -5146,7 +5274,7 @@ <city>Vancouver</city> <location>Vancouver, British Columbia, Canada</location> <latitude>49.250000</latitude> - <longitude>-123.133003</longitude> + <longitude>-123.133000</longitude> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -5198,7 +5326,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>84</pageId> @@ -5212,6 +5340,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5238,6 +5367,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5248,22 +5378,22 @@ <referrerSearchEngineIcon /> <languageCode>fr</languageCode> <language>French</language> - <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> - <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemVersion>XP</operatingSystemVersion> - <browserFamily>Gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browser>Firefox 3.6</browser> - <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> + <deviceType>Phablet</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.gif</deviceTypeIcon> + <deviceBrand>Samsung</deviceBrand> + <deviceModel>GALAXY Note 3</deviceModel> + <operatingSystem>Android 4.3</operatingSystem> + <operatingSystemName>Android</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>4.3</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>QQ Browser 5.0</browser> + <browserName>QQ Browser</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/QQ.gif</browserIcon> + <browserCode>QQ</browserCode> + <browserVersion>5.0</browserVersion> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__API.getSuggestedValuesForSegment.xml new file mode 100644 index 0000000000..35bc2d8319 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__API.getSuggestedValuesForSegment.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row>1</row> + <row>2</row> + <row>3</row> + <row>4</row> + <row>5</row> + <row>6</row> + <row>7</row> + <row>8</row> + <row>9</row> + <row>10</row> + <row>11</row> + <row>12</row> + <row>13</row> + <row>14</row> + <row>15</row> + <row>16</row> + <row>17</row> + <row>18</row> + <row>19</row> + <row>20</row> + <row>21</row> + <row>22</row> + <row>23</row> + <row>24</row> + <row>25</row> + <row>26</row> + <row>27</row> + <row>28</row> + <row>29</row> + <row>30</row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml new file mode 100644 index 0000000000..7c9bf3fd36 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_visits>26</nb_visits> + <nb_actions>50</nb_actions> + <nb_visits_converted>26</nb_visits_converted> + <bounce_count>18</bounce_count> + <sum_visit_length>12968</sum_visit_length> + <max_actions>4</max_actions> + <bounce_rate>69%</bounce_rate> + <nb_actions_per_visit>1.9</nb_actions_per_visit> + <avg_time_on_site>499</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml index 3cfabafb6c..9cc9faa5e0 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml @@ -179,15 +179,6 @@ <avg_event_value>0</avg_event_value> </row> <row> - <label>Purchase</label> - <nb_events>2</nb_events> - <nb_events_with_value>0</nb_events_with_value> - <sum_event_value>0</sum_event_value> - <min_event_value>0</min_event_value> - <max_event_value>0</max_event_value> - <avg_event_value>0</avg_event_value> - </row> - <row> <label>rating - La fiancée de l'eau</label> <nb_events>4</nb_events> <nb_events_with_value>4</nb_events_with_value> @@ -215,6 +206,15 @@ <avg_event_value>0</avg_event_value> </row> <row> + <label>Purchase</label> + <nb_events>2</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + <row> <label>This is an event without a URL</label> <nb_events>1</nb_events> <nb_events_with_value>0</nb_events_with_value> @@ -361,15 +361,6 @@ <avg_event_value>0</avg_event_value> </row> <row> - <label>Purchase</label> - <nb_events>1</nb_events> - <nb_events_with_value>0</nb_events_with_value> - <sum_event_value>0</sum_event_value> - <min_event_value>0</min_event_value> - <max_event_value>0</max_event_value> - <avg_event_value>0</avg_event_value> - </row> - <row> <label>rating - La fiancée de l'eau</label> <nb_events>2</nb_events> <nb_events_with_value>2</nb_events_with_value> @@ -396,6 +387,15 @@ <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> </row> + <row> + <label>Purchase</label> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> </result> <result prettyDate="Tuesday, January 5, 2010" /> <result prettyDate="Wednesday, January 6, 2010" /> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index 3c677f06fd..10d41c5fe3 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -14,6 +14,7 @@ <pageId>22</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -40,6 +41,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -119,6 +121,7 @@ <pageId>21</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -145,6 +148,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -225,6 +229,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -239,6 +244,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>420</timeSpent> <timeSpentPretty>7 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -253,6 +259,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <eventName>Search query here</eventName> + <interactionPosition /> <timeSpent>900</timeSpent> <timeSpentPretty>15 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -267,6 +274,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -282,6 +290,7 @@ <eventAction>rating</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -297,6 +306,7 @@ <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -323,6 +333,7 @@ <visitDurationPretty>58 min 1s</visitDurationPretty> <searches>0</searches> <actions>6</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -402,6 +413,7 @@ <pageId>19</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -428,6 +440,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -518,6 +531,7 @@ <pageId>1</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -538,6 +552,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -558,6 +573,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -578,6 +594,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -598,6 +615,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -618,6 +636,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -639,6 +658,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> + <interactionPosition /> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -660,6 +680,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> + <interactionPosition /> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -684,6 +705,7 @@ <pageId>9</pageId> <eventCategory>CategoryTriggersGoal here</eventCategory> <eventAction>This is an event without a URL</eventAction> + <interactionPosition /> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -697,6 +719,7 @@ <pageId>10</pageId> <generationTime>0.67s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -711,6 +734,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -725,6 +749,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -739,6 +764,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -753,6 +779,7 @@ <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -767,6 +794,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -781,6 +809,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -807,6 +836,7 @@ <visitDurationPretty>1 hours 0 min</visitDurationPretty> <searches>0</searches> <actions>16</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -886,6 +916,7 @@ <pageId>45</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -912,6 +943,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -987,6 +1019,7 @@ <pageId>44</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1013,6 +1046,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1089,6 +1123,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1103,6 +1138,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>420</timeSpent> <timeSpentPretty>7 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1117,6 +1153,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <eventName>Search query here</eventName> + <interactionPosition /> <timeSpent>900</timeSpent> <timeSpentPretty>15 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1131,6 +1168,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1146,6 +1184,7 @@ <eventAction>rating</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1161,6 +1200,7 @@ <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1187,6 +1227,7 @@ <visitDurationPretty>58 min 1s</visitDurationPretty> <searches>0</searches> <actions>6</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1262,6 +1303,7 @@ <pageId>42</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1288,6 +1330,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1370,6 +1413,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1390,6 +1434,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1410,6 +1455,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1430,6 +1476,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1450,6 +1497,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1471,6 +1519,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> + <interactionPosition /> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1492,6 +1541,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> + <interactionPosition /> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1505,6 +1555,7 @@ <pageId>33</pageId> <generationTime>0.67s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -1519,6 +1570,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1533,6 +1585,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1547,6 +1600,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1561,6 +1615,7 @@ <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1575,6 +1630,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1589,6 +1645,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1615,6 +1672,7 @@ <visitDurationPretty>59 min 1s</visitDurationPretty> <searches>0</searches> <actions>14</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 6c7b19157a..596636339a 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -14,6 +14,7 @@ <pageId>68</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -40,6 +41,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -115,6 +117,7 @@ <pageId>67</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -141,6 +144,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -217,6 +221,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -231,6 +236,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>420</timeSpent> <timeSpentPretty>7 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -245,6 +251,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <eventName>Search query here</eventName> + <interactionPosition /> <timeSpent>900</timeSpent> <timeSpentPretty>15 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -259,6 +266,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -274,6 +282,7 @@ <eventAction>rating</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -289,6 +298,7 @@ <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -315,6 +325,7 @@ <visitDurationPretty>58 min 1s</visitDurationPretty> <searches>0</searches> <actions>6</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -390,6 +401,7 @@ <pageId>65</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -416,6 +428,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -498,6 +511,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -518,6 +532,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -538,6 +553,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -558,6 +574,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -578,6 +595,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -599,6 +617,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> + <interactionPosition /> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -620,6 +639,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> + <interactionPosition /> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -633,6 +653,7 @@ <pageId>56</pageId> <generationTime>0.67s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -647,6 +668,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -661,6 +683,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -675,6 +698,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -689,6 +713,7 @@ <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -703,6 +728,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -717,6 +743,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -743,6 +770,7 @@ <visitDurationPretty>59 min 1s</visitDurationPretty> <searches>0</searches> <actions>14</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -818,6 +846,7 @@ <pageId>22</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -844,6 +873,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -923,6 +953,7 @@ <pageId>21</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -949,6 +980,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1029,6 +1061,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1043,6 +1076,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>420</timeSpent> <timeSpentPretty>7 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1057,6 +1091,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <eventName>Search query here</eventName> + <interactionPosition /> <timeSpent>900</timeSpent> <timeSpentPretty>15 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1071,6 +1106,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1086,6 +1122,7 @@ <eventAction>rating</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1101,6 +1138,7 @@ <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventName> <eventValue>9.66</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1127,6 +1165,7 @@ <visitDurationPretty>58 min 1s</visitDurationPretty> <searches>0</searches> <actions>6</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1206,6 +1245,7 @@ <pageId>19</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1232,6 +1272,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1322,6 +1363,7 @@ <pageId>1</pageId> <generationTime>0.33s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -1342,6 +1384,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1362,6 +1405,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1382,6 +1426,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1402,6 +1447,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1422,6 +1468,7 @@ </row> </customVariables> <eventName>La fiancée de l'eau</eventName> + <interactionPosition /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1443,6 +1490,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> + <interactionPosition /> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1464,6 +1512,7 @@ </customVariables> <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> + <interactionPosition /> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1488,6 +1537,7 @@ <pageId>9</pageId> <eventCategory>CategoryTriggersGoal here</eventCategory> <eventAction>This is an event without a URL</eventAction> + <interactionPosition /> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1501,6 +1551,7 @@ <pageId>10</pageId> <generationTime>0.67s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -1515,6 +1566,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1529,6 +1581,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1543,6 +1596,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1557,6 +1611,7 @@ <eventCategory>Movie</eventCategory> <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1571,6 +1626,7 @@ <eventCategory>Movie</eventCategory> <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1585,6 +1641,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1611,6 +1668,7 @@ <visitDurationPretty>1 hours 0 min</visitDurationPretty> <searches>0</searches> <actions>16</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml index 3ba555ab1a..e98af60cdc 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml @@ -211,7 +211,7 @@ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> - <label>page1.html</label> + <label>sub/dir/dir1/page1.html</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -222,19 +222,22 @@ <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <exit_nb_visits>1</exit_nb_visits> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> + <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> - <url>http://example.org/page1.html</url> - <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> + <url>http://example.org/sub/dir/dir1/page1.html</url> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segment> </row> <row> - <label>sub/dir/dir1/page1.html</label> + <label>page1.html</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -245,18 +248,15 @@ <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> - <entry_sum_visit_length>1</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> + <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> - <url>http://example.org/sub/dir/dir1/page1.html</url> - <segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segment> + <url>http://example.org/page1.html</url> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml index 6d6e6128de..a26e381adb 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml @@ -30,6 +30,24 @@ <is_aggregate>1</is_aggregate> </row> <row> + <label>CustomVarPage - CustomVarValue0</label> + <nb_visits>6</nb_visits> + <nb_actions>6</nb_actions> + <is_aggregate>0</is_aggregate> + </row> + <row> + <label>CustomVarPage - CustomVarValue1</label> + <nb_visits>6</nb_visits> + <nb_actions>6</nb_actions> + <is_aggregate>0</is_aggregate> + </row> + <row> + <label>CustomVarPage - CustomVarValue2</label> + <nb_visits>6</nb_visits> + <nb_actions>6</nb_actions> + <is_aggregate>0</is_aggregate> + </row> + <row> <label>CustomVarVisit - CustomVarValue1</label> <nb_visits>3</nb_visits> <nb_actions>9</nb_actions> @@ -51,24 +69,6 @@ <nb_visits_converted>0</nb_visits_converted> <is_aggregate>0</is_aggregate> </row> - <row> - <label>CustomVarPage - CustomVarValue0</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <is_aggregate>0</is_aggregate> - </row> - <row> - <label>CustomVarPage - CustomVarValue1</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <is_aggregate>0</is_aggregate> - </row> - <row> - <label>CustomVarPage - CustomVarValue2</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <is_aggregate>0</is_aggregate> - </row> </result> <result date="2010-03-06"> <row> @@ -89,23 +89,6 @@ <is_aggregate>1</is_aggregate> </row> <row> - <label>CustomVarVisit - CustomVarValue1</label> - <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>2</max_actions> - <sum_visit_length>1</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <is_aggregate>0</is_aggregate> - </row> - <row> - <label>CustomVarPage - CustomVarValue1</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <is_aggregate>0</is_aggregate> - </row> - <row> <label>CustomVarPage</label> <nb_actions>1</nb_actions> <slots> @@ -116,6 +99,23 @@ </slots> <is_aggregate>1</is_aggregate> </row> + <row> + <label>CustomVarPage - CustomVarValue1</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <is_aggregate>0</is_aggregate> + </row> + <row> + <label>CustomVarVisit - CustomVarValue1</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <nb_users>0</nb_users> + <max_actions>2</max_actions> + <sum_visit_length>1</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <is_aggregate>0</is_aggregate> + </row> </result> <result date="2010-03-07" /> <result date="2010-03-08" /> diff --git a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml index 155db4a5b8..760c5bb869 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml @@ -25,54 +25,6 @@ <is_aggregate>1</is_aggregate> </row> <row> - <label>dir1/sub</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.1</min_time_generation> - <max_time_generation>0.6</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>6</entry_nb_actions> - <entry_sum_visit_length>2</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>33%</exit_rate> - <avg_time_generation>0.3</avg_time_generation> - <is_aggregate>1</is_aggregate> - </row> - <row> - <label>dir1/sub/dir</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.1</min_time_generation> - <max_time_generation>0.6</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>6</entry_nb_actions> - <entry_sum_visit_length>2</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>33%</exit_rate> - <avg_time_generation>0.3</avg_time_generation> - <is_aggregate>1</is_aggregate> - </row> - <row> <label>dir2</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> @@ -97,13 +49,13 @@ <is_aggregate>1</is_aggregate> </row> <row> - <label>dir2/sub</label> + <label>dir3</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.2</min_time_generation> - <max_time_generation>1.2</max_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>1.8</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> @@ -117,65 +69,64 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>33%</exit_rate> - <avg_time_generation>0.6</avg_time_generation> + <avg_time_generation>0.9</avg_time_generation> <is_aggregate>1</is_aggregate> </row> <row> - <label>dir2/sub/dir</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> + <label>page1.html</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.2</min_time_generation> - <max_time_generation>1.2</max_time_generation> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>6</entry_nb_actions> - <entry_sum_visit_length>2</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>33%</exit_rate> - <avg_time_generation>0.6</avg_time_generation> - <is_aggregate>1</is_aggregate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <url>http://example.org/page1.html</url> + <is_aggregate>0</is_aggregate> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> </row> <row> - <label>dir3</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> + <label>sub</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.3</min_time_generation> - <max_time_generation>1.8</max_time_generation> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>6</entry_nb_actions> - <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>33%</exit_rate> - <avg_time_generation>0.9</avg_time_generation> + <exit_rate>0%</exit_rate> + <avg_time_generation>0</avg_time_generation> <is_aggregate>1</is_aggregate> </row> <row> - <label>dir3/sub</label> + <label>dir1/sub</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.3</min_time_generation> - <max_time_generation>1.8</max_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.6</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> @@ -189,17 +140,17 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>33%</exit_rate> - <avg_time_generation>0.9</avg_time_generation> + <avg_time_generation>0.3</avg_time_generation> <is_aggregate>1</is_aggregate> </row> <row> - <label>dir3/sub/dir</label> + <label>dir1/sub/dir</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.3</min_time_generation> - <max_time_generation>1.8</max_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.6</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> @@ -213,7 +164,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>33%</exit_rate> - <avg_time_generation>0.9</avg_time_generation> + <avg_time_generation>0.3</avg_time_generation> <is_aggregate>1</is_aggregate> </row> <row> @@ -290,6 +241,54 @@ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> + <label>dir2/sub</label> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>1.2</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>33%</exit_rate> + <avg_time_generation>0.6</avg_time_generation> + <is_aggregate>1</is_aggregate> + </row> + <row> + <label>dir2/sub/dir</label> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>1.2</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>33%</exit_rate> + <avg_time_generation>0.6</avg_time_generation> + <is_aggregate>1</is_aggregate> + </row> + <row> <label>dir2/sub/dir/page0.html</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -363,6 +362,54 @@ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> + <label>dir3/sub</label> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>1.8</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>33%</exit_rate> + <avg_time_generation>0.9</avg_time_generation> + <is_aggregate>1</is_aggregate> + </row> + <row> + <label>dir3/sub/dir</label> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>1.8</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>33%</exit_rate> + <avg_time_generation>0.9</avg_time_generation> + <is_aggregate>1</is_aggregate> + </row> + <row> <label>dir3/sub/dir/page0.html</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -436,53 +483,6 @@ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> - <label>page1.html</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation /> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <exit_nb_visits>1</exit_nb_visits> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <avg_time_generation>0</avg_time_generation> - <url>http://example.org/page1.html</url> - <is_aggregate>0</is_aggregate> - <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> - </row> - <row> - <label>sub</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation>0</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> - <entry_sum_visit_length>1</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <avg_time_generation>0</avg_time_generation> - <is_aggregate>1</is_aggregate> - </row> - <row> <label>sub/dir</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml index 7f6c3671eb..fc64578e32 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml @@ -279,7 +279,7 @@ Another line</defaultValue> </row> <row> <name>redisHost</name> - <title>Redis host</title> + <title>Redis host or unix socket</title> <value>127.0.0.1</value> <defaultValue>127.0.0.1</defaultValue> <type>string</type> @@ -289,7 +289,7 @@ Another line</defaultValue> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Remote host of the Redis server. Max 500 characters are allowed.</inlineHelp> + <inlineHelp>Remote host or unix socket of the Redis server. Max 500 characters are allowed.</inlineHelp> <introduction /> <condition /> </row> @@ -305,7 +305,7 @@ Another line</defaultValue> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Port the Redis server is running on. Value should be between 1 and 65535.</inlineHelp> + <inlineHelp>Port the Redis server is running on. Value should be between 1 and 65535. Use 0 if you are using unix socket to connect to Redis server.</inlineHelp> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index d4fde8bad5..0fc8515f43 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -31,6 +31,7 @@ </row> </customVariables> <generationTime>0.29s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -57,6 +58,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>blog.comperiosearch.com</referrerName> @@ -145,6 +147,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>79</timeSpent> <timeSpentPretty>1 min 19s</timeSpentPretty> <icon /> @@ -174,6 +177,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -200,6 +204,7 @@ <visitDurationPretty>1 min 21s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -287,6 +292,7 @@ </row> </customVariables> <generationTime>0.41s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -313,6 +319,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -413,6 +420,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>32</timeSpent> <timeSpentPretty>32s</timeSpentPretty> <icon /> @@ -442,6 +450,7 @@ <customVariablePageValue1>501</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -468,6 +477,7 @@ <visitDurationPretty>34s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -560,6 +570,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -586,6 +597,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>musicforeveryoneradio.be</referrerName> @@ -690,6 +702,7 @@ </row> </customVariables> <generationTime>0.39s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -716,6 +729,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -827,6 +841,7 @@ <customVariablePageValue1>404</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -853,6 +868,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -953,6 +969,7 @@ </row> </customVariables> <generationTime>0.12s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -979,6 +996,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>berndjung.com</referrerName> @@ -1071,6 +1089,7 @@ </row> </customVariables> <generationTime>0.15s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1097,6 +1116,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>forum.golem.de</referrerName> @@ -1198,6 +1218,7 @@ </row> </customVariables> <generationTime>0.18s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>2</timeSpent> <timeSpentPretty>2s</timeSpentPretty> <icon /> @@ -1228,6 +1249,7 @@ </row> </customVariables> <generationTime>0.11s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>7</timeSpent> <timeSpentPretty>7s</timeSpentPretty> <icon /> @@ -1246,6 +1268,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/download.png</icon> </row> @@ -1272,6 +1295,7 @@ <visitDurationPretty>10s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>2</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -1368,6 +1392,7 @@ </row> </customVariables> <generationTime>0.13s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1394,6 +1419,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1498,6 +1524,7 @@ </row> </customVariables> <generationTime>0.06s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1524,6 +1551,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>musicforeveryoneradio.be</referrerName> @@ -1617,6 +1645,7 @@ </row> </customVariables> <generationTime>0.12s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -1647,6 +1676,7 @@ </row> </customVariables> <generationTime>0.12s</generationTime> + <interactionPosition>5</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -1666,6 +1696,7 @@ </row> </customVariables> <generationTime>0.02s</generationTime> + <interactionPosition>9</interactionPosition> <timeSpent>52</timeSpent> <timeSpentPretty>52s</timeSpentPretty> <icon /> @@ -1685,6 +1716,7 @@ </row> </customVariables> <generationTime>0.23s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>50</timeSpent> <timeSpentPretty>50s</timeSpentPretty> <icon /> @@ -1704,6 +1736,7 @@ </row> </customVariables> <generationTime>0.29s</generationTime> + <interactionPosition>6</interactionPosition> <timeSpent>49</timeSpent> <timeSpentPretty>49s</timeSpentPretty> <icon /> @@ -1723,6 +1756,7 @@ </row> </customVariables> <generationTime>0.24s</generationTime> + <interactionPosition>10</interactionPosition> <timeSpent>26</timeSpent> <timeSpentPretty>26s</timeSpentPretty> <icon /> @@ -1742,6 +1776,7 @@ </row> </customVariables> <generationTime>1.32s</generationTime> + <interactionPosition>3</interactionPosition> <timeSpent>26</timeSpent> <timeSpentPretty>26s</timeSpentPretty> <icon /> @@ -1761,6 +1796,7 @@ </row> </customVariables> <generationTime>0.62s</generationTime> + <interactionPosition>7</interactionPosition> <timeSpent>7</timeSpent> <timeSpentPretty>7s</timeSpentPretty> <icon /> @@ -1780,6 +1816,7 @@ </row> </customVariables> <generationTime>0.54s</generationTime> + <interactionPosition>4</interactionPosition> <timeSpent>8</timeSpent> <timeSpentPretty>8s</timeSpentPretty> <icon /> @@ -1799,6 +1836,7 @@ </row> </customVariables> <generationTime>0.34s</generationTime> + <interactionPosition>8</interactionPosition> <icon /> </row> @@ -1825,6 +1863,7 @@ <visitDurationPretty>54s</visitDurationPretty> <searches>0</searches> <actions>10</actions> + <interactions>10</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1908,6 +1947,7 @@ </row> </customVariables> <generationTime>0.001s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1934,6 +1974,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2005,6 +2046,7 @@ <customVariablePageValue1>302</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>240</timeSpent> <timeSpentPretty>4 min 0s</timeSpentPretty> <icon /> @@ -2034,6 +2076,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -2060,6 +2103,7 @@ <visitDurationPretty>4 min 2s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2151,6 +2195,7 @@ </row> </customVariables> <generationTime>0.36s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2177,6 +2222,7 @@ <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2253,6 +2299,7 @@ </row> </customVariables> <generationTime>0.11s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -2282,6 +2329,7 @@ <customVariablePageValue1>301</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -2309,6 +2357,7 @@ </row> </customVariables> <generationTime>0.11s</generationTime> + <interactionPosition>3</interactionPosition> <icon /> </row> @@ -2335,6 +2384,7 @@ <visitDurationPretty>2s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>example.com</referrerName> @@ -2422,6 +2472,7 @@ </row> </customVariables> <generationTime>0.36s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2448,6 +2499,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2528,6 +2580,7 @@ </row> </customVariables> <generationTime>0.36s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -2558,6 +2611,7 @@ </row> </customVariables> <generationTime>0.36s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2584,6 +2638,7 @@ <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2674,6 +2729,7 @@ <customVariablePageValue3>301</customVariablePageValue3> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2700,6 +2756,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -2794,6 +2851,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2820,6 +2878,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>piwik.org</referrerName> @@ -2915,6 +2974,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -2941,6 +3001,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>sn110w.snt110.mail.live.com</referrerName> @@ -3053,6 +3114,7 @@ </row> </customVariables> <generationTime>0.001s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3079,6 +3141,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>www.test.nl</referrerName> @@ -3162,6 +3225,7 @@ </row> </customVariables> <generationTime>0.009s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3188,6 +3252,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3261,6 +3326,7 @@ </row> </customVariables> <eventName>myvideo</eventName> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -3287,6 +3353,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3359,6 +3426,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -3385,6 +3453,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3467,6 +3536,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3493,6 +3563,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3579,6 +3650,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3605,6 +3677,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3680,6 +3753,7 @@ <customVariablePageValue1>301</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -3709,6 +3783,7 @@ <customVariablePageValue1>307</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -3735,6 +3810,7 @@ <visitDurationPretty>3 min 2s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3810,6 +3886,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <timeSpent>61</timeSpent> <timeSpentPretty>1 min 1s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -3828,6 +3905,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <timeSpent>61</timeSpent> <timeSpentPretty>1 min 1s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -3846,6 +3924,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/download.png</icon> </row> @@ -3872,6 +3951,7 @@ <visitDurationPretty>2 min 3s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -3958,6 +4038,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -3984,6 +4065,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4070,6 +4152,7 @@ <customVariablePageValue1>500</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4096,6 +4179,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4171,6 +4255,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/download.png</icon> </row> @@ -4197,6 +4282,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4283,6 +4369,7 @@ <customVariablePageValue1>404</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4309,6 +4396,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4395,6 +4483,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4421,6 +4510,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4507,6 +4597,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4533,6 +4624,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4615,6 +4707,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4641,6 +4734,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4723,6 +4817,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4749,6 +4844,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4831,6 +4927,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4857,6 +4954,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -4939,6 +5037,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -4965,6 +5064,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5047,6 +5147,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5073,6 +5174,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5155,6 +5257,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5181,6 +5284,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5263,6 +5367,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5289,6 +5394,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5371,6 +5477,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5397,6 +5504,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5479,6 +5587,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5505,6 +5614,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5587,6 +5697,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5613,6 +5724,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5695,6 +5807,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5721,6 +5834,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5803,6 +5917,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5829,6 +5944,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -5911,6 +6027,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -5937,6 +6054,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -6019,6 +6137,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -6045,6 +6164,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -6127,6 +6247,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -6153,6 +6274,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -6235,6 +6357,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -6261,6 +6384,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 9d638427bf..adef933973 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -20,6 +20,7 @@ </row> </customVariables> <generationTime>0.29s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -46,6 +47,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>blog.comperiosearch.com</referrerName> @@ -134,6 +136,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>79</timeSpent> <timeSpentPretty>1 min 19s</timeSpentPretty> <icon /> @@ -152,6 +155,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -178,6 +182,7 @@ <visitDurationPretty>1 min 20s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -254,6 +259,7 @@ </row> </customVariables> <generationTime>0.41s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -280,6 +286,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -380,6 +387,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>32</timeSpent> <timeSpentPretty>32s</timeSpentPretty> <icon /> @@ -398,6 +406,7 @@ <customVariablePageValue1>501</customVariablePageValue1> </row> </customVariables> + <interactionPosition>2</interactionPosition> <icon /> </row> @@ -424,6 +433,7 @@ <visitDurationPretty>33s</visitDurationPretty> <searches>0</searches> <actions>2</actions> + <interactions>2</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -516,6 +526,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -542,6 +553,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>musicforeveryoneradio.be</referrerName> @@ -635,6 +647,7 @@ </row> </customVariables> <generationTime>0.39s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -661,6 +674,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -761,6 +775,7 @@ <customVariablePageValue1>404</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -787,6 +802,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -876,6 +892,7 @@ </row> </customVariables> <generationTime>0.12s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -902,6 +919,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>berndjung.com</referrerName> @@ -983,6 +1001,7 @@ </row> </customVariables> <generationTime>0.15s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1009,6 +1028,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>forum.golem.de</referrerName> @@ -1110,6 +1130,7 @@ </row> </customVariables> <generationTime>0.18s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>2</timeSpent> <timeSpentPretty>2s</timeSpentPretty> <icon /> @@ -1129,6 +1150,7 @@ </row> </customVariables> <generationTime>0.11s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>7</timeSpent> <timeSpentPretty>7s</timeSpentPretty> <icon /> @@ -1147,6 +1169,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition /> <icon>plugins/Morpheus/images/download.png</icon> </row> @@ -1173,6 +1196,7 @@ <visitDurationPretty>10s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>2</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -1258,6 +1282,7 @@ </row> </customVariables> <generationTime>0.13s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1284,6 +1309,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1377,6 +1403,7 @@ </row> </customVariables> <generationTime>0.06s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1403,6 +1430,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>musicforeveryoneradio.be</referrerName> @@ -1503,6 +1531,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1529,6 +1558,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>piwik.org</referrerName> @@ -1613,6 +1643,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1639,6 +1670,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>sn110w.snt110.mail.live.com</referrerName> @@ -1739,6 +1771,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -1761,6 +1794,7 @@ <customVariablePageValue4>PRODUCT name</customVariablePageValue4> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -1779,6 +1813,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>3</interactionPosition> <icon /> </row> @@ -1805,6 +1840,7 @@ <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>piwik.org</referrerName> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 23daf4bf06..75c89e1aa1 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -13,6 +13,7 @@ <pageIdAction>4</pageIdAction> <pageId>46</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -42,6 +43,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -65,6 +67,7 @@ <pageIdAction>47</pageIdAction> <pageId>48</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -77,6 +80,7 @@ <pageIdAction>48</pageIdAction> <pageId>49</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -92,6 +96,7 @@ <eventAction>Action8</eventAction> <eventName>Name8</eventName> <eventValue>353.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -118,6 +123,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -221,6 +227,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -247,6 +254,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -329,6 +337,7 @@ <pageIdAction>4</pageIdAction> <pageId>41</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -363,6 +372,7 @@ <pageIdAction>42</pageIdAction> <pageId>42</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -375,6 +385,7 @@ <pageIdAction>43</pageIdAction> <pageId>43</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -390,6 +401,7 @@ <eventAction>Action7</eventAction> <eventName>Name7</eventName> <eventValue>352.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -416,6 +428,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index 69d9272531..13e2249fbb 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -34,6 +34,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -60,6 +61,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -142,6 +144,7 @@ <pageIdAction>4</pageIdAction> <pageId>35</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -171,6 +174,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -194,6 +198,7 @@ <pageIdAction>37</pageIdAction> <pageId>37</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -206,6 +211,7 @@ <pageIdAction>38</pageIdAction> <pageId>38</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -221,6 +227,7 @@ <eventAction>Action6</eventAction> <eventName>Name6</eventName> <eventValue>351.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -247,6 +254,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -350,6 +358,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -376,6 +385,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 0323bd788c..0861763ac1 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -24,6 +24,7 @@ <pageIdAction>2</pageIdAction> <pageId>95</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -50,6 +51,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -124,6 +126,7 @@ <pageIdAction>4</pageIdAction> <pageId>46</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -153,6 +156,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -176,6 +180,7 @@ <pageIdAction>47</pageIdAction> <pageId>48</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -188,6 +193,7 @@ <pageIdAction>48</pageIdAction> <pageId>49</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -203,6 +209,7 @@ <eventAction>Action8</eventAction> <eventName>Name8</eventName> <eventValue>353.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -229,6 +236,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -332,6 +340,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -358,6 +367,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -440,6 +450,7 @@ <pageIdAction>4</pageIdAction> <pageId>41</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -474,6 +485,7 @@ <pageIdAction>42</pageIdAction> <pageId>42</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -486,6 +498,7 @@ <pageIdAction>43</pageIdAction> <pageId>43</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -501,6 +514,7 @@ <eventAction>Action7</eventAction> <eventName>Name7</eventName> <eventValue>352.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -527,6 +541,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -630,6 +645,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -656,6 +672,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -738,6 +755,7 @@ <pageIdAction>4</pageIdAction> <pageId>35</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -767,6 +785,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -790,6 +809,7 @@ <pageIdAction>37</pageIdAction> <pageId>37</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -802,6 +822,7 @@ <pageIdAction>38</pageIdAction> <pageId>38</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -817,6 +838,7 @@ <eventAction>Action6</eventAction> <eventName>Name6</eventName> <eventValue>351.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -843,6 +865,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -946,6 +969,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -972,6 +996,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 0323bd788c..0861763ac1 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -24,6 +24,7 @@ <pageIdAction>2</pageIdAction> <pageId>95</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -50,6 +51,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -124,6 +126,7 @@ <pageIdAction>4</pageIdAction> <pageId>46</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -153,6 +156,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -176,6 +180,7 @@ <pageIdAction>47</pageIdAction> <pageId>48</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -188,6 +193,7 @@ <pageIdAction>48</pageIdAction> <pageId>49</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -203,6 +209,7 @@ <eventAction>Action8</eventAction> <eventName>Name8</eventName> <eventValue>353.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -229,6 +236,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -332,6 +340,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -358,6 +367,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -440,6 +450,7 @@ <pageIdAction>4</pageIdAction> <pageId>41</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -474,6 +485,7 @@ <pageIdAction>42</pageIdAction> <pageId>42</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -486,6 +498,7 @@ <pageIdAction>43</pageIdAction> <pageId>43</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -501,6 +514,7 @@ <eventAction>Action7</eventAction> <eventName>Name7</eventName> <eventValue>352.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -527,6 +541,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -630,6 +645,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -656,6 +672,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -738,6 +755,7 @@ <pageIdAction>4</pageIdAction> <pageId>35</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -767,6 +785,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -790,6 +809,7 @@ <pageIdAction>37</pageIdAction> <pageId>37</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -802,6 +822,7 @@ <pageIdAction>38</pageIdAction> <pageId>38</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -817,6 +838,7 @@ <eventAction>Action6</eventAction> <eventName>Name6</eventName> <eventValue>351.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -843,6 +865,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -946,6 +969,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -972,6 +996,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 4665c485f0..a836236262 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -24,6 +24,7 @@ <pageIdAction>2</pageIdAction> <pageId>95</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -50,6 +51,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> @@ -124,6 +126,7 @@ <pageIdAction>4</pageIdAction> <pageId>46</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -153,6 +156,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -176,6 +180,7 @@ <pageIdAction>47</pageIdAction> <pageId>48</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -188,6 +193,7 @@ <pageIdAction>48</pageIdAction> <pageId>49</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -203,6 +209,7 @@ <eventAction>Action8</eventAction> <eventName>Name8</eventName> <eventValue>353.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -229,6 +236,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -332,6 +340,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -358,6 +367,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -440,6 +450,7 @@ <pageIdAction>4</pageIdAction> <pageId>41</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -474,6 +485,7 @@ <pageIdAction>42</pageIdAction> <pageId>42</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -486,6 +498,7 @@ <pageIdAction>43</pageIdAction> <pageId>43</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -501,6 +514,7 @@ <eventAction>Action7</eventAction> <eventName>Name7</eventName> <eventValue>352.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -527,6 +541,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -630,6 +645,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -656,6 +672,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -738,6 +755,7 @@ <pageIdAction>4</pageIdAction> <pageId>35</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -767,6 +785,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -790,6 +809,7 @@ <pageIdAction>37</pageIdAction> <pageId>37</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -802,6 +822,7 @@ <pageIdAction>38</pageIdAction> <pageId>38</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -817,6 +838,7 @@ <eventAction>Action6</eventAction> <eventName>Name6</eventName> <eventValue>351.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -843,6 +865,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -946,6 +969,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -972,6 +996,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1054,6 +1079,7 @@ <pageIdAction>4</pageIdAction> <pageId>30</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -1088,6 +1114,7 @@ <pageIdAction>32</pageIdAction> <pageId>31</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -1100,6 +1127,7 @@ <pageIdAction>33</pageIdAction> <pageId>32</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -1115,6 +1143,7 @@ <eventAction>Action5</eventAction> <eventName>Name5</eventName> <eventValue>350.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1141,6 +1170,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1244,6 +1274,7 @@ <customVariablePageValue5>Cvar5 PAGE value is 5</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -1270,6 +1301,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -1352,6 +1384,7 @@ <pageIdAction>4</pageIdAction> <pageId>24</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -1381,6 +1414,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -1404,6 +1438,7 @@ <pageIdAction>27</pageIdAction> <pageId>26</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -1416,6 +1451,7 @@ <pageIdAction>28</pageIdAction> <pageId>27</pageId> + <interactionPosition /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -1431,6 +1467,7 @@ <eventAction>Action4</eventAction> <eventName>Name4</eventName> <eventValue>349.678</eventValue> + <interactionPosition /> <icon>plugins/Morpheus/images/event.png</icon> </row> @@ -1457,6 +1494,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>5</actions> + <interactions>2</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml index 0e8f519c31..da61c550e1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml @@ -10,15 +10,15 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <goals> - <row idgoal='2'> + <row idgoal='1'> <nb_conversions>1</nb_conversions> <nb_visits_converted>1</nb_visits_converted> - <revenue>1</revenue> + <revenue>42</revenue> </row> - <row idgoal='1'> + <row idgoal='2'> <nb_conversions>1</nb_conversions> <nb_visits_converted>1</nb_visits_converted> - <revenue>42</revenue> + <revenue>1</revenue> </row> </goals> <nb_conversions>2</nb_conversions> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml index 37691b2a89..e809cc9f97 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml @@ -10,14 +10,19 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>42</revenue> + </row> <row idgoal='2'> <nb_conversions>1</nb_conversions> <nb_visits_converted>1</nb_visits_converted> <revenue>1</revenue> </row> </goals> - <nb_conversions>1</nb_conversions> - <revenue>1</revenue> + <nb_conversions>2</nb_conversions> + <revenue>43</revenue> <segment>deviceType==desktop</segment> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> @@ -81,18 +86,4 @@ <segment>deviceType==tv</segment> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> - <row> - <label>Unknown</label> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>42</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>42</revenue> - <nb_visits>0</nb_visits> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> - </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index eb5982c49b..453d9a946e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -25,6 +25,7 @@ <pageId>9</pageId> <generationTime>0.13s</generationTime> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -51,6 +52,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Yahoo!</referrerName> @@ -126,6 +128,7 @@ <pageId>1</pageId> <generationTime>0.23s</generationTime> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -139,6 +142,7 @@ <pageId>2</pageId> <generationTime>0.22s</generationTime> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -151,6 +155,7 @@ <pageIdAction>5</pageIdAction> <pageId>3</pageId> + <interactionPosition /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -163,6 +168,7 @@ <pageIdAction>6</pageIdAction> <pageId>4</pageId> + <interactionPosition /> <timeSpent>72</timeSpent> <timeSpentPretty>1 min 12s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> @@ -175,6 +181,7 @@ <pageIdAction>7</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <timeSpent>108</timeSpent> <timeSpentPretty>1 min 48s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -187,6 +194,7 @@ <pageIdAction>8</pageIdAction> <pageId>6</pageId> + <interactionPosition /> <timeSpent>72</timeSpent> <timeSpentPretty>1 min 12s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> @@ -211,6 +219,7 @@ <pageId>7</pageId> <siteSearchKeyword>Banks Own The World</siteSearchKeyword> <generationTime>0.81s</generationTime> + <interactionPosition>3</interactionPosition> <timeSpent>108</timeSpent> <timeSpentPretty>1 min 48s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> @@ -224,6 +233,7 @@ <pageId>8</pageId> <generationTime>0.02s</generationTime> + <interactionPosition>4</interactionPosition> <icon /> </row> @@ -250,6 +260,7 @@ <visitDurationPretty>27 min 1s</visitDurationPretty> <searches>1</searches> <actions>8</actions> + <interactions>4</interactions> <referrerType>website</referrerType> <referrerTypeName>Websites</referrerTypeName> <referrerName>referrer.com</referrerName> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index 8d118edb9a..480d02e41e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -13,6 +13,7 @@ <pageIdAction>2</pageIdAction> <pageId>2</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -39,6 +40,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Moteurs de recherche</referrerTypeName> <referrerName>Google</referrerName> @@ -113,6 +115,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>1084</timeSpent> <timeSpentPretty>18 min 4s</timeSpentPretty> <icon /> @@ -152,6 +155,7 @@ <visitDurationPretty>18 min 4s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>search</referrerType> <referrerTypeName>Moteurs de recherche</referrerTypeName> <referrerName>Google</referrerName> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 73cc01ca74..2fc3bd1b69 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -18,6 +18,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1365328800</timestamp> </row> @@ -44,6 +45,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -114,6 +116,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1365246000</timestamp> </row> @@ -140,6 +143,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -210,6 +214,7 @@ <customVariablePageValue1>200</customVariablePageValue1> </row> </customVariables> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1365163200</timestamp> </row> @@ -236,6 +241,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index 8bdcb100dc..483c51771c 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -13,6 +13,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -39,6 +40,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index 448942b60a..893c2dbf6f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -1,7 +1,7 @@ All Websites dashboard -label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,orders,ecommerce_revenue,visits_evolution,actions_evolution,pageviews_evolution,nb_conversions_evolution,revenue_evolution,orders_evolution,ecommerce_revenue_evolution -Site 1,11,43,43,$ 0,0,0,$ 0,100%,100%,0%,0%,0,0,0 -Site 2,1,3,3,$ 0,0,0,$ 0,100%,100%,0%,0%,0,0,0 +label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders,ecommerce_revenue,orders_evolution,ecommerce_revenue_evolution +Site 1,11,43,43,$ 0,0,100%,100%,100%,0%,0%,0,$ 0,0,0 +Site 2,1,3,3,$ 0,0,100%,100%,100%,0%,0%,0,$ 0,0,0 Visits Summary nb_uniq_visitors,nb_visits,nb_actions,max_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate @@ -236,8 +236,8 @@ Saturday,1,5,0%,5,00:15:01,0% Sunday,3,7,0%,2.3,00:05:00,67% Actions - Main metrics -nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords -43,27,0,0,0,0,0,0 +nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords,avg_time_generation +43,27,0,0,0,0,0,0,0.3s Bandwidth - Main metrics nb_total_overall_bandwidth,nb_total_pageview_bandwidth,nb_total_download_bandwidth @@ -257,8 +257,8 @@ products,1,1,100%,0.15s Entry page titles label,entry_nb_visits,entry_bounce_count,bounce_rate,avg_time_generation -second visitor/two days later/a new visit,8,0,0%,0.32s first page view,2,2,100%,0.14s +second visitor/two days later/a new visit,8,0,0%,0.32s Exit pages label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation @@ -268,16 +268,16 @@ products,1,1,100%,0.15s Exit page titles label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation -Checkout/Purchasing...,8,8,100%,0.45s first page view,2,2,100%,0.14s +Checkout/Purchasing...,8,8,100%,0.45s Page titles label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation +first page view,2,2,100%,00:00:00,100%,0.14s +Page Name not defined,1,1,0%,00:00:00,0%,0.22s Checkout/Purchasing...,8,8,0%,00:00:00,100%,0.45s second visitor/two days later/a new visit,8,8,0%,00:06:00,0%,0.32s second visitor/two days later/second page view,8,8,0%,00:09:00,0%,0.17s -first page view,2,2,100%,00:00:00,100%,0.14s -Page Name not defined,1,1,0%,00:00:00,0%,0.22s Site Search Keywords No data available @@ -317,9 +317,9 @@ No data available Referrer Type label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -Websites - referrer.com,6,22,3.7,00:10:01,33%,$ 0 -Campaigns - goal-matching-url-parameter,4,20,5,00:15:01,0%,$ 0 Direct Entry,1,1,1,00:00:00,100%,$ 0 +Websites,6,22,3.7,00:10:01,33%,$ 0 +Campaigns,4,20,5,00:15:01,0%,$ 0 All Referrers label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index fab3a92721..06bf981720 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -4100,6 +4100,14 @@ 0 </td> </tr> + + <tr style="background-color: rgb(242,242,242);line-height: 22px;"> + <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + Avg. generation time </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 0.3s + </td> + </tr> </tbody> </table> <br/> @@ -4386,35 +4394,35 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - second visitor/two days later/a new visit </td> + first page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.32s + 0.14s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - first page view </td> + second visitor/two days later/a new visit </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.14s + 0.32s </td> </tr> </tbody> @@ -4539,35 +4547,35 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Checkout/Purchasing... </td> + first page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.45s + 0.14s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - first page view </td> + Checkout/Purchasing... </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.14s + 0.45s </td> </tr> </tbody> @@ -4610,38 +4618,38 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Checkout/Purchasing... </td> + first page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.45s + 0.14s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - second visitor/two days later/a new visit </td> + Page Name not defined </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:06:00 + 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% @@ -4650,13 +4658,13 @@ 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.32s + 0.22s </td> </tr> <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - second visitor/two days later/second page view </td> + Checkout/Purchasing... </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 8 </td> @@ -4664,53 +4672,53 @@ 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:09:00 + 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.17s + 0.45s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - first page view </td> + second visitor/two days later/a new visit </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:06:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.14s + 0.32s </td> </tr> <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Page Name not defined </td> + second visitor/two days later/second page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:09:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% @@ -4719,7 +4727,7 @@ 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.22s + 0.17s </td> </tr> </tbody> @@ -4822,21 +4830,21 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Websites - referrer.com </td> + Direct Entry </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 6 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 22 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 3.7 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:10:01 + 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 33% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> $ 0 @@ -4845,21 +4853,21 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Campaigns - goal-matching-url-parameter </td> + Websites </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 4 + 6 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 20 + 22 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 5 + 3.7 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:15:01 + 00:10:01 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 33% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> $ 0 @@ -4868,21 +4876,21 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Direct Entry </td> + Campaigns </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 4 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 20 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 5 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:15:01 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> $ 0 diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml index ed2500e125..1bafbae6e3 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml @@ -11,6 +11,7 @@ <pageIdAction>2</pageIdAction> <serverTimePretty>Mar 6, 2010 11:22:33</serverTimePretty> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1267874553</timestamp> </row> @@ -30,6 +31,7 @@ <pageIdAction>3</pageIdAction> <serverTimePretty>Mar 6, 2010 11:25:33</serverTimePretty> <pageId>2</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -42,6 +44,7 @@ <pageIdAction>4</pageIdAction> <serverTimePretty>Mar 6, 2010 11:28:33</serverTimePretty> <pageId>3</pageId> + <interactionPosition>2</interactionPosition> <icon /> <timestamp>1267874913</timestamp> </row> @@ -61,6 +64,7 @@ <pageIdAction>6</pageIdAction> <serverTimePretty>Mar 6, 2010 13:16:33</serverTimePretty> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -73,6 +77,7 @@ <pageIdAction>2</pageIdAction> <serverTimePretty>Mar 6, 2010 13:22:33</serverTimePretty> <pageId>5</pageId> + <interactionPosition>2</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -85,6 +90,7 @@ <pageIdAction>2</pageIdAction> <serverTimePretty>Mar 6, 2010 13:28:33</serverTimePretty> <pageId>6</pageId> + <interactionPosition>3</interactionPosition> <icon /> <timestamp>1267882113</timestamp> </row> @@ -104,6 +110,7 @@ <pageIdAction>2</pageIdAction> <serverTimePretty>Mar 6, 2010 13:34:33</serverTimePretty> <pageId>7</pageId> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1267882473</timestamp> </row> @@ -123,6 +130,7 @@ <pageIdAction>10</pageIdAction> <serverTimePretty>Mar 6, 2010 16:28:33</serverTimePretty> <pageId>10</pageId> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1267892913</timestamp> </row> @@ -142,6 +150,7 @@ <pageIdAction>10</pageIdAction> <serverTimePretty>Mar 6, 2010 16:22:33</serverTimePretty> <pageId>8</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -154,6 +163,7 @@ <pageIdAction>10</pageIdAction> <serverTimePretty>Mar 6, 2010 16:28:33</serverTimePretty> <pageId>9</pageId> + <interactionPosition>2</interactionPosition> <timeSpent>721</timeSpent> <timeSpentPretty>12 min 1s</timeSpentPretty> <icon /> @@ -203,6 +213,7 @@ <pageIdAction>2</pageIdAction> <serverTimePretty>Mar 14, 2010 11:22:33</serverTimePretty> <pageId>11</pageId> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1268565753</timestamp> </row> @@ -222,6 +233,7 @@ <pageIdAction>2</pageIdAction> <serverTimePretty>Mar 14, 2010 11:46:33</serverTimePretty> <pageId>12</pageId> + <interactionPosition>1</interactionPosition> <icon /> <timestamp>1268567193</timestamp> </row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index 4015aad321..3e5457c1ff 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -101,7 +101,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports.<br /><br />Piwik will automatically exclude the common session parameters (phpsessid, sessionid, ...).</inlineHelp> + <inlineHelp>Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports. Regular expressions such as /^sess.*|.*[dD]ate$/ are suported.<br /><br />Piwik will automatically exclude the common session parameters (phpsessid, sessionid, ...).</inlineHelp> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml index 2da072a826..5d14d04cd7 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml @@ -80,7 +80,7 @@ <nb_uniq_visitors_returning>Unique returning visitors</nb_uniq_visitors_returning> <nb_users_returning>Returning Users</nb_users_returning> <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> + <nb_interactions>Content Interactions</nb_interactions> <interaction_rate>Interaction Rate</interaction_rate> <nb_visits_percentage>% Visits</nb_visits_percentage> <nb_hits_with_bandwidth>Recorded hits with bandwidth</nb_hits_with_bandwidth> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml index 097ddcd4c4..b14c503cb3 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml @@ -51,6 +51,11 @@ <documentation>The number of times this Page was visited after a visitor did a search on your website, and clicked on this page in the search results.</documentation> </row> <row> + <name>Content Interactions</name> + <id>nb_interactions</id> + <documentation>The number of times a content block was interacted with (eg, a 'click' on a banner or ad).</documentation> + </row> + <row> <name>Conversion Rate</name> <id>conversion_rate</id> <documentation>The percentage of visits that triggered a goal conversion.</documentation> @@ -91,11 +96,6 @@ <documentation>The ratio of content impressions to interactions.</documentation> </row> <row> - <name>Interactions</name> - <id>nb_interactions</id> - <documentation>The number of times a content block was interacted with (eg, a 'click' on a banner or ad).</documentation> - </row> - <row> <name>Maximum value</name> <id>max_event_value</id> <documentation>The maximum value for this event</documentation> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index ea1dbce1af..b2f868a1e0 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -1565,7 +1565,7 @@ <dimension>Content Name</dimension> <metrics> <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> + <nb_interactions>Content Interactions</nb_interactions> </metrics> <metricsDocumentation> <nb_impressions>The number of times a content block, such as a banner or an ad, was displayed on a page.</nb_impressions> @@ -1589,7 +1589,7 @@ <dimension>Content Piece</dimension> <metrics> <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> + <nb_interactions>Content Interactions</nb_interactions> </metrics> <metricsDocumentation> <nb_impressions>The number of times a content block, such as a banner or an ad, was displayed on a page.</nb_impressions> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml index 2cbc2807d4..75524fb54c 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml @@ -1430,7 +1430,7 @@ <name>Goal 1 - Thank you</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>15</order> + <order>2</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -1456,7 +1456,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>13</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -1484,7 +1484,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>14</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -1513,7 +1513,7 @@ </subcategory> <module>Goals</module> <action>goalConversionsOverview</action> - <order>15</order> + <order>25</order> <parameters> <module>Goals</module> <action>goalConversionsOverview</action> @@ -1535,7 +1535,7 @@ <name>Goal Goal 1 - Thank you conversions by type of visit</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>17</order> + <order>35</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2037,7 +2037,7 @@ <name>Goal 2 - Hello</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>20</order> + <order>3</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2063,7 +2063,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>18</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -2091,7 +2091,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>19</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2120,7 +2120,7 @@ </subcategory> <module>Goals</module> <action>goalConversionsOverview</action> - <order>20</order> + <order>25</order> <parameters> <module>Goals</module> <action>goalConversionsOverview</action> @@ -2142,7 +2142,7 @@ <name>Goal Goal 2 - Hello conversions by type of visit</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>22</order> + <order>35</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2644,7 +2644,7 @@ <name>triggered js</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>25</order> + <order>4</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2670,7 +2670,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>23</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -2698,7 +2698,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>24</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2749,7 +2749,7 @@ <name>Goal triggered js conversions by type of visit</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>27</order> + <order>35</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -3251,7 +3251,7 @@ <name>Overview</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>5</order> + <order>0</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -3277,7 +3277,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>1</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -3304,7 +3304,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>2</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -3331,7 +3331,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>3</order> + <order>25</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -3361,7 +3361,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>4</order> + <order>25</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -3391,7 +3391,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>5</order> + <order>25</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -3412,7 +3412,7 @@ <name>Conversions overview by type of visit</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>7</order> + <order>35</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -3969,7 +3969,7 @@ <name>Overview</name> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>10</order> + <order>1</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -3995,7 +3995,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>8</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -4023,7 +4023,7 @@ </subcategory> <module>Ecommerce</module> <action>getSparklines</action> - <order>9</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -4051,7 +4051,7 @@ </subcategory> <module>Ecommerce</module> <action>getConversionsOverview</action> - <order>10</order> + <order>25</order> <parameters> <module>Ecommerce</module> <action>getConversionsOverview</action> @@ -4197,7 +4197,7 @@ <name /> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>12</order> + <order>5</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index 8499ae5bca..60d41d94be 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -27,6 +27,13 @@ <row> <type>metric</type> <category>Visit</category> + <name>Number of Interactions</name> + <segment>interactions</segment> + <acceptedValues>Any positive integer</acceptedValues> + </row> + <row> + <type>metric</type> + <category>Visit</category> <name>Number of Internal Searches</name> <segment>searches</segment> <acceptedValues>To select all visits who used internal Site Search, use: &segment=searches>0</acceptedValues> @@ -482,6 +489,13 @@ <row> <type>dimension</type> <category>Actions</category> + <name>Content Interaction</name> + <segment>contentInteraction</segment> + <acceptedValues>The type of interaction with the content. For instance "click" or "submit".</acceptedValues> + </row> + <row> + <type>dimension</type> + <category>Actions</category> <name>Content Name</name> <segment>contentName</segment> <acceptedValues>The name of a content block, for instance "Ad Sale"</acceptedValues> @@ -533,13 +547,6 @@ <row> <type>dimension</type> <category>Actions</category> - <name>Interaction</name> - <segment>contentInteraction</segment> - <acceptedValues>The type of interaction with the content. For instance "click" or "submit".</acceptedValues> - </row> - <row> - <type>dimension</type> - <category>Actions</category> <name>Keyword (Site Search)</name> <segment>siteSearchKeyword</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index 17adcdc0ad..2607e36f1d 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -1740,7 +1740,7 @@ </subcategory> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>10</order> + <order>1</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -1766,7 +1766,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>8</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -1794,7 +1794,7 @@ </subcategory> <module>Ecommerce</module> <action>getSparklines</action> - <order>9</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -1822,7 +1822,7 @@ </subcategory> <module>Ecommerce</module> <action>getConversionsOverview</action> - <order>10</order> + <order>25</order> <parameters> <module>Ecommerce</module> <action>getConversionsOverview</action> @@ -2028,7 +2028,7 @@ </subcategory> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>5</order> + <order>0</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2054,7 +2054,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>1</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -2081,7 +2081,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>2</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2108,7 +2108,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>3</order> + <order>25</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2138,7 +2138,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>4</order> + <order>25</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2168,7 +2168,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>5</order> + <order>25</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2200,7 +2200,7 @@ </subcategory> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>15</order> + <order>2</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2226,7 +2226,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>13</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -2254,7 +2254,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>14</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2283,7 +2283,7 @@ </subcategory> <module>Goals</module> <action>goalConversionsOverview</action> - <order>15</order> + <order>25</order> <parameters> <module>Goals</module> <action>goalConversionsOverview</action> @@ -2316,7 +2316,7 @@ </subcategory> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>20</order> + <order>3</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2342,7 +2342,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>18</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -2370,7 +2370,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>19</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> @@ -2399,7 +2399,7 @@ </subcategory> <module>Goals</module> <action>goalConversionsOverview</action> - <order>20</order> + <order>25</order> <parameters> <module>Goals</module> <action>goalConversionsOverview</action> @@ -2432,7 +2432,7 @@ </subcategory> <module>CoreHome</module> <action>renderWidgetContainer</action> - <order>25</order> + <order>4</order> <parameters> <module>CoreHome</module> <action>renderWidgetContainer</action> @@ -2458,7 +2458,7 @@ </subcategory> <module>Goals</module> <action>getEvolutionGraph</action> - <order>23</order> + <order>5</order> <parameters> <forceView>1</forceView> <viewDataTable>graphEvolution</viewDataTable> @@ -2486,7 +2486,7 @@ </subcategory> <module>Goals</module> <action>get</action> - <order>24</order> + <order>15</order> <parameters> <forceView>1</forceView> <viewDataTable>sparklines</viewDataTable> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php index 80f9d11afe..f3d189a6a8 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php @@ -1 +1 @@ -a:1:{i:0;a:90:{s:9:"nb_visits";s:6:"Visits";s:16:"nb_uniq_visitors";s:15:"Unique visitors";s:10:"nb_actions";s:7:"Actions";s:8:"nb_users";s:5:"Users";s:20:"nb_actions_per_visit";s:17:"Actions per Visit";s:16:"avg_time_on_site";s:20:"Avg. Time on Website";s:11:"bounce_rate";s:11:"Bounce Rate";s:15:"conversion_rate";s:15:"Conversion Rate";s:5:"label";s:5:"Label";s:4:"date";s:4:"Date";s:16:"avg_time_on_page";s:17:"Avg. time on page";s:14:"sum_time_spent";s:41:"Total time spent by visitors (in seconds)";s:16:"sum_visit_length";s:41:"Total time spent by visitors (in seconds)";s:12:"bounce_count";s:7:"Bounces";s:22:"bounce_count_returning";s:33:"Bounce Count for Returning Visits";s:11:"max_actions";s:28:"Maximum actions in one visit";s:21:"max_actions_returning";s:38:"Maximum actions in one returning visit";s:29:"nb_visits_converted_returning";s:36:"Number of converted returning visits";s:26:"sum_visit_length_returning";s:51:"Total time spent by returning visitors (in seconds)";s:19:"nb_visits_converted";s:23:"Visits with Conversions";s:14:"nb_conversions";s:11:"Conversions";s:7:"revenue";s:7:"Revenue";s:7:"nb_hits";s:9:"Pageviews";s:15:"entry_nb_visits";s:9:"Entrances";s:22:"entry_nb_uniq_visitors";s:16:"Unique entrances";s:14:"exit_nb_visits";s:5:"Exits";s:21:"exit_nb_uniq_visitors";s:12:"Unique exits";s:18:"entry_bounce_count";s:7:"Bounces";s:17:"exit_bounce_count";s:7:"Bounces";s:9:"exit_rate";s:9:"Exit rate";s:26:"sum_daily_nb_uniq_visitors";s:27:"Unique visitors (daily sum)";s:18:"sum_daily_nb_users";s:17:"Users (daily sum)";s:32:"sum_daily_entry_nb_uniq_visitors";s:28:"Unique entrances (daily sum)";s:31:"sum_daily_exit_nb_uniq_visitors";s:24:"Unique exits (daily sum)";s:16:"entry_nb_actions";s:27:"Actions after entering here";s:22:"entry_sum_visit_length";s:61:"Total time spent by visitors (in seconds) after entering here";s:12:"nb_pageviews";s:9:"Pageviews";s:17:"nb_uniq_pageviews";s:16:"Unique Pageviews";s:12:"nb_downloads";s:9:"Downloads";s:17:"nb_uniq_downloads";s:16:"Unique Downloads";s:11:"nb_outlinks";s:8:"Outlinks";s:16:"nb_uniq_outlinks";s:15:"Unique Outlinks";s:11:"nb_searches";s:8:"Searches";s:11:"nb_keywords";s:15:"Unique Keywords";s:19:"avg_time_generation";s:20:"Avg. generation time";s:19:"nb_pages_per_search";s:20:"Search Results pages";s:24:"nb_hits_following_search";s:25:"Clicked in search results";s:16:"visits_evolution";s:16:"Visits Evolution";s:17:"actions_evolution";s:17:"Actions Evolution";s:19:"pageviews_evolution";s:19:"Pageviews Evolution";s:17:"revenue_evolution";s:17:"Revenue Evolution";s:24:"nb_conversions_evolution";s:21:"Conversions Evolution";s:16:"orders_evolution";s:26:"Ecommerce Orders Evolution";s:27:"ecommerce_revenue_evolution";s:25:"Product Revenue Evolution";s:6:"orders";s:16:"Ecommerce Orders";s:17:"ecommerce_revenue";s:15:"Product Revenue";s:17:"revenue_per_visit";s:17:"Revenue per Visit";s:8:"quantity";s:8:"Quantity";s:9:"avg_price";s:13:"Average Price";s:12:"avg_quantity";s:16:"Average Quantity";s:16:"revenue_subtotal";s:8:"Subtotal";s:11:"revenue_tax";s:3:"Tax";s:16:"revenue_shipping";s:8:"Shipping";s:16:"revenue_discount";s:8:"Discount";s:17:"avg_order_revenue";s:19:"Average Order Value";s:9:"nb_events";s:12:"Total events";s:15:"sum_event_value";s:11:"Total value";s:15:"min_event_value";s:13:"Minimum value";s:15:"max_event_value";s:13:"Maximum value";s:15:"avg_event_value";s:13:"Average value";s:20:"nb_events_with_value";s:19:"Events with a value";s:19:"nb_visits_returning";s:16:"Returning Visits";s:20:"nb_actions_returning";s:27:"Actions by Returning Visits";s:26:"avg_time_on_site_returning";s:43:"Avg. Duration of a Returning Visit (in sec)";s:21:"bounce_rate_returning";s:32:"Bounce Rate for Returning Visits";s:30:"nb_actions_per_visit_returning";s:32:"Avg. Actions per Returning Visit";s:26:"nb_uniq_visitors_returning";s:25:"Unique returning visitors";s:18:"nb_users_returning";s:15:"Returning Users";s:14:"nb_impressions";s:11:"Impressions";s:15:"nb_interactions";s:12:"Interactions";s:16:"interaction_rate";s:16:"Interaction Rate";s:20:"nb_visits_percentage";s:8:"% Visits";s:22:"nb_hits_with_bandwidth";s:28:"Recorded hits with bandwidth";s:13:"max_bandwidth";s:13:"Max Bandwidth";s:13:"min_bandwidth";s:13:"Min Bandwidth";s:13:"sum_bandwidth";s:13:"Sum Bandwidth";s:13:"avg_bandwidth";s:14:"Avg. Bandwidth";s:26:"nb_total_overall_bandwidth";s:25:"Bytes transferred overall";s:27:"nb_total_pageview_bandwidth";s:27:"Bytes transferred pageviews";s:27:"nb_total_download_bandwidth";s:27:"Bytes transferred downloads";}}
\ No newline at end of file +a:1:{i:0;a:90:{s:9:"nb_visits";s:6:"Visits";s:16:"nb_uniq_visitors";s:15:"Unique visitors";s:10:"nb_actions";s:7:"Actions";s:8:"nb_users";s:5:"Users";s:20:"nb_actions_per_visit";s:17:"Actions per Visit";s:16:"avg_time_on_site";s:20:"Avg. Time on Website";s:11:"bounce_rate";s:11:"Bounce Rate";s:15:"conversion_rate";s:15:"Conversion Rate";s:5:"label";s:5:"Label";s:4:"date";s:4:"Date";s:16:"avg_time_on_page";s:17:"Avg. time on page";s:14:"sum_time_spent";s:41:"Total time spent by visitors (in seconds)";s:16:"sum_visit_length";s:41:"Total time spent by visitors (in seconds)";s:12:"bounce_count";s:7:"Bounces";s:22:"bounce_count_returning";s:33:"Bounce Count for Returning Visits";s:11:"max_actions";s:28:"Maximum actions in one visit";s:21:"max_actions_returning";s:38:"Maximum actions in one returning visit";s:29:"nb_visits_converted_returning";s:36:"Number of converted returning visits";s:26:"sum_visit_length_returning";s:51:"Total time spent by returning visitors (in seconds)";s:19:"nb_visits_converted";s:23:"Visits with Conversions";s:14:"nb_conversions";s:11:"Conversions";s:7:"revenue";s:7:"Revenue";s:7:"nb_hits";s:9:"Pageviews";s:15:"entry_nb_visits";s:9:"Entrances";s:22:"entry_nb_uniq_visitors";s:16:"Unique entrances";s:14:"exit_nb_visits";s:5:"Exits";s:21:"exit_nb_uniq_visitors";s:12:"Unique exits";s:18:"entry_bounce_count";s:7:"Bounces";s:17:"exit_bounce_count";s:7:"Bounces";s:9:"exit_rate";s:9:"Exit rate";s:26:"sum_daily_nb_uniq_visitors";s:27:"Unique visitors (daily sum)";s:18:"sum_daily_nb_users";s:17:"Users (daily sum)";s:32:"sum_daily_entry_nb_uniq_visitors";s:28:"Unique entrances (daily sum)";s:31:"sum_daily_exit_nb_uniq_visitors";s:24:"Unique exits (daily sum)";s:16:"entry_nb_actions";s:27:"Actions after entering here";s:22:"entry_sum_visit_length";s:61:"Total time spent by visitors (in seconds) after entering here";s:12:"nb_pageviews";s:9:"Pageviews";s:17:"nb_uniq_pageviews";s:16:"Unique Pageviews";s:12:"nb_downloads";s:9:"Downloads";s:17:"nb_uniq_downloads";s:16:"Unique Downloads";s:11:"nb_outlinks";s:8:"Outlinks";s:16:"nb_uniq_outlinks";s:15:"Unique Outlinks";s:11:"nb_searches";s:8:"Searches";s:11:"nb_keywords";s:15:"Unique Keywords";s:19:"avg_time_generation";s:20:"Avg. generation time";s:19:"nb_pages_per_search";s:20:"Search Results pages";s:24:"nb_hits_following_search";s:25:"Clicked in search results";s:16:"visits_evolution";s:16:"Visits Evolution";s:17:"actions_evolution";s:17:"Actions Evolution";s:19:"pageviews_evolution";s:19:"Pageviews Evolution";s:17:"revenue_evolution";s:17:"Revenue Evolution";s:24:"nb_conversions_evolution";s:21:"Conversions Evolution";s:16:"orders_evolution";s:26:"Ecommerce Orders Evolution";s:27:"ecommerce_revenue_evolution";s:25:"Product Revenue Evolution";s:6:"orders";s:16:"Ecommerce Orders";s:17:"ecommerce_revenue";s:15:"Product Revenue";s:17:"revenue_per_visit";s:17:"Revenue per Visit";s:8:"quantity";s:8:"Quantity";s:9:"avg_price";s:13:"Average Price";s:12:"avg_quantity";s:16:"Average Quantity";s:16:"revenue_subtotal";s:8:"Subtotal";s:11:"revenue_tax";s:3:"Tax";s:16:"revenue_shipping";s:8:"Shipping";s:16:"revenue_discount";s:8:"Discount";s:17:"avg_order_revenue";s:19:"Average Order Value";s:9:"nb_events";s:12:"Total events";s:15:"sum_event_value";s:11:"Total value";s:15:"min_event_value";s:13:"Minimum value";s:15:"max_event_value";s:13:"Maximum value";s:15:"avg_event_value";s:13:"Average value";s:20:"nb_events_with_value";s:19:"Events with a value";s:19:"nb_visits_returning";s:16:"Returning Visits";s:20:"nb_actions_returning";s:27:"Actions by Returning Visits";s:26:"avg_time_on_site_returning";s:43:"Avg. Duration of a Returning Visit (in sec)";s:21:"bounce_rate_returning";s:32:"Bounce Rate for Returning Visits";s:30:"nb_actions_per_visit_returning";s:32:"Avg. Actions per Returning Visit";s:26:"nb_uniq_visitors_returning";s:25:"Unique returning visitors";s:18:"nb_users_returning";s:15:"Returning Users";s:14:"nb_impressions";s:11:"Impressions";s:15:"nb_interactions";s:20:"Content Interactions";s:16:"interaction_rate";s:16:"Interaction Rate";s:20:"nb_visits_percentage";s:8:"% Visits";s:22:"nb_hits_with_bandwidth";s:28:"Recorded hits with bandwidth";s:13:"max_bandwidth";s:13:"Max Bandwidth";s:13:"min_bandwidth";s:13:"Min Bandwidth";s:13:"sum_bandwidth";s:13:"Sum Bandwidth";s:13:"avg_bandwidth";s:14:"Avg. Bandwidth";s:26:"nb_total_overall_bandwidth";s:25:"Bytes transferred overall";s:27:"nb_total_pageview_bandwidth";s:27:"Bytes transferred pageviews";s:27:"nb_total_download_bandwidth";s:27:"Bytes transferred downloads";}}
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml index d0c3b6b131..c12dc93c9b 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml @@ -23,7 +23,7 @@ <row> <code>bn</code> <name>বাংলা</name> - <english_name>Bengali</english_name> + <english_name>Bangla</english_name> </row> <row> <code>bs</code> @@ -182,7 +182,7 @@ </row> <row> <code>pt-br</code> - <name>Português do Brasil</name> + <name>Português (Brasil)</name> <english_name>Brazilian Portuguese</english_name> </row> <row> @@ -242,7 +242,7 @@ </row> <row> <code>tl</code> - <name>Filipino</name> + <name>Tagalog</name> <english_name>Tagalog</english_name> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml index 3a3e734f39..d8a851d3c8 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml @@ -2,6 +2,7 @@ <result><!-- Piwik --> <script type="text/javascript"> var _paq = _paq || []; + // tracker methods like "setCustomDimension" should be called before "trackPageView" _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { @@ -12,6 +13,5 @@ g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<noscript><p><img src="//example.org/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 90df5b1904..d9d1b68bf4 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv Binary files differindex 489da99277..09cdb8f060 100644 --- a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 5b19eea90f..979634a932 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -66,6 +66,7 @@ <visitDurationPretty>6 min 3s</visitDurationPretty> <searches>0</searches> <actions>0</actions> + <interactions>0</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -170,6 +171,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -200,6 +202,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -226,6 +229,7 @@ <customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5> </row> </customVariables> + <interactionPosition>3</interactionPosition> <timeSpent>361</timeSpent> <timeSpentPretty>6 min 1s</timeSpentPretty> <icon /> @@ -285,6 +289,7 @@ <visitDurationPretty>18 min 1s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index d391947a56..391d44947e 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -31,6 +31,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -61,6 +62,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -87,6 +89,7 @@ <customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5> </row> </customVariables> + <interactionPosition>3</interactionPosition> <timeSpent>361</timeSpent> <timeSpentPretty>6 min 1s</timeSpentPretty> <icon /> @@ -146,6 +149,7 @@ <visitDurationPretty>12 min 1s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -238,6 +242,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -256,6 +261,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -286,6 +292,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>3</interactionPosition> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> <icon /> @@ -374,6 +381,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>4</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -404,6 +412,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>5</interactionPosition> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> @@ -430,6 +439,7 @@ <customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5> </row> </customVariables> + <interactionPosition>6</interactionPosition> <timeSpent>361</timeSpent> <timeSpentPretty>6 min 1s</timeSpentPretty> <icon /> @@ -489,6 +499,7 @@ <visitDurationPretty>1 hours 6 min</visitDurationPretty> <searches>0</searches> <actions>6</actions> + <interactions>6</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -604,6 +615,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -634,6 +646,7 @@ <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -664,6 +677,7 @@ <customVariablePageValue5 /> </row> </customVariables> + <interactionPosition>3</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -690,6 +704,7 @@ <customVariablePageValue5>["Multiple Category 1","",0,"Multiple Category 2","Electronics & Cameras","Multiple Category 4","Multiple Category 5","SHOULD NOT BE REPORTEDSSSSSSSSSSSSSSssssssssssssssssssssssssssstttttttttttttttttt</customVariablePageValue5> </row> </customVariables> + <interactionPosition>4</interactionPosition> <icon /> </row> @@ -716,6 +731,7 @@ <visitDurationPretty>12 min 1s</visitDurationPretty> <searches>0</searches> <actions>4</actions> + <interactions>4</interactions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv index 488663282f..78902751cb 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv @@ -1,7 +1,7 @@ All Websites dashboard label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,orders,ecommerce_revenue,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders_evolution,ecommerce_revenue_evolution -Piwik test,5,16,16,$ 13361.11,5,4,$ 13351.11,100%,100%,0%,0%,0%,0%,0% -Piwik test,2,1,1,$ 250,1,1,$ 250,100%,100%,0%,0,0%,0,0 +Piwik test,5,16,16,$ 13361.11,5,4,$ 13351.11,100%,100%,100%,100%,100%,100%,100% +Piwik test,2,1,1,$ 250,1,0,$ 0,100%,100%,100%,100%,100%,0,0 Visits Summary nb_uniq_visitors,nb_visits,nb_actions,max_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate @@ -18,7 +18,7 @@ VisitorName - Great name!,4,12,$ 13351.11,3,00:25:32,25% Device type label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate -Desktop,5,16,$ 250,3.2,00:22:49,20% +Desktop,5,16,$ 13361.11,3.2,00:22:49,20% Device model label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate @@ -327,7 +327,7 @@ No data available Ecommerce Orders nb_conversions,nb_visits_converted,revenue,revenue_subtotal,revenue_tax,revenue_shipping,revenue_discount,items,avg_order_revenue,conversion_rate -4,2,$ 13351.11,$ 2700,$ 531,$ 120.11,$ 686,12,$ 3337.78,0% +4,2,$ 13351.11,$ 2700,$ 531,$ 120.11,$ 686,12,$ 3337.78,40% Ecommerce Orders - Visits to Conversion label,nb_conversions @@ -364,7 +364,7 @@ label,nb_conversions Abandoned Carts nb_conversions,revenue,items,avg_order_revenue,conversion_rate -3,$ 7530.33,12,$ 2510.11,0% +3,$ 7530.33,12,$ 2510.11,60% Abandoned Carts - Visits to Conversion label,nb_conversions @@ -401,35 +401,35 @@ label,nb_conversions Product SKU label,revenue,quantity,orders,nb_visits,avg_price,avg_quantity,conversion_rate -SKU2,$ 1500,1,1,1,$ 0,1,100% -SKU VERY nice indeed,$ 1011.22,3,2,4,$ 0,1.5,50% -ANOTHER SKU HERE,$ 600,6,1,0,$ 0,6,0% -TRIPOD SKU,$ 200,2,1,0,$ 0,2,0% +SKU2,$ 1500,1,1,1,$ 1500,1,100% +SKU VERY nice indeed,$ 1011.22,3,2,4,$ 255.61,1.5,50% +ANOTHER SKU HERE,$ 600,6,1,0,$ 100,6,0% +TRIPOD SKU,$ 200,2,1,0,$ 100,2,0% SKU IN ABANDONED CART TWO,$ 0,0,0,3,$ 0,0,0% Product Name label,revenue,quantity,orders,avg_price,avg_quantity,conversion_rate,nb_visits -Canon SLR,$ 1500,1,1,$ 0,1,0%,0 -PRODUCT name,$ 1011.22,3,2,$ 0,1.5,100%,2 -PRODUCT name BIS,$ 600,6,1,$ 0,6,0%,0 -TRIPOD - bought day after,$ 200,2,1,$ 0,2,0%,0 +Canon SLR,$ 1500,1,1,$ 1500,1,0%,0 +PRODUCT name,$ 1011.22,3,2,$ 255.61,1.5,100%,2 +PRODUCT name BIS,$ 600,6,1,$ 100,6,0%,0 +TRIPOD - bought day after,$ 200,2,1,$ 100,2,0%,0 PRODUCT TWO LEFT in cart,$ 0,0,0,$ 0,0,0%,3 PRODUCT THREE LEFT in cart,$ 0,0,0,$ 1332,0,0%,3 Product Category label,revenue,quantity,orders,nb_visits,avg_price,avg_quantity,conversion_rate -Electronics & Cameras,$ 2500,3,2,3,$ 0,1.5,66.67% -Multiple Category 1,$ 1000,2,1,1,$ 0,2,100% -Multiple Category 2,$ 1000,2,1,1,$ 0,2,100% -Multiple Category 4,$ 1000,2,1,1,$ 0,2,100% -Multiple Category 5,$ 1000,2,1,1,$ 0,2,100% -Product Category not defined,$ 611.22,7,2,4,$ 0,3.5,50% -Tools,$ 200,2,1,0,$ 0,2,0% +Electronics & Cameras,$ 2500,3,2,3,$ 1000,1.5,66.67% +Multiple Category 1,$ 1000,2,1,1,$ 500,2,100% +Multiple Category 2,$ 1000,2,1,1,$ 500,2,100% +Multiple Category 4,$ 1000,2,1,1,$ 500,2,100% +Multiple Category 5,$ 1000,2,1,1,$ 500,2,100% +Product Category not defined,$ 611.22,7,2,4,$ 55.61,3.5,50% +Tools,$ 200,2,1,0,$ 100,2,0% Category TWO LEFT in cart,$ 0,0,0,3,$ 0,0,0% Goals nb_conversions,nb_visits_converted,revenue,conversion_rate -5,4,$ 13361.11,0% +5,4,$ 13361.11,80% Visits to Conversion label,nb_conversions,revenue @@ -466,7 +466,7 @@ label,nb_conversions,revenue Goal title match triggered ONCE nb_conversions,nb_visits_converted,revenue,conversion_rate -1,1,$ 10,0% +1,1,$ 10,20% title match triggered ONCE - Visits to Conversion label,nb_conversions diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index f04022a9ad..bce9dd677d 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -476,10 +476,10 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 250 + $ 0 </td> </tr> </tbody> @@ -730,7 +730,7 @@ 20% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 250 + $ 13361.11 </td> </tr> </tbody> @@ -4707,7 +4707,7 @@ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> Conversion Rate </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 40% </td> </tr> </tbody> @@ -5029,7 +5029,7 @@ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> Conversion Rate </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 60% </td> </tr> </tbody> @@ -5349,7 +5349,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 1500 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 @@ -5375,7 +5375,7 @@ 4 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 255.61 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1.5 @@ -5401,7 +5401,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 100 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 6 @@ -5427,7 +5427,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 100 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5519,7 +5519,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 1500 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 @@ -5545,7 +5545,7 @@ 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 255.61 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1.5 @@ -5571,7 +5571,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 100 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 6 @@ -5597,7 +5597,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 100 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5715,7 +5715,7 @@ 3 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 1000 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1.5 @@ -5741,7 +5741,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 500 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5767,7 +5767,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 500 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5793,7 +5793,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 500 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5819,7 +5819,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 500 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5845,7 +5845,7 @@ 4 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 55.61 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 3.5 @@ -5871,7 +5871,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 100 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5957,7 +5957,7 @@ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> Conversion Rate </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 80% </td> </tr> </tbody> @@ -6358,7 +6358,7 @@ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> Conversion Rate </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 20% </td> </tr> </tbody> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt index a55d80361a..645d7467c3 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt @@ -1 +1 @@ -week April 4 – 10, 2011. Piwik test: 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361, 5 Goal conversions, Product Revenue: $ 13351, 4 Ecommerce Orders. Piwik test: 2 Visits (+100%), 1 Actions (+100%), Revenue: $ 250, 1 Goal conversions
\ No newline at end of file +week April 4 – 10, 2011. Piwik test: 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%). Piwik test: 2 Visits (+100%), 1 Actions (+100%), Revenue: $ 250 (+100%), 1 Goal conversions (+100%)
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt index 4dd544955f..f36a23fa6e 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt @@ -1 +1 @@ -week April 4 – 10, 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361, 5 Goal conversions, Product Revenue: $ 13351, 4 Ecommerce Orders
\ No newline at end of file +week April 4 – 10, 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%)
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml index 7f6c3671eb..fc64578e32 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml @@ -279,7 +279,7 @@ Another line</defaultValue> </row> <row> <name>redisHost</name> - <title>Redis host</title> + <title>Redis host or unix socket</title> <value>127.0.0.1</value> <defaultValue>127.0.0.1</defaultValue> <type>string</type> @@ -289,7 +289,7 @@ Another line</defaultValue> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Remote host of the Redis server. Max 500 characters are allowed.</inlineHelp> + <inlineHelp>Remote host or unix socket of the Redis server. Max 500 characters are allowed.</inlineHelp> <introduction /> <condition /> </row> @@ -305,7 +305,7 @@ Another line</defaultValue> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Port the Redis server is running on. Value should be between 1 and 65535.</inlineHelp> + <inlineHelp>Port the Redis server is running on. Value should be between 1 and 65535. Use 0 if you are using unix socket to connect to Redis server.</inlineHelp> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml index 7f6c3671eb..fc64578e32 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml @@ -279,7 +279,7 @@ Another line</defaultValue> </row> <row> <name>redisHost</name> - <title>Redis host</title> + <title>Redis host or unix socket</title> <value>127.0.0.1</value> <defaultValue>127.0.0.1</defaultValue> <type>string</type> @@ -289,7 +289,7 @@ Another line</defaultValue> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Remote host of the Redis server. Max 500 characters are allowed.</inlineHelp> + <inlineHelp>Remote host or unix socket of the Redis server. Max 500 characters are allowed.</inlineHelp> <introduction /> <condition /> </row> @@ -305,7 +305,7 @@ Another line</defaultValue> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Port the Redis server is running on. Value should be between 1 and 65535.</inlineHelp> + <inlineHelp>Port the Redis server is running on. Value should be between 1 and 65535. Use 0 if you are using unix socket to connect to Redis server.</inlineHelp> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index 614ca49126..21e1b1d26c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -13,6 +13,7 @@ <pageIdAction>6</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -39,6 +40,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -132,6 +134,7 @@ <pageIdAction>2</pageIdAction> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -158,6 +161,7 @@ <visitDurationPretty>6 min 1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -251,6 +255,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -284,6 +289,7 @@ <customVariablePageValue5>looking at "profile page"</customVariablePageValue5> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -310,6 +316,7 @@ <customVariablePageValue4>looking at "profile page"</customVariablePageValue4> </row> </customVariables> + <interactionPosition>3</interactionPosition> <icon /> </row> @@ -336,6 +343,7 @@ <visitDurationPretty>6 min 4s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 614ca49126..21e1b1d26c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -13,6 +13,7 @@ <pageIdAction>6</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -39,6 +40,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -132,6 +134,7 @@ <pageIdAction>2</pageIdAction> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -158,6 +161,7 @@ <visitDurationPretty>6 min 1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -251,6 +255,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -284,6 +289,7 @@ <customVariablePageValue5>looking at "profile page"</customVariablePageValue5> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -310,6 +316,7 @@ <customVariablePageValue4>looking at "profile page"</customVariablePageValue4> </row> </customVariables> + <interactionPosition>3</interactionPosition> <icon /> </row> @@ -336,6 +343,7 @@ <visitDurationPretty>6 min 4s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index f15526855b..6a412c0910 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -66,6 +66,7 @@ <pageIdAction>6</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -92,6 +93,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -185,6 +187,7 @@ <pageIdAction>2</pageIdAction> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -211,6 +214,7 @@ <visitDurationPretty>6 min 1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml index 614ca49126..21e1b1d26c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml @@ -13,6 +13,7 @@ <pageIdAction>6</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -39,6 +40,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -132,6 +134,7 @@ <pageIdAction>2</pageIdAction> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -158,6 +161,7 @@ <visitDurationPretty>6 min 1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -251,6 +255,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -284,6 +289,7 @@ <customVariablePageValue5>looking at "profile page"</customVariablePageValue5> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -310,6 +316,7 @@ <customVariablePageValue4>looking at "profile page"</customVariablePageValue4> </row> </customVariables> + <interactionPosition>3</interactionPosition> <icon /> </row> @@ -336,6 +343,7 @@ <visitDurationPretty>6 min 4s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index 614ca49126..21e1b1d26c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -13,6 +13,7 @@ <pageIdAction>6</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -39,6 +40,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -132,6 +134,7 @@ <pageIdAction>2</pageIdAction> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -158,6 +161,7 @@ <visitDurationPretty>6 min 1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -251,6 +255,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <interactionPosition>1</interactionPosition> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> @@ -284,6 +289,7 @@ <customVariablePageValue5>looking at "profile page"</customVariablePageValue5> </row> </customVariables> + <interactionPosition>2</interactionPosition> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <icon /> @@ -310,6 +316,7 @@ <customVariablePageValue4>looking at "profile page"</customVariablePageValue4> </row> </customVariables> + <interactionPosition>3</interactionPosition> <icon /> </row> @@ -336,6 +343,7 @@ <visitDurationPretty>6 min 4s</visitDurationPretty> <searches>0</searches> <actions>3</actions> + <interactions>3</interactions> <referrerType>search</referrerType> <referrerTypeName>Search Engines</referrerTypeName> <referrerName>Google</referrerName> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index f15526855b..6a412c0910 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -66,6 +66,7 @@ <pageIdAction>6</pageIdAction> <pageId>5</pageId> + <interactionPosition /> <icon>plugins/Morpheus/images/link.gif</icon> </row> @@ -92,6 +93,7 @@ <visitDurationPretty>0s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>0</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> @@ -185,6 +187,7 @@ <pageIdAction>2</pageIdAction> <pageId>4</pageId> + <interactionPosition>1</interactionPosition> <icon /> </row> @@ -211,6 +214,7 @@ <visitDurationPretty>6 min 1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> + <interactions>1</interactions> <referrerType>campaign</referrerType> <referrerTypeName>Campaigns</referrerTypeName> <referrerName>campaign name - yeah!</referrerName> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml index b7c89b2689..d81561ed0d 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml @@ -1,18 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_visits>10</nb_visits> - <nb_hits>10</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <avg_bandwidth>0</avg_bandwidth> - </row> - <row> - <label>cloudsite5.com/-1</label> + <label>cloudsite5.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -23,7 +12,7 @@ <avg_bandwidth>0</avg_bandwidth> </row> <row> - <label>cloudsite6.com/-1</label> + <label>cloudsite6.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -34,7 +23,7 @@ <avg_bandwidth>0</avg_bandwidth> </row> <row> - <label>cloudsite7.com/-1</label> + <label>cloudsite7.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -86,4 +75,15 @@ <url>http://cloudsite7.com/28/download</url> <segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F28%2Fdownload</segment> </row> + <row> + <label>Others</label> + <nb_visits>10</nb_visits> + <nb_hits>10</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <avg_bandwidth>0</avg_bandwidth> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml index 4e8c18db0c..f773d20db9 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml @@ -1,18 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_visits>10</nb_visits> - <nb_hits>10</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <avg_bandwidth>0</avg_bandwidth> - </row> - <row> - <label>othersite10.com/-1</label> + <label>othersite10.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -23,7 +12,7 @@ <avg_bandwidth>0</avg_bandwidth> </row> <row> - <label>othersite11.com/-1</label> + <label>othersite11.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -34,7 +23,7 @@ <avg_bandwidth>0</avg_bandwidth> </row> <row> - <label>othersite12.com/-1</label> + <label>othersite12.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -86,4 +75,15 @@ <url>http://othersite12.com/</url> <segment>outlinkUrl==http%3A%2F%2Fothersite12.com%2F</segment> </row> + <row> + <label>Others</label> + <nb_visits>10</nb_visits> + <nb_hits>10</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <avg_bandwidth>0</avg_bandwidth> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml index 3e92585444..c139c3b992 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml @@ -20,26 +20,29 @@ <exit_rate>100%</exit_rate> </row> <row> - <label>title_0/-1</label> - <nb_visits>3</nb_visits> - <nb_hits>3</nb_hits> + <label>title_0</label> + <nb_visits>1</nb_visits> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_visits>3</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> + <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> </row> <row> - <label>title_0</label> + <label>title_1</label> <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_hits>1</nb_hits> @@ -61,29 +64,26 @@ <exit_rate>100%</exit_rate> </row> <row> - <label>title_0/title_0</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> + <label>title_0/ - Others</label> + <nb_visits>3</nb_visits> + <nb_hits>3</nb_hits> <sum_time_spent>0</sum_time_spent> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> + <entry_nb_visits>3</entry_nb_visits> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> + <entry_bounce_count>3</entry_bounce_count> + <exit_nb_visits>3</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> </row> <row> - <label>title_1</label> + <label>title_0/title_0</label> <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml index 8deb614c29..77c72b8a88 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml @@ -1,26 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_visits>10</nb_visits> - <nb_hits>10</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_visits>10</entry_nb_visits> - <entry_nb_actions>10</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>10</entry_bounce_count> - <exit_nb_visits>10</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> - <exit_rate>100%</exit_rate> - </row> - <row> - <label>0/-1</label> + <label>0/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -39,7 +20,7 @@ <exit_rate>100%</exit_rate> </row> <row> - <label>1/-1</label> + <label>1/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -58,7 +39,7 @@ <exit_rate>100%</exit_rate> </row> <row> - <label>2/-1</label> + <label>2/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -148,4 +129,23 @@ <url>http://piwik.net/2/</url> <segment>pageUrl==http%3A%2F%2Fpiwik.net%2F2%2F</segment> </row> + <row> + <label>Others</label> + <nb_visits>10</nb_visits> + <nb_hits>10</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>10</entry_nb_visits> + <entry_nb_actions>10</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>10</entry_bounce_count> + <exit_nb_visits>10</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml index 0723c8e315..834ce79c36 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_actions>60</nb_actions> - </row> - <row> - <label>name - -1</label> + <label>name - Others</label> <nb_visits>19</nb_visits> <nb_actions>19</nb_actions> </row> @@ -15,7 +11,7 @@ <nb_actions>16</nb_actions> </row> <row> - <label>liked - -1</label> + <label>liked - Others</label> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> </row> @@ -24,4 +20,8 @@ <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> </row> + <row> + <label>Others</label> + <nb_actions>60</nb_actions> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml index bf291de047..18ee2e2d93 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Unknown</label> + <label>Others</label> <nb_uniq_visitors>9</nb_uniq_visitors> <nb_visits>45</nb_visits> <nb_actions>45</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml index d2781e791c..41c9589a79 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml @@ -1,18 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_uniq_visitors>7</nb_uniq_visitors> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>7</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - <row> - <label>this search term - -1</label> + <label>this search term - Others</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -62,4 +51,15 @@ <url>http://ask.com/web?q=this+search+term</url> <logo>plugins/Referrers/images/searchEngines/ask.com.png</logo> </row> + <row> + <label>Others</label> + <nb_uniq_visitors>7</nb_uniq_visitors> + <nb_visits>7</nb_visits> + <nb_actions>7</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>7</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml index 2f781c0adb..f5e9832ea3 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml @@ -24,14 +24,14 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Websites</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> + <label>Search Engines</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>4</bounce_count> + <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> <row> @@ -46,7 +46,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Search Engines</label> + <label>Websites</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -58,13 +58,13 @@ </row> <row> <label>Websites</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>4</nb_visits> + <nb_actions>4</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> + <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml index 8d45a58e39..ab41a14413 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml @@ -1,20 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_uniq_visitors>6</nb_uniq_visitors> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>6</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <url>URL unknown!</url> - <logo>plugins/Referrers/images/searchEngines/xx.png</logo> - </row> - <row> - <label>Google - -1</label> + <label>Google - Others</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -26,7 +13,7 @@ <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> </row> <row> - <label>Yahoo! - -1</label> + <label>Yahoo! - Others</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -63,4 +50,17 @@ <url>http://search.yahoo.com/search?p=search+term+4</url> <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> </row> + <row> + <label>Others</label> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>6</nb_visits> + <nb_actions>6</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>6</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <url>URL unknown!</url> + <logo>plugins/Referrers/images/searchEngines/xx.png</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml index 07e82ed210..de1eda0305 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml @@ -1,18 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Others</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - <row> - <label>whatever0.com/-1</label> + <label>whatever0.com/ - Others</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -21,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <url>-1</url> + <url>Others</url> </row> <row> <label>whatever0.com/index</label> @@ -59,4 +48,15 @@ <nb_visits_converted>0</nb_visits_converted> <url>http://whatever1.com/0</url> </row> + <row> + <label>Others</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Unit/DataAccess/LogQueryBuilder/JoinGeneratorTest.php b/tests/PHPUnit/Unit/DataAccess/LogQueryBuilder/JoinGeneratorTest.php index cd572e4849..cb20726968 100644 --- a/tests/PHPUnit/Unit/DataAccess/LogQueryBuilder/JoinGeneratorTest.php +++ b/tests/PHPUnit/Unit/DataAccess/LogQueryBuilder/JoinGeneratorTest.php @@ -148,6 +148,65 @@ class JoinGeneratorTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expected, $tables); } + public function test_sortTablesForJoin_shouldSortTablesWithCustomJoinRequiringEachOther() + { + $tables = array( + 'log_link_visit_action', + 'log_action', + array( + 'table' => 'log_link_visit_action', + 'tableAlias' => 'log_link_visit_action_foo', + 'joinOn' => "log_link_visit_action.idvisit = log_link_visit_action_foo.idvisit" + ), + array( + 'table' => 'log_action', + 'tableAlias' => 'log_action_foo', + 'joinOn' => "log_link_visit_action_foo.idaction_url = log_action_foo.idaction" + ) + ); + + $generator = $this->makeGenerator($tables); + usort($tables, array($generator, 'sortTablesForJoin')); + + $expected = array( + array ( + 'table' => 'log_link_visit_action', + 'tableAlias' => 'log_link_visit_action_foo', + 'joinOn' => 'log_link_visit_action.idvisit = log_link_visit_action_foo.idvisit', + ), + array ( + 'table' => 'log_action', + 'tableAlias' => 'log_action_foo', + 'joinOn' => 'log_link_visit_action_foo.idaction_url = log_action_foo.idaction', + ), + 'log_link_visit_action', + 'log_action', + ); + + $this->assertEquals($expected, $tables); + + // should still be the same if inverted + $tables = array( + 'log_link_visit_action', + 'log_action', + array( + 'table' => 'log_action', + 'tableAlias' => 'log_action_foo', + 'joinOn' => "log_link_visit_action_foo.idaction_url = log_action_foo.idaction" + ), + array( + 'table' => 'log_link_visit_action', + 'tableAlias' => 'log_link_visit_action_foo', + 'joinOn' => "log_link_visit_action.idvisit = log_link_visit_action_foo.idvisit" + ), + ); + + $generator = $this->makeGenerator($tables); + usort($tables, array($generator, 'sortTablesForJoin')); + + $this->assertEquals($expected, $tables); + } + private function generate($tables) { $generator = $this->makeGenerator($tables); diff --git a/tests/PHPUnit/Unit/Tracker/RequestTest.php b/tests/PHPUnit/Unit/Tracker/RequestTest.php index e3964369ff..43f8a1bc7f 100644 --- a/tests/PHPUnit/Unit/Tracker/RequestTest.php +++ b/tests/PHPUnit/Unit/Tracker/RequestTest.php @@ -49,9 +49,13 @@ class RequestTest extends UnitTestCase $this->assertSame($this->time, $request->getCurrentTimestamp()); } - public function test_cdt_ShouldReturnTheCurrentTimestamp_IfNotAuthenticatedAndTimestampIsNotRecent() + /** + * @expectedException \Exception + * @expectedExceptionMessage Custom timestamp is 86500 seconds old + */ + public function test_cdt_ShouldNotTrackTheRequest_IfNotAuthenticatedAndTimestampIsNotRecent() { - $request = $this->buildRequest(array('cdt' => '' . $this->time - 28800)); + $request = $this->buildRequest(array('cdt' => '' . $this->time - 86500)); $this->assertSame($this->time, $request->getCurrentTimestamp()); } @@ -64,9 +68,9 @@ class RequestTest extends UnitTestCase public function test_cdt_ShouldReturnTheCustomTimestamp_IfAuthenticatedAndValid() { - $request = $this->buildRequest(array('cdt' => '' . ($this->time - 28800))); + $request = $this->buildRequest(array('cdt' => '' . ($this->time - 86500))); $request->setIsAuthenticated(); - $this->assertSame('' . ($this->time - 28800), $request->getCurrentTimestamp()); + $this->assertSame('' . ($this->time - 86500), $request->getCurrentTimestamp()); } public function test_cdt_ShouldReturnTheCustomTimestamp_IfTimestampIsInFuture() diff --git a/tests/PHPUnit/Unit/UrlHelperTest.php b/tests/PHPUnit/Unit/UrlHelperTest.php index 09aab2c2f3..369cfb3a34 100644 --- a/tests/PHPUnit/Unit/UrlHelperTest.php +++ b/tests/PHPUnit/Unit/UrlHelperTest.php @@ -234,4 +234,64 @@ class UrlHelperTest extends \PHPUnit_Framework_TestCase $this->assertEquals('add=foo', UrlHelper::getQueryFromUrl('/', array('add' => 'foo'))); $this->assertEquals('add[]=foo&add[]=test', UrlHelper::getQueryFromUrl('/', array('add' => array('foo', 'test')))); } + + + /** + * Dataprovider for testGetQueryStringWithExcludedParameters + */ + public function getQueryParameters() + { + return array( + array( + 'p1=v1&p2=v2', //expected + array('p1'=>'v1', 'p2'=>'v2'), //queryParameters + array() //parametersToExclude + ), + array( + 'p2=v2', + array('p1'=>'v1', 'p2'=>'v2'), + array('p1') + ), + array( + 'p1=v1&p2=v2', + array('p1'=>'v1', 'p2'=>'v2', 'sessionId'=>'HHSJHERTG'), + array('sessionId') + ), + array( + 'p1=v1&p2=v2', + array('p1'=>'v1', 'p2'=>'v2', 'sessionId'=>'HHSJHERTG'), + array('/session/') + ), + array( + 'p1=v1&p2=v2', + array('p1'=>'v1', 'sessionId'=>'HHSJHERTG', 'p2'=>'v2', 'token'=>'RYUN36HSAO'), + array('/[session|token]/') + ), + array( + '', + array('p1'=>'v1', 'p2'=>'v2', 'sessionId'=>'HHSJHERTG', 'token'=>'RYUN36HSAO'), + array('/.*/') + ), + array( + 'p2=v2&p4=v4', + array('p1'=>'v1', 'p2'=>'v2', 'p3'=>'v3', 'p4'=>'v4'), + array('/p[1|3]/') + ), + array( + 'p2=v2&p4=v4', + array('p1'=>'v1', 'p2'=>'v2', 'p3'=>'v3', 'p4'=>'v4', 'utm_source'=>'gekko', 'utm_medium'=>'email', 'utm_campaign'=>'daily'), + array('/p[1|3]/', '/utm_/') + ) + ); + } + + /** + * @dataProvider getQueryParameters + * @group Core + */ + public function testGetQueryStringWithExcludedParameters($expected, $queryParameters, $parametersToExclude) + { + $this->assertEquals($expected, UrlHelper::getQueryStringWithExcludedParameters($queryParameters, $parametersToExclude)); + } + } diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_main.png b/tests/UI/expected-screenshots/CoreUpdaterDb_main.png index 82fe26d151..15e3790562 100644 --- a/tests/UI/expected-screenshots/CoreUpdaterDb_main.png +++ b/tests/UI/expected-screenshots/CoreUpdaterDb_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:477f2a7d70960505f3143e486162af3e2bcb4c4a70e0f40bc80279546c118508 -size 278843 +oid sha256:1a60b66e0ade5a7500077b999e6ed1d6ce4c9bfcc0d662604bafe9a8e2082931 +size 281165 diff --git a/tests/UI/expected-screenshots/DashboardManager_create_new.png b/tests/UI/expected-screenshots/DashboardManager_create_new.png index c7c1560969..c59b7b16be 100644 --- a/tests/UI/expected-screenshots/DashboardManager_create_new.png +++ b/tests/UI/expected-screenshots/DashboardManager_create_new.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5a8b8e871c99c9798070aaba1e4b2ea24d0891729359b91acb24f7ff1728842 -size 236924 +oid sha256:37fa2337c1ac3407431a002ff62595cc2720fa16fa6b26027677fcc0c10dd918 +size 244955 diff --git a/tests/UI/expected-screenshots/DashboardManager_removed.png b/tests/UI/expected-screenshots/DashboardManager_removed.png index ad2795e43b..7db5941eeb 100644 --- a/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3160dd52b4ab99a66f32a90e2efce3207fb44fda0daa665e6fbffd50770dce7 -size 365021 +oid sha256:f5ab0ecf33f5d80552b1c24f44a3acdcebd2ba1e7eeeb5d07d9191a597d876c7 +size 364851 diff --git a/tests/UI/expected-screenshots/Dashboard_removed.png b/tests/UI/expected-screenshots/Dashboard_removed.png index 03c885c43c..ffae03fdfb 100644 --- a/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91b066a2279d4d4fbfb7a4e1b3feabcf0d7778da8b3ea695e2b94a388803385d -size 533176 +oid sha256:6a14ab72a0b13453d93b83f96e14d22da3127aa89f0e475687743b98762cfeab +size 533019 diff --git a/tests/UI/expected-screenshots/Dashboard_reset.png b/tests/UI/expected-screenshots/Dashboard_reset.png index 3bf8e42f52..f8b28088b6 100644 --- a/tests/UI/expected-screenshots/Dashboard_reset.png +++ b/tests/UI/expected-screenshots/Dashboard_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f5bef3ad69ef3d2326a9832420e43ad0f2a4fc973cc98b67507ed3c96dc3637 -size 244566 +oid sha256:5d698b9577a9020d0f100199a4047b8a8d579ddde6c7f3b29a9e9662e67923b0 +size 249226 diff --git a/tests/UI/expected-screenshots/Installation_js_tracking.png b/tests/UI/expected-screenshots/Installation_js_tracking.png index d8292c88da..025ec4f078 100644 --- a/tests/UI/expected-screenshots/Installation_js_tracking.png +++ b/tests/UI/expected-screenshots/Installation_js_tracking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7abe83847ecf91c2c210116a8f3125276ca2eccf08ac9344fc31737f8c18bf9 -size 190033 +oid sha256:05078353764c65c355af7f3b96a2948be8a89f75d1ffe508209354b50b095b7d +size 188228 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 112f146af6..5e3d2094f1 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce396a5030d192435353eceb9cd114cf69e0c8fa2044fb1734a2a573aa0f64d5 -size 534414 +oid sha256:9c5423b60960636d099187d93ef28eba5311bfd96ac03863dabf00bc86b7ad41 +size 534492 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 32613e4b7a..dc57c27f29 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edc1f109df4b03552ed727fc73a4057402cc2d6584d5d0729e41c057dd8d56fc -size 3470832 +oid sha256:883708f1db7071637588e02b79082939973b49e9e3367b214d89c837bce1a51d +size 3483863 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png index 1200b302e6..93399c6eb1 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d39952dd0c53c54d8a1e53060a1781fd252b70d979d86ae94d635070e50bcead -size 116883 +oid sha256:96388334f03f766390507ab85154978c76ddd126ca155c7621ee2798b11f1a47 +size 116773 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png index f50da961c2..a325eb43bd 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:231f951986687e6a47c094ac6b9fa2635a9a95758a819bd228c9ae97601c0c25 -size 304254 +oid sha256:bb4d3d2f549fe303574fd4c0df7c332f49e74701ec9211d4b39dc307ad9692fd +size 306805 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png index 4995fec660..83a4b8ac44 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73ce5d8f801ad0c99d52b3a9585ae9f2fdc16c59897e4b3f98e348567212d505 -size 645576 +oid sha256:9955076f8a3a3e6efbfb1c171154a76ed9381052205263063356269fdd6eff59 +size 653419 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index c5c1fcc6a8..265f46c842 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d874fd775d6d8be1c9e0b13187482607f6e51ba1490c267690ffa7567fc20a3 -size 482842 +oid sha256:1c24952040b91790bfacf59a30b5bc990b8de35f15757ab429f258ddb7a45ddc +size 482699 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index 1766795855..e9247c2ccc 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21157328dec382eb814c31a030acec960bdc1b9536aadba371ae220dc8cf8ef4 -size 488546 +oid sha256:e416ee88a474f7256e8ec6ebe2a0ba00caa6dc9a226db45aa5c468f910474a52 +size 494000 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png index 5c4c3ac6f3..aaa10332fe 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8b55fcd472e1bb49a165ebb5ad8bcde34e1f91834f094159ec7b01114c781c2 -size 52024 +oid sha256:eaf089abb49b870371957cfdde4adac66a81265e20e8d1e902572ab865a22f2f +size 83534 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png b/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png index 82c81eaf01..6f551128cf 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e507297ce45b22c13fc9ac73b7b63f6428bbdadf5286ee22ab12b509540e2d10 -size 138631 +oid sha256:836a5472c95afecc2ce3b62a4f0ab10a3772dcf94e7f9b702799d39b9945fa74 +size 170055 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png index 9b5c5cfdd9..9ee63816f7 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b207a93da45b798d1372667b606a72e07d2d2aaba3878fee430f29aa20558622 -size 183960 +oid sha256:6b930db850eb96918d3998bde6df04337907da4ad48e6a898a1d88fa7f51a542 +size 196636 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png index a0a684d315..32232a33d3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2ffe3ccbdbea1e6ff4d292238eaa565dcf239c833ce148eb55d300e2091bd6e -size 184636 +oid sha256:f2bc5ac35599e2e20c4a541174afdf3265c01e223973d28a4d4fc61f1f844f1c +size 197242 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png index d3838f305c..922242eb6a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67a39d8b3bef27ac5b84318518019899ab69d5de9b120ffad151415b9fa3bae0 -size 490266 +oid sha256:40bf44916e988a4ad572105ca79ab8fc8f426a9f0927676485e9f54c907f2103 +size 490143 diff --git a/tests/resources/OmniFixture-dump.sql b/tests/resources/OmniFixture-dump.sql index 350c46c1d1..209e820824 100644 --- a/tests/resources/OmniFixture-dump.sql +++ b/tests/resources/OmniFixture-dump.sql @@ -814,10 +814,10 @@ DROP TABLE IF EXISTS `user`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `user` ( `login` varchar(100) NOT NULL, - `password` char(32) NOT NULL, + `password` varchar(255) NOT NULL, `alias` varchar(45) NOT NULL, `email` varchar(100) NOT NULL, - `token_auth` char(32) NOT NULL, + `token_auth` char(64) NOT NULL, `superuser_access` tinyint(2) unsigned NOT NULL DEFAULT '0', `date_registered` timestamp NULL DEFAULT NULL, PRIMARY KEY (`login`), @@ -831,7 +831,7 @@ CREATE TABLE `user` ( LOCK TABLES `user` WRITE; /*!40000 ALTER TABLE `user` DISABLE KEYS */; -INSERT INTO `user` VALUES ('superUserLogin','1e56c228742c0189d261500852e27a02','superUserLogin','hello@example.org','9ad1de7f8b329ab919d854c556f860c1',1,'2016-03-09 09:10:19'); +INSERT INTO `user` VALUES ('superUserLogin','$2y$10$vh5d/W6S9M7u.1G2gc1TOeetRi.6HN6OG1jq47j5JhixtqTxkdGVi','superUserLogin','hello@example.org','9ad1de7f8b329ab919d854c556f860c1',1,'2016-03-09 09:10:19'); /*!40000 ALTER TABLE `user` ENABLE KEYS */; UNLOCK TABLES; diff --git a/tests/travis b/tests/travis -Subproject e041bdf1a6b63024478852a58a69dd826e8aca4 +Subproject e3ee1bc4a16a93e807b1cfbcee42567cd5b8fcb |
