diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4ee119df7a0a921463b1ef30002384330a4d299..0e71eb78159949d17ed61a26971d8b961adae9c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,13 +39,24 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API'
* Support for IE8 was dropped. This affects only the Piwik UI, not the Piwik.js Tracker.
* Required PHP version was changed from 5.3 to 5.5
-## Piwik 2.15.1
+## Piwik 2.16.0
### New features
* New segment `actionType` lets you segment all actions of a given type, eg. `actionType==events` or `actionType==downloads`. Action types values are: `pageviews`, `contents`, `sitesearches`, `events`, `outlinks`, `downloads`
+ * New segment `actionUrl` lets you segment any action that matches a given URL, whether they are Pageviews, Site searches, Contents, Downloads or Events.
+ * New segment `deviceBrand` lets you restrict your users to those using a particular device brand such as Apple, Samsung, LG, Google, Nokia, Sony, Lenovo, Alcatel, etc. View the [complete list of device brands.](http://developer.piwik.org/api-reference/segmentation)
+ * New segment operators `=^` "Starts with" and `=$` "Ends with" complement the existing segment operators: Contains, Does not contain, Equals, Not equals, Greater than or equal to, Less than or equal to.
* The JavaScript Tracker method `PiwikTracker.setDomains()` can now handle paths. This means when setting eg `_paq.push(['setDomains, '*.piwik.org/website1'])` all link that goes to the same domain `piwik.org` but to any other path than `website1/*` will be treated as outlink.
+ * In Administration > Websites, for each website, there is a checkbox "Only track visits and actions when the action URL starts with one of the above URLs". In Piwik 2.14.0, any action URL starting with one of the Alias URLs or starting with a subdomain of the Alias URL would be tracked. As of Piwik 2.15.0, when this checkbox is enabled, it may track less data: action URLs on an Alias URL subdomain will not be tracked anymore (you must specify each sub-domain as Alias URL).
+ * It is now possible to pass an option `php-cli-options` to the `core:archive` command. The given cli options will be forwarded to the actual PHP command. This allows to for example specifiy a different memory limit for the archiving process like this: `./console core:archive --php-cli-options="-d memory_limit=8G"`
+ * New less variable `@theme-color-menu-contrast-textSelected` that lets you specify the color of a selected menu item.
+ * in Administration > Diagnostics, there is a new page `Config file` which lets Super User view all config values from `global.ini.php` in the UI, and whether they were overriden in your `config/config.ini.php`
-### Internal change
+### New commands
+ * New command `config:set` lets you set INI config options from the command line. This command can be used for convenience or for automation.
+
+### Internal changes
+ * `UsersManager.*` API calls: when an API request specifies a `token_auth` of a user with `admin` permission, the returned dataset will not include all usernames as previously, API will now only return usernames for users with `view` or `admin` permission to website(s) viewable by this `token_auth`.
* When generating a new plugin skeleton via `generate:plugin` command, plugin name must now contain only letters and numbers.
* JavaScript Tracker tests no longer require `SQLite`. The existing MySQL configuration for tests is used now. In order to run the tests make sure Piwik is installed and `[database_tests]` is configured in `config/config.ini.php`.
* The definitions for search engine and social network detection have been moved from bundled data files to a separate package (see [https://github.com/piwik/searchengine-and-social-list](https://github.com/piwik/searchengine-and-social-list)).
@@ -57,12 +68,6 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API'
### Deprecations
* The method `DB::tableExists` was un-used and has been removed.
-
-### New commands
- * New command `config:set` lets you set INI config options from the command line. This command can be used for convenience or for automation.
-
-### Breaking changes
- * In Administration > Websites, for each website, there is a checkbox "Only track visits and actions when the action URL starts with one of the above URLs". In Piwik 2.14.0, any action URL starting with one of the Alias URLs or starting with a subdomain of the Alias URL would be tracked. As of Piwik 2.15.0, when this checkbox is enabled, it may track less data: action URLs on an Alias URL subdomain will not be tracked anymore (you must specify each sub-domain as Alias URL).
## Piwik 2.15.0
diff --git a/composer.json b/composer.json
index fe3ca314197df4240eac414a214aa469cc0378b7..b7ebee8d6486f09e082f8246505382cfff09053a 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,7 @@
"piwik/decompress": "~1.0",
"piwik/network": "~0.1.0",
"piwik/cache": "~0.2.5",
- "piwik/ini": "^1.0.3",
+ "piwik/ini": "^1.0.6",
"php-di/php-di": "^5.0.0",
"psr/log": "~1.0",
"monolog/monolog": "~1.11",
diff --git a/composer.lock b/composer.lock
index 263c85b4abc9401a3acab176018261599946684d..32d55198356bf20a0640d928a128bc4f32e63593 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": "09112ef01f28686b387148c407503c7c",
- "content-hash": "ff9b83524f413ac80daad8eb47099042",
+ "hash": "de61be52972a0fe8fe751306c271f4b8",
+ "content-hash": "68130b067cdceef8346b47d858b763a3",
"packages": [
{
"name": "container-interop/container-interop",
@@ -300,7 +300,6 @@
"phpdoc",
"reflection"
],
- "abandoned": "php-di/phpdoc-reader",
"time": "2014-08-21 08:20:45"
},
{
@@ -824,16 +823,16 @@
},
{
"name": "piwik/device-detector",
- "version": "3.4.5",
+ "version": "3.5.1",
"source": {
"type": "git",
"url": "https://github.com/piwik/device-detector.git",
- "reference": "367970e87a1b6a8feb30d339621af357dc8ab898"
+ "reference": "29830f9bd67c8300e37828db0688161dd6f5f7a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/piwik/device-detector/zipball/367970e87a1b6a8feb30d339621af357dc8ab898",
- "reference": "367970e87a1b6a8feb30d339621af357dc8ab898",
+ "url": "https://api.github.com/repos/piwik/device-detector/zipball/29830f9bd67c8300e37828db0688161dd6f5f7a5",
+ "reference": "29830f9bd67c8300e37828db0688161dd6f5f7a5",
"shasum": ""
},
"require": {
@@ -871,20 +870,20 @@
"parser",
"useragent"
],
- "time": "2015-12-17 22:27:21"
+ "time": "2016-01-21 22:26:37"
},
{
"name": "piwik/ini",
- "version": "1.0.4",
+ "version": "1.0.6",
"source": {
"type": "git",
"url": "https://github.com/piwik/component-ini.git",
- "reference": "9269255fd187e5bda2e5778041c8d143eb615b0a"
+ "reference": "bd2711ba4d5e20e4ca09b6829dc2831576b59dc3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/piwik/component-ini/zipball/9269255fd187e5bda2e5778041c8d143eb615b0a",
- "reference": "9269255fd187e5bda2e5778041c8d143eb615b0a",
+ "url": "https://api.github.com/repos/piwik/component-ini/zipball/bd2711ba4d5e20e4ca09b6829dc2831576b59dc3",
+ "reference": "bd2711ba4d5e20e4ca09b6829dc2831576b59dc3",
"shasum": ""
},
"require": {
@@ -904,7 +903,7 @@
"license": [
"LGPL-3.0"
],
- "time": "2015-04-21 04:59:09"
+ "time": "2016-01-14 21:13:33"
},
{
"name": "piwik/network",
@@ -980,16 +979,16 @@
},
{
"name": "piwik/referrer-spam-blacklist",
- "version": "1.0.6",
+ "version": "1.0.7",
"source": {
"type": "git",
"url": "https://github.com/piwik/referrer-spam-blacklist.git",
- "reference": "5414a855511c7bc761347a3091276c30ba30311d"
+ "reference": "85db74cfc7249cb34ff59eba22edeb6704fd69b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/piwik/referrer-spam-blacklist/zipball/5414a855511c7bc761347a3091276c30ba30311d",
- "reference": "5414a855511c7bc761347a3091276c30ba30311d",
+ "url": "https://api.github.com/repos/piwik/referrer-spam-blacklist/zipball/85db74cfc7249cb34ff59eba22edeb6704fd69b8",
+ "reference": "85db74cfc7249cb34ff59eba22edeb6704fd69b8",
"shasum": ""
},
"type": "library",
@@ -998,20 +997,20 @@
"Public Domain"
],
"description": "Community-contributed list of referrer spammers",
- "time": "2015-10-07 10:17:59"
+ "time": "2016-01-05 17:31:58"
},
{
"name": "piwik/searchengine-and-social-list",
- "version": "1.0",
+ "version": "1.1",
"source": {
"type": "git",
"url": "https://github.com/piwik/searchengine-and-social-list.git",
- "reference": "e2b97a1cd9ed2dde735de49f8ef9afc26b3df80b"
+ "reference": "5b6763e77dadf24e579f03a7a0e79f1827b5db8a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/piwik/searchengine-and-social-list/zipball/e2b97a1cd9ed2dde735de49f8ef9afc26b3df80b",
- "reference": "e2b97a1cd9ed2dde735de49f8ef9afc26b3df80b",
+ "url": "https://api.github.com/repos/piwik/searchengine-and-social-list/zipball/5b6763e77dadf24e579f03a7a0e79f1827b5db8a",
+ "reference": "5b6763e77dadf24e579f03a7a0e79f1827b5db8a",
"shasum": ""
},
"type": "library",
@@ -1020,7 +1019,7 @@
"Public Domain"
],
"description": "Search engine and social network definitions used by Piwik",
- "time": "2015-11-06 21:32:51"
+ "time": "2015-11-16 22:24:23"
},
{
"name": "psr/log",
diff --git a/config/global.ini.php b/config/global.ini.php
index 00de6ff1732af8f9d9047c5648af8298eefc70ea..fd9ef2d649b671746bedb1aa4801b41ff25e69c6 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -36,6 +36,7 @@ port = 3306
adapter = PDO\MYSQL
type = InnoDB
schema = Mysql
+charset = utf8
[tests]
; needed in order to run tests.
@@ -561,6 +562,10 @@ pivot_by_filter_enable_fetch_by_segment = 0
; on a per-request basis;
pivot_by_filter_default_column_limit = 10
+; If set to 0 it will disable Piwik Pro advertisements in some places. For example in the installation screen, the
+; Piwik Pro Ad widget will be removed etc.
+piwik_pro_ads_enabled = 1
+
[Tracker]
; Piwik uses "Privacy by default" model. When one of your users visit multiple of your websites tracked in this Piwik,
@@ -790,6 +795,7 @@ Plugins[] = Resolution
Plugins[] = DevicePlugins
Plugins[] = Heartbeat
Plugins[] = Intl
+Plugins[] = PiwikPro
[PluginsInstalled]
PluginsInstalled[] = Diagnostics
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
index 0485cc353259c4fafcdbd68c2cdbcf93c4508d8b..f24b4993b6a7fa63a181b97d90172eacf0f4f462 100644
--- a/core/ArchiveProcessor.php
+++ b/core/ArchiveProcessor.php
@@ -442,6 +442,16 @@ class ArchiveProcessor
$metrics[] = $uniqueVisitorsMetric;
$uniques = $this->computeNbUniques($metrics);
+
+ // see edge case as described in https://github.com/piwik/piwik/issues/9357 where uniq_visitors might be higher
+ // than visits because we archive / process it after nb_visits. Between archiving nb_visits and nb_uniq_visitors
+ // there could have been a new visit leading to a higher nb_unique_visitors than nb_visits which is not possible
+ // by definition. In this case we simply use the visits metric instead of unique visitors metric.
+ $visits = $row->getColumn('nb_visits');
+ if ($visits !== false && $uniques[$uniqueVisitorsMetric] !== false) {
+ $uniques[$uniqueVisitorsMetric] = min($uniques[$uniqueVisitorsMetric], $visits);
+ }
+
$row->setColumn('nb_uniq_visitors', $uniques[$uniqueVisitorsMetric]);
$row->setColumn('nb_users', $uniques[Metrics::INDEX_NB_USERS]);
}
diff --git a/core/CliMulti.php b/core/CliMulti.php
index 4921236f11c2fc09e9f72d5a30f80ab766717d86..ef360f0214657225a407e39c734af3f8d787b881 100644
--- a/core/CliMulti.php
+++ b/core/CliMulti.php
@@ -56,6 +56,8 @@ class CliMulti
*/
private $urlToPiwik = null;
+ private $phpCliOptions = '';
+
public function __construct()
{
$this->supportsAsync = $this->supportsAsync();
@@ -89,6 +91,15 @@ class CliMulti
return $results;
}
+ /**
+ * Forwards the given configuration options to the PHP cli command.
+ * @param string $phpCliOptions eg "-d memory_limit=8G -c=path/to/php.ini"
+ */
+ public function setPhpCliConfigurationOptions($phpCliOptions)
+ {
+ $this->phpCliOptions = (string) $phpCliOptions;
+ }
+
/**
* Ok, this sounds weird. Why should we care about ssl certificates when we are in CLI mode? It is needed for
* our simple fallback mode for Windows where we initiate HTTP requests instead of CLI.
@@ -142,8 +153,8 @@ class CliMulti
$bin = $this->findPhpBinary();
$superuserCommand = $this->runAsSuperUser ? "--superuser" : "";
- return sprintf('%s %s/console climulti:request -q --piwik-domain=%s %s %s > %s 2>&1 &',
- $bin, PIWIK_INCLUDE_PATH, escapeshellarg($hostname), $superuserCommand, escapeshellarg($query), $outputFile);
+ return sprintf('%s %s %s/console climulti:request -q --piwik-domain=%s %s %s > %s 2>&1 &',
+ $bin, $this->phpCliOptions, PIWIK_INCLUDE_PATH, escapeshellarg($hostname), $superuserCommand, escapeshellarg($query), $outputFile);
}
private function getResponse()
diff --git a/core/Common.php b/core/Common.php
index f1d0c3f64bacd75abd5008e9e955ffc5e699ba88..03e05214c7cad120361aa3e3d841446ea90435ea 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -557,10 +557,6 @@ class Common
$chars = $alphabet;
$str = '';
- list($usec, $sec) = explode(" ", microtime());
- $seed = ((float)$sec + (float)$usec) * 100000;
- mt_srand((int) $seed);
-
for ($i = 0; $i < $length; $i++) {
$rand_key = mt_rand(0, strlen($chars) - 1);
$str .= substr($chars, $rand_key, 1);
diff --git a/core/Config.php b/core/Config.php
index a1bbabc3496d28507ced807772e4195b92e905c0..adc3ba948de149bbab264e2b6e04e56fe3984a4b 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -157,7 +157,8 @@ class Config
'action_url_category_delimiter' => $general['action_url_category_delimiter'],
'autocomplete_min_sites' => $general['autocomplete_min_sites'],
'datatable_export_range_as_day' => $general['datatable_export_range_as_day'],
- 'datatable_row_limits' => $this->getDatatableRowLimits()
+ 'datatable_row_limits' => $this->getDatatableRowLimits(),
+ 'are_ads_enabled' => $general['piwik_pro_ads_enabled']
);
}
diff --git a/core/CronArchive.php b/core/CronArchive.php
index c929f88809bd400a7dc0d303975e3132961411c4..28ddf49ce90755cb33979b208a52cc6ef3429449 100644
--- a/core/CronArchive.php
+++ b/core/CronArchive.php
@@ -128,6 +128,12 @@ class CronArchive
*/
public $shouldStartProfiler = false;
+ /**
+ * Given options will be forwarded to the PHP command if the archiver is executed via CLI.
+ * @var string
+ */
+ public $phpCliConfigurationOptions = '';
+
/**
* If HTTP requests are used to initiate archiving, this controls whether invalid SSL certificates should
* be accepted or not by each request.
@@ -896,9 +902,7 @@ class CronArchive
$this->requests += count($urls);
$cliMulti = $this->makeCliMulti();
- $cliMulti->setAcceptInvalidSSLCertificate($this->acceptInvalidSSLCertificate);
$cliMulti->setConcurrentProcessesLimit($this->getConcurrentRequestsPerWebsite());
- $cliMulti->runAsSuperUser();
$response = $cliMulti->request($urls);
foreach ($urls as $index => $url) {
@@ -969,18 +973,8 @@ class CronArchive
{
$url = $this->makeRequestUrl($url);
- if ($this->shouldStartProfiler) {
- $url .= "&xhprof=2";
- }
-
- if ($this->testmode) {
- $url .= "&testmode=1";
- }
-
try {
$cliMulti = $this->makeCliMulti();
- $cliMulti->setAcceptInvalidSSLCertificate($this->acceptInvalidSSLCertificate);
- $cliMulti->runAsSuperUser();
$responses = $cliMulti->request(array($url));
$response = !empty($responses) ? array_shift($responses) : null;
@@ -1603,7 +1597,17 @@ class CronArchive
*/
private function makeRequestUrl($url)
{
- return $url . self::APPEND_TO_API_REQUEST;
+ $url = $url . self::APPEND_TO_API_REQUEST;
+
+ if ($this->shouldStartProfiler) {
+ $url .= "&xhprof=2";
+ }
+
+ if ($this->testmode) {
+ $url .= "&testmode=1";
+ }
+
+ return $url;
}
/**
@@ -1712,6 +1716,9 @@ class CronArchive
{
$cliMulti = StaticContainer::get('Piwik\CliMulti');
$cliMulti->setUrlToPiwik($this->urlToPiwik);
+ $cliMulti->setPhpCliConfigurationOptions($this->phpCliConfigurationOptions);
+ $cliMulti->setAcceptInvalidSSLCertificate($this->acceptInvalidSSLCertificate);
+ $cliMulti->runAsSuperUser();
return $cliMulti;
}
diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php
index 2ef614990f8db61c285d2063098bdea272528cbd..3473a33c39451e1b6eb4784b95f7a9252caf9b1a 100644
--- a/core/DataAccess/ArchiveWriter.php
+++ b/core/DataAccess/ArchiveWriter.php
@@ -212,7 +212,7 @@ class ArchiveWriter
$tableName = $this->getTableNameToInsert($valueSeen);
$fields = $this->getInsertFields();
- BatchInsert::tableInsertBatch($tableName, $fields, $values);
+ BatchInsert::tableInsertBatch($tableName, $fields, $values, $throwException = false, $charset = 'latin1');
return true;
}
diff --git a/core/DataFiles/cacert.pem b/core/DataFiles/cacert.pem
index b7cd57cb79a382962e547fa36a2f14edfc6315f3..27078e454df0ec13e0fbbfcafbbacea373a4f250 100644
--- a/core/DataFiles/cacert.pem
+++ b/core/DataFiles/cacert.pem
@@ -1,7 +1,7 @@
##
## Bundle of CA Root Certificates
##
-## Certificate data from Mozilla as of: Wed Feb 25 04:12:04 2015
+## Certificate data from Mozilla as of: Wed Oct 28 04:12:04 2015
##
## This is a bundle of X.509 certificates of public Certificate Authorities
## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,9 +14,38 @@
## Just configure this file as the SSLCACertificateFile.
##
## Conversion done with mk-ca-bundle.pl version 1.25.
-## SHA1: f9bc9fa76145720d94124527f82a7185d921975e
+## SHA1: 6d7d2f0a4fae587e7431be191a081ac1257d300a
##
+Let’s Encrypt Authority X1
+==========================
+-----BEGIN CERTIFICATE-----
+MIIEqDCCA5CgAwIBAgIRAJgT9HUT5XULQ+dDHpceRL0wDQYJKoZIhvcNAQELBQAw
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzAeFw0xNTEwMTkyMjMzMzZaFw0yMDEwMTkyMjMzMzZa
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAJzTDPBa5S5Ht3JdN4OzaGMw6tc1Jhkl4b2+NfFwki+3uEtB
+BaupnjUIWOyxKsRohwuj43Xk5vOnYnG6eYFgH9eRmp/z0HhncchpDpWRz/7mmelg
+PEjMfspNdxIknUcbWuu57B43ABycrHunBerOSuu9QeU2mLnL/W08lmjfIypCkAyG
+dGfIf6WauFJhFBM/ZemCh8vb+g5W9oaJ84U/l4avsNwa72sNlRZ9xCugZbKZBDZ1
+gGusSvMbkEl4L6KWTyogJSkExnTA0DHNjzE4lRa6qDO4Q/GxH8Mwf6J5MRM9LTb4
+4/zyM2q5OTHFr8SNDR1kFjOq+oQpttQLwNh9w5MCAwEAAaOCAZIwggGOMBIGA1Ud
+EwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMH8GCCsGAQUFBwEBBHMwcTAy
+BggrBgEFBQcwAYYmaHR0cDovL2lzcmcudHJ1c3RpZC5vY3NwLmlkZW50cnVzdC5j
+b20wOwYIKwYBBQUHMAKGL2h0dHA6Ly9hcHBzLmlkZW50cnVzdC5jb20vcm9vdHMv
+ZHN0cm9vdGNheDMucDdjMB8GA1UdIwQYMBaAFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MFQGA1UdIARNMEswCAYGZ4EMAQIBMD8GCysGAQQBgt8TAQEBMDAwLgYIKwYBBQUH
+AgEWImh0dHA6Ly9jcHMucm9vdC14MS5sZXRzZW5jcnlwdC5vcmcwPAYDVR0fBDUw
+MzAxoC+gLYYraHR0cDovL2NybC5pZGVudHJ1c3QuY29tL0RTVFJPT1RDQVgzQ1JM
+LmNybDATBgNVHR4EDDAKoQgwBoIELm1pbDAdBgNVHQ4EFgQUqEpqYwR93brm0Tm3
+pkVl7/Oo7KEwDQYJKoZIhvcNAQELBQADggEBANHIIkus7+MJiZZQsY14cCoBG1hd
+v0J20/FyWo5ppnfjL78S2k4s2GLRJ7iD9ZDKErndvbNFGcsW+9kKK/TnY21hp4Dd
+ITv8S9ZYQ7oaoqs7HwhEMY9sibED4aXw09xrJZTC9zK1uIfW6t5dHQjuOWv+HHoW
+ZnupyxpsEUlEaFb+/SCI4KCSBdAsYxAcsHYI5xxEI4LutHp6s3OT2FuO90WfdsIk
+6q78OMSdn875bNjdBYAqxUp2/LEIHfDBkLoQz0hFJmwAbYahqKaLn73PAAm1X2kj
+f1w8DdnkabOLGeOVcj9LQ+s67vBykx4anTjURkbqZslUEUsn2k5xeua2zUk=
+-----END CERTIFICATE-----
Equifax Secure CA
=================
@@ -174,23 +203,6 @@ Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
-----END CERTIFICATE-----
-Equifax Secure Global eBusiness CA
-==================================
------BEGIN CERTIFICATE-----
-MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-RXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBTZWN1cmUgR2xvYmFsIGVCdXNp
-bmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIwMDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0VxdWlmYXggU2VjdXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEds
-b2JhbCBlQnVzaW5lc3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRV
-PEnCUdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc58O/gGzN
-qfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/o5brhTMhHD4ePmBudpxn
-hcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAHMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j
-BBgwFoAUvqigdHJQa0S3ySPY+6j/s1draGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hs
-MA0GCSqGSIb3DQEBBAUAA4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okEN
-I7SS+RkAZ70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv8qIY
-NMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
------END CERTIFICATE-----
-
AddTrust Low-Value Services Root
================================
-----BEGIN CERTIFICATE-----
@@ -1159,29 +1171,6 @@ vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
oKfN5XozNmr6mis=
-----END CERTIFICATE-----
-TURKTRUST Certificate Services Provider Root 1
-==============================================
------BEGIN CERTIFICATE-----
-MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP
-MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
-acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx
-MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg
-U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB
-TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC
-aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX
-yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8i
-Si9BB35JYbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ
-8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4
-W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46
-sWrv7/hg0Uw2ZkUd82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxE
-q8Sn5RTOPEFhfEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
-B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgY
-nNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H
------END CERTIFICATE-----
-
TURKTRUST Certificate Services Provider Root 2
==============================================
-----BEGIN CERTIFICATE-----
@@ -1606,83 +1595,6 @@ PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
-----END CERTIFICATE-----
-TC TrustCenter Class 2 CA II
-============================
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
-IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw
-MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
-c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE
-AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw
-IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2
-xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ
-Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u
-SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB
-7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
-Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
-cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
-SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G
-dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ
-KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj
-TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP
-JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk
-vQ==
------END CERTIFICATE-----
-
-TC TrustCenter Class 3 CA II
-============================
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
-IENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYw
-MTEyMTQ0MTU3WhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
-c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UE
-AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJWHt4bNwcwIi9v8Qbxq63W
-yKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+QVl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo
-6SI7dYnWRBpl8huXJh0obazovVkdKyT21oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZ
-uV3bOx4a+9P/FRQI2AlqukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk
-2ZyqBwi1Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NXXAek0CSnwPIA1DCB
-7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
-Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
-cnVzdENlbnRlciUyMENsYXNzJTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
-SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlNirTzwppVMXzE
-O2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8TtXqluJucsG7Kv5sbviRmEb8
-yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9
-IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal
-092Y+tTmBvTwtiBjS+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc
-5A==
------END CERTIFICATE-----
-
-TC TrustCenter Universal CA I
-=============================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
-IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN
-MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg
-VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw
-JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC
-qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv
-xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw
-ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O
-gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j
-BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG
-1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy
-vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3
-ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
-ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a
-7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
------END CERTIFICATE-----
-
Deutsche Telekom Root CA 2
==========================
-----BEGIN CERTIFICATE-----
@@ -1705,28 +1617,6 @@ dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
Cm26OWMohpLzGITY+9HPBVZkVw==
-----END CERTIFICATE-----
-ComSign Secured CA
-==================
------BEGIN CERTIFICATE-----
-MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE
-AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w
-NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD
-QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs
-49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sWv+bznkqH
-7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB
-kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d1
-9guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw
-AwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t
-U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA
-j8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC
-AQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3a
-BijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp
-FhpFfTMDZflScZAmlaxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP
-51qJThRv4zdLhfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
-OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
------END CERTIFICATE-----
-
Cybertrust Global Root
======================
-----BEGIN CERTIFICATE-----
@@ -1828,26 +1718,6 @@ fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
-----END CERTIFICATE-----
-Buypass Class 3 CA 1
-====================
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1
-MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
-c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx
-ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0
-n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia
-AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c
-1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7
-pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA
-EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5
-htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj
-el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
------END CERTIFICATE-----
-
EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
==========================================================================
-----BEGIN CERTIFICATE-----
@@ -2277,28 +2147,6 @@ yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
LXpUq3DDfSJlgnCW
-----END CERTIFICATE-----
-E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
-===================================================
------BEGIN CERTIFICATE-----
-MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
-EwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxpZ2kgQS5TLjE8MDoGA1UEAxMz
-ZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3
-MDEwNDExMzI0OFoXDTE3MDEwNDExMzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0
-cm9uaWsgQmlsZ2kgR3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9u
-aWsgU2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdUMZTe1RK6UxYC6lhj71vY
-8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlTL/jDj/6z/P2douNffb7tC+Bg62nsM+3Y
-jfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAI
-JjjcJRFHLfO6IxClv7wC90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk
-9Ok0oSy1c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/BAQD
-AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoEVtstxNulMA0GCSqG
-SIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLPqk/CaOv/gKlR6D1id4k9CnU58W5d
-F4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwq
-D2fK/A+JYZ1lpTzlvBNbCNvj/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4
-Vwpm+Vganf2XKWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
-fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
------END CERTIFICATE-----
-
GlobalSign Root CA - R3
=======================
-----BEGIN CERTIFICATE-----
@@ -3858,3 +3706,276 @@ BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G3
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
+olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
+x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
+EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
+Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
+mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
+1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
+07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
+FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
+41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
+yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
+U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
+KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
+v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
+8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
+8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
+mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
+1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
+JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
+tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden EV Root CA
+================================
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
+MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
+cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
+SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
+O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
+0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
+Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
+XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
+08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
+0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
+74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
+fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
+ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
+eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
+c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
+5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
+b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
+f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
+5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
+WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
+DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
+eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
+-----END CERTIFICATE-----
+
+IdenTrust Commercial Root CA 1
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
+b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
+IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
+hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
+mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
+1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
+XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
+3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
+NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
+WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
+xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
+uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
+hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
+ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
+ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
+YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
+feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
+kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
+2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
+Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
+cGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+
+IdenTrust Public Sector Root CA 1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
+ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
+b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
+P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
+Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
+rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
+qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
+mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
+ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
+LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
+iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
+4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
+Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
+DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
+mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
+GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
+m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
+NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
+Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
+ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
+ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
+3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
+bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
+b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
+HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
+DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
+OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
+/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
+HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
+s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
+TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
+AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
+0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
+iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
+nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
+e4pIb4tF9g==
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - EC1
+==========================================
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
+FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
+YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
+FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
+LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
+dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
+AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
+9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
+vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
+kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
+
+CFCA EV ROOT
+============
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
+CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
+IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
+MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
+DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
+BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
+7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
+uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
+ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
+xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
+py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
+gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
+hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
+tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
+BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
+ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
+4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
+E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
+BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
+aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
+PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
+kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
+ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----
+
+TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVFIxDzAN
+BgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
+bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4xQjBABgNVBAMMOVTDnFJLVFJVU1Qg
+RWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSBINTAeFw0xMzA0MzAw
+ODA3MDFaFw0yMzA0MjgwODA3MDFaMIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0w
+SwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnE
+n2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBFbGVrdHJvbmlrIFNlcnRp
+ZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApCUZ4WWe60ghUEoI5RHwWrom/4NZzkQqL/7hzmAD/I0Dpe3/a6i6zDQGn1k19uwsu537
+jVJp45wnEFPzpALFp/kRGml1bsMdi9GYjZOHp3GXDSHHmflS0yxjXVW86B8BSLlg/kJK9siArs1m
+ep5Fimh34khon6La8eHBEJ/rPCmBp+EyCNSgBbGM+42WAA4+Jd9ThiI7/PS98wl+d+yG6w8z5UNP
+9FR1bSmZLmZaQ9/LXMrI5Tjxfjs1nQ/0xVqhzPMggCTTV+wVunUlm+hkS7M0hO8EuPbJbKoCPrZV
+4jI3X/xml1/N1p7HIL9Nxqw/dV8c7TKcfGkAaZHjIxhT6QIDAQABo0IwQDAdBgNVHQ4EFgQUVpkH
+HtOsDGlktAxQR95DLL4gwPswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAJ5FdnsXSDLyOIspve6WSk6BGLFRRyDN0GSxDsnZAdkJzsiZ3GglE9Rc8qPo
+BP5yCccLqh0lVX6Wmle3usURehnmp349hQ71+S4pL+f5bFgWV1Al9j4uPqrtd3GqqpmWRgqujuwq
+URawXs3qZwQcWDD1YIq9pr1N5Za0/EKJAWv2cMhQOQwt1WbZyNKzMrcbGW3LM/nfpeYVhDfwwvJl
+lpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CFYv4HAqGEVka+lgqaE9chTLd8
+B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW+qtB4Uu2NQvAmxU=
+-----END CERTIFICATE-----
+
+TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQGEwJUUjEPMA0G
+A1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
+acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2MB4XDTEzMTIxODA5
+MDQxMFoXDTIzMTIxNjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExTTBL
+BgNVBAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSf
+aSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2VydGlm
+aWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCdsGjW6L0UlqMACprx9MfMkU1xeHe59yEmFXNRFpQJRwXiM/VomjX/3EsvMsew7eKC5W/a
+2uqsxgbPJQ1BgfbBOCK9+bGlprMBvD9QFyv26WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EED
+wnS3/faAz1vFq6TWlRKb55cTMgPp1KtDWxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0pu5Fb
+HH3GQjhtQiht1AH7zYiXSX6484P4tZgvsycLSF5W506jM7NE1qXyGJTtHB6plVxiSvgNZ1GpryHV
++DKdeboaX+UEVU0TRv/yz3THGmNtwx8XEsMeED5gCLMxAgMBAAGjQjBAMB0GA1UdDgQWBBTdVRcT
+9qzoSCHK77Wv0QAy7Z6MtTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQsFAAOCAQEAb1gNl0OqFlQ+v6nfkkU/hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3R
+fdCaqaXKGDsCQC4qnFAUi/5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X+LEr+DXCqu4svLcsy
+o4LyVN/Y8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKIDgI6tflEATseW
+hvtDmHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY/ATTMHKm9ocJV612ph1jmv3XZch4gyt1
+O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsGtAuYSyher4hYyw==
+-----END CERTIFICATE-----
+
+Certinomis - Root CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
+LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
+EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
+ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
+P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
+d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
+z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
+8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
+RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
+6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
+FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
+PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
+i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
+YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
+6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
+AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
+WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
+Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
+lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
+y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
+Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
+DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
+I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
+cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
+hkIGuUE=
+-----END CERTIFICATE-----
diff --git a/core/Date.php b/core/Date.php
index be009fe54bc70a8ef4ef29ba894d0c53f37eaa62..be099e792afe489a0a1e0caff4215026f2133d90 100644
--- a/core/Date.php
+++ b/core/Date.php
@@ -718,11 +718,11 @@ class Date
case "EE":
case "E":
return $translator->translate('Intl_Day_Short_' . $dayOfWeek);
- case "CCCC":
+ case "cccc":
return $translator->translate('Intl_Day_Long_StandAlone_' . $dayOfWeek);
- case "CCC":
- case "CC":
- case "C":
+ case "ccc":
+ case "cc":
+ case "c":
return $translator->translate('Intl_Day_Short_StandAlone_' . $dayOfWeek);
case "D":
return 1 + (int)$this->toString('z'); // 1 - 366
diff --git a/core/Db/BatchInsert.php b/core/Db/BatchInsert.php
index 8d54c163b2951dd0bcdc3ce8ad2b9fe26e064a83..84093dca9d89ab4bba82e73bbbe792a82034d224 100644
--- a/core/Db/BatchInsert.php
+++ b/core/Db/BatchInsert.php
@@ -51,17 +51,20 @@ class BatchInsert
* @param array $values array of data to be inserted
* @param bool $throwException Whether to throw an exception that was caught while trying
* LOAD DATA INFILE, or not.
+ * @param string $charset The charset to use, defaults to utf8
* @throws Exception
* @return bool True if the bulk LOAD was used, false if we fallback to plain INSERTs
*/
- public static function tableInsertBatch($tableName, $fields, $values, $throwException = false)
+ public static function tableInsertBatch($tableName, $fields, $values, $throwException = false, $charset = 'utf8')
{
- $filePath = StaticContainer::get('path.tmp') . '/assets/' . $tableName . '-' . Common::generateUniqId() . '.csv';
-
$loadDataInfileEnabled = Config::getInstance()->General['enable_load_data_infile'];
if ($loadDataInfileEnabled
&& Db::get()->hasBulkLoader()) {
+
+ $path = self::getBestPathForLoadData();
+ $filePath = $path . $tableName . '-' . Common::generateUniqId() . '.csv';
+
try {
$fileSpec = array(
'delim' => "\t",
@@ -72,13 +75,9 @@ class BatchInsert
},
'eol' => "\r\n",
'null' => 'NULL',
+ 'charset' => $charset
);
- // hack for charset mismatch
- if (!DbHelper::isDatabaseConnectionUTF8() && !isset(Config::getInstance()->database['charset'])) {
- $fileSpec['charset'] = 'latin1';
- }
-
self::createCSVFile($filePath, $fileSpec, $values);
if (!is_readable($filePath)) {
@@ -95,17 +94,36 @@ class BatchInsert
throw $e;
}
}
- }
- // if all else fails, fallback to a series of INSERTs
- if(file_exists($filePath)){
- @unlink($filePath);
+ // if all else fails, fallback to a series of INSERTs
+ if (file_exists($filePath)) {
+ @unlink($filePath);
+ }
}
-
+
self::tableInsertBatchIterate($tableName, $fields, $values);
+
return false;
}
+ private static function getBestPathForLoadData()
+ {
+ try {
+ $path = Db::fetchOne('SELECT @@secure_file_priv'); // was introduced in 5.0.38
+ } catch (Exception $e) {
+ // we do not rethrow exception as an error is expected if MySQL is < 5.0.38
+ // in this case tableInsertBatch might still work
+ }
+
+ if (empty($path) || !@is_dir($path) || !@is_writable($path)) {
+ $path = StaticContainer::get('path.tmp') . '/assets/';
+ } elseif (!Common::stringEndsWith($path, '/')) {
+ $path .= '/';
+ }
+
+ return $path;
+ }
+
/**
* Batch insert into table from CSV (or other delimited) file.
*
diff --git a/core/Http.php b/core/Http.php
index b5533262e4a156b76fc75925bacbe7dcf309c5f1..7e7602c20e74d8a17d957bb5e1876d33c37f92af 100644
--- a/core/Http.php
+++ b/core/Http.php
@@ -125,6 +125,7 @@ class Http
* @param string $httpMethod The HTTP method to use. Defaults to `'GET'`.
* @param string $httpUsername HTTP Auth username
* @param string $httpPassword HTTP Auth password
+ * @param array|string $requestBody If $httpMethod is 'POST' this may accept an array of variables or a string that needs to be posted
*
* @throws Exception
* @return bool true (or string/array) on success; false on HTTP response error code (1xx or 4xx)
@@ -143,7 +144,8 @@ class Http
$getExtendedInfo = false,
$httpMethod = 'GET',
$httpUsername = null,
- $httpPassword = null
+ $httpPassword = null,
+ $requestBody = null
) {
if ($followDepth > 5) {
throw new Exception('Too many redirects (' . $followDepth . ')');
@@ -152,6 +154,10 @@ class Http
$contentLength = 0;
$fileLength = 0;
+ if (!empty($requestBody) && is_array($requestBody)) {
+ $requestBody = http_build_query($requestBody);
+ }
+
// Piwik services behave like a proxy, so we should act like one.
$xff = 'X-Forwarded-For: '
. (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && !empty($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] . ',' : '')
@@ -251,10 +257,17 @@ class Http
. $xff . "\r\n"
. $via . "\r\n"
. $rangeHeader
- . "Connection: close\r\n"
- . "\r\n";
+ . "Connection: close\r\n";
fwrite($fsock, $requestHeader);
+ if (strtolower($httpMethod) === 'post' && !empty($requestBody)) {
+ fwrite($fsock, self::buildHeadersForPost($requestBody));
+ fwrite($fsock, "\r\n");
+ fwrite($fsock, $requestBody);
+ } else {
+ fwrite($fsock, "\r\n");
+ }
+
$streamMetaData = array('timed_out' => false);
@stream_set_blocking($fsock, true);
@@ -421,6 +434,14 @@ class Http
}
}
+ if (strtolower($httpMethod) === 'post' && !empty($requestBody)) {
+ $postHeader = self::buildHeadersForPost($requestBody);
+ $postHeader .= "\r\n";
+ $stream_options['http']['method'] = 'POST';
+ $stream_options['http']['header'] .= $postHeader;
+ $stream_options['http']['content'] = $requestBody;
+ }
+
$ctx = stream_context_create($stream_options);
}
@@ -499,6 +520,11 @@ class Http
@curl_setopt($ch, CURLOPT_NOBODY, true);
}
+ if (strtolower($httpMethod) === 'post' && !empty($requestBody)) {
+ curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $requestBody);
+ }
+
if (!empty($httpUsername) && !empty($httpPassword)) {
$curl_options += array(
CURLOPT_USERPWD => $httpUsername . ':' . $httpPassword,
@@ -596,6 +622,14 @@ class Http
}
}
+ private static function buildHeadersForPost($requestBody)
+ {
+ $postHeader = "Content-Type: application/x-www-form-urlencoded\r\n";
+ $postHeader .= "Content-Length: " . strlen($requestBody) . "\r\n";
+
+ return $postHeader;
+ }
+
/**
* Downloads the next chunk of a specific file. The next chunk's byte range
* is determined by the existing file's size and the expected file size, which
@@ -839,9 +873,8 @@ class Http
private static function getProxyConfiguration($url)
{
$hostname = UrlHelper::getHostFromUrl($url);
- $localHostnames = Url::getLocalHostnames();
- if(in_array($hostname, $localHostnames)) {
+ if (Url::isLocalHost($hostname)) {
return array(null, null, null, null);
}
diff --git a/core/Mail.php b/core/Mail.php
index 22843b5a76d881689df4d7b78752345741b54491..c6c8623cfd279740b9afcc7c9638e739f52a4df4 100644
--- a/core/Mail.php
+++ b/core/Mail.php
@@ -127,6 +127,18 @@ class Mail extends Zend_Mail
}
}
+ public function createAttachment($body, $mimeType = null, $disposition = null, $encoding = null, $filename = null)
+ {
+ $filename = $this->sanitiseString($filename);
+ return parent::createAttachment($body, $mimeType, $disposition, $encoding, $filename);
+ }
+
+ public function setSubject($subject)
+ {
+ $subject = $this->sanitiseString($subject);
+ return parent::setSubject($subject);
+ }
+
/**
* @param string $email
* @return string
@@ -152,6 +164,20 @@ class Mail extends Zend_Mail
*/
protected function isHostDefinedAndNotLocal($url)
{
- return isset($url['host']) && !in_array($url['host'], Url::getLocalHostnames(), true);
+ return isset($url['host']) && !Url::isLocalHost($url['host']);
+ }
+
+ /**
+ * Replaces characters known to appear incorrectly in some email clients
+ *
+ * @param $string
+ * @return mixed
+ */
+ function sanitiseString($string)
+ {
+ $search = array('–', '’');
+ $replace = array('-', '\'');
+ $string = str_replace($search, $replace, $string);
+ return $string;
}
}
diff --git a/core/Notification/Manager.php b/core/Notification/Manager.php
index e7eafec49e4c0e9e158dbd931d05301b72691296..bdf1f130dd4882a99e8947068525bd0655c8f4ba 100644
--- a/core/Notification/Manager.php
+++ b/core/Notification/Manager.php
@@ -23,6 +23,11 @@ class Manager
*/
private static $session = null;
+ /**
+ * @var Notification[]
+ */
+ private static $notifications = array();
+
/**
* Posts a notification that will be shown in Piwik's status bar. If a notification with the same ID
* has been posted and has not been closed/removed, it will be replaced with `$notification`.
@@ -105,12 +110,21 @@ class Manager
private static function addNotification($id, Notification $notification)
{
- if (!self::isEnabled()) {
- return;
- }
+ self::saveNotificationAcrossUiRequestsIfNeeded($id, $notification);
- $session = static::getSession();
- $session->notifications[$id] = $notification;
+ // we store all kinda notifications here so in case the session is not enabled or disabled later there is still
+ // a chance it gets delivered to the UI during the same request.
+ self::$notifications[$id] = $notification;
+ }
+
+ private static function saveNotificationAcrossUiRequestsIfNeeded($id, Notification $notification)
+ {
+ $isPersistent = $notification->type === Notification::TYPE_PERSISTENT;
+
+ if ($isPersistent && self::isSessionEnabled()) {
+ $session = static::getSession();
+ $session->notifications[$id] = $notification;
+ }
}
private static function removeOldestNotificationsIfThereAreTooMany()
@@ -126,28 +140,43 @@ class Manager
private static function getAllNotifications()
{
- if (!self::isEnabled()) {
+ if (!self::isSessionEnabled()) {
return array();
}
- $session = static::getSession();
+ $notifications = self::$notifications;
+
+ foreach ($notifications as $id => $notification) {
+ // we copy them over to the session if possible and persist it in case the session was not yet
+ // writable / enabled at the time the notification was added.
+ self::saveNotificationAcrossUiRequestsIfNeeded($id, $notification);
+ }
- return $session->notifications;
+ if (self::isSessionEnabled()) {
+ $session = static::getSession();
+ foreach ($session->notifications as $id => $notification) {
+ $notifications[$id] = $notification;
+ }
+ }
+
+ return $notifications;
}
private static function removeNotification($id)
{
- if (!self::isEnabled()) {
- return;
+ if (array_key_exists($id, self::$notifications)) {
+ unset(self::$notifications[$id]);
}
- $session = static::getSession();
- if (array_key_exists($id, $session->notifications)) {
- unset($session->notifications[$id]);
+ if (self::isSessionEnabled()) {
+ $session = static::getSession();
+ if (array_key_exists($id, $session->notifications)) {
+ unset($session->notifications[$id]);
+ }
}
}
- private static function isEnabled()
+ private static function isSessionEnabled()
{
return Session::isWritable() && Session::isReadable();
}
@@ -161,7 +190,7 @@ class Manager
static::$session = new SessionNamespace('notification');
}
- if (empty(static::$session->notifications) && self::isEnabled()) {
+ if (empty(static::$session->notifications) && self::isSessionEnabled()) {
static::$session->notifications = array();
}
diff --git a/core/PiwikPro/Advertising.php b/core/PiwikPro/Advertising.php
new file mode 100644
index 0000000000000000000000000000000000000000..deea4fa9f37f8c24e2c6daaee166ed140ed3ee73
--- /dev/null
+++ b/core/PiwikPro/Advertising.php
@@ -0,0 +1,141 @@
+<?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\PiwikPro;
+
+use Piwik\Plugin;
+use Piwik\Config;
+
+/**
+ * Piwik PRO Advertising related methods. Lets you for example check whether advertising is enabled, generate
+ * links for differnt landing pages etc.
+ *
+ * @api
+ * @since 2.16.0
+ */
+class Advertising
+{
+ const CAMPAIGN_NAME_UPGRADE_TO_PRO = 'Upgrade_to_Pro';
+ const CAMPAIGN_NAME_UPGRADE_TO_CLOUD = 'Upgrade_to_Cloud';
+
+ /**
+ * @var Plugin\Manager
+ */
+ private $pluginManager;
+
+ /**
+ * @var Config
+ */
+ private $config;
+
+ public function __construct(Plugin\Manager $pluginManager, Config $config)
+ {
+ $this->pluginManager = $pluginManager;
+ $this->config = $config;
+ }
+
+ /**
+ * Returns true if it is ok to show some Piwik PRO advertising in the Piwik UI.
+ * @return bool
+ */
+ public function arePiwikProAdsEnabled()
+ {
+ if ($this->pluginManager->isPluginActivated('EnterpriseAdmin')
+ || $this->pluginManager->isPluginActivated('LoginAdmin')
+ || $this->pluginManager->isPluginActivated('CloudAdmin')
+ || $this->pluginManager->isPluginActivated('WhiteLabel')) {
+ return false;
+ }
+
+ $showAds = $this->config->General['piwik_pro_ads_enabled'];
+
+ return !empty($showAds);
+ }
+
+ /**
+ * Get URL for promoting the Piwik Cloud.
+ *
+ * @param string $campaignMedium
+ * @param string $campaignContent
+ * @return string
+ */
+ public function getPromoUrlForCloud($campaignMedium, $campaignContent = '')
+ {
+ $url = 'https://piwik.pro/cloud/?';
+
+ $campaign = $this->getCampaignParametersForPromoUrl(
+ $name = self::CAMPAIGN_NAME_UPGRADE_TO_CLOUD,
+ $campaignMedium,
+ $campaignContent
+ );
+
+ return $url . $campaign;
+ }
+
+ /**
+ * Get URL for promoting Piwik On Premises.
+ * @param string $campaignMedium
+ * @param string $campaignContent
+ * @return string
+ */
+ public function getPromoUrlForOnPremises($campaignMedium, $campaignContent = '')
+ {
+ $url = 'https://piwik.pro/c/upgrade/?';
+
+ $campaign = $this->getCampaignParametersForPromoUrl(
+ $name = self::CAMPAIGN_NAME_UPGRADE_TO_PRO,
+ $campaignMedium,
+ $campaignContent
+ );
+
+ return $url . $campaign;
+ }
+
+ /**
+ * Appends campaign parameters to the given URL for promoting any Piwik PRO service.
+ * @param string $url
+ * @param string $campaignName
+ * @param string $campaignMedium
+ * @param string $campaignContent
+ * @return string
+ */
+ public function addPromoCampaignParametersToUrl($url, $campaignName, $campaignMedium, $campaignContent = '')
+ {
+ if (empty($url)) {
+ return '';
+ }
+
+ if (strpos($url, '?') === false) {
+ $url .= '?';
+ } else {
+ $url .= '&';
+ }
+
+ $url .= $this->getCampaignParametersForPromoUrl($campaignName, $campaignMedium, $campaignContent);
+
+ return $url;
+ }
+
+ /**
+ * Generates campaign URL parameters that can be used with any promotion link for Piwik PRO.
+ *
+ * @param string $campaignName
+ * @param string $campaignMedium
+ * @param string $campaignContent Optional
+ * @return string URL parameters without a leading ? or &
+ */
+ private function getCampaignParametersForPromoUrl($campaignName, $campaignMedium, $campaignContent = '')
+ {
+ $campaignName = sprintf('pk_campaign=%s&pk_medium=%s&pk_source=Piwik_App', $campaignName, $campaignMedium);
+
+ if (!empty($campaignContent)) {
+ $campaignName .= '&pk_content=' . $campaignContent;
+ }
+
+ return $campaignName;
+ }
+}
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index e4c9380e2d5115c9ab39e9cd6008091818b60af0..636303e9299b5b97bb558d6c8c9daa8a3ef3e4be 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -630,6 +630,7 @@ abstract class Controller
$view->date = $this->strDate;
$view->prettyDate = self::getCalendarPrettyDate($period);
+ $view->prettyDateLong = $period->getLocalizedLongString();
$view->rawDate = $rawDate;
$view->startDate = $dateStart;
$view->endDate = $dateEnd;
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
index 7c8a1be211ecc8bdbd79608dd802ea05d3ccf1b8..a0658c4142b4694b1edb553746c92e32c852b49a 100644
--- a/core/Plugin/ControllerAdmin.php
+++ b/core/Plugin/ControllerAdmin.php
@@ -21,6 +21,7 @@ use Piwik\Tracker\TrackerConfig;
use Piwik\Url;
use Piwik\Version;
use Piwik\View;
+use Piwik\ProxyHttp;
/**
* Base class of plugin controllers that provide administrative functionality.
@@ -86,6 +87,36 @@ abstract class ControllerAdmin extends Controller
self::setBasicVariablesAdminView($view);
}
+ private static function notifyIfURLIsNotSecure()
+ {
+ $isURLSecure = ProxyHttp::isHttps();
+ if ($isURLSecure) {
+ return;
+ }
+
+ if (!Piwik::hasUserSuperUserAccess()) {
+ return;
+ }
+
+ if(Url::isLocalHost(Url::getCurrentHost())) {
+ return;
+ }
+
+
+ $message = Piwik::translate('General_CurrentlyUsingUnsecureHttp');
+
+ $message .= " ";
+
+ $message .= Piwik::translate('General_ReadThisToLearnMore',
+ array('<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/faq_91/">', '</a>')
+ );
+
+ $notification = new Notification($message);
+ $notification->context = Notification::CONTEXT_WARNING;
+ $notification->raw = true;
+ Notification\Manager::notify('ControllerAdmin_HttpIsUsed', $notification);
+ }
+
/**
* @ignore
*/
@@ -104,6 +135,7 @@ abstract class ControllerAdmin extends Controller
}
}
+
private static function notifyIfEAcceleratorIsUsed()
{
$isEacceleratorUsed = ini_get('eaccelerator.enable');
@@ -184,6 +216,7 @@ abstract class ControllerAdmin extends Controller
{
self::notifyWhenTrackingStatisticsDisabled();
self::notifyIfEAcceleratorIsUsed();
+ self::notifyIfURLIsNotSecure();
$view->topMenu = MenuTop::getInstance()->getMenu();
$view->userMenu = MenuUser::getInstance()->getMenu();
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index 63a3e0aaafca5317182c36c0b0b1fbf994db4473..2b552f48e0e34c66240d868469cadd834eccc8f1 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -18,9 +18,11 @@ use Piwik\Container\StaticContainer;
use Piwik\EventDispatcher;
use Piwik\Filesystem;
use Piwik\Log;
+use Piwik\Notification;
use Piwik\Piwik;
use Piwik\Plugin;
use Piwik\PluginDeactivatedException;
+use Piwik\Session;
use Piwik\Theme;
use Piwik\Tracker;
use Piwik\Translation\Translator;
@@ -828,6 +830,15 @@ class Manager
if ($newPlugin->hasMissingDependencies()) {
$this->deactivatePlugin($pluginName);
+
+ // add this state we do not know yet whether current user has super user access. We do not even know
+ // if someone is actually logged in.
+ $message = sprintf('We disabled the plugin %s as it has missing dependencies.', $pluginName);
+ $message .= ' Please contact your Piwik administrator.';
+
+ $notification = new Notification($message);
+ $notification->context = Notification::CONTEXT_ERROR;
+ Notification\Manager::notify('PluginManager_PluginDeactivated', $notification);
continue;
}
diff --git a/core/Settings/SystemSetting.php b/core/Settings/SystemSetting.php
index 94f7416c19c70e7d2e0dd94f2d380af79c2b18fb..fb0a4d7a2d6e23e767eed9fb110d7f4b01e2d74d 100644
--- a/core/Settings/SystemSetting.php
+++ b/core/Settings/SystemSetting.php
@@ -9,6 +9,7 @@
namespace Piwik\Settings;
+use Piwik\Config;
use Piwik\Piwik;
/**
@@ -58,6 +59,10 @@ class SystemSetting extends Setting
*/
public function isWritableByCurrentUser()
{
+ if ($this->hasConfigValue()) {
+ return false;
+ }
+
return $this->writableByCurrentUser;
}
@@ -80,4 +85,34 @@ class SystemSetting extends Setting
{
return 30;
}
+
+ public function getValue()
+ {
+ $defaultValue = parent::getValue(); // we access value first to make sure permissions are checked
+
+ $configValue = $this->getValueFromConfig();
+
+ if (isset($configValue)) {
+ $defaultValue = $configValue;
+ settype($defaultValue, $this->type);
+ }
+
+ return $defaultValue;
+ }
+
+ private function hasConfigValue()
+ {
+ $value = $this->getValueFromConfig();
+ return isset($value);
+ }
+
+ private function getValueFromConfig()
+ {
+ $config = Config::getInstance()->{$this->pluginName};
+
+ if (!empty($config) && array_key_exists($this->name, $config)) {
+ return $config[$this->name];
+ }
+ }
+
}
diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
index 7a50263e39a085a424b16e95d42073717abc16a3..b0df27b2b68a6ce4458c97087cae489602abd3bb 100644
--- a/core/SettingsPiwik.php
+++ b/core/SettingsPiwik.php
@@ -186,7 +186,10 @@ class SettingsPiwik
// if URL changes, always update the cache
|| $currentUrl != $url
) {
- if (strlen($currentUrl) >= strlen('http://a/')) {
+ $host = Url::getHostFromUrl($url);
+
+ if (strlen($currentUrl) >= strlen('http://a/')
+ && !Url::isLocalHost($host)) {
self::overwritePiwikUrl($currentUrl);
}
$url = $currentUrl;
diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php
index e714ecded7b02a6ea8bd5247a003d488ad2b214e..b6f316304652830a49b280e196ba5c0e361376c9 100644
--- a/core/Tracker/Request.php
+++ b/core/Tracker/Request.php
@@ -407,6 +407,10 @@ class Request
{
$this->params[$name] = $value;
unset($this->paramsCache[$name]);
+
+ if ($name === 'cdt') {
+ $this->cdtCache = null;
+ }
}
private function hasParam($name)
diff --git a/core/Twig.php b/core/Twig.php
index 06706d7b449fe8231ab8da5e56814c950e40c490..c3b6ba7414d7a72944ee0bfcd2dee7d40ca29688 100755
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -87,6 +87,9 @@ class Twig
$this->addFilter_percentage();
$this->addFilter_percent();
$this->addFilter_percentEvolution();
+ $this->addFilter_piwikProAdLink();
+ $this->addFilter_piwikProOnPremisesAdLink();
+ $this->addFilter_piwikProCloudAdLink();
$this->addFilter_prettyDate();
$this->addFilter_safeDecodeRaw();
$this->addFilter_number();
@@ -104,6 +107,8 @@ class Twig
$this->twig->addTokenParser(new RenderTokenParser());
$this->addTest_false();
+ $this->addTest_true();
+ $this->addTest_emptyString();
}
private function addTest_false()
@@ -117,6 +122,28 @@ class Twig
$this->twig->addTest($test);
}
+ private function addTest_true()
+ {
+ $test = new Twig_SimpleTest(
+ 'true',
+ function ($value) {
+ return true === $value;
+ }
+ );
+ $this->twig->addTest($test);
+ }
+
+ private function addTest_emptyString()
+ {
+ $test = new Twig_SimpleTest(
+ 'emptyString',
+ function ($value) {
+ return '' === $value;
+ }
+ );
+ $this->twig->addTest($test);
+ }
+
protected function addFunction_getJavascriptTranslations()
{
$getJavascriptTranslations = new Twig_SimpleFunction(
@@ -258,6 +285,7 @@ class Twig
{
$rawSafeDecoded = new Twig_SimpleFilter('rawSafeDecoded', function ($string) {
$string = str_replace('+', '%2B', $string);
+ $string = str_replace(' ', html_entity_decode(' '), $string);
return SafeDecodeLabel::decodeLabelSafe($string);
@@ -297,6 +325,49 @@ class Twig
$this->twig->addFilter($percentage);
}
+ protected function addFilter_piwikProAdLink()
+ {
+ $ads = $this->getPiwikProAdvertising();
+ $piwikProAd = new Twig_SimpleFilter('piwikProCampaignParameters', function ($url, $campaignName, $campaignMedium, $campaignContent = '') use ($ads) {
+ $url = $ads->addPromoCampaignParametersToUrl($url, $campaignName, $campaignMedium, $campaignContent);
+ return $url;
+ });
+ $this->twig->addFilter($piwikProAd);
+ }
+
+ protected function addFilter_piwikProOnPremisesAdLink()
+ {
+ $twigEnv = $this->getTwigEnvironment();
+ $ads = $this->getPiwikProAdvertising();
+ $piwikProAd = new Twig_SimpleFilter('piwikProOnPremisesPromoUrl', function ($medium, $content = '') use ($twigEnv, $ads) {
+
+ $url = $ads->getPromoUrlForOnPremises($medium, $content);
+
+ return twig_escape_filter($twigEnv, $url, 'html_attr');
+
+ }, array('is_safe' => array('html_attr')));
+ $this->twig->addFilter($piwikProAd);
+ }
+
+ protected function addFilter_piwikProCloudAdLink()
+ {
+ $twigEnv = $this->getTwigEnvironment();
+ $ads = $this->getPiwikProAdvertising();
+ $piwikProAd = new Twig_SimpleFilter('piwikProCloudPromoUrl', function ($medium, $content = '') use ($twigEnv, $ads) {
+
+ $url = $ads->getPromoUrlForCloud($medium, $content);
+
+ return twig_escape_filter($twigEnv, $url, 'html_attr');
+
+ }, array('is_safe' => array('html_attr')));
+ $this->twig->addFilter($piwikProAd);
+ }
+
+ private function getPiwikProAdvertising()
+ {
+ return StaticContainer::get('Piwik\PiwikPro\Advertising');
+ }
+
protected function addFilter_number()
{
$formatter = new Twig_SimpleFilter('number', function ($string, $minFractionDigits = 0, $maxFractionDigits = 0) {
diff --git a/core/Updates/2.1.1-b11.php b/core/Updates/2.1.1-b11.php
index 0d1ef47f3d1e5dc307a72401e88a7d2e0a06f6c7..543ae284e8bebe43f4358a25385c59b318cb28f2 100644
--- a/core/Updates/2.1.1-b11.php
+++ b/core/Updates/2.1.1-b11.php
@@ -94,7 +94,7 @@ class Updates_2_1_1_b11 extends Updates
foreach ($missingIdArchives as $missingIdArchive) {
$params[] = array_values($missingIdArchive);
}
- BatchInsert::tableInsertBatch($table, array_keys(reset($missingIdArchives)), $params, $throwException = false);
+ BatchInsert::tableInsertBatch($table, array_keys(reset($missingIdArchives)), $params, $throwException = false, $charset = 'latin1');
} catch (\Exception $ex) {
Updater::handleQueryError($ex, "<batch insert>", false, __FILE__);
}
diff --git a/core/Updates/2.16.0-rc2.php b/core/Updates/2.16.0-rc2.php
new file mode 100644
index 0000000000000000000000000000000000000000..2bddb6b5cb84055f38d6b260faef312323058a3f
--- /dev/null
+++ b/core/Updates/2.16.0-rc2.php
@@ -0,0 +1,28 @@
+<?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\Updater;
+use Piwik\Updates;
+
+class Updates_2_16_0_rc2 extends Updates
+{
+ public function doUpdate(Updater $updater)
+ {
+ $pluginManager = \Piwik\Plugin\Manager::getInstance();
+ $pluginName = 'PiwikPro';
+
+ try {
+ if (!$pluginManager->isPluginActivated($pluginName)) {
+ $pluginManager->activatePlugin($pluginName);
+ }
+ } catch (\Exception $e) {
+ }
+ }
+}
\ No newline at end of file
diff --git a/core/Url.php b/core/Url.php
index a86978286ae3f329f08099970259d7ec8202b517..2a301a9b4638a6496a0079d6a87c9b7ded19fee4 100644
--- a/core/Url.php
+++ b/core/Url.php
@@ -551,6 +551,21 @@ class Url
&& in_array($parsedUrl['scheme'], array('http', 'https'));
}
+ /**
+ * Checks whether the given host is a local host like `127.0.0.1` or `localhost`.
+ *
+ * @param string $host
+ * @return bool
+ */
+ public static function isLocalHost($host)
+ {
+ if (empty($host)) {
+ return false;
+ }
+
+ return in_array($host, Url::getLocalHostnames(), true);
+ }
+
public static function getTrustedHostsFromConfig()
{
$hosts = self::getHostsFromConfig('General', 'trusted_hosts');
@@ -677,7 +692,6 @@ class Url
return array('localhost', '127.0.0.1', '::1', '[::1]');
}
-
/**
* @return bool
*/
diff --git a/core/View.php b/core/View.php
index bc8ccf075aac5ab2c8b00d2e9a5bac93f0cd12a5..b57a7f553b54eeb82ca762545f269def3e00256e 100644
--- a/core/View.php
+++ b/core/View.php
@@ -10,6 +10,7 @@ namespace Piwik;
use Exception;
use Piwik\AssetManager\UIAssetCacheBuster;
+use Piwik\Container\StaticContainer;
use Piwik\Plugins\UsersManager\API as APIUsersManager;
use Piwik\View\ViewInterface;
use Twig_Environment;
@@ -85,6 +86,7 @@ if (!defined('PIWIK_USER_PATH')) {
* which is outputted in the template, eg, `{{ postEvent('MyPlugin.event') }}`
* - **isPluginLoaded**: Returns true if the supplied plugin is loaded, false if otherwise.
* `{% if isPluginLoaded('Goals') %}...{% endif %}`
+ * - **arePiwikProAdsEnabled**: Returns true if it is ok to show some Piwik PRO advertising in the UI (from Piwik 2.16.0)
*
* ### Examples
*
@@ -226,7 +228,10 @@ class View implements ViewInterface
$this->latest_version_available = UpdateCheck::isNewestVersionAvailable();
$this->disableLink = Common::getRequestVar('disableLink', 0, 'int');
$this->isWidget = Common::getRequestVar('widget', 0, 'int');
-
+
+ $piwikProAds = StaticContainer::get('Piwik\PiwikPro\Advertising');
+ $this->arePiwikProAdsEnabled = $piwikProAds->arePiwikProAdsEnabled();
+
if (Development::isEnabled()) {
$cacheBuster = rand(0, 10000);
} else {
diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php
index 31649f31170389f0d615db794398e57280712442..19388d7bb19ca0cd4a8180421fd252ec0156a47e 100644
--- a/core/testMinimumPhpVersion.php
+++ b/core/testMinimumPhpVersion.php
@@ -144,7 +144,7 @@ if (!function_exists('Piwik_GetErrorMessagePage')) {
<li><a rel="noreferrer" target="_blank" href="http://piwik.org/faq/">Piwik Frequently Asked Questions</a></li>
<li><a rel="noreferrer" target="_blank" href="http://piwik.org/docs/">Piwik Documentation</a></li>
<li><a rel="noreferrer" target="_blank" href="http://forum.piwik.org/">Piwik Forums</a></li>
- <li><a rel="noreferrer" target="_blank" href="http://demo.piwik.org">Piwik Online Demo</a></li>
+ <li><a rel="noreferrer" target="_blank" href="https://piwik.pro/contact/?pk_campaign=App_AnErrorOccured&pk_source=Piwik_App&pk_medium=ProfessionalServicesLink#contact-form">Professional help (Piwik PRO)</a></li>
</ul>';
}
if ($optionalLinkBack) {
diff --git a/js/README.md b/js/README.md
index d24f8d8c9dca78876fc2cbea1bb57af210c708c1..1d409cebff8ef4778874a2d31baf0aaa28595f3b 100644
--- a/js/README.md
+++ b/js/README.md
@@ -22,6 +22,13 @@ The js/ folder contains:
attempt to block tracking, you can change your tracking code to use "js/"
instead of "piwik.js" and "piwik.php", respectively.
+ Note that in order for [Page Overlay](https://piwik.org/docs/page-overlay/) to work, the Piwik tracker method `setAPIUrl()` needs to be called with its parameter pointing to the root directory of Piwik. E.g.:
+
+ ```js
+ _paq.push(['setAPIUrl', u]);
+
+ ```
+
## Deployment
* piwik.js is minified using YUICompressor 2.4.2.
diff --git a/js/piwik.js b/js/piwik.js
index 773b38bf8de422691cb7c51776896778430d5ef1..64998cd0cd7cbd829d4fc1a2f3a6ffe2456abe90 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -957,7 +957,7 @@ if (typeof JSON2 !== 'object' && typeof window.JSON === 'object' && window.JSON.
/*global unescape */
/*global ActiveXObject */
/*members encodeURIComponent, decodeURIComponent, getElementsByTagName,
- shift, unshift, piwikAsyncInit,
+ shift, unshift, piwikAsyncInit, frameElement, self, hasFocus,
createElement, appendChild, characterSet, charset, all,
addEventListener, attachEvent, removeEventListener, detachEvent, disableCookies,
cookie, domain, readyState, documentElement, doScroll, title, text,
@@ -2727,6 +2727,18 @@ if (typeof Piwik !== 'object') {
);
}
+ function isInsideAnIframe () {
+ if (isDefined(windowAlias.frameElement)) {
+ return (windowAlias.frameElement && String(windowAlias.frameElement.nodeName).toLowerCase() === 'iframe');
+ }
+
+ try {
+ return windowAlias.self !== windowAlias.top;
+ } catch (e) {
+ return true;
+ }
+ }
+
/************************************************************
* End Page Overlay
************************************************************/
@@ -2913,6 +2925,11 @@ if (typeof Piwik !== 'object') {
// Guard against installing the activity tracker more than once per Tracker instance
heartBeatSetUp = false,
+ // bool used to detect whether this browser window had focus at least once. So far we cannot really
+ // detect this 100% correct for an iframe so whenever Piwik is loaded inside an iframe we presume
+ // the window had focus at least once.
+ hadWindowFocusAtLeastOnce = isInsideAnIframe(),
+
// Timestamp of last tracker request sent to Piwik
lastTrackerRequestTime = null,
@@ -3228,6 +3245,19 @@ if (typeof Piwik !== 'object') {
heartBeatTimeout = setTimeout(function heartBeat() {
heartBeatTimeout = null;
+
+ if (!hadWindowFocusAtLeastOnce) {
+ // if browser does not support .hasFocus (eg IE5), we assume that the window has focus.
+ hadWindowFocusAtLeastOnce = (!documentAlias.hasFocus || documentAlias.hasFocus());
+ }
+
+ if (!hadWindowFocusAtLeastOnce) {
+ // only send a ping if the tab actually had focus at least once. For example do not send a ping
+ // if window was opened via "right click => open in new window" and never had focus see #9504
+ heartBeatUp(configHeartBeatDelay);
+ return;
+ }
+
if (heartBeatPingIfActivityAlias()) {
return;
}
@@ -3253,6 +3283,8 @@ if (typeof Piwik !== 'object') {
}
function heartBeatOnFocus() {
+ hadWindowFocusAtLeastOnce = true;
+
// since it's possible for a user to come back to a tab after several hours or more, we try to send
// a ping if the page is active. (after the ping is sent, the heart beat timeout will be set)
if (heartBeatPingIfActivityAlias()) {
diff --git a/lang/ar.json b/lang/ar.json
index 3797ca84f32d3e4af41ce71170cf4ab27b89d61a..0ba900d175c7b9df5bcd31b161d10e623412780b 100644
--- a/lang/ar.json
+++ b/lang/ar.json
@@ -11,7 +11,7 @@
"And": "Ùˆ",
"API": "واجهة تØكم التطبيقات",
"ArchivingInlineHelp": "للمواقع المتوسطة وعالية الزيارات، من المÙضل تعطيل إطلاق الأرشÙØ© من المتصÙØ. بدلاً من ذلك، ÙÙ†ØÙ† Ù†Ùضل ضبط Cron job لمعالجة Piwik كل ساعة.",
- "ArchivingTriggerDescription": "Ù…Ùضل ÙÙŠ Øالة مواقع Piwik الكبيرة أن تقوم %sبضبط وظيÙØ© %s لمعالجة التقارير آلياً.",
+ "ArchivingTriggerDescription": "Ù…Ùضل ÙÙŠ Øالة مواقع Piwik الكبيرة أن تقوم %1$sبضبط وظيÙØ© %2$s لمعالجة التقارير آلياً.",
"AuthenticationMethodSmtp": "أسلوب المصادقة لمزود SMTP",
"AverageOrderValue": "متوسط ​​قيمة الطلب",
"AveragePrice": "متوسط السعر",
@@ -21,10 +21,8 @@
"Cancel": "إلغاء",
"CannotUnzipFile": "لايمكن ÙÙƒ ضغط المل٠%1$s: %2$s",
"ChangePassword": "تغيير كلمة المرور",
- "ChooseDate": "اختر التاريخ",
"ChooseLanguage": "اختر اللغة",
"ChoosePeriod": "اختر المدة",
- "ChooseWebsite": "اختر الموقع",
"ClickHere": "إضغط هنا لمزيد من المعلومات.",
"Close": "إغلاق",
"ColumnActionsPerVisit": "السلوكيات لكل زيارة",
@@ -51,7 +49,7 @@
"ColumnValuePerVisit": "القيمة لكل زيارة",
"ColumnVisitDuration": "مدة الزيارة (بالثواني)",
"ColumnVisitsWithConversions": "زيارات بÙائدة",
- "ConfigFileIsNotWritable": "مل٠إعدادات Piwik %s غير قابل للكتابة، بعض التغييرات التي قمت بها قد لا تكون Ù…ØÙوظة. %s الرجاء تغيير صلاØيات مل٠الإعدادات بØيث تكون قابلة للكتابة.",
+ "ConfigFileIsNotWritable": "مل٠إعدادات Piwik %1$s غير قابل للكتابة، بعض التغييرات التي قمت بها قد لا تكون Ù…ØÙوظة. %2$s الرجاء تغيير صلاØيات مل٠الإعدادات بØيث تكون قابلة للكتابة.",
"ContinueToPiwik": "المتابعة إلى Piwik",
"CurrentMonth": "الشهر الØالي",
"CurrentWeek": "الأسبوع الØالي",
@@ -89,21 +87,21 @@
"ExceptionFilesizeMismatch": "خطأ ÙÙŠ Øجم الملÙ: %1$s (الØجم المتوقع: %2$sØŒ الØجم الÙعلي: %3$s).",
"ExceptionIncompatibleClientServerVersions": "%1$s إصدار عميلك %2$s والذي هو غير متواÙÙ‚ مع إصدار الخادم %3$s.",
"ExceptionInvalidArchiveTimeToLive": "زمن الأرشÙØ© لليوم يجب أن يكون رقماً أكبر من الصÙر Øيث يمثل الثواني.",
- "ExceptionInvalidDateFormat": "يجب أن تكون صيغة التاريخ: %s أو أي كلمة استدلالية مدعومة بواسطة الدالة %s (انظر %s لمزيد من المعلومات).",
- "ExceptionInvalidDateRange": "التاريخ \"%s\" ليس بÙترة صالØØ© ÙÙŠ التقويم. يجب أن تكون على الصيغة التالية: %s.",
- "ExceptionInvalidPeriod": "الÙترة \"%s\" غير مدعومة. Øاول أياً من التالي بدلاً منها: %s.",
- "ExceptionInvalidRendererFormat": "الصيغة \"%s\" غير صØÙŠØØ©. Øاول أياً من التالي بدلاً منها: %s.",
- "ExceptionInvalidReportRendererFormat": "تهيئة التقرير '%s' غير صالØØ©. الرجاء تجربة أياً مما يلي كبديل: %s.",
+ "ExceptionInvalidDateFormat": "يجب أن تكون صيغة التاريخ: %1$s أو أي كلمة استدلالية مدعومة بواسطة الدالة %2$s (انظر %3$s لمزيد من المعلومات).",
+ "ExceptionInvalidDateRange": "التاريخ \"%1$s\" ليس بÙترة صالØØ© ÙÙŠ التقويم. يجب أن تكون على الصيغة التالية: %2$s.",
+ "ExceptionInvalidPeriod": "الÙترة \"%1$s\" غير مدعومة. Øاول أياً من التالي بدلاً منها: %2$s.",
+ "ExceptionInvalidRendererFormat": "الصيغة \"%1$s\" غير صØÙŠØØ©. Øاول أياً من التالي بدلاً منها: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "تهيئة التقرير '%1$s' غير صالØØ©. الرجاء تجربة أياً مما يلي كبديل: %2$s.",
"ExceptionInvalidToken": "المÙØªØ§Ø ØºÙŠØ± صالØ.",
"ExceptionLanguageFileNotFound": "مل٠اللغة \"%s\" غير موجود.",
- "ExceptionMethodNotFound": "النظام \"%s\" غير موجود أو غير متواÙر ÙÙŠ الموديول \"%s\".",
+ "ExceptionMethodNotFound": "النظام \"%1$s\" غير موجود أو غير متواÙر ÙÙŠ الموديول \"%2$s\".",
"ExceptionMissingFile": "مل٠مÙقود: %s",
"ExceptionNonceMismatch": "لم يمكن تعري٠مÙØªØ§Ø Ø§Ù„Ø£Ù…Ø§Ù† ÙÙŠ هذا النموذج.",
"ExceptionPrivilege": "لا يمكنك الوصول لهذا المورد، Ùهو يتطلب صلاØيات وصول %s.",
"ExceptionPrivilegeAccessWebsite": "لا يمكنك مشاهدة هذا المورد، Ùهو يتطلب صلاØيات وصول %s لموقع id=%d.",
"ExceptionPrivilegeAtLeastOneWebsite": "لا يمكنك الوصول لهذا المورد، Ùهو يتطلب صلاØيات وصول %s على الأقل لموقع واØد.",
"ExceptionUndeletableFile": "لم يمكن ØØ°Ù %s",
- "ExceptionUnreadableFileDisabledMethod": "لم يمكن قراءة مل٠الإعدادات (%s). قد يكون المستضي٠قد عطل %s.",
+ "ExceptionUnreadableFileDisabledMethod": "لم يمكن قراءة مل٠الإعدادات (%1$s). قد يكون المستضي٠قد عطل %2$s.",
"Export": "تصدير",
"ExportAsImage": "تصدير كصورة",
"ExportThisReport": "تصدير البيانات ÙÙŠ هيئة ملÙات أخرى",
@@ -128,7 +126,7 @@
"Locale": "ar_EG.UTF-8",
"Logout": "تسØيل خروج",
"MainMetrics": "أهم مقاييس",
- "MediumToHighTrafficItIsRecommendedTo": "للمواقع متوسطة وعالية الزيارات، Ù†Ùضل معالجة تقارير اليوم الØالي على الأكثر كل نص٠ساعة (%s ثانية) أو كل ساعة (%s ثانية).",
+ "MediumToHighTrafficItIsRecommendedTo": "للمواقع متوسطة وعالية الزيارات، Ù†Ùضل معالجة تقارير اليوم الØالي على الأكثر كل نص٠ساعة (%1$s ثانية) أو كل ساعة (%2$s ثانية).",
"Metadata": "الÙوقية",
"MetricsToPlot": "مقاييس لمؤامرة",
"MetricToPlot": "متري لرسم",
@@ -166,7 +164,7 @@
"OperationLessThan": "أقل من",
"OperationNotEquals": "لا يساوي",
"OptionalSmtpPort": "اختياري. الاÙتراضي 25 لاتصالات TLS SMTP غير المشÙرة، Ùˆ465 لاتصالات SSL SMTP المشÙرة.",
- "OrCancel": "أو %s إلغاء %s",
+ "OrCancel": "أو %1$s إلغاء %2$s",
"Others": "أخرى",
"Outlinks": "الروابط الصادرة",
"Overview": "نظرة عامة",
@@ -198,7 +196,7 @@
"Save": "ØÙظ",
"SaveImageOnYourComputer": "Ù„ØÙظ الصورة على جهازك، انقر بز الÙأرة الأيمن واختر \"ØÙظ الصورة باسم\"...",
"Search": "بØØ«",
- "SeeTheOfficialDocumentationForMoreInformation": "انظر %sمستندات المساعدة الرسمية%s لمزيد من المعلومات.",
+ "SeeTheOfficialDocumentationForMoreInformation": "انظر %1$sمستندات المساعدة الرسمية%2$s لمزيد من المعلومات.",
"SelectYesIfYouWantToSendEmailsViaServer": "اختر \"نعم\" إذا كنت ترغب ÙÙŠ أو يتوجب عليك إرسال البريد الإلكتروني من خلال مزود معين بدلاً من دالة البريد الإلكتروني المØلية.",
"Settings": "الإعدادات",
"SmallTrafficYouCanLeaveDefault": "للمواقع قليلة الزيارات، يمكنك ترك القيمة الاÙتراضية %s ثانية، ومراجعة التقارير ÙÙŠ الوقت الØقيقي.",
@@ -233,7 +231,7 @@
"Warning": "تنبيه",
"WarningFileIntegrityNoManifest": "لم يمكن إجراء ÙØص سلامة الملÙات بسبب Ùقد مل٠manifest.inc.php.",
"WarningFileIntegrityNoMd5file": "لم يمكن إتمام ÙØص سلامة الملÙات بسبب Ùقد دالة md5_file().",
- "WarningPasswordStored": "%sتنبيه:%s سيتم ØÙظ كلمة المرور هذه ÙÙŠ مل٠الإعدادات وظاهرة لأياً كان ممن يمكنه الوصول إليه.",
+ "WarningPasswordStored": "%1$sتنبيه:%2$s سيتم ØÙظ كلمة المرور هذه ÙÙŠ مل٠الإعدادات وظاهرة لأياً كان ممن يمكنه الوصول إليه.",
"Website": "الموقع",
"Weekly": "أسبوعي",
"Widgets": "الإضاÙات",
@@ -258,6 +256,7 @@
"EnableGraphsLabel": "إعرض الرسوم",
"EvolutionGraph": "رسم التاريخ",
"HowtoDeleteAnAccount": "إضغط باستمرار Ù„ØØ°Ù Øساب٠ما",
+ "HowtoDeleteAnAccountOniOS": "مرّر من اليمين لليسار لتØØ°Ù Øساباً",
"HowtoLoginAnonymous": "أترك اسم المسخدم وكلمة المرور Ùارغين للدخول المجهول",
"HttpTimeout": "مهلة HTTP",
"LastUpdated": "آخر تØديث: %s",
@@ -271,7 +270,7 @@
"AvailableMetrics": "المقاييس المتوÙرة",
"CompareRows": "قارن السجلات",
"ComparingRecords": "مقارنة %s صÙÙˆÙ",
- "MetricBetweenText": "من %s إلى %s",
+ "MetricBetweenText": "من %1$s إلى %2$s",
"MetricChangeText": "%s التغير خلال المدة",
"PickARow": "إختر صÙاً للمقارنة"
}
diff --git a/lang/be.json b/lang/be.json
index e63340cbdbb31c3594f49ad72a0d11f988cd3ae6..6d20136fc0e605a234f057fbc8fb8976e5c68d71 100644
--- a/lang/be.json
+++ b/lang/be.json
@@ -8,7 +8,7 @@
"AllWebsitesDashboard": "Ð“Ð°Ð»Ð¾ÑžÐ½Ð°Ñ Ð¿Ð°Ð½Ñль ÑžÑÑ–Ñ… вÑб-Ñайтаў",
"API": "API-функцыі",
"ArchivingInlineHelp": "Ð”Ð»Ñ Ñайтаў з ÑÑÑ€Ñднім Ñ– выÑокім трафікам, Ñ€Ñкамендуецца адключыць функцыю Ð°Ñ€Ñ…Ñ–Ð²Ð°Ð²Ð°Ð½Ð½Ñ Piwik Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑку з браўзÑра.",
- "ArchivingTriggerDescription": "Ð Ñкамендуецца Ð´Ð»Ñ Piwik на Ñайтах з выÑокім трафікам, патрÑбна %sÑžÑталÑваць заданне Ð´Ð»Ñ ÐºÑ€Ð¾Ð½Ñƒ%s Ð´Ð»Ñ Ð°ÑžÑ‚Ð°Ð¼Ð°Ñ‚Ñ‹Ñ‡Ð½Ð°Ð¹ апрацоўкі Ñправаздач.",
+ "ArchivingTriggerDescription": "Ð Ñкамендуецца Ð´Ð»Ñ Piwik на Ñайтах з выÑокім трафікам, патрÑбна %1$sÑžÑталÑваць заданне Ð´Ð»Ñ ÐºÑ€Ð¾Ð½Ñƒ%2$s Ð´Ð»Ñ Ð°ÑžÑ‚Ð°Ð¼Ð°Ñ‚Ñ‹Ñ‡Ð½Ð°Ð¹ апрацоўкі Ñправаздач.",
"AuthenticationMethodSmtp": "Метад праверкі ÑапраўднаÑці Ð´Ð»Ñ SMTP",
"AverageOrderValue": "СÑÑ€Ñдні кошт замоў",
"AveragePrice": "СÑÑ€Ñднш кошт",
@@ -17,10 +17,8 @@
"BrokenDownReportDocumentation": "Яна разбіта на некалькі Ñправаздач, ÑÐºÑ–Ñ Ð°Ð´Ð»ÑŽÑтроўваюцца Ñž Ñпарклайны Ñž ніжнÑй чаÑтцы Ñтаронкі. Ð’Ñ‹ можаце павÑлічыць графікі, націÑнуўшы на Ñправаздачу, Ñкую вы хацелі б бачыць.",
"ChangePassword": "ЗмÑніць пароль",
"ChangeTagCloudView": "Калі лаÑка, звÑрніце ўвагу на то, што вы можаце прагледзець Ñправаздачу не толькі Ñк воблака Ñ‚Ñгаў. Каб зрабіць гÑта, выкарыÑтоўвайце Ñлементы ÐºÑ–Ñ€Ð°Ð²Ð°Ð½Ð½Ñ Ñž ніжнÑй чаÑтцы Ñправаздачы.",
- "ChooseDate": "Выберыце дату",
"ChooseLanguage": "ÐбÑрыце мову",
"ChoosePeriod": "ÐбÑрыце перыÑд",
- "ChooseWebsite": "ÐбÑрыце вÑб-Ñайт",
"ClickHere": "ÐаціÑніце тут Ð´Ð»Ñ Ð°Ñ‚Ñ€Ñ‹Ð¼Ð°Ð½Ð½Ñ Ð´Ð°Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð°Ð¹ інфармацыі.",
"Close": "Зачыніць",
"ColumnActionsPerVisit": "ДзеÑнні за наведванне",
@@ -64,7 +62,7 @@
"ColumnValuePerVisit": "Прыбытак за кожнае наведванне",
"ColumnVisitDuration": "ПрацÑглаÑць Ð½Ð°Ð²ÐµÐ´Ð²Ð°Ð½Ð½Ñ (у Ñекундах)",
"ColumnVisitsWithConversions": "Ðаведванні з канверÑÑ–Ñй",
- "ConfigFileIsNotWritable": "Файл канфігурацыі Piwik %s недаÑтупны Ð´Ð»Ñ Ð·Ð°Ð¿Ñ–Ñу, Ð½ÐµÐºÐ°Ñ‚Ð¾Ñ€Ñ‹Ñ Ð· Вашых змÑненнÑÑž могуць быць не захованы. %s Калі лаÑка, змÑніце дазвол канфігурацыйнага файла, каб зрабіць Ñго даÑтупным Ð´Ð»Ñ Ð·Ð°Ð¿Ñ–Ñу.",
+ "ConfigFileIsNotWritable": "Файл канфігурацыі Piwik %1$s недаÑтупны Ð´Ð»Ñ Ð·Ð°Ð¿Ñ–Ñу, Ð½ÐµÐºÐ°Ñ‚Ð¾Ñ€Ñ‹Ñ Ð· Вашых змÑненнÑÑž могуць быць не захованы. %2$s Калі лаÑка, змÑніце дазвол канфігурацыйнага файла, каб зрабіць Ñго даÑтупным Ð´Ð»Ñ Ð·Ð°Ð¿Ñ–Ñу.",
"ContinueToPiwik": "ПерайÑці да Piwik",
"CurrentMonth": "БÑгучы меÑÑц",
"CurrentWeek": "БÑгучы тыдзень",
@@ -75,7 +73,7 @@
"Date": "Дата",
"DateRange": "ДыÑпазон дат:",
"DateRangeFrom": "Ðд",
- "DateRangeFromTo": "Ðд %s Да %s",
+ "DateRangeFromTo": "Ðд %1$s Да %2$s",
"DateRangeTo": "Да",
"DaysHours": "%1$s дзён %2$s гадзін",
"DaysSinceFirstVisit": "Лік дзён з даты першага наведваннÑ",
@@ -105,16 +103,16 @@
"ExceptionFileIntegrity": "Праверка цÑлаÑнаÑці не ўдалаÑÑ: %s",
"ExceptionFilesizeMismatch": "ÐеадпаведнаÑць памеру файла: %1$s (чаканы памер: %2$s, атрыманы памер: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Ваш кліент %1$s верÑÑ–Ñ– %2$s неÑумÑшчальнs з верÑÑ–Ñй Ñервера %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Сукупны фармат Ñправаздач '%s' неÑапраўдныÑ. ПаÑпрабуйце любы з наÑтупных замеÑÑ‚: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Сукупны фармат Ñправаздач '%1$s' неÑапраўдныÑ. ПаÑпрабуйце любы з наÑтупных замеÑÑ‚: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "СённÑшни архіўны Ñ‡Ð°Ñ Ð¿Ð°Ð²Ð¸Ð½ÐµÐ½ быць колькаÑцю Ñекунд больш за нуль",
- "ExceptionInvalidDateFormat": "Фармат даты павінен быць: %s, або на любое ключавое Ñлова, падтрымліваемае функцыÑй %s (глÑдзі %s Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆ падрабÑзнай інфармацыі)",
- "ExceptionInvalidDateRange": "Дата - '%s' - нÑправільны дыÑпазон дат. Ðн павінен мець наÑтупны фармат: %s.",
- "ExceptionInvalidPeriod": "ПерыÑд '%s' не падтрымліваецца. ПаÑпрабуйце любы з наÑтупных замеÑÑ‚ перыÑда: %s",
- "ExceptionInvalidRendererFormat": "Фармат Ñ€Ñндара '%s' не падтрымліваецца. ПаÑпрабуйце любы з наÑтупных замеÑÑ‚ Ñ€Ñндара: %s",
- "ExceptionInvalidReportRendererFormat": "Фармат Ñправаздачы '%s' не падтрымліваецца. ПаÑпрабуйце любы з наÑтупных замеÑÑ‚ Ñправаздачы: %s",
+ "ExceptionInvalidDateFormat": "Фармат даты павінен быць: %1$s, або на любое ключавое Ñлова, падтрымліваемае функцыÑй %2$s (глÑдзі %3$s Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆ падрабÑзнай інфармацыі)",
+ "ExceptionInvalidDateRange": "Дата - '%1$s' - нÑправільны дыÑпазон дат. Ðн павінен мець наÑтупны фармат: %2$s.",
+ "ExceptionInvalidPeriod": "ПерыÑд '%1$s' не падтрымліваецца. ПаÑпрабуйце любы з наÑтупных замеÑÑ‚ перыÑда: %2$s",
+ "ExceptionInvalidRendererFormat": "Фармат Ñ€Ñндара '%1$s' не падтрымліваецца. ПаÑпрабуйце любы з наÑтупных замеÑÑ‚ Ñ€Ñндара: %2$s",
+ "ExceptionInvalidReportRendererFormat": "Фармат Ñправаздачы '%1$s' не падтрымліваецца. ПаÑпрабуйце любы з наÑтупных замеÑÑ‚ Ñправаздачы: %2$s",
"ExceptionInvalidToken": "Маркер з'ÑўлÑецца нÑправільным.",
"ExceptionLanguageFileNotFound": "Моўны файл '%s' не знойдзены.",
- "ExceptionMethodNotFound": "Метад '%s' не Ñ–Ñнуе ці не даÑтупны Ñž модулі '%s'.",
+ "ExceptionMethodNotFound": "Метад '%1$s' не Ñ–Ñнуе ці не даÑтупны Ñž модулі '%2$s'.",
"ExceptionMissingFile": "ÐдÑутнічае файл: %s",
"ExceptionNonceMismatch": "Ðе атрымалаÑÑ Ð¿Ñ€Ð°Ð²ÐµÑ€Ñ‹Ñ†ÑŒ токÑн бÑÑпекі Ñž гÑтай форме.",
"ExceptionPrivilege": "Ð’Ñ‹ не можаце атрымаць доÑтуп да гÑтага Ñ€ÑÑурÑу, таму што ён патрабуе %s доÑтуп.",
@@ -122,7 +120,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Ð’Ñ‹ не можаце атрымаць доÑтуп да гÑтага Ñ€ÑÑурÑу, таму што ён патрабуе %s доÑтуп, па меншай меры аднаго вÑб-Ñайта.",
"ExceptionUnableToStartSession": "Ðемагчыма запуÑціць ÑеÑÑ–ÑŽ.",
"ExceptionUndeletableFile": "Ðемагчыма выдаліць %s",
- "ExceptionUnreadableFileDisabledMethod": "Файл канфігурацыі {%s} не можа быць прачытаны. Магчыма ваш хоÑÑ‚ адключыў %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Файл канфігурацыі {%1$s} не можа быць прачытаны. Магчыма ваш хоÑÑ‚ адключыў %2$s.",
"Export": "ÐкÑпартаваць",
"ExportAsImage": "ÐкÑпартаваць у малюнак",
"ExportThisReport": "ÐкÑпартаваць гÑÑ‚Ñ‹ набор дадзеных у Ñ–Ð½ÑˆÑ‹Ñ Ñ„Ð°Ñ€Ð¼Ð°Ñ‚Ñ‹",
@@ -149,7 +147,7 @@
"Locale": "be_BY.UTF-8",
"Logout": "ВыйÑці",
"MainMetrics": "Ð“Ð°Ð»Ð¾ÑžÐ½Ð°Ñ Ð¼ÐµÑ‚Ñ€Ñ‹ÐºÑ–",
- "MediumToHighTrafficItIsRecommendedTo": "Ð”Ð»Ñ Ð²Ñб-Ñайтаў з ÑÑÑ€Ñднім Ñ– выÑокім трафікам, мы Ñ€Ñкамендуем апрацоўваць Ñправаздачы на ÑённÑшні дзень не больш чым праз ÐºÐ¾Ð¶Ð½Ñ‹Ñ Ð¿Ð°ÑžÐ³Ð°Ð´Ð·Ñ–Ð½Ñ‹ (%s Ñекунд) або кожную гадзіну (%s Ñекунд).",
+ "MediumToHighTrafficItIsRecommendedTo": "Ð”Ð»Ñ Ð²Ñб-Ñайтаў з ÑÑÑ€Ñднім Ñ– выÑокім трафікам, мы Ñ€Ñкамендуем апрацоўваць Ñправаздачы на ÑённÑшні дзень не больш чым праз ÐºÐ¾Ð¶Ð½Ñ‹Ñ Ð¿Ð°ÑžÐ³Ð°Ð´Ð·Ñ–Ð½Ñ‹ (%1$s Ñекунд) або кожную гадзіну (%2$s Ñекунд).",
"Metadata": "МетададзеныÑ",
"MetricsToPlot": "Метрыкі Ð´Ð»Ñ Ð¿Ð°Ð±ÑƒÐ´Ð¾Ð²Ñ‹",
"MetricToPlot": "ÐœÐµÑ‚Ñ€Ñ‹Ñ‡Ð½Ð°Ñ Ð¿Ð°Ð±ÑƒÐ´Ð°Ð²Ð°Ñ†ÑŒ",
@@ -178,13 +176,13 @@
"OnlyUsedIfUserPwdIsSet": "ВыкарыÑтоўваецца толькі калі Ñ–Ð¼Ñ ÐºÐ°Ñ€Ñ‹Ñтальніка \/ пароль ÑžÑтаноўлены. Калі вы не ўпÑўненыÑ, Ñкі метад выкарыÑтаць, папытаеце вашага правайдÑра.",
"OpenSourceWebAnalytics": "Ð’Ñб аналітыка з адчыненым кодам",
"OptionalSmtpPort": "ÐеабавÑзкова. Па змаўчанні - 25 - Ð´Ð»Ñ Ð½ÐµÐ·Ð°ÑˆÑ‹Ñ„Ñ€Ð°Ð²Ð°Ð½Ñ‹Ñ… злучÑннÑÑž Ñ– TLS SMTP. 465 - Ð´Ð»Ñ Ð·Ð°ÑˆÑ‹Ñ„Ñ€Ð°Ð²Ð°Ð½Ñ‹Ñ… Ñ– SSL SMTP.",
- "OrCancel": "або %s Ðдмена %s",
+ "OrCancel": "або %1$s Ðдмена %2$s",
"Others": "ІншыÑ",
"Outlink": "Ðутлінк",
"Outlinks": "Ð—Ð½ÐµÑˆÐ½Ñ–Ñ ÑпаÑылкі",
"Overview": "ÐглÑд",
"Pages": "Старонкі",
- "ParameterMustIntegerBetween": "Параметр %s павінна быць цÑлае лік у дыÑпазоне ад %s Ñ– %s",
+ "ParameterMustIntegerBetween": "Параметр %1$s павінна быць цÑлае лік у дыÑпазоне ад %2$s Ñ– %3$s",
"Password": "Пароль",
"Period": "ПерыÑд",
"Piechart": "ÐšÑ€ÑƒÐ³Ð°Ð²Ð°Ñ Ð´Ñ‹Ñграма",
@@ -212,7 +210,7 @@
"Save": "Захаваць",
"SaveImageOnYourComputer": "Каб захаваць малюнак на ваш кампутар, націÑніце правай кнопкай мышы на малюнак Ñ– абÑрыце \"Захаваць малюнак Ñк…\"",
"Search": "Пошук",
- "SeeTheOfficialDocumentationForMoreInformation": "ГлÑдзіце %sафіцыйную дакументацыю%s Ð´Ð»Ñ Ð°Ñ‚Ñ€Ñ‹Ð¼Ð°Ð½Ð½Ñ Ð¿Ð°Ð´Ñ€Ð°Ð±Ñзнай інфармацыі.",
+ "SeeTheOfficialDocumentationForMoreInformation": "ГлÑдзіце %1$sафіцыйную дакументацыю%2$s Ð´Ð»Ñ Ð°Ñ‚Ñ€Ñ‹Ð¼Ð°Ð½Ð½Ñ Ð¿Ð°Ð´Ñ€Ð°Ð±Ñзнай інфармацыі.",
"SelectYesIfYouWantToSendEmailsViaServer": "Ðдзначце \"Так\" калі патрÑбна адправіць Ñлектронную пошту праз імÑнны Ñервер, замеÑÑ‚ выкарыÑÐ°Ð½Ð½Ñ Ð»Ð°ÐºÐ°Ð»ÑŒÐ½Ð°Ð¹ паштовай функціі",
"Settings": "Ðаладкі",
"Shipping": "ДаÑтаўка",
@@ -253,7 +251,7 @@
"Warning": "Увага",
"WarningFileIntegrityNoManifest": "Праверка цÑлаÑнаÑці файлаў не можа быць выканана з-за адÑутнаÑці файла manifest.inc.php.",
"WarningFileIntegrityNoMd5file": "Праверка цÑлаÑнаÑці файлаў не можа быць завершана з-за адÑутнаÑці md5_file () функцыі.",
- "WarningPasswordStored": "%sWarning:%s ГÑÑ‚Ñ‹ пароль будзе захаваны Ñž файле канфігурацыі, ен будзе бачным ÑžÑім, хто мае да Ñго доÑтуп.",
+ "WarningPasswordStored": "%1$sWarning:%2$s ГÑÑ‚Ñ‹ пароль будзе захаваны Ñž файле канфігурацыі, ен будзе бачным ÑžÑім, хто мае да Ñго доÑтуп.",
"Website": "Сайт",
"Weekly": "Штотыдзень",
"Widgets": "ВіджÑÑ‚Ñ‹",
diff --git a/lang/bg.json b/lang/bg.json
index b1e76019001060b44c96ba63a7621feeff443aba..902bbfb91daed49431e5edcbe17374a65cfdf118 100644
--- a/lang/bg.json
+++ b/lang/bg.json
@@ -12,7 +12,7 @@
"And": "и",
"API": "API",
"ArchivingInlineHelp": "За Ñайтовете ÑÑŠÑ Ñреден или виÑок трафик, препоръчваме да изключите Piwik архивиране Ñлед гледане от браузър. Съветваме ви в този Ñлучай да използвате cron job за Вашите доклади на вÑеки чаÑ.",
- "ArchivingTriggerDescription": "За по-големи Piwik инÑталации, Ñе препоръчва %scron job%s за автоматични доклади.",
+ "ArchivingTriggerDescription": "За по-големи Piwik инÑталации, Ñе препоръчва %1$scron job%2$s за автоматични доклади.",
"AuthenticationMethodSmtp": "УдоÑтоверен метод за SMTP",
"AverageOrderValue": "Средна ÑтойноÑÑ‚ на поръчка",
"AveragePrice": "Средна цена",
@@ -24,10 +24,8 @@
"CannotUnzipFile": "Ðе може да Ñе разархивира файл %1$s: %2$s",
"ChangePassword": "СмÑна на парола",
"ChangeTagCloudView": "МолÑ, имайте предвид, че можете да видите доклада и по други начини, оÑвен като облак от етикети. За целта, използвайте знаците в долната чаÑÑ‚ на доклада.",
- "ChooseDate": "Изберете дата",
"ChooseLanguage": "Избери език",
"ChoosePeriod": "Избери период",
- "ChooseWebsite": "Избери уеб Ñайт",
"ClickHere": "Кликнете тук за повече информациÑ.",
"ClickToChangePeriod": "ÐатиÑни отново за да Ñмениш периода.",
"Close": "ЗатварÑне",
@@ -80,7 +78,7 @@
"ColumnViewedAfterSearchDocumentation": "БроÑÑ‚ пъти, в който тази Ñтраница е била поÑетена, Ñлед като поÑетител е извършил Ñ‚ÑŠÑ€Ñене във Ð²Ð°ÑˆÐ¸Ñ Ñайт и е щракнал върху връзка от ÑпиÑъка Ñ Ñ€ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚Ð¸.",
"ColumnVisitDuration": "ПродължителноÑÑ‚ на поÑещение (в Ñекунди)",
"ColumnVisitsWithConversions": "ПоÑÐµÑ‰ÐµÐ½Ð¸Ñ Ñ ÐšÐ¾Ð½Ð²ÐµÑ€ÑиÑ",
- "ConfigFileIsNotWritable": "КонфигурационниÑÑ‚ файл %s на Piwik не е доÑтъпен и Вашите наÑтройки нÑма да бъдат запазени. %s ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½ÐµÑ‚Ðµ правата на файла, така, че да може да Ñе пише в него.",
+ "ConfigFileIsNotWritable": "КонфигурационниÑÑ‚ файл %1$s на Piwik не е доÑтъпен и Вашите наÑтройки нÑма да бъдат запазени. %2$s ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½ÐµÑ‚Ðµ правата на файла, така, че да може да Ñе пише в него.",
"Continue": "Продължи",
"ContinueToPiwik": "Продължете към Piwik",
"CurrentMonth": "Този меÑец",
@@ -96,7 +94,7 @@
"Date": "Дата",
"DateRange": "Период от време:",
"DateRangeFrom": "От",
- "DateRangeFromTo": "От %s до %s",
+ "DateRangeFromTo": "От %1$s до %2$s",
"DateRangeTo": "До",
"DaysHours": "%1$s дни %2$s чаÑа",
"DaysSinceFirstVisit": "Дни Ñлед първото поÑещение",
@@ -137,17 +135,17 @@
"ExceptionFileIntegrity": "ЦÑлоÑтната проверка неуÑпешна: %s",
"ExceptionFilesizeMismatch": "Размерът на файла не ÑъответÑтва: %1$s (очаквана дължина: %2$s, намерен: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Вашата %1$s клиентÑка верÑÐ¸Ñ Ðµ %2$s ,коÑто е неÑъвмеÑтима Ñ Ð²ÐµÑ€ÑиÑта на Ñървъра %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Формат на обобщените доклади '%s' не е валиден. Опитайте нÑкое от Ñледните вмеÑто това: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Формат на обобщените доклади '%1$s' не е валиден. Опитайте нÑкое от Ñледните вмеÑто това: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Ð”Ð½ÐµÑ Ð²Ñ€ÐµÐ¼ÐµÑ‚Ð¾ за живот на архива Ñ‚Ñ€Ñбва да бъде чиÑло в Ñекунди по-голÑмо от нула",
- "ExceptionInvalidDateFormat": "Формата на датата Ñ‚Ñ€Ñбва да е: %s или ключова дума, поддържана от %s Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ (виж %s за повече информациÑ)",
- "ExceptionInvalidDateRange": "Датата '%s' не е правилен период от време. Ð¢Ñ Ñ‚Ñ€Ñбва да има ÑÐ»ÐµÐ´Ð½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚: %s.",
- "ExceptionInvalidPeriod": "Периодът '%s' не Ñе поддържа. Опитайте нÑÐºÐ¾Ñ Ð¾Ñ‚ Ñледните вмеÑто това: %s",
- "ExceptionInvalidRendererFormat": "Renderer формат '%s' не е валиден. Опитайте нÑÐºÐ¾Ñ Ð¾Ñ‚ Ñледните вмеÑто това: %s.",
- "ExceptionInvalidReportRendererFormat": "Формат на доклада '%s' не е валиден. Опитайте вмеÑто това нÑкое от Ñледните: %s.",
- "ExceptionInvalidStaticGraphType": "Графика от типа '%s' не е валидна. Опитайте вмеÑто това нÑкое от Ñледните: %s.",
+ "ExceptionInvalidDateFormat": "Формата на датата Ñ‚Ñ€Ñбва да е: %1$s или ключова дума, поддържана от %2$s Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ (виж %3$s за повече информациÑ)",
+ "ExceptionInvalidDateRange": "Датата '%1$s' не е правилен период от време. Ð¢Ñ Ñ‚Ñ€Ñбва да има ÑÐ»ÐµÐ´Ð½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚: %2$s.",
+ "ExceptionInvalidPeriod": "Периодът '%1$s' не Ñе поддържа. Опитайте нÑÐºÐ¾Ñ Ð¾Ñ‚ Ñледните вмеÑто това: %2$s",
+ "ExceptionInvalidRendererFormat": "Renderer формат '%1$s' не е валиден. Опитайте нÑÐºÐ¾Ñ Ð¾Ñ‚ Ñледните вмеÑто това: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Формат на доклада '%1$s' не е валиден. Опитайте вмеÑто това нÑкое от Ñледните: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Графика от типа '%1$s' не е валидна. Опитайте вмеÑто това нÑкое от Ñледните: %2$s.",
"ExceptionInvalidToken": "Знакът не е валиден.",
"ExceptionLanguageFileNotFound": "Ð•Ð·Ð¸ÐºÐ¾Ð²Ð¸Ñ Ñ„Ð°Ð¹Ð» '%s' не бе намерен.",
- "ExceptionMethodNotFound": "Методът '%s' не ÑъщеÑтвува или не е наличен в модулът '%s'.",
+ "ExceptionMethodNotFound": "Методът '%1$s' не ÑъщеÑтвува или не е наличен в модулът '%2$s'.",
"ExceptionMissingFile": "ЛипÑващ файл: %s",
"ExceptionNonceMismatch": "Ðе може да Ñе провери кода за ÑигурноÑÑ‚ на тази форма.",
"ExceptionPrivilege": "ÐÑмате доÑтъп до този реÑурÑ, тъй като изиÑква %s доÑтъп.",
@@ -155,7 +153,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "ÐÑмате доÑтъп до този реÑурÑ, тъй като изиÑква %s доÑтъп в продължение на поне една Интернет Ñтраница.",
"ExceptionUnableToStartSession": "Ðевъзможно е да Ñе Ñтартира ÑеÑиÑ.",
"ExceptionUndeletableFile": "Ðе мога да Ð¸Ð·Ñ‚Ñ€Ð¸Ñ %s",
- "ExceptionUnreadableFileDisabledMethod": "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» {%s} не може да бъде прочетен. ВашиÑÑ‚ хоÑтинг може да е забранил %s.",
+ "ExceptionUnreadableFileDisabledMethod": "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» {%1$s} не може да бъде прочетен. ВашиÑÑ‚ хоÑтинг може да е забранил %2$s.",
"ExceptionReportNotFound": "ЗаÑÐ²ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ñ‡ÐµÑ‚ не ÑъщеÑтвува.",
"ExceptionWidgetNotFound": "ЗаÑвената от Ð²Ð°Ñ Ð´Ð¶Ð°Ð´Ð¶Ð° не ÑъщеÑтвува.",
"ExpandDataTableFooter": "ПромÑна на визуализациÑта или конфигуриране на доклада",
@@ -202,7 +200,7 @@
"Logout": "Изход",
"MainMetrics": "Главни метрики",
"Matches": "СъвпадениÑ",
- "MediumToHighTrafficItIsRecommendedTo": "За Ñреден до виÑок трафик на Ñайтове, ние препоръчваме да обработвате докладите за Ð´Ð½ÐµÑ Ð½Ð° вÑеки половин Ñ‡Ð°Ñ (%s Ñекунди) или вÑеки Ñ‡Ð°Ñ (%s Ñекунди).",
+ "MediumToHighTrafficItIsRecommendedTo": "За Ñреден до виÑок трафик на Ñайтове, ние препоръчваме да обработвате докладите за Ð´Ð½ÐµÑ Ð½Ð° вÑеки половин Ñ‡Ð°Ñ (%1$s Ñекунди) или вÑеки Ñ‡Ð°Ñ (%2$s Ñекунди).",
"Metadata": "Мета данни",
"Metric": "Метрика",
"Metrics": "Метрики",
@@ -256,16 +254,16 @@
"OperationNotEquals": "Еквивалентно на",
"OptionalSmtpPort": "Ðе е задължително. По подразбиране е 25 за некриптиран и TLS SMTP, и 465 за SSL SMTP.",
"Options": "ÐаÑтройки",
- "OrCancel": "или %s Затвори %s",
+ "OrCancel": "или %1$s Затвори %2$s",
"Others": "Други",
"Outlink": "Външна връзка",
"Outlinks": "ИзходÑщи",
"OverlayRowActionTooltip": "Вижте анализите директно от Ñайта Ñи (Ð¾Ñ‚Ð²Ð°Ñ€Ñ Ð½Ð¾Ð² подпрозорец)",
"Overview": "Общ преглед",
"Pages": "Страници",
- "Pagination": "%s - %s като %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Параметърът %s Ñ‚Ñ€Ñбва да има цифрова ÑтойноÑÑ‚ от %s до %s.",
+ "Pagination": "%1$s - %2$s като %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Параметърът %1$s Ñ‚Ñ€Ñбва да има цифрова ÑтойноÑÑ‚ от %2$s до %3$s.",
"Password": "Парола",
"Period": "Период",
"Piechart": "Диаграма",
@@ -315,7 +313,7 @@
"Clear": "ИзчиÑти",
"SearchNoResults": "ÐÑма резултати",
"SeeAll": "вижте вÑички",
- "SeeTheOfficialDocumentationForMoreInformation": "Прегледайте %sofficial documentation%s за повече информациÑ",
+ "SeeTheOfficialDocumentationForMoreInformation": "Прегледайте %1$sofficial documentation%2$s за повече информациÑ",
"SeeThisFaq": "Вижте %1$sтези чеÑто задавани въпроÑи%2$s.",
"Segment": "Сегмент",
"SelectYesIfYouWantToSendEmailsViaServer": "Изберете \"Да\", ако желаете, или изпратете електронна поща чрез именуван Ñървър, вмеÑто да ползвате локално mail функциÑта.",
@@ -370,7 +368,7 @@
"WarningFileIntegrityNoManifest": "ЦÑлоÑтната проверка на файла не може да бъде изпълнена поради липÑата на manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "Ð’ Ñлучай, че Piwik Ñе внедрÑва поÑредÑтвом Git, е нормално това Ñъобщение да Ñе поÑвÑва.",
"WarningFileIntegrityNoMd5file": "ЦÑлоÑтната проверка не може да бъде оÑъщеÑтвена поради липÑата на md5_file() функциÑта.",
- "WarningPasswordStored": "%sВнимание:%s Тази парола ще Ñе ÑъхранÑва в ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» видими за вÑички, които Ñ Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ‚.",
+ "WarningPasswordStored": "%1$sВнимание:%2$s Тази парола ще Ñе ÑъхранÑва в ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» видими за вÑички, които Ñ Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ‚.",
"Website": "УебÑайт",
"Weekly": "ЕжеÑедмично",
"WeeklyReport": "Ñедмично",
@@ -438,7 +436,7 @@
"RatingDontRemindMe": "Ðе ми напомнÑй",
"RatingNotNow": "Ðе Ñега",
"RatingNow": "ОК, ще го Ð¾Ñ†ÐµÐ½Ñ Ñега",
- "RatingPleaseRateUs": "Piwik Mobile е Ñвободен Ñофтуер, ето защо ние наиÑтина ще Ñме Ви благодарни, ако отделите една минута, за да оцените приложението в %s. Ðко имате Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° нови функции или желаете да Ñъобщите за проблем, Ð¼Ð¾Ð»Ñ Ñвържете Ñе Ñ Ð½Ð°Ñ %s",
+ "RatingPleaseRateUs": "Piwik Mobile е Ñвободен Ñофтуер, ето защо ние наиÑтина ще Ñме Ви благодарни, ако отделите една минута, за да оцените приложението в %1$s. Ðко имате Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° нови функции или желаете да Ñъобщите за проблем, Ð¼Ð¾Ð»Ñ Ñвържете Ñе Ñ Ð½Ð°Ñ %2$s",
"ReleaseToRefresh": "ОÑвободете за да Ñе обнови...",
"Reloading": "Презареждане…",
"RequestTimedOutShort": "Мрежова грешка за изтекла ÑеÑиÑ",
@@ -461,7 +459,7 @@
"AvailableMetrics": "Ðалични метрики",
"CompareRows": "СравнÑване на запиÑи",
"ComparingRecords": "СравнÑвайки %s редове",
- "MetricBetweenText": "между %s и %s",
+ "MetricBetweenText": "между %1$s и %2$s",
"MetricChangeText": "%s промени през периода",
"MetricMinMax": "%1$s варират между %2$s и %3$s за периода",
"MetricsFor": "Метрики за %s",
diff --git a/lang/bn.json b/lang/bn.json
index e70de759112a7f95912e54f706e01fa6e519da0e..26171b9eda0c9c3a699812208cb591e9892f64dd 100644
--- a/lang/bn.json
+++ b/lang/bn.json
@@ -7,7 +7,7 @@
"Daily": "দৈনিক",
"Date": "তারিখ",
"DateRangeFrom": "থেকে",
- "DateRangeFromTo": "থেকে %s পরà§à¦¯à¦¨à§à¦¤ %s",
+ "DateRangeFromTo": "থেকে %1$s পরà§à¦¯à¦¨à§à¦¤ %2$s",
"DateRangeTo": "পরà§à¦¯à¦¨à§à¦¤",
"Delete": "মà§à¦›à§‡ ফেলà§à¦¨",
"Description": "বিবরণ",
@@ -38,7 +38,7 @@
"NewVisitor": "নতà§à¦¨ পরিদরà§à¦¶à¦¨à¦•à¦¾à¦°à§€",
"No": "না",
"Ok": "ঠিক আছে",
- "OrCancel": "অথবা %s পরিবরà§à¦¤à¦¨ করà§à¦¨ %s",
+ "OrCancel": "অথবা %1$s পরিবরà§à¦¤à¦¨ করà§à¦¨ %2$s",
"Plugin": "পà§à¦²à¦¾à¦—ইন",
"Plugins": "পà§à¦²à¦¾à¦—ইনসমূহ",
"Price": "মূলà§à¦¯",
diff --git a/lang/bs.json b/lang/bs.json
index e8bd4dec2405b14fbd853acababf36fa807037e2..595cc30d3c1d1fc92a2013f517c960a4bbb3c17a 100644
--- a/lang/bs.json
+++ b/lang/bs.json
@@ -10,7 +10,7 @@
"And": "i",
"API": "API",
"ArchivingInlineHelp": "Za web stranice koje imaju veću posjećenost preporuÄeno je iskljuÄiti Piwik arhiviranje pokretaÄa iz browsera. Umjesto toga, preporuÄujemo cron job koji se procesira svaki sat.",
- "ArchivingTriggerDescription": "PreporuÄeno za veće Piwik instalacije, moraÅ¡ %s postaviti cron job%s da procesiras reporte automatski.",
+ "ArchivingTriggerDescription": "PreporuÄeno za veće Piwik instalacije, moraÅ¡ %1$s postaviti cron job%2$s da procesiras reporte automatski.",
"AuthenticationMethodSmtp": "Metoda provjere za SMTP",
"AverageOrderValue": "ProsjeÄna vrijednost narudžbe",
"AveragePrice": "ProsjeÄna cijena",
@@ -20,10 +20,8 @@
"BrokenDownReportDocumentation": "Razlomljeno je u razliÄite reporte koji su prikazani na dnu stranice. Možete povećati grafikone klikanjem na reporte koje biste voljeli vidjeti.",
"Cancel": "Otkaži",
"ChangeTagCloudView": "Molimo zapamtite, možete vidjeti reporte na druge naÄine pored oblaka sa etiketama. Koristite kontrole na dnu reporta da to uradite.",
- "ChooseDate": "Izaberi datum",
"ChooseLanguage": "Izaberite jezik",
"ChoosePeriod": "Izaberite period",
- "ChooseWebsite": "Izaberite web sajt",
"ClickHere": "Klikni ovdje za više informacija",
"Close": "Zatvori",
"ColumnActionsPerVisit": "Akcije po posjeti",
@@ -65,7 +63,7 @@
"ColumnValuePerVisit": "Zarada po posjeti",
"ColumnVisitDuration": "Trajanje posjete (u sekundama)",
"ColumnVisitsWithConversions": "Posjete sa konverzijom",
- "ConfigFileIsNotWritable": "Piwik konfiguracijski fajl %s nije otvoren za pisanje i neke promjene se neće saÄuvati. %s molimo promijenite postavke (permissions) kako bi config file bio dostupan za pisanje.",
+ "ConfigFileIsNotWritable": "Piwik konfiguracijski fajl %1$s nije otvoren za pisanje i neke promjene se neće saÄuvati. %2$s molimo promijenite postavke (permissions) kako bi config file bio dostupan za pisanje.",
"CurrentMonth": "Trenutni mjesec",
"CurrentWeek": "Trenutna sedmica",
"CurrentYear": "Trenutna godina",
@@ -78,7 +76,7 @@
"Date": "Datum",
"DateRange": "Raspon datuma:",
"DateRangeFrom": "Iz",
- "DateRangeFromTo": "Iz %s u %s",
+ "DateRangeFromTo": "Iz %1$s u %2$s",
"DateRangeTo": "U",
"DaysHours": "%1$s dani %2$s sati",
"DaysSinceFirstVisit": "Dani nakon prve posjete",
@@ -109,17 +107,17 @@
"ExceptionFileIntegrity": "Integracijska provjera je zaustavljena: %s",
"ExceptionFilesizeMismatch": "VeliÄina fajla nevažeća: %1$s (oÄekivana veliÄina: %2$s, pronaÄ‘eno: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Vaša %1$s klijent verzija je %2$s i nije kompatibilna sa verzijom servija %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Skupljeni reporti u formatu '%s' nisu važeći. Probajte jedan od ovih umjesto toga: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Skupljeni reporti u formatu '%1$s' nisu važeći. Probajte jedan od ovih umjesto toga: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Današnje vrijeme arhiviranja mora biti u sekundama više od nule.",
- "ExceptionInvalidDateFormat": "Format datuma mora biti: %s ili bilo koja kljuÄna rijeÄa podržana od %s funkcije (vidi %s za viÅ¡e informacija)",
- "ExceptionInvalidDateRange": "Datum '%s' nije važeći raspon datuma. Probajte jedan od ovih umjesto toga: %s.",
- "ExceptionInvalidPeriod": "Period '%s' nije podržan. Probajte jedan od ovih umjesto toga: %s.",
- "ExceptionInvalidRendererFormat": "Format prikazivaÄa (renderer) '%s' nije važeći. Molimo probajte ponovo sa: %s.",
- "ExceptionInvalidReportRendererFormat": "Format reporta '%s' nije važeći. Probajte jedan od ovih: %s.",
- "ExceptionInvalidStaticGraphType": "StatiÄki grafikon tipa '%s' nije važeći. Probajte jedan od ovih umjesto toga: %s.",
+ "ExceptionInvalidDateFormat": "Format datuma mora biti: %1$s ili bilo koja kljuÄna rijeÄa podržana od %2$s funkcije (vidi %3$s za viÅ¡e informacija)",
+ "ExceptionInvalidDateRange": "Datum '%1$s' nije važeći raspon datuma. Probajte jedan od ovih umjesto toga: %2$s.",
+ "ExceptionInvalidPeriod": "Period '%1$s' nije podržan. Probajte jedan od ovih umjesto toga: %2$s.",
+ "ExceptionInvalidRendererFormat": "Format prikazivaÄa (renderer) '%1$s' nije važeći. Molimo probajte ponovo sa: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Format reporta '%1$s' nije važeći. Probajte jedan od ovih: %2$s.",
+ "ExceptionInvalidStaticGraphType": "StatiÄki grafikon tipa '%1$s' nije važeći. Probajte jedan od ovih umjesto toga: %2$s.",
"ExceptionInvalidToken": "Token (žeton) nije važeći.",
"ExceptionLanguageFileNotFound": "Fajl jezika '%s' nije pronađen.",
- "ExceptionMethodNotFound": "Metoda '%s' ne postoji ili nije dostupna modulu '%s'.",
+ "ExceptionMethodNotFound": "Metoda '%1$s' ne postoji ili nije dostupna modulu '%2$s'.",
"ExceptionMissingFile": "Nedostajući fajl: %s",
"ExceptionNonceMismatch": "Nemogućnost provjere sigurnosti uzete sa ove forme.",
"ExceptionPrivilege": "Ne možeš dostupiti ovim resursima jer zahtijeva %s pristup.",
@@ -127,7 +125,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Ne možeš pristupiti ovim resursima pošto zahtijeva %s pristup za barem jednu web stranicu.",
"ExceptionUnableToStartSession": "Nije moguće pokrenuti sesiju.",
"ExceptionUndeletableFile": "Nije moguće izbrisati %s",
- "ExceptionUnreadableFileDisabledMethod": "Konfigracijski fajl {%s} nije moguće Äitati. VaÅ¡ host mora onesposobiti %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Konfigracijski fajl {%1$s} nije moguće Äitati. VaÅ¡ host mora onesposobiti %2$s.",
"Export": "Exportiraj",
"ExportAsImage": "Exportiraj kao sliku",
"ExportThisReport": "Exportiraj skup podataka u drugim formatima",
@@ -159,7 +157,7 @@
"Locale": "bs_BA.UTF-8",
"Logout": "Izloguj se",
"MainMetrics": "Glavne metrike",
- "MediumToHighTrafficItIsRecommendedTo": "Za stranice sa većom posjećenosti preporuÄujemo da se reporti procesiraju najviÅ¡e svakih pola sata (%s sekundi) ili svakog sata (%s sekundi)",
+ "MediumToHighTrafficItIsRecommendedTo": "Za stranice sa većom posjećenosti preporuÄujemo da se reporti procesiraju najviÅ¡e svakih pola sata (%1$s sekundi) ili svakog sata (%2$s sekundi)",
"Metadata": "Metadata",
"Metric": "Metrika",
"Metrics": "Metrike",
@@ -206,13 +204,13 @@
"OperationNotEquals": "nije jednako",
"OptionalSmtpPort": "Optimalno default je 25 za nekriptovano i TLS SMTP i 465 za SSL SMTP.",
"Options": "Opcije",
- "OrCancel": "ili %s otkaži %s",
+ "OrCancel": "ili %1$s otkaži %2$s",
"Others": "Drugo",
"Outlink": "Izlazeći link",
"Outlinks": "Izlazni linkovi",
"Overview": "Pregled",
"Pages": "Stranice",
- "ParameterMustIntegerBetween": "Parameter %s mora biti cijela vrijednost broja između %s i %s",
+ "ParameterMustIntegerBetween": "Parameter %1$s mora biti cijela vrijednost broja između %2$s i %3$s",
"Password": "Lozinka",
"Period": "Period",
"Piechart": "Pita grafikon",
@@ -250,7 +248,7 @@
"SaveImageOnYourComputer": "Da saÄuvaÅ¡ sliku na raÄunar, klikni desni klik na sliku i klikni \"Save Image As...\"",
"Search": "Traži",
"SeeAll": "pogledaj sve",
- "SeeTheOfficialDocumentationForMoreInformation": "Vidi the %sofficial documentation%s za više informacija.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Vidi the %1$sofficial documentation%2$s za više informacija.",
"SelectYesIfYouWantToSendEmailsViaServer": "Izaberite \"Da\" ako želite da pošaljete e-mail preko servera umjesto lokalne mail funkcije.",
"Settings": "Postavke",
"Shipping": "Utovar",
@@ -294,7 +292,7 @@
"Warning": "Upozorenje",
"WarningFileIntegrityNoManifest": "Provjera integracije fajlova nije mogla biti pokrenuta zbog nedostatka manifest.inc.php.",
"WarningFileIntegrityNoMd5file": "Provjera fajla nije mogla biti pokrenuta zbog nedostatka md5_file() function.",
- "WarningPasswordStored": "%sUpozorenje:%s Ovaj password će biti saÄuvan u config fajl koji će biti vidljiv svima koji mogu pristupiti tom fajlu.",
+ "WarningPasswordStored": "%1$sUpozorenje:%2$s Ovaj password će biti saÄuvan u config fajl koji će biti vidljiv svima koji mogu pristupiti tom fajlu.",
"Website": "Web stranica",
"Weekly": "SedmiÄno",
"WeeklyReport": "sedmiÄno",
diff --git a/lang/ca.json b/lang/ca.json
index 64befe642b6778d12b8bfc848521a1e03288521d..2ea32e3f6768dc5e660fbc47a61ae5997f96b1fb 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -10,7 +10,7 @@
"AllWebsitesDashboard": "Tauler de tots els llocs web",
"API": "API",
"ArchivingInlineHelp": "Per llocs amb transit entre mig i alt, es recomana desactivar l'arxivat del Piwik des del navegador. En canvi, recomanem que configureu una tasca de cron per processar els informes de Piwik cada hora.",
- "ArchivingTriggerDescription": "Recomanat per instal·lacions grans de Piwik, es pot %sconfigurar una %stasca programada per processar les entrades automà ticament.",
+ "ArchivingTriggerDescription": "Recomanat per instal·lacions grans de Piwik, es pot %1$sconfigurar una %2$stasca programada per processar les entrades automà ticament.",
"AuthenticationMethodSmtp": "Mètode d'autenticació SMTP",
"AverageOrderValue": "Valor mig de les comandes",
"AveragePrice": "Preu mig",
@@ -22,10 +22,8 @@
"CannotUnzipFile": "No es pot descomprimir el fitxer %1$s: %2$s",
"ChangePassword": "Canvia la contrasenya",
"ChangeTagCloudView": "Si us plau, tingueu en compte que podeu veure l'informe en altres formes que en nuvol d'etiquetes. Feu servir els controls al peu de l'informe per fer-ho.",
- "ChooseDate": "Triar data",
"ChooseLanguage": "Tria idioma",
"ChoosePeriod": "Triar perÃode",
- "ChooseWebsite": "Triar lloc web",
"ClickHere": "Fes clic aquà per més informació.",
"ClickToChangePeriod": "Torneu a clickar per canviar el perÃode",
"Close": "Tanca",
@@ -75,7 +73,7 @@
"ColumnViewedAfterSearchDocumentation": "El nombre de vegades que aquesta pà gina s'ha visitat desprès de que el visitant faigi una cerca al vostre lloc web i haigi clicat en aquesta pà gina als resultats.",
"ColumnVisitDuration": "Durada de la visita (en segons)",
"ColumnVisitsWithConversions": "Visites amb conversions",
- "ConfigFileIsNotWritable": "El fitxer de configuració del Piwiki %s no es pot modificar, alguns dels canvis que has fet no es guardaran. Si us plau %s canvia els permisos del fitxer de configuració per tal que es pugui modificar.",
+ "ConfigFileIsNotWritable": "El fitxer de configuració del Piwiki %1$s no es pot modificar, alguns dels canvis que has fet no es guardaran. Si us plau %2$s canvia els permisos del fitxer de configuració per tal que es pugui modificar.",
"Continue": "Continuar",
"ContinueToPiwik": "Vés cap al Piwik",
"CurrentMonth": "Mes actual",
@@ -91,7 +89,7 @@
"Date": "Data",
"DateRange": "Rang de dates:",
"DateRangeFrom": "De",
- "DateRangeFromTo": "De %s fins a %s",
+ "DateRangeFromTo": "De %1$s fins a %2$s",
"DateRangeTo": "Fins",
"DaysHours": "%1$s dies %2$s hores",
"DaysSinceFirstVisit": "Dies des de la primera visita",
@@ -129,17 +127,17 @@
"ExceptionFileIntegrity": "Ha fallat la verificació de integritat: %s",
"ExceptionFilesizeMismatch": "Mida de fitxer incohoerent: %1$s (mida esperada: %2$s, real: %3$s)",
"ExceptionIncompatibleClientServerVersions": "El vostre client %1$s té la versió %2$s que és incompatbile amb la versió de servidor %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "El format de informes agregats '%s' no és và lid. Proveu-ne algun dels següents en el seu lloc: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "El format de informes agregats '%1$s' no és và lid. Proveu-ne algun dels següents en el seu lloc: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "El temps lÃmit per fer l'arxivat avui ha de ser més gran que zero.",
- "ExceptionInvalidDateFormat": "El format de data ha de ser: %s o una altra paraula clau suportada per la funció %s (vegeu %s per més informació)",
- "ExceptionInvalidDateRange": "La data '%s' no és un rang correcte de data. Hauria de tenir el format següent: %s.",
- "ExceptionInvalidPeriod": "El perÃode '%s' no està suportat. Proveu-ne algun dels següents en el seu lloc: %s.",
- "ExceptionInvalidRendererFormat": "El format generador '%s' no és và lid. Proveu-ne un dels següents en el seu lloc: %s.",
- "ExceptionInvalidReportRendererFormat": "El format de l'informe '%s' no és và lid. Proveu-ne un dels següent en el seu lloc: %s.",
- "ExceptionInvalidStaticGraphType": "El grà fic està tic tipus '%s' no és và lid. Proveu-ne un dels següents en el seu lloc: %s.",
+ "ExceptionInvalidDateFormat": "El format de data ha de ser: %1$s o una altra paraula clau suportada per la funció %2$s (vegeu %3$s per més informació)",
+ "ExceptionInvalidDateRange": "La data '%1$s' no és un rang correcte de data. Hauria de tenir el format següent: %2$s.",
+ "ExceptionInvalidPeriod": "El perÃode '%1$s' no està suportat. Proveu-ne algun dels següents en el seu lloc: %2$s.",
+ "ExceptionInvalidRendererFormat": "El format generador '%1$s' no és và lid. Proveu-ne un dels següents en el seu lloc: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "El format de l'informe '%1$s' no és và lid. Proveu-ne un dels següent en el seu lloc: %2$s.",
+ "ExceptionInvalidStaticGraphType": "El grà fic està tic tipus '%1$s' no és và lid. Proveu-ne un dels següents en el seu lloc: %2$s.",
"ExceptionInvalidToken": "El token no és và lid.",
"ExceptionLanguageFileNotFound": "El fitxer d'idioma '%s' no s'ha trobat.",
- "ExceptionMethodNotFound": "El mètode '%s' no existeix o no està disponible en el mòdul '%s'.",
+ "ExceptionMethodNotFound": "El mètode '%1$s' no existeix o no està disponible en el mòdul '%2$s'.",
"ExceptionMissingFile": "Falta fitxer: %s",
"ExceptionNonceMismatch": "No s'ha pogut verificar el token del formulari.",
"ExceptionPrivilege": "No podeu accedir a aquest recurs perquè requereix un accés de %s",
@@ -147,7 +145,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "No podeu accedir a aquest recurs perquè requereix un accés %s .per al menys un lloc web",
"ExceptionUnableToStartSession": "No s'ha pogut començar la sessió.",
"ExceptionUndeletableFile": "No s'ha pogut esborrar %s",
- "ExceptionUnreadableFileDisabledMethod": "El fitxer de configuració {%s} no s'ha pogut llegir. El vostre host pot tenir deshabilitat %s.",
+ "ExceptionUnreadableFileDisabledMethod": "El fitxer de configuració {%1$s} no s'ha pogut llegir. El vostre host pot tenir deshabilitat %2$s.",
"Export": "Exporta",
"ExportAsImage": "Exportar com a imatge",
"ExportThisReport": "Guardar aquestes dades en altres formats",
@@ -185,7 +183,7 @@
"Locale": "ca_ES.UTF-8",
"Logout": "Surt",
"MainMetrics": "Mètriques principals",
- "MediumToHighTrafficItIsRecommendedTo": "Per llocs de mig i alt transit, recomanem processar informes per avui com a molt cada mitja hora (%s segons) o cada hora (%s segons)",
+ "MediumToHighTrafficItIsRecommendedTo": "Per llocs de mig i alt transit, recomanem processar informes per avui com a molt cada mitja hora (%1$s segons) o cada hora (%2$s segons)",
"Metadata": "Metadata",
"Metric": "Mètrica",
"Metrics": "Mètriques",
@@ -233,7 +231,7 @@
"OperationEquals": "Es igual",
"OptionalSmtpPort": "Opcional. Per defecte té el valor 25 per no xifrat i TLS SMTP, i 465 per SSL SMTP.",
"Options": "Opcions",
- "OrCancel": "o %s cancel·la %s",
+ "OrCancel": "o %1$s cancel·la %2$s",
"Others": "Altres",
"Outlink": "Enllaç extern",
"Outlinks": "Enllaços externs",
@@ -241,9 +239,9 @@
"OverlayRowActionTooltipTitle": "Obre una pà gina superposada",
"Overview": "Resum",
"Pages": "PÃ gines",
- "Pagination": "%s - %s de %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "El parà metre %s ha de ser un enter entre %s i %s",
+ "Pagination": "%1$s - %2$s de %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "El parà metre %1$s ha de ser un enter entre %2$s i %3$s",
"Password": "Contrasenya",
"Period": "PerÃode",
"Piechart": "Grà fic de sectors",
@@ -284,7 +282,7 @@
"SaveImageOnYourComputer": "Per guardar la imatge al vostre ordinador, feu click amb el botó dret sobre la imatge i trieu \"Guardar la imatge com..\"",
"Search": "Cerca",
"SearchNoResults": "Sense resultats",
- "SeeTheOfficialDocumentationForMoreInformation": "Vegeu la %sinformació oficial%s per més informació.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Vegeu la %1$sinformació oficial%2$s per més informació.",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Trieu \"si\" si voleu o heu d'enviar el correu a través de un servidor enlloc de a través de la funció mail local.",
"Settings": "Tauler de control",
@@ -332,7 +330,7 @@
"Warning": "AvÃs",
"WarningFileIntegrityNoManifest": "La verificació de la integritat dels fitxers no s'ha pogut fer perquè falta el manifest.inc.php.",
"WarningFileIntegrityNoMd5file": "La verificació de la integritat dels fitxers no s'ha pogut completar perquè falta la funció md5_file();",
- "WarningPasswordStored": "%sAlerta:%s Aquesta contrasenya es guardarà en un fitxer de configuració visible on tothom pot accedir.",
+ "WarningPasswordStored": "%1$sAlerta:%2$s Aquesta contrasenya es guardarà en un fitxer de configuració visible on tothom pot accedir.",
"Website": "Lloc web",
"Weekly": "Setmanalment",
"WeeklyReport": "setmanal",
@@ -410,7 +408,7 @@
"CompareRows": "Compareu registres",
"ComparingRecords": "Comparant %s files",
"Documentation": "Feu click a les mètriques per mostrarle al grà fic d'evolució. Utiltizeu la tecla shift per mostrar múltiples mètriques d'una vegada.",
- "MetricBetweenText": "entre %s i %s",
+ "MetricBetweenText": "entre %1$s i %2$s",
"MetricChangeText": "%s en el perÃode",
"MetricsFor": "Mètriques per %s",
"MultiRowEvolutionTitle": "Evolució de múltiples files",
diff --git a/lang/cs.json b/lang/cs.json
index 1050a3f259bffd8ca6b58da14a363270342f3800..2cfd9c7ea5b53c4a8c4c09aab79233fd04b97689 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -1,8 +1,8 @@
{
"General": {
- "12HourClock": "12-hodinový formát",
- "24HourClock": "24-hodinový formát",
- "AbandonedCarts": "Neobjednané koÅ¡Ãky",
+ "12HourClock": "12hodinový formát",
+ "24HourClock": "24hodinový formát",
+ "AbandonedCarts": "OpuÅ¡tÄ›né koÅ¡Ãky",
"AboutPiwikX": "O Piwiku %s",
"Action": "Akce",
"Actions": "Akce",
@@ -14,8 +14,8 @@
"And": "a",
"API": "API",
"Apply": "PoužÃt",
- "ArchivingInlineHelp": "Pro web stránky se stÅ™ednà nebo vysokou návÅ¡tÄ›vnostà je doporuÄeno zakázat archivovánà Piwiku z webového prohlÞeÄe. MÃsto toho doporuÄujeme vytvoÅ™enà úlohy pro cron",
- "ArchivingTriggerDescription": "DoporuÄeno pro vÄ›tÅ¡Ã instalace Piwiku, potÅ™ebujete %snastavit cron úlohu%s na automatické spracovánà hlášenÃ.",
+ "ArchivingInlineHelp": "Pro weby se stÅ™ednà až vysokou návÅ¡tÄ›vnostà je doporuÄeno zakázat spouÅ¡tÄ›nà archivovánà Piwiku z prohlÞeÄe. MÃsto toho doporuÄujeme vytvoÅ™it cron úlohu pro zpracovánà hlášenà Piwiku každou hodinu.",
+ "ArchivingTriggerDescription": "DoporuÄeno pro vÄ›tÅ¡Ã instalace Piwiku, potÅ™ebujete %1$snastavit cron úlohu%2$s na automatické spracovánà hlášenÃ.",
"AuthenticationMethodSmtp": "AutentizaÄnà metoda SMTP",
"AverageOrderValue": "Průměrná hodnota objednávky",
"AveragePrice": "Průměrná cena",
@@ -27,10 +27,9 @@
"CannotUnzipFile": "Nelze rozbalit soubor %1$s: %2$s",
"ChangePassword": "Změnit heslo",
"ChangeTagCloudView": "VÅ¡imnÄ›te si, že můžete zobrazit hlášenà jinak, než jako tag cloud. Pro zmÄ›nu zobrazenà použijte ovládacà prvky pod nÃm.",
- "ChooseDate": "Zvolte datum",
+ "ChooseDate": "Vybrat datum, aktuálně vybrané datum je: %s",
"ChooseLanguage": "Zvolte jazyk",
"ChoosePeriod": "Zvolte obdobÃ",
- "ChooseWebsite": "Zvolte web",
"ClickHere": "KliknÄ›te zde pro vÃce informacÃ",
"ClickToChangePeriod": "Klikni znovu pro zmÄ›nu obdobÃ.",
"Close": "ZavÅ™Ãt",
@@ -40,13 +39,13 @@
"ColumnAverageGenerationTime": "PrůmÄ›rný Äas generovánÃ",
"ColumnAverageGenerationTimeDocumentation": "PrůmÄ›rný Äas, za který byla stránka vygenerována. Toto měřenà zahrnuje Äas, který potÅ™eboval server k vygenerovánà stránky plus Äas, který potÅ™eboval klient k jejÃmu staženÃ. KratÅ¡Ã průmÄ›rný Äas znamená rychlejÅ¡Ã stránku.",
"ColumnAverageTimeOnPage": "PrůmÄ›rný Äas na stránce",
- "ColumnAverageTimeOnPageDocumentation": "PrůmÄ›rný celkový Äas strávený na stránce (pouze konkrétnà stránky, ne celý web).",
+ "ColumnAverageTimeOnPageDocumentation": "PrůmÄ›rný celkový Äas strávený na této stránce (pouze na této stránce, ne na celém webu).",
"ColumnAvgTimeOnSite": "PrůmÄ›rnÄ› Äasu na stránkách",
"ColumnAvgTimeOnSiteDocumentation": "Průměrná doba jedné návštěvy",
"ColumnBounceRate": "Odchozà frekvence",
"ColumnBounceRateDocumentation": "Procento návÅ¡tÄ›v, které mÄ›ly jedno zobrazenÃ. To znamená návÅ¡tÄ›vnÃci, kteřà po zobrazenà stránky okamžitÄ› odeÅ¡li.",
"ColumnBounces": "Ihned odchozÃ",
- "ColumnBouncesDocumentation": "PoÄet návÅ¡tÄ›v, které zaÄaly a skonÄily na této stránce. To znamená, že návÅ¡tÄ›vnÃk opustil web po zobrazenà pouze této stránky.",
+ "ColumnBouncesDocumentation": "PoÄet návÅ¡tÄ›v, které zaÄaly a skonÄily na této stránce. To znamená, že po zobrazenà této stránky návÅ¡tÄ›vnÃk web opustil.",
"ColumnConversionRate": "Frekvence konverzÃ",
"ColumnConversionRateDocumentation": "Procento návÅ¡tÄ›v, které provedly konverzi CÃle.",
"ColumnDestinationPage": "CÃlová stránka",
@@ -84,9 +83,11 @@
"ColumnViewedAfterSearchDocumentation": "PoÄet návÅ¡tÄ›v této stránky poté, co návÅ¡tÄ›vnÃk provedl vyhledávánà a kliknul na tuto stránku.",
"ColumnVisitDuration": "Doba návštěvy (v sekundách)",
"ColumnVisitsWithConversions": "Návštěvy s přechodem",
- "ConfigFileIsNotWritable": "KonfiguraÄnà soubor Piwiku %s nenà zapisovatelný, nÄ›které zmÄ›ny nebudou uloženy. %s ProsÃm upravte oprávnÄ›nà ke konfiguraÄnÃmu souboru",
+ "ConfigFileIsNotWritable": "KonfiguraÄnà soubor Piwiku %1$s nenà zapisovatelný, nÄ›které zmÄ›ny nebudou uloženy. %2$s ProsÃm upravte oprávnÄ›nà ke konfiguraÄnÃmu souboru",
"Continue": "PokraÄovat",
"ContinueToPiwik": "PokraÄujte do Piwiku",
+ "CurrentlyUsingUnsecureHttp": "AktuálnÄ› použÃváte Piwik pÅ™es nezabezpeÄené HTTP pÅ™ipojenÃ, což sebou nese svá rizika. Pro zvýšenà bezpeÄnosti doporuÄujeme nastavit Piwik tak, aby použÃval SSL (HTTPS).",
+ "CreatedByUser": "vytvořil %s",
"CurrentMonth": "Tento mÄ›sÃc",
"CurrentWeek": "Tento týden",
"CurrentYear": "Tento rok",
@@ -100,7 +101,7 @@
"Date": "Datum",
"DateRange": "Rozsah:",
"DateRangeFrom": "Od",
- "DateRangeFromTo": "Od %s do %s",
+ "DateRangeFromTo": "Od %1$s do %2$s",
"DateRangeInPeriodList": "Rozsah datumů",
"DateRangeTo": "Do",
"DaysHours": "%1$s dnà %2$s hodin",
@@ -133,30 +134,30 @@
"Edit": "Upravit",
"EncryptedSmtpTransport": "Zadejte Å¡ifrovánà transportnà vrstvy vyžadované vaÅ¡Ãm SMTP serverem.",
"Error": "Chyba",
- "ErrorRequest": "Ajaj! PÅ™i požadavku doÅ¡lo k chybÄ›. Na serveru mohlo dojÃt k doÄasnému problému, nebo jste požádali o hlášenà s pÅ™ÃliÅ¡ mnoha daty. ProsÃm, zkuste to znovu. Pokud se bude problém opakovat, %skontaktujte svého administrátora Piwiku%s.",
+ "ErrorRequest": "Ajaj! PÅ™i požadavku doÅ¡lo k chybÄ›. Na serveru mohlo dojÃt k doÄasnému problému, nebo jste požádali o hlášenà s pÅ™ÃliÅ¡ mnoha daty. ProsÃm, zkuste to znovu. Pokud se bude problém opakovat, %1$skontaktujte svého administrátora Piwiku%2$s.",
"EvolutionOverPeriod": "Vývoj za periodu",
"EvolutionSummaryGeneric": "%1$s v %2$s srovnáno s %3$s v %4$s. Vývoj: %5$s",
- "ExceptionContactSupportGeneric": "Pokud problém přetrvá, %skontaktujte pro pomoc svého Piwik administrátora%s.",
- "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Uživatel musà být super uživatel nebo uživatel %s.",
+ "ExceptionContactSupportGeneric": "Pokud problém přetrvá, %1$skontaktujte pro pomoc svého Piwik administrátora%2$s.",
+ "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Uživatel musà být super-uživatel nebo uživatel %s.",
"ExceptionConfigurationFileNotFound": "KonfiguraÄnà soubor {%s} nebyl nalezen",
- "ExceptionConfigurationFileNotFound2": "Pokud soubor existuje, ověřte, že %s může ÄÃst uživatel '%s'.",
+ "ExceptionConfigurationFileNotFound2": "Pokud soubor existuje, ověřte, že %1$s může ÄÃst uživatel '%2$s'.",
"ExceptionDatabaseVersion": "Vaše %1$s verze je %2$s ale Piwik vyžaduje minimálně %3$s.",
"ExceptionDatabaseVersionNewerThanCodebase": "Kód Piwiku je z verze %1$s, ale bylo zjištěno, že databáze byla již aktualizována na verzi %2$s.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "VaÅ¡i administrátoÅ™i možná pracujà na aktualizaci. Zkuste to prosÃm za pár minut.",
"ExceptionFileIntegrity": "Test integrity selhal: %s",
"ExceptionFilesizeMismatch": "Nesouhlasà velikost souboru: %1$s (oÄekávaná délka: %2$s, nalezeno: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Vaše %1$s verze klienta je %2$s tato je ale nekompatibilnà se serverem %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Agregovaný formát hlášenà %s nenà platný. Zkuste mÃsto toho nÄ›jaký z %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Agregovaný formát hlášenà %1$s nenà platný. Zkuste mÃsto toho nÄ›jaký z %2$s.",
"ExceptionInvalidArchiveTimeToLive": "DneÅ¡nà doba života archivu musà být ÄÃslo vÄ›tÅ¡Ã než nula",
- "ExceptionInvalidDateFormat": "Formát data musà být: %s nebo klÃÄové slovo podporované funkcà %s (vÃce informacà viz %s)",
- "ExceptionInvalidDateRange": "Datum '%s' nenà v platném rozmezÃ. Může mÃt následujÃcà formát: %s.",
- "ExceptionInvalidPeriod": "Perioda '%s' nenà podporovaná. VyzkouÅ¡ejte nÄ›jakou z následujÃcÃch mÃsto: %s.",
- "ExceptionInvalidRendererFormat": "Formát rendereru '%s' nenà platný. VyzkouÅ¡ejte nÄ›jaký jiný mÃsto: %s.",
- "ExceptionInvalidReportRendererFormat": "Formát hlášenà %s nenà platný. Zkuste mÃsto toho jakýkoliv z %s.",
- "ExceptionInvalidStaticGraphType": "Typ statického grafu %s nenà platný. Zkuste mÃsto toho nÄ›který z %s.",
+ "ExceptionInvalidDateFormat": "Formát data musà být: %1$s nebo klÃÄové slovo podporované funkcà %2$s (vÃce informacà viz %3$s)",
+ "ExceptionInvalidDateRange": "Datum '%1$s' nenà v platném rozmezÃ. Může mÃt následujÃcà formát: %2$s.",
+ "ExceptionInvalidPeriod": "Perioda '%1$s' nenà podporovaná. VyzkouÅ¡ejte nÄ›jakou z následujÃcÃch mÃsto: %2$s.",
+ "ExceptionInvalidRendererFormat": "Formát rendereru '%1$s' nenà platný. VyzkouÅ¡ejte nÄ›jaký jiný mÃsto: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Formát hlášenà %1$s nenà platný. Zkuste mÃsto toho jakýkoliv z %2$s.",
+ "ExceptionInvalidStaticGraphType": "Typ statického grafu %1$s nenà platný. Zkuste mÃsto toho nÄ›který z %2$s.",
"ExceptionInvalidToken": "Token je neplatný",
"ExceptionLanguageFileNotFound": "Jazykový soubor '%s' nenalezen",
- "ExceptionMethodNotFound": "Metoda '%s' neexistuje nebo nenà dostupná v modulu '%s'.",
+ "ExceptionMethodNotFound": "Metoda '%1$s' neexistuje nebo nenà dostupná v modulu '%2$s'.",
"ExceptionMissingFile": "ChybÄ›jÃcà soubor: %s",
"ExceptionNonceMismatch": "Nebylo možné ověřit bezpeÄnostnà token tohoto formuláře.",
"ExceptionPrivilege": "Nemůžete přistupovat k tomuto zdroji, protože vyžaduje oprávněnà %s.",
@@ -164,7 +165,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Nemůžete přistupovat k tomuto zdroji, protože vyžaduje oprávněnà %s alespoň pro jeden web",
"ExceptionUnableToStartSession": "NepodaÅ™ilo se zahájit sezenÃ.",
"ExceptionUndeletableFile": "Nelze vymazat soubor %s",
- "ExceptionUnreadableFileDisabledMethod": "KonfiguraÄnà soubor {%s} je neÄitelný. Host může být zakázán %s.",
+ "ExceptionUnreadableFileDisabledMethod": "KonfiguraÄnà soubor {%1$s} je neÄitelný. Host může být zakázán %2$s.",
"ExceptionReportNotFound": "Požadované hlášenà neexistuje.",
"ExceptionWidgetNotFound": "Požadovaný widget neexistuje.",
"ExceptionReportNotEnabled": "Požadované hlášenà nenà povoleno. To obvykle znamená, že zásuvný modul, který ho poskytuje je zakázán, nebo že nemáte dostateÄná oprávnÄ›nÃ.",
@@ -212,7 +213,7 @@
"Logout": "Odhlásit",
"MainMetrics": "Hlavnà měřenÃ",
"Matches": "Shody",
- "MediumToHighTrafficItIsRecommendedTo": "Pro weby se stÅ™ednÃm nebo velkým provozem doporuÄujeme zpracovat dneÅ¡nà hlášenà každou půlhodinu (%s vteÅ™in), nebo každou hodinu (%s vteÅ™in)",
+ "MediumToHighTrafficItIsRecommendedTo": "Pro weby se stÅ™ednÃm nebo velkým provozem doporuÄujeme zpracovat dneÅ¡nà hlášenà každou půlhodinu (%1$s vteÅ™in), nebo každou hodinu (%2$s vteÅ™in)",
"Metadata": "Meta data",
"Metric": "MěřenÃ",
"Metrics": "MěřenÃ",
@@ -230,6 +231,7 @@
"Name": "Jméno",
"NbActions": "PoÄet akcÃ",
"NbSearches": "PoÄet internÃch vyhledávánÃ",
+ "NeedMoreHelp": "PotÅ™ebujete vÃce pomoci?",
"Never": "Nikdy",
"NewReportsWillBeProcessedByCron": "Pokud nenà archivovánà spouÅ¡tÄ›no webovým prohlÞeÄem, budou nová hlášenà zpracovávána cronem.",
"NewUpdatePiwikX": "Nová aktualizace: Piwik %s",
@@ -269,7 +271,7 @@
"OptionalSmtpPort": "Volitelné. Pro nešifrovaná a TLS SMTP spojenà je výchozà 25, pro SSL SMTP spojenà je výchozà 465.",
"Options": "NastavenÃ",
"Or": "nebo",
- "OrCancel": "nebo %s Zrušit %s",
+ "OrCancel": "nebo %1$s Zrušit %2$s",
"Others": "OstatnÃ",
"Outlink": "Odchozà odkaz",
"Outlinks": "Externà odkazy",
@@ -277,9 +279,9 @@
"OverlayRowActionTooltipTitle": "OtevÅ™Ãt vrstvu stránky",
"Overview": "Přehled",
"Pages": "Stránky",
- "Pagination": "%s - %s z %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "PromÄ›nná %s musà být ÄÃselná hodnota mezi %s a %s.",
+ "Pagination": "%1$s - %2$s z %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "PromÄ›nná %1$s musà být ÄÃselná hodnota mezi %2$s a %3$s.",
"Password": "Heslo",
"Period": "ObdobÃ",
"Piechart": "KoláÄový graf",
@@ -331,10 +333,10 @@
"Clear": "VyÄistit",
"SearchNoResults": "Žádné výsledky",
"SeeAll": "Zobrazit vše",
- "SeeTheOfficialDocumentationForMoreInformation": "Pro vÃce informacà navÅ¡tivte %soficiálnà dokumentaci%s.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Pro vÃce informacà navÅ¡tivte %1$soficiálnà dokumentaci%2$s.",
"SeeThisFaq": "PodÃvejte se na %1$stento Äasto kladený dotaz%2$s.",
"Segment": "Část",
- "SelectYesIfYouWantToSendEmailsViaServer": "Zvolte \"Ano\" pokud chcete email posÃlat pomocà uvedeného serveru mÃsto lokálnà funkce PHP mail",
+ "SelectYesIfYouWantToSendEmailsViaServer": "Zvolte \"Ano\" pokud chcete e-mail posÃlat pomocà uvedeného serveru mÃsto lokálnà funkce PHP mail",
"Settings": "NastavenÃ",
"Shipping": "Doprava",
"Show": "zobrazit",
@@ -358,7 +360,7 @@
"Total": "Celkem",
"TotalRatioTooltip": "Toto je %1$s ze všech %2$s %3$s.",
"TotalRevenue": "Celková hodnota",
- "TotalVisitsPageviewsActionsRevenue": "(Celkem: %s návÅ¡tÄ›v, %s zobrazenÃ, %s akcÃ, %s pÅ™Ãjem)",
+ "TotalVisitsPageviewsActionsRevenue": "(Celkem: %1$s návÅ¡tÄ›v, %2$s zobrazenÃ, %3$s akcÃ, %4$s pÅ™Ãjem)",
"TrackingScopeAction": "Akce",
"TrackingScopePage": "Stránka",
"TrackingScopeVisit": "Návštěva",
@@ -371,7 +373,7 @@
"UsePlusMinusIconsDocumentation": "Použijte ikonu plus a mÃnus vlevo od navigace.",
"UserId": "ID uživatele",
"Username": "Uživatelské jméno",
- "UseSMTPServerForEmail": "Pro email použÃt SMTP server",
+ "UseSMTPServerForEmail": "Pro e-mail použÃt SMTP server",
"Value": "Hodnota",
"VBarGraph": "Svislý sloupcový graf",
"View": "Zobrazit",
@@ -395,9 +397,9 @@
"WarningFileIntegrityNoManifest": "Test integrity nemůže být proveden z důvodů chybÄ›jÃcÃho souboru manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "Pokud nasazujete Piwik z Gitu, pak je tato zpráva normálnÃ.",
"WarningFileIntegrityNoMd5file": "Test integrity nemůže být dokonÄen z důvodů chybÄ›jÃcà funkce md5_file().",
- "WarningPasswordStored": "%sUpozornÄ›nÃ:%s Toto heslo bude uloženo v konfiguraÄnÃm souboru viditelné pro vÅ¡echny s pÅ™Ãstupem k nÄ›mu.",
- "WarningDebugOnDemandEnabled": "Režim sledovánà %s povolen. Z bezpeÄnostnÃch důvodů je doporuÄováno ponechat toto nastavenà pouze po krátkou dobu. Pokud ho chcete zakázat, nastavte %s v %s na %s.",
- "Website": "Web stránky",
+ "WarningPasswordStored": "%1$sUpozornÄ›nÃ:%2$s Toto heslo bude uloženo v konfiguraÄnÃm souboru viditelné pro vÅ¡echny s pÅ™Ãstupem k nÄ›mu.",
+ "WarningDebugOnDemandEnabled": "Režim sledovánà %1$s povolen. Z bezpeÄnostnÃch důvodů je doporuÄováno ponechat toto nastavenà pouze po krátkou dobu. Pokud ho chcete zakázat, nastavte %2$s v %3$s na %4$s.",
+ "Website": "Web",
"Weekly": "Týdně",
"WeeklyReport": "Týdně",
"WeeklyReports": "Tydennà hlášenÃ",
@@ -445,12 +447,12 @@
"LastUpdated": "Poslednà aktualizace: %s",
"LoadingReport": "NaÄÃtánà %s",
"LoginCredentials": "PověřenÃ",
- "LoginToPiwikToChangeSettings": "PÅ™ihlaÅ¡te se k vaÅ¡emu Piwik serveru, pokud chcete mÄ›nit a vytvářet webové stránky a uživatele nebo mÄ›nit obecná nastavenà jako hlášenÃ, které se naÄte jako výchozÃ.",
+ "LoginToPiwikToChangeSettings": "PÅ™ihlaste se k vaÅ¡emu Piwik serveru, pokud chcete pÅ™idávat a mÄ›nit weby, uživatele nebo mÄ›nit obecná nastavenÃ, jako \"HlášenÃ, které se naÄte jako výchozÃ\".",
"LoginUseHttps": "PoužÃt HTTPS",
"MultiChartLabel": "Zobrazit multi grafy",
"NavigationBack": "Zpět",
"NetworkError": "Chyba sÃtÄ›",
- "NetworkErrorWithStatusCode": "DoÅ¡lo k chybÄ› \"%s\". Požadavek vrátil stavový kód \"%s\". URL byla \"%s\". ProsÃm zkontrolujte vámi zadanou URL a pro vÃce informacà o této chybÄ› a jejÃm možném Å™eÅ¡enà chybové logy zadaného serveru.",
+ "NetworkErrorWithStatusCode": "DoÅ¡lo k chybÄ› \"%1$s\". Požadavek vrátil stavový kód \"%2$s\". URL byla \"%3$s\". ProsÃm zkontrolujte vámi zadanou URL a pro vÃce informacà o této chybÄ› a jejÃm možném Å™eÅ¡enà chybové logy zadaného serveru.",
"NetworkErrorWithStatusCodeShort": "Chyba sÃtÄ› %s",
"NetworkNotReachable": "SÃÅ¥ je nedosažitelná",
"NoAccountIsSelected": "MusÃte vybrat úÄet. Pokud nenà žádný nastaven, pÅ™idejte ho.",
@@ -460,7 +462,7 @@
"NoVisitorFound": "Žádný návÅ¡tÄ›vnÃk nebyl nalezen",
"NoVisitorsShort": "Žádnà návÅ¡tÄ›vnÃci",
"NoWebsiteFound": "Žádný web nenalezen",
- "NoWebsitesShort": "Žádné webové stránky",
+ "NoWebsitesShort": "Žádné weby",
"PullDownToRefresh": "Stáhněte pro obnovu...",
"PossibleSslError": "Možná chyba SSL certifikátu",
"PossibleSslErrorExplanation": "DoÅ¡lo k chybÄ›, která může být způsobena neplatným, nebo sám sebou podepsaným SSL certifikátem: \"%s\". PÅ™ihlášenà fungovat může, ale nebude to tak bezpeÄné.",
@@ -468,18 +470,18 @@
"RatingDontRemindMe": "Neupozorňovat mě",
"RatingNotNow": "Nynà ne",
"RatingNow": "Dobrá, teÄ to ohodnotÃm",
- "RatingPleaseRateUs": "Piwik mobile je volně šiřitelný software. Proto bychom ocenili, kdybyste si našli minutu k jeho ohodnocenà v %s. Pokud máte návrh na nějakou novou vlastnost nebo chcete nahlásit chybu, kontaktujte %s",
+ "RatingPleaseRateUs": "Piwik mobile je volně šiřitelný software. Proto bychom ocenili, kdybyste si našli minutu k jeho ohodnocenà v %1$s. Pokud máte návrh na nějakou novou vlastnost nebo chcete nahlásit chybu, kontaktujte %2$s",
"ReleaseToRefresh": "UvolnÄ›te pro obnovenÃ...",
"Reloading": "Znovu nahrávám...",
"RequestTimedOutShort": "Chyba Äasového limitu sÃtÄ›",
"RestrictedCompatibility": "Omezená kompatibilita",
"RestrictedCompatibilityExplanation": "Verze Piwiku %s nenà plnÄ› podporována Piwik mobile 2. Můžete se setkat s nÄ›jakými chybami. DoporuÄujeme aktualizovat Piwik na nejnovÄ›jÅ¡Ã verzi nebo se vrátit k Piwik mobile 1.",
"SaveSuccessError": "ProsÃm zkontrolujte si vaÅ¡e nastavenÃ",
- "SearchWebsite": "Prohledat webové stránky",
+ "SearchWebsite": "Hledat weby",
"ShowAll": "Zobrazit vše",
"ShowLess": "Zobrazit méně",
"StaticGraph": "Přehledový graf",
- "TopVisitedWebsites": "NejvÃce navÅ¡tÄ›vované webové stránky",
+ "TopVisitedWebsites": "NejvÃce navÅ¡tÄ›vované weby",
"TryIt": "Vyzkoušejte to!",
"UseSearchBarHint": "Zde je zobrazeno pouze prvnÃch %s webových stránek. K pÅ™Ãstupu k dalÅ¡Ãm použijte vyhledávacà panel.",
"VerifyAccount": "Ověřovánà úÄtu",
@@ -493,7 +495,7 @@
"CompareRows": "Porovnat řádky",
"ComparingRecords": "Porovnávánà %s řádků",
"Documentation": "KliknÄ›te na měřenÃ, pokud je chcete zobrazit ve velkém grafu vývoje. Použijte shift + kliknutà pro zobrazenà vÃce měřenà najednou.",
- "MetricBetweenText": "mezi %s a %s",
+ "MetricBetweenText": "mezi %1$s a %2$s",
"MetricChangeText": "%s za interval",
"MetricMinMax": "Během tohoto obdobà %1$s se pohyboval(a) mezi %2$s a %3$s",
"MetricsFor": "Měřenà pro %s",
diff --git a/lang/da.json b/lang/da.json
index 050ae1a0c7a8059f663f80ffb650f344d6bed436..e5c5b2e313a6f1905d9cc4ad99dece05c0d97cfd 100644
--- a/lang/da.json
+++ b/lang/da.json
@@ -11,7 +11,7 @@
"And": "og",
"API": "API",
"ArchivingInlineHelp": "For hjemmesider med medium til høj trafik anbefales det at deaktivere Piwik-arkivering udløst fra browseren. I stedet anbefales det at køre et cron job hver time til at behandle Piwik rapporter.",
- "ArchivingTriggerDescription": "Til større Piwik installationer anbefales det, at %soprette et cron job%s til at behandle rapporterne automatisk.",
+ "ArchivingTriggerDescription": "Til større Piwik installationer anbefales det, at %1$soprette et cron job%2$s til at behandle rapporterne automatisk.",
"AuthenticationMethodSmtp": "Godkenselsesmetode til SMTP",
"AverageOrderValue": "Gennemsnitlig ordreværdi",
"AveragePrice": "Gennemsnitlige pris",
@@ -23,10 +23,8 @@
"CannotUnzipFile": "Kan ikke udpakke filen %1$s: %2$s",
"ChangePassword": "Skift adgangskode",
"ChangeTagCloudView": "Bemærk, at du kan få vist rapporten på andre måder end som en emnesky. Brug kontrolelementerne nederst i rapporten for at gøre det.",
- "ChooseDate": "Vælg dato",
"ChooseLanguage": "Vælg sprog",
"ChoosePeriod": "Vælg periode",
- "ChooseWebsite": "Vælg hjemmeside",
"ClickHere": "Klik her for yderligere oplysninger.",
"ClickToChangePeriod": "Klik igen for at ændre perioden.",
"Close": "Luk",
@@ -79,7 +77,7 @@
"ColumnViewedAfterSearchDocumentation": "Antallet af gange denne side er blevet besøgt efter en besøgende lavede en søgning på hjemmesiden, og klikkede på denne side i søgeresultaterne.",
"ColumnVisitDuration": "Besøgsvarighed (i sekunder)",
"ColumnVisitsWithConversions": "Besøg med konverteringer",
- "ConfigFileIsNotWritable": "Piwik konfigurationsfilen %s er skrivebeskyttet, nogle af ændringerne vil ikke blive gemt. %s Skift tilladelser til konfigurationsfilen for at gøre den skrivebar.",
+ "ConfigFileIsNotWritable": "Piwik konfigurationsfilen %1$s er skrivebeskyttet, nogle af ændringerne vil ikke blive gemt. %2$s Skift tilladelser til konfigurationsfilen for at gøre den skrivebar.",
"Continue": "Fortsæt",
"ContinueToPiwik": "Fortsæt til Piwik",
"CurrentMonth": "Denne måned",
@@ -95,7 +93,7 @@
"Date": "Dato",
"DateRange": "Datointerval:",
"DateRangeFrom": "Fra",
- "DateRangeFromTo": "Fra %s til %s",
+ "DateRangeFromTo": "Fra %1$s til %2$s",
"DateRangeTo": "Til",
"DaysHours": "%1$s dage %2$s timer",
"DaysSinceFirstVisit": "Dage siden første besøg",
@@ -127,9 +125,10 @@
"Edit": "Rediger",
"EncryptedSmtpTransport": "Indtast tranportlag krypteringen, som kræves af SMTP serveren.",
"Error": "Fejl",
- "ErrorRequest": "Ups… der var et problem i løbet af anmodningen. Måske serveren havde et midlertidigt problem, eller måske du har anmodet om en rapport med for mange data. Prøv igen. Hvis fejlen opstår gentagne gange %skontakt din Piwik administrator%s for at få hjælp.",
+ "ErrorRequest": "Ups… der var et problem i løbet af anmodningen. Måske serveren havde et midlertidigt problem, eller måske du har anmodet om en rapport med for mange data. Prøv igen. Hvis fejlen opstår gentagne gange %1$skontakt din Piwik administrator%2$s for at få hjælp.",
"EvolutionOverPeriod": "Udvikling i perioden",
"EvolutionSummaryGeneric": "%1$s i %2$s sammenlignet med %3$s i %4$s. Udvikling: %5$s",
+ "ExceptionContactSupportGeneric": "Hvis du stadig har dette problem, %1$skontakt Piwik administrator%2$s for at få hjælp.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Brugeren skal være enten en superbruger eller brugeren '%s' selv.",
"ExceptionConfigurationFileNotFound": "Konfigurationsfilen (%s) blev ikke fundet.",
"ExceptionDatabaseVersion": "%1$s version er %2$s, men Piwik behøver mindst version %3$s.",
@@ -138,17 +137,17 @@
"ExceptionFileIntegrity": "Integritetstjek mislykkedes: %s",
"ExceptionFilesizeMismatch": "Fil størrelse passer ikke: %1$s (forventet længde: %2$s, fundet: %3$s)",
"ExceptionIncompatibleClientServerVersions": "%1$s klient version er %2$s, som er uforenelig med server version %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Sammenfattende rapportformat '%s' ikke gyldigt. Prøv en af følgende i stedet: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Sammenfattende rapportformat '%1$s' ikke gyldigt. Prøv en af følgende i stedet: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Levetiden på \"I dag arkiv\" skal være et antal sekunder større end nul",
- "ExceptionInvalidDateFormat": "Datoformat skal være: %s eller et nøgleord, der understøttes af %s funktionen (se %s for mere information)",
- "ExceptionInvalidDateRange": "Datoen '%s' er ikke et korrekt datointerval. Det skal have følgende format: %s.",
- "ExceptionInvalidPeriod": "Perioden '%s' er ikke understøttet. Prøv en af følgende i stedet: %s",
- "ExceptionInvalidRendererFormat": "Rendering format '%s' ikke gyldigt. Prøv et af følgende i stedet: %s.",
- "ExceptionInvalidReportRendererFormat": "Rapport format '%s' er ikke gyldigt. Prøv i stedet et af følgende: %s.",
- "ExceptionInvalidStaticGraphType": "Statisk diagramtype '%s' ikke gyldigt. Prøv en af følgende i stedet: %s.",
+ "ExceptionInvalidDateFormat": "Datoformat skal være: %1$s eller et nøgleord, der understøttes af %2$s funktionen (se %3$s for mere information)",
+ "ExceptionInvalidDateRange": "Datoen '%1$s' er ikke et korrekt datointerval. Det skal have følgende format: %2$s.",
+ "ExceptionInvalidPeriod": "Perioden '%1$s' er ikke understøttet. Prøv en af følgende i stedet: %2$s",
+ "ExceptionInvalidRendererFormat": "Rendering format '%1$s' ikke gyldigt. Prøv et af følgende i stedet: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Rapport format '%1$s' er ikke gyldigt. Prøv i stedet et af følgende: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Statisk diagramtype '%1$s' ikke gyldigt. Prøv en af følgende i stedet: %2$s.",
"ExceptionInvalidToken": "Token er ikke gyldig.",
"ExceptionLanguageFileNotFound": "Sprogfil '%s' blev ikke fundet.",
- "ExceptionMethodNotFound": "Metoden '%s' eksisterer ikke eller er ikke tilgængelig i modulet '%s'.",
+ "ExceptionMethodNotFound": "Metoden '%1$s' eksisterer ikke eller er ikke tilgængelig i modulet '%2$s'.",
"ExceptionMissingFile": "Mangler fil: %s",
"ExceptionNonceMismatch": "Kan ikke kontrollere sikkerheden på formularen.",
"ExceptionPrivilege": "Du kan ikke få adgang til denne ressource, det kræver en %s adgang.",
@@ -156,7 +155,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Du kan ikke få adgang til denne ressource, da det kræver en %s adgang til mindst én hjemmeside.",
"ExceptionUnableToStartSession": "Kan ikke starte sessionen.",
"ExceptionUndeletableFile": "Kunne ikke slette %s",
- "ExceptionUnreadableFileDisabledMethod": "Konfigurationsfilen (%s) kunne ikke læses. Udbyderen kan have deaktiveret %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Konfigurationsfilen (%1$s) kunne ikke læses. Udbyderen kan have deaktiveret %2$s.",
"ExceptionReportNotFound": "Den ønskede rapport findes ikke.",
"ExceptionWidgetNotFound": "Den anmodede widget findes ikke.",
"ExceptionReportNotEnabled": "Den ønskede rapport er ikke aktiveret. Dette betyder normalt enten at udvidelsen, der definerer rapporten er deaktiveret eller at du har ikke tilladelse nok til at få adgang til rapporten.",
@@ -204,7 +203,7 @@
"Logout": "Log af",
"MainMetrics": "Hovedmålinger",
"Matches": "Matcher",
- "MediumToHighTrafficItIsRecommendedTo": "For hjemmesider med medium til høj trafik anbefales det kun at behandle rapporter for i dag højst hver halve time (%s sekunder) eller hver time (%s sekunder).",
+ "MediumToHighTrafficItIsRecommendedTo": "For hjemmesider med medium til høj trafik anbefales det kun at behandle rapporter for i dag højst hver halve time (%1$s sekunder) eller hver time (%2$s sekunder).",
"Metadata": "Metadata",
"Metric": "MÃ¥ling",
"Metrics": "MÃ¥linger",
@@ -257,7 +256,7 @@
"OperationNotEquals": "Ikke lig med",
"OptionalSmtpPort": "Valgfri: Standard 25 for ukrypteret og TLS SMTP og 465 for SSL SMTP.",
"Options": "Indstillinger",
- "OrCancel": "eller %s Fortryd %s",
+ "OrCancel": "eller %1$s Fortryd %2$s",
"Others": "Andre",
"Outlink": "Udgående links",
"Outlinks": "Udgående links",
@@ -265,9 +264,9 @@
"OverlayRowActionTooltipTitle": "Ã…bn sideoverlejring",
"Overview": "Oversigt",
"Pages": "Sider",
- "Pagination": "%s - %s af %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Parameter %s skal være et tal mellem %s og %s.",
+ "Pagination": "%1$s - %2$s af %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Parameter %1$s skal være et tal mellem %2$s og %3$s.",
"Password": "Adgangskode",
"Period": "Periode",
"Piechart": "Cirkeldiagram",
@@ -314,7 +313,7 @@
"Clear": "Ryd",
"SearchNoResults": "Ingen resultater",
"SeeAll": "se samtlige",
- "SeeTheOfficialDocumentationForMoreInformation": "Se den %sofficielle dokumentation%s for mere information.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Se den %1$sofficielle dokumentation%2$s for mere information.",
"SeeThisFaq": "Se %1$sdenne faq%2$s.",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Vælg \"Ja\", hvis du ønsker eller er nødt til at sende e-mail via en bestemt server i stedet for den lokale mail-funktionen",
@@ -371,7 +370,7 @@
"WarningFileIntegrityNoManifest": "Fil integritetstjek kunne ikke udføres på grund af manglende manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "Hvis du implementerer Piwik fra Git, er meddelelsen normal.",
"WarningFileIntegrityNoMd5file": "Fil integritetstjek kunne ikke gennemføres pga. manglende md5_file () funktion.",
- "WarningPasswordStored": "%sAdvarsel:%s Adgangskoden bliver gemt i konfigurationsfilen synlig for alle, der har adgang til den.",
+ "WarningPasswordStored": "%1$sAdvarsel:%2$s Adgangskoden bliver gemt i konfigurationsfilen synlig for alle, der har adgang til den.",
"Website": "Hjemmeside",
"Weekly": "Ugentligt",
"WeeklyReport": "ugentlig",
@@ -424,7 +423,7 @@
"MultiChartLabel": "Vis minidiagrammer",
"NavigationBack": "Tilbage",
"NetworkError": "Netværksfejl",
- "NetworkErrorWithStatusCode": "Der opstod en fejl \"%s\". Anmodningen returnerede status \"%s\". URL-adresse var \"%s\". Kontroller den indtastede URL og fejllogfiler på serveren for at få yderligere oplysninger om fejlen, og hvordan den kan løses.",
+ "NetworkErrorWithStatusCode": "Der opstod en fejl \"%1$s\". Anmodningen returnerede status \"%2$s\". URL-adresse var \"%3$s\". Kontroller den indtastede URL og fejllogfiler på serveren for at få yderligere oplysninger om fejlen, og hvordan den kan løses.",
"NetworkErrorWithStatusCodeShort": "Netværksfejl %s",
"NetworkNotReachable": "Netværk ikke tilgængeligt",
"NoAccountIsSelected": "Du er nødt til at vælge en konto. Tilføj en ny konto, hvis du ikke har konfigureret en.",
@@ -442,7 +441,7 @@
"RatingDontRemindMe": "PÃ¥mind mig ikke",
"RatingNotNow": "Senere",
"RatingNow": "OK, jeg vil bedømme nu",
- "RatingPleaseRateUs": "Piwik Mobile app er gratis software. Vi vil sætte stor pris på, at du bruger 1 minut på at bedømme app'en i %s. Hvis du har forslag til nye features eller fejlrapporter, så kontakt %s",
+ "RatingPleaseRateUs": "Piwik Mobile app er gratis software. Vi vil sætte stor pris på, at du bruger 1 minut på at bedømme app'en i %1$s. Hvis du har forslag til nye features eller fejlrapporter, så kontakt %2$s",
"ReleaseToRefresh": "Slip for at opdatere...",
"Reloading": "Genindlæser...",
"RequestTimedOutShort": "Netværk timeout-fejl",
@@ -467,7 +466,7 @@
"CompareRows": "Sammenlign rækker",
"ComparingRecords": "Sammenligner %s rækker",
"Documentation": "Klik på målinger for at få vist udviklingen på en stor graf. Brug shift-klik for at vise flere målinger samtidigt.",
- "MetricBetweenText": "mellem %s og %s",
+ "MetricBetweenText": "mellem %1$s og %2$s",
"MetricChangeText": "%s over perioden",
"MetricMinMax": "%1$s varierede mellem %2$s og %3$s over perioden",
"MetricsFor": "MÃ¥linger for %s",
diff --git a/lang/de.json b/lang/de.json
index 0f975ee0659d83ac7b6e491f5a74499d01ef3407..94f585b079d085cc803d003df4fc5a2577339294 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -15,7 +15,7 @@
"API": "API",
"Apply": "Anwenden",
"ArchivingInlineHelp": "Für Websites mit mittlerem bis hohem Verkehrsaufkommen wird empfohlen, die durch den Browser ausgelöste Archivierung zu deaktivieren. Stattdessen wird empfohlen, dass Sie einen Cronjob aufsetzen, der die Berichte einmal pro Stunde abarbeitet.",
- "ArchivingTriggerDescription": "Für größere Piwik-Installationen sollten Sie %seinen Cronjob erstellen%s, der die Berichte automatisch abarbeitet.",
+ "ArchivingTriggerDescription": "Für größere Piwik-Installationen sollten Sie %1$seinen Cronjob erstellen%2$s, der die Berichte automatisch abarbeitet.",
"AuthenticationMethodSmtp": "Authentifizierungsmethode für SMTP",
"AverageOrderValue": "Durchschnittlicher Bestellwert",
"AveragePrice": "Durchschnittlicher Preis",
@@ -27,10 +27,9 @@
"CannotUnzipFile": "Die Datei %1$s kann nicht entpackt werden: %2$s",
"ChangePassword": "Passwort ändern",
"ChangeTagCloudView": "Bitte beachten Sie, dass Sie den Bericht nicht nur als Tag-Cloud anzeigen können. Verwenden Sie die Steuerelemente in der Fußleiste, um die Ansicht zu wechseln.",
- "ChooseDate": "Wähle Datum",
+ "ChooseDate": "Wählen Sie ein datum, aktuell gewähltes Datum ist: %s",
"ChooseLanguage": "Sprache wählen",
"ChoosePeriod": "Zeitraum wählen",
- "ChooseWebsite": "Website wählen",
"ClickHere": "Klicken Sie hier für mehr Informationen.",
"ClickToChangePeriod": "Klicken Sie erneut, um den Zeitraum zu ändern.",
"Close": "Schließen",
@@ -84,9 +83,10 @@
"ColumnViewedAfterSearchDocumentation": "Die Anzahl, wie häufig diese Seite besucht wurde, nachdem zuvor die interne Suche benutzt wurde.",
"ColumnVisitDuration": "Dauer des Besuchs (in Sekunden)",
"ColumnVisitsWithConversions": "Besuche mit Konversionen",
- "ConfigFileIsNotWritable": "Die Piwik-Konfigurationsdatei %s ist nicht schreibbar, Ihre Änderungen werden nicht gespeichert. %s Bitte ändern Sie die Zugriffsrechte der Konfigurationsdatei, um diese schreibbar zu machen.",
+ "ConfigFileIsNotWritable": "Die Piwik-Konfigurationsdatei %1$s ist nicht schreibbar, Ihre Änderungen werden nicht gespeichert. %2$s Bitte ändern Sie die Zugriffsrechte der Konfigurationsdatei, um diese schreibbar zu machen.",
"Continue": "Weiter",
"ContinueToPiwik": "Weiter zu Piwik",
+ "CreatedByUser": "Erstellt von %s",
"CurrentMonth": "Aktueller Monat",
"CurrentWeek": "Aktuelle Woche",
"CurrentYear": "Aktuelles Jahr",
@@ -100,7 +100,7 @@
"Date": "Datum",
"DateRange": "Zeitspanne:",
"DateRangeFrom": "Von",
- "DateRangeFromTo": "Von %s bis %s",
+ "DateRangeFromTo": "Von %1$s bis %2$s",
"DateRangeInPeriodList": "Zeitspanne",
"DateRangeTo": "Bis",
"DaysHours": "%1$s Tage %2$s Stunden",
@@ -133,30 +133,30 @@
"Edit": "Ändern",
"EncryptedSmtpTransport": "Geben Sie hier die von Ihrem SMTP-Server benötigte Verschlüsselung ein.",
"Error": "Fehler",
- "ErrorRequest": "Oops… während der Anfrage ist ein Problem aufgetreten. Möglicherweise war der Server temporär überlastet, oder eventuell haben Sie einen Bericht mit zu vielen Daten angefordert. Bitte noch einmal versuchen. Wenn dieser Fehler wiederholt auftritt %skontaktieren Sie bitte Ihren Piwik Administrator%s, um Unterstützung zu erhalten.",
+ "ErrorRequest": "Oops… während der Anfrage ist ein Problem aufgetreten. Möglicherweise war der Server temporär überlastet, oder eventuell haben Sie einen Bericht mit zu vielen Daten angefordert. Bitte noch einmal versuchen. Wenn dieser Fehler wiederholt auftritt %1$skontaktieren Sie bitte Ihren Piwik Administrator%2$s, um Unterstützung zu erhalten.",
"EvolutionOverPeriod": "Entwicklung über den Zeitraum",
"EvolutionSummaryGeneric": "%1$s in %2$s verglichen mit %3$s in %4$s. Entwicklung: %5$s",
- "ExceptionContactSupportGeneric": "Falls dieses Problem weiterhin besteht, %skontaktieren Sie bitte Ihren Piwik Administrator%s für Unterstützung.",
+ "ExceptionContactSupportGeneric": "Falls dieses Problem weiterhin besteht, %1$skontaktieren Sie bitte Ihren Piwik Administrator%2$s für Unterstützung.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Der Benutzer muss entweder ein Hauptadministrator sein oder der Benutzer '%s'.",
"ExceptionConfigurationFileNotFound": "Die Konfigurationsdatei {%s} wurde nicht gefunden.",
- "ExceptionConfigurationFileNotFound2": "Insofern die Datei existiert überprüfen Sie bitte dass %s für den Benutzer '%s' lesbar ist.",
+ "ExceptionConfigurationFileNotFound2": "Insofern die Datei existiert überprüfen Sie bitte dass %1$s für den Benutzer '%2$s' lesbar ist.",
"ExceptionDatabaseVersion": "Ihre %1$s-Version ist %2$s, aber Piwik benötigt mindestens %3$s",
"ExceptionDatabaseVersionNewerThanCodebase": "Ihre Piwik Codebase läuft auf der alten Version %1$s und wir haben erkannt, dass Ihre Piwik Datenbank bereits auf die neuere Version %2$s aktualisiert wurde.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "Möglicherweise sind die Piwik Administratoren gerade daran, den Aktualisierungsprozess abzuschliessen. Bitte versuchen Sie es in ein paar Minuten noch einmal.",
"ExceptionFileIntegrity": "Integritätsprüfung fehlgeschlagen: %s",
"ExceptionFilesizeMismatch": "Unterschiedliche Dateigröße: %1$s (erwartete Größe: %2$s, gefunden: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Ihre %1$s-Client Version ist %2$s, die aber mit der Server-Version %3$s inkompatibel ist.",
- "ExceptionInvalidAggregateReportsFormat": "Aggregiertes Berichtsformat '%s' ungültig. Versuchen Sie eines der folgenden: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Aggregiertes Berichtsformat '%1$s' ungültig. Versuchen Sie eines der folgenden: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Die Archivierungszeit von Live-Berichten muss eine Zahl in Sekunden (größer als Null) sein.",
- "ExceptionInvalidDateFormat": "Das Datumsformat muss %s oder eine andere, von der Funktion %s unterstützte Zeichenkette sein. (Besuchen Sie %s für nähere Informationen)",
- "ExceptionInvalidDateRange": "Das Datum '%s' ist keine korrekte Zeitspanne. Es sollte das folgende Format haben: %s",
- "ExceptionInvalidPeriod": "Der Zeitraum '%s' wird nicht unterstützt. Versuchen Sie es stattdessen mit einem der folgenden: %s",
- "ExceptionInvalidRendererFormat": "Das Renderer-Format '%s' ist ungültig. Versuchen Sie stattdessen eines der folgenden Formate: %s.",
- "ExceptionInvalidReportRendererFormat": "Berichtsformat '%s' ist ungültig. Versuchen Sie stattdessen eines der folgenden: %s.",
- "ExceptionInvalidStaticGraphType": "Typ des statischen Graphs '%s' ist ungültig. Versuchen Sie stattdessen einen der folgenden Typen: %s",
+ "ExceptionInvalidDateFormat": "Das Datumsformat muss %1$s oder eine andere, von der Funktion %2$s unterstützte Zeichenkette sein. (Besuchen Sie %3$s für nähere Informationen)",
+ "ExceptionInvalidDateRange": "Das Datum '%1$s' ist keine korrekte Zeitspanne. Es sollte das folgende Format haben: %2$s",
+ "ExceptionInvalidPeriod": "Der Zeitraum '%1$s' wird nicht unterstützt. Versuchen Sie es stattdessen mit einem der folgenden: %2$s",
+ "ExceptionInvalidRendererFormat": "Das Renderer-Format '%1$s' ist ungültig. Versuchen Sie stattdessen eines der folgenden Formate: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Berichtsformat '%1$s' ist ungültig. Versuchen Sie stattdessen eines der folgenden: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Typ des statischen Graphs '%1$s' ist ungültig. Versuchen Sie stattdessen einen der folgenden Typen: %2$s",
"ExceptionInvalidToken": "Das Token ist ungültig.",
"ExceptionLanguageFileNotFound": "Sprachdatei '%s' wurde nicht gefunden.",
- "ExceptionMethodNotFound": "Die Methode '%s' existiert nicht oder ist im Modul '%s' nicht verfügbar.",
+ "ExceptionMethodNotFound": "Die Methode '%1$s' existiert nicht oder ist im Modul '%2$s' nicht verfügbar.",
"ExceptionMissingFile": "Fehlende Datei: %s",
"ExceptionNonceMismatch": "Das Sicherheitstoken des Formulars konnte nicht verifiziert werden.",
"ExceptionPrivilege": "Sie können auf die Ressource nicht zugreifen, da Sie dafür mindestens %s Rechte benötigen.",
@@ -164,7 +164,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Sie können auf diese Ressource nicht zugreifen, da eine %s Berechtigung für mindestens eine Website benötigt wird.",
"ExceptionUnableToStartSession": "Starten einer Session nicht möglich.",
"ExceptionUndeletableFile": "Löschen von %s nicht möglich",
- "ExceptionUnreadableFileDisabledMethod": "Die Konfigurationsdatei {%s} konnte nicht gelesen werden. Ihr Host hat möglicherweise %s deaktiviert.",
+ "ExceptionUnreadableFileDisabledMethod": "Die Konfigurationsdatei {%1$s} konnte nicht gelesen werden. Ihr Host hat möglicherweise %2$s deaktiviert.",
"ExceptionReportNotFound": "Der gesuchte Bericht existiert nicht.",
"ExceptionWidgetNotFound": "Das gesuchte Widget existiert nicht.",
"ExceptionReportNotEnabled": "Der gesuchte Bericht ist nicht aktiviert. Das bedeutet normalerweise entweder, dass das Plugin, welches den Bericht definiert, deaktiviert ist oder Sie haben nicht die benötigten Berechtigungen, um diesen Bericht einzusehen.",
@@ -212,7 +212,7 @@
"Logout": "Abmelden",
"MainMetrics": "Kernmetriken",
"Matches": "Treffer",
- "MediumToHighTrafficItIsRecommendedTo": "Für Websites mit mittlerem bis hohem Verkehrsaufkommen empfehlen wir, Berichte für den heutigen Tag maximal jede halbe Stunde (%s Sekunden) oder jede Stunde (%s Sekunden) abzuarbeiten.",
+ "MediumToHighTrafficItIsRecommendedTo": "Für Websites mit mittlerem bis hohem Verkehrsaufkommen empfehlen wir, Berichte für den heutigen Tag maximal jede halbe Stunde (%1$s Sekunden) oder jede Stunde (%2$s Sekunden) abzuarbeiten.",
"Metadata": "Metadaten",
"Metric": "Metrik",
"Metrics": "Metriken",
@@ -269,7 +269,7 @@
"OptionalSmtpPort": "Optional. Standard ist 25 für unverschlüsseltes SMTP sowie SMTP mit TLS, und 465 für SMTP mit SSL.",
"Options": "Optionen",
"Or": "oder",
- "OrCancel": "oder %s abbrechen %s",
+ "OrCancel": "oder %1$s abbrechen %2$s",
"Others": "Andere",
"Outlink": "Ausgehender Verweis",
"Outlinks": "Ausgehende Verweise",
@@ -277,9 +277,9 @@
"OverlayRowActionTooltipTitle": "Seiten Overlay öffnen",
"Overview": "Ãœbersicht",
"Pages": "Seiten",
- "Pagination": "%s - %s von %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Parameter %s muss ein ganzzahliger Wert zwischen %s und %s sein.",
+ "Pagination": "%1$s - %2$s von %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Parameter %1$s muss ein ganzzahliger Wert zwischen %2$s und %3$s sein.",
"Password": "Passwort",
"Period": "Zeitraum",
"Piechart": "Kreisdiagramm",
@@ -331,7 +331,7 @@
"Clear": "Zurücksetzen",
"SearchNoResults": "Keine Ergebnisse",
"SeeAll": "alle ansehen",
- "SeeTheOfficialDocumentationForMoreInformation": "Weitere Informationen finden Sie in der %soffiziellen Dokumentation%s.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Weitere Informationen finden Sie in der %1$soffiziellen Dokumentation%2$s.",
"SeeThisFaq": "Siehe %1$sdiese FAQ%2$s.",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Wählen Sie \"Ja\", wenn Sie E-Mails über einen Server verschicken möchten, anstatt die lokale mail()-Funktion zu benutzen.",
@@ -358,7 +358,7 @@
"Total": "Gesamt",
"TotalRatioTooltip": "Das entspricht %1$s von %2$s %3$s.",
"TotalRevenue": "Gesamteinnahmen",
- "TotalVisitsPageviewsActionsRevenue": "(Gesamt: %s Besuche, %s Seitenansichten, %s Aktionen, %s Einnahmen)",
+ "TotalVisitsPageviewsActionsRevenue": "(Gesamt: %1$s Besuche, %2$s Seitenansichten, %3$s Aktionen, %4$s Einnahmen)",
"TrackingScopeAction": "Aktion",
"TrackingScopePage": "Seite",
"TrackingScopeVisit": "Besuch",
@@ -395,8 +395,8 @@
"WarningFileIntegrityNoManifest": "Aufgrund der fehlenden Datei manifest.inc.php konnte die Integritätsprüfung nicht durchgeführt werden.",
"WarningFileIntegrityNoManifestDeployingFromGit": "Wenn Sie Piwik von Git deployen ist diese Nachricht normal.",
"WarningFileIntegrityNoMd5file": "Durch die fehlende md5_file() Funktion konnte die Integritätsprüfung nicht durchgeführt werden.",
- "WarningPasswordStored": "%sWarnung:%s Dieses Passwort wird in der Konfigurationsdatei gespeichert und ist so für jeden sichtbar, der auf diese Datei Zugriff hat.",
- "WarningDebugOnDemandEnabled": "Der Tracker befindet sich im %s Modus. Aus Sicherheitsgründen sollte dieser nur für einen kurzen Zeitraum aktiv sein. Um Ihn zu deaktivieren setzen Sie %s auf %s in %s",
+ "WarningPasswordStored": "%1$sWarnung:%2$s Dieses Passwort wird in der Konfigurationsdatei gespeichert und ist so für jeden sichtbar, der auf diese Datei Zugriff hat.",
+ "WarningDebugOnDemandEnabled": "Der Tracker befindet sich im %1$s Modus. Aus Sicherheitsgründen sollte dieser nur für einen kurzen Zeitraum aktiv sein. Um Ihn zu deaktivieren setzen Sie %2$s auf %3$s in %4$s",
"Website": "Website",
"Weekly": "Wöchentlich",
"WeeklyReport": "wöchentlich",
@@ -450,7 +450,7 @@
"MultiChartLabel": "Multisite Graphen anzeigen",
"NavigationBack": "Zurück",
"NetworkError": "Netzwerkfehler",
- "NetworkErrorWithStatusCode": "Folgender Fehler trat auf \"%s\". Die Anfrage gab den Status \"%s\" zurück. URL war \"%s\". Bitte die eingegebene URL überprüfen und die Fehlerlog Dateien auf dem Server überprüfen, um mehr Informationen zu diesem Fehler und wie er zu beheben ist, zu erfahren.",
+ "NetworkErrorWithStatusCode": "Folgender Fehler trat auf \"%1$s\". Die Anfrage gab den Status \"%2$s\" zurück. URL war \"%3$s\". Bitte die eingegebene URL überprüfen und die Fehlerlog Dateien auf dem Server überprüfen, um mehr Informationen zu diesem Fehler und wie er zu beheben ist, zu erfahren.",
"NetworkErrorWithStatusCodeShort": "Netzwerkfehler %s",
"NetworkNotReachable": "Netzwerk ist nicht erreichbar",
"NoAccountIsSelected": "Kein Zugang ausgewählt. Fügen Sie einen neuen Account hinzu, wenn Sie keinen konfiguriert haben.",
@@ -468,7 +468,7 @@
"RatingDontRemindMe": "Bitte nicht daran erinnern",
"RatingNotNow": "Nicht jetzt",
"RatingNow": "OK, ich bewerte es jetzt",
- "RatingPleaseRateUs": "Piwik Mobile App ist Freie Software, wir würden es sehr zu schätzen wissen, wenn Sie 1 Minute Ihrer wertvollen Zeit opfern würden, um diese App im %s zu bewerten. Falls Sie Vorschläge für neue Features haben oder Fehler melden möchten, bitte kontaktieren Sie %s",
+ "RatingPleaseRateUs": "Piwik Mobile App ist Freie Software, wir würden es sehr zu schätzen wissen, wenn Sie 1 Minute Ihrer wertvollen Zeit opfern würden, um diese App im %1$s zu bewerten. Falls Sie Vorschläge für neue Features haben oder Fehler melden möchten, bitte kontaktieren Sie %2$s",
"ReleaseToRefresh": "Zum Aktualisieren loslassen...",
"Reloading": "Wird neu geladen...",
"RequestTimedOutShort": "Netzwerk Zeitüberschreitung",
@@ -493,7 +493,7 @@
"CompareRows": "Vergleiche Einträge",
"ComparingRecords": "Vergleiche %s Zeilen",
"Documentation": "Klicken Sie auf die Metriken, um sie im großen Entwicklungs-Graphen zu sehen. Verwenden Sie Shift-Klick, um mehrere Metriken gleichzeitig zu sehen.",
- "MetricBetweenText": "zwischen %s und %s",
+ "MetricBetweenText": "zwischen %1$s und %2$s",
"MetricChangeText": "%s in diesem Zeitraum",
"MetricMinMax": "%1$s bewegte sich während dem Zeitraum zwischen %2$s und %3$s",
"MetricsFor": "Metriken für %s",
diff --git a/lang/el.json b/lang/el.json
index c8a479aaef80f73379ea615a7858142b8855655f..23662599bab37755a87592e1d4d53b56ba2ce39e 100644
--- a/lang/el.json
+++ b/lang/el.json
@@ -15,7 +15,7 @@
"API": "API",
"Apply": "ΕφαÏμογή",
"ArchivingInlineHelp": "Για μεσαίας ή μεγάλης επισκεψιμότητας ιστοσελίδες, Ï€Ïοτείνεται να απενεÏγοποιήσετε την αÏχειοθÎτηση από τον φυλλομετÏητή. Αντί για αυτό, σας Ï€Ïοτείνουμε να εγκαταστήσετε μια εÏγασία cron για να δημιουÏγείτε αναφοÏÎÏ‚ Piwik κάθε ÏŽÏα.",
- "ArchivingTriggerDescription": "Συνιστάται για μεγάλες εγκαταστάσεις του Piwik. ΧÏειάζεται να %sεγκαταστήσετε μια εÏγασία cron%s για να δημιουÏγείτε τις αναφοÏÎÏ‚ αυτόματα.",
+ "ArchivingTriggerDescription": "Î Ïοτείνεται για μεγάλες εγκαταστάσεις του Piwik, Ï€ÏÎπει να %1$sοÏίσετε μια εÏγασία cron%2$s για να γίνεται αυτόματη επεξεÏγασία των αναφοÏών.",
"AuthenticationMethodSmtp": "ÎœÎθοδος πιστοποίησης SMTP",
"AverageOrderValue": "ÎœÎση τιμή παÏαγγελίας",
"AveragePrice": "ÎœÎση τιμή",
@@ -27,10 +27,9 @@
"CannotUnzipFile": "ΑδÏνατη η αποσυμπίεση αÏχείου %1$s: %2$s",
"ChangePassword": "Αλλαγή κωδικοÏ",
"ChangeTagCloudView": "Σημειώστε ότι μποÏείτε να δείτε την αναφοÏά με άλλους Ï„Ïόπους εκτός από σÏννεφο ετικετών. ΧÏησιμοποιήστε τα κουμπί στο κάτω μÎÏος της αναφοÏάς για αυτό.",
- "ChooseDate": "Επιλογή ημεÏομηνίας",
+ "ChooseDate": "ΕπιλÎξτε ημεÏομηνία, αυτή τη στιγμή επιλεγμÎνη είναι η: %s",
"ChooseLanguage": "Επιλογή γλώσσας",
"ChoosePeriod": "Επιλογή πεÏιόδου",
- "ChooseWebsite": "Επιλογή ιστοσελίδας",
"ClickHere": "Πατήστε εδώ για πεÏισσότεÏες πληÏοφοÏίες.",
"ClickToChangePeriod": "Πατήστε πάλι για αλλαγή της πεÏιόδου.",
"Close": "Κλείσιμο",
@@ -84,9 +83,11 @@
"ColumnViewedAfterSearchDocumentation": "Ο αÏιθμός των επισκÎψεων σε αυτή τη σελίδα, Îπειτα από αναζήτηση ενός επισκÎπτη στην ιστοσελίδα σας και Î±Ï†Î¿Ï ÏƒÏ„Î· συνÎχεια Îκανε κλικ σε αυτή τη σελίδα από τα αποτελÎσματα αναζήτησης.",
"ColumnVisitDuration": "ΔιάÏκεια επίσκεψης (σε δευτεÏόλεπτα)",
"ColumnVisitsWithConversions": "ΕπισκÎψεις με ΜετατÏοπÎÏ‚",
- "ConfigFileIsNotWritable": "Το αÏχείο Ïυθμίσεων %s του Piwik δεν είναι εγγÏάψιμο. Οι αλλαγÎÏ‚ σας δεν θα αποθηκευτοÏν. %s Αλλάξτε τα δικαιώματα στο αÏχείο Ïυθμίσεων για να το κάνετε εγγÏάψιμο.",
+ "ConfigFileIsNotWritable": "Το αÏχείο Ïυθμίσεων %1$s του Piwik δεν είναι εγγÏάψιμο, οÏισμÎνες από τις αλλαγÎÏ‚ σας δεν θα αποθηκευτοÏν. %2$s Αλλάξτε τα δικαιώματα στο αÏχείο Ïυθμίσεων για να το κάνετε εγγÏάψιμο.",
"Continue": "ΣυνÎχεια",
"ContinueToPiwik": "ΣυνÎχεια στο Piwik",
+ "CurrentlyUsingUnsecureHttp": "Αυτή τη στιγμή χÏησιμοποιείτε το Piwik πάνω από μη ασφαλή σÏνδεση HTTP, γεγονός που εμπεÏιÎχει Ïίσκο. ΣυνιστοÏμε να παÏαμετÏοποιήσετε το Piwik για χÏήση SSL (HTTPS) για βελτιωμÎνη ασφάλεια.",
+ "CreatedByUser": "δημιουÏγήθηκε από %s",
"CurrentMonth": "ΤÏÎχων Μήνας",
"CurrentWeek": "ΤÏÎχουσα Εβδομάδα",
"CurrentYear": "ΤÏÎχον Έτος",
@@ -100,7 +101,7 @@
"Date": "ΗμεÏομηνία",
"DateRange": "ΧÏονική πεÏίοδος",
"DateRangeFrom": "Από",
- "DateRangeFromTo": "Από %s Îως %s",
+ "DateRangeFromTo": "Από %1$s σε %2$s",
"DateRangeInPeriodList": "εÏÏος ημεÏομηνίας",
"DateRangeTo": "Î Ïος",
"DaysHours": "%1$s μÎÏες %2$s ÏŽÏες",
@@ -133,30 +134,30 @@
"Edit": "ΕπεξεÏγασία",
"EncryptedSmtpTransport": "Εισάγετε το κÏυπτογÏαφημÎνο επίπεδο μεταφοÏάς που απαιτείται από τον διακομιστή SMTP σας.",
"Error": "Σφάλμα",
- "ErrorRequest": "Ουπς... υπήÏξε Ï€Ïόβλημα κατά την επεξεÏγασία της αίτησης. ΜποÏεί ο διακομιστής να είχε Îνα Ï€ÏοσωÏινό Ï€Ïόβλημα ή μποÏεί να ζητήσατε μια αναφοÏά με πάÏα πολλά δεδομÎνα. ΠαÏακαλοÏμε δοκιμάστε ξανά. Αν το σφάλμα επαναλαμβάνεται διαÏκώς, παÏακαλοÏμε %sεπικοινωνήστε με τον διαχειÏιστή του Piwik σας%s για βοήθεια.",
+ "ErrorRequest": "Ουπς... υπήÏξε Îνα Ï€Ïόβλημα κατά την αίτηση. Είναι πιθανόν ο διακομιστής να αντιμετώπισε Îνα Ï€ÏοσωÏινό Ï€Ïόβλημα ή να κάνατε μια αίτηση με πάÏα πολλά δεδομÎνα. ΠαÏακαλώ ξαναδοκιμάστε. Αν το σφάλμα επαναληφθεί ξανά %1$sεπικοινωνήστε με τον διαχειÏιστή σας του Piwik%2$s για βοήθεια.",
"EvolutionOverPeriod": "ΕξÎλιξη εντός της πεÏιόδου",
"EvolutionSummaryGeneric": "%1$s στο %2$s σε σÏγκÏιση με το %3$s στο %4$s. ΕξÎλιξη: %5$s",
- "ExceptionContactSupportGeneric": "Αν συνεχίζετε να αντιμετωπίζετε αυτό το Ï€Ïόβλημα, %sεπικοινωνήστε με τον διαχειÏιστή του Piwik σας%s για βοήθεια.",
+ "ExceptionContactSupportGeneric": "Αν συνεχίζετε να αντιμετωπίζετε Ï€Ïόβλημα, %1$sεπικοινωνήστε με τον διαχειÏιστή σας του Piwik%2$s για βοήθεια.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Ο χÏήστης Ï€ÏÎπει να είναι είτε ΥπεÏ-ΧÏήστης είτε ο ίδιος ο χÏήστης '%s'.",
"ExceptionConfigurationFileNotFound": "Δεν βÏÎθηκε το αÏχείο Ïυθμίσεων {%s} ή δεν ήταν δυνατή η ανάγνωσή του.",
- "ExceptionConfigurationFileNotFound2": "Αν το αÏχείο υπάÏχει, ελÎγξτε ότι το %s είναι αναγνώσιμο από το χÏήστη '%s'.",
+ "ExceptionConfigurationFileNotFound2": "Αν το αÏχείο υπάÏχει, ελÎγξτε αν είναι %1$s αναγνώσιμο από τον χÏήστη '%2$s'.",
"ExceptionDatabaseVersion": "Η Îκδοσή %1$s είναι %2$s αλλά το Piwik απαιτεί τουλάχιστον %3$s.",
"ExceptionDatabaseVersionNewerThanCodebase": "Ο κώδικας του Piwik εκτελεί την παλιότεÏη Îκδοση %1$s και εντοπίστηκε ότι η βάση δεδομÎνων του Piwik Îχει ήδη αναβαθμιστεί στην νεότεÏη Îκδοση %2$s.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "Είναι πιθανόν οι διαχειÏιστÎÏ‚ του Piwik να τελειώνουν τη διαδικασία αναβάθμισης. ΠαÏακαλοÏμε δοκιμάστε πάλι αÏγότεÏα σε λίγα λεπτά.",
"ExceptionFileIntegrity": "Ο Îλεγχος ακεÏαιότητας απÎτυχε: %s",
"ExceptionFilesizeMismatch": "ΑταίÏιαστο μÎγεθος αÏχείου: %1$s (αναμενόμενο: %2$s, βÏÎθηκε: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Η Îκδοση πελάτη σας %1$s είναι %2$s η οποία είναι ασÏμβατη με την Îκδοση διακομιστή %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Η μοÏφή των συνολικών αναφοÏών «%s» δεν είναι ÎγκυÏη. Δοκιμάστε κάποια από τις επόμενες: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Η μοÏφή του αθÏοίσματος αναφοÏών '%1$s' δεν είναι ÎγκυÏη. Δοκιμάστε μια από τις παÏακάτω: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Ο ημεÏήσιος χÏόνος αÏχειοθÎτησης Ï€ÏÎπει να είναι Îνας θετικός αÏιθμός δευτεÏολÎπτων.",
- "ExceptionInvalidDateFormat": "Η ημεÏομηνία Ï€ÏÎπει να Îχει μοÏφή: %s ή οποιαδήποτε λÎξη κλειδί υποστηÏίζεται από τη συνάÏτηση %s (δείτε την %s για πεÏισσότεÏες πληÏοφοÏίες)",
- "ExceptionInvalidDateRange": "Η ημεÏομηνία «%s» δεν είναι οÏθό εÏÏος ημεÏομηνιών. Î ÏÎπει να Îχει την ακόλουθη μοÏφή: %s.",
- "ExceptionInvalidPeriod": "Η πεÏίοδος «%s» δεν υποστηÏίζεται. Δοκιμάστε κάποια από τις ακόλουθες: %s.",
- "ExceptionInvalidRendererFormat": "Η μοÏφή του ΑναφοÏÎα «%s» δεν είναι ÎγκυÏη. Δοκιμάστε κάποιο από τις ακόλουθες: %s.",
- "ExceptionInvalidReportRendererFormat": "Η μοÏφή αναφοÏάς «%s» δεν είναι ÎγκυÏη. Δοκιμάστε κάποια από τις επόμενες: %s.",
- "ExceptionInvalidStaticGraphType": "Ο στατικός Ï„Ïπος διαγÏάμματος «%s» δεν είναι ÎγκυÏος. Δοκιμάστε κάποιον από τους επόμενους: %s.",
+ "ExceptionInvalidDateFormat": "Η μοÏφή ημεÏομηνίας Ï€ÏÎπει να είναι: %1$s ή οποιαδήποτε λÎξη κλειδί υποστηÏίζεται από την συνάÏτηση %2$s (δείτε το %3$s για πεÏισσότεÏες πληÏοφοÏίες)",
+ "ExceptionInvalidDateRange": "Η ημεÏομηνία '%1$s' δεν είναι σωστή μοÏφή εÏÏους ημεÏομηνίας. Θα Ï€ÏÎπει να Îχει την ακόλουθη μοÏφή: %2$s.",
+ "ExceptionInvalidPeriod": "Η πεÏίοδος '%1$s' δεν υποστηÏίζεται. Δοκιμάστε μία από τις παÏακάτω: %2$s",
+ "ExceptionInvalidRendererFormat": "Η μοÏφή απόδοσης '%1$s' δεν είναι ÎγκυÏη. Δοκιμάστε μία από τις παÏακάτω: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Η μοÏφή αναφοÏάς '%1$s' δεν είναι ÎγκυÏη. Δοκιμάστε μία από τις παÏακάτω: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Ο Ï„Ïπος ÏƒÏ„Î±Ï„Î¹ÎºÎ¿Ï Î³Ïαφήματος '%1$s' δεν είναι ÎγκυÏος. Δοκιμάστε Îναν από τις παÏακάτω: %2$s.",
"ExceptionInvalidToken": "Το τεκμήÏιο δεν είναι ÎγκυÏο.",
"ExceptionLanguageFileNotFound": "Το αÏχείο γλώσσας «%s» δεν βÏÎθηκε.",
- "ExceptionMethodNotFound": "Η μÎθοδος «%s» δεν υπάÏχει ή δεν είναι διαθÎσιμη στο Ï€Ïότυπο «%s».",
+ "ExceptionMethodNotFound": "Η μÎθοδος '%1$s' δεν υπάÏχει ή δεν είναι διαθÎσιμη στη μονάδα '%2$s'.",
"ExceptionMissingFile": "ΑπολεσθÎν αÏχείο: %s",
"ExceptionNonceMismatch": "ΑδÏνατη η πιστοποίηση τεκμηÏίου ασφάλειας σε αυτή τη φόÏμα.",
"ExceptionPrivilege": "Δεν Îχετε Ï€Ïόσβαση σε αυτή την Ï€ÏοÎλευση καθώς απαιτεί Ï€Ïόσβαση %s.",
@@ -164,7 +165,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Δεν Îχετε Ï€Ïόσβαση σε αυτή τη Ï€ÏοÎλευση καθώς απαιτεί Ï€Ïόσβαση %s για τουλάχιστον μια ιστοσελίδα.",
"ExceptionUnableToStartSession": "ΑδÏνατη η ÎναÏξη της συνεδÏίας.",
"ExceptionUndeletableFile": "ΑδÏνατη η διαγÏαφή του %s",
- "ExceptionUnreadableFileDisabledMethod": "Δεν είναι δυνατή η ανάγνωση του αÏχείου Ïυθμίσεων {%s} δεν μποÏεί να αναγνωστεί. Ο διακομιστής σας μποÏεί να απενεÏγοποίησε το %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Δεν ήταν δυνατή η ανάγνωση του αÏχείου {%1$s}. Ο διακομιστής σας μποÏεί να Îχει απενεÏγοποιημÎνο το %2$s.",
"ExceptionReportNotFound": "Δεν υπάÏχει η ζητοÏμενη αναφοÏά.",
"ExceptionWidgetNotFound": "Το ζητοÏμενο γÏαφικό συστατικό δεν υπάÏχει.",
"ExceptionReportNotEnabled": "Η ζητοÏμενη αναφοÏά δεν είναι ενεÏγή. Αυτό συνήθως σημαίνει ότι είτε το Ï€Ïόσθετο που οÏίζει την αναφοÏά είναι ανενεÏγό είτε δεν Îχετε την απαιτοÏμενη Ï€Ïόσβαση για να την δείτε.",
@@ -212,7 +213,7 @@
"Logout": "ΑποσÏνδεση",
"MainMetrics": "ΒασικÎÏ‚ μετÏήσεις",
"Matches": "ΤαιÏιάζει",
- "MediumToHighTrafficItIsRecommendedTo": "Για μεσαίας ή μεγάλης επισκεψιμότητας ιστοσελίδες, Ï€Ïοτείνεται η δημιουÏγία των αναφοÏών για σήμεÏα να γίνεται το Ï€Î¿Î»Ï ÎºÎ¬Î¸Îµ μισή ÏŽÏα (%s δευτεÏόλεπτα) ή κάθε ÏŽÏα (%s δευτεÏόλεπτα).",
+ "MediumToHighTrafficItIsRecommendedTo": "Για ιστοτόπους μÎσης με υψηλής επισκεψιμότητας, Ï€Ïοτείνουμε να γίνεται επεξεÏγασία των αναφοÏών για την Ï„ÏÎχουσα μÎÏα το Ï€Î¿Î»Ï ÎºÎ¬Î¸Îµ μισή ÏŽÏα (%1$s δευτεÏόλεπτα) ή κάθε ÏŽÏα (%2$s δευτεÏόλεπτα).",
"Metadata": "ΜεταδεδομÎνα",
"Metric": "ÎœÎÏ„Ïηση",
"Metrics": "ΜετÏήσεις",
@@ -230,6 +231,7 @@
"Name": "Ονομασία",
"NbActions": "ΑÏιθμός ΔÏαστηÏιοτήτων",
"NbSearches": "ΑÏιθμός ΕσωτεÏικών Αναζητήσεων",
+ "NeedMoreHelp": "ΧÏειάζεστε βοήθεια;",
"Never": "ΠοτÎ",
"NewReportsWillBeProcessedByCron": "Αν η αÏχειοθÎτηση δεν ενεÏγοποιείται από τον φυλλομετÏητή, οι νÎες αναφοÏÎÏ‚ θα Ï€ÏοωθοÏνται από το crontab.",
"NewUpdatePiwikX": "ÎÎα ΕνημÎÏωση: Piwik %s",
@@ -269,7 +271,7 @@
"OptionalSmtpPort": "Î ÏοαιÏετικό: Η 25 είναι η Ï€ÏοεπιλεγμÎνη θÏÏα για μη κÏυπτογÏαφημÎνο και TLS SMTP. Η 465 για SSL SMTP.",
"Options": "ΕπιλογÎÏ‚",
"Or": "ή",
- "OrCancel": "ή %s ΆκυÏο %s",
+ "OrCancel": "ή %1$s ΆκυÏο %2$s",
"Others": "Άλλα",
"Outlink": "ΕξωτεÏικός σÏνδεσμος",
"Outlinks": "ΕξωτεÏικοί σÏνδεσμοι",
@@ -277,9 +279,9 @@
"OverlayRowActionTooltipTitle": "Άνοιγμα ΥπεÏκάλυψης Σελίδας",
"Overview": "Συνολική εικόνα",
"Pages": "Σελίδες",
- "Pagination": "%s - %s από %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Η παÏάμετÏος %s Ï€ÏÎπει να είναι ακÎÏαιος Î¼ÎµÏ„Î±Î¾Ï %s και %s.",
+ "Pagination": "%1$s - %2$s από %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Η παÏάμετÏος %1$s Ï€ÏÎπει να είναι ακÎÏαιος αÏιθμός Î¼ÎµÏ„Î±Î¾Ï %2$s και %3$s.",
"Password": "Κωδικός",
"Period": "ΠεÏίοδος",
"Piechart": "ΔιάγÏαμμα πίτας",
@@ -331,7 +333,7 @@
"Clear": "ΚαθαÏισμός",
"SearchNoResults": "Δεν υπάÏχουν αποτελÎσματα.",
"SeeAll": "δείτε τα όλα",
- "SeeTheOfficialDocumentationForMoreInformation": "Δείτε την %sεπίσημη τεκμηÏίωση%s για πεÏισσότεÏες πληÏοφοÏίες.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Δείτε την %1$sεπίσημη τεκμηÏίωση%2$s για πεÏισσότεÏες πληÏοφοÏίες.",
"SeeThisFaq": "Δείτε %1$sτις συχνÎÏ‚ εÏωτήσεις-απαντήσεις%2$s.",
"Segment": "Τμήμα",
"SelectYesIfYouWantToSendEmailsViaServer": "ΕπιλÎξτε «Îαι», αν θÎλετε να αποστείλετε την ηλεκτÏονική επιστολή μÎσω ενός ονοματισμÎνου διακομιστή αντί της τοπικής συνάÏτησης αλληλογÏαφίας",
@@ -358,7 +360,7 @@
"Total": "ΣÏνολο",
"TotalRatioTooltip": "Αυτό είναι το %1$s από όλες τις %2$s %3$s.",
"TotalRevenue": "Συνολική Î Ïόσοδος",
- "TotalVisitsPageviewsActionsRevenue": "(ΣÏνολα: %s επισκÎψεις, %s Ï€ÏοβολÎÏ‚ σελίδων, %s ενÎÏγειες, %s κÎÏδος)",
+ "TotalVisitsPageviewsActionsRevenue": "(Συνολικά: %1$s επισκÎψεις, %2$s αναγνώσεις σελίδων, %3$s ενÎÏγειες, %4$s κÎÏδος)",
"TrackingScopeAction": "ΕνÎÏγεια",
"TrackingScopePage": "Σελίδα",
"TrackingScopeVisit": "Επίσκεψη",
@@ -395,8 +397,8 @@
"WarningFileIntegrityNoManifest": "Ο Îλεγχος ακεÏαιότητας αÏχείου δεν μποÏεί να Ï€Ïαγματοποιηθεί επειδή λείπει το αÏχείο manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "Αν παίÏνετε το Piwik από το Git, το μήνυμα αυτό είναι φυσιολογικό.",
"WarningFileIntegrityNoMd5file": "Ο Îλεγχος ακεÏαιότητας αÏχείου δεν μποÏεί να ολοκληÏωθεί γιατί είναι ανενεÏγή η συνάÏτηση md5_file().",
- "WarningPasswordStored": "%sÎ Ïοειδοποίηση:%s Αυτός ο κωδικός Ï€Ïόσβασης θα αποθηκευτεί στο αÏχείο Ïυθμίσεων και θα είναι οÏατός από οποιονδήποτε Îχει Ï€Ïόσβαση σε αυτό.",
- "WarningDebugOnDemandEnabled": "Η κατάσταση ΠαÏακολοÏθησης %s είναι ενεÏγή. Για λόγους ασφαλείας, θα Ï€ÏÎπει να ενεÏγοποιείται μόνο για συγκεκÏιμÎνο χÏονικό διάστημα. Για να την απενεÏγοποιήσετε, οÏίστε το %s σε %s στο %s",
+ "WarningPasswordStored": "%1$sÎ Ïοσοχή:%2$s Αυτό το συνθηματικό θα αποθηκευτεί στο αÏχείο Ïυθμίσεων και θα είναι οÏατό από οποιονδήποτε Îχει Ï€Ïόσβαση σε αυτό.",
+ "WarningDebugOnDemandEnabled": "Η κατάσταση ΠαÏακολοÏθησης %1$s είναι ενεÏγοποιημÎνη. Για λόγους ασφάλειας, θα Ï€ÏÎπει να είναι ενεÏγοποιημÎνη μόνο για σÏντομο χÏονικό διάστημα. Για να την απενεÏγοποιήσετε θÎσετε το %2$s σε %3$s στο %4$s",
"Website": "Ιστοσελίδα",
"Weekly": "Εβδομαδιαίως",
"WeeklyReport": "εβδομαδιαία",
@@ -450,7 +452,7 @@
"MultiChartLabel": "Î Ïοβολή μικÏοδιαγÏαμμάτων",
"NavigationBack": "Πίσω",
"NetworkError": "Σφάλμα δικτÏου",
- "NetworkErrorWithStatusCode": "ΣυνÎβη Îνα σφάλμα \"%s\". Το αίτημα επÎστÏεψε την κατάσταση \"%s\". Η διεÏθυνση URL ήταν \"%s\". ΠαÏακαλοÏμε ελÎγξτε τη διεÏθυνση URL σας και τα αÏχεία καταγÏαφής των σφαλμάτων σε αυτόν τον εξυπηÏετητή για πεÏισσότεÏες πληÏοφοÏίες σχετικά με το σφάλμα και πώς να το λÏσετε.",
+ "NetworkErrorWithStatusCode": "ΥπήÏξε Îνα σφάλμα \"%1$s\". Η αίτηση επÎστÏεψε την κατάσταση \"%2$s\". Η διεÏθυνση URL ήταν \"%3$s\". ΠαÏακαλώ ελÎγξτε το URL που εισαγάγατε και το ημεÏολόγιο σφαλμάτων στον διακομιστή για πεÏισσότεÏες πληÏοφοÏίες σχετικά με το σφάλμα και πως να το διοÏθώσετε.",
"NetworkErrorWithStatusCodeShort": "Σφάλμα δικτÏου %s",
"NetworkNotReachable": "Το δίκτυο δεν είναι Ï€Ïοσβάσιμο",
"NoAccountIsSelected": "Î ÏÎπει να επιλÎξετε Îνα λογαÏιασμό. Î ÏοσθÎστε Îνα νÎο λογαÏιασμό αν δεν Îχετε ήδη Ïυθμίσει κάποιον.",
@@ -468,7 +470,7 @@
"RatingDontRemindMe": "ΧωÏίς υπενθÏμιση",
"RatingNotNow": "Όχι Ï„ÏŽÏα",
"RatingNow": "Εντάξει, θα το βαθμολογήσω Ï„ÏŽÏα",
- "RatingPleaseRateUs": "Η εφαÏμογή του Piwik για κινητά είναι ΕλεÏθεÏο Λογισμικό. Θα το εκτιμοÏσαμε αν είχατε 1 λεπτό για να αξιολογήσετε την εφαÏμογή στο %s. Αν Îχετε Ï€Ïοτάσεις για νÎα χαÏακτηÏιστικά ή αναφοÏÎÏ‚ για σφάλματα, επικοινωνήστε στο %s",
+ "RatingPleaseRateUs": "Το Piwik Mobile App είναι ΕλεÏθεÏο Λογισμικό, θα το εκτιμοÏσαμε ιδιαίτεÏα αν δίνατε 1 λεπτό για να βαθμολογήσετε την εφαÏμογή στο %1$s. Αν Îχετε τυχόν Ï€Ïοτάσεις ή θÎλετε να αναφÎÏετε σφάλματα, ελάτε σε επικοινωνία με %2$s",
"ReleaseToRefresh": "ΑπελευθεÏώστε το για ανανÎωση...",
"Reloading": "ΕπαναφόÏτωση...",
"RequestTimedOutShort": "Σφάλμα Λήξης ΧÏόνου ΔικτÏου",
@@ -493,7 +495,7 @@
"CompareRows": "ΣÏγκÏιση εγγÏαφών",
"ComparingRecords": "ΣÏγκÏιση %s εγγÏαφών",
"Documentation": "Πατήστε στις μετÏήσεις για να τις Ï€Ïοβάλετε στο μεγάλο διάγÏαμμα. Πατήστε Shift+κλικ για Ï€Ïοβολή πολλαπλών μετÏήσεων ταυτόχÏονα.",
- "MetricBetweenText": "Î¼ÎµÏ„Î±Î¾Ï %s και %s",
+ "MetricBetweenText": "από %1$s σε %2$s",
"MetricChangeText": "%s μετά την πεÏίοδο",
"MetricMinMax": "Το %1$s σε εÏÏος Î¼ÎµÏ„Î±Î¾Ï Ï„Î¿Ï… %2$s και %3$s μÎσα σε πεÏίοδο",
"MetricsFor": "ΜετÏήσεις για %s",
diff --git a/lang/en.json b/lang/en.json
index 6581f7fc47ced6ff023125fe05f24403a2f3d4f8..810c4bc81b49269f7a53a5140cbaa21e5f828f9c 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -15,7 +15,7 @@
"API": "API",
"Apply": "Apply",
"ArchivingInlineHelp": "For medium to high traffic websites, it is recommended to disable Piwik archiving to trigger from the browser. Instead, we recommend that you setup a cron job to process Piwik reports every hour.",
- "ArchivingTriggerDescription": "Recommended for larger Piwik installs, you need to %ssetup a cron job%s to process the reports automatically.",
+ "ArchivingTriggerDescription": "Recommended for larger Piwik installs, you need to %1$ssetup a cron job%2$s to process the reports automatically.",
"AuthenticationMethodSmtp": "Authentication method for SMTP",
"AverageOrderValue": "Average Order Value",
"AveragePrice": "Average Price",
@@ -27,10 +27,9 @@
"CannotUnzipFile": "Cannot unzip file %1$s: %2$s",
"ChangePassword": "Change password",
"ChangeTagCloudView": "Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.",
- "ChooseDate": "Choose date",
+ "ChooseDate": "Choose date, currently selected date is: %s",
"ChooseLanguage": "Choose language",
"ChoosePeriod": "Choose period",
- "ChooseWebsite": "Choose website",
"ClickHere": "Click here for more information.",
"ClickToChangePeriod": "Click again to change the period.",
"Close": "Close",
@@ -84,9 +83,11 @@
"ColumnViewedAfterSearchDocumentation": "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.",
"ColumnVisitDuration": "Visit Duration (in seconds)",
"ColumnVisitsWithConversions": "Visits with Conversions",
- "ConfigFileIsNotWritable": "The Piwik configuration file %s is not writable, some of your changes might not be saved. %s Please change permissions of the config file to make it writable.",
+ "ConfigFileIsNotWritable": "The Piwik configuration file %1$s is not writable, some of your changes might not be saved. %2$s Please change permissions of the config file to make it writable.",
"Continue": "Continue",
"ContinueToPiwik": "Continue to Piwik",
+ "CurrentlyUsingUnsecureHttp": "You are currently using Piwik over unsecure HTTP, which can be risky. We recommend you set up Piwik to use SSL (HTTPS) for improved security.",
+ "CreatedByUser": "created by %s",
"CurrentMonth": "Current Month",
"CurrentWeek": "Current Week",
"CurrentYear": "Current Year",
@@ -100,7 +101,7 @@
"Date": "Date",
"DateRange": "Date range:",
"DateRangeFrom": "From",
- "DateRangeFromTo": "From %s to %s",
+ "DateRangeFromTo": "From %1$s to %2$s",
"DateRangeInPeriodList": "date range",
"DateRangeTo": "To",
"DaysHours": "%1$s days %2$s hours",
@@ -133,30 +134,30 @@
"Edit": "Edit",
"EncryptedSmtpTransport": "Enter the transport layer encryption required by your SMTP server.",
"Error": "Error",
- "ErrorRequest": "Oops\u2026 there was a problem during the request. Maybe the server had a temporary issue, or maybe you requested a report with too much data. Please try again. If this error occurs repeatedly please %scontact your Piwik administrator%s for assistance.",
+ "ErrorRequest": "Oops… there was a problem during the request. Maybe the server had a temporary issue, or maybe you requested a report with too much data. Please try again. If this error occurs repeatedly please %1$scontact your Piwik administrator%2$s for assistance.",
"EvolutionOverPeriod": "Evolution over the period",
"EvolutionSummaryGeneric": "%1$s in %2$s compared to %3$s in %4$s. Evolution: %5$s",
- "ExceptionContactSupportGeneric": "If you still have this issue please %scontact your Piwik administrator%s for assistance. ",
+ "ExceptionContactSupportGeneric": "If you still have this issue please %1$scontact your Piwik administrator%2$s for assistance. ",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "The user has to be either a Super User or the user '%s' itself.",
"ExceptionConfigurationFileNotFound": "The configuration file {%s} has not been found or could not be read.",
- "ExceptionConfigurationFileNotFound2": "If the file exists, please check that %s is readable by the user '%s'.",
+ "ExceptionConfigurationFileNotFound2": "If the file exists, please check that %1$s is readable by the user '%2$s'.",
"ExceptionDatabaseVersion": "Your %1$s version is %2$s but Piwik requires at least %3$s.",
"ExceptionDatabaseVersionNewerThanCodebase": "Your Piwik codebase is running the old version %1$s and we have detected that your Piwik Database has already been upgraded to the newer version %2$s.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "Maybe your Piwik administrators are currently finishing the upgrade process. Please try again in a few minutes.",
"ExceptionFileIntegrity": "Integrity check failed: %s",
"ExceptionFilesizeMismatch": "File size mismatch: %1$s (expected length: %2$s, found: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Your %1$s client version is %2$s which is incompatible with server version %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Aggregate reports format '%s' not valid. Try any of the following instead: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Aggregate reports format '%1$s' not valid. Try any of the following instead: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Today archive time to live must be a number of seconds greater than zero",
- "ExceptionInvalidDateFormat": "Date format must be: %s or any keyword supported by the %s function (see %s for more information)",
- "ExceptionInvalidDateRange": "The date '%s' is not a correct date range. It should have the following format: %s.",
- "ExceptionInvalidPeriod": "The period '%s' is not supported. Try any of the following instead: %s",
- "ExceptionInvalidRendererFormat": "Renderer format '%s' not valid. Try any of the following instead: %s.",
- "ExceptionInvalidReportRendererFormat": "Report format '%s' not valid. Try any of the following instead: %s.",
- "ExceptionInvalidStaticGraphType": "Static graph type '%s' not valid. Try any of the following instead: %s.",
+ "ExceptionInvalidDateFormat": "Date format must be: %1$s or any keyword supported by the %2$s function (see %3$s for more information)",
+ "ExceptionInvalidDateRange": "The date '%1$s' is not a correct date range. It should have the following format: %2$s.",
+ "ExceptionInvalidPeriod": "The period '%1$s' is not supported. Try any of the following instead: %2$s",
+ "ExceptionInvalidRendererFormat": "Renderer format '%1$s' not valid. Try any of the following instead: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Report format '%1$s' not valid. Try any of the following instead: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Static graph type '%1$s' not valid. Try any of the following instead: %2$s.",
"ExceptionInvalidToken": "Token is not valid.",
"ExceptionLanguageFileNotFound": "Language file '%s' not found.",
- "ExceptionMethodNotFound": "The method '%s' does not exist or is not available in the module '%s'.",
+ "ExceptionMethodNotFound": "The method '%1$s' does not exist or is not available in the module '%2$s'.",
"ExceptionMissingFile": "Missing file: %s",
"ExceptionNonceMismatch": "Could not verify the security token on this form.",
"ExceptionPrivilege": "You can't access this resource as it requires a %s access.",
@@ -164,7 +165,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "You can't access this resource as it requires an %s access for at least one website.",
"ExceptionUnableToStartSession": "Unable to start session.",
"ExceptionUndeletableFile": "Unable to delete %s",
- "ExceptionUnreadableFileDisabledMethod": "The configuration file {%s} could not be read. Your host may have disabled %s.",
+ "ExceptionUnreadableFileDisabledMethod": "The configuration file {%1$s} could not be read. Your host may have disabled %2$s.",
"ExceptionReportNotFound": "The requested report does not exist.",
"ExceptionWidgetNotFound": "The requested widget does not exist.",
"ExceptionReportNotEnabled": "The requested report is not enabled. This means usually either the plugin that defines the report is deactivated or you do not have enough permission to access this report.",
@@ -213,7 +214,7 @@
"Logout": "Sign out",
"MainMetrics": "Main metrics",
"Matches": "Matches",
- "MediumToHighTrafficItIsRecommendedTo": "For medium to high traffic websites, we recommend to process reports for today at most every half hour (%s seconds) or every hour (%s seconds).",
+ "MediumToHighTrafficItIsRecommendedTo": "For medium to high traffic websites, we recommend to process reports for today at most every half hour (%1$s seconds) or every hour (%2$s seconds).",
"Metadata": "Metadata",
"Metric": "Metric",
"Metrics": "Metrics",
@@ -231,6 +232,7 @@
"Name": "Name",
"NbActions": "Number of Actions",
"NbSearches": "Number of Internal Searches",
+ "NeedMoreHelp": "Need more help?",
"Never": "Never",
"NewReportsWillBeProcessedByCron": "When Piwik archiving is not triggered by the browser, new reports will be processed by the crontab.",
"NewUpdatePiwikX": "New Update: Piwik %s",
@@ -270,7 +272,7 @@
"OptionalSmtpPort": "Optional. Defaults to 25 for unencrypted and TLS SMTP, and 465 for SSL SMTP.",
"Options": "Options",
"Or": "or",
- "OrCancel": "or %s Cancel %s",
+ "OrCancel": "or %1$s Cancel %2$s",
"Others": "Others",
"Outlink": "Outlink",
"Outlinks": "Outlinks",
@@ -278,9 +280,9 @@
"OverlayRowActionTooltipTitle": "Open Page Overlay",
"Overview": "Overview",
"Pages": "Pages",
- "Pagination": "%s - %s of %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Parameter %s must be an integer value between %s and %s.",
+ "Pagination": "%1$s - %2$s of %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Parameter %1$s must be an integer value between %2$s and %3$s.",
"Password": "Password",
"Period": "Period",
"Piechart": "Piechart",
@@ -332,7 +334,7 @@
"Clear": "Clear",
"SearchNoResults": "No results",
"SeeAll": "see all",
- "SeeTheOfficialDocumentationForMoreInformation": "See the %sofficial documentation%s for more information.",
+ "SeeTheOfficialDocumentationForMoreInformation": "See the %1$sofficial documentation%2$s for more information.",
"SeeThisFaq": "See %1$sthis faq%2$s.",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Select \"Yes\" if you want or have to send e-mail via a named server instead of the local mail function",
@@ -359,7 +361,7 @@
"Total": "Total",
"TotalRatioTooltip": "This is %1$s of all %2$s %3$s.",
"TotalRevenue": "Total Revenue",
- "TotalVisitsPageviewsActionsRevenue": "(Total: %s visits, %s pageviews, %s actions, %s revenue)",
+ "TotalVisitsPageviewsActionsRevenue": "(Total: %1$s visits, %2$s pageviews, %3$s actions, %4$s revenue)",
"TrackingScopeAction": "Action",
"TrackingScopePage": "Page",
"TrackingScopeVisit": "Visit",
@@ -396,8 +398,8 @@
"WarningFileIntegrityNoManifest": "File integrity check could not be performed due to missing manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "If you are deploying Piwik from Git, this message is normal.",
"WarningFileIntegrityNoMd5file": "File integrity check could not be completed due to missing md5_file() function.",
- "WarningPasswordStored": "%sWarning:%s This password will be stored in the config file visible to everybody who can access it.",
- "WarningDebugOnDemandEnabled": "Tracker %s mode is enabled. For security reasons this should be enabled only for a short time frame. To disable it set %s to %s in %s",
+ "WarningPasswordStored": "%1$sWarning:%2$s This password will be stored in the config file visible to everybody who can access it.",
+ "WarningDebugOnDemandEnabled": "Tracker %1$s mode is enabled. For security reasons this should be enabled only for a short time frame. To disable it set %2$s to %3$s in %4$s",
"Website": "Website",
"Weekly": "Weekly",
"WeeklyReport": "weekly",
@@ -451,7 +453,7 @@
"MultiChartLabel": "Display sparklines",
"NavigationBack": "Back",
"NetworkError": "Network Error",
- "NetworkErrorWithStatusCode": "There was an error \"%s\". The request returned the status \"%s\". URL was \"%s\". Please check your entered URL and the error logs on this server for more information about the error and how to resolve it.",
+ "NetworkErrorWithStatusCode": "There was an error \"%1$s\". The request returned the status \"%2$s\". URL was \"%3$s\". Please check your entered URL and the error logs on this server for more information about the error and how to resolve it.",
"NetworkErrorWithStatusCodeShort": "Network Error %s",
"NetworkNotReachable": "Network not reachable",
"NoAccountIsSelected": "You have to select an account. Add a new account if you haven't configured one.",
@@ -469,7 +471,7 @@
"RatingDontRemindMe": "Don't remind me",
"RatingNotNow": "Not now",
"RatingNow": "OK, I'll rate it now",
- "RatingPleaseRateUs": "Piwik Mobile App is a Free Software, we would really appreciate if you took 1 minute to rate the app in the %s. If you have suggestions of new features or bug reports, please contact %s",
+ "RatingPleaseRateUs": "Piwik Mobile App is a Free Software, we would really appreciate if you took 1 minute to rate the app in the %1$s. If you have suggestions of new features or bug reports, please contact %2$s",
"ReleaseToRefresh": "Release to refresh...",
"Reloading": "Reloading...",
"RequestTimedOutShort": "Network Timeout Error",
@@ -494,7 +496,7 @@
"CompareRows": "Compare records",
"ComparingRecords": "Comparing %s rows",
"Documentation": "Click the metrics to display them in the large evolution graph. Use shift-click to display multiple metrics at once.",
- "MetricBetweenText": "from %s to %s",
+ "MetricBetweenText": "from %1$s to %2$s",
"MetricChangeText": "%s change over the period",
"MetricMinMax": "%1$s ranged between %2$s and %3$s over the period",
"MetricsFor": "Metrics for %s",
diff --git a/lang/es.json b/lang/es.json
index 5c2a97a67d1a2cc1cc51c7e720aba766d2b8c2f4..787397776f3c0ec0506f6ace423793a850b7ad9f 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -12,7 +12,7 @@
"And": "y",
"API": "API",
"ArchivingInlineHelp": "Para sitios de internet de medio o alto tráfico, se recomienda deshabilitar el archivado de Piwik al ingresar con el navegador. En su lugar, le recomendamos que configure una tarea cron para procesar los informes de Piwik cada hora.",
- "ArchivingTriggerDescription": "Recomendado para grandes instalaciones de Piwik, necesita %sconfigurar una tarea de cron %s para procesar los reportes automáticamente.",
+ "ArchivingTriggerDescription": "Recomendado para grandes instalaciones de Piwik, necesita %1$sconfigurar una tarea de cron %2$s para procesar los reportes automáticamente.",
"AuthenticationMethodSmtp": "Método de autenticación SMTP",
"AverageOrderValue": "Valor promedio por pedido",
"AveragePrice": "Precio promedio",
@@ -24,10 +24,8 @@
"CannotUnzipFile": "No se puede descomprimir el archivo %1$s: %2$s",
"ChangePassword": "Cambiar contraseña",
"ChangeTagCloudView": "Por favor tenga en cuenta que puede ver el reporte de otros modos que no sean una nube de etiquetas. Use los controles al final del informe para hacerlo.",
- "ChooseDate": "Elija una fecha",
"ChooseLanguage": "Elegir idioma",
"ChoosePeriod": "Elegir periodo",
- "ChooseWebsite": "Elegir sitio de internet",
"ClickHere": "Haga clic aquà para más información.",
"ClickToChangePeriod": "Clic nuevamente para modificar el perÃodo.",
"Close": "Cerrar",
@@ -81,7 +79,7 @@
"ColumnViewedAfterSearchDocumentation": "El número de veces que esta página fue visitada después que un visitante hizo una búsqueda en su sitio, he hizo clic en esta página en los resultados de la búsqueda.",
"ColumnVisitDuration": "Duración de la visita (en segundos)",
"ColumnVisitsWithConversions": "Visitas con conversiones",
- "ConfigFileIsNotWritable": "El archivo de configuración de Piwik %s no tiene permisos de escritura, algunos de los cambios no se guardarán. %s Por favor, cambie los permisos del archivo de configuración para que sea modificable.",
+ "ConfigFileIsNotWritable": "El archivo de configuración de Piwik %1$s no tiene permisos de escritura, algunos de los cambios no se guardarán. %2$s Por favor, cambie los permisos del archivo de configuración para que sea modificable.",
"Continue": "Continuar",
"ContinueToPiwik": "Ir a Piwik",
"CurrentMonth": "Mes actual",
@@ -97,7 +95,7 @@
"Date": "Fecha",
"DateRange": "Rango de fecha:",
"DateRangeFrom": "Desde",
- "DateRangeFromTo": "Desde %s a %s",
+ "DateRangeFromTo": "Desde %1$s a %2$s",
"DateRangeTo": "A",
"DaysHours": "%1$s dÃas %2$s horas",
"DaysSinceFirstVisit": "DÃas desde la primera visita",
@@ -129,30 +127,30 @@
"Edit": "Editar",
"EncryptedSmtpTransport": "Ingrese el tipo de encriptación de su servidor SMTP.",
"Error": "Error",
- "ErrorRequest": "Oops... hubo un problema durante la petición. Tal vez el servidor tuvo un problema temporal, o tal vez pidió un informe con demasiada información. Por favor vuelva a intentarlo. Si el error ocurre repetidamente, %scontáctese con su administrador Piwik%s para ayudarlo.",
+ "ErrorRequest": "Oops... hubo un problema durante la petición. Tal vez el servidor tuvo un problema temporal, o tal vez pidió un informe con demasiada información. Por favor vuelva a intentarlo. Si el error ocurre repetidamente, %1$scontáctese con su administrador Piwik%2$s para ayudarlo.",
"EvolutionOverPeriod": "Evolución en el periodo",
"EvolutionSummaryGeneric": "%1$s en %2$s comparado con %3$s en %4$s. Evolución: %5$s",
- "ExceptionContactSupportGeneric": "Si todavÃa tienes este problema, por favor %scontáctese con su administrador Piwik%s en busca de ayuda.",
+ "ExceptionContactSupportGeneric": "Si todavÃa tienes este problema, por favor %1$scontáctese con su administrador Piwik%2$s en busca de ayuda.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Este usuario debe ser Super User o el mismo usuario '%s'.",
"ExceptionConfigurationFileNotFound": "El archivo de configuración {%s} no fue encontrado o no puedo ser leÃdo.",
- "ExceptionConfigurationFileNotFound2": "Si el archivo existe, por favor compruebe que %s es legible por el usuario '%s'.",
+ "ExceptionConfigurationFileNotFound2": "Si el archivo existe, por favor compruebe que %1$s es legible por el usuario '%2$s'.",
"ExceptionDatabaseVersion": "Su versión %1$s es %2$s pero Piwik requiere al menos %3$s.",
"ExceptionDatabaseVersionNewerThanCodebase": "Su código base Piwik está ejecutando una versión añeja %1$s y hemos detectado que su base de datos Piwik ya se ha actualizado a la versión más reciente %2$s.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "Tal vez sus administradores Piwik están actualmente finalizando el proceso de actualización. Por favor vuelva a intentarlo en unos minutos.",
"ExceptionFileIntegrity": "Falló la verificación de integridad: %s",
"ExceptionFilesizeMismatch": "Tamaño de archivo incorrecto: %1$s (se esperaba %2$s, se encontró: %3$s)",
"ExceptionIncompatibleClientServerVersions": "La versión de su cliente %1$s %2$s es incompatible con la versión del servidor %3$s",
- "ExceptionInvalidAggregateReportsFormat": "El formato de informes global '%s' no es válido. En su lugar, pruebe alguno de los siguientes: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "El formato de informes global '%1$s' no es válido. En su lugar, pruebe alguno de los siguientes: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "El archivo de hoy debe tener un tiempo de vida en segundos mayor a cero",
- "ExceptionInvalidDateFormat": "El formato de fecha debe ser: %s o cualquier palabra clave soportada por la función %s (vea %s para más información)",
- "ExceptionInvalidDateRange": "La fecha '%s' no es rango de fecha correcto Puede tener el siguiente formato: %s.",
- "ExceptionInvalidPeriod": "El perÃodo '%s' no es válido. Pruebe alguno de los siguientes en su lugar: %s.",
- "ExceptionInvalidRendererFormat": "Formato de renderizado '%s' no válido. Pruebe alguno de los siguientes en su lugar: %s.",
- "ExceptionInvalidReportRendererFormat": "El formato de informe '%s' no es válido. Pruebe cualquiera de los siguientes en su lugar: %s.",
- "ExceptionInvalidStaticGraphType": "El tipo de gráfico estático '%s' no es válido. Pruebe alguno de los siguientes en su lugar: %s.",
+ "ExceptionInvalidDateFormat": "El formato de fecha debe ser: %1$s o cualquier palabra clave soportada por la función %2$s (vea %3$s para más información)",
+ "ExceptionInvalidDateRange": "La fecha '%1$s' no es rango de fecha correcto Puede tener el siguiente formato: %2$s.",
+ "ExceptionInvalidPeriod": "El perÃodo '%1$s' no es válido. Pruebe alguno de los siguientes en su lugar: %2$s.",
+ "ExceptionInvalidRendererFormat": "Formato de renderizado '%1$s' no válido. Pruebe alguno de los siguientes en su lugar: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "El formato de informe '%1$s' no es válido. Pruebe cualquiera de los siguientes en su lugar: %2$s.",
+ "ExceptionInvalidStaticGraphType": "El tipo de gráfico estático '%1$s' no es válido. Pruebe alguno de los siguientes en su lugar: %2$s.",
"ExceptionInvalidToken": "Token no es válido.",
"ExceptionLanguageFileNotFound": "Archivo de idioma '%s' no encontrado.",
- "ExceptionMethodNotFound": "El método '%s' no existe o no está disponible en el módulo '%s'.",
+ "ExceptionMethodNotFound": "El método '%1$s' no existe o no está disponible en el módulo '%2$s'.",
"ExceptionMissingFile": "Archivo faltante:%s",
"ExceptionNonceMismatch": "No se puede verificar la llave de seguridad en este formulario.",
"ExceptionPrivilege": "No puede acceder a este recurso pues requiere un acceso %s .",
@@ -160,7 +158,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "No se puede acceder a este recurso, ya que requiere un %s de acceso a por lo menos un sitio de internet.",
"ExceptionUnableToStartSession": "No se pudo iniciar sesión.",
"ExceptionUndeletableFile": "No se puede borrar %s",
- "ExceptionUnreadableFileDisabledMethod": "El archivo de configuración {%s} no se pudo leer. Su host puede estar deshabilitado %s.",
+ "ExceptionUnreadableFileDisabledMethod": "El archivo de configuración {%1$s} no se pudo leer. Su host puede estar deshabilitado %2$s.",
"ExceptionReportNotFound": "El informe solicitado no existe.",
"ExceptionWidgetNotFound": "El reproductor solicitado no existe.",
"ExceptionReportNotEnabled": "El informe solicitado no está disponible. Esto significa usualmente que el complemento que confecciona el informe está desactivado o no posee los suficientes permisos para acceder a este informe.",
@@ -208,7 +206,7 @@
"Logout": "Desconectarse",
"MainMetrics": "Métricas principales",
"Matches": "Coincidencias",
- "MediumToHighTrafficItIsRecommendedTo": "Para sitios de internet de medio o alto tráfico, recomendamos procesar los informes de hoy cada media hora (%s segundos) o cada hora (%s segundos).",
+ "MediumToHighTrafficItIsRecommendedTo": "Para sitios de internet de medio o alto tráfico, recomendamos procesar los informes de hoy cada media hora (%1$s segundos) o cada hora (%2$s segundos).",
"Metadata": "Metadatos",
"Metric": "Métrica",
"Metrics": "Métricas",
@@ -262,7 +260,7 @@
"OperationNotEquals": "No Iguales",
"OptionalSmtpPort": "Opcional. Por defecto 25 para SMTP sin encriptación y TLS, y 465 para SSL SMTP",
"Options": "Opciones",
- "OrCancel": "o %s Cancelar %s",
+ "OrCancel": "o %1$s Cancelar %2$s",
"Others": "Otros",
"Outlink": "Enlace externo",
"Outlinks": "Enlaces de salida",
@@ -270,9 +268,9 @@
"OverlayRowActionTooltipTitle": "Superposición página abierta",
"Overview": "General",
"Pages": "Páginas",
- "Pagination": "%s - %s de %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "El parámetro %s debe ser un número entero entre %s y %s.",
+ "Pagination": "%1$s - %2$s de %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "El parámetro %1$s debe ser un número entero entre %2$s y %3$s.",
"Password": "Contraseña",
"Period": "Periodo",
"Piechart": "Gráfica circular",
@@ -324,7 +322,7 @@
"Clear": "Quitar",
"SearchNoResults": "Sin resultados",
"SeeAll": "mostrar todo",
- "SeeTheOfficialDocumentationForMoreInformation": "Vea la %sdocumentación oficial%s para mayor información.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Vea la %1$sdocumentación oficial%2$s para mayor información.",
"SeeThisFaq": "Vea %1$sestas preguntas frecuentes%2$s.",
"Segment": "Segmento",
"SelectYesIfYouWantToSendEmailsViaServer": "Seleccione \"Si\" si desea o tiene que enviar un correo electrónico a través de un servidor remoto en vez de la función correo local",
@@ -381,7 +379,7 @@
"WarningFileIntegrityNoManifest": "La verificación de integridad de archivos no se pudo realizar debido a que falta manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "Si está desplegando Piwik con Git, este mensaje es normal.",
"WarningFileIntegrityNoMd5file": "La verificación de integridad no pudo ser completada debido a que falta la función md5_file().",
- "WarningPasswordStored": "%sWarning:%s Esta contraseña se almacenará en el archivo de configuración visible a todo el que pueda acceder a él.",
+ "WarningPasswordStored": "%1$sWarning:%2$s Esta contraseña se almacenará en el archivo de configuración visible a todo el que pueda acceder a él.",
"Website": "Sitio de internet",
"Weekly": "Semanal",
"WeeklyReport": "semanal",
@@ -434,7 +432,7 @@
"MultiChartLabel": "Mostrar minigráficos",
"NavigationBack": "Atrás",
"NetworkError": "Error en la red",
- "NetworkErrorWithStatusCode": "Hubo un error \"%s\". El pedido retornó el estado \"%s\". La URL fue \"%s\". Por favor, revise la URL ingresada y el dato de registro de error en este servidor para una mayor información acerca del error y cómo resolverlo.",
+ "NetworkErrorWithStatusCode": "Hubo un error \"%1$s\". El pedido retornó el estado \"%2$s\". La URL fue \"%3$s\". Por favor, revise la URL ingresada y el dato de registro de error en este servidor para una mayor información acerca del error y cómo resolverlo.",
"NetworkErrorWithStatusCodeShort": "Error de red %s",
"NetworkNotReachable": "Red inaccesible",
"NoAccountIsSelected": "Tiene que seleccionar una cuenta. Agrega una nueva cuenta si no ha configurado una.",
@@ -452,7 +450,7 @@
"RatingDontRemindMe": "No recordarme",
"RatingNotNow": "Ahora no",
"RatingNow": "Está bien, lo evaluaré ahora",
- "RatingPleaseRateUs": "Piwik Mobile App es software libre, realmente apreciarÃamos que se tomara 1 minuto para evaluar la aplicación en el %s. Si posee sugerencias de nuevas caracterÃsticas o informes de error, por favor póngase en contacto con %s",
+ "RatingPleaseRateUs": "Piwik Mobile App es software libre, realmente apreciarÃamos que se tomara 1 minuto para evaluar la aplicación en el %1$s. Si posee sugerencias de nuevas caracterÃsticas o informes de error, por favor póngase en contacto con %2$s",
"ReleaseToRefresh": "Suelte para actualizar...",
"Reloading": "Recargando...",
"RequestTimedOutShort": "Error de tiempo de espera de red",
@@ -477,7 +475,7 @@
"CompareRows": "Comparar registros",
"ComparingRecords": "Comparando %s filas",
"Documentation": "Cliquee en las métricas para visualizarlas en un gráfico su evolución en el tiempo. Utilice shit-clic para visualizar múltiples métricas de una vez.",
- "MetricBetweenText": "entre %s y %s",
+ "MetricBetweenText": "entre %1$s y %2$s",
"MetricChangeText": "%s cambio sobre el perÃodo",
"MetricMinMax": "%1$s variaba entre %2$s y %3$s en el perÃodo",
"MetricsFor": "Métricas para %s",
diff --git a/lang/et.json b/lang/et.json
index 676be0c9ede92a0646b691e83c6e035dd29c75ba..c610b75d91c61d706c622f11dd62c8b7175c4d68 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -19,10 +19,8 @@
"Cancel": "Katkesta",
"CannotUnzipFile": "Ei saa lahtipakkida faili %1$s: %2$s",
"ChangePassword": "Vaheta salasõna",
- "ChooseDate": "Vali kuupäev",
"ChooseLanguage": "Vali keel",
"ChoosePeriod": "Vali periood",
- "ChooseWebsite": "Vali veebileht",
"ClickHere": "Vajuta siia lisainfo saamiseks.",
"ClickToChangePeriod": "Vajuta siia perioodi muutmiseks.",
"Close": "Sulge",
@@ -73,7 +71,7 @@
"Date": "Kuupäev",
"DateRange": "Kuupäeva vahemik:",
"DateRangeFrom": "Alates",
- "DateRangeFromTo": "Alates %s kuni %s",
+ "DateRangeFromTo": "Alates %1$s kuni %2$s",
"DateRangeTo": "Kuni",
"DaysHours": "%1$s päeva %2$s tundi",
"DaysSinceFirstVisit": "Päevi esmasest külastusest",
@@ -190,7 +188,7 @@
"OperationNotEquals": "Ei võrdu",
"OptionalSmtpPort": "Valikuline. Vaikimisi 25 kaitsmata ja TLS ning 465 krüpteeritud SSL SMTP jaoks.",
"Options": "Valikud",
- "OrCancel": "või %s Katkesta %s",
+ "OrCancel": "või %1$s Katkesta %2$s",
"Others": "Teised",
"Outlink": "Väljuv link",
"Outlinks": "Väljuvad lingid",
@@ -346,7 +344,7 @@
"AvailableMetrics": "Saadaolevad mõõdikud",
"CompareRows": "Võrdle tulemusi",
"ComparingRecords": "Võrdlen %s rida",
- "MetricBetweenText": "alates %s kuni %s",
+ "MetricBetweenText": "alates %1$s kuni %2$s",
"MetricChangeText": "%s muutus perioodi jooksul",
"MetricMinMax": "%1$s varieerus perioodil %2$s ja %3$s vahel",
"MetricsFor": "%s mõõdikud",
diff --git a/lang/eu.json b/lang/eu.json
index 9991094d534b39d70959afbbeda69e3e318ca354..486c1c191f78437760f771f868d73869fc5b87af 100644
--- a/lang/eu.json
+++ b/lang/eu.json
@@ -10,7 +10,6 @@
"ChangePassword": "Aldatu pasahitza",
"ChooseLanguage": "Aukeratu hizkuntza",
"ChoosePeriod": "Aukeratu aldia",
- "ChooseWebsite": "Aukeratu webgunea",
"Close": "Itxi",
"ColumnActionsPerVisit": "Ekintzak bisitako",
"ColumnAverageTimeOnPage": "B.b.ko denbora orrialdean",
@@ -63,7 +62,7 @@
"ExceptionFileIntegrity": "Osotasun egiaztapenak huts egin du: %s",
"ExceptionFilesizeMismatch": "Fitxategien tamainak ez datoz bat: %1$s (esperotako luzera: %2$s, aurkitua: %3$s)",
"ExceptionInvalidToken": "Tokena baliogabea da.",
- "ExceptionMethodNotFound": "'%s' metodoa ez dago edo ez dago eskura '%s' moduluan.",
+ "ExceptionMethodNotFound": "'%1$s' metodoa ez dago edo ez dago eskura '%2$s' moduluan.",
"ExceptionMissingFile": "Fitxategia falta da: %s",
"ExceptionNonceMismatch": "Ezin da segurtasun-tokena egiaztatu inprimaki honetan.",
"ExceptionUndeletableFile": "Ezin da %s ezabatu",
@@ -99,7 +98,7 @@
"OnlyEnterIfRequired": "Idatzi erabiltzaile-izena soilik zure SMTP zerbitzariak behar badu",
"OnlyEnterIfRequiredPassword": "Idatzi pasahitza soilik zure SMTP zerbitzariak behar badu",
"OpenSourceWebAnalytics": "Kode irekiko web analitikak",
- "OrCancel": "edo %s utzi %s",
+ "OrCancel": "edo %1$s utzi %2$s",
"Others": "Besteak",
"Outlinks": "Kanpo-loturak",
"Overview": "Orokorra",
diff --git a/lang/fa.json b/lang/fa.json
index 771c5133266dcb715c79a3c430edb6d1c3aa3f84..f3761b143e78df48fa35f49b2e3434dc607bb7ff 100644
--- a/lang/fa.json
+++ b/lang/fa.json
@@ -13,7 +13,7 @@
"API": "API",
"Apply": "بکارگیری",
"ArchivingInlineHelp": "توصیه می‌شود برای وبسایت‌های با تراÙیک متوسط یا بالا گزینه آرشیو پیویک از مرورگر غیر Ùعال شود. بجای آن توصیه می‌کنیم تا یک cron job برای پردازش گزارش‌ها هر یک ساعت راه‌اندازی شود.",
- "ArchivingTriggerDescription": "شما به %sراه‌اندازی یک cron job%s برای پردازش خودکار گزارش‌ها نیاز دارید.",
+ "ArchivingTriggerDescription": "شما به %1$sراه‌اندازی یک cron job%2$s برای پردازش خودکار گزارش‌ها نیاز دارید.",
"AuthenticationMethodSmtp": "روش تایید هویت برای SMTP",
"AverageOrderValue": "ارزش ترتیبی متوسط",
"AveragePrice": "قیمت متوسط",
@@ -25,10 +25,8 @@
"CannotUnzipFile": "Ùایل %1$s: %2$s نمی تواند از Øالت Ùشرده خارج شود",
"ChangePassword": "تغییر کلمه عبور",
"ChangeTagCloudView": "لطÙا توجه داشته باشید Ú©Ù‡ شما Ù…ÛŒ توانید این گزارش را در راه های دیگر به عنوان یک ابر برچسب مشاهده است. استÙاده از کنترل در پایین گزارش به انجام این کار است.",
- "ChooseDate": "انتخاب تاریخ",
"ChooseLanguage": "انتخاب زبان",
"ChoosePeriod": "انتخاب دوره",
- "ChooseWebsite": "انتخاب وب سایت",
"ClickHere": "برای اطلاعات بیشتر اینجا کلیک کنید",
"ClickToChangePeriod": "برای تغییر بازه دوباره کلیک کنید.",
"Close": "بستن",
@@ -95,7 +93,7 @@
"Date": "تاریخ",
"DateRange": "بازه زمانی:",
"DateRangeFrom": "از",
- "DateRangeFromTo": "از %s تا %s",
+ "DateRangeFromTo": "از %1$s تا %2$s",
"DateRangeTo": "به",
"DaysHours": "%1$s روز %2$s ساعت",
"DaysSinceFirstVisit": "روز بعد از اولین بازدید",
@@ -131,12 +129,12 @@
"ExceptionFileIntegrity": "بررسی درستی شکست خورد: %s",
"ExceptionFilesizeMismatch": "اندازه Ùایل اشتباه است: %1$s (اندازه مورد انتظار:%2$s , اندازه کنونی:%3$s)",
"ExceptionInvalidArchiveTimeToLive": "امروز هم آرشیو زندگی باید تعداد ثانیه بزرگتر از صÙر",
- "ExceptionInvalidDateFormat": "قالب تاریخ باید اینگونه باشد: %s یا هر واژه کلیدی دیگری که توسط تابع %s پشتیبانی می شود(برای اطلاعات بیشتر %s را ببینید)",
- "ExceptionInvalidPeriod": "بازه ÛŒ '%s' پشتیبانی نمی شود. یکی از این ها را استÙاده کنید: %s.",
- "ExceptionInvalidReportRendererFormat": "قالب گزارش '%s' معتبر نمی باشد. یکی از این ها را استÙاده کنید: %s.",
+ "ExceptionInvalidDateFormat": "قالب تاریخ باید اینگونه باشد: %1$s یا هر واژه کلیدی دیگری که توسط تابع %2$s پشتیبانی می شود(برای اطلاعات بیشتر %3$s را ببینید)",
+ "ExceptionInvalidPeriod": "بازه ÛŒ '%1$s' پشتیبانی نمی شود. یکی از این ها را استÙاده کنید: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "قالب گزارش '%1$s' معتبر نمی باشد. یکی از این ها را استÙاده کنید: %2$s.",
"ExceptionInvalidToken": "رمز معتبر نیست.",
"ExceptionLanguageFileNotFound": "Ùایل زبان '%s' یاÙت نشد",
- "ExceptionMethodNotFound": "متد'%s' وجود ندارد یا در این ماژول '%s'موجود نیست.",
+ "ExceptionMethodNotFound": "متد'%1$s' وجود ندارد یا در این ماژول '%2$s'موجود نیست.",
"ExceptionMissingFile": "Ùایل Ù…Ùقود: %s",
"ExceptionNonceMismatch": "آیا این نشانه رمز امنیتی در این Ùرم معتبر نیست.",
"ExceptionPrivilege": "شما نمی توانید به این منبع دسترسی داشته باشید زیرا این به دسترسی %s نیاز دارد.",
@@ -186,7 +184,7 @@
"Logout": "خروج",
"MainMetrics": "معیار های اصلی",
"Matches": "مسابقه ها",
- "MediumToHighTrafficItIsRecommendedTo": "برای وبسایت های با تراÙیک متوسط یا بالا , ما توصیه Ù…ÛŒ کنیم Ú©Ù‡ گزارش های هرروز را Øداکثر هر نیم ساعت (%s ثانیه) یا هر ساعت (%s ثانیه) پردازش کنید.",
+ "MediumToHighTrafficItIsRecommendedTo": "برای وبسایت های با تراÙیک متوسط یا بالا , ما توصیه Ù…ÛŒ کنیم Ú©Ù‡ گزارش های هرروز را Øداکثر هر نیم ساعت (%1$s ثانیه) یا هر ساعت (%2$s ثانیه) پردازش کنید.",
"Metadata": "متا داده",
"Metric": "معیار",
"Metrics": "معیار ها",
@@ -237,7 +235,7 @@
"OperationNotEquals": "برابر نیست",
"OptionalSmtpPort": "اختیاری است. به طور پیش Ùرض تا 25 برای تکه تکه کردن Ùˆ TLS SMTPØŒ Ùˆ SMTP SSL 465.",
"Options": "اختیارات",
- "OrCancel": "یا %s لغو %s",
+ "OrCancel": "یا %1$s لغو %2$s",
"Others": "دیگران",
"Outlink": "لینک خروجی",
"Outlinks": "لینک های خروجی",
@@ -245,7 +243,7 @@
"OverlayRowActionTooltipTitle": "گشودن نمای صÙØÙ‡",
"Overview": "بازبینی",
"Pages": "صÙØÙ‡ ها",
- "ParameterMustIntegerBetween": "پارامتر %s باید یک عدد صØÛŒØ Ø¨ÛŒÙ† %s Ùˆ %s باشد.",
+ "ParameterMustIntegerBetween": "پارامتر %1$s باید یک عدد صØÛŒØ Ø¨ÛŒÙ† %2$s Ùˆ %3$s باشد.",
"Password": "رمزعبور",
"Period": "دوره",
"Piechart": "نمودار دایره ای",
@@ -288,7 +286,7 @@
"Search": "جستجو",
"SearchNoResults": "هیچ نتیجه ای",
"SeeAll": "دیدن همه",
- "SeeTheOfficialDocumentationForMoreInformation": "برای اطلاعات بیشتر %sمستندات رسمی%s را ببینید.",
+ "SeeTheOfficialDocumentationForMoreInformation": "برای اطلاعات بیشتر %1$sمستندات رسمی%2$s را ببینید.",
"Segment": "سگمنت",
"SelectYesIfYouWantToSendEmailsViaServer": "انتخاب \"بله\" اگر شما Ù…ÛŒ خواهید Ùˆ یا مجبور به ارسال ایمیل از طریق یک سرور به جای تابع ایمیل Ù…ØÙ„ÛŒ به نام",
"Settings": "تنظيمات",
@@ -341,7 +339,7 @@
"WarningFileIntegrityNoManifest": "Ú†Ú© کردن Ùایل یکپارچگی Ù…ÛŒ تواند انجام نمی شود به دلیل از دست رÙته manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "اگر شما در Øال توسعه پیویک به Ú©Ù…Ú© Git هستید ØŒ این پیغام عادی است.",
"WarningFileIntegrityNoMd5file": "کنترل یکپارچگی Ùایل نمی تواند به دلیل md5_file Ú¯Ù… شده تابع () تکمیل شده است.",
- "WarningPasswordStored": "%sهشدار: %s این رمزعبور در Ùایل تنظیمات ذخیره خواهد شد Ú©Ù‡ قابل مشاهده برای هرکسی است Ú©Ù‡ به آن دسترسی دارد.",
+ "WarningPasswordStored": "%1$sهشدار: %2$s این رمزعبور در Ùایل تنظیمات ذخیره خواهد شد Ú©Ù‡ قابل مشاهده برای هرکسی است Ú©Ù‡ به آن دسترسی دارد.",
"Website": "وب سایت",
"Weekly": "Ù‡Ùتگی",
"WeeklyReport": "Ù‡Ùتگی",
@@ -430,7 +428,7 @@
"CompareRows": "مقایسه سوابق",
"ComparingRecords": "مقایسه %s ردیÙ",
"Documentation": "با کلیک روی معیارها در نمودار تکامل بزرگ نشان داده Ù…ÛŒ شوند. برای نشان دادن معیارهای چندگانه به صورت یکجا از SHIFT-کلیک استÙاده کنید.",
- "MetricBetweenText": "بین %s و %s",
+ "MetricBetweenText": "بین %1$s و %2$s",
"MetricChangeText": "%s تغییر در طول دوره",
"MetricMinMax": "%1$s در بازه مابین %2$s و %3$s در طول دوره",
"MetricsFor": "معیارها برای %s",
diff --git a/lang/fi.json b/lang/fi.json
index 702aced3099febdf7013a34c4ad9aa46a8df2865..eec6f7eba142911b6517e11633a06b4070e0843e 100644
--- a/lang/fi.json
+++ b/lang/fi.json
@@ -11,7 +11,7 @@
"And": "ja",
"API": "API",
"ArchivingInlineHelp": "Keskikokoisilla ja vilkkailla sivulla on suositeltavaa kieltää arkistointi selaimesta. Parempi vaihtoehto on käyttää cron-työtä arkistointiin joka tunti.",
- "ArchivingTriggerDescription": "Suositeltavaa suuremmissa Piwik-asennuksissa. Sinun täytyy %sasentaa cron-työ%s, jotta raportit käsitellään oikein.",
+ "ArchivingTriggerDescription": "Suositeltavaa suuremmissa Piwik-asennuksissa. Sinun täytyy %1$sasentaa cron-työ%2$s, jotta raportit käsitellään oikein.",
"AuthenticationMethodSmtp": "SMTP:n autentikointimenetelmä",
"AverageOrderValue": "Oston keskimääräinen arvo",
"AveragePrice": "Keskihinta",
@@ -23,10 +23,8 @@
"CannotUnzipFile": "Ei voi purkaa tiedostoa %1$s: %2$s",
"ChangePassword": "Vaihda salasana",
"ChangeTagCloudView": "Voit katsoa raporttia myös muissa muodoissa. Käytä nappuloita raportin alareunassa.",
- "ChooseDate": "Valitse päiväys",
"ChooseLanguage": "Valitse kieli",
"ChoosePeriod": "Valitse aikaväli",
- "ChooseWebsite": "Valitse verkkosivu",
"ClickHere": "Klikkaa tästä lisätietoja.",
"ClickToChangePeriod": "Vaihda aikaväliä klikkaamalla uudelleen",
"Close": "Sulje",
@@ -80,7 +78,7 @@
"ColumnViewedAfterSearchDocumentation": "Kävijöiden lukumäärä tällä sivulla, kun kävijä on tehnyt haun verkkosivullasi ja klikannut tätä sivua hakutuloksissa.",
"ColumnVisitDuration": "Käynnin kesto (sekunteja)",
"ColumnVisitsWithConversions": "Käyntejä, joissa keskusteluja",
- "ConfigFileIsNotWritable": "Piwikin asetustiedostoon %s ei voi kirjoittaa. Kaikkia muutoksia ei voi tallentaa. %s Muuta tiedoston oikeuksia niin, että kirjoittaminen on sallittua.",
+ "ConfigFileIsNotWritable": "Piwikin asetustiedostoon %1$s ei voi kirjoittaa. Kaikkia muutoksia ei voi tallentaa. %2$s Muuta tiedoston oikeuksia niin, että kirjoittaminen on sallittua.",
"Continue": "Jatka",
"ContinueToPiwik": "Jatka Piwikiin",
"CurrentMonth": "Tämä kuukausi",
@@ -96,7 +94,6 @@
"Date": "Päiväys",
"DateRange": "Aikaväli:",
"DateRangeFrom": "Alkaen",
- "DateRangeFromTo": "%s - %s",
"DateRangeTo": "Mihin",
"DaysHours": "%1$s päivää %2$s tuntia",
"DaysSinceFirstVisit": "Päiviä ensimmäisestä käynnistä",
@@ -128,10 +125,10 @@
"Edit": "Muokkaa",
"EncryptedSmtpTransport": "Valitse SMTP-palvelimen vaatima salaus.",
"Error": "Virhe",
- "ErrorRequest": "Hups, ongelma pyyntöäsi käsitellessä. Palvelimella on voinut olla tilapäinen ongelma tai ehkä pyytämäsi raportti sisälsi liikaa tietoa. Ole hyvä ja yritä uudelleen. Jos ongelma jatkuu, ole hyvä ja %sota yhteyttä Piwik ylläpitäjääsi%s avun saamiseksi.",
+ "ErrorRequest": "Hups, ongelma pyyntöäsi käsitellessä. Palvelimella on voinut olla tilapäinen ongelma tai ehkä pyytämäsi raportti sisälsi liikaa tietoa. Ole hyvä ja yritä uudelleen. Jos ongelma jatkuu, ole hyvä ja %1$sota yhteyttä Piwik ylläpitäjääsi%2$s avun saamiseksi.",
"EvolutionOverPeriod": "Muutos aikajaksolla",
"EvolutionSummaryGeneric": "%1$s %2$s:ssa verrattuna %3$s %4$s:ssa. Evoluutio: %5$s",
- "ExceptionContactSupportGeneric": "Jos ongelma jatkuu, ole hyvä ja %sota yhteyttä Piwik ylläpitääsi%s avun saamiseksi.",
+ "ExceptionContactSupportGeneric": "Jos ongelma jatkuu, ole hyvä ja %1$sota yhteyttä Piwik ylläpitääsi%2$s avun saamiseksi.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Käyttäjän täytyy olla joko Superkäyttäjä tai '%s' käyttäjä.",
"ExceptionConfigurationFileNotFound": "Asetustiedostoa {%s} ei ole.",
"ExceptionDatabaseVersion": "Ohjelman %1$s versio on %2$s mutta Piwik tarvitsee vähintään %3$s",
@@ -140,17 +137,17 @@
"ExceptionFileIntegrity": "Eheystarkistus epäonnistui: %s",
"ExceptionFilesizeMismatch": "Tiedoston koko ei täsmää: %1$s (koon pitäisi olla %2$s, oli %3$s).",
"ExceptionIncompatibleClientServerVersions": "Ohjelman %1$s asiakasohjelman versio on %2$s, joka on epäyhteensopiva palvelimen version %3$s kanssa.",
- "ExceptionInvalidAggregateReportsFormat": "Koontaraportin formaatti '%s' ei kelpaa. Kokeile jotain seuraavista: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Koontaraportin formaatti '%1$s' ei kelpaa. Kokeile jotain seuraavista: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Arkistoinnin aika täytyy ilmoittaa sekunteina ja olla suurempaa kuin nolla",
- "ExceptionInvalidDateFormat": "Aikamuodon täytyy olla %s tai mikä tahansa avainsana jota %s tukee (katso %s saadaksesi lisätietoja)",
- "ExceptionInvalidDateRange": "Päiväys '%s' ei ole hyväksyttävä. Oikea muoto on '%s'.",
- "ExceptionInvalidPeriod": "Aikaväliä '%s' ei tueta. Kokeile jotain seuraavista: %s",
- "ExceptionInvalidRendererFormat": "Muoto '%s' ei ole hyväksyttävä. Kokeile jotain seuraavista: %s.",
- "ExceptionInvalidReportRendererFormat": "Raportin formaatti '%s' on virheellinen. Yritä jotain seuraavista: %s.",
- "ExceptionInvalidStaticGraphType": "Staattisen graafin tyyppi '%s' ei kelpaa. Kokeile jotain seuraavista: %s.",
+ "ExceptionInvalidDateFormat": "Aikamuodon täytyy olla %1$s tai mikä tahansa avainsana jota %2$s tukee (katso %3$s saadaksesi lisätietoja)",
+ "ExceptionInvalidDateRange": "Päiväys '%1$s' ei ole hyväksyttävä. Oikea muoto on '%2$s'.",
+ "ExceptionInvalidPeriod": "Aikaväliä '%1$s' ei tueta. Kokeile jotain seuraavista: %2$s",
+ "ExceptionInvalidRendererFormat": "Muoto '%1$s' ei ole hyväksyttävä. Kokeile jotain seuraavista: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Raportin formaatti '%1$s' on virheellinen. Yritä jotain seuraavista: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Staattisen graafin tyyppi '%1$s' ei kelpaa. Kokeile jotain seuraavista: %2$s.",
"ExceptionInvalidToken": "Avainta ei voi hyväksyä.",
"ExceptionLanguageFileNotFound": "Kieltä %s ei löydy",
- "ExceptionMethodNotFound": "Metodia '%s' ei ole olemassa tai ei ole saatavilla moduulissa '%s'.",
+ "ExceptionMethodNotFound": "Metodia '%1$s' ei ole olemassa tai ei ole saatavilla moduulissa '%2$s'.",
"ExceptionMissingFile": "Puuttuva tiedosto: %s",
"ExceptionNonceMismatch": "Turvallisuustarkisteen varmistaminen epäonnistui.",
"ExceptionPrivilege": "Et voi käyttää resurssia, sillä tarvitset pääsyn %s.",
@@ -158,7 +155,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Et voi käyttää resurssia, koska siihen vaaditaan %s pääsy vähintään yhdelle sivulle.",
"ExceptionUnableToStartSession": "Session käynnistäminen ei onnistu.",
"ExceptionUndeletableFile": "Tiedostoa %s ei voi poistaa",
- "ExceptionUnreadableFileDisabledMethod": "Asetustiedostoa {%s} ei voi lukea. %s saattaa olla poistettuna käytöstä.",
+ "ExceptionUnreadableFileDisabledMethod": "Asetustiedostoa {%1$s} ei voi lukea. %2$s saattaa olla poistettuna käytöstä.",
"ExceptionReportNotFound": "Pyydettyä raporttia ei ole olemassa.",
"ExceptionWidgetNotFound": "Pyydettyä vimpainta ei ole olemassa.",
"ExceptionReportNotEnabled": "Pyydettyä raporttia ei ole otettu käyttöön. Tämä tarkoittaa yleensä joko, että raportin tarjoava laajennus on poistettu käytöstä tai sinulla ei ole tarpeeksi käyttöoikeuksia tähän raporttiin.",
@@ -206,7 +203,7 @@
"Logout": "Kirjaudu ulos",
"MainMetrics": "Tärkeimmät arvot",
"Matches": "Osumat",
- "MediumToHighTrafficItIsRecommendedTo": "Keskisuurille ja vilkkaille verkkosivuille on suositeltavaa käsitellä raportit enintään kerran puolessa tunnissa (%s sekuntia) tai tunnissa (%s sekuntia).",
+ "MediumToHighTrafficItIsRecommendedTo": "Keskisuurille ja vilkkaille verkkosivuille on suositeltavaa käsitellä raportit enintään kerran puolessa tunnissa (%1$s sekuntia) tai tunnissa (%2$s sekuntia).",
"Metadata": "Metatiedot",
"Metric": "Metriikka",
"Metrics": "Metriikat",
@@ -259,7 +256,7 @@
"OperationNotEquals": "Ei täsmää",
"OptionalSmtpPort": "Valinnainen. Oletus 25 salaamattomalle ja TLS:lle ja 465 SSL:lle.",
"Options": "Asetukset",
- "OrCancel": "tai %s peruuta %s",
+ "OrCancel": "tai %1$s peruuta %2$s",
"Others": "Muut",
"Outlink": "Lähtevä linkki",
"Outlinks": "Lähtevät linkit",
@@ -267,9 +264,9 @@
"OverlayRowActionTooltipTitle": "Avaa sivuleijuke",
"Overview": "Yleiskatsaus",
"Pages": "Sivut",
- "Pagination": "%s - %s %s:sta.",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Parametrin %s täytyy olla kokonaisluku väliltä %s ja %s.",
+ "Pagination": "%1$s - %2$s %3$s:sta.",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Parametrin %1$s täytyy olla kokonaisluku väliltä %2$s ja %3$s.",
"Password": "Salasana",
"Period": "Aikaväli",
"Piechart": "Ympyräkaavio",
@@ -315,7 +312,7 @@
"Clear": "Tyhjennä",
"SearchNoResults": "Ei tuloksia",
"SeeAll": "näytä kaikki",
- "SeeTheOfficialDocumentationForMoreInformation": "Löydät %svirallisesta dokumentaatiosta%s lisätietoa.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Löydät %1$svirallisesta dokumentaatiosta%2$s lisätietoa.",
"SeeThisFaq": "Katso %1$stämä vastaus%2$s.",
"Segment": "Osa",
"SelectYesIfYouWantToSendEmailsViaServer": "Valitse \"Kyllä\" jos haluat sähköpostit tietyn palvelimen kautta",
@@ -372,7 +369,7 @@
"WarningFileIntegrityNoManifest": "Tiedostojen eheystarkistusta ei voida suorittaa, tiedosto manifest.inc.php puuttuu",
"WarningFileIntegrityNoManifestDeployingFromGit": "Jos olet ottanut Piwikin käyttöön Git-järjestelmän kautta, tämä viesti on normaali.",
"WarningFileIntegrityNoMd5file": "Tiedostojen eheystarkistusta ei voi suorittaa, funktio md5_file() puuttuu.",
- "WarningPasswordStored": "%sVaroitus:%s tämä salasana tallennetaan salaamattomana asetustiedostoon. Kaikki joilla on pääsy tiedostoon näkevät salasanan.",
+ "WarningPasswordStored": "%1$sVaroitus:%2$s tämä salasana tallennetaan salaamattomana asetustiedostoon. Kaikki joilla on pääsy tiedostoon näkevät salasanan.",
"Website": "Verkkosivu",
"Weekly": "Viikoittain",
"WeeklyReport": "viikottainen",
@@ -425,7 +422,7 @@
"MultiChartLabel": "Näytä pikkukuvat",
"NavigationBack": "Takaisin",
"NetworkError": "Verkkovirhe",
- "NetworkErrorWithStatusCode": "Tapahtui virhe \"%s\". Pyyntö palautti statuksen \"%s\". URL oli \"%s\". Tarkista osoite ja virhelogit palvelimella.",
+ "NetworkErrorWithStatusCode": "Tapahtui virhe \"%1$s\". Pyyntö palautti statuksen \"%2$s\". URL oli \"%3$s\". Tarkista osoite ja virhelogit palvelimella.",
"NetworkErrorWithStatusCodeShort": "Verkkovirhe: %s",
"NetworkNotReachable": "Verkkoon ei saada yhteyttä",
"NoAccountIsSelected": "Sinun täytyy valita tili. Lisää uusi tili, jos et ole vielä määritellyt tiliä.",
@@ -443,7 +440,7 @@
"RatingDontRemindMe": "Älä muistuta uudelleen",
"RatingNotNow": "Ei nyt",
"RatingNow": "Arvostelen nyt",
- "RatingPleaseRateUs": "Piwikin mobiilisovellus on vapaa ohjelma. Arvostaisimme todella, jos voisit käyttää hetken ohjelman arvosteluun %s:ssä. Jos sinulla on parannusehdotuksia tai virheraportteja, ota yhteyttä %s",
+ "RatingPleaseRateUs": "Piwikin mobiilisovellus on vapaa ohjelma. Arvostaisimme todella, jos voisit käyttää hetken ohjelman arvosteluun %1$s:ssä. Jos sinulla on parannusehdotuksia tai virheraportteja, ota yhteyttä %2$s",
"ReleaseToRefresh": "Vapauta päivittääksesi...",
"Reloading": "Päivitetään...",
"RequestTimedOutShort": "Verkon aikakatkaisuvirhe",
@@ -468,7 +465,6 @@
"CompareRows": "Vertaile tietoja",
"ComparingRecords": "Vertaillaan %s riviä",
"Documentation": "Klikkaa metriikkaa jonka haluat nähdä isossa seurantakuvaajassa. Shift+hiiren klikkaus merkkaa useita metriikoita yhdellä kertaa.",
- "MetricBetweenText": "%s-%s",
"MetricChangeText": "%s ajanjaksolla",
"MetricMinMax": "%1$s vaihteli %2$s ja %3$s välillä ajanjakson aikana",
"MetricsFor": "Metriikka %s",
diff --git a/lang/fr.json b/lang/fr.json
index d4139d5e5f869934bfb7c1fd1ec3d01d8bee412f..ca448a47060daac5d55c125054b031387daafae7 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -15,7 +15,7 @@
"API": "API",
"Apply": "Appliquer",
"ArchivingInlineHelp": "Pour les sites à trafic moyen et fort, il est recommandé de désactiver l'archivage de Piwik depuis le navigateur. Nous vous recommandons de mettre en place une tâche planifiée (cron job) qui génère les rapports toutes les heures.",
- "ArchivingTriggerDescription": "Recommandé pour les installations importantes de Piwik, vous devriez %s mettre en place une tâche planifiée (cron) %s pour générer les rapports automatiquement.",
+ "ArchivingTriggerDescription": "Recommandé pour les installations importantes de Piwik, vous devriez %1$s mettre en place une tâche planifiée (cron) %2$s pour générer les rapports automatiquement.",
"AuthenticationMethodSmtp": "Méthode d'authentification pour le serveur SMTP",
"AverageOrderValue": "Valeur Moyenne d'une Commande",
"AveragePrice": "Prix Moyen",
@@ -27,10 +27,9 @@
"CannotUnzipFile": "Impossible de décompresser le ficher %1$s: %2$s",
"ChangePassword": "Modifier le mot de passe",
"ChangeTagCloudView": "Veuillez noter que vous pouvez visualiser le rapport sous une autre forme qu'un nuage de tags. Pour cela, utilisez les option en dessous du rapport.",
- "ChooseDate": "Sélectionnez une date",
+ "ChooseDate": "Choisissez une date, date actuellement sélectionnée : %s",
"ChooseLanguage": "Sélectionnez la langue",
"ChoosePeriod": "Sélectionnez la période",
- "ChooseWebsite": "Sélectionnez le site web",
"ClickHere": "Cliquez ici pour plus d'informations.",
"ClickToChangePeriod": "Cliquez à nouveau pour modifier la période.",
"Close": "Fermer",
@@ -84,9 +83,10 @@
"ColumnViewedAfterSearchDocumentation": "Le nombre de fois où cette page a été visitée après qu'un visiteur ayant fait une recherche sur votre site, et cliqué sur cette page dans les résultats de recherche.",
"ColumnVisitDuration": "Durée de la visite (en secondes)",
"ColumnVisitsWithConversions": "Visites avec Conversions",
- "ConfigFileIsNotWritable": "Le fichier de configuration de Piwik %s n'a pas la permission d'écriture, vos modifications ne seront pas sauvegardées. %s Merci de modifier les permissions du fichier de configuration de manière à le rendre accessible en écriture.",
+ "ConfigFileIsNotWritable": "Le fichier de configuration de Piwik %1$s n'a pas la permission d'écriture, vos modifications ne seront pas sauvegardées. %2$s Merci de modifier les permissions du fichier de configuration de manière à le rendre accessible en écriture.",
"Continue": "Continuer",
"ContinueToPiwik": "Continuer vers Piwik",
+ "CreatedByUser": "créé par %s",
"CurrentMonth": "Mois courant",
"CurrentWeek": "Semaine courante",
"CurrentYear": "Année courante",
@@ -100,7 +100,7 @@
"Date": "Date",
"DateRange": "Période :",
"DateRangeFrom": "Du",
- "DateRangeFromTo": "De %s à %s",
+ "DateRangeFromTo": "De %1$s à %2$s",
"DateRangeInPeriodList": "période",
"DateRangeTo": "Au",
"DaysHours": "%1$s jours %2$s heures",
@@ -133,30 +133,30 @@
"Edit": "Éditer",
"EncryptedSmtpTransport": "Entrez la couche de chiffrement requise par votre serveur SMTP.",
"Error": "Erreur",
- "ErrorRequest": "Oups... Il y a eu un problème pendant le traitement de la requête. Peut être que le serveur a eu un soucis temporaire, ou peut être que vous avez demandé un rapport avec trop de données. Veuillez réssayer. Si cette erreur se répète veuillez %scontacter votre administrateur Piwik%s pour obtenir de l'aide.",
+ "ErrorRequest": "Oups... Il y a eu un problème pendant le traitement de la requête. Peut être que le serveur a eu un soucis temporaire, ou peut être que vous avez demandé un rapport avec trop de données. Veuillez réssayer. Si cette erreur se répète veuillez %1$scontacter votre administrateur Piwik%2$s pour obtenir de l'aide.",
"EvolutionOverPeriod": "Évolution sur la période",
"EvolutionSummaryGeneric": "%1$s en %2$s comparé à %3$s en %4$s. Evolution: %5$s",
- "ExceptionContactSupportGeneric": "Si vous avez toujours ce problème veuillez %scontacter votre administrateur Piwik%s pour obtenir de l'aide.",
+ "ExceptionContactSupportGeneric": "Si vous avez toujours ce problème veuillez %1$scontacter votre administrateur Piwik%2$s pour obtenir de l'aide.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "L'utilisateur doit être un Super Utilisateur ou l'utilisateur \"%s\" lui-même.",
"ExceptionConfigurationFileNotFound": "Le fichier de configuration {%s} n'a pas été trouvé",
- "ExceptionConfigurationFileNotFound2": "Si le fichier existe, veuillez vérifier que %s est lisible pour l'utilisateur '%s'.",
+ "ExceptionConfigurationFileNotFound2": "Si le fichier existe, veuillez vérifier que %1$s est lisible pour l'utilisateur '%2$s'.",
"ExceptionDatabaseVersion": "Votre version de %1$s est %2$s mais Piwik a besoin au minimum de la version %3$s.",
"ExceptionDatabaseVersionNewerThanCodebase": "Votre installation de Piwik fonctionne sur l'ancienne version %1$s et nous avons détecté que votre base de données a été mise à jour vers la version plus récente %2$s.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "Peut-être que vos administrateurs Piwik sont en train de terminer le processus de mise à jour en ce moment. Veuillez réessayer dans quelques minutes.",
"ExceptionFileIntegrity": "Échec du contrôle d'intégrité : %s",
"ExceptionFilesizeMismatch": "Différence de taille de fichier : %1$s (longueur attendue: %2$s, rencontrée : %3$s)",
"ExceptionIncompatibleClientServerVersions": "La version de votre client %1$s est %2$s ce qui est incompatible avec le serveur de version %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Le type de rapport suivant '%s' n'est pas valide. Essayer un des types suivants : %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Le type de rapport suivant '%1$s' n'est pas valide. Essayer un des types suivants : %2$s.",
"ExceptionInvalidArchiveTimeToLive": "La durée de l'archivage doit être un nombre de secondes supérieur à zéro.",
- "ExceptionInvalidDateFormat": "Le format de date doit être : %s ou n'importe quel mot-clé supporté par la fonction %s (visitez %s pour plus d'informations)",
- "ExceptionInvalidDateRange": "La date '%s' ne correspond pas au format suivant : %s.",
- "ExceptionInvalidPeriod": "La période '%s' n'est pas supportée. Veuillez essayer parmi celles-ci à la place : %s.",
- "ExceptionInvalidRendererFormat": "Le format de rendu '%s' n'est pas valide. Veuillez essayer un de ceux-ci à la place : %s.",
- "ExceptionInvalidReportRendererFormat": "Format de rapport '%s' invalide. Essayez n'importe lequel des formats suivants à la place : %s.",
- "ExceptionInvalidStaticGraphType": "Le type de graph suivant '%s' n'est pas valide. Essayer un des types suivants : %s.",
+ "ExceptionInvalidDateFormat": "Le format de date doit être : %1$s ou n'importe quel mot-clé supporté par la fonction %2$s (visitez %3$s pour plus d'informations)",
+ "ExceptionInvalidDateRange": "La date '%1$s' ne correspond pas au format suivant : %2$s.",
+ "ExceptionInvalidPeriod": "La période '%1$s' n'est pas supportée. Veuillez essayer parmi celles-ci à la place : %2$s.",
+ "ExceptionInvalidRendererFormat": "Le format de rendu '%1$s' n'est pas valide. Veuillez essayer un de ceux-ci à la place : %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Format de rapport '%1$s' invalide. Essayez n'importe lequel des formats suivants à la place : %2$s.",
+ "ExceptionInvalidStaticGraphType": "Le type de graph suivant '%1$s' n'est pas valide. Essayer un des types suivants : %2$s.",
"ExceptionInvalidToken": "La clef partagée (token) n'est pas valide.",
"ExceptionLanguageFileNotFound": "Le fichier de langage '%s' n'a pas été trouvé.",
- "ExceptionMethodNotFound": "La méthode '%s' n'existe pas ou n'est pas disponible dans le module '%s'",
+ "ExceptionMethodNotFound": "La méthode '%1$s' n'existe pas ou n'est pas disponible dans le module '%2$s'",
"ExceptionMissingFile": "Fichier manquant : %s",
"ExceptionNonceMismatch": "Impossible de vérifier le code (token) de sécurité pour ce formulaire.",
"ExceptionPrivilege": "Vous ne pouvez accéder à cette ressource, ceci requiert un accès de type %s.",
@@ -164,7 +164,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Vous ne pouvez accéder à cette ressource, ceci requiert au moins un accès de type %s à un site web.",
"ExceptionUnableToStartSession": "Impossible de démarrer une session.",
"ExceptionUndeletableFile": "Impossible de supprimer %s",
- "ExceptionUnreadableFileDisabledMethod": "Le fichier de configuration {%s} n'a pas pu être lu. votre hébergeur a probablement désactivé %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Le fichier de configuration {%1$s} n'a pas pu être lu. votre hébergeur a probablement désactivé %2$s.",
"ExceptionReportNotFound": "Le rapport demandé n'existe pas.",
"ExceptionWidgetNotFound": "Le gadget demandé n'existe pas.",
"ExceptionReportNotEnabled": "Le rapport demandé n'est pas activé. Ceci signifie d'habitude ou que le composant additionnel qui définit le rapport est désactivé ou bien que vous n'avez pas assez de permissions pour accéder à ce rapport.",
@@ -212,7 +212,7 @@
"Logout": "Déconnexion",
"MainMetrics": "Métriques principales",
"Matches": "Correspondances",
- "MediumToHighTrafficItIsRecommendedTo": "Pour les sites à moyen et fort trafic, nous recommandons d'effectuer les rapports du jours au plus toutes les demies heures (%s secondes) ou toutes les heures (%secondes).",
+ "MediumToHighTrafficItIsRecommendedTo": "Pour les sites à moyen et fort trafic, nous recommandons d'effectuer les rapports du jours au plus toutes les demies heures (%1$s secondes) ou toutes les heures (%2$secondes).",
"Metadata": "Méta-données",
"Metric": "Métrique",
"Metrics": "Métriques",
@@ -269,7 +269,7 @@
"OptionalSmtpPort": "Optionnel. Par défaut à 25 pour non chiffré et TLS SMTP, et 465 pour du SMTP SSL.",
"Options": "Options",
"Or": "ou",
- "OrCancel": "ou %s Annuler %s",
+ "OrCancel": "ou %1$s Annuler %2$s",
"Others": "Autres",
"Outlink": "Lien sortant",
"Outlinks": "Liens sortant",
@@ -277,9 +277,9 @@
"OverlayRowActionTooltipTitle": "Ouvrir l'analyse des pages web",
"Overview": "Récapitulatif",
"Pages": "Pages",
- "Pagination": "%s - %s de %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Le paramètre %s doit être un entier compris entre %s et %s.",
+ "Pagination": "%1$s - %2$s de %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Le paramètre %1$s doit être un entier compris entre %2$s et %3$s.",
"Password": "Mot de passe",
"Period": "Période",
"Piechart": "Camembert",
@@ -331,7 +331,7 @@
"Clear": "Réinitialiser",
"SearchNoResults": "Aucun résultat",
"SeeAll": "tout montrer",
- "SeeTheOfficialDocumentationForMoreInformation": "Consultez la %s documentation officielle %s pour plus d'information.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Consultez la %1$s documentation officielle %2$s pour plus d'information.",
"SeeThisFaq": "Voir %1$scette faq%2$s.",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Sélectionnez \"Oui\" si vous voulez ou devez envoyer un e-mail via un serveur nommé à la place de la fonction de courrier local.",
@@ -358,7 +358,7 @@
"Total": "Total",
"TotalRatioTooltip": "C'est %1$s de %2$s %3$s.",
"TotalRevenue": "Total des recettes",
- "TotalVisitsPageviewsActionsRevenue": "(Total : %s visites, %s pages vues, %s actions, %s revenu)",
+ "TotalVisitsPageviewsActionsRevenue": "(Total : %1$s visites, %2$s pages vues, %3$s actions, %4$s revenu)",
"TrackingScopeAction": "Action",
"TrackingScopePage": "Page",
"TrackingScopeVisit": "Visite",
@@ -395,8 +395,8 @@
"WarningFileIntegrityNoManifest": "Le contrôle d'intégrité n'a pu être effectué car le fichier manifest.inc.php est manquant.",
"WarningFileIntegrityNoManifestDeployingFromGit": "Si vous déployez Piwik depuis Git, ce message est normal.",
"WarningFileIntegrityNoMd5file": "Le contrôle d'intégrité n'a pu être effectué car la fonction md5_file() est manquante.",
- "WarningPasswordStored": "%sAttention :%s Ce mot de passe sera stocké dans le fichier de configuration et sera visible pour n'importe qui y ayant accès.",
- "WarningDebugOnDemandEnabled": "Le mode %s du suivit est activé. Pour des raisons de sécurité ceci ne devrait être activité que pour une courte période de temps. Pour le désactivé définir %s à %s dans %s",
+ "WarningPasswordStored": "%1$sAttention :%2$s Ce mot de passe sera stocké dans le fichier de configuration et sera visible pour n'importe qui y ayant accès.",
+ "WarningDebugOnDemandEnabled": "Le mode %1$s du suivit est activé. Pour des raisons de sécurité ceci ne devrait être activité que pour une courte période de temps. Pour le désactivé définir %2$s à %3$s dans %4$s",
"Website": "Site",
"Weekly": "Hebdomadaire",
"WeeklyReport": "hebdomadaire",
@@ -450,7 +450,7 @@
"MultiChartLabel": "Afficher les sparklines",
"NavigationBack": "Retour",
"NetworkError": "Erreur réseau",
- "NetworkErrorWithStatusCode": "Erreur rencontrée \"%s\". La requête a retourné le statut \"%s. L'URL était \"%s\". Veuillez vérifier que vous avez entré l'URL correctement et consulter les logs du serveur pour plus d'informations à propos de l'erreur et sur comment la résoudre.",
+ "NetworkErrorWithStatusCode": "Erreur rencontrée \"%1$s\". La requête a retourné le statut \"%2$s. L'URL était \"%3$s\". Veuillez vérifier que vous avez entré l'URL correctement et consulter les logs du serveur pour plus d'informations à propos de l'erreur et sur comment la résoudre.",
"NetworkErrorWithStatusCodeShort": "Erreur réseau %s",
"NetworkNotReachable": "Réseau inaccessible",
"NoAccountIsSelected": "Vous devez sélectionner un compte. Ajoutez un nouveau compte si aucun n'a été configuré.",
@@ -468,7 +468,7 @@
"RatingDontRemindMe": "Ne pas me rappeler",
"RatingNotNow": "Pas maintenant",
"RatingNow": "OK, je vais le noter maintenant",
- "RatingPleaseRateUs": "L'application Piwik Mobile est un logiciel gratuit, nous vous serions très reconnaissant si vous preniez 1 minute pour noter l'application sur le %s. Si vous avez des suggestions de nouvelles fonctionnalités ou si vous souhaitez signaler un bug, veuillez contacter %s",
+ "RatingPleaseRateUs": "L'application Piwik Mobile est un logiciel gratuit, nous vous serions très reconnaissant si vous preniez 1 minute pour noter l'application sur le %1$s. Si vous avez des suggestions de nouvelles fonctionnalités ou si vous souhaitez signaler un bug, veuillez contacter %2$s",
"ReleaseToRefresh": "Relâchez pour actualiser...",
"Reloading": "Recharchement...",
"RequestTimedOutShort": "Erreur réseau, délai dépassé (timeout)",
@@ -493,7 +493,7 @@
"CompareRows": "Comparer les enregistrements",
"ComparingRecords": "Comparaison de %s lignes",
"Documentation": "Cliquez sur les métriques pour les afficher dans un graphique d'évolution large. Utilisez shift-clic pour afficher plusieurs métriques en même temps.",
- "MetricBetweenText": "entre %s et %s",
+ "MetricBetweenText": "entre %1$s et %2$s",
"MetricChangeText": "%s au cours de la période",
"MetricMinMax": "%1$s est compris entre %2$s et %3$s sur la période",
"MetricsFor": "Métriques pour %s",
diff --git a/lang/gl.json b/lang/gl.json
index 770ebfaf5d8e99756f8e016a29cc60e8db29bd2e..dd466a72017375bc986c9f4a9f0f89e55f0595d0 100644
--- a/lang/gl.json
+++ b/lang/gl.json
@@ -14,7 +14,6 @@
"BackToPiwik": "Voltar a Piwik",
"Cancel": "Cancelar",
"ChangePassword": "Cambiar o contrasinal",
- "ChooseDate": "Escolla Data",
"ClickHere": "Prema aquà para máis información.",
"Close": "Pechar",
"ColumnActionsPerVisit": "Accións por Visita",
@@ -93,7 +92,7 @@
"NVisits": "%s visitas",
"Ok": "Ok",
"OpenSourceWebAnalytics": "Analise Web de Open Source",
- "OrCancel": "ou %s Cancelar %s",
+ "OrCancel": "ou %1$s Cancelar %2$s",
"Others": "Outros",
"Outlinks": "Ligazóns externos",
"Overview": "Xeral",
diff --git a/lang/he.json b/lang/he.json
index e0ac43e7c327a56e1584c3bad90bf17220203c93..c73ae356ac6283f841aba7bf8ab117f2b1c9b5c4 100644
--- a/lang/he.json
+++ b/lang/he.json
@@ -10,7 +10,7 @@
"And": "ו",
"API": "API",
"ArchivingInlineHelp": "עבור ××ª×¨×™× ×‘×¢×œ×™ תעבורה ×‘×™× ×•× ×™×ª×¢×“ גבוהה, מומלץ לבטל ×ת ×רכיון Piwik בעת צפייה דרך הדפדפן בדוחות. ×‘×ž×§×•× ×–×ת, מומלץ להגדיר עבודה ×›×¨×•× ×™×ª (cron job) שתעבד דוחות Piwik בכל שעה.",
- "ArchivingTriggerDescription": "מומלץ ×œ×”×ª×§× ×•×ª גדולות יותר של Piwik, צריך %sלהגדיר עבודה ×›×¨×•× ×™×ª%s שתעבד ×ת הדוחות ×וטומטית.",
+ "ArchivingTriggerDescription": "מומלץ ×œ×”×ª×§× ×•×ª גדולות יותר של Piwik, צריך %1$sלהגדיר עבודה ×›×¨×•× ×™×ª%2$s שתעבד ×ת הדוחות ×וטומטית.",
"AuthenticationMethodSmtp": "שיטת ×ימות עבור SMTP",
"AverageOrderValue": "ערך ×”×–×ž× ×” ממוצע",
"AveragePrice": "מחיר ממוצע",
@@ -20,10 +20,8 @@
"Cancel": "ביטול",
"CannotUnzipFile": "×œ× ×™×›×•×œ לחלץ ×ת הקובץ %1$s: %2$s",
"ChangePassword": "×©×™× ×•×™ סיסמה",
- "ChooseDate": "בחירת ת×ריך",
"ChooseLanguage": "בחירת שפה",
"ChoosePeriod": "בחירת תקופה",
- "ChooseWebsite": "בחירת ×תר",
"Close": "לסגור",
"ColumnActionsPerVisit": "פעולות בכל ביקור",
"ColumnAverageTimeOnPage": "זמן ממוצע בעמוד",
@@ -84,20 +82,20 @@
"ExceptionFilesizeMismatch": "×ין הת×מה במשקל הקובץ: %1$s (מצופה: %2$s, × ×ž×¦×: %3$s)",
"ExceptionIncompatibleClientServerVersions": "גרסת צד הלקוח של %1$s ×”×™× %2$s בעוד גרסת צד השרת ×”×™× %3$s.",
"ExceptionInvalidArchiveTimeToLive": "זמן ×”×—×™×™× ×©×œ ×רכיון ×”×™×•× ×—×™×™×‘ להיות מספר ×©× ×™×•×ª הגדול מ-0.",
- "ExceptionInvalidDateFormat": "×ª×‘× ×™×ª הת×ריך מוכרחה להיות: %s ×ו כל מילת מפתח ×©× ×ª×ž×›×ª על ידי ×¤×•× ×§×¦×™×ª ×” %s (ר×ו %s בשביל מידע × ×•×¡×£)",
- "ExceptionInvalidDateRange": "הת×ריך '%s' ××™× ×• טווח ת××¨×™×›×™× × ×›×•×Ÿ. ×”×•× ×¦×¨×™×š להיכתב ×‘×ª×‘× ×™×ª הב××”: %s.",
- "ExceptionInvalidPeriod": "התקופה '%s' ×œ× × ×ª×ž×›×ª. יש ×œ× ×¡×•×ª ×ת ×חת מהב×ות במקו×: %s",
- "ExceptionInvalidRendererFormat": "הפורמט '%s' ××™× ×• תקין. יש ×œ× ×¡×•×ª ×חד מהב××™× ×‘×ž×§×•×: %s.",
+ "ExceptionInvalidDateFormat": "×ª×‘× ×™×ª הת×ריך מוכרחה להיות: %1$s ×ו כל מילת מפתח ×©× ×ª×ž×›×ª על ידי ×¤×•× ×§×¦×™×ª ×” %2$s (ר×ו %3$s בשביל מידע × ×•×¡×£)",
+ "ExceptionInvalidDateRange": "הת×ריך '%1$s' ××™× ×• טווח ת××¨×™×›×™× × ×›×•×Ÿ. ×”×•× ×¦×¨×™×š להיכתב ×‘×ª×‘× ×™×ª הב××”: %2$s.",
+ "ExceptionInvalidPeriod": "התקופה '%1$s' ×œ× × ×ª×ž×›×ª. יש ×œ× ×¡×•×ª ×ת ×חת מהב×ות במקו×: %2$s",
+ "ExceptionInvalidRendererFormat": "הפורמט '%1$s' ××™× ×• תקין. יש ×œ× ×¡×•×ª ×חד מהב××™× ×‘×ž×§×•×: %2$s.",
"ExceptionInvalidToken": "הכרטיס ×œ× ×ª×§×£.",
"ExceptionLanguageFileNotFound": "קובץ השפה '%s' ×œ× × ×ž×¦×.",
- "ExceptionMethodNotFound": "המתודה '%s' ×œ× ×§×™×™×ž×ª ×ו ×œ× × ×ž×¦××” במודל '%s'.",
+ "ExceptionMethodNotFound": "המתודה '%1$s' ×œ× ×§×™×™×ž×ª ×ו ×œ× × ×ž×¦××” במודל '%2$s'.",
"ExceptionMissingFile": "קובץ חסר: %s",
"ExceptionNonceMismatch": "×œ× × ×™×ª×Ÿ ל×מת ×ת כרטיס ×”×בטחה בטופס ×–×”.",
"ExceptionPrivilege": "×œ× × ×™×ª×Ÿ לגשת למש×ב ×–×” מכיוון ×©×”×•× ×“×•×¨×© גישת %s.",
"ExceptionPrivilegeAccessWebsite": "×œ× × ×™×ª×Ÿ לגשת למש×ב ×–×” מכיוון ×©×”×•× ×“×•×¨×© גישת %s עבור ×”×תר שמספרו הסידורי ×”×•× %d.",
"ExceptionPrivilegeAtLeastOneWebsite": "×œ× × ×™×ª×Ÿ לגשת למש×ב ×–×” מכיוון ×©×”×•× ×“×•×¨×© גישת %s עבור ×תר ×חד לפחות.",
"ExceptionUndeletableFile": "×œ× × ×™×ª×Ÿ למחוק ×ת %s",
- "ExceptionUnreadableFileDisabledMethod": "קובץ ההגדרות {%s} ×œ× × ×™×ª×Ÿ לקרי××”. המ×רח ×ולי ×—×¡× ×ת %s.",
+ "ExceptionUnreadableFileDisabledMethod": "קובץ ההגדרות {%1$s} ×œ× × ×™×ª×Ÿ לקרי××”. המ×רח ×ולי ×—×¡× ×ת %2$s.",
"Export": "ייצו×",
"ExportAsImage": "×œ×™×™×¦× ×›×ª×ž×•× ×”",
"ExportThisReport": "×œ×™×™×¦× ×ž×™×“×¢ ×‘×¤×•×¨×ž×˜×™× ×חרי×",
@@ -122,7 +120,7 @@
"LoadingData": "טוען מידע...",
"Locale": "he_IL.UTF-8",
"Logout": "×œ×”×ª× ×ª×§",
- "MediumToHighTrafficItIsRecommendedTo": "ל××ª×¨×™× ×‘×¢×œ×™ תעבודה ×‘×™× ×•× ×™×ª עד גבוהה, ×× ×• ×ž×ž×œ×™×¦×™× ×œ×¢×‘×“ דוחות ×œ×”×™×•× ×œ×›×œ היותר בכל חצי שעה (%s ×©× ×™×•×ª) ×ו בכל שעה (%s ×©× ×™×•×ª)",
+ "MediumToHighTrafficItIsRecommendedTo": "ל××ª×¨×™× ×‘×¢×œ×™ תעבודה ×‘×™× ×•× ×™×ª עד גבוהה, ×× ×• ×ž×ž×œ×™×¦×™× ×œ×¢×‘×“ דוחות ×œ×”×™×•× ×œ×›×œ היותר בכל חצי שעה (%1$s ×©× ×™×•×ª) ×ו בכל שעה (%2$s ×©× ×™×•×ª)",
"MinutesSeconds": "%1$s דקות ו-%2$s ×©× ×™×•×ª",
"Monthly": "חודשי",
"MultiSitesSummary": "כל ×”×תרי×",
@@ -145,7 +143,7 @@
"OnlyUsedIfUserPwdIsSet": "משומש רק ×× ×©× ×”×ž×©×ª×ž×©\/סיסמה מוגדרי×, יש לברר ×¢× ×”×¡×¤×§ במקרה של חוסר ווד×ות ב××™×–×” שיטה לבחור.",
"OpenSourceWebAnalytics": "× ×™×ª×•×— פעילות ××ª×¨×™× ×‘×§×•×“ פתוח",
"OptionalSmtpPort": "××•×¤×¦×™×•× ×œ×™. ברירת המחדל ×”×™× 25 עבור ×œ× ×ž×•×¦×¤×Ÿ ו-TLS SMTP, 465 עבור SSL SMTP.",
- "OrCancel": "×ו %s ביטול %s",
+ "OrCancel": "×ו %1$s ביטול %2$s",
"Others": "×חרי×",
"Outlinks": "×§×™×©×•×¨×™× ×™×•×¦××™×",
"Overview": "מבט כללי",
@@ -174,7 +172,7 @@
"Search": "חיפוש",
"SearchNoResults": "×ין תוצ×ות",
"SeeAll": "להציג הכל",
- "SeeTheOfficialDocumentationForMoreInformation": "ר×ו %sתיעוד רשמי%s למידע × ×•×¡×£.",
+ "SeeTheOfficialDocumentationForMoreInformation": "ר×ו %1$sתיעוד רשמי%2$s למידע × ×•×¡×£.",
"SelectYesIfYouWantToSendEmailsViaServer": "יש לבחור \"כן\" ×× ×¨×•×¦×™× ×ו ×—×™×™×‘×™× ×œ×©×œ×•×— דו×\"ל דרך שרת ×•×œ× ×“×¨×š ×¤×•× ×§×¦×™×ª הדו×\"ל המקומית",
"Settings": "הגדרות",
"Show": "להציג",
@@ -204,7 +202,7 @@
"Warning": "×זהרה",
"WarningFileIntegrityNoManifest": "×œ× × ×™×ª×Ÿ לבצע בדיקת ×ª×§×™× ×•×ª ×§×‘×¦×™× ×ž×›×™×•×•×Ÿ שהקובץ manifest.inc.php חסר.",
"WarningFileIntegrityNoMd5file": "×œ× × ×™×ª×Ÿ לבצע בדיקת ×ª×§×™× ×•×ª ×§×‘×¦×™× ×ž×›×™×•×•×Ÿ ×©×”×¤×•× ×§×¦×™×” md5_file() חסרה.",
- "WarningPasswordStored": "%s×זהרה:%s הסיסמה ת×וכסן בקובץ ההגדרות וחושפת לכל כיצד להתחבר.",
+ "WarningPasswordStored": "%1$s×זהרה:%2$s הסיסמה ת×וכסן בקובץ ההגדרות וחושפת לכל כיצד להתחבר.",
"Website": "×תר",
"Weekly": "שבועי",
"WeeklyReport": "שבועי",
@@ -246,7 +244,7 @@
"CompareRows": "השווה תוצ×ות",
"ComparingRecords": "משווה %s שורות",
"Documentation": "לחץ על ×”×ž×“×“×™× ×›×“×™ ×œ×”×¦×™×’× ×‘×’×¨×£ התקדמות. השתמש בלחיצה על ×”×ž×“×“×™× ×¢× ×”×ž×§×© shift כדי להציג מספר ×ž×“×“×™× ×‘×™×—×“.",
- "MetricBetweenText": "מ-%s עד %s",
+ "MetricBetweenText": "מ-%1$s עד %2$s",
"MetricChangeText": "%s ×©×™× ×•×™ במשך התקופה",
"MetricMinMax": "%1$s בטווח בין %2$s ו-%3$s במשך התקופה",
"MetricsFor": "×ž×“×“×™× ×¢×‘×•×¨ %s",
diff --git a/lang/hi.json b/lang/hi.json
index cf2bc68763e760f0f9c6f2582edbeec6d28b5c5b..fedbd7a13d1bdfc80b8e57a72d98eba2440d704f 100644
--- a/lang/hi.json
+++ b/lang/hi.json
@@ -12,7 +12,7 @@
"And": "और",
"API": "à¤à¤ªà¥€à¤†à¤ˆ",
"ArchivingInlineHelp": "मधà¥à¤¯à¤® से उचà¥à¤š यातायात वेबसाइटों के लिà¤,यह Piwik बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤° से सकà¥à¤°à¤¿à¤¯ करने के लिठपà¥à¤°à¤¾à¤²à¥‡à¤–ण को निषà¥à¤•à¥à¤°à¤¿à¤¯ करने की सिफारिश की है.इसके बजाय, हम आपको Piwik रिपोरà¥à¤Ÿà¥‹à¤‚ के हर घंटे की पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ के लिठà¤à¤• कà¥à¤°à¥‰à¤¨ जॉब सेटअप करने की सलाह देते हैं.",
- "ArchivingTriggerDescription": "बड़ा Piwik सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ के लिठसिफारिश है, आपको सà¥à¤µà¤¤à¤ƒ रिपोरà¥à¤Ÿà¥‹à¤‚ को संसाधित करने के लिठ%s à¤à¤• कà¥à¤°à¥‰à¤¨ जॉब सेटअप %s की जरूरत है.",
+ "ArchivingTriggerDescription": "बड़ा Piwik सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ के लिठसिफारिश है, आपको सà¥à¤µà¤¤à¤ƒ रिपोरà¥à¤Ÿà¥‹à¤‚ को संसाधित करने के लिठ%1$s à¤à¤• कà¥à¤°à¥‰à¤¨ जॉब सेटअप %2$s की जरूरत है.",
"AuthenticationMethodSmtp": "à¤à¤¸à¤à¤®à¤Ÿà¥€à¤ªà¥€ के लिठपà¥à¤°à¤®à¤¾à¤£à¥€à¤•à¤°à¤£ विधि",
"AverageOrderValue": "औसत आदेश मूलà¥à¤¯",
"AveragePrice": "औसत मूलà¥à¤¯",
@@ -24,10 +24,8 @@
"CannotUnzipFile": "फ़ाइल नहीं खोल सकते %1$s: %2$s",
"ChangePassword": "पासवरà¥à¤¡ बदलें",
"ChangeTagCloudView": "कृपया धà¥à¤¯à¤¾à¤¨ दें, आप à¤à¤• टैग बादल के रूप की तà¥à¤²à¤¨à¤¾ में अनà¥à¤¯ तरीकों से रिपोरà¥à¤Ÿ देख सकते हैं.à¤à¤¸à¤¾ करने के लिठरिपोरà¥à¤Ÿ के तल पर नियंतà¥à¤¤à¥à¤£à¥‹à¤‚ का पà¥à¤°à¤¯à¥‹à¤— करें.",
- "ChooseDate": "तारीख चà¥à¤¨à¥‡à¤‚",
"ChooseLanguage": "à¤à¤¾à¤·à¤¾ चà¥à¤¨à¥‡à¤‚",
"ChoosePeriod": "अवधि चà¥à¤¨à¥‡à¤‚",
- "ChooseWebsite": "वेबसाइट चà¥à¤¨à¥‡à¤‚",
"ClickHere": "अधिक जानकारी के लिठयहां कà¥à¤²à¤¿à¤• करें.",
"ClickToChangePeriod": "अवधि बदलने के लिठफिर से कà¥à¤²à¤¿à¤• करें.",
"Close": "बंद करें",
@@ -80,7 +78,7 @@
"ColumnViewedAfterSearchDocumentation": "à¤à¤• आगंतà¥à¤• आपकी वेबसाइट पर à¤à¤• खोज किया था, और खोज परिणामों में इस पृषà¥à¤ पर कà¥à¤²à¤¿à¤• करने के बाद कई बार इस पृषà¥à¤ का दौरा किया था.",
"ColumnVisitDuration": "à¤à¥‡à¤‚ट अवधि(सेकंड में)",
"ColumnVisitsWithConversions": "रूपांतरण के साथ दौरा",
- "ConfigFileIsNotWritable": "Piwik विनà¥à¤¯à¤¾à¤¸ फाइल %sलिखने योगà¥à¤¯ नहीं है, अपने परिवरà¥à¤¤à¤¨à¥‹à¤‚ से कà¥à¤› नहीं बचाया जा सकता है. यह लिखने योगà¥à¤¯ बनाने के लिठ%sविनà¥à¤¯à¤¾à¤¸ फाइल की अनà¥à¤®à¤¤à¤¿ में बदलाव करें.",
+ "ConfigFileIsNotWritable": "Piwik विनà¥à¤¯à¤¾à¤¸ फाइल %1$sलिखने योगà¥à¤¯ नहीं है, अपने परिवरà¥à¤¤à¤¨à¥‹à¤‚ से कà¥à¤› नहीं बचाया जा सकता है. यह लिखने योगà¥à¤¯ बनाने के लिठ%2$sविनà¥à¤¯à¤¾à¤¸ फाइल की अनà¥à¤®à¤¤à¤¿ में बदलाव करें.",
"Continue": "जारी",
"ContinueToPiwik": "Piwik पर जारी",
"CurrentMonth": "वरà¥à¤¤à¤®à¤¾à¤¨ महीना",
@@ -96,7 +94,7 @@
"Date": "तारीख",
"DateRange": "तिथि सीमा:",
"DateRangeFrom": "से",
- "DateRangeFromTo": "%s से %s में",
+ "DateRangeFromTo": "%1$s से %2$s में",
"DateRangeTo": "से",
"DaysHours": "%1$s दिन %2$s घंटे",
"DaysSinceFirstVisit": "पहली यातà¥à¤°à¤¾ के बाद से दिन",
@@ -135,17 +133,17 @@
"ExceptionFileIntegrity": "अखंडता की जाà¤à¤š विफल: %s",
"ExceptionFilesizeMismatch": "फ़ाइल का आकार बेमेल है:%1$s (अपेकà¥à¤·à¤¿à¤¤ लंबाई:%2$s,पाया :%3$s)",
"ExceptionIncompatibleClientServerVersions": "अपने %1$sगà¥à¤°à¤¾à¤¹à¤• के संसà¥à¤•à¤°à¤£%2$s जो है सरà¥à¤µà¤° संसà¥à¤•à¤°à¤£%3$s के साथ असंगत है",
- "ExceptionInvalidAggregateReportsFormat": "सकल रिपोरà¥à¤Ÿà¥‹à¤‚ सà¥à¤µà¤°à¥‚प '%s' मानà¥à¤¯ नहीं है. इसके बजाय निमà¥à¤¨à¤²à¤¿à¤–ित में से किसी का पà¥à¤°à¤¯à¤¾à¤¸ करें:%s.",
+ "ExceptionInvalidAggregateReportsFormat": "सकल रिपोरà¥à¤Ÿà¥‹à¤‚ सà¥à¤µà¤°à¥‚प '%1$s' मानà¥à¤¯ नहीं है. इसके बजाय निमà¥à¤¨à¤²à¤¿à¤–ित में से किसी का पà¥à¤°à¤¯à¤¾à¤¸ करें:%2$s.",
"ExceptionInvalidArchiveTimeToLive": "आज संगà¥à¤°à¤¹ जीने के लिठशूनà¥à¤¯ से अधिक सेकंड की संखà¥à¤¯à¤¾ होनी चाहिà¤",
- "ExceptionInvalidDateFormat": "तिथि पà¥à¤°à¤¾à¤°à¥‚प में होना चाहिà¤:%s या (अधिक जानकारी के लिठ%s देखें) पà¥à¤°à¤•à¤¾à¤°à¥à¤¯ %sदà¥à¤µà¤¾à¤°à¤¾ किसी à¤à¥€ शबà¥à¤¦ का समरà¥à¤¥à¤¨ किया",
- "ExceptionInvalidDateRange": "तारीख की à¤à¤• सही तिथि '%s' सीमा नहीं है. यह निमà¥à¤¨ सà¥à¤µà¤°à¥‚प होना चाहिà¤: %s",
- "ExceptionInvalidPeriod": "अवधि '%s' समरà¥à¤¥à¤¿à¤¤ नहीं है. इसके बजाय निमà¥à¤¨ में से किसी का पà¥à¤°à¤¯à¤¾à¤¸ करें: %s",
- "ExceptionInvalidRendererFormat": "पà¥à¤°à¤¤à¤¿à¤ªà¤¾à¤¦à¤• सà¥à¤µà¤°à¥‚प '%s' मानà¥à¤¯ नहीं. इसके बजाय निमà¥à¤¨ में से किसी का पà¥à¤°à¤¯à¤¾à¤¸ करें: %s",
- "ExceptionInvalidReportRendererFormat": "रिपोरà¥à¤Ÿ पà¥à¤°à¤¾à¤°à¥‚प '%s' मानà¥à¤¯ नहीं. इसके बजाय निमà¥à¤¨ में से किसी का पà¥à¤°à¤¯à¤¾à¤¸ करें: %s",
- "ExceptionInvalidStaticGraphType": "सà¥à¤¥à¥ˆà¤¤à¤¿à¤• रेखाचितà¥à¤° के पà¥à¤°à¤•à¤¾à¤° '%s' मानà¥à¤¯ नहीं. इसके बजाय निमà¥à¤¨ में से किसी का पà¥à¤°à¤¯à¤¾à¤¸ करें: %s.",
+ "ExceptionInvalidDateFormat": "तिथि पà¥à¤°à¤¾à¤°à¥‚प में होना चाहिà¤:%1$s या (अधिक जानकारी के लिठ%2$s देखें) पà¥à¤°à¤•à¤¾à¤°à¥à¤¯ %3$sदà¥à¤µà¤¾à¤°à¤¾ किसी à¤à¥€ शबà¥à¤¦ का समरà¥à¤¥à¤¨ किया",
+ "ExceptionInvalidDateRange": "तारीख की à¤à¤• सही तिथि '%1$s' सीमा नहीं है. यह निमà¥à¤¨ सà¥à¤µà¤°à¥‚प होना चाहिà¤: %2$s",
+ "ExceptionInvalidPeriod": "अवधि '%1$s' समरà¥à¤¥à¤¿à¤¤ नहीं है. इसके बजाय निमà¥à¤¨ में से किसी का पà¥à¤°à¤¯à¤¾à¤¸ करें: %2$s",
+ "ExceptionInvalidRendererFormat": "पà¥à¤°à¤¤à¤¿à¤ªà¤¾à¤¦à¤• सà¥à¤µà¤°à¥‚प '%1$s' मानà¥à¤¯ नहीं. इसके बजाय निमà¥à¤¨ में से किसी का पà¥à¤°à¤¯à¤¾à¤¸ करें: %2$s",
+ "ExceptionInvalidReportRendererFormat": "रिपोरà¥à¤Ÿ पà¥à¤°à¤¾à¤°à¥‚प '%1$s' मानà¥à¤¯ नहीं. इसके बजाय निमà¥à¤¨ में से किसी का पà¥à¤°à¤¯à¤¾à¤¸ करें: %2$s",
+ "ExceptionInvalidStaticGraphType": "सà¥à¤¥à¥ˆà¤¤à¤¿à¤• रेखाचितà¥à¤° के पà¥à¤°à¤•à¤¾à¤° '%1$s' मानà¥à¤¯ नहीं. इसके बजाय निमà¥à¤¨ में से किसी का पà¥à¤°à¤¯à¤¾à¤¸ करें: %2$s.",
"ExceptionInvalidToken": "टोकन मानà¥à¤¯ नहीं है.",
"ExceptionLanguageFileNotFound": "à¤à¤¾à¤·à¤¾ फाइल '%s' नहीं मिली.",
- "ExceptionMethodNotFound": "विधि '%s' मौजूद नहीं या à¤à¤¾à¤— में उपलबà¥à¤§ नहीं '%s' है.",
+ "ExceptionMethodNotFound": "विधि '%1$s' मौजूद नहीं या à¤à¤¾à¤— में उपलबà¥à¤§ नहीं '%2$s' है.",
"ExceptionMissingFile": "लापता फ़ाइल: %s",
"ExceptionNonceMismatch": "इस पà¥à¤°à¤ªà¤¤à¥à¤° पर सà¥à¤°à¤•à¥à¤·à¤¾ टोकन को सतà¥à¤¯à¤¾à¤ªà¤¿à¤¤ नहीं किया जा सका.",
"ExceptionPrivilege": "इसे à¤à¤• %s पहà¥à¤à¤š की आवशà¥à¤¯à¤•à¤¤à¤¾ के रूप में आप इस संसाधन तक पहà¥à¤à¤š नहीं सकते हैं.",
@@ -153,7 +151,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "इसे कम से कम à¤à¤• वेबसाइट के लिठकिसी पहà¥à¤à¤š की आवशà¥à¤¯à¤•à¤¤à¤¾ के रूप %s में आप इस संसाधन तक पहà¥à¤à¤š नहीं सकते हैं.",
"ExceptionUnableToStartSession": "सतà¥à¤° पà¥à¤°à¤¾à¤°à¤‚ठकरने में अकà¥à¤·à¤®.",
"ExceptionUndeletableFile": "%s हटाने में असमरà¥à¤¥",
- "ExceptionUnreadableFileDisabledMethod": "विनà¥à¤¯à¤¾à¤¸ फाइल {%s} नहीं पढ़ी जा सकी. आपका मेजबान %s निषà¥à¤•à¥à¤°à¤¿à¤¯ हो सकता है",
+ "ExceptionUnreadableFileDisabledMethod": "विनà¥à¤¯à¤¾à¤¸ फाइल {%1$s} नहीं पढ़ी जा सकी. आपका मेजबान %2$s निषà¥à¤•à¥à¤°à¤¿à¤¯ हो सकता है",
"ExceptionReportNotFound": "का अनà¥à¤°à¥‹à¤§ रिपोरà¥à¤Ÿ मौजूद नहीं है।",
"ExceptionWidgetNotFound": "का अनà¥à¤°à¥‹à¤§ विजेट मौजूद नहीं है।",
"ExpandDataTableFooter": "दृशà¥à¤¯ बदलें या रिपोरà¥à¤Ÿ कॉनà¥à¤«à¤¼à¤¿à¤—र",
@@ -198,7 +196,7 @@
"Logout": "बाहर करें",
"MainMetrics": "मà¥à¤–à¥à¤¯ मैटà¥à¤°à¤¿à¤•à¥à¤¸",
"Matches": "मेल खाता है",
- "MediumToHighTrafficItIsRecommendedTo": "मधà¥à¤¯à¤® उचà¥à¤š यातायात वेबसाइटों के लिà¤, हम जà¥à¤¯à¤¾à¤¦à¤¾ से जà¥à¤¯à¤¾à¤¦à¤¾ हर आधे घंटे (%s सेकंड) या हर घंटे (%s सेकंड) में आज के लिठरिपोरà¥à¤Ÿ को संसाधित करने की सलाह देते हैं.",
+ "MediumToHighTrafficItIsRecommendedTo": "मधà¥à¤¯à¤® उचà¥à¤š यातायात वेबसाइटों के लिà¤, हम जà¥à¤¯à¤¾à¤¦à¤¾ से जà¥à¤¯à¤¾à¤¦à¤¾ हर आधे घंटे (%1$s सेकंड) या हर घंटे (%2$s सेकंड) में आज के लिठरिपोरà¥à¤Ÿ को संसाधित करने की सलाह देते हैं.",
"Metadata": "मेटाडाटा",
"Metric": "मैटà¥à¤°à¤¿à¤•",
"Metrics": "मेटà¥à¤°à¤¿à¤•à¥à¤¸",
@@ -252,7 +250,7 @@
"OperationNotEquals": "बराबर नहीं है",
"OptionalSmtpPort": "वैकलà¥à¤ªà¤¿à¤•. डिफ़ॉलà¥à¤Ÿ के लिठ25 से अनà¤à¤¨à¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿà¥‡à¤¡ और टीà¤à¤²à¤à¤¸ à¤à¤¸à¤à¤®à¤Ÿà¥€à¤ªà¥€, और à¤à¤¸à¤à¤¸à¤à¤² à¤à¤¸à¤à¤®à¤Ÿà¥€à¤ªà¥€ के लिठ465.",
"Options": "विकलà¥à¤ª",
- "OrCancel": "या %s %s रदà¥à¤¦",
+ "OrCancel": "या %1$s %2$s रदà¥à¤¦",
"Others": "अनà¥à¤¯ लोग",
"Outlink": "आउटलिंक",
"Outlinks": "आउटलिंक",
@@ -260,9 +258,9 @@
"OverlayRowActionTooltipTitle": "ओपन पृषà¥à¤ ओवरले",
"Overview": "अवलोकन",
"Pages": "पृषà¥à¤ ों",
- "Pagination": "%s - %s के लिठ%s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "पैरामीटर %s और %s के बीच में à¤à¤• पूरà¥à¤£à¤¾à¤‚क मान %s होना चाहिà¤.",
+ "Pagination": "%1$s - %2$s के लिठ%3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "पैरामीटर %1$s और %2$s के बीच में à¤à¤• पूरà¥à¤£à¤¾à¤‚क मान %3$s होना चाहिà¤.",
"Password": "पासवरà¥à¤¡",
"Period": "अवधि",
"Piechart": "पाइ चारà¥à¤Ÿ",
@@ -311,7 +309,7 @@
"Clear": "सà¥à¤ªà¤·à¥à¤Ÿ",
"SearchNoResults": "कोई परिणाम नहीं",
"SeeAll": "सà¤à¥€ देखना",
- "SeeTheOfficialDocumentationForMoreInformation": "अधिक जानकारी के लिठ%sआधिकारिक दसà¥à¤¤à¤¾à¤µà¥‡à¤œ %s देखें.",
+ "SeeTheOfficialDocumentationForMoreInformation": "अधिक जानकारी के लिठ%1$sआधिकारिक दसà¥à¤¤à¤¾à¤µà¥‡à¤œ %2$s देखें.",
"SeeThisFaq": "%1$s पूछे जाने वाले पà¥à¤°à¤¶à¥à¤¨ %2$s. को देखें।",
"Segment": "खंड",
"SelectYesIfYouWantToSendEmailsViaServer": "आप चाहते हैं या सà¥à¤¥à¤¾à¤¨à¥€à¤¯ मेल पà¥à¤°à¤•à¤¾à¤°à¥à¤¯ का नाम के बदले सरà¥à¤µà¤° के माधà¥à¤¯à¤® से ई - मेल à¤à¥‡à¤œà¤¨à¥‡ के लिठहै, तो \"हाà¤\" का चयन करें",
@@ -366,7 +364,7 @@
"WarningFileIntegrityNoManifest": "फ़ाइल अखंडता की जांच manifest.inc.php गà¥à¤® की वजह से नहीं किया जा सकता है.",
"WarningFileIntegrityNoManifestDeployingFromGit": "आप Git से Piwik की तैनाती कर रहे हैं, तो यह संदेश सामानà¥à¤¯ है।",
"WarningFileIntegrityNoMd5file": "फ़ाइल अखंडता की जांच लापता md5_file () फ़ंकà¥à¤¶à¤¨ के कारण पूरा नहीं हो सका.",
- "WarningPasswordStored": "%sचेतावनी:%s यह पासवरà¥à¤¡ config फाइल में संगà¥à¤°à¤¹à¥€à¤¤ किया जाà¤à¤—ा यह उपयोग कर सकते हैं जो हर किसी को दिखाई दे.",
+ "WarningPasswordStored": "%1$sचेतावनी:%2$s यह पासवरà¥à¤¡ config फाइल में संगà¥à¤°à¤¹à¥€à¤¤ किया जाà¤à¤—ा यह उपयोग कर सकते हैं जो हर किसी को दिखाई दे.",
"Website": "वेबसाइट",
"Weekly": "सापà¥à¤¤à¤¾à¤¹à¤¿à¤•",
"WeeklyReport": "सापà¥à¤¤à¤¾à¤¹à¤¿à¤•",
@@ -418,7 +416,7 @@
"MultiChartLabel": "सà¥à¤ªà¤¾à¤°à¥à¤•à¤²à¤¾à¤‡à¤¨ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤",
"NavigationBack": "वापस जाà¤à¤",
"NetworkError": "नेटवरà¥à¤• तà¥à¤°à¥à¤Ÿà¤¿",
- "NetworkErrorWithStatusCode": "कोई तà¥à¤°à¥à¤Ÿà¤¿ \"%s\" थी. अनà¥à¤°à¥‹à¤§ सà¥à¤¥à¤¿à¤¤à¤¿ लौट \"%s\" आà¤. यूआरà¤à¤² \"%s\" था. अधिक तà¥à¤°à¥à¤Ÿà¤¿ के बारे में जानकारी और कैसे इसे हल करने के लिठइस सरà¥à¤µà¤° पर आपके दà¥à¤µà¤¾à¤°à¤¾ दरà¥à¤œ URL और तà¥à¤°à¥à¤Ÿà¤¿ लॉग की जाà¤à¤š करें.",
+ "NetworkErrorWithStatusCode": "कोई तà¥à¤°à¥à¤Ÿà¤¿ \"%1$s\" थी. अनà¥à¤°à¥‹à¤§ सà¥à¤¥à¤¿à¤¤à¤¿ लौट \"%2$s\" आà¤. यूआरà¤à¤² \"%3$s\" था. अधिक तà¥à¤°à¥à¤Ÿà¤¿ के बारे में जानकारी और कैसे इसे हल करने के लिठइस सरà¥à¤µà¤° पर आपके दà¥à¤µà¤¾à¤°à¤¾ दरà¥à¤œ URL और तà¥à¤°à¥à¤Ÿà¤¿ लॉग की जाà¤à¤š करें.",
"NetworkErrorWithStatusCodeShort": "नेटवरà¥à¤• तà¥à¤°à¥à¤Ÿà¤¿ %s",
"NetworkNotReachable": "पहà¥à¤‚च के बाहर नेटवरà¥à¤•",
"NoAccountIsSelected": "आपको à¤à¤• खाते का चयन करना है. यदि अपने विनà¥à¤¯à¤¸à¥à¤¤ नहीं किया है, तो à¤à¤• नया खाता जोड़ें.",
@@ -435,7 +433,7 @@
"RatingDontRemindMe": "मà¥à¤à¥‡ याद मत दिलाओ",
"RatingNotNow": "अà¤à¥€ नहीं",
"RatingNow": "ठीक है, मैं अब यह दर दूà¤à¤—ा",
- "RatingPleaseRateUs": "आप में अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— दर करने के लिठ1 मिनट ले लिया %sतो हम सच में जानना चाहेंगे Piwik मोबाइल à¤à¤• फà¥à¤°à¥€ सॉफà¥à¤Ÿà¤µà¥‡à¤¯à¤° है.आपको नई सà¥à¤µà¤¿à¤§à¤¾à¤“ं या बग रिपोरà¥à¤Ÿ का सà¥à¤à¤¾à¤µ हैं तो कृपया %sसंपरà¥à¤• करें",
+ "RatingPleaseRateUs": "आप में अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— दर करने के लिठ1 मिनट ले लिया %1$sतो हम सच में जानना चाहेंगे Piwik मोबाइल à¤à¤• फà¥à¤°à¥€ सॉफà¥à¤Ÿà¤µà¥‡à¤¯à¤° है.आपको नई सà¥à¤µà¤¿à¤§à¤¾à¤“ं या बग रिपोरà¥à¤Ÿ का सà¥à¤à¤¾à¤µ हैं तो कृपया %2$sसंपरà¥à¤• करें",
"ReleaseToRefresh": "रीफ़à¥à¤°à¥‡à¤¶ करने के लिठछोड़ दें ...",
"Reloading": "पà¥à¤¨: लोड ...",
"RequestTimedOutShort": "संजाल टाइमआउट तà¥à¤°à¥à¤Ÿà¤¿",
@@ -458,7 +456,7 @@
"CompareRows": "रिकॉरà¥à¤¡ की तà¥à¤²à¤¨à¤¾ करें",
"ComparingRecords": "पंकà¥à¤¤à¤¿à¤¯à¥‹à¤‚ की %s तà¥à¤²à¤¨à¤¾ करना",
"Documentation": "विशाल विकास गà¥à¤°à¤¾à¤« में उनà¥à¤¹à¥‡à¤‚ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ करने के लिठमेटà¥à¤°à¤¿à¤•à¥à¤¸ कà¥à¤²à¤¿à¤• करें. पà¥à¤°à¤¯à¥‹à¤— à¤à¤• ही बार में à¤à¤•à¤¾à¤§à¤¿à¤• मैटà¥à¤°à¤¿à¤•à¥à¤¸ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ करने के लिठशिफà¥à¤Ÿ कà¥à¤²à¤¿à¤• करें.",
- "MetricBetweenText": "%s और %s के बीच",
+ "MetricBetweenText": "%1$s और %2$s के बीच",
"MetricChangeText": "अवधि %s से अधिक है",
"MetricsFor": "%s के लिठमेटà¥à¤°à¤¿à¤•à¥à¤¸",
"MultiRowEvolutionTitle": "à¤à¤•à¤¾à¤§à¤¿à¤• पंकà¥à¤¤à¤¿à¤¯à¥‹à¤‚ का विकास",
diff --git a/lang/hr.json b/lang/hr.json
index 77d30680a4f00b243f503bee67472ad3b6c67555..c959ac59c5ff88263f5756924b8ee534a3ddec65 100644
--- a/lang/hr.json
+++ b/lang/hr.json
@@ -10,7 +10,7 @@
"And": "i",
"API": "API",
"ArchivingInlineHelp": "PreporuÄljivo je iskljuÄiti pokretanje arhiviranja pri posjeti za stranice sa srednjom i visokom posjećenošću.Umjesto toga savjetujemo da postavite cron job koji će obraditi Piwik izvjeÅ¡taje svakih sat vremena.",
- "ArchivingTriggerDescription": "Za veće Piwik instalacije preporuÄamo %spostavljanje cron joba %s za automatsku obradu izvjeÅ¡taja.",
+ "ArchivingTriggerDescription": "Za veće Piwik instalacije preporuÄamo %1$spostavljanje cron joba %2$s za automatsku obradu izvjeÅ¡taja.",
"AuthenticationMethodSmtp": "NaÄin SMTP autorizacije",
"AverageOrderValue": "ProsjeÄna vrijednost narudžbe",
"AveragePrice": "ProsjeÄna cijena",
@@ -21,10 +21,8 @@
"Cancel": "Odustani",
"ChangePassword": "Promjeni lozinku.",
"ChangeTagCloudView": "Napominjemo da izvjeÅ¡taje možete vidjeti i na druge naÄine osim u obliku oblaka za oznakama. Za promjenu prikaza koristite kontrole na dnu izvjeÅ¡taja.",
- "ChooseDate": "Odaberi datum",
"ChooseLanguage": "Odaberite jezik",
"ChoosePeriod": "Odaberite vremenski raspon",
- "ChooseWebsite": "Odaberite internet stranicu",
"ClickHere": "Klikni za više informacija",
"Close": "Zatvori",
"ClickToSearch": "Klikni za pretragu",
@@ -69,7 +67,7 @@
"ColumnValuePerVisit": "Prihod po posjeti",
"ColumnVisitDuration": "Trajanje posjete (u sekundama)",
"ColumnVisitsWithConversions": "Posjete sa konverzijama",
- "ConfigFileIsNotWritable": "Nije moguće upisati promjene u Piwik konfiguracijsku datoteku %s. %s Izmjenite dozvole na datoteci kako bi se moglo u nju upisivati.",
+ "ConfigFileIsNotWritable": "Nije moguće upisati promjene u Piwik konfiguracijsku datoteku %1$s. %2$s Izmjenite dozvole na datoteci kako bi se moglo u nju upisivati.",
"Continue": "Nastavi",
"ContinueToPiwik": "Nastavi na Piwik",
"CurrentMonth": "Tekući mjesec",
@@ -83,7 +81,7 @@
"Date": "Datum",
"DateRange": "Vremenski raspon:",
"DateRangeFrom": "Od",
- "DateRangeFromTo": "Od %s do %s",
+ "DateRangeFromTo": "Od %1$s do %2$s",
"DateRangeTo": "Do",
"DaysHours": "%1$s dan(a) %2$s sat(a)",
"DaysSinceFirstVisit": "Dana od prve posjete",
@@ -118,14 +116,14 @@
"ExceptionFilesizeMismatch": "VeliÄina datoteke ne odgovara:%1$s (oÄekivana veliÄina: %2$s, pronaÄ‘ena: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Vaša %1$s klijent verzija je %2$s koja nije uskladiva sa server verzijom %3$s.",
"ExceptionInvalidArchiveTimeToLive": "Vrijednost mora biti broj sekundi veći od nule.",
- "ExceptionInvalidDateFormat": "Format datuma mora biti %s ili bilo koji izraz koji prepoznaje %s funkcija (vidi %s za više informacija)",
- "ExceptionInvalidDateRange": "Datum '%s' nema ispravan raspon. Mora imati sljedeći oblik: %s.",
- "ExceptionInvalidPeriod": "Razdoblje '%s' nije podržano. Pokušaj sa nekim od sljedećih: %s",
- "ExceptionInvalidRendererFormat": "Format prikaza '%s' nije valjan. Pokušaj sa nekim od sljedećih: %s.",
- "ExceptionInvalidReportRendererFormat": "Format izvještaja '%s' nije valjan. Pokušaj sa nekim od sljedećih: %s.",
+ "ExceptionInvalidDateFormat": "Format datuma mora biti %1$s ili bilo koji izraz koji prepoznaje %2$s funkcija (vidi %3$s za više informacija)",
+ "ExceptionInvalidDateRange": "Datum '%1$s' nema ispravan raspon. Mora imati sljedeći oblik: %2$s.",
+ "ExceptionInvalidPeriod": "Razdoblje '%1$s' nije podržano. Pokušaj sa nekim od sljedećih: %2$s",
+ "ExceptionInvalidRendererFormat": "Format prikaza '%1$s' nije valjan. Pokušaj sa nekim od sljedećih: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Format izvještaja '%1$s' nije valjan. Pokušaj sa nekim od sljedećih: %2$s.",
"ExceptionInvalidToken": "Oznaka nije valjana.",
"ExceptionLanguageFileNotFound": "JeziÄna datoteka '%s' nije pronaÄ‘ena.",
- "ExceptionMethodNotFound": "Metoda '%s' ne postoji ili nije dostupna u modulu '%s'.",
+ "ExceptionMethodNotFound": "Metoda '%1$s' ne postoji ili nije dostupna u modulu '%2$s'.",
"ExceptionMissingFile": "Nedostaje datoteka: %s",
"ExceptionNonceMismatch": "Nije moguće provjeriti sigurnosnu oznaku obrasca.",
"ExceptionPrivilege": "Nije moguće pristupiti ovoj funkciji jer zahjeva %s nivo pristupa.",
@@ -133,7 +131,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Nije moguće pristupiti ovoj funkciji jer zahjeva %s nivo pristupa za barem jednu web stranicu.",
"ExceptionUnableToStartSession": "Nije moguće pokrenuti vezu.",
"ExceptionUndeletableFile": "Nije moguće obrisati %s",
- "ExceptionUnreadableFileDisabledMethod": "Nije moguće proÄitati konfiguracijsku datoteku {%s}. Moguće je da je vaÅ¡ poslužitelj iskljuÄio %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Nije moguće proÄitati konfiguracijsku datoteku {%1$s}. Moguće je da je vaÅ¡ poslužitelj iskljuÄio %2$s.",
"ExceptionReportNotFound": "Zatraženi izvještaj ne postoji",
"Export": "Izvezi",
"ExportAsImage": "Izvezi kao sliku",
@@ -164,7 +162,7 @@
"LoadingData": "UÄitavam podatke...",
"Locale": "hr_HR.UTF-8",
"Logout": "Odjavi se",
- "MediumToHighTrafficItIsRecommendedTo": "Za stranice sa srednjim i velikim prometom preporuÄamo da izvjeÅ¡taje za tekući dan najviÅ¡e svakih pola sata (%s sekundi) ili svakih sat vremena (%s sekundi).",
+ "MediumToHighTrafficItIsRecommendedTo": "Za stranice sa srednjim i velikim prometom preporuÄamo da izvjeÅ¡taje za tekući dan najviÅ¡e svakih pola sata (%1$s sekundi) ili svakih sat vremena (%2$s sekundi).",
"Metadata": "META data",
"MinutesSeconds": "%1$s min %2$ss",
"Monthly": "MjeseÄno",
@@ -208,7 +206,7 @@
"OperationNotEquals": "Nije jednako",
"OptionalSmtpPort": "Opcionalno. Pretpostavljena vrijednost je 25 za neenkriptiranu i TLS vezu ili 465 za SSL vezu.",
"Options": "Opcije",
- "OrCancel": "ili %s odustani %s",
+ "OrCancel": "ili %1$s odustani %2$s",
"Others": "Ostali",
"Outlink": "Odlazni link",
"Outlinks": "Odlazni linkovi",
@@ -241,7 +239,7 @@
"Save": "Spremi",
"SaveImageOnYourComputer": "Za spremanje slike na vaÅ¡e raÄunalo koristite desni klik na sliku i odaberite opciju za spremanje slike.",
"Search": "Pretraga",
- "SeeTheOfficialDocumentationForMoreInformation": "Za više informacija pogledajte %sslužbenu dokumentaciju%s.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Za više informacija pogledajte %1$sslužbenu dokumentaciju%2$s.",
"SelectYesIfYouWantToSendEmailsViaServer": "Odaberite \"Da\" ako želite slati mail preko poslužitelja umjesto pomoću lokalne funckije",
"Settings": "Postavke",
"Shipping": "Poštarina",
@@ -281,7 +279,7 @@
"Warning": "Upozorenje",
"WarningFileIntegrityNoManifest": "Nije moguće napraviti provjeru integriteta datoteke jer nedostaje manifest.inc.php.",
"WarningFileIntegrityNoMd5file": "Nije moguće napraviti provjeru integriteta datoteke jer funkcija md5_file() nije dostupna.",
- "WarningPasswordStored": "%sPozor:%s Ova će lozinka biti pohranjena u konfiguracijsku datoteka i biti će vidljiva svima koji imaju pristup toj datoteci.",
+ "WarningPasswordStored": "%1$sPozor:%2$s Ova će lozinka biti pohranjena u konfiguracijsku datoteka i biti će vidljiva svima koji imaju pristup toj datoteci.",
"Website": "Web stranica",
"Weekly": "Tjedno",
"Widgets": "Widgeti",
@@ -335,7 +333,7 @@
"TryIt": "Probaj!"
},
"RowEvolution": {
- "MetricBetweenText": "od %s do %s",
+ "MetricBetweenText": "od %1$s do %2$s",
"PickARow": "Odaberi redak za usporedbu"
}
}
\ No newline at end of file
diff --git a/lang/hu.json b/lang/hu.json
index 19265c78ecf6a97ecd345ffbc6f33beed1108201..6169badfef1d3dd14f2378e1a4e7961f3f4110f5 100644
--- a/lang/hu.json
+++ b/lang/hu.json
@@ -13,7 +13,7 @@
"API": "API",
"Apply": "Alkalmaz",
"ArchivingInlineHelp": "Közepes és nagy forgalmú weboldalak esetén ajánlott letiltani a böngészÅ‘vel való megnyitás által elÅ‘idézett archiválást. Ehelyett ajánlott egy cron job beállÃtása, mely óránként feldolgozza a Piwik jelentéseket.",
- "ArchivingTriggerDescription": "Nagyobb, Piwik-et használó weboldalak esetén ajánlott. A jelentések automatikus feldolgozásához %segy cron job belállÃtása%s is szükséges.",
+ "ArchivingTriggerDescription": "Nagyobb, Piwik-et használó weboldalak esetén ajánlott. A jelentések automatikus feldolgozásához %1$segy cron job belállÃtása%2$s is szükséges.",
"AuthenticationMethodSmtp": "SMTP autentikációs módszer",
"AverageOrderValue": "Ãtlagos rendelési érték",
"AveragePrice": "Ãtlagár",
@@ -24,10 +24,8 @@
"Cancel": "Mégse",
"ChangePassword": "Jelszó megváltoztatása",
"ChangeTagCloudView": "Figyelmedbe ajánljuk, hogy a jelentés a cÃmkefelhÅ‘n kÃvül más formátumokban is megtekinthetÅ‘ a jelentés alján található gombok segÃtségével.",
- "ChooseDate": "Válassz dátumot",
"ChooseLanguage": "Válassz nyelvet",
"ChoosePeriod": "Válassz időtartamot",
- "ChooseWebsite": "Válassz weboldalt",
"ClickHere": "Kattints ide további információért.",
"Close": "Bezárás",
"ClickToSearch": "Kattintson a kereséshez",
@@ -73,7 +71,7 @@
"ColumnValuePerVisit": "Látogatásonkénti érték",
"ColumnVisitDuration": "Látogatás időtartama (másodpercekben)",
"ColumnVisitsWithConversions": "Látogatások konverzióval",
- "ConfigFileIsNotWritable": "A Piwik konfigurációs fájl %s nem Ãrható, Ãgy egyes változtatásokat nem lehet elmenteni. %s Kérjük, engedélyezze a konfigurációs fájlra az Ãrási jogot.",
+ "ConfigFileIsNotWritable": "A Piwik konfigurációs fájl %1$s nem Ãrható, Ãgy egyes változtatásokat nem lehet elmenteni. %2$s Kérjük, engedélyezze a konfigurációs fájlra az Ãrási jogot.",
"ContinueToPiwik": "Tovább a Piwik-hez",
"CurrentMonth": "Aktuális hónap",
"CurrentWeek": "Aktuális hét",
@@ -83,7 +81,7 @@
"Date": "Dátum",
"DateRange": "Időintervallum:",
"DateRangeFrom": "Ettől",
- "DateRangeFromTo": "%s-tól %s-ig",
+ "DateRangeFromTo": "%1$s-tól %2$s-ig",
"DateRangeTo": "Eddig",
"DaysHours": "%1$s nap %2$s óra",
"DaysSinceFirstVisit": "Első látogatás óta eltelt napok",
@@ -114,14 +112,14 @@
"ExceptionFilesizeMismatch": "Fájlméret nem egyezik %1$s (várt hossz: %2$s, ehelyett a talált: %3$s)",
"ExceptionIncompatibleClientServerVersions": "A %1$s kliens verzió: %2$s, mely inkompatibilis a következő szerver verzióval: %3$s.",
"ExceptionInvalidArchiveTimeToLive": "A mai archÃvum élettartamának nullánál nagyobbnak kell lennie másodpercekben mérve.",
- "ExceptionInvalidDateFormat": "A dátumformátumnak a következőnek kell lennie: %s vagy bármely, a %s funkció által támogatott kulcsszó (további információ: %s)",
- "ExceptionInvalidDateRange": "A '%s' időintervallum nem megfelelő. Kérjük, próbáld meg helyette a következőket: %s.",
- "ExceptionInvalidPeriod": "A '%s' időtartam nem támogatott. Kérjük, próbáld meg helyette a következőket: %s.",
- "ExceptionInvalidRendererFormat": "A '%s' megjelenÃtési formátum érvénytelen. Kérjük, próbáld meg helyette a következÅ‘ket: %s.",
- "ExceptionInvalidReportRendererFormat": "A '%s' jelentés formátum érvénytelen. Próbálkozz egy másikkal a következőek közül: %s.",
+ "ExceptionInvalidDateFormat": "A dátumformátumnak a következőnek kell lennie: %1$s vagy bármely, a %2$s funkció által támogatott kulcsszó (további információ: %3$s)",
+ "ExceptionInvalidDateRange": "A '%1$s' időintervallum nem megfelelő. Kérjük, próbáld meg helyette a következőket: %2$s.",
+ "ExceptionInvalidPeriod": "A '%1$s' időtartam nem támogatott. Kérjük, próbáld meg helyette a következőket: %2$s.",
+ "ExceptionInvalidRendererFormat": "A '%1$s' megjelenÃtési formátum érvénytelen. Kérjük, próbáld meg helyette a következÅ‘ket: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "A '%1$s' jelentés formátum érvénytelen. Próbálkozz egy másikkal a következőek közül: %2$s.",
"ExceptionInvalidToken": "Érvénytelen kód.",
"ExceptionLanguageFileNotFound": "A '%s' nyelvi fájl nem található",
- "ExceptionMethodNotFound": "A '%s' eljárás nem létezik, vagy nem áll rendelkezésre a '%s' modulban.",
+ "ExceptionMethodNotFound": "A '%1$s' eljárás nem létezik, vagy nem áll rendelkezésre a '%2$s' modulban.",
"ExceptionMissingFile": "Hiányzó fájl: %s",
"ExceptionNonceMismatch": "Nem lehetett ellenőrizni a biztonsági kódot ezen az űrlapon.",
"ExceptionPrivilege": "Ez a lehetőség nem elérhető, mivel %s szintű hozzáférés kellene hozzá.",
@@ -129,7 +127,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Ez a lehetőség nem elérhető, mivel %s szintű hozzáférés kellene hozzá legalább egy weboldal esetén.",
"ExceptionUnableToStartSession": "Nem lehet elindÃtani a munkamenetet.",
"ExceptionUndeletableFile": "Ezt nem lehet letörölni: %s",
- "ExceptionUnreadableFileDisabledMethod": "A konfigurációs fájl {%s} nem olvasható. Lehet, hogy a szerveren nem engedélyezett a következő: %s.",
+ "ExceptionUnreadableFileDisabledMethod": "A konfigurációs fájl {%1$s} nem olvasható. Lehet, hogy a szerveren nem engedélyezett a következő: %2$s.",
"Export": "Export",
"ExportAsImage": "Exportálás képként",
"ExportThisReport": "Adatok exportálása más formátumokba",
@@ -154,7 +152,7 @@
"LoadingData": "Adatok betöltése folyamatban…",
"Locale": "hu_HU.UTF-8",
"Logout": "Kilépés",
- "MediumToHighTrafficItIsRecommendedTo": "Közepes vagy nagy forgalmú weboldalak esetén javasoljuk, hogy a jelentések legfeljebb félóránként (%s másodpercenként) vagy óránként (%s másodpercenként) kerüljenek feldolgozásra.",
+ "MediumToHighTrafficItIsRecommendedTo": "Közepes vagy nagy forgalmú weboldalak esetén javasoljuk, hogy a jelentések legfeljebb félóránként (%1$s másodpercenként) vagy óránként (%2$s másodpercenként) kerüljenek feldolgozásra.",
"MinutesSeconds": "%1$s perc %2$s mp.",
"Monthly": "Havi",
"MultiSitesSummary": "Összes weboldal",
@@ -178,7 +176,7 @@
"OnlyUsedIfUserPwdIsSet": "Csak abban az esetben használva, ha a felhasználói név és jelszó megadásra került. Kérdezd meg a rendszeradminisztrátorod, ha nem vagy biztos, melyik megoldást használd.",
"OpenSourceWebAnalytics": "NyÃlt forráskódú webanalitika",
"OptionalSmtpPort": "Opcionális. Alapértelmezettként 25-ös port a nem titkosÃtott és a TLS SMTP esetén és 465-ös port a SSL SMTP esetén.",
- "OrCancel": "vagy %s megszakÃt %s",
+ "OrCancel": "vagy %1$s megszakÃt %2$s",
"Others": "Mások",
"Outlink": "Kimenő link",
"Outlinks": "Kimenő linkek",
@@ -211,7 +209,7 @@
"Save": "Mentés",
"SaveImageOnYourComputer": "A kép lementéséhez kattints jobbklikkel a képre és választ a \"Kép mentése más néven…\" opciót.",
"Search": "Keresés",
- "SeeTheOfficialDocumentationForMoreInformation": "A további részletekkel kapcsolatban lásd a %shivatalos dokumentációt%s.",
+ "SeeTheOfficialDocumentationForMoreInformation": "A további részletekkel kapcsolatban lásd a %1$shivatalos dokumentációt%2$s.",
"SelectYesIfYouWantToSendEmailsViaServer": "Válaszd az \"Igen\"-t, ha az e-mailek elküldését egy megadott szerverrel, és nem pedig a local mail funkcióval szeretnéd megoldani.",
"Settings": "BeállÃtások",
"Shipping": "SzállÃtás",
@@ -258,7 +256,7 @@
"Warning": "Figyelmeztetés",
"WarningFileIntegrityNoManifest": "A fájlintegritás-ellenőrzés nem hajtható végre, mivel hiányzik a manifest.inc.php fájl.",
"WarningFileIntegrityNoMd5file": "A fájlintegritás-ellenőrzés nem hajtható végre, mivel az md5_file() funkció nem elérhető.",
- "WarningPasswordStored": "%sFigyelmeztetés:%s Ez a jelszó eltárolásra kerül a konfigurációs fájlban, Ãgy bárki láthatja, aki hozzáfér a fájlhoz.",
+ "WarningPasswordStored": "%1$sFigyelmeztetés:%2$s Ez a jelszó eltárolásra kerül a konfigurációs fájlban, Ãgy bárki láthatja, aki hozzáfér a fájlhoz.",
"Website": "Weboldal",
"Weekly": "Heti",
"WeeklyReport": "heti",
@@ -317,7 +315,7 @@
"CompareRows": "Adatok összehasonlÃtása",
"ComparingRecords": "%s sorok összehasonlÃtása",
"Documentation": "Válassza ki a megjelenÃtendÅ‘ metrikákat, amelyeket szeretne megtekinteni nagy evolúciós grafikonon. A shift billentyű nyomvatartásával több metrika egyidejűleg megjelenthetÅ‘.",
- "MetricBetweenText": "%s-től %s-ig",
+ "MetricBetweenText": "%1$s-től %2$s-ig",
"PickAnotherRow": "Válasszon egy mások sort az összehasonlÃtáshoz",
"PickARow": "Válasszon egy sort az összehasonlÃtáshoz"
}
diff --git a/lang/id.json b/lang/id.json
index 6245ae969fee6863aa490387d04dbdde6fe47b0e..2e052353fcef56d36bc27cf2509e6530a37ff61e 100644
--- a/lang/id.json
+++ b/lang/id.json
@@ -15,7 +15,7 @@
"API": "API",
"Apply": "Terapkan",
"ArchivingInlineHelp": "Untuk kunjungan situs menengah hingga tinggi, disarankan untuk mematikan pengarsipan Piwik ketika laporan ditampilkan. Kami lebih menyarankan untuk mengatur tugas Cron untuk mengolah laporan pada tiap jam.",
- "ArchivingTriggerDescription": "Disarankan untuk instalasi Piwik besar untuk %smengatur tugas Cron%s untuk mengolah laporan otomatis.",
+ "ArchivingTriggerDescription": "Disarankan untuk instalasi Piwik besar untuk %1$smengatur tugas Cron%2$s untuk mengolah laporan otomatis.",
"AuthenticationMethodSmtp": "Metode otentikasi untuk SMTP",
"AverageOrderValue": "Rerata Nilai Permintaan",
"AveragePrice": "Harga Rerata",
@@ -27,10 +27,8 @@
"CannotUnzipFile": "Tidak dapat membongkar berkas %1$s: %2$s",
"ChangePassword": "Ganti Sandi",
"ChangeTagCloudView": "Perlu diketahui, bahwa Anda dapat melihat laporan dalam cara lain selain sebagai etiket awan. Gunakan kendali di bagian bawah laporan untuk melakukannya.",
- "ChooseDate": "Pilih tanggal",
"ChooseLanguage": "Pilih bahasa",
"ChoosePeriod": "Pilih periode",
- "ChooseWebsite": "Pilih situs",
"ClickHere": "Klik di sini untuk informasi lebih lanjut.",
"ClickToChangePeriod": "Klik kembali untuk mengubah periode.",
"Close": "Tutup",
@@ -84,7 +82,7 @@
"ColumnViewedAfterSearchDocumentation": "Jumlah kali Halaman ini dikunjungi setelah pengnjung melakukan pencarian dalam Situs Anda, dan mengekik Halaman ini di hasil pencarian.",
"ColumnVisitDuration": "Lama Kunjungan (dalam detik)",
"ColumnVisitsWithConversions": "Kunjungan dengan Tayangan",
- "ConfigFileIsNotWritable": "Berkas konfigurasi Piwik %s tak dapat ditulisi, beberapa perubahan Anda kemungkinan tidak tersimpan. %s Silakan mengubah perizinan berkas konfigurasi agar dapat ditulisi.",
+ "ConfigFileIsNotWritable": "Berkas konfigurasi Piwik %1$s tak dapat ditulisi, beberapa perubahan Anda kemungkinan tidak tersimpan. %2$s Silakan mengubah perizinan berkas konfigurasi agar dapat ditulisi.",
"Continue": "Lanjut",
"ContinueToPiwik": "Lanjut ke Piwik",
"CurrentMonth": "Bulan Ini",
@@ -100,7 +98,7 @@
"Date": "Tanggal",
"DateRange": "Rentang tanggal:",
"DateRangeFrom": "Dari",
- "DateRangeFromTo": "Dari %s ke %s",
+ "DateRangeFromTo": "Dari %1$s ke %2$s",
"DateRangeInPeriodList": "rentang tanggal",
"DateRangeTo": "Kepada",
"DaysHours": "%1$s hari %2$s jam",
@@ -133,28 +131,28 @@
"Edit": "Sunting",
"EncryptedSmtpTransport": "Masukkan penyandian lapisan transpor yang dibutuhkan peladen SMTP.",
"Error": "Galat",
- "ErrorRequest": "Ups.. terdapat kesalahan selama melakukan permintaan. Mungkin peladen mendapat masalah sementara, atau mungkin Anda melakukan permintaan dengan data yang terlalu besar. Silakan coba kembali. Bila galat ini terjadi berulang, silakan %shubungi pengelola Piwik Anda%s untuk bantuan.",
+ "ErrorRequest": "Ups.. terdapat kesalahan selama melakukan permintaan. Mungkin peladen mendapat masalah sementara, atau mungkin Anda melakukan permintaan dengan data yang terlalu besar. Silakan coba kembali. Bila galat ini terjadi berulang, silakan %1$shubungi pengelola Piwik Anda%2$s untuk bantuan.",
"EvolutionOverPeriod": "Perkembangan selama periode",
"EvolutionSummaryGeneric": "%1$s di %2$s dibandingkan dengan %3$s di %4$s. Perubahan: %5$s",
- "ExceptionContactSupportGeneric": "Bila Anda tetap mengalami kendala, silakan %shubungi pengelola Piwik Anda%s untuk bantuan.",
+ "ExceptionContactSupportGeneric": "Bila Anda tetap mengalami kendala, silakan %1$shubungi pengelola Piwik Anda%2$s untuk bantuan.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Pengguna harus menjadi Pengguna Super atau pengguna '%s' itu sendiri.",
"ExceptionConfigurationFileNotFound": "Berkas konfigurasi {%s} tak ditemukan.",
- "ExceptionConfigurationFileNotFound2": "Bila berkas tersebut ada, harap memeriksa bahwa berkas %s dapat dibaca oleh pengguna '%s'.",
+ "ExceptionConfigurationFileNotFound2": "Bila berkas tersebut ada, harap memeriksa bahwa berkas %1$s dapat dibaca oleh pengguna '%2$s'.",
"ExceptionDatabaseVersion": "Versi %1$s Anda adalah %2$s, tetapi Piwik membtuhkan setidaknya versi %3$s.",
"ExceptionFileIntegrity": "Pemerikasaa intergritas gagal: %s",
"ExceptionFilesizeMismatch": "Ukuran berkas tak sesuai: %1$s (diharapkan panjang: %2$s, ditemukan: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Versi klien %1$s Anda adalah %2$s yang tidak sesuai dengan server versi %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Laporan keseluruhan bentuk '%s' tak sahih. Coba salah satu berikut ini sebagai pengganti: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Laporan keseluruhan bentuk '%1$s' tak sahih. Coba salah satu berikut ini sebagai pengganti: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Pengarsipan hari ini agar aktif, nilai detik harus harus lebih besar dari nol",
- "ExceptionInvalidDateFormat": "Pola tanggal harus: %s atau kata kunci lain yang didukung oleh fungsi %s (lihat %s untuk informasi selengkapnya)",
- "ExceptionInvalidDateRange": "Tanggal '%s' bukan rentang tanggal yang benar. Tanggal harus memiliki format sebagai berikut: %s.",
- "ExceptionInvalidPeriod": "Periode '%s' tidak didukung. Coba salah satu berikut ini sebagai pengganti: %s",
- "ExceptionInvalidRendererFormat": "Penyaji format '%s' tak sahih. Coba salah satu berikut ini sebagai pengganti: %s.",
- "ExceptionInvalidReportRendererFormat": "Laporan format '%s' tak sahih. Coba salah satu berikut ini sebagai pengganti: %s.",
- "ExceptionInvalidStaticGraphType": "Grafik statis jenis '%s' tak sahih. Coba salah satu berikut ini sebagai pengganti: %s.",
+ "ExceptionInvalidDateFormat": "Pola tanggal harus: %1$s atau kata kunci lain yang didukung oleh fungsi %2$s (lihat %3$s untuk informasi selengkapnya)",
+ "ExceptionInvalidDateRange": "Tanggal '%1$s' bukan rentang tanggal yang benar. Tanggal harus memiliki format sebagai berikut: %2$s.",
+ "ExceptionInvalidPeriod": "Periode '%1$s' tidak didukung. Coba salah satu berikut ini sebagai pengganti: %2$s",
+ "ExceptionInvalidRendererFormat": "Penyaji format '%1$s' tak sahih. Coba salah satu berikut ini sebagai pengganti: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Laporan format '%1$s' tak sahih. Coba salah satu berikut ini sebagai pengganti: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Grafik statis jenis '%1$s' tak sahih. Coba salah satu berikut ini sebagai pengganti: %2$s.",
"ExceptionInvalidToken": "Kepingan tak sahih.",
"ExceptionLanguageFileNotFound": "Berkas bahasa '%s' tak ditemukan.",
- "ExceptionMethodNotFound": "Metode '%s' tidak ada atau tak tersedia di modul '%s'.",
+ "ExceptionMethodNotFound": "Metode '%1$s' tidak ada atau tak tersedia di modul '%2$s'.",
"ExceptionMissingFile": "Berkas hilang: %s",
"ExceptionNonceMismatch": "Tidak dapat memeriksa kepingan dari borang ini.",
"ExceptionPrivilege": "Anda tak dapat mengakses sumber daya ini karena membutuhkan akses %s.",
@@ -162,7 +160,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Anda tak dapat mengakses sumber daya ini karena membutuhkan setidaknya akses %s untuk satu situs.",
"ExceptionUnableToStartSession": "Tak dapat memulai sesi.",
"ExceptionUndeletableFile": "Tak dapat meghapus %s",
- "ExceptionUnreadableFileDisabledMethod": "Berkas konfigurasi {%s} tak dapat dibaca. Inang Anda kemungkungkinan mematikan %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Berkas konfigurasi {%1$s} tak dapat dibaca. Inang Anda kemungkungkinan mematikan %2$s.",
"Export": "Ekspor",
"ExportAsImage": "Ekspor sebagai Gambar",
"ExportThisReport": "Ekspor dataset ini ke format lain",
@@ -199,7 +197,7 @@
"Logout": "Keluar-log",
"MainMetrics": "Metrik utama",
"Matches": "Cocok",
- "MediumToHighTrafficItIsRecommendedTo": "Untuk kunjungan menengah hingga tinggi, kami menyarankan untuk mengolah laporan untuk hari ini setiap setengah jam (%s detik) atau satu jam (%s detik).",
+ "MediumToHighTrafficItIsRecommendedTo": "Untuk kunjungan menengah hingga tinggi, kami menyarankan untuk mengolah laporan untuk hari ini setiap setengah jam (%1$s detik) atau satu jam (%2$s detik).",
"Metadata": "Metadata",
"Metric": "Metrik",
"Metrics": "Metrik",
@@ -249,7 +247,7 @@
"OperationNotEquals": "Tidak sama dengan",
"OptionalSmtpPort": "Pilihan. Asali 25 untuk sambungan tak tersandi dan SMTP TLS, serta 465 untuk SMTP SSL.",
"Options": "Opsi",
- "OrCancel": "atau %s Batal %s",
+ "OrCancel": "atau %1$s Batal %2$s",
"Others": "Lainnya",
"Outlink": "Tautan keluar",
"Outlinks": "Tautan Luar",
@@ -257,7 +255,7 @@
"OverlayRowActionTooltipTitle": "Buka Penghampar Halaman",
"Overview": "Iktisar",
"Pages": "Halaman",
- "ParameterMustIntegerBetween": "Parameter %s harus bilangan bulat antara %s dan %s.",
+ "ParameterMustIntegerBetween": "Parameter %1$s harus bilangan bulat antara %2$s dan %3$s.",
"Password": "Sandi",
"Period": "Periode",
"Piechart": "Bagan Lingkaran",
@@ -299,7 +297,7 @@
"SaveImageOnYourComputer": "Untuk menyimpan gambar ke komputer Anda, klik kanan di gambar dan pilih \"Simpan Gambar dengan Nama...\"",
"Search": "Cari",
"SearchNoResults": "Tidak ada hasil",
- "SeeTheOfficialDocumentationForMoreInformation": "Lihat %sdokumentasi resmi%s untuk informasi selengkapnya.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Lihat %1$sdokumentasi resmi%2$s untuk informasi selengkapnya.",
"SelectYesIfYouWantToSendEmailsViaServer": "Pilih \"Ya\" bila Anda ingin mengirim surel melalui peladen surel daripada menggunakan fungsi mail() lokal",
"Settings": "Pengaturan",
"Shipping": "Pengiriman",
@@ -347,7 +345,7 @@
"Warning": "Peringatan",
"WarningFileIntegrityNoManifest": "Pemeriksaan integritas berkas tak dapat dilakukan sebab berkas manifest.inc.php tak ditemukan.",
"WarningFileIntegrityNoMd5file": "Pemeriksaan integritas berkas tak dapat diselesaikan sebab fungsi md5_file() tak ditemukan.",
- "WarningPasswordStored": "%sPeringatan:%s Sandi akan disimpan dalam berkas konfigurasi yang tampak kepada semua yang dapat mengakses ini.",
+ "WarningPasswordStored": "%1$sPeringatan:%2$s Sandi akan disimpan dalam berkas konfigurasi yang tampak kepada semua yang dapat mengakses ini.",
"Website": "Situs",
"Weekly": "Mingguan",
"WeeklyReport": "mingguan",
@@ -400,7 +398,7 @@
"MultiChartLabel": "Tampilkan bagan garis",
"NavigationBack": "Kembali",
"NetworkError": "Galat Jaringan",
- "NetworkErrorWithStatusCode": "Terdapat galat \"%s\". Permintaan memberikan status \"%s\", dengan URL \"%s\". Harap periksa URL yang Anda masukkan dan catatan galat dalam peladen ini untuk informasi tentang galat dan bagaimana menyelesaikannya.",
+ "NetworkErrorWithStatusCode": "Terdapat galat \"%1$s\". Permintaan memberikan status \"%2$s\", dengan URL \"%3$s\". Harap periksa URL yang Anda masukkan dan catatan galat dalam peladen ini untuk informasi tentang galat dan bagaimana menyelesaikannya.",
"NetworkErrorWithStatusCodeShort": "Galat Jaringan %s",
"NetworkNotReachable": "Jaringan tak terjangkau",
"NoAccountIsSelected": "Anda harus memilih sebuah akun. Tambah akun baru bila Anda belum mengaturnya.",
@@ -418,7 +416,7 @@
"RatingDontRemindMe": "Jangan ingatkan lagi",
"RatingNotNow": "Jangan sekarang",
"RatingNow": "Baik, aku akan menilai sekarang",
- "RatingPleaseRateUs": "App Bergerak Piwik merupakan Perangkat Lunak Gratis, kami sangat menghargai bila Anda meluangkan waktu sebentar untuk menilai aplikasi ini di %s. Bila Anda memiliki permintaan fitur baru atau laporan kutu, harap menghubungi %s",
+ "RatingPleaseRateUs": "App Bergerak Piwik merupakan Perangkat Lunak Gratis, kami sangat menghargai bila Anda meluangkan waktu sebentar untuk menilai aplikasi ini di %1$s. Bila Anda memiliki permintaan fitur baru atau laporan kutu, harap menghubungi %2$s",
"ReleaseToRefresh": "Lepaskan untuk menyegarkan...",
"Reloading": "Memuat ulang...",
"RequestTimedOutShort": "Galat Waktu Tunggu Jaringan",
@@ -443,7 +441,7 @@
"CompareRows": "Bandingkan catatan",
"ComparingRecords": "Membandingkan %s baris",
"Documentation": "Klik metrik untuk menampilkan grafik perubahan besar. Gunakan shift-klik untuk menampikan banyak grafik sekaligus.",
- "MetricBetweenText": "antara %s dan %s",
+ "MetricBetweenText": "antara %1$s dan %2$s",
"MetricChangeText": "%s selama masa",
"MetricMinMax": "%1$s terentang antara %2$s dan %3$s melebihi masa",
"MetricsFor": "Metrik untuk %s",
diff --git a/lang/it.json b/lang/it.json
index a7c540aead36b3ce1676994cdfea5fb0e1e887c5..adbd85d3639a667fb01d0c19823a8b00d4592e99 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -15,7 +15,7 @@
"API": "API",
"Apply": "Applica",
"ArchivingInlineHelp": "Per i siti da medi a grandi, è raccomandabile disabilitare l'attivazione di Piwik dal browser. Raccomandiamo piuttosto di configurare un cron job per elaborare i report di Piwik ogni ora.",
- "ArchivingTriggerDescription": "Raccomandato per installazioni di Piwik grandi, devi %sconfigurare un cron job%s per elaborare i report automaticamente.",
+ "ArchivingTriggerDescription": "Raccomandato per installazioni di Piwik grandi, devi %1$sconfigurare un cron job%2$s per elaborare i report automaticamente.",
"AuthenticationMethodSmtp": "Metodo di autenticazione per SMTP",
"AverageOrderValue": "Valore medio ordine",
"AveragePrice": "Prezzo medio",
@@ -27,10 +27,9 @@
"CannotUnzipFile": "Impossibile scompattare il file %1$s: %2$s",
"ChangePassword": "Cambio password",
"ChangeTagCloudView": "Nota che puoi vedere il report in altri modi diversi dalla tag cloud. Usa i controlli in fondo al report per fare ciò.",
- "ChooseDate": "Scegli data",
+ "ChooseDate": "Scegli una data, attualmente è selezionata: %s",
"ChooseLanguage": "Scegli la lingua",
"ChoosePeriod": "Scegli il periodo",
- "ChooseWebsite": "Scegli il sito",
"ClickHere": "Clicca qui per maggiori informazioni",
"ClickToChangePeriod": "Clicca di nuovo per cambiare il periodo.",
"Close": "Chiudi",
@@ -84,9 +83,11 @@
"ColumnViewedAfterSearchDocumentation": "Numero di volte in cui questa Pagina è stata visitata dopo che un visitatore ha fatto una ricerca nel vostro sito e ha cliccato su questa pagina nei risultati della ricerca.",
"ColumnVisitDuration": "Durata delle visite (in secondi)",
"ColumnVisitsWithConversions": "Visite con Conversioni",
- "ConfigFileIsNotWritable": "Il file di configurazione di Piwik %s non è scrivibile, alcune delle tue impostazioni potrebbero non essere state salvate. %s Cambia i permessi del file di configurazione per farlo diventare modificabile.",
+ "ConfigFileIsNotWritable": "Il file di configurazione di Piwik %1$s non è scrivibile, alcune delle tue impostazioni potrebbero non essere state salvate. %2$s Cambia i permessi del file di configurazione per farlo diventare modificabile.",
"Continue": "Continua",
"ContinueToPiwik": "Vai a Piwik",
+ "CurrentlyUsingUnsecureHttp": "Al momento stai usando Piwik tramite il non sicuro HTTP, il che può essere rischioso. Ti raccomandiamo di configurare Piwik affinché utilizzi SSL (HTTPS) per una maggiore sicurezza.",
+ "CreatedByUser": "creato da %s",
"CurrentMonth": "Mese corrente",
"CurrentWeek": "Settimana corrente",
"CurrentYear": "Anno corrente",
@@ -100,7 +101,7 @@
"Date": "Data",
"DateRange": "Arco temporale:",
"DateRangeFrom": "Da",
- "DateRangeFromTo": "Da %s a %s",
+ "DateRangeFromTo": "Da %1$s a %2$s",
"DateRangeInPeriodList": "intervallo date",
"DateRangeTo": "A",
"DaysHours": "%1$s giorni %2$s ore",
@@ -133,30 +134,30 @@
"Edit": "Modifica",
"EncryptedSmtpTransport": "Inserisci la crittografia a livello di trasporto richiesta dal server SMTP.",
"Error": "Errore",
- "ErrorRequest": "Ooops... c'è stato un problema durante la richiesta. Forse il server ha avuto un problema temporaneo o forse hai richiesto un report con troppi dati. Si prega di provare nuovamente. Se questo errore si verifica ripetutamente, %scontatta il tuo amministratore di Piwik%s per assistenza.",
+ "ErrorRequest": "Ooops... c'è stato un problema durante la richiesta. Forse il server ha avuto un problema temporaneo o forse hai richiesto un report con troppi dati. Si prega di provare nuovamente. Se questo errore si verifica ripetutamente, %1$scontatta il tuo amministratore di Piwik%2$s per assistenza.",
"EvolutionOverPeriod": "Evoluzione nel periodo",
"EvolutionSummaryGeneric": "%1$s in %2$s confrontato con %3$s in %4$s. Evoluzione: %5$s",
- "ExceptionContactSupportGeneric": "Se hai ancora questo problema %scontatta il tuo amministratore di Piwik%s per assistenza.",
+ "ExceptionContactSupportGeneric": "Se hai ancora questo problema %1$scontatta il tuo amministratore di Piwik%2$s per assistenza.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "L'utente deve essere un Super User o l'utente '%s' stesso.",
"ExceptionConfigurationFileNotFound": "Il file di configurazione {%s} non è stato trovato.",
- "ExceptionConfigurationFileNotFound2": "Se il file esiste, controlla che %s sia leggibile dall'utente '%s'.",
+ "ExceptionConfigurationFileNotFound2": "Se il file esiste, controlla che %1$s sia leggibile dall'utente '%2$s'.",
"ExceptionDatabaseVersion": "La tua %1$s versione è %2$s ma Piwik richiede almeno la %3$s.",
"ExceptionDatabaseVersionNewerThanCodebase": "Il tuo codice di Piwik è quello della vecchia versione %1$s mentre abbiamo rilevato che il database di Piwik è già stato aggiornato alla nuova versione %2$s.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "Può darsi che i tuoi amministratori di Piwik al momento stiano terminando il processo di aggiornamento. Prova ancora tra qualche minuto.",
"ExceptionFileIntegrity": "Test di integrità fallito: %s",
"ExceptionFilesizeMismatch": "Discordanza di dimensione file: %1$s (dimensione attesa: %2$s, trovata: %3$s)",
"ExceptionIncompatibleClientServerVersions": "La tua %1$s versione del client è %2$s la quale non è compatibile con la versione del server %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Formato di report aggregati '%s' non valido. Provate, invece, uno dei seguenti: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Formato di report aggregati '%1$s' non valido. Prova, invece, uno dei seguenti: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Il tempo di archiviazione di oggi deve essere un numero di secondi maggiore di zero",
- "ExceptionInvalidDateFormat": "Il formato della data deve essere: %s o qualsiasi parola chiave supportata dalla funzione %s (vedi %s per maggiori informazioni)",
- "ExceptionInvalidDateRange": "La data '%s' non è corretta. Dovrebbe avere questo formato: %s.",
- "ExceptionInvalidPeriod": "Il periodo '%s' non è supportato. Prova, invece, uno di questi: %s",
- "ExceptionInvalidRendererFormat": "Il formato di visualizzazione '%s' non è valido. Prova, invece, uno dei formati seguenti: %s.",
- "ExceptionInvalidReportRendererFormat": "Il formato report '%s' non è valido. Prova, invece, uno dei seguenti: %s.",
- "ExceptionInvalidStaticGraphType": "Tipo di grafico statico '%s' non è valido. Prova, invece, una dei seguenti: %s.",
+ "ExceptionInvalidDateFormat": "Il formato della data deve essere: %1$s o qualsiasi parola chiave supportata dalla funzione %2$s (vedi %3$s per maggiori informazioni)",
+ "ExceptionInvalidDateRange": "La data '%1$s' non è corretta. Dovrebbe avere questo formato: %2$s.",
+ "ExceptionInvalidPeriod": "Il periodo '%1$s' non è supportato. Prova, invece, uno di questi: %2$s",
+ "ExceptionInvalidRendererFormat": "Il formato di visualizzazione '%1$s' non è valido. Prova, invece, uno dei formati seguenti: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Il formato di report '%1$s' non è valido. Prova al suo posto uno di questi: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Il tipo di grafico statico '%1$s' non è valido. Prova al suo posto uno di questi: %2$s.",
"ExceptionInvalidToken": "Il token non è valido.",
"ExceptionLanguageFileNotFound": "File di lingua '%s' non trovato.",
- "ExceptionMethodNotFound": "Il metodo '%s' non esiste o non è disponibile nel modulo '%s'.",
+ "ExceptionMethodNotFound": "Il metodo '%1$s' non esiste o non è disponibile nel modulo '%2$s'.",
"ExceptionMissingFile": "Manca il file: %s",
"ExceptionNonceMismatch": "Non è possibile verificare il token di sicurezza di questo form.",
"ExceptionPrivilege": "Non puoi accedere a questa risorsa con un accesso %s.",
@@ -164,7 +165,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Non puoi accedere alla risorsa richiesta perché essa richiede un accesso %s per almeno un sito web.",
"ExceptionUnableToStartSession": "Impossibile avviare la sessione.",
"ExceptionUndeletableFile": "Impossibile cancellare %s",
- "ExceptionUnreadableFileDisabledMethod": "Il file di configurazione {%s} non può essere letto. Il tuo host può aver disabilitato %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Il file di configurazione {%1$s} non può essere letto. Il tuo host può avere disabilitato %2$s.",
"ExceptionReportNotFound": "Il report richiesto non esiste.",
"ExceptionWidgetNotFound": "Il widget richiesto non esiste.",
"ExceptionReportNotEnabled": "Il report richiesto non è abilitato. Questo in genere significa che il plugin che definisce il report è disattivato o che tu non hai i permessi sufficienti per accedere a questo report.",
@@ -212,7 +213,7 @@
"Logout": "Esci",
"MainMetrics": "Metriche principali",
"Matches": "Corrispondenze",
- "MediumToHighTrafficItIsRecommendedTo": "Per siti da medio ad alto traffico, raccomandiamo di far elaborare i report di oggi al massimo ogni mezz'ora (%s secondi) o ogni ora (%s secondi).",
+ "MediumToHighTrafficItIsRecommendedTo": "Per siti web con un traffico medio o alto, raccomandiamo di elaborare i report per oggi almeno ogni mezz'ora (%1$s secondi) oppure ogni ora (%2$s secondi).",
"Metadata": "Metadati",
"Metric": "Metrica",
"Metrics": "Metriche",
@@ -230,6 +231,7 @@
"Name": "Nome",
"NbActions": "Numero di azioni",
"NbSearches": "Numero di Ricerche Interne",
+ "NeedMoreHelp": "Hai bisogno di altro aiuto?",
"Never": "Mai",
"NewReportsWillBeProcessedByCron": "Quando l'archiviazione di Piwik non è attivata dal browser, i nuovi report verranno elaborati con un crontab",
"NewUpdatePiwikX": "Nuovo Aggiornamento: Piwik %s",
@@ -269,7 +271,7 @@
"OptionalSmtpPort": "Opzionale. Default a 25 per non cifrato e TLS SMTP, e 465 per SSL SMTP.",
"Options": "Opzioni",
"Or": "o",
- "OrCancel": "oppure %s Annulla %s",
+ "OrCancel": "o %1$s Cancella %2$s",
"Others": "Altri",
"Outlink": "Outlink (link esterno)",
"Outlinks": "Outlinks (link esterni)",
@@ -277,9 +279,9 @@
"OverlayRowActionTooltipTitle": "Copertura Open Page",
"Overview": "Riepilogo",
"Pages": "Pagine",
- "Pagination": "%s - %s di %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Il parametro %s deve essere un valore intero compreso tra %s e %s",
+ "Pagination": "%1$s - %2$s di %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Il parametro %1$s deve essere un valore intero compreso tra %2$s e %3$s.",
"Password": "Password",
"Period": "Periodo",
"Piechart": "Diagramma a torta",
@@ -331,7 +333,7 @@
"Clear": "Pulisci",
"SearchNoResults": "Nessun risultato",
"SeeAll": "vedi tutto",
- "SeeTheOfficialDocumentationForMoreInformation": "Vedi la %sdocumentazione ufficiale%s per maggiori informazioni",
+ "SeeTheOfficialDocumentationForMoreInformation": "Vedi la %1$sdocumentazione ufficiale%2$s per ulteriori informazioni.",
"SeeThisFaq": "Vedi %1$squesta faq%2$s.",
"Segment": "Segmento",
"SelectYesIfYouWantToSendEmailsViaServer": "Seleziona \"Si\" se vuoi mandare le email attraverso un altro server, diverso dalla funzione email locale.",
@@ -358,7 +360,7 @@
"Total": "Totale",
"TotalRatioTooltip": "Questo è %1$s di tuttti i %2$s %3$s.",
"TotalRevenue": "Totale guadagni",
- "TotalVisitsPageviewsActionsRevenue": "(Totale: %s visite, %s pagine, %s azioni, %s ricavi)",
+ "TotalVisitsPageviewsActionsRevenue": "(Totale: %1$s visite, %2$s pagine viste, %3$s azioni, %4$s entrate)",
"TrackingScopeAction": "Azione",
"TrackingScopePage": "Pagina",
"TrackingScopeVisit": "Visita",
@@ -395,8 +397,8 @@
"WarningFileIntegrityNoManifest": "Il controllo dell'integrità dei file non può essere eseguito per la mancanza del file manifest.inc.php",
"WarningFileIntegrityNoManifestDeployingFromGit": "Se stai sviluppando Piwik da Git, questo messaggio è normale.",
"WarningFileIntegrityNoMd5file": "Il controllo d'integrità dei file non ha potuto essere completato per la mancanza della funzione md5_file().",
- "WarningPasswordStored": "%sAttenzione:%s Questa password verrà salvata nel file di configurazione, e sarà visibile a chiunque ne ha accesso.",
- "WarningDebugOnDemandEnabled": "La modalità tracker %s è abilitata. Per ragioni di sicurezza, questa dovrebbe essere abilitata solo per un breve lasso di tempo. Per disabilitarla, imposta %s a %s in %s.",
+ "WarningPasswordStored": "%1$sAttenzione:%2$s Questa password verrà salvata nel file di configurazione visibile da tutti che possono accedervi.",
+ "WarningDebugOnDemandEnabled": "Modalità di tracciamento %1$s abilitata. Per ragioni di sicurezza, potrà essere abilitata solo per un breve lasso di tempo. Per disabilitarla imposta %2$s a %3$s in %4$s",
"Website": "Sito:",
"Weekly": "Settimanale",
"WeeklyReport": "settimanale",
@@ -450,7 +452,7 @@
"MultiChartLabel": "Mostra sparklines",
"NavigationBack": "Indietro",
"NetworkError": "Errore di Rete",
- "NetworkErrorWithStatusCode": "C'è stato un errore \"%s\". La richiesta ha restituito lo status \"%s\". L'URL era \"%s\". Si prega di controllare l'URL immessa e il log degli errori su questo server per ulteriori informazioni sull'errore e su come risolverlo.",
+ "NetworkErrorWithStatusCode": "C'è stato un errore \"%1$s\". La richiesta ha restituito lo status \"%2$s\". L'URL era \"%3$s\". Si prega di controllare l'URL digitata e i log di errore su questo server per maggiori informazioni sull'errore e su come risolverlo.",
"NetworkErrorWithStatusCodeShort": "Errore di Rete %s",
"NetworkNotReachable": "Rete non raggiungibile",
"NoAccountIsSelected": "Devi scegliere un account. Aggiungi un nuovo account se non ne hai configurato uno.",
@@ -468,7 +470,7 @@
"RatingDontRemindMe": "Non ricordarmelo",
"RatingNotNow": "Non ora",
"RatingNow": "OK, do un voto ora",
- "RatingPleaseRateUs": "L'App Piwik Mobile è un software libero, ti saremmo davvero grati se potessi prenderti 1 minuto per valutare l'app in %s. Se hai suggerimenti su nuove funzionalità o segnalazioni di bug, ti preghiamo di contattare %s",
+ "RatingPleaseRateUs": "Piwik Mobile App è un software gratuito, apprezzeremmo molto se tu dedicassi 1 minuto per valutare l'app in %1$s. Se hai suggerimenti per nuove funzioni o segnalazioni di bug, si prega di contattare %2$s.",
"ReleaseToRefresh": "Rilascia per aggiornare...",
"Reloading": "Ricaricando...",
"RequestTimedOutShort": "Errore di Timeout Rete",
@@ -493,7 +495,7 @@
"CompareRows": "Confronta record",
"ComparingRecords": "Comparazione di %s righe",
"Documentation": "Clicca sulle metriche per visualizzarle in un grafico evoluzione di grandi dimensioni. Usa Shift-click per visualizzare più parametri contemporaneamente.",
- "MetricBetweenText": "da %s e %s",
+ "MetricBetweenText": "da %1$s a %2$s",
"MetricChangeText": "%s cambiamenti nel periodo",
"MetricMinMax": "%1$s tra %2$s e %3$s nel periodo",
"MetricsFor": "Metriche per %s",
diff --git a/lang/ja.json b/lang/ja.json
index 57afecc7e406665ef094ffc6bd0c6f6be2b70fd3..a76d0acd920ccc8f3421babb44368b62fd7850bd 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -15,7 +15,7 @@
"API": "API",
"Apply": "é©ç”¨",
"ArchivingInlineHelp": "比較的トラフィックã®é«˜ã„ウェブサイトã§ã¯ã€ãƒ–ラウザã§ã®è¡¨ç¤ºã‚’トリガーã¨ã™ã‚‹ Piwik アーカイブ処ç†ã‚’無効ã«ã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€1時間ã”ã¨ã« Piwik リãƒãƒ¼ãƒˆã‚’処ç†ã™ã‚‹ cron ジョブをセットアップã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚",
- "ArchivingTriggerDescription": "比較的トラフィックã®é«˜ã„ウェブサイトã«æŽ¨å¥¨ã—ã¾ã™ã€‚ 自動リãƒãƒ¼ãƒˆå‡¦ç†ã«ã¯ %scron ジョブã®ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—%sãŒå¿…è¦ã¨ãªã‚Šã¾ã™ã€‚",
+ "ArchivingTriggerDescription": "比較的トラフィックã®é«˜ã„ウェブサイトã«æŽ¨å¥¨ã—ã¾ã™ã€‚ 自動リãƒãƒ¼ãƒˆå‡¦ç†ã«ã¯ %1$scron ジョブã®ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—%2$sãŒå¿…è¦ã¨ãªã‚Šã¾ã™ã€‚",
"AuthenticationMethodSmtp": "SMTP ã®èªè¨¼æ–¹æ³•",
"AverageOrderValue": "å¹³å‡æ³¨æ–‡é¡",
"AveragePrice": "å¹³å‡ä¾¡æ ¼",
@@ -27,10 +27,8 @@
"CannotUnzipFile": "解å‡ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ %1$s: %2$s",
"ChangePassword": "パスワードã®å¤‰æ›´",
"ChangeTagCloudView": "タグクラウドã¨ã—ã¦ã§ã¯ãªãã€åˆ¥ã®æ–¹æ³•ã§ãƒªãƒãƒ¼ãƒˆã‚’見られã¾ã™ã®ã§ã€ã”注æ„ãã ã•ã„。ã“れを行ã†ã«ã¯ãƒªãƒãƒ¼ãƒˆã®ä¸‹éƒ¨ã«ã‚るコントãƒãƒ¼ãƒ«ã‚’使用ã—ã¾ã™ã€‚",
- "ChooseDate": "日付をé¸æŠž",
"ChooseLanguage": "言語をé¸æŠž",
"ChoosePeriod": "期間をé¸æŠž",
- "ChooseWebsite": "ウェブサイトをé¸æŠž",
"ClickHere": "詳細ã¯ã“ã¡ã‚‰ã‚’クリック",
"ClickToChangePeriod": "期間を変更ã™ã‚‹ã«ã¯ã€ã‚‚ã†ä¸€åº¦ã‚¯ãƒªãƒƒã‚¯ã—ã¦ãã ã•ã„",
"Close": "é–‰ã˜ã‚‹",
@@ -84,7 +82,7 @@
"ColumnViewedAfterSearchDocumentation": "ビジターãŒã‚ãªãŸã®ã‚¦ã‚§ãƒ–サイト上ã§æ¤œç´¢ã—ãŸå¾Œã«ã€ã“ã®ãƒšãƒ¼ã‚¸ã‚’訪れãŸå›žæ•°ã¨ã€æ¤œç´¢çµæžœã§ã“ã®ãƒšãƒ¼ã‚¸ãŒã‚¯ãƒªãƒƒã‚¯ã•ã‚ŒãŸå›žæ•°",
"ColumnVisitDuration": "滞在時間（秒å˜ä½ï¼‰",
"ColumnVisitsWithConversions": "コンãƒãƒ¼ã‚¸ãƒ§ãƒ³ä»˜ãビジット",
- "ConfigFileIsNotWritable": "Piwik è¨å®šãƒ•ã‚¡ã‚¤ãƒ« %s ãŒæ›¸ãè¾¼ã¿å¯èƒ½ã§ã¯ãªã„ãŸã‚ã€ã„ãã¤ã‹ã®å¤‰æ›´ãŒä¿å˜ã•ã‚Œãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚%sè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‘ーミッションを書ãè¾¼ã¿å¯èƒ½ã«å¤‰æ›´ã—ã¦ãã ã•ã„。",
+ "ConfigFileIsNotWritable": "Piwik è¨å®šãƒ•ã‚¡ã‚¤ãƒ« %1$s ãŒæ›¸ãè¾¼ã¿å¯èƒ½ã§ã¯ãªã„ãŸã‚ã€ã„ãã¤ã‹ã®å¤‰æ›´ãŒä¿å˜ã•ã‚Œãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚%2$sè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‘ーミッションを書ãè¾¼ã¿å¯èƒ½ã«å¤‰æ›´ã—ã¦ãã ã•ã„。",
"Continue": "続ã‘ã‚‹",
"ContinueToPiwik": "Piwik を続ã‘ã‚‹",
"CurrentMonth": "今月",
@@ -100,7 +98,7 @@
"Date": "日付",
"DateRange": "期間：",
"DateRangeFrom": "From",
- "DateRangeFromTo": "%s ã‹ã‚‰ %s ã¾ã§",
+ "DateRangeFromTo": "%1$s ã‹ã‚‰ %2$s ã¾ã§",
"DateRangeInPeriodList": "期間",
"DateRangeTo": "To",
"DaysHours": "%1$s 日 %2$s 時間",
@@ -133,30 +131,28 @@
"Edit": "編集",
"EncryptedSmtpTransport": "SMTP サーãƒãƒ¼ã§å¿…è¦ã¨ãªã‚‹ã€ãƒˆãƒ©ãƒ³ã‚¹ãƒãƒ¼ãƒˆãƒ¬ã‚¤ãƒ¤ãƒ¼ã®æš—å·ã‚’入力ã—ã¾ã™ã€‚",
"Error": "エラー",
- "ErrorRequest": "ãŠã£ã¨ ! ...リクエストä¸ã«å•é¡ŒãŒã‚ã‚Šã¾ã—ãŸã€‚ãŠãらãサーãƒã«ä¸€æ™‚çš„ãªå•é¡ŒãŒç™ºç”Ÿã—ã¦ã„ã‚‹ã‹ã€ãƒ‡ãƒ¼ã‚¿é‡ãŒå¤šéŽãŽã‚‹ãƒ¬ãƒãƒ¼ãƒˆã‚’リクエストã—ãŸå¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。ã“ã®ã‚¨ãƒ©ãƒ¼ãŒç¹°ã‚Šè¿”ã—表示ã•ã‚Œã‚‹å ´åˆã¯ã€%scontact your Piwik dministrator%s",
"EvolutionOverPeriod": "一定期間ã®æŽ¨ç§»",
"EvolutionSummaryGeneric": "%4$s ã® %3$s ã¨æ¯”較ã—㟠%1$s ã® %2$s 。展開: %5$s",
- "ExceptionContactSupportGeneric": "ã„ã¾ã ã«ã“ã®å•é¡ŒãŒç™ºç”Ÿã™ã‚‹å ´åˆã¯ã€%s Piwik 管ç†è€…ã«é€£çµ¡ã—ã¦ãã ã•ã„。 %s",
+ "ExceptionContactSupportGeneric": "ã„ã¾ã ã«ã“ã®å•é¡ŒãŒç™ºç”Ÿã™ã‚‹å ´åˆã¯ã€%1$s Piwik 管ç†è€…ã«é€£çµ¡ã—ã¦ãã ã•ã„。 %2$s",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "ユーザーã¯ã€ã‚¹ãƒ¼ãƒ‘ーユーザーもã—ãã¯ãƒ¦ãƒ¼ã‚¶ãƒ¼ '%s' ãれ自身ã®ã„ãšã‚Œã‹ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚",
"ExceptionConfigurationFileNotFound": "è¨å®šãƒ•ã‚¡ã‚¤ãƒ« {%s} ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
- "ExceptionConfigurationFileNotFound2": "ファイルãŒå˜åœ¨ã™ã‚‹å ´åˆã¯ã€%s ㌠'%s' ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«ã‚ˆã£ã¦èªã¿å–ã‚Šå¯èƒ½ãªäº‹ã‚’確èªã—ã¦ãã ã•ã„。",
+ "ExceptionConfigurationFileNotFound2": "ファイルãŒå˜åœ¨ã™ã‚‹å ´åˆã¯ã€%1$s ㌠'%2$s' ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«ã‚ˆã£ã¦èªã¿å–ã‚Šå¯èƒ½ãªäº‹ã‚’確èªã—ã¦ãã ã•ã„。",
"ExceptionDatabaseVersion": "%1$s ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ %2$s ã§ã™ãŒã€Piwik ã«ã¯å°‘ãªãã¨ã‚‚ %3$s ãŒå¿…è¦ã¨ãªã‚Šã¾ã™ã€‚",
"ExceptionDatabaseVersionNewerThanCodebase": "Piwik コードベースãŒå¤ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1$s を実行ã—ã€Piwik データベースãŒæ—¢ã«æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %2$s ã«ã‚¢ãƒƒãƒ—グレードã•ã‚ŒãŸã“ã¨ã‚’検出ã—ã¾ã—ãŸã€‚",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "ãŠãらã Piwik 管ç†è€…ã¯ç¾åœ¨ã€ã‚¢ãƒƒãƒ—グレードプãƒã‚»ã‚¹ã‚’終了ã—ã¦ã„ã¾ã™ã€‚数分後ã«ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。",
"ExceptionFileIntegrity": "æ•´åˆæ€§ãƒã‚§ãƒƒã‚¯ã®å¤±æ•—： %s",
"ExceptionFilesizeMismatch": "ファイルサイズã®ä¸æ•´åˆï¼š %1$s （想定サイズ： %2$sã€å®Ÿã‚µã‚¤ã‚ºï¼š %3$s）",
"ExceptionIncompatibleClientServerVersions": "%1$s クライアントã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ %2$s ã§ã‚ã‚Šã€ã‚µãƒ¼ãƒãƒ¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %3$s ã¨äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“。",
- "ExceptionInvalidAggregateReportsFormat": "集計リãƒãƒ¼ãƒˆã®æ›¸å¼ '%s' ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 次ã®ã„ãšã‚Œã‹ã‚’試ã—ã¦ãã ã•ã„： %s",
+ "ExceptionInvalidAggregateReportsFormat": "集計リãƒãƒ¼ãƒˆã®æ›¸å¼ '%1$s' ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 次ã®ã„ãšã‚Œã‹ã‚’試ã—ã¦ãã ã•ã„： %2$s",
"ExceptionInvalidArchiveTimeToLive": "今日ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®æœ‰åŠ¹æœŸé™ã¯ 0 より大ãã„秒数ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™",
- "ExceptionInvalidDateFormat": "有効ãªæ—¥ä»˜ã®æ›¸å¼ï¼š %s ã¾ãŸã¯ %s 関数ã§ã‚µãƒãƒ¼ãƒˆã•ã‚Œã‚‹ä»»æ„ã®ã‚ーワード（詳細㯠%s ã‚’å‚照）",
- "ExceptionInvalidDateRange": "日付 '%s' ã¯æ£ã—ã„日付ã®ç¯„囲ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 日付ã¯æ¬¡ã®æ›¸å¼ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼š %s",
- "ExceptionInvalidPeriod": "期間 '%s' ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。 代ã‚ã‚Šã«æ¬¡ã®ã„ãšã‚Œã‹ã‚’試ã—ã¦ãã ã•ã„： %s",
- "ExceptionInvalidRendererFormat": "å‡ºåŠ›æ›¸å¼ '%s' ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 次ã®ã„ãšã‚Œã‹ã‚’試ã—ã¦ãã ã•ã„： %s",
- "ExceptionInvalidReportRendererFormat": "リãƒãƒ¼ãƒˆã®æ›¸å¼ '%s' ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 次ã®ã„ãšã‚Œã‹ã‚’試ã—ã¦ãã ã•ã„： %s",
- "ExceptionInvalidStaticGraphType": "é™çš„ãªã‚°ãƒ©ãƒ•ã®ç¨®é¡ž '%s' ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 次ã®ã„ãšã‚Œã‹ã‚’試ã—ã¦ãã ã•ã„： %s",
+ "ExceptionInvalidDateFormat": "有効ãªæ—¥ä»˜ã®æ›¸å¼ï¼š %1$s ã¾ãŸã¯ %2$s 関数ã§ã‚µãƒãƒ¼ãƒˆã•ã‚Œã‚‹ä»»æ„ã®ã‚ーワード（詳細㯠%3$s ã‚’å‚照）",
+ "ExceptionInvalidDateRange": "日付 '%1$s' ã¯æ£ã—ã„日付ã®ç¯„囲ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 日付ã¯æ¬¡ã®æ›¸å¼ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼š %2$s",
+ "ExceptionInvalidPeriod": "期間 '%1$s' ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。 代ã‚ã‚Šã«æ¬¡ã®ã„ãšã‚Œã‹ã‚’試ã—ã¦ãã ã•ã„： %2$s",
+ "ExceptionInvalidRendererFormat": "å‡ºåŠ›æ›¸å¼ '%1$s' ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 次ã®ã„ãšã‚Œã‹ã‚’試ã—ã¦ãã ã•ã„： %2$s",
+ "ExceptionInvalidReportRendererFormat": "リãƒãƒ¼ãƒˆã®æ›¸å¼ '%1$s' ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 次ã®ã„ãšã‚Œã‹ã‚’試ã—ã¦ãã ã•ã„： %2$s",
"ExceptionInvalidToken": "トークンãŒæœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。",
"ExceptionLanguageFileNotFound": "言語ファイル '%s' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
- "ExceptionMethodNotFound": "メソッド '%s' ã¯ã€å˜åœ¨ã—ãªã„ã‹ã€ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ« '%s' ã§åˆ©ç”¨å¯èƒ½ã§ã¯ã‚ã‚Šã¾ã›ã‚“。",
+ "ExceptionMethodNotFound": "メソッド '%1$s' ã¯ã€å˜åœ¨ã—ãªã„ã‹ã€ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ« '%2$s' ã§åˆ©ç”¨å¯èƒ½ã§ã¯ã‚ã‚Šã¾ã›ã‚“。",
"ExceptionMissingFile": "ä¸è¶³ãƒ•ã‚¡ã‚¤ãƒ«ï¼š %s",
"ExceptionNonceMismatch": "ã“ã®ãƒ•ã‚©ãƒ¼ãƒ ã®ã‚»ã‚ュリティトークンを検証ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚",
"ExceptionPrivilege": "ã“ã®ãƒªã‚½ãƒ¼ã‚¹ã«ã¯ %s アクセス権ãŒå¿…è¦ãªãŸã‚ã€ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。",
@@ -164,7 +160,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "ã“ã®ãƒªã‚½ãƒ¼ã‚¹ã«ã¯å°‘ãªãã¨ã‚‚1ã¤ã®ã‚¦ã‚§ãƒ–サイト用㮠%s アクセス権ãŒå¿…è¦ãªãŸã‚ã€ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。",
"ExceptionUnableToStartSession": "セッションを開始ã§ãã¾ã›ã‚“",
"ExceptionUndeletableFile": "%s ãŒå‰Šé™¤ã§ãã¾ã›ã‚“ã§ã—ãŸ",
- "ExceptionUnreadableFileDisabledMethod": "è¨å®šãƒ•ã‚¡ã‚¤ãƒ« {%s} ã‚’èªã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ サーãƒãƒ¼ã§ %s ãŒç„¡åŠ¹åŒ–ã•ã‚Œã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚",
+ "ExceptionUnreadableFileDisabledMethod": "è¨å®šãƒ•ã‚¡ã‚¤ãƒ« {%1$s} ã‚’èªã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ サーãƒãƒ¼ã§ %2$s ãŒç„¡åŠ¹åŒ–ã•ã‚Œã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚",
"ExceptionReportNotFound": "リクエストã•ã‚ŒãŸãƒ¬ãƒãƒ¼ãƒˆã¯å˜åœ¨ã—ã¾ã›ã‚“。",
"ExceptionWidgetNotFound": "リクエストã•ã‚ŒãŸã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã¯å˜åœ¨ã—ã¾ã›ã‚“。",
"ExceptionReportNotEnabled": "リクエストã•ã‚ŒãŸãƒ¬ãƒãƒ¼ãƒˆã¯ã€åˆ©ç”¨ã§ãã¾ã›ã‚“。レãƒãƒ¼ãƒˆã®å®šç¾©ãŒç„¡åŠ¹ã«ãªã£ã¦ã„ã‚‹ã‹ã€ã“ã®ãƒ¬ãƒãƒ¼ãƒˆã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹å分ãªæ¨©é™ã‚’æŒã£ã¦ã„ãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚",
@@ -212,7 +208,7 @@
"Logout": "ãƒã‚°ã‚¢ã‚¦ãƒˆ",
"MainMetrics": "メインメトリクス",
"Matches": "一致",
- "MediumToHighTrafficItIsRecommendedTo": "比較的トラフィックã®é«˜ã„ウェブサイトã§ã¯ã€ä»Šæ—¥ã®ãƒªãƒãƒ¼ãƒˆã®å‡¦ç†é–“隔を 30分（%s 秒） ã¾ãŸã¯ 1時間（%s 秒） ã«è¨å®šã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚",
+ "MediumToHighTrafficItIsRecommendedTo": "比較的トラフィックã®é«˜ã„ウェブサイトã§ã¯ã€ä»Šæ—¥ã®ãƒªãƒãƒ¼ãƒˆã®å‡¦ç†é–“隔を 30分（%1$s 秒） ã¾ãŸã¯ 1時間（%2$s 秒） ã«è¨å®šã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚",
"Metadata": "メタデータ",
"Metric": "メトリック",
"Metrics": "メトリクス",
@@ -267,7 +263,7 @@
"OptionalSmtpPort": "オプションã§ã™ã€‚ éžæš—å·åŒ–㨠TLS SMTP ã§ã¯ 25 ãŒã€SSL SMTP ã§ã¯ 465 ãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã«ãªã‚Šã¾ã™ã€‚",
"Options": "オプション",
"Or": "ã¾ãŸã¯",
- "OrCancel": "ã¾ãŸã¯ %s ã‚ャンセル %s",
+ "OrCancel": "ã¾ãŸã¯ %1$s ã‚ャンセル %2$s",
"Others": "ãã®ä»–",
"Outlink": "外部リンク",
"Outlinks": "外部リンク数",
@@ -275,9 +271,9 @@
"OverlayRowActionTooltipTitle": "ページオーãƒãƒ¼ãƒ¬ã‚¤ã‚’é–‹ã",
"Overview": "概観",
"Pages": "ページ",
- "Pagination": "%s ã® %s - %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "%s パラメータ㯠%s ã‹ã‚‰ %s ã¾ã§ã®æ•´æ•°å€¤ã§æŒ‡å®šã—ã¦ãã ã•ã„",
+ "Pagination": "%1$s ã® %2$s - %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "%1$s パラメータ㯠%2$s ã‹ã‚‰ %3$s ã¾ã§ã®æ•´æ•°å€¤ã§æŒ‡å®šã—ã¦ãã ã•ã„",
"Password": "パスワード",
"Period": "期間",
"Piechart": "円グラフ",
@@ -328,7 +324,7 @@
"Clear": "クリア",
"SearchNoResults": "何もã‚ã‚Šã¾ã›ã‚“",
"SeeAll": "ã™ã¹ã¦ã‚’見る",
- "SeeTheOfficialDocumentationForMoreInformation": "詳細ã«ã¤ã„ã¦ã¯ã€%så…¬å¼ãƒ‰ã‚ュメント%sã‚’å‚ç…§ã—ã¦ãã ã•ã„。",
+ "SeeTheOfficialDocumentationForMoreInformation": "詳細ã«ã¤ã„ã¦ã¯ã€%1$så…¬å¼ãƒ‰ã‚ュメント%2$sã‚’å‚ç…§ã—ã¦ãã ã•ã„。",
"SeeThisFaq": "%1$s ã“ã® faq %2$s ã‚’å‚ç…§ã—ã¦ãã ã•ã„。",
"Segment": "セグメント",
"SelectYesIfYouWantToSendEmailsViaServer": "ãƒãƒ¼ã‚«ãƒ«ã® mail() 関数ã®ä»£ã‚ã‚Šã«ãƒ¡ãƒ¼ãƒ«ã‚µãƒ¼ãƒãƒ¼çµŒç”±ã§ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ãŸã„å ´åˆã¯ã€\"ã¯ã„\" ã‚’é¸æŠžã—ã¾ã™",
@@ -355,7 +351,7 @@
"Total": "åˆè¨ˆ",
"TotalRatioTooltip": "ã“ã‚Œã¯ã€å…¨ã¦ã® %2$s %3$s ã® %1$sã§ã™ã€‚",
"TotalRevenue": "ç·åŽç›Š",
- "TotalVisitsPageviewsActionsRevenue": "( åˆè¨ˆ : ビジット数 %s ã€ãƒšãƒ¼ã‚¸ãƒ“ュー %s ã€ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ %s ã€åˆ©ç›Š %s )",
+ "TotalVisitsPageviewsActionsRevenue": "( åˆè¨ˆ : ビジット数 %1$s ã€ãƒšãƒ¼ã‚¸ãƒ“ュー %2$s ã€ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ %3$s ã€åˆ©ç›Š %4$s )",
"TrackingScopeAction": "アクション",
"TrackingScopePage": "ページ",
"TrackingScopeVisit": "ビジット",
@@ -391,7 +387,7 @@
"WarningFileIntegrityNoManifest": "manifest.inc.php ãŒä¸è¶³ã—ã¦ã„ã‚‹ãŸã‚ã€ãƒ•ã‚¡ã‚¤ãƒ«ã®æ•´åˆæ€§ãƒã‚§ãƒƒã‚¯ã‚’実行ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚",
"WarningFileIntegrityNoManifestDeployingFromGit": "Git ã‹ã‚‰ Piwik を開発ã—ã¦ã„ã‚‹å ´åˆã€ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯æ£å¸¸ã§ã™ã€‚",
"WarningFileIntegrityNoMd5file": "md5_file() 関数ãŒå˜åœ¨ã—ãªã„ãŸã‚ã€ãƒ•ã‚¡ã‚¤ãƒ«ã®æ•´åˆæ€§ãƒã‚§ãƒƒã‚¯ã‚’完了ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚",
- "WarningPasswordStored": "%sè¦å‘Šï¼š%s ã“ã®ãƒ‘スワードã¯è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ä¿å˜ã•ã‚Œã¾ã™ã€‚ ã“ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ãªäººã§ã‚ã‚Œã°ã€ãƒ‘スワードを見られるå¯èƒ½æ€§ãŒã‚ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。",
+ "WarningPasswordStored": "%1$sè¦å‘Šï¼š%2$s ã“ã®ãƒ‘スワードã¯è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ä¿å˜ã•ã‚Œã¾ã™ã€‚ ã“ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ãªäººã§ã‚ã‚Œã°ã€ãƒ‘スワードを見られるå¯èƒ½æ€§ãŒã‚ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。",
"Website": "ウェブサイト",
"Weekly": "毎週",
"WeeklyReport": "毎週",
@@ -445,7 +441,7 @@
"MultiChartLabel": "スパークラインã®è¡¨ç¤º",
"NavigationBack": "戻る",
"NetworkError": "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¨ãƒ©ãƒ¼",
- "NetworkErrorWithStatusCode": "エラー \"%s\" ãŒã‚ã‚Šã¾ã™ã€‚リクエストã¯ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ \"%s\" ã‚’è¿”ã—ã¾ã—ãŸã€‚URL 㯠\"%s\" ã§ã—ãŸã€‚ã“ã®ã‚¨ãƒ©ãƒ¼ã®è©³ç´°ã¨ã€è§£æ±ºæ–¹æ³•ã«ã¤ã„ã¦ã¯ã€å…¥åŠ›ã—㟠URL ã¨ã“ã®ã‚µãƒ¼ãƒãƒ¼ã®ã‚¨ãƒ©ãƒ¼ãƒã‚°ã‚’確èªã—ã¦ãã ã•ã„。",
+ "NetworkErrorWithStatusCode": "エラー \"%1$s\" ãŒã‚ã‚Šã¾ã™ã€‚リクエストã¯ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ \"%2$s\" ã‚’è¿”ã—ã¾ã—ãŸã€‚URL 㯠\"%3$s\" ã§ã—ãŸã€‚ã“ã®ã‚¨ãƒ©ãƒ¼ã®è©³ç´°ã¨ã€è§£æ±ºæ–¹æ³•ã«ã¤ã„ã¦ã¯ã€å…¥åŠ›ã—㟠URL ã¨ã“ã®ã‚µãƒ¼ãƒãƒ¼ã®ã‚¨ãƒ©ãƒ¼ãƒã‚°ã‚’確èªã—ã¦ãã ã•ã„。",
"NetworkErrorWithStatusCodeShort": "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¨ãƒ©ãƒ¼ %s",
"NetworkNotReachable": "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«åˆ°é”ã§ãã¾ã›ã‚“ã§ã—ãŸ",
"NoAccountIsSelected": "アカウントをé¸ã¶å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã¾ã è¨å®šãŒå®Œäº†ã—ã¦ã„ãªã„å ´åˆã€æ–°ã—ã„ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’è¿½åŠ ã—ã¦ãã ã•ã„。",
@@ -463,7 +459,7 @@
"RatingDontRemindMe": "リマインドã—ãªã„ã§ãã ã•ã„。",
"RatingNotNow": "今ã§ã¯ã‚ã‚Šã¾ã›ã‚“。",
"RatingNow": "OK ã§ã™ã€‚ã„ã¾ã€è©•ä¾¡ã—ã¾ã™ã€‚",
- "RatingPleaseRateUs": "Piwik モãƒã‚¤ãƒ«ã‚¢ãƒ—リã¯ã€ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã§ã™ã€‚1 分ãŠæ™‚é–“ã‚’ã„ãŸã ã‘ã¾ã›ã‚“ã‹?ã‚‚ã—よã‚ã—ã‘ã‚Œã°ã€%s ã§ã‚¢ãƒ—リを評価ã—ã¦é ‚ã‘ãŸã‚‰å¬‰ã—ã„ã§ã™ã€‚新機能やãƒã‚°ãƒ¬ãƒãƒ¼ãƒˆã®æ案をãŠæŒã¡ã§ã—ãŸã‚‰ã€ãœã² %s ã«ã”連絡ãã ã•ã„。",
+ "RatingPleaseRateUs": "Piwik モãƒã‚¤ãƒ«ã‚¢ãƒ—リã¯ã€ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã§ã™ã€‚1 分ãŠæ™‚é–“ã‚’ã„ãŸã ã‘ã¾ã›ã‚“ã‹?ã‚‚ã—よã‚ã—ã‘ã‚Œã°ã€%1$s ã§ã‚¢ãƒ—リを評価ã—ã¦é ‚ã‘ãŸã‚‰å¬‰ã—ã„ã§ã™ã€‚新機能やãƒã‚°ãƒ¬ãƒãƒ¼ãƒˆã®æ案をãŠæŒã¡ã§ã—ãŸã‚‰ã€ãœã² %2$s ã«ã”連絡ãã ã•ã„。",
"ReleaseToRefresh": "リリース更新",
"Reloading": "リãƒãƒ¼ãƒ‰ä¸",
"RequestTimedOutShort": "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¿ã‚¤ãƒ アウトエラー",
@@ -488,7 +484,7 @@
"CompareRows": "レコードを比較",
"ComparingRecords": "%s 列ã®æ¯”較",
"Documentation": "大展開グラフã«ã“れらを表示ã™ã‚‹ã«ã¯ã€ãƒ¡ãƒˆãƒªã‚¯ã‚¹ã‚’クリックã—ã¦ãã ã•ã„。複数メトリクスを一度ã«è¡¨ç¤ºã™ã‚‹ã«ã¯ã€shift- クリックを使用ã—ã¦ãã ã•ã„。",
- "MetricBetweenText": "%s ã‹ã‚‰ %s ã¸",
+ "MetricBetweenText": "%1$s ã‹ã‚‰ %2$s ã¸",
"MetricChangeText": "対象期間ã«ã‚ãŸã‚‹ %s 変化",
"MetricMinMax": "対象期間ã«ã‚ãŸã‚‹ %2$s 㨠%3$s ã®é–“ã«ä¸¦ã¹ã‚‰ã‚ŒãŸ %1$s",
"MetricsFor": "%s ã®ãƒ¡ãƒˆãƒªã‚¯ã‚¹",
diff --git a/lang/ko.json b/lang/ko.json
index c8c9b8aea82c91020b03f4f06e5efe8e2c63292a..0e3adbe8531bbb6e5d7828878036a963f794e363 100644
--- a/lang/ko.json
+++ b/lang/ko.json
@@ -15,7 +15,7 @@
"API": "API",
"Apply": "ì ìš©",
"ArchivingInlineHelp": "비êµì íŠ¸ëž˜í”½ì´ ë†’ì€ ì›¹ì‚¬ì´íŠ¸ëŠ” 브ë¼ìš°ì € 트리거를 Piwikì— ë³´ê´€í•˜ëŠ” ê²ƒì„ ë¹„í™œì„±í™”í•˜ëŠ” ê²ƒì´ ì¢‹ìŠµë‹ˆë‹¤. ëŒ€ì‹ , 1 시간마다 Piwik ë³´ê³ ì„œë¥¼ 처리하는 cron ìž‘ì—…ì„ ì„¤ì •í•˜ëŠ” ê²ƒì´ ì¢‹ìŠµë‹ˆë‹¤.",
- "ArchivingTriggerDescription": "비êµì íŠ¸ëž˜í”½ì´ ë†’ì€ ì›¹ì‚¬ì´íŠ¸ì— 권장합니다. ìžë™ ë³´ê³ ì„œ 처리는 %scron ìž‘ì—… ì„¤ì •%sì´ í•„ìš”í•©ë‹ˆë‹¤.",
+ "ArchivingTriggerDescription": "비êµì íŠ¸ëž˜í”½ì´ ë†’ì€ ì›¹ì‚¬ì´íŠ¸ì— 권장합니다. ìžë™ ë³´ê³ ì„œ 처리는 %1$scron ìž‘ì—… ì„¤ì •%2$sì´ í•„ìš”í•©ë‹ˆë‹¤.",
"AuthenticationMethodSmtp": "SMTP ì¸ì¦ 방법",
"AverageOrderValue": "í‰ê· 주문액",
"AveragePrice": "í‰ê· 가격",
@@ -27,10 +27,8 @@
"CannotUnzipFile": "%1$s 파ì¼ì˜ ì••ì¶•ì„ í’€ 수 없습니다: %2$s",
"ChangePassword": "비밀번호 변경",
"ChangeTagCloudView": "태그 í´ë¼ìš°ë“œê°€ ì•„ë‹Œ 다른 방법으로 ë³´ê³ ì„œë¥¼ ë³¼ 수 있습니다. ë³´ê³ ì„œì˜ ì•„ëž˜ìª½ì—있는 ì»¨íŠ¸ë¡¤ì„ ì‚¬ìš©í•˜ì„¸ìš”.",
- "ChooseDate": "ë‚ ì§œ ì„ íƒ",
"ChooseLanguage": "언어 ì„ íƒ",
"ChoosePeriod": "기간 ì„ íƒ",
- "ChooseWebsite": "웹사ì´íŠ¸ ì„ íƒ",
"ClickHere": "ìžì„¸í•œ ë‚´ìš©ì€ ì´ê³³ì„ í´ë¦í•˜ì„¸ìš”.",
"ClickToChangePeriod": "ê¸°ê°„ì„ ë³€ê²½í•˜ë ¤ë©´ 다시 í´ë¦í•˜ì„¸ìš”.",
"Close": "닫기",
@@ -82,7 +80,7 @@
"ColumnViewedAfterSearchDocumentation": "ì´ë¯¸ 진입한 방문ìžê°€ 웹사ì´íŠ¸ë‚´ì—ì„œ 검색한 결과로부터 ì´ íŽ˜ì´ì§€ë¥¼ í´ë¦í•œ 횟수입니다.",
"ColumnVisitDuration": "머문 시간 (초)",
"ColumnVisitsWithConversions": "ì „í™˜ì„ í†µí•œ 방문 수",
- "ConfigFileIsNotWritable": "Piwik ì„¤ì • íŒŒì¼ %s를 쓸수 없기 ë•Œë¬¸ì— ì¼ë¶€ ë³€ê²½ì´ ì €ìž¥ë˜ì§€ ì•Šì„ ìˆ˜ 있습니다. %s ì„¤ì • 파ì¼ì˜ ê¶Œí•œì„ ì“¸ 수 있게 변경하세요.",
+ "ConfigFileIsNotWritable": "Piwik ì„¤ì • íŒŒì¼ %1$s를 쓸수 없기 ë•Œë¬¸ì— ì¼ë¶€ ë³€ê²½ì´ ì €ìž¥ë˜ì§€ ì•Šì„ ìˆ˜ 있습니다. %2$s ì„¤ì • 파ì¼ì˜ ê¶Œí•œì„ ì“¸ 수 있게 변경하세요.",
"Continue": "계ì†",
"ContinueToPiwik": "Piwik ê³„ì† í•˜ê¸°",
"CurrentMonth": "ì´ë²ˆë‹¬",
@@ -98,7 +96,7 @@
"Date": "ë‚ ì§œ",
"DateRange": "기간:",
"DateRangeFrom": "From",
- "DateRangeFromTo": "%sì—ì„œ %s까지",
+ "DateRangeFromTo": "%1$sì—ì„œ %2$s까지",
"DateRangeInPeriodList": "기간",
"DateRangeTo": "To",
"DaysHours": "%1$sì¼ %2$s 시간",
@@ -133,23 +131,23 @@
"Error": "ì—러",
"EvolutionOverPeriod": "기간ë™ì•ˆ 진행 ê³¼ì •",
"EvolutionSummaryGeneric": "%2$sì˜ %1$s와 %4$sì˜ %3$s 비êµ. 변화 추ì´: %5$s",
- "ExceptionContactSupportGeneric": "만약 해당 ë¬¸ì œê°€ ê³„ì† ë°œìƒí•œë‹¤ë©´ %sPiwik 관리ìžì—게 ì—°ë½í•˜ì—¬ ë„움%sì„ êµ¬í•˜ì„¸ìš”.",
+ "ExceptionContactSupportGeneric": "만약 해당 ë¬¸ì œê°€ ê³„ì† ë°œìƒí•œë‹¤ë©´ %1$sPiwik 관리ìžì—게 ì—°ë½í•˜ì—¬ ë„움%2$sì„ êµ¬í•˜ì„¸ìš”.",
"ExceptionConfigurationFileNotFound": "ì„¤ì •íŒŒì¼ {%s}ì„ ì°¾ì„ ìˆ˜ 없습니다.",
"ExceptionDatabaseVersion": "현재 %1$s ë²„ì „ %2$s ì´ì§€ë§Œ Piwikì—는 ì ì–´ë„ %3$sê°€ 필요합니다.",
"ExceptionFileIntegrity": "무결성 검사 실패: %s",
"ExceptionFilesizeMismatch": "íŒŒì¼ í¬ê¸° 불ì¼ì¹˜: %1$s (ì˜ˆìƒ í¬ê¸°: %2$s, ì‹¤ì œ í¬ê¸°: %3$s)",
"ExceptionIncompatibleClientServerVersions": "%1$s í´ë¼ì´ì–¸íŠ¸ ë²„ì „ %2$sì´ë©°, 서버 ë²„ì „ %3$s와 í˜¸í™˜ì„±ì´ ì—†ìŠµë‹ˆë‹¤.",
- "ExceptionInvalidAggregateReportsFormat": "집계 ë³´ê³ ì„œ í˜•ì‹ '%s'는 ì‚¬ìš©í• ìˆ˜ 없습니다. ë‹¤ìŒ ì¤‘ 하나를 ì‹œë„하세요: %s",
+ "ExceptionInvalidAggregateReportsFormat": "집계 ë³´ê³ ì„œ í˜•ì‹ '%1$s'는 ì‚¬ìš©í• ìˆ˜ 없습니다. ë‹¤ìŒ ì¤‘ 하나를 ì‹œë„하세요: %2$s",
"ExceptionInvalidArchiveTimeToLive": "ì˜¤ëŠ˜ì˜ ì•„ì¹´ì´ë¸Œ ì‹œê°„ì€ ê¸°ê°„ì€ 0보다 ë” í° ì´ˆì´ì–´ì•¼í•©ë‹ˆë‹¤",
- "ExceptionInvalidDateFormat": "ìœ íš¨í•œ ë‚ ì§œ 형ì‹: %s ë˜ëŠ” %s 함수ì—ì„œ 지ì›ë˜ëŠ” ëª¨ë“ í‚¤ì›Œë“œ (ìžì„¸í•œ ë‚´ìš©ì€ %s 참조)",
- "ExceptionInvalidDateRange": "ë‚ ì§œ '%s'ì€ ì˜¬ë°”ë¥¸ ë‚ ì§œ 범위가 아닙니다. ë‚ ì§œëŠ” 다ìŒê³¼ ê°™ì€ í˜•ì‹ì´ì–´ì•¼í•©ë‹ˆë‹¤: %s",
- "ExceptionInvalidPeriod": "기간 '%s'는 지ì›ë˜ì§€ 않습니다. ëŒ€ì‹ ë‹¤ìŒ ì¤‘ 하나를 ì‹œë„하세요: %s",
- "ExceptionInvalidRendererFormat": "ì¶œë ¥ í˜•ì‹ '%s'는 ì‚¬ìš©í• ìˆ˜ 없습니다. ë‹¤ìŒ ì¤‘ 하나를 ì‹œë„하세요: %s",
- "ExceptionInvalidReportRendererFormat": "ë³´ê³ ì„œ í˜•ì‹ '%s'는 ì‚¬ìš©í• ìˆ˜ 없습니다. ë‹¤ìŒ ì¤‘ 하나를 ì‹œë„하세요: %s",
- "ExceptionInvalidStaticGraphType": "ì •ì 차트 종류 '%s'는 ì‚¬ìš©í• ìˆ˜ 없습니다. ë‹¤ìŒ ì¤‘ 하나를 ì‹œë„하세요: %s",
+ "ExceptionInvalidDateFormat": "ìœ íš¨í•œ ë‚ ì§œ 형ì‹: %1$s ë˜ëŠ” %2$s 함수ì—ì„œ 지ì›ë˜ëŠ” ëª¨ë“ í‚¤ì›Œë“œ (ìžì„¸í•œ ë‚´ìš©ì€ %3$s 참조)",
+ "ExceptionInvalidDateRange": "ë‚ ì§œ '%1$s'ì€ ì˜¬ë°”ë¥¸ ë‚ ì§œ 범위가 아닙니다. ë‚ ì§œëŠ” 다ìŒê³¼ ê°™ì€ í˜•ì‹ì´ì–´ì•¼í•©ë‹ˆë‹¤: %2$s",
+ "ExceptionInvalidPeriod": "기간 '%1$s'는 지ì›ë˜ì§€ 않습니다. ëŒ€ì‹ ë‹¤ìŒ ì¤‘ 하나를 ì‹œë„하세요: %2$s",
+ "ExceptionInvalidRendererFormat": "ì¶œë ¥ í˜•ì‹ '%1$s'는 ì‚¬ìš©í• ìˆ˜ 없습니다. ë‹¤ìŒ ì¤‘ 하나를 ì‹œë„하세요: %2$s",
+ "ExceptionInvalidReportRendererFormat": "ë³´ê³ ì„œ í˜•ì‹ '%1$s'는 ì‚¬ìš©í• ìˆ˜ 없습니다. ë‹¤ìŒ ì¤‘ 하나를 ì‹œë„하세요: %2$s",
+ "ExceptionInvalidStaticGraphType": "ì •ì 차트 종류 '%1$s'는 ì‚¬ìš©í• ìˆ˜ 없습니다. ë‹¤ìŒ ì¤‘ 하나를 ì‹œë„하세요: %2$s",
"ExceptionInvalidToken": "í† í°ì´ ìœ íš¨í•˜ì§€ 않습니다.",
"ExceptionLanguageFileNotFound": "'%s' 언어 파ì¼ì„ ì°¾ì„ ìˆ˜ 없습니다",
- "ExceptionMethodNotFound": "메서드 '%s'는 존재하지 않거나 모듈 '%s'ì—ì„œ ì‚¬ìš©í• ìˆ˜ 없습니다.",
+ "ExceptionMethodNotFound": "메서드 '%1$s'는 존재하지 않거나 모듈 '%2$s'ì—ì„œ ì‚¬ìš©í• ìˆ˜ 없습니다.",
"ExceptionMissingFile": "누ë½ëœ 파ì¼: %s",
"ExceptionNonceMismatch": "ì´ ì–‘ì‹ì˜ 보안 í† í°ì„ ê²€ì¦ í• ìˆ˜ 없습니다.",
"ExceptionPrivilege": "ì´ ë¦¬ì†ŒìŠ¤ëŠ” %s ê¶Œí•œì´ í•„ìš”í•˜ê¸° ë•Œë¬¸ì— ì ‘ê·¼í• ìˆ˜ 없습니다.",
@@ -157,7 +155,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "ì´ ë¦¬ì†ŒìŠ¤ëŠ” í•˜ë‚˜ì˜ ì›¹ì‚¬ì´íŠ¸ì— 대한 %s ê¶Œí•œì´ í•„ìš”í•˜ê¸° ë•Œë¬¸ì— ì ‘ê·¼í• ìˆ˜ 없습니다.",
"ExceptionUnableToStartSession": "ì„¸ì…˜ì„ ì‹œìž‘í• ìˆ˜ 없습니다.",
"ExceptionUndeletableFile": "%s를 ì œê±°í• ìˆ˜ 없습니다",
- "ExceptionUnreadableFileDisabledMethod": "ì„¤ì • íŒŒì¼ {%s}를 ë¡œë“œí• ìˆ˜ 없습니다. 서버 %sê°€ 비활성화ë˜ì—ˆì„ 수 있습니다.",
+ "ExceptionUnreadableFileDisabledMethod": "ì„¤ì • íŒŒì¼ {%1$s}를 ë¡œë“œí• ìˆ˜ 없습니다. 서버 %2$sê°€ 비활성화ë˜ì—ˆì„ 수 있습니다.",
"ExceptionReportNotFound": "ìš”ì²ëœ ë³´ê³ ì„œê°€ 존재하지 않습니다.",
"ExceptionWidgetNotFound": "ìš”ì²ëœ ìœ„ì ¯ì´ ì¡´ìž¬í•˜ì§€ 않습니다.",
"Export": "내보내기",
@@ -197,7 +195,7 @@
"Locale": "ko_KR.UTF-8",
"Logout": "로그아웃",
"MainMetrics": "주요 지표",
- "MediumToHighTrafficItIsRecommendedTo": "비êµì íŠ¸ëž˜í”½ì´ ë†’ì€ ì›¹ì‚¬ì´íŠ¸ëŠ” ì˜¤ëŠ˜ì˜ ë³´ê³ ì„œ 처리 ê°„ê²©ì„ 30분 (%sì´ˆ) ë˜ëŠ” 1시간 (%sì´ˆ)ë¡œ ì„¤ì •í•˜ëŠ” ê²ƒì´ ì¢‹ìŠµë‹ˆë‹¤.",
+ "MediumToHighTrafficItIsRecommendedTo": "비êµì íŠ¸ëž˜í”½ì´ ë†’ì€ ì›¹ì‚¬ì´íŠ¸ëŠ” ì˜¤ëŠ˜ì˜ ë³´ê³ ì„œ 처리 ê°„ê²©ì„ 30분 (%1$sì´ˆ) ë˜ëŠ” 1시간 (%2$sì´ˆ)ë¡œ ì„¤ì •í•˜ëŠ” ê²ƒì´ ì¢‹ìŠµë‹ˆë‹¤.",
"Metadata": "메타ë°ì´í„°",
"Metric": "통계",
"Metrics": "통계",
@@ -242,7 +240,7 @@
"OperationDoesNotContain": "í¬í•¨í•˜ì§€ 않기",
"OptionalSmtpPort": "옵션입니다. 비 암호화 ë° TLS SMTP는 25ê°€ SSL SMTP는 465ì´ ê¸°ë³¸ìž…ë‹ˆë‹¤.",
"Options": "ì„¤ì •",
- "OrCancel": "ë˜ëŠ” %s 취소 %s",
+ "OrCancel": "ë˜ëŠ” %1$s 취소 %2$s",
"Others": "기타",
"Outlink": "외부ë§í¬",
"Outlinks": "외부 ë§í¬ 수",
@@ -250,9 +248,9 @@
"OverlayRowActionTooltipTitle": "페ì´ì§€ 중첩 열기",
"Overview": "개요",
"Pages": "페ì´ì§€",
- "Pagination": "%s - %s ì˜ %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "%s 매개변수는 %sì—ì„œ %sê¹Œì§€ì˜ ì •ìˆ˜ë¡œ ê°’ì„ ì§€ì •í•˜ì„¸ìš”.",
+ "Pagination": "%1$s - %2$s ì˜ %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "%1$s 매개변수는 %2$sì—ì„œ %3$sê¹Œì§€ì˜ ì •ìˆ˜ë¡œ ê°’ì„ ì§€ì •í•˜ì„¸ìš”.",
"Password": "비밀번호",
"Period": "기간",
"Piechart": "파ì´ì°¨íŠ¸",
@@ -299,7 +297,7 @@
"SaveImageOnYourComputer": "ì´ë¯¸ì§€ë¥¼ ì €ìž¥í•˜ë ¤ë©´ ì´ë¯¸ì§€ë¥¼ 오른쪽으로 í´ë¦í•˜ì—¬ \"다른 ì´ë¦„으로 그림 ì €ìž¥...\"ì„ ì„ íƒí•©ë‹ˆë‹¤",
"Search": "검색",
"SeeAll": "다 보기",
- "SeeTheOfficialDocumentationForMoreInformation": "ìžì„¸í•œ ë‚´ìš©ì€ %s ê³µì‹ ë¬¸ì„œ %s를 참조하세요.",
+ "SeeTheOfficialDocumentationForMoreInformation": "ìžì„¸í•œ ë‚´ìš©ì€ %1$s ê³µì‹ ë¬¸ì„œ %2$s를 참조하세요.",
"SelectYesIfYouWantToSendEmailsViaServer": "로컬 mail() 함수 ëŒ€ì‹ ë©”ì¼ì„œë²„를 통해 ì´ë©”ì¼ì„ 보낼 경우, \"예\"를 ì„ íƒí•©ë‹ˆë‹¤",
"Settings": "ì„¤ì •",
"Shipping": "배송",
@@ -355,7 +353,7 @@
"WarningFileIntegrityNoManifest": "manifest.inc.phpê°€ 없기 때문ì—, 파ì¼ì˜ 무결성 검사를 ìˆ˜í–‰í• ìˆ˜ 없습니다.",
"WarningFileIntegrityNoManifestDeployingFromGit": "만약 Git으로부터 Piwik를 ì‚¬ìš©í•˜ê³ ìžˆë‹¤ë©´, ì´ ë©”ì„¸ì§€ëŠ” ì •ìƒìž…니다.",
"WarningFileIntegrityNoMd5file": "md5_file() 함수가 존재하지 않기 때문ì—, íŒŒì¼ ë¬´ê²°ì„± 검사를 ì™„ë£Œí• ìˆ˜ 없습니다.",
- "WarningPasswordStored": "%s ê²½ê³ : %s 암호는 ì„¤ì • 파ì¼ì— ì €ìž¥ë©ë‹ˆë‹¤. ì´ ì„¤ì • 파ì¼ì— 액세스 í• ìˆ˜ìžˆëŠ” 사람ì´ë¼ë©´, 패스워드를 ë³¼ 수 ìžˆì„ ê°€ëŠ¥ì„±ì´ ìžˆë‹¤ëŠ” ì ì— ìœ ì˜í•˜ì„¸ìš”.",
+ "WarningPasswordStored": "%1$s ê²½ê³ : %2$s 암호는 ì„¤ì • 파ì¼ì— ì €ìž¥ë©ë‹ˆë‹¤. ì´ ì„¤ì • 파ì¼ì— 액세스 í• ìˆ˜ìžˆëŠ” 사람ì´ë¼ë©´, 패스워드를 ë³¼ 수 ìžˆì„ ê°€ëŠ¥ì„±ì´ ìžˆë‹¤ëŠ” ì ì— ìœ ì˜í•˜ì„¸ìš”.",
"Website": "웹사ì´íŠ¸",
"Weekly": "주간",
"WeeklyReport": "매주",
@@ -405,7 +403,7 @@
"MultiChartLabel": "스파í¬ë¼ì¸ 표시",
"NavigationBack": "뒤로",
"NetworkError": "ë„¤íŠ¸ì›Œí¬ ì—러",
- "NetworkErrorWithStatusCode": "\"%s\" 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤. 요ì²ì—ì„œ \"%s\" ìƒíƒœê°€ 반환ë˜ì—ˆìŠµë‹ˆë‹¤. URLì€ \"%s\" 입니다. ìž…ë ¥í•œ URLì„ í™•ì¸í•´ ë³´ê³ ì„œë²„ì˜ ì˜¤ë¥˜ 로그ì—ì„œ ë” ìžì„¸í•œ ë‚´ìš©ì„ ë¶„ì„하여 ì´ ë¬¸ì œë¥¼ 해결하세요.",
+ "NetworkErrorWithStatusCode": "\"%1$s\" 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤. ìš”ì²ì—ì„œ \"%2$s\" ìƒíƒœê°€ 반환ë˜ì—ˆìŠµë‹ˆë‹¤. URLì€ \"%3$s\" 입니다. ìž…ë ¥í•œ URLì„ í™•ì¸í•´ ë³´ê³ ì„œë²„ì˜ ì˜¤ë¥˜ 로그ì—ì„œ ë” ìžì„¸í•œ ë‚´ìš©ì„ ë¶„ì„하여 ì´ ë¬¸ì œë¥¼ 해결하세요.",
"NetworkErrorWithStatusCodeShort": "ë„¤íŠ¸ì›Œí¬ ì—러 %s",
"NetworkNotReachable": "네트워í¬ì— ì—°ê²°í• ìˆ˜ ì—†ìŒ",
"NoAccountIsSelected": "í•˜ë‚˜ì˜ ê³„ì •ì„ ì„ íƒí•˜ì…”야 합니다. 만약 í™˜ê²½ì„¤ì •ì„ í•˜ì§€ 않았다면 새로운 ê³„ì •ì„ ì¶”ê°€í•˜ì„¸ìš”.",
@@ -422,7 +420,7 @@
"RatingDontRemindMe": "ë”ì´ìƒ ë³´ì´ì§€ ì•ŠìŒ",
"RatingNotNow": "지금 안함",
"RatingNow": "좋아요, 지금 í‰ê°€í•˜ê² 습니다",
- "RatingPleaseRateUs": "Piwik ëª¨ë°”ì¼ ì•±ì€ ë¬´ë£Œ 소프트웨어입니다. ì—¬ëŸ¬ë¶„ì˜ ì†Œì¤‘í•œ 1분으로 %sì—ì„œ ìš°ë¦¬ì˜ ì• í”Œë¦¬ì¼€ì´ì…˜ì„ í‰ê°€í•´ ì£¼ì‹ ë‹¤ë©´ ì •ë§ ê°ì‚¬í•˜ê² 습니다. 새로운 기능 ì œì•ˆì´ë‚˜ 버그를 발견하셨다면, %së¡œ ì—°ë½ ë¶€íƒë“œë ¤ìš”",
+ "RatingPleaseRateUs": "Piwik ëª¨ë°”ì¼ ì•±ì€ ë¬´ë£Œ 소프트웨어입니다. ì—¬ëŸ¬ë¶„ì˜ ì†Œì¤‘í•œ 1분으로 %1$sì—ì„œ ìš°ë¦¬ì˜ ì• í”Œë¦¬ì¼€ì´ì…˜ì„ í‰ê°€í•´ ì£¼ì‹ ë‹¤ë©´ ì •ë§ ê°ì‚¬í•˜ê² 습니다. 새로운 기능 ì œì•ˆì´ë‚˜ 버그를 발견하셨다면, %2$së¡œ ì—°ë½ ë¶€íƒë“œë ¤ìš”",
"ReleaseToRefresh": "놓아서 ìƒˆë¡œê³ ì¹¨...",
"Reloading": "새로 ê³ ì¹¨ 중...",
"RequestTimedOutShort": "ë„¤íŠ¸ì›Œí¬ íƒ€ìž„ 아웃 오류",
@@ -445,7 +443,7 @@
"CompareRows": "ê¸°ë¡ ë¹„êµ",
"ComparingRecords": "%s í–‰ 비êµ",
"Documentation": "í° ì§„í™” 그래프ì—ì„œ í‘œì‹œí• í†µê³„ë¥¼ í´ë¦í•©ë‹ˆë‹¤. 쉬프트-í´ë¦ì„ 사용하여 í•œë²ˆì— ì—¬ëŸ¬ê°œì˜ ì¸¡ì • í•ëª©ì„ 표시합니다.",
- "MetricBetweenText": "%s와 %s 사ì´",
+ "MetricBetweenText": "%1$s와 %2$s 사ì´",
"MetricChangeText": "%s 기간 ë™ì•ˆ",
"MetricsFor": "%sì— ëŒ€í•œ 통계",
"MultiRowEvolutionTitle": "여러 í–‰ì˜ ë³€í™” 추ì´",
diff --git a/lang/lt.json b/lang/lt.json
index b19694b2c3dc312eb08ffaf51a799c7ef610a768..68701aa696f22a35b0243ce3c3b4d9817f05cb73 100644
--- a/lang/lt.json
+++ b/lang/lt.json
@@ -8,8 +8,9 @@
"AllWebsitesDashboard": "Visų svetainių skydelis",
"And": "ir",
"API": "API sÄ…saja",
+ "Apply": "Taikyti",
"ArchivingInlineHelp": "Vidutinio ir didelio srauto svetainėms rekomenduojama išjungti Piwik archyvavimo trigerį. Vietoj to, rekomenduojame nustatyti cron job Piwik ataskaitų generavimui kas valandą.",
- "ArchivingTriggerDescription": "Rekomenduojama didesniems Piwik diegimams. Jums reikia %snustatyti cron job%s automatiniam ataskaitų generavimui.",
+ "ArchivingTriggerDescription": "Rekomenduojama didesniems Piwik diegimams. Jums reikia %1$snustatyti cron job%2$s automatiniam ataskaitų generavimui.",
"AuthenticationMethodSmtp": "SMTP autentifikacijos metodas",
"AverageOrderValue": "Vidutinė užsakymo vertė",
"AveragePrice": "VidutinÄ— kaina",
@@ -17,10 +18,8 @@
"BackToPiwik": "Atgal į Piwik",
"Cancel": "Atsisakyti",
"ChangePassword": "Pakeisti slaptažodį",
- "ChooseDate": "Pasirinkti datÄ…",
"ChooseLanguage": "Pasirinkti kalbÄ…",
"ChoosePeriod": "Pasirinkti periodÄ…",
- "ChooseWebsite": "Pasirinkti svetainÄ™",
"ClickHere": "Daugiau informacijos",
"Close": "Užverti",
"ColumnActionsPerVisit": "Veiksmų per apsilankymą",
@@ -41,6 +40,7 @@
"ColumnNbUsers": "Naudotojai",
"ColumnNbVisits": "Apsilankymai",
"ColumnPageviews": "Puslapio peržiūros",
+ "ColumnPageviewsDocumentation": "Å io puslapio aplankymų skaiÄius.",
"ColumnPercentageVisits": "% apsilankymų",
"ColumnRevenue": "Pajamos",
"ColumnSumVisitLength": "Bendras visų lankytojų praleistas laikas (sekundėmis)",
@@ -48,18 +48,19 @@
"ColumnValuePerVisit": "Apsilankymo vertÄ—",
"ColumnVisitDuration": "Apsilankymo trukmÄ— (sek.)",
"ColumnVisitsWithConversions": "Apsilankymai su konversija",
- "ConfigFileIsNotWritable": "Piwik konfigÅ«racijos failas %s negali bÅ«ti keiÄiamas, todÄ—l dalis JÅ«sų nustatymų gali bÅ«ti neiÅ¡saugoti. %s PraÅ¡ome pakeisti Å¡io failo teises, kad galÄ—tumÄ—te įraÅ¡yti pakeitimus.",
+ "ConfigFileIsNotWritable": "Piwik konfigÅ«racijos failas %1$s negali bÅ«ti keiÄiamas, todÄ—l dalis JÅ«sų nustatymų gali bÅ«ti neiÅ¡saugoti. %2$s PraÅ¡ome pakeisti Å¡io failo teises, kad galÄ—tumÄ—te įraÅ¡yti pakeitimus.",
"Continue": "Tęsti",
"ContinueToPiwik": "Grįžti į Piwik",
"CurrentMonth": "Å is mÄ—nuo",
"CurrentWeek": "Å i savaitÄ—",
"CurrentYear": "Å ie metai",
"Daily": "Kasdien",
+ "DailyReports": "KasdienÄ—s ataskaitos",
"DashboardForASpecificWebsite": "Skydelis konkreÄiai svetainei",
"Date": "Data",
"DateRange": "Laikotarpis:",
"DateRangeFrom": "Nuo",
- "DateRangeFromTo": "Nuo %s iki %s",
+ "DateRangeFromTo": "Nuo %1$s iki %2$s",
"DateRangeTo": "Iki",
"DaysHours": "%1$s dienos %2$s valandos",
"DaysSinceFirstVisit": "Dienos nuo pirmo apsilankymo",
@@ -91,13 +92,13 @@
"ExceptionFilesizeMismatch": "Nesutampa failo dydis: %1$s (turi būti: %2$s, rasta: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Jūsų %1$s kliento versija yra %2$s, kuri yra nesuderinama su serverio %3$s versija.",
"ExceptionInvalidArchiveTimeToLive": "Šiandienos archyvo saugojimo laikas turi būti nurodytas sekundėmis ir reikšme didesne už nulį",
- "ExceptionInvalidDateFormat": "Datos formatas turi būti: %s ar bet kuris raktažodis palaikomas %s funkcijos (žiūrėkite %s išsamesnei informacijai gauti)",
- "ExceptionInvalidDateRange": "Data '%s' yra iš klaidingo diapazono. Ji turi būti šio formato: %s.",
- "ExceptionInvalidPeriod": "Periodas '%s' nepalaikomas. Vietoj jo pabandykite Å¡iuos: %s.",
- "ExceptionInvalidRendererFormat": "VerÄiamas formatas '%s' negaliojantis . Vietoj jo pabandykite Å¡iuos: %s.",
+ "ExceptionInvalidDateFormat": "Datos formatas turi būti: %1$s ar bet kuris raktažodis palaikomas %2$s funkcijos (žiūrėkite %3$s išsamesnei informacijai gauti)",
+ "ExceptionInvalidDateRange": "Data '%1$s' yra iš klaidingo diapazono. Ji turi būti šio formato: %2$s.",
+ "ExceptionInvalidPeriod": "Periodas '%1$s' nepalaikomas. Vietoj jo pabandykite Å¡iuos: %2$s.",
+ "ExceptionInvalidRendererFormat": "VerÄiamas formatas '%1$s' negaliojantis . Vietoj jo pabandykite Å¡iuos: %2$s.",
"ExceptionInvalidToken": "Pažymėjimas negaliojantis.",
"ExceptionLanguageFileNotFound": "'%s' kalbos failas nerastas.",
- "ExceptionMethodNotFound": "'%s' metodas neegzistuoja arba neprieinamas '%s' modulyje.",
+ "ExceptionMethodNotFound": "'%1$s' metodas neegzistuoja arba neprieinamas '%2$s' modulyje.",
"ExceptionMissingFile": "Trūksta failo: %s",
"ExceptionNonceMismatch": "Negalima patikrinti Å¡ios formos saugos rakto.",
"ExceptionPrivilege": "Negalite pasiekti šių resursų, nes tam reikia %s teisių.",
@@ -105,7 +106,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Negalite pasiekti šių resursų, nes tam reikia %s teisių mažiausiai vienai svetainei.",
"ExceptionUnableToStartSession": "Nepavyko pradÄ—ti sesijos",
"ExceptionUndeletableFile": "Nepavyko ištrinti %s",
- "ExceptionUnreadableFileDisabledMethod": "{%s} konfigūracijos failas nenuskaitytas. Jūsų stotis gali būti išjungusi %s.",
+ "ExceptionUnreadableFileDisabledMethod": "{%1$s} konfigūracijos failas nenuskaitytas. Jūsų stotis gali būti išjungusi %2$s.",
"ExceptionWidgetNotFound": "Užklausto valdiklio nėra.",
"Export": "Eksportuoti",
"ExportAsImage": "Eksportuoti kaip paveikslėlį",
@@ -122,6 +123,7 @@
"GraphHelp": "Daugiau informacijos apie grafikų atvaizdavimą",
"HelloUser": "Sveiki, %s!",
"Help": "Pagalba",
+ "HelpTranslatePiwik": "Galbūt, jūs norėtumėte %1$spadėti mums patobulinti Piwik vertimus%2$s?",
"Hide": "slÄ—pti",
"HoursMinutes": "%1$s valandos %2$s min.",
"Id": "ID",
@@ -136,9 +138,10 @@
"LoadingPopover": "Įkeliama %s...",
"Locale": "lt_LT.UTF-8",
"Logout": "Atsijungti",
- "MediumToHighTrafficItIsRecommendedTo": "Vidutinio ir didelio srauto svetainÄ—ms rekomenduojame generuoti kasdienines ataskaitas kas pusÄ™ valandos (%s sekundÄ—s) arba kas valandÄ… (%s sekundÄ—s).",
+ "MediumToHighTrafficItIsRecommendedTo": "Vidutinio ir didelio srauto svetainÄ—ms rekomenduojame generuoti kasdienines ataskaitas kas pusÄ™ valandos (%1$s sekundÄ—s) arba kas valandÄ… (%2$s sekundÄ—s).",
"MinutesSeconds": "%1$s min. %2$ssek.",
"Monthly": "Kas mėnesį",
+ "More": "Daugiau",
"MultiSitesSummary": "Visos svetainÄ—s",
"Name": "Pavadinimas",
"NbActions": "Veiksmų kiekis",
@@ -156,17 +159,22 @@
"NumberOfVisits": "Apsilankymų kiekis",
"NVisits": "%s apsilankymai",
"Ok": "Gerai",
+ "OneAction": "1 veiksmas",
+ "OneVisit": "1 apsilankymas",
"OnlyEnterIfRequired": "Įveskite naudotojo vardą tik jei Jūsų SMTP serveris to reikalauja",
"OnlyEnterIfRequiredPassword": "Įveskite slaptažodį tik jei Jūsų SMTP serveris to reikalauja",
"OnlyUsedIfUserPwdIsSet": "Tik kai nurodomas naudotojo vardas\/slaptažodis. Klauskite savo paslaugų teikėjo, jei nesate tikri, kurį metodą naudoti.",
"OpenSourceWebAnalytics": "Atvirojo kodo žiniatinklio analizės sprendimas",
+ "OperationAtLeast": "Bent",
+ "OperationAtMost": "Daugiausiai",
"Options": "Parinktys",
- "OrCancel": "arba %s atšaukti %s",
+ "OrCancel": "arba %1$s atšaukti %2$s",
"Others": "Kita",
"Outlinks": "IÅ¡orinÄ—s nuorodos",
"Overview": "Bendras vaizdas",
"Pages": "Puslapiai",
- "PaginationWithoutTotal": "%s - %s",
+ "Pagination": "%1$s - %2$s iš %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
"Password": "Slaptažodis",
"Period": "Periodas",
"Piechart": "SkritulinÄ— diagrama",
@@ -195,10 +203,13 @@
"Save": "IÅ¡saugoti",
"SaveImageOnYourComputer": "Norėdami išsaugoti paveikslėlį savo kompiuteryje, spustelėkite dešiniuoju pelytės klavišu ant paveikslėlio ir pasirinkite \"Išsaugoti paveikslėlį kaip...\"",
"Search": "Ieškoti",
- "SeeTheOfficialDocumentationForMoreInformation": "%sOficialioje dokumentacijoje%s rasite daugiau informacijos.",
+ "Clear": "IÅ¡valyti",
+ "SearchNoResults": "Rezultatų nėra",
+ "SeeTheOfficialDocumentationForMoreInformation": "%1$sOficialioje dokumentacijoje%2$s rasite daugiau informacijos.",
"SelectYesIfYouWantToSendEmailsViaServer": "PažymÄ—kite \"Taip\", jei norite, kad laiÅ¡kai bÅ«tų siunÄiami per vardinį serverį vietoj vietinÄ—s siuntimo funkcijos.",
"Settings": "Nuostatos",
"Shipping": "Pristatymas",
+ "Show": "rodyti",
"SmallTrafficYouCanLeaveDefault": "Mažo srauto svetainėms galite palikti numatytąsias %s sekundes ir gauti ataskaitas realiuoju laiku.",
"SmtpEncryption": "SMTP Å¡ifravimas",
"SmtpPassword": "SMTP slaptažodis",
@@ -207,10 +218,12 @@
"SmtpUsername": "SMTP naudotojo vardas",
"Source": "Å altinis",
"Subtotal": "TarpinÄ— suma",
+ "Summary": "SuvestinÄ—",
"Table": "LentelÄ—",
"TagCloud": "Žymių debesis",
"Tax": "MokesÄiai",
"TimeAgo": "prieš %s",
+ "TimeFormat": "Laiko formatas",
"Total": "IÅ¡ viso",
"TotalRevenue": "Pajamų iš viso",
"TranslatorName": "Donatas Stonys (Blue Whale SEO)",
@@ -234,19 +247,23 @@
"Warning": "Įspėjimas",
"WarningFileIntegrityNoManifest": "Failo vientisumo patikra negali būti atlikta dėl nesamo manifest.inc.php failo.",
"WarningFileIntegrityNoMd5file": "Failo vientisumo patikra negali būti atlikta dėl nesamos md5_file() funkcijos.",
- "WarningPasswordStored": "%sÄ®spÄ—jimas:%s Å is slaptažodis bus iÅ¡saugotas konfigÅ«racijos faile, kuris bus matomas kiekvienam turinÄiam priÄ—jimÄ… prie Å¡io failo.",
+ "WarningPasswordStored": "%1$sÄ®spÄ—jimas:%2$s Å is slaptažodis bus iÅ¡saugotas konfigÅ«racijos faile, kuris bus matomas kiekvienam turinÄiam priÄ—jimÄ… prie Å¡io failo.",
"Website": "SvetainÄ—",
"Weekly": "Kas savaitÄ™",
+ "WeeklyReports": "SavaitinÄ—s ataskaitos",
"Widgets": "Valdikliai",
"Widget": "Valdiklis",
+ "YearlyReports": "MetinÄ—s ataskaitos",
"YearsDays": "%1$s metai %2$s dienos",
"Yes": "Taip",
"YouAreCurrentlyUsing": "Šiuo metu jūs naudojate Piwik %s.",
+ "YouAreViewingDemoShortMessage": "JÅ«s matote Piwik demonstracijÄ…",
"YouMustBeLoggedIn": "Pirmiausia turite prisijungti.",
"YourChangesHaveBeenSaved": "Jūsų atlikti pakeitimai išsaugoti."
},
"Mobile": {
"Account": "Paskyra",
+ "Accounts": "Paskyros",
"AddAccount": "PridÄ—ti paskyrÄ…",
"AddPiwikDemo": "PridÄ—ti Piwik Demo",
"AnonymousAccess": "AnoniminÄ— prieiga",
@@ -256,10 +273,12 @@
"NetworkError": "Tinklo Klaida",
"NetworkErrorWithStatusCodeShort": "Tinklo Klaida %s",
"NetworkNotReachable": "Tinklas nepasiekiamas",
+ "NoWebsiteFound": "Svetainių nerasta",
"RatingNotNow": "Ne dabar",
"Reloading": "Įkeliama iš naujo...",
"SaveSuccessError": "Piwik URL arba naudotojo vardo ir slaptažodžio kombinacija yra neteisinga.",
"ShowLess": "Rodyti mažiau",
+ "VerifyLoginData": "Įsitikinkite, kad jūsų naudotojo vardo ir slaptažodžio derinys yra teisingas.",
"YouAreOffline": "Atleiskite, šiuo metu jūs esate atsijungę nuo tinklo"
}
}
\ No newline at end of file
diff --git a/lang/lv.json b/lang/lv.json
index 5465b7d5dc9107e3452331d7fefea86e377490ba..5126662ce4069e74fbf2d68619247f1e7bdb3479 100644
--- a/lang/lv.json
+++ b/lang/lv.json
@@ -8,17 +8,15 @@
"AllWebsitesDashboard": "Visu vietņu panelis",
"API": "API",
"ArchivingInlineHelp": "VidÄ“ja un augsta apmeklÄ“juma vietnÄ“m rekomendÄ“jam atslÄ“gt pÄrlÅ«ka izsauktu Piwik arhivÄ“Å¡anu. TÄ vietÄ iesakam lietot cron darbu, kas arhivÄ“ Piwik katru stundu.",
- "ArchivingTriggerDescription": "ApjomÄ«gÄm Piwik instalÄcijÄm iesakam %siestatÄ«t cron darbu%s, kas apstrÄdÄs atskaites automÄtiski.",
+ "ArchivingTriggerDescription": "ApjomÄ«gÄm Piwik instalÄcijÄm iesakam %1$siestatÄ«t cron darbu%2$s, kas apstrÄdÄs atskaites automÄtiski.",
"AuthenticationMethodSmtp": "SMTP autentifikÄcijas metode",
"AverageOrderValue": "VidÄ“jÄ pasÅ«tÄ«juma vÄ“rtÄ«ba",
"AveragePrice": "VidÄ“jÄ cena",
"AverageQuantity": "Vidējais apjoms",
"BackToPiwik": "Atpakaļ uz Piwik",
"ChangePassword": "Mainīt paroli",
- "ChooseDate": "Izvēlies datumu",
"ChooseLanguage": "Izvēlieties valodu",
"ChoosePeriod": "Izvēlieties periodu",
- "ChooseWebsite": "Izvēlieties lapu",
"ClickHere": "Lai saņemtu papildus informÄciju, klikÅ¡Ä·iniet Å¡eit.",
"Close": "Aizvērt",
"ColumnActionsPerVisit": "DarbÄ«bas vienÄ apmeklÄ“jumÄ",
@@ -62,7 +60,7 @@
"ColumnValuePerVisit": "IenÄkumi uz vienu apmeklÄ“jumu",
"ColumnVisitDuration": "Apmeklējuma ilgums (sekundēs)",
"ColumnVisitsWithConversions": "ApmeklÄ“jumi ar reklÄmguvumiem",
- "ConfigFileIsNotWritable": "Piwik iestatÄ«jumu datne %s nav rakstÄma, dažas no izmaiņÄm iespÄ“jams netiks saglabÄtas. %s LÅ«dzu izmainiet iestatÄ«jumu datnes atļaujas, lai tajÄ varÄ“tu ierakstÄ«t.",
+ "ConfigFileIsNotWritable": "Piwik iestatÄ«jumu datne %1$s nav rakstÄma, dažas no izmaiņÄm iespÄ“jams netiks saglabÄtas. %2$s LÅ«dzu izmainiet iestatÄ«jumu datnes atļaujas, lai tajÄ varÄ“tu ierakstÄ«t.",
"ContinueToPiwik": "TurpinÄt uz Piwik",
"CurrentMonth": "Pašreizējais mēnesis",
"CurrentWeek": "PaÅ¡reizÄ“jÄ nedēļa",
@@ -73,7 +71,7 @@
"Date": "Datums",
"DateRange": "Datumu diapazons:",
"DateRangeFrom": "No",
- "DateRangeFromTo": "No %s līdz %s",
+ "DateRangeFromTo": "No %1$s līdz %2$s",
"DateRangeTo": "LÄ«dz",
"DaysSinceFirstVisit": "Dienas kopÅ¡ pirmÄ apmeklÄ“juma",
"DaysSinceLastEcommerceOrder": "Dienas kopÅ¡ pÄ“dÄ“jÄ e-komercijas pasÅ«tÄ«juma",
@@ -106,7 +104,7 @@
"ExceptionPrivilege": "Lai apskatītu šo sadaļu, Jums ir nepieciešama %s pieeja.",
"ExceptionUnableToStartSession": "Nav iespÄ“jams sÄkt sesiju.",
"ExceptionUndeletableFile": "Nevar izdzēst %s",
- "ExceptionUnreadableFileDisabledMethod": "IestatÄ«jumu datni {%s} nav iespÄ“jams nolasÄ«t. JÅ«su resursdatorÄ iespÄ“jams ir izslÄ“gts %s.",
+ "ExceptionUnreadableFileDisabledMethod": "IestatÄ«jumu datni {%1$s} nav iespÄ“jams nolasÄ«t. JÅ«su resursdatorÄ iespÄ“jams ir izslÄ“gts %2$s.",
"Export": "Eksports",
"ExportAsImage": "EksportÄ“t kÄ bildi",
"ExportThisReport": "EksportÄ“t Å¡o datu kopu citos formÄtos",
@@ -133,7 +131,7 @@
"Locale": "lv_LV.UTF-8",
"Logout": "Iziet",
"MainMetrics": "Galvenie mērījumi",
- "MediumToHighTrafficItIsRecommendedTo": "VidÄ“ja un augsta apmklÄ“juma vietnÄ“m iesakam apstrÄdÄt atskaites ne biežÄk kÄ katru pusstundu (%s sekundes) vai katru stundu (%s sekundes).",
+ "MediumToHighTrafficItIsRecommendedTo": "VidÄ“ja un augsta apmklÄ“juma vietnÄ“m iesakam apstrÄdÄt atskaites ne biežÄk kÄ katru pusstundu (%1$s sekundes) vai katru stundu (%2$s sekundes).",
"Metadata": "Metadati",
"MetricsToPlot": "MÄ“rÄ«jumi plÄnoÅ¡anai",
"MetricToPlot": "MÄ“rÄ«jums plÄnoÅ¡anai",
@@ -161,13 +159,13 @@
"OnlyEnterIfRequiredPassword": "Ievadiet paroli tikai tad, ja JÅ«su SMTP serveris to pieprasa.",
"OpenSourceWebAnalytics": "AtvÄ“rtÄ koda tÄ«kla analÄ«ze",
"OptionalSmtpPort": "Izvēles. Pēc noklusējuma 25 nekriptētētam un TLS SMTP, bet 465 izmantojot SSL SMTP.",
- "OrCancel": "vai %s atcelt %s",
+ "OrCancel": "vai %1$s atcelt %2$s",
"Others": "Citi",
"Outlink": "Ārēja saite",
"Outlinks": "Ä€rÄ“jÄs saites",
"Overview": "PÄrskats",
"Pages": "lapas",
- "ParameterMustIntegerBetween": "Parametra %s vÄ“rtÄ«bai ir jÄbÅ«t skaitlim no %s lÄ«dz %s.",
+ "ParameterMustIntegerBetween": "Parametra %1$s vÄ“rtÄ«bai ir jÄbÅ«t skaitlim no %2$s lÄ«dz %3$s.",
"Password": "Parole",
"Period": "Periods",
"Piechart": "Sektoru diagramma",
@@ -197,7 +195,7 @@
"Save": "SaglabÄt",
"SaveImageOnYourComputer": "Lai saglabÄtu bildi datora, uz bildes spiediet labo peles pogu un izvÄ“lieties \"Save Image As...\"",
"Search": "Meklēt",
- "SeeTheOfficialDocumentationForMoreInformation": "Lai iegÅ«tu vairÄk informÄciju, apskatiet %soficiÄlo dokumentÄciju%s.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Lai iegÅ«tu vairÄk informÄciju, apskatiet %1$soficiÄlo dokumentÄciju%2$s.",
"SelectYesIfYouWantToSendEmailsViaServer": "Ja vÄ“lies vai ir nepiecieÅ¡ans sÅ«tÄ«t e-pastus caur serveri neizmantojot lokÄlo \"mail\" metodi, izvÄ“lies \"JÄ\"",
"Settings": "Iestatījumi",
"Shipping": "PiegÄde",
diff --git a/lang/nb.json b/lang/nb.json
index 15085389833bf0ca211b66512341561e456478a7..c20d68cb5680d623fa21b7b54582b7a666cddf6d 100644
--- a/lang/nb.json
+++ b/lang/nb.json
@@ -15,7 +15,7 @@
"API": "API",
"Apply": "Bruk",
"ArchivingInlineHelp": "For nettsteder med medium til høy trafikk, er det anbefalt å arkivering av rapporter når de vises i nettleseren. I stedet anbefaler vi at du setter opp en cron-jobb som prosesserer Piwik-rapporter hver time.",
- "ArchivingTriggerDescription": "For større Piwik-installasjoner anbefales det at du setter opp en %scron-jobb%s for å behandle rapporter automatisk.",
+ "ArchivingTriggerDescription": "For større Piwik-installasjoner anbefales det at du setter opp en %1$scron-jobb%2$s for å behandle rapporter automatisk.",
"AuthenticationMethodSmtp": "Autentiseringsmetode for SMTP",
"AverageOrderValue": "Gjennomsnittlig ordrepris",
"AveragePrice": "Gjennomsnittlig pris",
@@ -27,10 +27,9 @@
"CannotUnzipFile": "Kan ikke pakke opp filen %1$s: %2$s",
"ChangePassword": "Endre passord",
"ChangeTagCloudView": "Legg merke til at du kan se på rapporten på andre måter enn som en stikkordsky. Bruk kontrollene på bunnen av rapporten for å gjøre det.",
- "ChooseDate": "Velg dato",
+ "ChooseDate": "Velg dato, valgt dato er: %s",
"ChooseLanguage": "Velg språk",
"ChoosePeriod": "Velg periode",
- "ChooseWebsite": "Velg nettsted",
"ClickHere": "Klikk her for mer informasjon.",
"ClickToChangePeriod": "Klikk igjen for å endre periode.",
"Close": "Lukk",
@@ -84,12 +83,14 @@
"ColumnViewedAfterSearchDocumentation": "Antallet ganger denne siden var besøkt etter at en besøker gjorde et søk på nettstedet ditt og klikket på denne siden i søkeresultatene.",
"ColumnVisitDuration": "Besøksvarighet (i sekunder)",
"ColumnVisitsWithConversions": "Besøk med konvertering",
- "ConfigFileIsNotWritable": "Konfigurasjonsfilen for Piwik %s er ikke skrivbar. Noen av endringene dine blir kanskje ikke lagret. %s Endre rettighetene for filen slik at den er skrivbar.",
+ "ConfigFileIsNotWritable": "Konfigurasjonsfilen for Piwik %1$s er ikke skrivbar. Noen av endringene dine blir kanskje ikke lagret. %2$s Endre rettighetene for filen slik at den er skrivbar.",
"Continue": "Fortsett",
"ContinueToPiwik": "Fortsett til Piwik",
- "CurrentMonth": "Gjeldende måned",
- "CurrentWeek": "Gjeldende uke",
- "CurrentYear": "Gjeldende år",
+ "CurrentlyUsingUnsecureHttp": "Du bruker nå Piwik over usikker HTTP, som kan være risikabelt. Vi anbefaler at du setter opp Piwik til å bruke SSL (HTTPS) for økt sikkerhet.",
+ "CreatedByUser": "laget av %s",
+ "CurrentMonth": "Denne måneden",
+ "CurrentWeek": "Denne uken",
+ "CurrentYear": "Dette året",
"Daily": "Daglig",
"DailyReport": "daglig",
"DailyReports": "Daglige rapporter",
@@ -100,7 +101,7 @@
"Date": "Dato",
"DateRange": "Datointervall:",
"DateRangeFrom": "Fra",
- "DateRangeFromTo": "Fra %s til %s",
+ "DateRangeFromTo": "Fra %1$s til %2$s",
"DateRangeInPeriodList": "datointervall",
"DateRangeTo": "Til",
"DaysHours": "%1$s dager %2$s timer",
@@ -133,30 +134,30 @@
"Edit": "Rediger",
"EncryptedSmtpTransport": "Fyll inn transportlagkrypteringen som kreves av din SMTP-tjener.",
"Error": "Feil",
- "ErrorRequest": "Oi... Det oppstod et problem under forespørselen. Kanskje tjeneren hadde en midlertidig feil eller kanskje du ba om en rapport med for mye data. Prøv igjen. Hvis feilen oppstår gjentatte ganger, %skontakt din Piwik-administrator%s for assistanse.",
+ "ErrorRequest": "Oi... Det oppstod et problem under forespørselen. Kanskje tjeneren hadde en midlertidig feil eller kanskje du ba om en rapport med for mye data. Prøv igjen. Hvis feilen oppstår gjentatte ganger, %1$skontakt din Piwik-administrator%2$s for assistanse.",
"EvolutionOverPeriod": "Utvikling i perioden",
"EvolutionSummaryGeneric": "%1$s i %2$s sammenlignet med %3$s i %4$s. Utvikling: %5$s",
- "ExceptionContactSupportGeneric": "Hvis du fortsatt har dette problemet, %skontakt din Piwik-administrator%s for assistanse.",
+ "ExceptionContactSupportGeneric": "Hvis du fortsatt har dette problemet, %1$skontakt din Piwik-administrator%2$s for assistanse.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Bruker må enten være en superbruker eller brukeren «%s» selv.",
"ExceptionConfigurationFileNotFound": "Klarte ikke finne eller lese konfigurasjonsfilen {%s}.",
- "ExceptionConfigurationFileNotFound2": "Hvis filen eksisterer, vennligst sjekk at %s er lesbar for brukeren «%s».",
+ "ExceptionConfigurationFileNotFound2": "Hvis filen eksisterer, vennligst sjekk at %1$s er lesbar for brukeren «%2$s».",
"ExceptionDatabaseVersion": "Din %1$s versjon er %2$s, men Piwik krever minst %3$s.",
"ExceptionDatabaseVersionNewerThanCodebase": "Din Piwik-kodebase kjører den gamle versjonen %1$s, og vi har oppdaget at din Piwik-database allerede har blitt oppgradert til den nyere versjonen %2$s.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "Kanskje dine Piwik-administratorer holder på med å fullføre oppgraderingsprosessen. Prøv igjen om noen få minutter.",
"ExceptionFileIntegrity": "Integritetssjekk feilet: %s",
"ExceptionFilesizeMismatch": "Filstørrelse stemmer ikke: %1$s (forventet lengde: %2$s, fant: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Din %1$s klientversjon er %2$s som ikke passer med tjenerversjonen %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Format «%s» for aggregerte rapporter er ikke gyldig. Prøv en av følgende istedenfor: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Format «%1$s» for aggregerte rapporter er ikke gyldig. Prøv en av følgende istedenfor: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Arkiveringsintervallet for i dag må være et antall sekunder som er større enn null",
- "ExceptionInvalidDateFormat": "Datoformatet må være %s eller et nøkkelord støttet av %s-funksjonen (se %s for mer informasjon).",
- "ExceptionInvalidDateRange": "Datoen «%s» er ikke et gyldig datointervall. Riktig format er: %s",
- "ExceptionInvalidPeriod": "Perioden «%s» er ikke støttet. Prøv en av følgende istedenfor: %s",
- "ExceptionInvalidRendererFormat": "Format «%s» for rendering er ikke gyldig. Prøv en av følgende istedenfor: %s.",
- "ExceptionInvalidReportRendererFormat": "Rapportformat «%s» er ikke gyldig. Prøv en av følgende istedenfor: %s.",
- "ExceptionInvalidStaticGraphType": "Statisk graftype «%s» er ikke gyldig. Prøv en av følgende istedenfor: %s.",
+ "ExceptionInvalidDateFormat": "Datoformatet må være %1$s eller et nøkkelord støttet av %2$s-funksjonen (se %3$s for mer informasjon).",
+ "ExceptionInvalidDateRange": "Datoen «%1$s» er ikke et gyldig datointervall. Riktig format er: %2$s",
+ "ExceptionInvalidPeriod": "Perioden «%1$s» er ikke støttet. Prøv en av følgende istedenfor: %2$s",
+ "ExceptionInvalidRendererFormat": "Format «%1$s» for rendering er ikke gyldig. Prøv en av følgende istedenfor: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Rapportformat «%1$s» er ikke gyldig. Prøv en av følgende istedenfor: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Statisk graftype «%1$s» er ikke gyldig. Prøv en av følgende istedenfor: %2$s.",
"ExceptionInvalidToken": "Autentiseringsnøkkel er ikke gyldig.",
"ExceptionLanguageFileNotFound": "Fant ikke språkfilen «%s».",
- "ExceptionMethodNotFound": "Metoden «%s» eksisterer ikke eller er ikke tilgjengelig i modulen «%s».",
+ "ExceptionMethodNotFound": "Metoden «%1$s» eksisterer ikke eller er ikke tilgjengelig i modulen «%2$s».",
"ExceptionMissingFile": "Mangler fil: %s",
"ExceptionNonceMismatch": "Klarte ikke å verifisere autentiseringsnøkkelen i dette skjemaet.",
"ExceptionPrivilege": "Du har ikke tilgang til denne ressursen siden den krever «%s»-tilgang.",
@@ -164,7 +165,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Du har ikke tilgang til denne ressursen siden den krever «%s»-tilgang for minst ett av nettstedene.",
"ExceptionUnableToStartSession": "Klarte ikke å starte økt.",
"ExceptionUndeletableFile": "Klarte ikke å slette %s",
- "ExceptionUnreadableFileDisabledMethod": "Klarte ikke å lese konfigurasjonsfilen {%s}. Verten din kan ha deaktivert %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Klarte ikke å lese konfigurasjonsfilen {%1$s}. Verten din kan ha deaktivert %2$s.",
"ExceptionReportNotFound": "Den etterspurte rapporten finnes ikke.",
"ExceptionWidgetNotFound": "Den etterspurte widgeten finnes ikke.",
"ExceptionReportNotEnabled": "Den etterspurte rapporten er ikke aktivert. Dette betyr vanligvis at enten er utvidelsen som definerer rapporten deaktivert, eller så har du ikke nok rettigheter til å vise rapporten.",
@@ -212,7 +213,7 @@
"Logout": "Logg ut",
"MainMetrics": "Hovedmåltall",
"Matches": "Treff",
- "MediumToHighTrafficItIsRecommendedTo": "For nettsteder med medium til høy trafikk, er det anbefalt å ikke prosessere dagens rapporter oftere enn hver halvtime (%s sekunder) eller hver time (%s sekunder).",
+ "MediumToHighTrafficItIsRecommendedTo": "For nettsteder med medium til høy trafikk, er det anbefalt å ikke prosessere dagens rapporter oftere enn hver halvtime (%1$s sekunder) eller hver time (%2$s sekunder).",
"Metadata": "Metadata",
"Metric": "MÃ¥ltall",
"Metrics": "MÃ¥ltall",
@@ -269,7 +270,7 @@
"OptionalSmtpPort": "Valgfritt. Standard er 25 for ukryptert og TLS SMTP, og 465 for SSL SMTP.",
"Options": "Alternativer",
"Or": "eller",
- "OrCancel": "eller %s avbryt %s",
+ "OrCancel": "eller %1$s avbryt %2$s",
"Others": "Andre",
"Outlink": "Utlenke",
"Outlinks": "Utlenker",
@@ -277,9 +278,9 @@
"OverlayRowActionTooltipTitle": "Ã…pne sideoverlegg",
"Overview": "Oversikt",
"Pages": "Sider",
- "Pagination": "%s – %s av %s",
- "PaginationWithoutTotal": "%s – %s",
- "ParameterMustIntegerBetween": "Parameteret %s må være et heltall mellom %s og %s.",
+ "Pagination": "%1$s – %2$s av %3$s",
+ "PaginationWithoutTotal": "%1$s – %2$s",
+ "ParameterMustIntegerBetween": "Parameteret %1$s må være et heltall mellom %2$s og %3$s.",
"Password": "Passord",
"Period": "Periode",
"Piechart": "Kakediagram",
@@ -331,7 +332,7 @@
"Clear": "Tøm",
"SearchNoResults": "Ingen resultater",
"SeeAll": "se alle",
- "SeeTheOfficialDocumentationForMoreInformation": "Se %sden offisielle dokumentasjonen%s for mer informasjon.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Se %1$sden offisielle dokumentasjonen%2$s for mer informasjon.",
"SeeThisFaq": "Se %1$sdenne FAQ-en%2$s.",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Velg «Ja» hvis du vil sende e-post med en navngitt tjener istedenfor den lokale mail-funksjonen",
@@ -358,7 +359,7 @@
"Total": "Totalt",
"TotalRatioTooltip": "Dette er %1$s av alle %2$s %3$s.",
"TotalRevenue": "Totale inntekter",
- "TotalVisitsPageviewsActionsRevenue": "(Totalt: %s besøk, %s sidevisninger, %s handlinger, %s inntekter)",
+ "TotalVisitsPageviewsActionsRevenue": "(Totalt: %1$s besøk, %2$s sidevisninger, %3$s handlinger, %4$s inntekter)",
"TrackingScopeAction": "Handling",
"TrackingScopePage": "Side",
"TrackingScopeVisit": "Besøk",
@@ -395,8 +396,8 @@
"WarningFileIntegrityNoManifest": "Klarte ikke å utføre integritetskontroll av filer fordi manifest.inc.php mangler.",
"WarningFileIntegrityNoManifestDeployingFromGit": "Hvis du installerer Piwik fra Git, er denne meldingen normal.",
"WarningFileIntegrityNoMd5file": "Klarte ikke utføre integritetskontroll av filer fordi funksjonen md5_file mangler.",
- "WarningPasswordStored": "%sAdvarsel:%s Dette passordet lagres i klartekst i konfigurasjonsfilen slik at alle med tilgang kan lese det.",
- "WarningDebugOnDemandEnabled": "Sporingsmodus %s er aktivert. På grunn av sikkerheten bør dette kun være aktivert i en kort periode. For å deaktivere, sett %s til %s i %s",
+ "WarningPasswordStored": "%1$sAdvarsel:%2$s Dette passordet lagres i klartekst i konfigurasjonsfilen slik at alle med tilgang kan lese det.",
+ "WarningDebugOnDemandEnabled": "Sporingsmodus %1$s er aktivert. På grunn av sikkerheten bør dette kun være aktivert i en kort periode. For å deaktivere, sett %2$s til %3$s i %4$s",
"Website": "Nettsted",
"Weekly": "Ukentlig",
"WeeklyReport": "ukentlig",
@@ -450,7 +451,7 @@
"MultiChartLabel": "Vis minigrafer",
"NavigationBack": "Tilbake",
"NetworkError": "Nettverksfeil",
- "NetworkErrorWithStatusCode": "Det oppstod en «%s»-feil. Forespørselen returnerte statusen «%s». URL-en var «%s». Sjekk URL-en du skrev inn og feilloggene på denne tjeneren for mer informasjon om feilen og hvordan du kan løse problemet.",
+ "NetworkErrorWithStatusCode": "Det oppstod en «%1$s»-feil. Forespørselen returnerte statusen «%2$s». URL-en var «%3$s». Sjekk URL-en du skrev inn og feilloggene på denne tjeneren for mer informasjon om feilen og hvordan du kan løse problemet.",
"NetworkErrorWithStatusCodeShort": "Nettverksfeil %s",
"NetworkNotReachable": "Nettverk kan ikke nås",
"NoAccountIsSelected": "Du må velge en konto. Legg til en ny konto hvis du ikke har satt opp en konto enda.",
@@ -468,7 +469,7 @@
"RatingDontRemindMe": "Ikke minn meg på dette",
"RatingNotNow": "Ikke nå",
"RatingNow": "OK, jeg vil vurdere den nå",
- "RatingPleaseRateUs": "Appen Piwik Mobil er fri programvare. Vi ville virkelig sette pris på om du brukte 1 minutt på å vurdere denne appen i %s. Hvis du har forslag til nye funksjoner eller feilrapporter, kontakt %s",
+ "RatingPleaseRateUs": "Appen Piwik Mobil er fri programvare. Vi ville virkelig sette pris på om du brukte 1 minutt på å vurdere denne appen i %1$s. Hvis du har forslag til nye funksjoner eller feilrapporter, kontakt %2$s",
"ReleaseToRefresh": "Slipp for å oppdatere...",
"Reloading": "Laster inn på nytt ...",
"RequestTimedOutShort": "Nettverksfeil – tidsavbrudd",
@@ -493,7 +494,7 @@
"CompareRows": "Sammenlign oppføringer",
"ComparingRecords": "Sammenligner %s rader",
"Documentation": "Klikk måltallet for å vise det i den store utviklingsgrafen. Bruk SHIFT-klikk for å vise flere måltall på en gang.",
- "MetricBetweenText": "fra %s til %s",
+ "MetricBetweenText": "fra %1$s til %2$s",
"MetricChangeText": "%s endring i perioden",
"MetricMinMax": "%1$s rangert mellom %2$s og %3$s i perioden",
"MetricsFor": "MÃ¥ltall for %s",
diff --git a/lang/nl.json b/lang/nl.json
index c8b0818e185c29530e4ce6ddfe914a7c21aaa8f3..7d94a685fbacb5f4349063d77c54c82c3f126ba8 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -12,7 +12,7 @@
"And": "en",
"API": "API",
"ArchivingInlineHelp": "Voor middelgrote tot grote websites, is het aan te raden Piwik archivering voor de browser uit te schakelen. Als alternatief raden we aan om een cronjob te maken om piwik om het uur rapporten te laten genereren.",
- "ArchivingTriggerDescription": "Aangeraden voor grote Piwik installaties, gebruik een %scronjob%s om automatisch rapporten te genereren.",
+ "ArchivingTriggerDescription": "Aangeraden voor grote Piwik installaties, gebruik een %1$scronjob%2$s om automatisch rapporten te genereren.",
"AuthenticationMethodSmtp": "Authenticatie methode voor SMTP",
"AverageOrderValue": "Gemiddelde Orderwaarde",
"AveragePrice": "Gemiddelde Prijs",
@@ -24,10 +24,8 @@
"CannotUnzipFile": "Kan bestand %1$s niet uitpakken: %2$s",
"ChangePassword": "Wijzig wachtwoord",
"ChangeTagCloudView": "Je kunt het rapport ook op andere manieren dan een tag-cloud bekijken door de icoontjes onderaan het rapport te gebruiken.",
- "ChooseDate": "Kies datum",
"ChooseLanguage": "Kies taal",
"ChoosePeriod": "Kies periode",
- "ChooseWebsite": "Kies website",
"ClickHere": "Klik hier voor meer informatie.",
"ClickToChangePeriod": "Klik nog een keer om de periode te veranderen.",
"Close": "Sluiten",
@@ -81,7 +79,7 @@
"ColumnViewedAfterSearchDocumentation": "Het aantal keer deze pagina was bezocht nadat een bezoeker een zoekopdracht deed op je website, en in de zoekresultaten op deze pagina klikte.",
"ColumnVisitDuration": "Duur van bezoek (in seconden)",
"ColumnVisitsWithConversions": "Bezoekers met conversies",
- "ConfigFileIsNotWritable": "Het piwik configuratiebestand %s is niet beschrijfbaar. Niet alle wijzigingen zullen worden bewaard. %s Wijzig de permissies van het configuratie bestand om het beschrijfbaar te maken.",
+ "ConfigFileIsNotWritable": "Het piwik configuratiebestand %1$s is niet beschrijfbaar. Niet alle wijzigingen zullen worden bewaard. %2$s Wijzig de permissies van het configuratie bestand om het beschrijfbaar te maken.",
"Continue": "Ga verder",
"ContinueToPiwik": "Ga verder naar Piwik",
"CurrentMonth": "Huidige maand",
@@ -97,7 +95,7 @@
"Date": "Datum",
"DateRange": "Datumbereik:",
"DateRangeFrom": "Van",
- "DateRangeFromTo": "Van %s tot %s",
+ "DateRangeFromTo": "Van %1$s tot %2$s",
"DateRangeTo": "Tot",
"DaysHours": "%1$s dagen %2$s uren",
"DaysSinceFirstVisit": "Aantal dagen sinds eerste bezoek",
@@ -129,30 +127,30 @@
"Edit": "Aanpassen",
"EncryptedSmtpTransport": "Geef de transport beveiligingslaag op die vereist is voor uw SMTP server.",
"Error": "Fout",
- "ErrorRequest": "Oeps... er ontstond een probleem tijdens het verzoek. Misschien had de server een tijdelijk probleem, of vroeg je een rapport op met teveel data. Probeer het opnieuw. Als het probleem zich voor blijft doen, neem dan %scontact op met de Piwik beheerder%s.",
+ "ErrorRequest": "Oeps... er ontstond een probleem tijdens het verzoek. Misschien had de server een tijdelijk probleem, of vroeg je een rapport op met teveel data. Probeer het opnieuw. Als het probleem zich voor blijft doen, neem dan %1$scontact op met de Piwik beheerder%2$s.",
"EvolutionOverPeriod": "Trend",
"EvolutionSummaryGeneric": "%1$s in %2$s vergeleken met %3$s in %4$s. Evolutie: %5$s",
- "ExceptionContactSupportGeneric": "Als het probleem zich nog steeds voordoet, neem dan %scontact op met je Piwik beheerder%s.",
+ "ExceptionContactSupportGeneric": "Als het probleem zich nog steeds voordoet, neem dan %1$scontact op met je Piwik beheerder%2$s.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "De gebruiker dient een Super User of de gebruiker '%s' zelf te zijn.",
"ExceptionConfigurationFileNotFound": "Het configuratiebestand {%s} is niet gevonden of kon niet worden gelezen.",
- "ExceptionConfigurationFileNotFound2": "Indien het bestand bestaat, wees er dan zeker van %s kan gelezen worden door de gebruiker '%s'.",
+ "ExceptionConfigurationFileNotFound2": "Indien het bestand bestaat, wees er dan zeker van %1$s kan gelezen worden door de gebruiker '%2$s'.",
"ExceptionDatabaseVersion": "Uw %1$s versie is %2$s maar Piwik vereist ten minste %3$s.",
"ExceptionDatabaseVersionNewerThanCodebase": "De Piwik bestanden zijn van de verouderde versie %1$s en we zien dat de Piwik Database al een upgrade heeft gehad naar de nieuwere versie %2$s.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "Het kan zijn dat de Piwik beheerder op dit moment de upgrade aan het uitvoeren is. Probeer het over een paar minuten nog eens.",
"ExceptionFileIntegrity": "Integriteitstest mislukt: %s",
"ExceptionFilesizeMismatch": "Bestandsgrootte klopt niet: %1$s (verwachte grootte: %2$s, gevonden: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Uw %1$s cliënt versie is %2$s maar is niet compatibel met server versie %3$s",
- "ExceptionInvalidAggregateReportsFormat": "Samengesteld rapporten formaat '%s' niet geldig. Probeer in plaats daarvan een van de volgende: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Samengesteld rapporten formaat '%1$s' niet geldig. Probeer in plaats daarvan een van de volgende: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Archiveer tijdstip van vandaag moet een aantal seconden zijn groter dan nul.",
- "ExceptionInvalidDateFormat": "Datum formaat moet zijn: %s of elk sleutelwoord ondersteund door de %s functie (zie %s voor meer info)",
- "ExceptionInvalidDateRange": "De datum '%s' is geen correct datum bereik. Het moet het volgende formaat hebben: %s.",
- "ExceptionInvalidPeriod": "De periode '%s' is niet geschikt. Probeer anders één van de volgende: %s",
- "ExceptionInvalidRendererFormat": "Renderformaat '%s' niet geldig. Probeer anders één van de volgende: %s",
- "ExceptionInvalidReportRendererFormat": "Rapport formaat %s is niet geldig. Probeer: %s",
- "ExceptionInvalidStaticGraphType": "Statische grafiek type '%s' niet geldig. Probeer in plaats daarvan een van de volgende: %s.",
+ "ExceptionInvalidDateFormat": "Datum formaat moet zijn: %1$s of elk sleutelwoord ondersteund door de %2$s functie (zie %3$s voor meer info)",
+ "ExceptionInvalidDateRange": "De datum '%1$s' is geen correct datum bereik. Het moet het volgende formaat hebben: %2$s.",
+ "ExceptionInvalidPeriod": "De periode '%1$s' is niet geschikt. Probeer anders één van de volgende: %2$s",
+ "ExceptionInvalidRendererFormat": "Renderformaat '%1$s' niet geldig. Probeer anders één van de volgende: %2$s",
+ "ExceptionInvalidReportRendererFormat": "Rapport formaat %1$s is niet geldig. Probeer: %2$s",
+ "ExceptionInvalidStaticGraphType": "Statische grafiek type '%1$s' niet geldig. Probeer in plaats daarvan een van de volgende: %2$s.",
"ExceptionInvalidToken": "Token is niet geldig.",
"ExceptionLanguageFileNotFound": "Taal bestand '%s' is niet gevonden.",
- "ExceptionMethodNotFound": "De methode '%s' bestaat niet of is niet beschikbaar in de module '%s'.",
+ "ExceptionMethodNotFound": "De methode '%1$s' bestaat niet of is niet beschikbaar in de module '%2$s'.",
"ExceptionMissingFile": "Bestand niet gevonden: %s",
"ExceptionNonceMismatch": "Kan het security token in dit formulier niet verifiëren.",
"ExceptionPrivilege": "Je hebt geen toegang tot deze bron, omdat %s toegang is vereist.",
@@ -160,7 +158,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Je hebt geen toegang tot deze bron, omdat %s toegang is vereist voor tenminste één website.",
"ExceptionUnableToStartSession": "Kan sessie niet starten.",
"ExceptionUndeletableFile": "Kan %s niet verwijderen.",
- "ExceptionUnreadableFileDisabledMethod": "Het configuratiebestand {%s} kon niet gelezen worden. Uw host kan %s uitgeschakeld hebben.",
+ "ExceptionUnreadableFileDisabledMethod": "Het configuratiebestand {%1$s} kon niet gelezen worden. Uw host kan %2$s uitgeschakeld hebben.",
"ExceptionReportNotFound": "Het aangevraagde rapport bestaat niet.",
"ExceptionWidgetNotFound": "De opgevraagde widget bestaat niet.",
"ExceptionReportNotEnabled": "Het opgevraagde rapport is niet geactiveerd. Dit betekend in de meeste gevallen dat de plugin die dit rapport bevat gedeactiveerd is, of dat je niet voldoende rechten hebt voor de toegang tot het rapport.",
@@ -208,7 +206,7 @@
"Logout": "Afmelden",
"MainMetrics": "Algemene gegevens",
"Matches": "Overeenkomsten",
- "MediumToHighTrafficItIsRecommendedTo": "Voor middelgrote tot grote websites, raden we u aan rapporten te genereren voor vandaag, met een maximale frequentie van eens per half uur (%s seconden) of elk uur (%s seconden).",
+ "MediumToHighTrafficItIsRecommendedTo": "Voor middelgrote tot grote websites, raden we u aan rapporten te genereren voor vandaag, met een maximale frequentie van eens per half uur (%1$s seconden) of elk uur (%2$s seconden).",
"Metadata": "Metadata",
"Metric": "Metric",
"Metrics": "Metrics",
@@ -262,7 +260,7 @@
"OperationNotEquals": "Niet gelijk aan",
"OptionalSmtpPort": "Optioneel. Standaard 25 voor onbeveiligd and TLS SMTP, en 465 voor SSL SMTP",
"Options": "Opties",
- "OrCancel": "of %s Annuleer %s",
+ "OrCancel": "of %1$s Annuleer %2$s",
"Others": "Andere",
"Outlink": "Uitgaande Link",
"Outlinks": "Uitgaande Links",
@@ -270,9 +268,9 @@
"OverlayRowActionTooltipTitle": "Open Page Overlay",
"Overview": "Overzicht",
"Pages": "Pagina's",
- "Pagination": "%s - %s van %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Parameter %s moet een geheel getal tussen %s en %s zijn.",
+ "Pagination": "%1$s - %2$s van %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Parameter %1$s moet een geheel getal tussen %2$s en %3$s zijn.",
"Password": "Wachtwoord",
"Period": "Periode",
"Piechart": "Taartdiagram",
@@ -324,7 +322,7 @@
"Clear": "Duidelijk",
"SearchNoResults": "Geen resultaten",
"SeeAll": "Bekijk alles",
- "SeeTheOfficialDocumentationForMoreInformation": "Zie de %sofficiële documentatie%s voor meer info.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Zie de %1$sofficiële documentatie%2$s voor meer info.",
"SeeThisFaq": "Bekijk %1$sdeze veelgestelde vraag%2$s.",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Selecteer \"Ja\" als u wilt dat mail verzonden wordt via een opgegeven server in plaats van de lokale mail functie.",
@@ -350,7 +348,7 @@
"Total": "Totaal",
"TotalRatioTooltip": "Dit is %1$s van alle %2$s %3$s.",
"TotalRevenue": "Totale Inkomsten",
- "TotalVisitsPageviewsActionsRevenue": "(Totaal: %s bezoekers, %s paginaweergaves,%s acties, %s inkomsten)",
+ "TotalVisitsPageviewsActionsRevenue": "(Totaal: %1$s bezoekers, %2$s paginaweergaves,%3$s acties, %4$s inkomsten)",
"TransitionsRowActionTooltip": "Bekijk wat bezoekers voor en na het bekijken van deze pagina deden",
"TransitionsRowActionTooltipTitle": "Open transities",
"TranslatorName": "Martijn van Laar, Hannes Bossuyt, Sigge Stegeman, Taco Vader, Benkheil Abdelouali, Ko de Pree, Richard Mastop",
@@ -382,8 +380,8 @@
"WarningFileIntegrityNoManifest": "Bestand integriteits controle kon niet worden uitgevoerd vanwege ontbrekend manifest.inc.php",
"WarningFileIntegrityNoManifestDeployingFromGit": "Als je Piwik vanuit Git deployed, dan is deze melding normaal.",
"WarningFileIntegrityNoMd5file": "Bestand integriteit controle kon niet worden voltooid vanwege ontbrekende md5_file() functie.",
- "WarningPasswordStored": "%sWaarschuwing:%s Dit wachtwoord zal worden bewaard in het configuratie bestand, zichtbaar voor iedereen die toegang heeft.",
- "WarningDebugOnDemandEnabled": "Tracker %s modus staat aan. Om beveilingsredenen zou dit maar voor een korte duur aan mogen staan. Om het uit te zetten, zet %s op %s in %s",
+ "WarningPasswordStored": "%1$sWaarschuwing:%2$s Dit wachtwoord zal worden bewaard in het configuratie bestand, zichtbaar voor iedereen die toegang heeft.",
+ "WarningDebugOnDemandEnabled": "Tracker %1$s modus staat aan. Om beveilingsredenen zou dit maar voor een korte duur aan mogen staan. Om het uit te zetten, zet %2$s op %3$s in %4$s",
"Website": "Website",
"Weekly": "Wekelijks",
"WeeklyReport": "wekelijks",
@@ -436,7 +434,7 @@
"MultiChartLabel": "Toon grafieklijnen",
"NavigationBack": "Terug",
"NetworkError": "Netwerk Fout",
- "NetworkErrorWithStatusCode": "Er was een probleem \"%s\". Het verzoek retourneerde de status \"%s\". URL was \"%s\". Controleer je ingevoerde URL en de error logs op deze server voor meer informatie over deze fout en hoe je ze kunt oplossen.",
+ "NetworkErrorWithStatusCode": "Er was een probleem \"%1$s\". Het verzoek retourneerde de status \"%2$s\". URL was \"%3$s\". Controleer je ingevoerde URL en de error logs op deze server voor meer informatie over deze fout en hoe je ze kunt oplossen.",
"NetworkErrorWithStatusCodeShort": "Netwerk fout %s",
"NetworkNotReachable": "Netwerk niet bereikbaar",
"NoAccountIsSelected": "Je moet een account selecteren. Voeg een nieuwe account toe indien je nog geen hebt geconfigureerd.",
@@ -454,7 +452,7 @@
"RatingDontRemindMe": "Herinner me er niet aan",
"RatingNotNow": "Niet nu",
"RatingNow": "Ok, ik wil het nu beoordelen",
- "RatingPleaseRateUs": "Piwik Mobile is gratis software. We zouden het erg op prijs stellen als je 1 minuut tijd neemt om de app te beoordelen op %s. Als u suggesties voor nieuwe functies heeft of foutmeldingen, neem dan a.u.b. contact op met %s",
+ "RatingPleaseRateUs": "Piwik Mobile is gratis software. We zouden het erg op prijs stellen als je 1 minuut tijd neemt om de app te beoordelen op %1$s. Als u suggesties voor nieuwe functies heeft of foutmeldingen, neem dan a.u.b. contact op met %2$s",
"ReleaseToRefresh": "Laat los om te vernieuwen ...",
"Reloading": "Herladen ...",
"RequestTimedOutShort": "Netwerk Timeout fout",
@@ -479,7 +477,7 @@
"CompareRows": "Vergelijk records",
"ComparingRecords": "Bezig met %s rijen te vergelijken",
"Documentation": "Klik op de gegevens om ze in een uitgebreidere trendgrafiek te bekijken. Gebruik shift-click om in één grafiek meerdere gegevens te tonen.",
- "MetricBetweenText": "tussen %s en %s",
+ "MetricBetweenText": "tussen %1$s en %2$s",
"MetricChangeText": "%s over de periode",
"MetricMinMax": "%1$s zat tussen %2$s en %3$s tijdens de periode",
"MetricsFor": "Gegevens voor %s",
diff --git a/lang/nn.json b/lang/nn.json
index d70e7a54988ead894c5b5921672f4e143952c3e7..6a3a9570b26816b9869e00bd04d68adec98e9118 100644
--- a/lang/nn.json
+++ b/lang/nn.json
@@ -8,7 +8,7 @@
"AllWebsitesDashboard": "Styringspanel for alle nettstadene",
"API": "API",
"ArchivingInlineHelp": "For nettstader med middels til høg trafikk, er det tilrådd å slå av arkivering via nettlesaren. Me oppmodar deg heller til å setja opp ein cron-jobb for å handsama rapportane til Piwik kvar time.",
- "ArchivingTriggerDescription": "For større installasjonar av Piwik er det tilrådd at du %ssett opp ein cron-jobb%s for å handsama rapportane automatisk.",
+ "ArchivingTriggerDescription": "For større installasjonar av Piwik er det tilrådd at du %1$ssett opp ein cron-jobb%2$s for å handsama rapportane automatisk.",
"AuthenticationMethodSmtp": "Godkjenningsmetode for SMTP",
"AverageOrderValue": "Gjennomsnittleg verdi på ordre",
"AveragePrice": "Snittpris",
@@ -17,10 +17,8 @@
"Cancel": "Avbryt",
"ChangePassword": "Bytt passord",
"ChangeTagCloudView": "Du kan sjå rapporten på andre vis enn ein emnesky. Bruk kontrollane på botn av rapporten for å gjera dette.",
- "ChooseDate": "Vel dato",
"ChooseLanguage": "Vel språk",
"ChoosePeriod": "Vel periode",
- "ChooseWebsite": "Vel nettside",
"ClickHere": "Klikk her for meir informasjon.",
"Close": "Lukk",
"ColumnActionsPerVisit": "Handlingar per vitjing",
@@ -61,7 +59,7 @@
"ColumnUniquePageviewsDocumentation": "Talet på vitjingar som inkluderte denne sida. Viss ei side visast fleire gong per vitjing, reknast det berre som ein gong.",
"ColumnValuePerVisit": "Inntekt per vitjing",
"ColumnVisitDuration": "Vitjarlengd (i sekund)",
- "ConfigFileIsNotWritable": "Konfigurasjonsfila til Piwik, %s, er ikkje skrivbar. Somme av endringane dine vil kanskje ikkje koma med. %s Endre tilgangsløyver for fila for å gjera den skrivbar.",
+ "ConfigFileIsNotWritable": "Konfigurasjonsfila til Piwik, %1$s, er ikkje skrivbar. Somme av endringane dine vil kanskje ikkje koma med. %2$s Endre tilgangsløyver for fila for å gjera den skrivbar.",
"ContinueToPiwik": "Hald fram til Piwik",
"CurrentMonth": "Denne månaden",
"CurrentWeek": "Denne veka",
@@ -75,7 +73,7 @@
"Date": "Dato",
"DateRange": "Periode:",
"DateRangeFrom": "Frå",
- "DateRangeFromTo": "Frå %s til %s",
+ "DateRangeFromTo": "Frå %1$s til %2$s",
"DateRangeTo": "Til",
"DaysHours": "%1$s dagar %2$s timar",
"DaysSinceFirstVisit": "Dagar sidan fyrste vitjing",
@@ -105,15 +103,17 @@
"ExceptionFileIntegrity": "Integritetssjekk feila: %s",
"ExceptionFilesizeMismatch": "Filstorleiken samsvarer ikkje: %1$s (forventa lengde: %2$s, fann: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Din %1$s klientversjon er %2$s, som ikkje er støtta med tenarversjon %3$s",
+ "ExceptionInvalidAggregateReportsFormat": "Algemene rapporten formaat '%1$s' niet geldig. Probeer in plaats daarvan een van de volgende: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Levetida for dagens arkiv må vera lengre enn null sekund",
- "ExceptionInvalidDateFormat": "Datoformatet må vera: %s eller eit anna nøkkelord som er støtta av %s funksjonen (sjå %s for meir informasjon)",
- "ExceptionInvalidDateRange": "Datoen '%s' er ikkje ein korrekt periode. Formatet lyt vera det følgjande: %s.",
- "ExceptionInvalidPeriod": "Perioden '%s' er ikkje støtta. Prøv følgjande i staden: %s",
- "ExceptionInvalidReportRendererFormat": "Rapportformat '%s' er ikkje gyldig. Prøv følgjande i staden: %s.",
- "ExceptionInvalidStaticGraphType": "Graftype '%s' er ikkje gyldig. Prøv følgjande i staden: %s.",
+ "ExceptionInvalidDateFormat": "Datoformatet må vera: %1$s eller eit anna nøkkelord som er støtta av %2$s funksjonen (sjå %3$s for meir informasjon)",
+ "ExceptionInvalidDateRange": "Datoen '%1$s' er ikkje ein korrekt periode. Formatet lyt vera det følgjande: %2$s.",
+ "ExceptionInvalidPeriod": "Perioden '%1$s' er ikkje støtta. Prøv følgjande i staden: %2$s",
+ "ExceptionInvalidRendererFormat": "Renderformaat '%1$s' niet geldig. Probeer anders één van de volgende: %2$s",
+ "ExceptionInvalidReportRendererFormat": "Rapportformat '%1$s' er ikkje gyldig. Prøv følgjande i staden: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Graftype '%1$s' er ikkje gyldig. Prøv følgjande i staden: %2$s.",
"ExceptionInvalidToken": "Teiknet er ikkje gyldig.",
"ExceptionLanguageFileNotFound": "Fann ikkje språkfila '%s'.",
- "ExceptionMethodNotFound": "Metoden '%s' finst ikkje, eller er utilgjengeleg i modulen '%s'.",
+ "ExceptionMethodNotFound": "Metoden '%1$s' finst ikkje, eller er utilgjengeleg i modulen '%2$s'.",
"ExceptionMissingFile": "Manglar fil: %s",
"ExceptionNonceMismatch": "Kunne ikkje stadfesta tryggleiksteiknet for dette skjemaet.",
"ExceptionPrivilege": "Du kan ikkje nå denne ressursen, av di den krev '%s' tilgang.",
@@ -121,7 +121,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Du kan ikkje nå denne ressursen, av di den krev '%s' tilgang for minst ein nettstad.",
"ExceptionUnableToStartSession": "Kunne ikkje starta økt.",
"ExceptionUndeletableFile": "Kunne ikkje sletta %s",
- "ExceptionUnreadableFileDisabledMethod": "Kunne ikkje lesa konfigurasjonsfila {%s}. Verten din har kanskje skrudd av %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Kunne ikkje lesa konfigurasjonsfila {%1$s}. Verten din har kanskje skrudd av %2$s.",
"Export": "Eksporter",
"ExportAsImage": "Eksporter som bilete",
"ExportThisReport": "Eksporter dette datasettet til andre format",
@@ -150,7 +150,7 @@
"Locale": "nn_NO.UTF-8",
"Logout": "Logg ut",
"MainMetrics": "Hovudverdiar",
- "MediumToHighTrafficItIsRecommendedTo": "For nettstader med middels til høg trafikk, tilrår me å handsama rapportar for idag maksimalt kvar halve (%s sekundar) eller heile time (%s sekundar).",
+ "MediumToHighTrafficItIsRecommendedTo": "For nettstader med middels til høg trafikk, tilrår me å handsama rapportar for idag maksimalt kvar halve (%1$s sekundar) eller heile time (%2$s sekundar).",
"Metadata": "Metadata",
"Metric": "Verdi",
"Metrics": "Verdiar",
@@ -183,13 +183,13 @@
"OnlyUsedIfUserPwdIsSet": "Berre brukt viss brukarnamn\/passord er sett, spør tilbydaren din viss du er usikker på kva metode du lyt bruka.",
"OpenSourceWebAnalytics": "Open nettstatistikk",
"OptionalSmtpPort": "Valfri. Standarden er 25 for ukrypter og TLS SMTP, og 465 for SSL SMTP.",
- "OrCancel": "eller %s Avbryt %s",
+ "OrCancel": "eller %1$s Avbryt %2$s",
"Others": "Andre",
"Outlink": "Utpeikar",
"Outlinks": "Utpeikarar",
"Overview": "Oversikt",
"Pages": "Sider",
- "ParameterMustIntegerBetween": "Parameteren %s må vera eit heiltal mellom %s og %s.",
+ "ParameterMustIntegerBetween": "Parameteren %1$s må vera eit heiltal mellom %2$s og %3$s.",
"Password": "Passord",
"Period": "Periode",
"Piechart": "Kakestykke",
@@ -221,7 +221,7 @@
"Save": "Lagre",
"SaveImageOnYourComputer": "For å lagra biletet på maskina di, høgreklikk på biletet og vel \"Lagre biletet som...\"",
"Search": "Søk",
- "SeeTheOfficialDocumentationForMoreInformation": "Sjå den %soffisielle dokumentasjonen%s for meir informasjon.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Sjå den %1$soffisielle dokumentasjonen%2$s for meir informasjon.",
"SelectYesIfYouWantToSendEmailsViaServer": "Vel \"Ja\" viss du vil senda e-post via ein eigen tenar i staden for den lokale epostfunksjonen",
"Settings": "Innstillingar",
"Shipping": "Frakt",
@@ -259,7 +259,7 @@
"Warning": "Ã…tvaring",
"WarningFileIntegrityNoManifest": "Sjekking av filintegritet kunne ikkje bli utført av di manifest.inc.php manglar.",
"WarningFileIntegrityNoMd5file": "Sjekking av filintegritet kunne ikkje bli utført av di md5_file()-funksjonen manglar.",
- "WarningPasswordStored": "%sÃ…tvaring:%s Dette passordet vil lagrast i konfigurasjonsfila og er synleg for alle som har tilgang til den.",
+ "WarningPasswordStored": "%1$sÃ…tvaring:%2$s Dette passordet vil lagrast i konfigurasjonsfila og er synleg for alle som har tilgang til den.",
"Website": "Nettstad",
"Weekly": "Kvar veke",
"WeeklyReports": "Vekesrapportar",
@@ -270,5 +270,12 @@
"YouAreCurrentlyUsing": "Du bruker no Piwik %s.",
"YouMustBeLoggedIn": "Du må vera innlogga for å bruka denne funksjonen.",
"YourChangesHaveBeenSaved": "Endringane dine er lagra."
+ },
+ "Mobile": {
+ "NetworkErrorWithStatusCode": "Er was een probleem \"%1$s\". Het verzoek retourneerde de status \"%2$s\". URL was \"%3$s\". Controleer je ingevoerde URL en de error logs op deze server voor meer informatie over deze fout en hoe je ze kunt oplossen.",
+ "RatingPleaseRateUs": "Piwik Mobile is vrije software. We zouden het erg op prijs stellen als u 1 minuut tijd nam om de app te waarderen op %1$s. Als u suggesties voor nieuwe functies heeft of foutmeldingen, neem dan a.u.b. contact op met %2$s"
+ },
+ "RowEvolution": {
+ "MetricBetweenText": "tussen %1$s en %2$s"
}
}
\ No newline at end of file
diff --git a/lang/pl.json b/lang/pl.json
index c68085a88f66783b2c5247316d5cd0bc46b4be0c..743a5fc86229cfe5b29436462d94d80e0357a9a9 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -1,5 +1,7 @@
{
"General": {
+ "12HourClock": "zegar 12-godzinny",
+ "24HourClock": "zegar 24-godzinny",
"AbandonedCarts": "Porzucone transakcje",
"AboutPiwikX": "O Piwik %s",
"Action": "Aktywność",
@@ -12,7 +14,7 @@
"And": "i",
"API": "API",
"ArchivingInlineHelp": "Dla serwisów o średnim i wysokim natężeniu ruchu, zalecane jest wyłączenie archiwizacji danych Piwik podczas przeglądania raportów w przeglądarce. Zamiast tego zaleca się skonfigurowanie żądania cron, by przetwarzanie raportów Piwik następowało co godzinę.",
- "ArchivingTriggerDescription": "Zalecany dla większych instalacji Piwik, musisz %sskonfigurować crona%s do przetwarzania raportów automatycznie.",
+ "ArchivingTriggerDescription": "Zalecany dla większych instalacji Piwik, musisz %1$sskonfigurować crona%2$s do przetwarzania raportów automatycznie.",
"AuthenticationMethodSmtp": "Metoda uwierzytelnienie dla SMTP",
"AverageOrderValue": "Średnia wartość zamówienia",
"AveragePrice": "Åšrednia cena",
@@ -23,10 +25,8 @@
"Cancel": "Anuluj",
"CannotUnzipFile": "Nie można rozpakować pliku %1$s: %2$s",
"ChangePassword": "Zmień hasło",
- "ChooseDate": "Zakres dat",
"ChooseLanguage": "Wybierz język",
"ChoosePeriod": "Wybierz okres",
- "ChooseWebsite": "Wybierz stronÄ™",
"ClickHere": "Kliknij tutaj, aby uzyskać więcej informacji.",
"ClickToChangePeriod": "Kilknij jeszcze raz i zmień okres.",
"Close": "Zamknij",
@@ -77,7 +77,7 @@
"ColumnViewedAfterSearch": "Kliknięć w wyniki wyszukiwania",
"ColumnVisitDuration": "Czas pobytu (w sekundach)",
"ColumnVisitsWithConversions": "Wizyty z przeniesieniami",
- "ConfigFileIsNotWritable": "Plik konfiguracyjny Piwik %s nie ma ustawionych praw do zapisu, zmiany poczynione nie mogły więc zostać zapisane. %s Zmień przez chmod uprawnienia do zapisu pliku konfiguracyjnego.",
+ "ConfigFileIsNotWritable": "Plik konfiguracyjny Piwik %1$s nie ma ustawionych praw do zapisu, zmiany poczynione nie mogły więc zostać zapisane. %2$s Zmień przez chmod uprawnienia do zapisu pliku konfiguracyjnego.",
"Continue": "Kontunuuj",
"ContinueToPiwik": "Idź do Piwik",
"CurrentMonth": "bieżący miesiąc",
@@ -92,7 +92,8 @@
"Date": "Data",
"DateRange": "Zakres dat:",
"DateRangeFrom": "od",
- "DateRangeFromTo": "Od %s do %s",
+ "DateRangeFromTo": "Od %1$s do %2$s",
+ "DateRangeInPeriodList": "zakres dat",
"DateRangeTo": "do",
"DaysHours": "%1$s dni %2$s godzin",
"DaysSinceFirstVisit": "dni od pierwszej wizyty",
@@ -127,17 +128,17 @@
"ExceptionFileIntegrity": "Weryfikacja integralności pliku zakończona niepowodzeniem: %s",
"ExceptionFilesizeMismatch": "Zła wielkość pliku: %1$s (spodziewana wielkość: %2$s, znaleziono: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Twoja %1$s wersja klienta jest %2$s co oznacza, że jest niezgodna z tą wersją serwera %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Zagregowany format raportu '%s' jest niepoprawny. Zamiast niego spróbuj: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Zagregowany format raportu '%1$s' jest niepoprawny. Zamiast niego spróbuj: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Obecny czas życia archiwum musi być określony numerem sekund większym niż zero",
- "ExceptionInvalidDateFormat": "Format daty powinien być następujący: %s lub obsługiwany przez następujące słowa kluczowe przez %s funkcję (poznaj %s by uzyskać więcej informacji)",
- "ExceptionInvalidDateRange": "Data '%s' nie jest w prawidłowym zakresie. Powinna posiadać następujący format: %s.",
- "ExceptionInvalidPeriod": "Dany okres '%s' nie jest obsługiwany. Wypróbuj inny z listy poniżej: %s",
- "ExceptionInvalidRendererFormat": "Zastosowany format '%s' jest nieprawidłowy. Wybierz jeden z dostępnych zamiast: %s.",
- "ExceptionInvalidReportRendererFormat": "Zastosowany format '%s' jest nieprawidłowy. Sprawdź jeden z dostępnych zamiast: %s.",
- "ExceptionInvalidStaticGraphType": "Statyczny typ wykresu '%s' jest nie ważny. Spróbuj jedną z następujących czynności zamiast: %s.",
+ "ExceptionInvalidDateFormat": "Format daty powinien być następujący: %1$s lub obsługiwany przez następujące słowa kluczowe przez %2$s funkcję (poznaj %3$s by uzyskać więcej informacji)",
+ "ExceptionInvalidDateRange": "Data '%1$s' nie jest w prawidłowym zakresie. Powinna posiadać następujący format: %2$s.",
+ "ExceptionInvalidPeriod": "Dany okres '%1$s' nie jest obsługiwany. Wypróbuj inny z listy poniżej: %2$s",
+ "ExceptionInvalidRendererFormat": "Zastosowany format '%1$s' jest nieprawidłowy. Wybierz jeden z dostępnych zamiast: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Zastosowany format '%1$s' jest nieprawidłowy. Sprawdź jeden z dostępnych zamiast: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Statyczny typ wykresu '%1$s' jest nie ważny. Spróbuj jedną z następujących czynności zamiast: %2$s.",
"ExceptionInvalidToken": "Token nie jest poprawny.",
"ExceptionLanguageFileNotFound": "Plik obsługi języka '%s' nie został odnaleziony.",
- "ExceptionMethodNotFound": "Metoda '%s' nie istnieje lub nie jest osiÄ…galna w module '%s'.",
+ "ExceptionMethodNotFound": "Metoda '%1$s' nie istnieje lub nie jest osiÄ…galna w module '%2$s'.",
"ExceptionMissingFile": "Brak pliku: %s",
"ExceptionNonceMismatch": "Nie można pozytywnie zweryfikować tokenu zabezpieczającego w tym formularzu.",
"ExceptionPrivilege": "Nie posiadasz dostępu do tych zasobów, ponieważ one wymagają poziomu uprawnień określonych jako %s.",
@@ -145,7 +146,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Nie posiadasz dostępu do tych zasobów, ponieważ one wymagają uprawnień jako %s w dostępie do przynajmniej jednej strony internetowej.",
"ExceptionUnableToStartSession": "Nie można uruchomić sesji.",
"ExceptionUndeletableFile": "Nie można skasować %s",
- "ExceptionUnreadableFileDisabledMethod": "Plik konfiguracyjny {%s} nie ma praw do odczytu. Twój hosting mógł zablokować %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Plik konfiguracyjny {%1$s} nie ma praw do odczytu. Twój hosting mógł zablokować %2$s.",
"ExceptionReportNotFound": "Raport nie istnieje.",
"ExceptionWidgetNotFound": "Żądany gadżet nie istnieje.",
"ExceptionReportNotEnabled": "Żądany raport nie jest włączony. Zazwyczaj oznacza to, że wtyczka, która określa raport jest nieaktywowana albo nie masz wystarczających uprawnień do dostępu do raportu.",
@@ -161,6 +162,7 @@
"Forums": "Forum",
"FromReferrer": "z",
"GeneralInformation": "Ogólne informacje",
+ "General": "Ogólne",
"GetStarted": "Zacznij",
"GiveUsYourFeedback": "Zdaj relacjÄ™!",
"Goal": "Cel",
@@ -191,7 +193,7 @@
"Logout": "Wylogowanie",
"MainMetrics": "Główne wskaźniki",
"Matches": "Pasuje",
- "MediumToHighTrafficItIsRecommendedTo": "Dla serwisów o średnim natężeniu ruchu, zaleca się przetwarzanie raportowania dziennego najwyżej do pół godziny (%s sekund) lub co godzinę (%s sekund).",
+ "MediumToHighTrafficItIsRecommendedTo": "Dla serwisów o średnim natężeniu ruchu, zaleca się przetwarzanie raportowania dziennego najwyżej do pół godziny (%1$s sekund) lub co godzinę (%2$s sekund).",
"Metadata": "Metadata",
"Metric": "Metryka",
"Metrics": "Metryki",
@@ -219,6 +221,7 @@
"NotDefined": "%s nie zdefiniowany",
"Note": "Uwagi",
"NotInstalled": "Niezainstalowany",
+ "NotRecommended": "niezalecane",
"NotValid": "%s nie jest poprawny",
"NumberOfVisits": "Ilość odwiedzin",
"NUsers": "%s użytkowników",
@@ -240,9 +243,12 @@
"OperationIsNot": "Nie jest",
"OperationLessThan": "mniej niż",
"OperationNotEquals": "Nie równa się",
+ "OperationStartsWith": "Zaczyna siÄ™ od",
+ "OperationEndsWith": "Kończy się na",
"OptionalSmtpPort": "Opcjonalnie. Domyślnie jest to port 25 dla TLS SMTP niezaszyfrowanego, i 465 dla SSL SMTP.",
"Options": "Opcje",
- "OrCancel": "lub wykonaj %s krok wstecz %s",
+ "Or": "albo",
+ "OrCancel": "lub wykonaj %1$s krok wstecz %2$s",
"Others": "Pozostałe",
"Outlink": "Linki zewnętrzne",
"Outlinks": "Linki zewnętrzne",
@@ -250,9 +256,9 @@
"OverlayRowActionTooltipTitle": "Nakładka Otwarta Strona",
"Overview": "PrzeglÄ…d",
"Pages": "Strony",
- "Pagination": "%s - %s z %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Parametr %s musi być liczbą całkowitą między %s a %s.",
+ "Pagination": "%1$s - %2$s z %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Parametr %1$s musi być liczbą całkowitą między %2$s a %3$s.",
"Password": "Hasło",
"Period": "Okres",
"Piechart": "Wykres kołowy",
@@ -273,6 +279,7 @@
"Quantity": "Ilość",
"RangeReports": "Niestandardowe zakresy dat",
"ReadThisToLearnMore": "%1$sPrzeczytaj to żeby wiedzieć więcej.%2$s",
+ "Recommended": "Zalecane",
"Refresh": "Odśwież",
"RefreshPage": "Odśwież stronę",
"RelatedReport": "PowiÄ…zany raport",
@@ -295,7 +302,7 @@
"Clear": "Wyczyść",
"SearchNoResults": "Brak wyników",
"SeeAll": "Zobacz wszystko",
- "SeeTheOfficialDocumentationForMoreInformation": "Zobacz w %soficjalnej dokumentacjin%s, aby uzyskać więcej informacji.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Zobacz w %1$soficjalnej dokumentacjin%2$s, aby uzyskać więcej informacji.",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Wybierz \"Tak\", jeśli chcesz lub musisz wysyłać e-mail za pośrednictwem serwera nazw, zamiast lokalnej obsługi przez zintegrowaną funkcję poczty",
"Settings": "Konfiguracja",
@@ -315,10 +322,14 @@
"TagCloud": "Chmura Tagów",
"Tax": "Podatek",
"TimeAgo": "%s temu",
+ "TimeFormat": "Format czasu",
"TimeOnPage": "Czas na stronie",
"Total": "Ogólnie",
"TotalRatioTooltip": "To jest %1$s wszystkich %2$s %3$s.",
"TotalRevenue": "Przychody ogółem",
+ "TrackingScopeAction": "Akcja",
+ "TrackingScopePage": "Strona",
+ "TrackingScopeVisit": "Wizyta",
"TransitionsRowActionTooltipTitle": "Otwarte przejścia",
"TranslatorName": "<a href=\"http:\/\/eliteria.pl\">Remigiusz Waszkiewicz<\/a>, Marcin Kowol, Maciej Zawadziński, Artur Warchoł,AETERNUS, Tomasz Kornicki",
"UniquePurchases": "Unikalnych zakupów",
@@ -342,18 +353,22 @@
"Visitors": "OglÄ…dajÄ…cy",
"VisitsWith": "Odwiedzin z %s",
"VisitorSettings": "Konfiguracje użytkownika",
+ "VisitType": "Typ wizyty",
"VisitTypeExample": "Przykładowo, aby wybrać wszystkich odwiedzających, którzy powrócili na serwis, włączając tych, którzy zakupili coś podczas poprzednich wizyt, zapytanie API będzie zawierać %s",
"Warning": "Ostrzeżenie",
+ "WarningPhpVersionXIsTooOld": "Wersja PHP %s której używasz osiągnęła swój Koniec Życia (EOL). Rekomandujemy aktualizację do aktualnej wersji, ponieważ używanie obecnej może narazić Cię na luki w zabezpieczeniach i błędy które zostały naprawione w nowszych wersjach PHP.",
+ "WarningPiwikWillStopSupportingPHPVersion": "Piwik przestanie wspierać PHP %1$s w następnej głownej wersji. Zaktualizuj PHP do przynajmniej PHP %2$s, zanim będzie za późno!",
"WarningFileIntegrityNoManifest": "Weryfikacja integralności plików nie mogła zostać przeprowadzona z powodu braku pliku manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "W przypadku wdrażania Piwik z Git, komunikat ten jest prawidłowy.",
"WarningFileIntegrityNoMd5file": "Weryfikacja integralności plików nie mogła zostać zakończona z powodu braku funkcji md5_file().",
- "WarningPasswordStored": "%sOstrzeżenie:%s To hasło zostanie zapisane w pliku konfiguracyjnym widocznym dla każdego, kto może mieć do niego dostęp.",
+ "WarningPasswordStored": "%1$sOstrzeżenie:%2$s To hasło zostanie zapisane w pliku konfiguracyjnym widocznym dla każdego, kto może mieć do niego dostęp.",
"Website": "Strona WWW",
"Weekly": "Tygodniowo",
"WeeklyReport": "tygodniowo",
"WeeklyReports": "Raporty tygodniowe",
"WellDone": "Dobra robota!",
"Widgets": "Interfejs widżetów",
+ "Widget": "Widget",
"XComparedToY": "%1$s w stosunku do %2$s",
"XFromY": "%1$s z %2$s",
"YearlyReport": "rocznie",
@@ -361,6 +376,7 @@
"YearsDays": "%1$s lat %2$s dni",
"Yes": "Tak",
"YouAreCurrentlyUsing": "Aktualnie używasz Piwik %s.",
+ "YouAreViewingDemoShortMessage": "OglÄ…dasz demo aplikacji Piwik",
"YouMustBeLoggedIn": "Musisz się zalogować, by uzyskać dostęp do funkcji zasobów.",
"YourChangesHaveBeenSaved": "Twoje modyfikacje zostały zapisane pomyślnie."
},
@@ -379,7 +395,7 @@
"ChooseSegment": "Wybierz segment",
"ConfirmRemoveAccount": "Czy chcesz usunąć to konto?",
"DefaultReportDate": "Data raportu",
- "EmailUs": "Wyślij nam wiadomośc email",
+ "EmailUs": "Wyślij nam wiadomość email",
"EnableGraphsLabel": "Wyświetlanie wykresów",
"EvolutionGraph": "Graf Historyczny",
"HelpUsToImprovePiwikMobile": "Czy chcesz włączyć anonimowe śledzenie wykorzystania w Piwik Mobile?",
@@ -394,7 +410,7 @@
"NavigationBack": "Powrót",
"NetworkError": "BÅ‚Ä…d sieci",
"NetworkErrorWithStatusCodeShort": "BÅ‚Ä…d sieci %s",
- "NetworkNotReachable": "Sieć nie osiągalna",
+ "NetworkNotReachable": "Sieć nieosiągalna",
"NoAccountIsSelected": "Musisz wybrać konto. Dodaj nowe konto jeśli go nie skonfigurowałeś.",
"NoDataShort": "Brak danych",
"NoPiwikAccount": "Brak konta Piwik?",
@@ -408,8 +424,9 @@
"IgnoreSslError": "Ignoruj błąd SSL",
"RatingDontRemindMe": "Nie przypominaj mi",
"RatingNotNow": "Nie teraz",
+ "RatingNow": "OK, oceniÄ™ to teraz",
"ReleaseToRefresh": "Puść aby odświeżyć...",
- "Reloading": "Przeładowanie...",
+ "Reloading": "Przeładowywanie...",
"RestrictedCompatibility": "Ograniczona kompatybilność",
"SaveSuccessError": "Prosimy sprawdzić ustawienia konfiguracyjne",
"SearchWebsite": "Przeszukuj witryny",
@@ -424,7 +441,7 @@
"AvailableMetrics": "Dostępne wskaźniki",
"CompareRows": "Porównaj rekordy",
"ComparingRecords": "Porównywanych wierszy %s",
- "MetricBetweenText": "od %s do %s",
+ "MetricBetweenText": "od %1$s do %2$s",
"MetricsFor": "Metryka dla %s",
"MultiRowEvolutionTitle": "Postęp dla wielu rekordów",
"PickAnotherRow": "Wybierz inny wiersz do porównania",
diff --git a/lang/pt-br.json b/lang/pt-br.json
index 2bed8292e5d2cf94128637d3f0972991056e39ce..9d55d2908d5c946cf622dfcfbe1eb51df10e699a 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -15,7 +15,7 @@
"API": "API",
"Apply": "Aplicar",
"ArchivingInlineHelp": "Para sites com tráfego de médio a alto, é recomendado desabilitar a trigger que salva do navegador. Em vez disso, nós recomendamos que instale um cron job para processar os relatorios Piwik a cada hora.",
- "ArchivingTriggerDescription": "Recomendado para instalações maiores do Piwik, precisa de %s configurar um cron job%s para processar os relatórios automaticamente.",
+ "ArchivingTriggerDescription": "Recomendado para instalações maiores do Piwik, você precisa %1$sconfigurar um trabalho cron%2$s para processar os relatórios automaticamente.",
"AuthenticationMethodSmtp": "Método de autenticação para SMTP",
"AverageOrderValue": "Média de Pedidos",
"AveragePrice": "Média de Preço",
@@ -27,10 +27,9 @@
"CannotUnzipFile": "Não pode descompactar o arquivo %1$s: %2$s",
"ChangePassword": "Modificar senha",
"ChangeTagCloudView": "Por favor, note que você pode ver o relatório de outras maneiras além de uma nuvem de tags. Utilize os controles na parte inferior do relatório para modificá-lo.",
- "ChooseDate": "Escolha a Data",
+ "ChooseDate": "Escolha a data, a data atualmente selecionada é: %s",
"ChooseLanguage": "Escolha o idioma.",
"ChoosePeriod": "Escolha o perÃodo.",
- "ChooseWebsite": "Escolha o site",
"ClickHere": "Clique aqui para mais informações.",
"ClickToChangePeriod": "Clique novamente para alterar o perÃodo.",
"Close": "Fechar",
@@ -84,9 +83,11 @@
"ColumnViewedAfterSearchDocumentation": "O número de vezes que esta página foi visitada depois que um visitante fez uma pesquisa em seu site, e clicou nesta página nos resultados de pesquisa.",
"ColumnVisitDuration": "Duração da Visita em segundos",
"ColumnVisitsWithConversions": "Visitas com conversões",
- "ConfigFileIsNotWritable": "O arquivo %s de configuração Piwik não é editável, suas mudanças não serão salvas. %s por favor mude as permissões da configuração do arquivo para fazê-lo editável.",
+ "ConfigFileIsNotWritable": "O arquivo %1$s de configuração Piwik não é editável, algumas de suas alterações podem não ser salvas. %2$s Por favor, altere as permissões do arquivo de configuração para torná-lo editável.",
"Continue": "Continuar",
"ContinueToPiwik": "Continua no Piwik",
+ "CurrentlyUsingUnsecureHttp": "Atualmente você está usando Piwik com HTTP não segura, o que pode ser arriscado. Nós recomendamos que você configure Piwik com SSL (HTTPS) para melhorar a segurança.",
+ "CreatedByUser": "criado por %s",
"CurrentMonth": "Mês atual",
"CurrentWeek": "Semana atual",
"CurrentYear": "Ano atual",
@@ -100,7 +101,7 @@
"Date": "Data",
"DateRange": "Entre as datas:",
"DateRangeFrom": "De",
- "DateRangeFromTo": "De %s para %s",
+ "DateRangeFromTo": "De %1$s para %2$s",
"DateRangeInPeriodList": "perÃodo",
"DateRangeTo": "Para",
"DaysHours": "%1$s dias %2$s horas",
@@ -133,30 +134,30 @@
"Edit": "Editar",
"EncryptedSmtpTransport": "Digite a criptografia de camada de transporte exigida pelo servidor SMTP.",
"Error": "Erro",
- "ErrorRequest": "Oops ... houve um problema durante a solicitação. Talvez o servidor teve um problema temporário, ou você solicitou um relatório com muitos dados. Por favor, tente novamente. Se este erro ocorrer repetidamente, por favor entre em %scontato com seus administradores do Piwik%s para obter assistência.",
+ "ErrorRequest": "Oops... houve um problema durante a solicitação. Talvez o servidor tenha tido um problema temporário ou talvez você tenha solicitado um relatório com dados demais. Por favor, tente novamente. Se esse erro ocorrer repetidamente, por favor %1$scontate o seu administrador do Piwik%2$s para assistência.",
"EvolutionOverPeriod": "Evolução no PerÃodo",
"EvolutionSummaryGeneric": "%1$s em %2$s em relação ao %3$s em %4$s. Evolução: %5$s",
- "ExceptionContactSupportGeneric": "Se você continuar experimentando esse erro, entre em %scontato com seu administrador%s Piwik para suporte.",
+ "ExceptionContactSupportGeneric": "Se você ainda tiver esse problema, por favor %1$scontate o seu administrador Piwik%2$s para assistência.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "O usuário precisa ter permissão de Super Usuário ou ser o próprio: '%s'.",
"ExceptionConfigurationFileNotFound": "O ficheiro de configuração {%s} não foi encontrado.",
- "ExceptionConfigurationFileNotFound2": "Se o arquivo existe, por favor verifique se %s é legÃvel pelo usuário '%s'.",
+ "ExceptionConfigurationFileNotFound2": "Se o arquivo existir, por favor verifique se %1$s é legÃvel pelo usuário '%2$s'.",
"ExceptionDatabaseVersion": "Sua %1$s versão é %2$s mas o Piwik requer no mÃnimo %3$s.",
"ExceptionDatabaseVersionNewerThanCodebase": "Sua base de código Piwik está executando a versão antiga %1$s e foi detectado que seu banco de dados Piwik já foi atualizado para a nova versão %2$s.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "Talvez seus administradores do Piwik estejam atualmente terminando o processo de atualização. Por favor, tente novamente em alguns minutos.",
"ExceptionFileIntegrity": "Check de inegridade falhou: %s.",
"ExceptionFilesizeMismatch": "Tamanho do arquivo incompatÃvel: %1$s (esperado: %2$s, encontrado: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Sua %1$s client version é %2$s que é incompatÃvel com a versão do servidor %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Formato de relatórios agregados '%s' não é válido. Tente um dos seguintes: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "O formato de relatórios agregados '%1$s' não é válido. Tente um dos seguintes: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "O tempo de arquivamento para hoje tem de ser um número de segundos maior do que zero.",
- "ExceptionInvalidDateFormat": "O formato da data tem de ser: %s ou alguma das palavras-chave suportadas pela função %s (ver %s para mais informações)",
- "ExceptionInvalidDateRange": "A data %s não está numa gama de datas correcta. Deverá ter o seguinte formato: %s.",
- "ExceptionInvalidPeriod": "O periodo '%s' não é suportado. Tente algum dos seguintes como alternativa: %s",
- "ExceptionInvalidRendererFormat": "Formato de renderização '%s' não válido. Tente algum dos seguintes como alternativa: %s",
- "ExceptionInvalidReportRendererFormat": "Formato do relatório '%s' não é válido. Tente um dos seguintes:%s.",
- "ExceptionInvalidStaticGraphType": "Tipo de gráfico estático '%s' não é válido. Tente um dos seguintes: %s.",
+ "ExceptionInvalidDateFormat": "O formato da data deve ser: %1$s ou alguma das palavras chave suportadas pela função %2$s (veja %3$s para mais informações)",
+ "ExceptionInvalidDateRange": "A data '%1$s' não é um intervalo de data correta. Deve ter o seguinte formato: %2$s.",
+ "ExceptionInvalidPeriod": "O perÃodo '%1$s' não é suportado. Tente algum dos seguintes: %2$s",
+ "ExceptionInvalidRendererFormat": "O formato de renderização '%1$s' não válido. Tente algum dos seguintes: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "O formato de relatório '%1$s' não é válido. Tente algum dos seguintes: %2$s.",
+ "ExceptionInvalidStaticGraphType": "O tipo de gráfico estático '%1$s' não é válido. Tente um dos seguintes: %2$s.",
"ExceptionInvalidToken": "O token não é válido.",
"ExceptionLanguageFileNotFound": "Ficheiro de idioma %s não encontrado.",
- "ExceptionMethodNotFound": "O método '%s' não existe ou não está disponÃvel no módulo '%s'.",
+ "ExceptionMethodNotFound": "O método '%1$s' não existe ou não está disponÃvel no módulo '%2$s'.",
"ExceptionMissingFile": "Arquivo faltando: %s.",
"ExceptionNonceMismatch": "Não conseguiria verificar a segurança tomada nesse modelo.",
"ExceptionPrivilege": "Não pode aceder a este recurso uma vez que ele requer um acesso %s.",
@@ -164,7 +165,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Não pode aceder a este recurso uma vez que ele requer um acesso %s para pelo menos um site.",
"ExceptionUnableToStartSession": "Não foi possÃvel iniciar a sessão.",
"ExceptionUndeletableFile": "ImpossÃvel de apagar %s",
- "ExceptionUnreadableFileDisabledMethod": "O ficheiro de configuração {%s} não pôde ser lido. O seu alojamento pode ter destivado %s.",
+ "ExceptionUnreadableFileDisabledMethod": "O arquivo de configuração {%1$s} não pôde ser lido. O seu host pode ter destivado %2$s.",
"ExceptionReportNotFound": "O relatório solicitado não existe.",
"ExceptionWidgetNotFound": "O widget solicitado não existe.",
"ExceptionReportNotEnabled": "O relatório solicitado não está habilitado. Geralmente isto significa que o plugin que define o relatório está desativado ou você não tem permissão suficiente para acessar o mesmo.",
@@ -212,7 +213,7 @@
"Logout": "Sair",
"MainMetrics": "Métricas principais",
"Matches": "Equivalências",
- "MediumToHighTrafficItIsRecommendedTo": "Para sites com tráfego de médio a alto, nós recomendamos processar relatórios diariamente no máximo a cada meia hora(%s segundos)ou toda hora (%s segundos).",
+ "MediumToHighTrafficItIsRecommendedTo": "Para sites com tráfego de médio a alto, nós recomendamos processar relatórios diários no máximo a cada meia hora (%1$s segundos) ou a cada hora (%2$s segundos).",
"Metadata": "Metadados",
"Metric": "Métrica",
"Metrics": "Métricas",
@@ -230,6 +231,7 @@
"Name": "Nome",
"NbActions": "Número de Ações",
"NbSearches": "Número de Pesquisas internas",
+ "NeedMoreHelp": "Precisa de mais ajuda?",
"Never": "Nunca",
"NewReportsWillBeProcessedByCron": "Quando o arquivamento do Piwik não for iniciado pelo navegador, novos relatórios irão ser processados pelo crontab.",
"NewUpdatePiwikX": "Nova atualização: Piwik %s",
@@ -269,7 +271,7 @@
"OptionalSmtpPort": "Opcional. O padrão é 25 para não criptografadas e TLS SMTP, e 465 para SMTP SSL.",
"Options": "Opções",
"Or": "ou",
- "OrCancel": "ou %s Cancele %s",
+ "OrCancel": "or %1$s Cancelar %2$s",
"Others": "Outros",
"Outlink": "SaÃda",
"Outlinks": "Links externos",
@@ -277,9 +279,9 @@
"OverlayRowActionTooltipTitle": "Sobreposição de Página aberta",
"Overview": "Visão Geral",
"Pages": "Páginas",
- "Pagination": "%s - %s de %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "O parâmetro %s deve ser um valor inteiro entre %s e %s.",
+ "Pagination": "%1$s - %2$s de %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "O parâmetro %1$s deve ser um valor inteiro entre %2$s e %3$s.",
"Password": "Senha",
"Period": "PerÃodo",
"Piechart": "Gráfico circular",
@@ -331,7 +333,7 @@
"Clear": "Limpar",
"SearchNoResults": "sem resultados",
"SeeAll": "Ver todos",
- "SeeTheOfficialDocumentationForMoreInformation": "Veja a %s documentação oficial%s para mais informações.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Veja a %1$sdocumentação oficial%2$s para mais informações.",
"SeeThisFaq": "Veja %1$sEste faq%2$s.",
"Segment": "Segmento",
"SelectYesIfYouWantToSendEmailsViaServer": "Selecione \"Sim\" se pretende ou precisa de enviar email através de um nome de servidor em vez de usar a função de email local.",
@@ -358,7 +360,7 @@
"Total": "Total",
"TotalRatioTooltip": "Este é %1$s de todos os %2$s %3$s.",
"TotalRevenue": "Total de Revendas",
- "TotalVisitsPageviewsActionsRevenue": "(Total: %s visitas , %s exibições de página, %s actions, %s receita)",
+ "TotalVisitsPageviewsActionsRevenue": "(Total: %1$s visitas, %2$s visualizações, %3$s ações, %4$s receita)",
"TrackingScopeAction": "Ação",
"TrackingScopePage": "Página",
"TrackingScopeVisit": "Visita",
@@ -395,8 +397,8 @@
"WarningFileIntegrityNoManifest": "O check de integridade do arquivo não pode ser feita enquanto estiver faltando manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "Se você estiver implantando Piwik a partir do repositório Git, esta mensagem é normal.",
"WarningFileIntegrityNoMd5file": "O check de integridade do arquivo não pode ser completado enquanto estiver faltando a função md5_file().",
- "WarningPasswordStored": "%sAviso:%s Esta senha será armazenada no arquivo de configuração, visÃvel para todos que puderem acessá-lo.",
- "WarningDebugOnDemandEnabled": "O modo Tracker %s está ativado. Por razões de segurança, este deve ser ativado apenas por um curto espaço de tempo. Para desativá-lo configure %s para %s em %s",
+ "WarningPasswordStored": "%1$sWarning:%2$s Esta senha será armazenada no arquivo de configuração visÃvel para todos que possam acessá-lo.",
+ "WarningDebugOnDemandEnabled": "O modo Tracker %1$s está ativado. Por razões de segurança, este deve ser ativado apenas por um curto perÃodo de tempo. Para desativá-lo configure %2$s para %3$s em %4$s",
"Website": "Website",
"Weekly": "Semanalmente",
"WeeklyReport": "semanal",
@@ -450,7 +452,7 @@
"MultiChartLabel": "Mostrar sparklines",
"NavigationBack": "Voltar",
"NetworkError": "Erro de Rede",
- "NetworkErrorWithStatusCode": "Houve um erro \"%s\". O pedido devolveu o status de \"%s\". URL era \"%s\". Por favor, verifique a sua URL digitada e os logs de erro no servidor para obter mais informações sobre o erro e como resolvê-lo.",
+ "NetworkErrorWithStatusCode": "Houve um erro \"%1$s\". O pedido retornou o status como \"%2$s\". URL foi \"%3$s\". Por favor, verifique a URL inserida e os logs de erro no servidor para obter mais informações sobre o erro e como resolvê-lo.",
"NetworkErrorWithStatusCodeShort": "Erro de Conexão %s",
"NetworkNotReachable": "Rede não encontrada",
"NoAccountIsSelected": "Você tem que selecionar uma conta, ou Adicionar uma nova conta se você não tiver uma configurada.",
@@ -468,7 +470,7 @@
"RatingDontRemindMe": "Não me lembrar",
"RatingNotNow": "Não agora",
"RatingNow": "OK, vou avaliá-lo agora",
- "RatingPleaseRateUs": "Piwik Mobile App é um Software Livre, nós realmente apreciamos se você tirar um minuto para avaliar a aplicação do %s. Se você tiver sugestões de novas funcionalidades ou relatórios de bugs, por favor, entre em contato %s '",
+ "RatingPleaseRateUs": "O Piwik Mobile App é um software livre, nós realmente apreciaremos se você tomar um minuto para avaliar o aplicativo na %1$s. Se você tiver sugestões de recursos ou relatórios de novos erros, entre em contato %2$s",
"ReleaseToRefresh": "Solte para recarregar...",
"Reloading": "Recarregar...",
"RequestTimedOutShort": "Tempo limite de Rede atingido!",
@@ -493,7 +495,7 @@
"CompareRows": "Comparar registros",
"ComparingRecords": "Comparando %s registros",
"Documentation": "Clique nas métricas para exibi-las no gráfico de grande evolução. Use Shift + clique para exibir multiplas métricas de uma só vez.",
- "MetricBetweenText": "entre %s e %s",
+ "MetricBetweenText": "de %1$s para %2$s",
"MetricChangeText": "%s altera ao longo do perÃodo",
"MetricMinMax": "%1$s intervalado entre %2$s e %3$s está fora do perÃodo",
"MetricsFor": "Metricas para %s",
diff --git a/lang/pt.json b/lang/pt.json
index 81f95be1610802f61a380cd751213f202b411ffc..7232021e7c0751e01374056d9d6fd21d669fce72 100644
--- a/lang/pt.json
+++ b/lang/pt.json
@@ -11,7 +11,7 @@
"And": "e",
"API": "API",
"ArchivingInlineHelp": "Para websites de tráfego médio ou elevado, é recomendado desactivar o arquivar de Piwik de ser accionado quando os relatórios são vistos no navegador. Em vez disso, recomendamos que configure uma tarefa cron para processar os relatórios de Piwik cada hora.",
- "ArchivingTriggerDescription": "Recomendado para instalações Piwik maiores, tem que %sconfigurar uma tarefa cron%s para processar os relatórios automaticamente.",
+ "ArchivingTriggerDescription": "Recomendado para instalações Piwik maiores, tem que %1$sconfigurar uma tarefa cron%2$s para processar os relatórios automaticamente.",
"AuthenticationMethodSmtp": "Método de autenticação SMTP",
"AverageOrderValue": "Valor médio dos pedidos",
"AveragePrice": "Preço Médio",
@@ -22,10 +22,8 @@
"CannotUnzipFile": "Não é possivel extrair o ficheiro unzip %1$s: %2$s",
"ChangePassword": "Alterar palavra-passe",
"ChangeTagCloudView": "Por favor note que pode visualizar relatórios de outras formas além das tag clouds. Use os menus no fundo do relatório para o fazer.",
- "ChooseDate": "Escolha data",
"ChooseLanguage": "Escolha o idioma",
"ChoosePeriod": "Escolha o perÃodo",
- "ChooseWebsite": "Escolha o website",
"ClickHere": "Clique aqui para mais informação.",
"Close": "Fechar",
"ColumnActionsPerVisit": "Acções por Visita",
@@ -70,7 +68,7 @@
"ColumnValuePerVisit": "Valor por Visita",
"ColumnVisitDuration": "Duração da visita (em segundos)",
"ColumnVisitsWithConversions": "Visitas com Conversões",
- "ConfigFileIsNotWritable": "O ficheiro de configuração de Piwik %s não é modificável, as suas alteração não serão guardadas. %s Por favor altere as permissões do ficheiro de configuração para ser modificável.",
+ "ConfigFileIsNotWritable": "O ficheiro de configuração de Piwik %1$s não é modificável, as suas alteração não serão guardadas. %2$s Por favor altere as permissões do ficheiro de configuração para ser modificável.",
"ContinueToPiwik": "Voltar a Piwik",
"CurrentMonth": "Mês Actual",
"CurrentWeek": "Semana Actual",
@@ -83,7 +81,7 @@
"Date": "Data",
"DateRange": "Intervalo de data:",
"DateRangeFrom": "De",
- "DateRangeFromTo": "De %s até %s",
+ "DateRangeFromTo": "De %1$s até %2$s",
"DateRangeTo": "Até",
"DaysHours": "%1$s dias %2$s horas",
"DaysSinceFirstVisit": "Dias desde a primeira visita",
@@ -115,16 +113,16 @@
"ExceptionFileIntegrity": "Verificação de integridade falhou: %s",
"ExceptionFilesizeMismatch": "Tamanho do ficheiro não corresponde: %1$s (tamanho esperado: %2$s, encontrado: %3$s)",
"ExceptionIncompatibleClientServerVersions": "A sua versão cliente de %1$s é %2$s que é incompatÃvel com a versão servidor %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "O formato agregado do relatório '%s' não é válido. Em alternativa tente alguns dos seguintes: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "O formato agregado do relatório '%1$s' não é válido. Em alternativa tente alguns dos seguintes: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "O tempo de vida do arquivo tem que ser um número de segundos maior que zero.",
- "ExceptionInvalidDateFormat": "O formato da data tem que ser: %s ou qualquer palavra-chave suportada pela função %s (veja %s para mais informação)",
- "ExceptionInvalidDateRange": "A data '%s' não é um intervalo de data correcto. Deve ter o seguinte formato: %s.",
- "ExceptionInvalidPeriod": "O perÃodo '%s' não é suportado. Tente um dos seguintes: %s",
- "ExceptionInvalidRendererFormat": "Formato de renderização '%s' não é válido. Tente um dos seguintes: %s.",
- "ExceptionInvalidReportRendererFormat": "O formato do relatório '%s' não é válido. Em alternativa tente alguns dos seguintes: %s.",
+ "ExceptionInvalidDateFormat": "O formato da data tem que ser: %1$s ou qualquer palavra-chave suportada pela função %2$s (veja %3$s para mais informação)",
+ "ExceptionInvalidDateRange": "A data '%1$s' não é um intervalo de data correcto. Deve ter o seguinte formato: %2$s.",
+ "ExceptionInvalidPeriod": "O perÃodo '%1$s' não é suportado. Tente um dos seguintes: %2$s",
+ "ExceptionInvalidRendererFormat": "Formato de renderização '%1$s' não é válido. Tente um dos seguintes: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "O formato do relatório '%1$s' não é válido. Em alternativa tente alguns dos seguintes: %2$s.",
"ExceptionInvalidToken": "O sÃmbolo não é válido.",
"ExceptionLanguageFileNotFound": "O ficheiro de idioma '%s' não foi encontrado.",
- "ExceptionMethodNotFound": "O método '%s' não existe ou não está disponÃvel no módulo '%s'.",
+ "ExceptionMethodNotFound": "O método '%1$s' não existe ou não está disponÃvel no módulo '%2$s'.",
"ExceptionMissingFile": "Falta o ficheiro: %s",
"ExceptionNonceMismatch": "Não foi possÃvel verificar o sÃmbolo de segurança deste formulário.",
"ExceptionPrivilege": "Não pode aceder a este recurso porque necessita de acesso %s.",
@@ -132,7 +130,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Não pode aceder a este recurso porque necessita de acesso %s pelo menos para um website.",
"ExceptionUnableToStartSession": "Não foi possÃvel começar a sessão.",
"ExceptionUndeletableFile": "Não é possÃvel eliminar %s",
- "ExceptionUnreadableFileDisabledMethod": "Não foi possÃvel ler o ficheiro de configuração {%s}. O seu host pode ter desactivado %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Não foi possÃvel ler o ficheiro de configuração {%1$s}. O seu host pode ter desactivado %2$s.",
"Export": "Exportar",
"ExportAsImage": "Exportar como Imagem",
"ExportThisReport": "Exportar estes dados noutros formatos",
@@ -161,7 +159,7 @@
"Locale": "pt_PT.UTF-8",
"Logout": "Sair",
"MainMetrics": "Dados Principais",
- "MediumToHighTrafficItIsRecommendedTo": "Para websites com tráfego médio ou elevado, recomendamos que processe os relatórios de hoje no máximo cada meia hora (%s segundos) ou de hora em hora (%s segundos).",
+ "MediumToHighTrafficItIsRecommendedTo": "Para websites com tráfego médio ou elevado, recomendamos que processe os relatórios de hoje no máximo cada meia hora (%1$s segundos) ou de hora em hora (%2$s segundos).",
"Metadata": "Meta-dados",
"Metric": "Métrica",
"Metrics": "Métricas",
@@ -194,14 +192,14 @@
"OnlyUsedIfUserPwdIsSet": "Apenas utilizado se um utilizador\/palavra-passe estiver definido, pergunte ao seu fornecedor se não tiver a certeza que método deve usar.",
"OpenSourceWebAnalytics": "Análise Web de código livre",
"OptionalSmtpPort": "Opcional. Por omissão é 25 para ligações não encriptadas e TLS SMTP, e 465 para SSL SMTP.",
- "OrCancel": "ou %s Cancelar %s",
+ "OrCancel": "ou %1$s Cancelar %2$s",
"Others": "Outros",
"Outlink": "Link de saÃda",
"Outlinks": "Links de saÃda",
"Overview": "Visão Geral",
"Pages": "Páginas",
- "Pagination": "%s - %s de %s",
- "ParameterMustIntegerBetween": "O parâmetro %s tem que ser um valor inteiro entre %s e %s.",
+ "Pagination": "%1$s - %2$s de %3$s",
+ "ParameterMustIntegerBetween": "O parâmetro %1$s tem que ser um valor inteiro entre %2$s e %3$s.",
"Password": "Palavra-passe",
"Period": "PerÃodo",
"Piechart": "Gráfico Circular",
@@ -232,7 +230,7 @@
"Search": "Pesquisar",
"Clear": "Limpar",
"SearchNoResults": "sem resultados",
- "SeeTheOfficialDocumentationForMoreInformation": "Veja a %sdocumentação oficial%s para mais informação",
+ "SeeTheOfficialDocumentationForMoreInformation": "Veja a %1$sdocumentação oficial%2$s para mais informação",
"SelectYesIfYouWantToSendEmailsViaServer": "Seleccione \"Sim\" se quer ou tem de enviar e-mail através de um servidor nomeado em vez da função de mail local.",
"Settings": "Definições",
"Shipping": "Expedição",
@@ -279,7 +277,7 @@
"Warning": "Aviso",
"WarningFileIntegrityNoManifest": "A verificação da integridade dos ficheiros não pode ser executada devido a faltar manifest.inc.php.",
"WarningFileIntegrityNoMd5file": "A verificação da integridade dos ficheiros não pode ser completada devido faltar a função md5_file().",
- "WarningPasswordStored": "%sAviso:%s Esta palavra-passe será guardada no ficheiro de configuração, visÃvel para qualquer pessoa que o possa aceder.",
+ "WarningPasswordStored": "%1$sAviso:%2$s Esta palavra-passe será guardada no ficheiro de configuração, visÃvel para qualquer pessoa que o possa aceder.",
"Website": "Website",
"Weekly": "Semanalmente",
"WeeklyReport": "semanal",
@@ -318,7 +316,7 @@
"RowEvolution": {
"AvailableMetrics": "Métricas disponÃveis",
"CompareRows": "Comparar registos",
- "MetricBetweenText": "de %s a %s",
+ "MetricBetweenText": "de %1$s a %2$s",
"MetricsFor": "Métricas para %s",
"PickAnotherRow": "Escolha outra linha para comparar",
"PickARow": "Escolher um registo para comparação"
diff --git a/lang/ro.json b/lang/ro.json
index 3e84cf952ae1ba1d2f1ce100d06a9a75a0ee9fc7..ee042e57e643fddd7a2b591e0d6ddbb58440f348 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -11,7 +11,7 @@
"And": "ÅŸi",
"API": "API",
"ArchivingInlineHelp": "Pentru site-uri cu trafic mediu sau mare, este recomandata dezactivarea arhivari Piwik din browser. Recomandat sa faceti setup la un cron job pentru a procesa rapoarte Piwik in fiecare ora",
- "ArchivingTriggerDescription": "Recomandat pentru instalari mari, trebuie sa %ssetup un cron job%s pentru procesarea automata a rapoartelor",
+ "ArchivingTriggerDescription": "Recomandat pentru instalari mari, trebuie sa %1$ssetup un cron job%2$s pentru procesarea automata a rapoartelor",
"AuthenticationMethodSmtp": "Metoda autentificare pentru SMTP",
"AverageOrderValue": "Valoare medie a comenzii",
"AveragePrice": "Pret mediu",
@@ -23,10 +23,8 @@
"CannotUnzipFile": "Nu se poate dezarhiva fisierul %1$s: %2$s",
"ChangePassword": "Schimbă parola",
"ChangeTagCloudView": "Va rugam notati, puteti vizualiza rapoartele in alte feluri, pe langa tag cloud. Folositi controalele din josul raportului pentru a face asta",
- "ChooseDate": "Alege data",
"ChooseLanguage": "Alege limba",
"ChoosePeriod": "Alegeti interval",
- "ChooseWebsite": "Alegeti website",
"ClickHere": "Click aici pentru mai multe informatii",
"ClickToChangePeriod": "Click iarasi pentru a schimba perioada.",
"Close": "Inchide",
@@ -78,7 +76,7 @@
"ColumnViewedAfterSearchDocumentation": "De câte ori această pagină a fost vizitat după ce un vizitator a făcut o căutare pe website-ul tau, și a făcut clic pe această pagină în rezultatele de căutare.",
"ColumnVisitDuration": "Durata vizita (in secunde)",
"ColumnVisitsWithConversions": "Vizite cu conversii",
- "ConfigFileIsNotWritable": "Fişierul de configurare %s Piwik nu se poate scrie, e posibil ca o parte din modificările tale să nu se fi salvat. %s Schimbă permisiile fişierului de configurare pentru a-l putea modifica.",
+ "ConfigFileIsNotWritable": "Fişierul de configurare %1$s Piwik nu se poate scrie, e posibil ca o parte din modificările tale să nu se fi salvat. %2$s Schimbă permisiile fişierului de configurare pentru a-l putea modifica.",
"Continue": "Continuă",
"ContinueToPiwik": "Continuă către Piwik",
"CurrentMonth": "Luna curenta",
@@ -94,7 +92,7 @@
"Date": "Data",
"DateRange": "Interval:",
"DateRangeFrom": "De la",
- "DateRangeFromTo": "De la %s la %s",
+ "DateRangeFromTo": "De la %1$s la %2$s",
"DateRangeTo": "la",
"DaysHours": "%1$s zile %2$s ore",
"DaysSinceFirstVisit": "Zile de la prima vizita",
@@ -134,17 +132,17 @@
"ExceptionFileIntegrity": "A esuat verificare integritatii: %s",
"ExceptionFilesizeMismatch": "Nepotrivire la marime fisierului: %1$s (marime asteptata: %2$s, gasita: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Versiunea clientului dvs. %1$s este %2$s, care este incompatibila cu versiunea de pe server, %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Formatul rapoartelor agregate '%s' este invalid. Incercati-l pe oricare dintre acestea: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Formatul rapoartelor agregate '%1$s' este invalid. Incercati-l pe oricare dintre acestea: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Timpul de arhivare trebuie sa fie un numar de secunde mai mare de 0",
- "ExceptionInvalidDateFormat": "Formatul datei trebuie sa fie: %s sau alt cuvant cheie suportat de functia %s (vedeti %s pentru mai multe informatii)",
- "ExceptionInvalidDateRange": "Data '%s' nu este un interval corect. Ar trebui sa aiba urmatorul format: %s.",
- "ExceptionInvalidPeriod": "Perioada '%s' nu este suportata. Incercati-o pe oricare dintre acestea: %s.",
- "ExceptionInvalidRendererFormat": "Formatul '%s' este invalid. Incercati-l pe oricare dintre acestea: %s.",
- "ExceptionInvalidReportRendererFormat": "Formatul raportului '%s' este invalid. Incercati-l pe oricare dintre acestea: %s.",
- "ExceptionInvalidStaticGraphType": "Tipul graficului static '%s' nu este valid. Încearcă unul din următoarele: %s.",
+ "ExceptionInvalidDateFormat": "Formatul datei trebuie sa fie: %1$s sau alt cuvant cheie suportat de functia %2$s (vedeti %3$s pentru mai multe informatii)",
+ "ExceptionInvalidDateRange": "Data '%1$s' nu este un interval corect. Ar trebui sa aiba urmatorul format: %2$s.",
+ "ExceptionInvalidPeriod": "Perioada '%1$s' nu este suportata. Incercati-o pe oricare dintre acestea: %2$s.",
+ "ExceptionInvalidRendererFormat": "Formatul '%1$s' este invalid. Incercati-l pe oricare dintre acestea: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Formatul raportului '%1$s' este invalid. Incercati-l pe oricare dintre acestea: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Tipul graficului static '%1$s' nu este valid. Încearcă unul din următoarele: %2$s.",
"ExceptionInvalidToken": "Token invalid",
"ExceptionLanguageFileNotFound": "Fişierul de limba '%s' nu a fost găsit.",
- "ExceptionMethodNotFound": "Metoda '%s' nu exista sau nu e valabila in modulul '%s'.",
+ "ExceptionMethodNotFound": "Metoda '%1$s' nu exista sau nu e valabila in modulul '%2$s'.",
"ExceptionMissingFile": "Fisier lipsa: %s",
"ExceptionNonceMismatch": "Nu a putut fi verificat token-ul de securitate in acest formular",
"ExceptionPrivilege": "Nu puteti accesa resursa pentru ca necesita acces la %s",
@@ -152,7 +150,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Nu puteti accesa resursa pentru ca necesita acces %s pentru cel putin un site",
"ExceptionUnableToStartSession": "Sesiunea nu a putut fi pornita",
"ExceptionUndeletableFile": "Nu s-a putut sterge %s",
- "ExceptionUnreadableFileDisabledMethod": "Fisierul de configurare {%s} nu a putut fi citit. Hosting-ul dvs. ar fi putut dezactiva %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Fisierul de configurare {%1$s} nu a putut fi citit. Hosting-ul dvs. ar fi putut dezactiva %2$s.",
"ExpandDataTableFooter": "Schimba vizualizarea sau configura raportul",
"Export": "Exporta",
"ExportAsImage": "Exporta ca imagine",
@@ -195,7 +193,7 @@
"Logout": "IeÅŸire",
"MainMetrics": "Metrici principali",
"Matches": "Meciuri",
- "MediumToHighTrafficItIsRecommendedTo": "Pentru site-uri cu trafic mediu sau mare, este recomandata procesarea rapoartelor la fiecare jumate de ora (%s secunde) sau ora (%s secunde)",
+ "MediumToHighTrafficItIsRecommendedTo": "Pentru site-uri cu trafic mediu sau mare, este recomandata procesarea rapoartelor la fiecare jumate de ora (%1$s secunde) sau ora (%2$s secunde)",
"Metadata": "Metadata",
"Metric": "Metric",
"Metrics": "Metrice",
@@ -247,7 +245,7 @@
"OperationNotEquals": "diferite",
"OptionalSmtpPort": "Optional. Prestabilit la 25 pentru neecriptat si TLS SMTP, si 465 pentru SSL SMTP.",
"Options": "Opţiuni",
- "OrCancel": "sau %s Anuleaza %s",
+ "OrCancel": "sau %1$s Anuleaza %2$s",
"Others": "Altele",
"Outlink": "Link extern",
"Outlinks": "Outlink-uri",
@@ -255,8 +253,8 @@
"OverlayRowActionTooltipTitle": "Deschide Page Overlay",
"Overview": "Rezumat",
"Pages": "Pagini",
- "Pagination": "%s - %s of %s",
- "ParameterMustIntegerBetween": "Parametrul %s trebuie sa fie o valoare intreaga intre %s si %s.",
+ "Pagination": "%1$s - %2$s of %3$s",
+ "ParameterMustIntegerBetween": "Parametrul %1$s trebuie sa fie o valoare intreaga intre %2$s si %3$s.",
"Password": "Parola",
"Period": "Perioada",
"Piechart": "Diagrama",
@@ -302,7 +300,7 @@
"Search": "Cauta",
"SearchNoResults": "Nici un rezultat",
"SeeAll": "vezi tot",
- "SeeTheOfficialDocumentationForMoreInformation": "Vedeti %sdocumentatie oficiala%s pentru mai multe informatii.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Vedeti %1$sdocumentatie oficiala%2$s pentru mai multe informatii.",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Selectati \"Da\" daca vreti sa trimiteti email via serverul mentionat in locul functiei local mail",
"Settings": "Setări",
@@ -356,7 +354,7 @@
"WarningFileIntegrityNoManifest": "Verificare integritatii fisierelor nu a putut fi efectuata din cauza lipsei manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "Dacă implementați Piwik din Git, acest mesaj este normal.",
"WarningFileIntegrityNoMd5file": "Verificare integritatii fisierelor nu a putut fi efectuata din cauza lipsei functiei md5_file()",
- "WarningPasswordStored": "%sAtentie:%s Parola va fi stocata in fisierul config vizibil oricui il poate accesa.",
+ "WarningPasswordStored": "%1$sAtentie:%2$s Parola va fi stocata in fisierul config vizibil oricui il poate accesa.",
"Website": "Website",
"Weekly": "Saptamanal",
"WeeklyReport": "săptămânal",
@@ -407,7 +405,7 @@
"MultiChartLabel": "Afișare Sparklines",
"NavigationBack": "ÃŽnapoi",
"NetworkError": "Eroare de reţea",
- "NetworkErrorWithStatusCode": "Nu a fost o eroare \"%s\". Cererea de revenitre la statusul \"%s\". URL-ul a fost \"%s\". Vă rugăm să verificați URL-ul dvs. si erorile de logare de pe acest server pentru mai multe informații despre eroare și cum să-l rezolve .",
+ "NetworkErrorWithStatusCode": "Nu a fost o eroare \"%1$s\". Cererea de revenitre la statusul \"%2$s\". URL-ul a fost \"%3$s\". Vă rugăm să verificați URL-ul dvs. si erorile de logare de pe acest server pentru mai multe informații despre eroare și cum să-l rezolve .",
"NetworkErrorWithStatusCodeShort": "Eroarea de reţea %s",
"NetworkNotReachable": "Reteaua nu este accesibila",
"NoAccountIsSelected": "Trebuie să selectați un cont. Adăugați un cont nou dacă nu ați configurat-o.",
@@ -422,7 +420,7 @@
"RatingDontRemindMe": "Nu-mi aminti",
"RatingNotNow": "Nu acum",
"RatingNow": "OK, il voi evalua acum",
- "RatingPleaseRateUs": "Piwik Mobile App este un software gratuit, ne-ar face placere dacă ați aloca 1 minut pentru a evalua aplicația în %s. Dacă aveți sugestii pentru noile caracteristici sau rapoarte de bug-uri, vă rugăm să contactați %s",
+ "RatingPleaseRateUs": "Piwik Mobile App este un software gratuit, ne-ar face placere dacă ați aloca 1 minut pentru a evalua aplicația în %1$s. Dacă aveți sugestii pentru noile caracteristici sau rapoarte de bug-uri, vă rugăm să contactați %2$s",
"ReleaseToRefresh": "Lansare pentru reimprospatare...",
"Reloading": "Reincarcare...",
"RequestTimedOutShort": "Eroare de rețea timp expirat",
@@ -446,7 +444,7 @@
"CompareRows": "Compara inregistrari",
"ComparingRecords": "Comparând %s rânduri",
"Documentation": "Faceți clic pe metrici pentru a le afișa în Graficul de mare evoluție. Utilizați Shift-clic pentru a afișa mai multe valori dintr-o dată.",
- "MetricBetweenText": "între %s şi %s",
+ "MetricBetweenText": "între %1$s şi %2$s",
"MetricChangeText": "%s schimba în perioada",
"MetricMinMax": "%1$s variat între %2$s și %3$s în perioada",
"MetricsFor": "Metrici pentru %s",
diff --git a/lang/ru.json b/lang/ru.json
index 18ba18e860e9a8c4a84b39cba55c01f151c99374..cd59aba81baabaf9bc3a13d72e0d8c793f0bd2a1 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -13,7 +13,7 @@
"API": "API-функции",
"Apply": "Применить",
"ArchivingInlineHelp": "Ð”Ð»Ñ Ñайтов Ñо Ñредней или выÑокой нагрузкой рекомендуетÑÑ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ архивирование данных при входе в веб-аналитику через браузер. ВмеÑто Ñтого лучше назначить cron-задачу, чтобы Piwik автоматичеÑки формировал отчеты каждый чаÑ.",
- "ArchivingTriggerDescription": "Ð”Ð»Ñ Ñайтов Ñ Ð²Ñ‹Ñокой нагрузкой наÑтоÑтельно рекомендуетÑÑ %sназначить cron-задачу%s, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ формировать отчеты автоматичеÑки.",
+ "ArchivingTriggerDescription": "Ð”Ð»Ñ Ñайтов Ñ Ð²Ñ‹Ñокой нагрузкой наÑтоÑтельно рекомендуетÑÑ %1$sназначить cron-задачу%2$s, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ формировать отчеты автоматичеÑки.",
"AuthenticationMethodSmtp": "Метод аутентификации SMTP",
"AverageOrderValue": "СреднÑÑ ÑтоимоÑÑ‚ÑŒ заказа",
"AveragePrice": "СреднÑÑ Ñ†ÐµÐ½Ð°",
@@ -25,10 +25,8 @@
"CannotUnzipFile": "Ðе могу раÑпаковать файл %1$s: %2$s",
"ChangePassword": "Изменить пароль",
"ChangeTagCloudView": "Учтите, что Ð’Ñ‹ можете проÑматривать отчет не только через облако тегов. ИÑпользуйте Ñлементы ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ð½Ð¸Ð·Ñƒ отчета Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚Ð¾Ð² проÑмотра.",
- "ChooseDate": "Выбор даты",
"ChooseLanguage": "Выбрать Ñзык",
"ChoosePeriod": "Выбрать период",
- "ChooseWebsite": "Выбрать Ñайт",
"ClickHere": "Ðажмите здеÑÑŒ, чтобы узнать больше",
"ClickToChangePeriod": "Ðажмите еще раз, чтобы изменить период.",
"Close": "Закрыть",
@@ -82,7 +80,7 @@
"ColumnViewedAfterSearchDocumentation": "ЧиÑло раз, когда поÑетители поÑещали Ñту Ñтраницу поÑле того, как они пользовалиÑÑŒ поиÑком на вашем Ñайте и кликнули по найденной Ñтранице.",
"ColumnVisitDuration": "ПродолжительноÑÑ‚ÑŒ поÑÐµÑ‰ÐµÐ½Ð¸Ñ (Ñек)",
"ColumnVisitsWithConversions": "Повторные поÑещениÑ",
- "ConfigFileIsNotWritable": "Файл конфигурации Piwik %s закрыт Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи, ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ðµ будут Ñохранены. %s ПожалуйÑта, измените Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¾Ð³Ð¾ файла и разрешите запиÑÑŒ в него.",
+ "ConfigFileIsNotWritable": "Файл конфигурации Piwik %1$s закрыт Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи, ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ðµ будут Ñохранены. %2$s ПожалуйÑта, измените Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¾Ð³Ð¾ файла и разрешите запиÑÑŒ в него.",
"Continue": "Продолжить",
"ContinueToPiwik": "Перейти к Piwik",
"CurrentMonth": "Текущий меÑÑц",
@@ -98,7 +96,7 @@
"Date": "Дата",
"DateRange": "Временной период:",
"DateRangeFrom": "От",
- "DateRangeFromTo": "С %s по %s",
+ "DateRangeFromTo": "С %1$s по %2$s",
"DateRangeInPeriodList": "диапазон дат:",
"DateRangeTo": "До",
"DaysHours": "%1$s дн. %2$s чаÑ",
@@ -131,30 +129,30 @@
"Edit": "Редактировать",
"EncryptedSmtpTransport": "Выберите тип ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ‚Ñ€Ð°Ð½Ñпортном уровне, требуемое вашим SMTP Ñервером.",
"Error": "Ошибка",
- "ErrorRequest": "Ой... возникла проблема во Ð²Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа. Возможно причиной тому Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° на Ñервере, или Вами был запрошен отчет, Ñодержащий большой объем данных. ПожалуйÑта, повторите попытку. ЕÑли ошибка повторÑетÑÑ, пожалуйÑта %sÑвÑжитеÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором Piwik%s.",
+ "ErrorRequest": "Ой... возникла проблема во Ð²Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа. Возможно причиной тому Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° на Ñервере, или Вами был запрошен отчет, Ñодержащий большой объем данных. ПожалуйÑта, повторите попытку. ЕÑли ошибка повторÑетÑÑ, пожалуйÑта %1$sÑвÑжитеÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором Piwik%2$s.",
"EvolutionOverPeriod": "ÐÐ²Ð¾Ð»ÑŽÑ†Ð¸Ñ Ð·Ð° период",
"EvolutionSummaryGeneric": "%1$s в %2$s по Ñравнению Ñ %3$s в %4$s. ИзменениÑ: %5$s",
- "ExceptionContactSupportGeneric": "ЕÑли вы продолжаете получать Ñту ошибку, пожалуйÑта, %sобратитеÑÑŒ к админиÑтратору Piwik%s за помощью.",
+ "ExceptionContactSupportGeneric": "ЕÑли вы продолжаете получать Ñту ошибку, пожалуйÑта, %1$sобратитеÑÑŒ к админиÑтратору Piwik%2$s за помощью.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Пользователь должен быть либо Ñуперпользователем, либо пользователем '%s'.",
"ExceptionConfigurationFileNotFound": "Конфигурационный файл {%s} не может быть найден.",
- "ExceptionConfigurationFileNotFound2": "ЕÑли файл ÑущеÑтвует, пожалуйÑта, проверьте, что %s доÑтупен Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼ \"%s\".",
+ "ExceptionConfigurationFileNotFound2": "ЕÑли файл ÑущеÑтвует, пожалуйÑта, проверьте, что %1$s доÑтупен Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼ \"%2$s\".",
"ExceptionDatabaseVersion": "ВерÑÐ¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ %1$s - %2$s, но Piwik требует Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ %3$s.",
"ExceptionDatabaseVersionNewerThanCodebase": "ИÑполнÑемые файлы Piwik уÑтаревшей верÑии %1$s, а база данных Piwik уже обновлена до новой верÑии %2$s.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "Возможно Ваш Piwik-админиÑтратор только что закончил процеÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ. Попробуйте повторить позже.",
"ExceptionFileIntegrity": "Проверка целоÑтноÑти не удалаÑÑŒ: %s",
"ExceptionFilesizeMismatch": "Размер файла не Ñовпадает: %1$s (ожидалÑÑ: %2$s, обнаружен: %3$s)",
"ExceptionIncompatibleClientServerVersions": "ВерÑÐ¸Ñ %1$s вашего клиента - %2$s, она не ÑовмеÑтима Ñ Ñервером верÑии %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Определение формата отчетов '%s' неверно. Попробуйте что-нибудь Ñледующее, вмеÑто: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Определение формата отчетов '%1$s' неверно. Попробуйте что-нибудь Ñледующее, вмеÑто: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Ð’Ñ€ÐµÐ¼Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ (в Ñекундах) должно быть больше нулÑ",
- "ExceptionInvalidDateFormat": "Формат даты должен быть: %s или любое другое ключевое Ñлово, поддерживаемое функцией %s (Ñм. %s, чтобы узнать больше)",
- "ExceptionInvalidDateRange": "Дата '%s' не входит в корректный промежуток. Она должна быть Ñледующего формата: %s.",
- "ExceptionInvalidPeriod": "Период '%s' не поддерживаетÑÑ. Попробуйте вмеÑто него другой из доÑтупных: %s",
- "ExceptionInvalidRendererFormat": "Формат рендерера '%s' неверен. Попробуйте вмеÑто него другой из доÑтупных: %s.",
- "ExceptionInvalidReportRendererFormat": "Формат отчета '%s' не верен. Попробуйте вмеÑто него другой из доÑтупных: '%s'.",
- "ExceptionInvalidStaticGraphType": "Тип Ñтатичного графика '%s' неверен. Попробуйте что-нибудь Ñледующее, вмеÑто: %s.",
+ "ExceptionInvalidDateFormat": "Формат даты должен быть: %1$s или любое другое ключевое Ñлово, поддерживаемое функцией %2$s (Ñм. %3$s, чтобы узнать больше)",
+ "ExceptionInvalidDateRange": "Дата '%1$s' не входит в корректный промежуток. Она должна быть Ñледующего формата: %2$s.",
+ "ExceptionInvalidPeriod": "Период '%1$s' не поддерживаетÑÑ. Попробуйте вмеÑто него другой из доÑтупных: %2$s",
+ "ExceptionInvalidRendererFormat": "Формат рендерера '%1$s' неверен. Попробуйте вмеÑто него другой из доÑтупных: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Формат отчета '%1$s' не верен. Попробуйте вмеÑто него другой из доÑтупных: '%2$s'.",
+ "ExceptionInvalidStaticGraphType": "Тип Ñтатичного графика '%1$s' неверен. Попробуйте что-нибудь Ñледующее, вмеÑто: %2$s.",
"ExceptionInvalidToken": "Токен неверен.",
"ExceptionLanguageFileNotFound": "Файл Ñзыка '%s' не найден.",
- "ExceptionMethodNotFound": "Метод '%s' не ÑущеÑтвует или недоÑтупен в модуле '%s'.",
+ "ExceptionMethodNotFound": "Метод '%1$s' не ÑущеÑтвует или недоÑтупен в модуле '%2$s'.",
"ExceptionMissingFile": "ОтÑутÑтвует файл: %s",
"ExceptionNonceMismatch": "Ðе могу проверить Ñлемент безопаÑноÑти Ð´Ð»Ñ Ñтой формы.",
"ExceptionPrivilege": "Ð’Ñ‹ не можете иметь доÑтуп к Ñтому реÑурÑу, поÑкольку он требует прав %s.",
@@ -162,7 +160,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Ð’Ñ‹ не можете получить доÑтуп к Ñтому реÑурÑу, поÑкольку необходимы права %s Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ñайта.",
"ExceptionUnableToStartSession": "Ðе удалоÑÑŒ запуÑтить ÑеÑÑию.",
"ExceptionUndeletableFile": "Ðевозможно удалить %s",
- "ExceptionUnreadableFileDisabledMethod": "Конфигурационный файл {%s} не может быть прочтен. Возможно, на вашем хоÑте отключен %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Конфигурационный файл {%1$s} не может быть прочтен. Возможно, на вашем хоÑте отключен %2$s.",
"ExceptionReportNotFound": "Запрашиваемый отчет не ÑущеÑтвует.",
"ExceptionWidgetNotFound": "Запрашиваемый виджет не ÑущеÑтвует.",
"ExceptionReportNotEnabled": "Запрошенный отчёт не включен. Ðто означает, как правило, что либо выключен плагин, который определÑет Ñтот отчет, либо нет прав доÑтупа к Ñтому отчёту.",
@@ -209,7 +207,7 @@
"Logout": "Выйти",
"MainMetrics": "ОÑновные показатели",
"Matches": "Совпадений",
- "MediumToHighTrafficItIsRecommendedTo": "Ð”Ð»Ñ Ñайтов Ñо Ñредней или выÑокой нагрузкой мы рекомендуем формировать отчеты за ÑегоднÑшний день каждые полчаÑа (%s Ñек) или каждый Ñ‡Ð°Ñ (%s Ñек).",
+ "MediumToHighTrafficItIsRecommendedTo": "Ð”Ð»Ñ Ñайтов Ñо Ñредней или выÑокой нагрузкой мы рекомендуем формировать отчеты за ÑегоднÑшний день каждые полчаÑа (%1$s Ñек) или каждый Ñ‡Ð°Ñ (%2$s Ñек).",
"Metadata": "Метаданные",
"Metric": "Показатель",
"Metrics": "Показатели",
@@ -263,7 +261,7 @@
"OperationNotEquals": "Ðе равно",
"OptionalSmtpPort": "ÐеобÑзательно. По умолчанию иÑпользуетÑÑ 25 Ð´Ð»Ñ Ð½ÐµÐ·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ и TLS SMTP ÑоединениÑ, и 465 Ð´Ð»Ñ SSL SMTP.",
"Options": "ÐаÑтройки",
- "OrCancel": "или %s отмените %s",
+ "OrCancel": "или %1$s отмените %2$s",
"Others": "Другие",
"Outlink": "ИÑходÑÑ‰Ð°Ñ ÑÑылка",
"Outlinks": "ИÑходÑщие ÑÑылки",
@@ -271,9 +269,9 @@
"OverlayRowActionTooltipTitle": "Открыть Ñтраницу Ñ Ð½Ð°Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÐ¼",
"Overview": "Обзор",
"Pages": "Страницы",
- "Pagination": "%s - %s из %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Параметр %s должен быть целым чиÑлом между %s и %s.",
+ "Pagination": "%1$s - %2$s из %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Параметр %1$s должен быть целым чиÑлом между %2$s и %3$s.",
"Password": "Пароль",
"Period": "Период",
"Piechart": "ÐšÑ€ÑƒÐ³Ð¾Ð²Ð°Ñ Ð´Ð¸Ð°Ð³Ñ€Ð°Ð¼Ð¼Ð°",
@@ -323,7 +321,7 @@
"Clear": "ОчиÑтить",
"SearchNoResults": "Без результатов",
"SeeAll": "проÑмотреть вÑÑ‘",
- "SeeTheOfficialDocumentationForMoreInformation": "Смотрите %sофициальную документацию%s чтобы узнать больше.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Смотрите %1$sофициальную документацию%2$s чтобы узнать больше.",
"SeeThisFaq": "ПоÑмотрите %1$sÑти чаÑтые вопроÑÑ‹%2$s.",
"Segment": "Сегмент",
"SelectYesIfYouWantToSendEmailsViaServer": "Выберите \"Да\", еÑли вы хотите отÑылать e-mail пиÑьма через определенный Ñервер, вмеÑто иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð¹ mail функции.",
@@ -350,10 +348,10 @@
"Total": "Ð’Ñего",
"TotalRatioTooltip": "Ðто %1$s из вÑех %2$s %3$s.",
"TotalRevenue": "ÐžÐ±Ñ‰Ð°Ñ Ð¿Ñ€Ð¸Ð±Ñ‹Ð»ÑŒ",
- "TotalVisitsPageviewsActionsRevenue": "(Ð’Ñего: %s визиты, %s проÑмотры Ñтраниц, %s дейÑтвиÑ, %s выручка)",
+ "TotalVisitsPageviewsActionsRevenue": "(Ð’Ñего: %1$s визиты, %2$s проÑмотры Ñтраниц, %3$s дейÑтвиÑ, %4$s выручка)",
"TransitionsRowActionTooltip": "ПоÑмотрите, что поÑетители делали до и поÑле проÑмотра Ñтой Ñтраницы",
"TransitionsRowActionTooltipTitle": "Открыть переходы",
- "TranslatorName": "Ademaro, <a href=\"http:\/\/jokerintertactive.ru\/\">Joker Interactive<\/a>, <a href=\"http:\/\/codax.ru\/\">Важенин Ð˜Ð»ÑŒÑ (ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ñ Codax)<\/a>, Nelde Maxim, Andrey, Vadim Nekhai",
+ "TranslatorName": "Ademaro, <a href=\"http:\/\/jokerintertactive.ru\/\">Joker Interactive<\/a>, <a href=\"http:\/\/codax.ru\/\">Важенин Ð˜Ð»ÑŒÑ (ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ñ Codax)<\/a>, Nelde Maxim, Andrey, Vadim Nekhai, <a href=\"https:\/\/uptimepal.net\">UptimePal<\/a>",
"UniquePurchases": "Уникальные покупки",
"Unknown": "ÐеизвеÑтно",
"Upload": "Закачать",
@@ -384,7 +382,7 @@
"WarningFileIntegrityNoManifest": "Проверка целоÑтноÑти не может быть проведена из-за отÑутÑÑ‚Ð²Ð¸Ñ manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "ЕÑли вы делаете деплой Piwik из Git, Ñто Ñообщение ÑвлÑетÑÑ Ð½Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ñ‹Ð¼.",
"WarningFileIntegrityNoMd5file": "Проверка целоÑтноÑти не может быть проведена из-за отÑутÑÑ‚Ð²Ð¸Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¸ md5_file().",
- "WarningPasswordStored": "%sВнимание:%s Ðтот пароль будет Ñохранен в конфигурационном файле на Ñервере в незашифрованном виде, и будет виден любому, кто имеет доÑтуп к файловой ÑиÑтеме Ñервера.",
+ "WarningPasswordStored": "%1$sВнимание:%2$s Ðтот пароль будет Ñохранен в конфигурационном файле на Ñервере в незашифрованном виде, и будет виден любому, кто имеет доÑтуп к файловой ÑиÑтеме Ñервера.",
"Website": "Сайт",
"Weekly": "Еженедельно",
"WeeklyReport": "еженедельно",
@@ -438,7 +436,7 @@
"MultiChartLabel": "Отображать тонкие графики (нити)",
"NavigationBack": "Ðазад",
"NetworkError": "Ошибка Ñети",
- "NetworkErrorWithStatusCode": "Произошла ошибка \"%s\". Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð²ÐµÑ€Ð½ÑƒÐ» ÑтатуÑ: \"%s\". URL был: \"%s\". ПожалуйÑта, проверьте введенный URL и лог ошибок на Ñервере Ð´Ð»Ñ Ð±Ð¾Ð»ÐµÐµ детальной информации по ошибке и ÑпоÑобам её решениÑ.",
+ "NetworkErrorWithStatusCode": "Произошла ошибка \"%1$s\". Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð²ÐµÑ€Ð½ÑƒÐ» ÑтатуÑ: \"%2$s\". URL был: \"%3$s\". ПожалуйÑта, проверьте введенный URL и лог ошибок на Ñервере Ð´Ð»Ñ Ð±Ð¾Ð»ÐµÐµ детальной информации по ошибке и ÑпоÑобам её решениÑ.",
"NetworkErrorWithStatusCodeShort": "Ошибка Ñети %s",
"NetworkNotReachable": "Сеть недоÑтупна",
"NoAccountIsSelected": "Ð’Ñ‹ должны выбрать учетную запиÑÑŒ. Добавьте новую учетную запиÑÑŒ, еÑли вы Ñтого еще не Ñделали.",
@@ -456,7 +454,7 @@
"RatingDontRemindMe": "Ðе напоминать мне",
"RatingNotNow": "Ðе ÑейчаÑ",
"RatingNow": "OK, ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ñ†ÐµÐ½ÑŽ",
- "RatingPleaseRateUs": "Мобильное приложение Piwik беÑплатно, мы будем очень благодарны вам, еÑли вы найдете минутку, чтобы оценить приложение в %s. ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ новым функциÑм или вы нашли баг, пожалуйÑта ÑвÑжитеÑÑŒ Ñ %s",
+ "RatingPleaseRateUs": "Мобильное приложение Piwik беÑплатно, мы будем очень благодарны вам, еÑли вы найдете минутку, чтобы оценить приложение в %1$s. ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ новым функциÑм или вы нашли баг, пожалуйÑта ÑвÑжитеÑÑŒ Ñ %2$s",
"ReleaseToRefresh": "ОтпуÑтите, чтобы обновить...",
"Reloading": "Обновление...",
"RequestTimedOutShort": "Ошибка времени Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð² Ñети",
@@ -481,7 +479,7 @@
"CompareRows": "Сравнить запиÑи",
"ComparingRecords": "Сравнение %s Ñтрок",
"Documentation": "Ðажмите на показатели, чтобы отобразить их динамику на большом графике. ИÑпользуйте shift+клик Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð½ÐµÑкольких показателей одновременно.",
- "MetricBetweenText": "Между %s и %s",
+ "MetricBetweenText": "Между %1$s и %2$s",
"MetricChangeText": "%s за период",
"MetricMinMax": "%1$s выÑтавленый между %2$s и %3$s больше периода",
"MetricsFor": "Показатели Ð´Ð»Ñ %s",
diff --git a/lang/sk.json b/lang/sk.json
index 6593349188d48aa1893fe875e6bcc753d239a276..8377e7666b6b2150bba5df36eceac58ab7922856 100644
--- a/lang/sk.json
+++ b/lang/sk.json
@@ -15,7 +15,7 @@
"API": "API",
"Apply": "Použiť",
"ArchivingInlineHelp": "Pre stredné až vysoké návÅ¡tevnosti webových stránok, sa odporúÄa vypnúť v Piwiku archiváciu spúšťanú prezeranÃm z prehliadaÄa. Namiesto toho odporúÄame nastaviÅ¥ cron úlohu na spracovanie Piwik reportov každú hodinu.",
- "ArchivingTriggerDescription": "OdporúÄa sa pre väÄÅ¡ie inÅ¡talácie Piwiku, musÃte %s nastaviÅ¥ cron %s aby spracovával reporty automaticky.",
+ "ArchivingTriggerDescription": "OdporúÄa sa pre väÄÅ¡ie inÅ¡talácie Piwiku, musÃte %1$s nastaviÅ¥ cron %2$s aby spracovával reporty automaticky.",
"AuthenticationMethodSmtp": "Metóda overovania pre SMTP",
"AverageOrderValue": "Prierná hodnota nákupu",
"AveragePrice": "Priemerná cena",
@@ -27,10 +27,8 @@
"CannotUnzipFile": "Nie je možné rozbaliť súbor %1$s: %2$s",
"ChangePassword": "Zmena hesla",
"ChangeTagCloudView": "VÅ¡imnite si, že reporty môžete vidieÅ¥ aj iným spôsobom ako oblak znaÄiek. Použite ovládanie na spodku grafu pre prepÃnanie zobrazenia.",
- "ChooseDate": "Vybrať dátum",
"ChooseLanguage": "Vyberte jazyk",
"ChoosePeriod": "Vyberte si obdobie",
- "ChooseWebsite": "Vyberte si web",
"ClickHere": "Klinite pre viac informáciÃ.",
"ClickToChangePeriod": "Kliknite znovu pre zmenu obdobia",
"Close": "Zatvoriť",
@@ -84,7 +82,7 @@
"ColumnViewedAfterSearchDocumentation": "PoÄet krát koľko bola táto stránka navÅ¡tÃvená po tom, ako návÅ¡tevnÃk spravil vyhľadávanie na VaÅ¡om webe a klikol na túto stránku vo výsledkoch vyhľadávania.",
"ColumnVisitDuration": "Dĺžka návštevy (v sekundách)",
"ColumnVisitsWithConversions": "Návštevy s konverziou",
- "ConfigFileIsNotWritable": "KonfiguraÄný súbor %s Piwiku , some of your changes might not be saved. %s Please change permissions of the config file to make it writable.",
+ "ConfigFileIsNotWritable": "KonfiguraÄný súbor %1$s Piwiku , some of your changes might not be saved. %2$s Please change permissions of the config file to make it writable.",
"Continue": "PokraÄovaÅ¥",
"ContinueToPiwik": "PokraÄovaÅ¥ do projektu Piwik",
"CurrentMonth": "Aktuálny mesiac",
@@ -100,7 +98,7 @@
"Date": "Dátum",
"DateRange": "Časové obdobie:",
"DateRangeFrom": "Od",
- "DateRangeFromTo": "Od %s do %s",
+ "DateRangeFromTo": "Od %1$s do %2$s",
"DateRangeInPeriodList": "dátumový rozsah",
"DateRangeTo": "Do",
"DaysHours": "%1$s dnà %2$s hodÃn",
@@ -133,30 +131,30 @@
"Edit": "Upraviť",
"EncryptedSmtpTransport": "Zadajte šifrovanie prenosnej vrstvy požadovanej vašim SMTP serverom.",
"Error": "Chyba",
- "ErrorRequest": "Oops..poÄas požiadavky sa vyskytol problém. Možno je server doÄasne nedostupný alebo možno ste požadovali report, ktorý obsahuje prÃliÅ¡ veľa údajov. Ak sa táto chyba vyskytuje opakovane, prosÃm %s kontaktujte Vášho Piwik administrátora %s.",
+ "ErrorRequest": "Oops..poÄas požiadavky sa vyskytol problém. Možno je server doÄasne nedostupný alebo možno ste požadovali report, ktorý obsahuje prÃliÅ¡ veľa údajov. Ak sa táto chyba vyskytuje opakovane, prosÃm %1$s kontaktujte Vášho Piwik administrátora %2$s.",
"EvolutionOverPeriod": "Vývoj za obdobie",
"EvolutionSummaryGeneric": "%1$s v %2$s porovnané s %3$s v %4$s. Vývoj: %5$s",
- "ExceptionContactSupportGeneric": "Ak sa stále vyskytuje táto záležitosÅ¥, prosÃm %s kontaktujte Vášho Piwik administrátora %s.",
+ "ExceptionContactSupportGeneric": "Ak sa stále vyskytuje táto záležitosÅ¥, prosÃm %1$s kontaktujte Vášho Piwik administrátora %2$s.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "UžÃvateľ musà byÅ¥ buÄto SuperužÃvateľ alebo samotný užÃvateľ '%s'.",
"ExceptionConfigurationFileNotFound": "KonfiguraÄný súbor{%s} nebol nájdený.",
- "ExceptionConfigurationFileNotFound2": "Ak súbor existuje, prosÃm skontrolujte Äi %s je užÃvateľom '%s' Äitateľné.",
+ "ExceptionConfigurationFileNotFound2": "Ak súbor existuje, prosÃm skontrolujte Äi %1$s je užÃvateľom '%2$s' Äitateľné.",
"ExceptionDatabaseVersion": "Vaša verzia %1$s je %2$s,ale Piwik potrebuje aspoň verziu %3$s.",
"ExceptionDatabaseVersionNewerThanCodebase": "Vaša Piwik kódovacia základňa bežà pod starou verziou %1$s a my sme zistili, že Vaša Piwik databáza bola práve aktualizovaná na novšiu verziu %2$s.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "Možno VaÅ¡i Piwik administrátori práve dokonÄujú proces aktualizácie. ProsÃm skúste znova o niekoľko minút.",
"ExceptionFileIntegrity": "Kontrola integrity sa nepodarila: %s",
"ExceptionFilesizeMismatch": "Nesedà veľkosÅ¥ súboru: %1$s (oÄakávaná veľkosÅ¥: %2$s, nájdená veľkosÅ¥: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Vaša verzia klienta %1$s je %2$s je nekompatibilná s verziou servera %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Formát agregovaných reportov '%s' je neplatný. Skúste namiesto toho použiť jeden z týchto: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Formát agregovaných reportov '%1$s' je neplatný. Skúste namiesto toho použiť jeden z týchto: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "DneÅ¡ný Äas archivovania",
- "ExceptionInvalidDateFormat": "Formát dátumu musà byÅ¥: %s alebo kľúÄového slova ktoré podporuje funkciu %s (pozri %s pre viac informáciÃ)",
- "ExceptionInvalidDateRange": "Dátum '%s' nie je platný Äasový rozsah. Použite nasledovný formát: %s.",
- "ExceptionInvalidPeriod": "Rozsah '%s' nie je podporovaný. Skúste namiesto toho použiť jeden z týchto: %s.",
- "ExceptionInvalidRendererFormat": "Formát vykresľovania '%s' je neplatný. Skúste namiesto toho použiť jeden z týchto: %s.",
- "ExceptionInvalidReportRendererFormat": "Formát správ '%s' je neplatný. Skúste namiesto toho použiť jeden z týchto: %s.",
- "ExceptionInvalidStaticGraphType": "Typ statického grafu '%s' neplatný. Skúste namiesto neho niektorý z nasledujúcich: %s.",
+ "ExceptionInvalidDateFormat": "Formát dátumu musà byÅ¥: %1$s alebo kľúÄového slova ktoré podporuje funkciu %2$s (pozri %3$s pre viac informáciÃ)",
+ "ExceptionInvalidDateRange": "Dátum '%1$s' nie je platný Äasový rozsah. Použite nasledovný formát: %2$s.",
+ "ExceptionInvalidPeriod": "Rozsah '%1$s' nie je podporovaný. Skúste namiesto toho použiť jeden z týchto: %2$s.",
+ "ExceptionInvalidRendererFormat": "Formát vykresľovania '%1$s' je neplatný. Skúste namiesto toho použiť jeden z týchto: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Formát správ '%1$s' je neplatný. Skúste namiesto toho použiť jeden z týchto: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Typ statického grafu '%1$s' neplatný. Skúste namiesto neho niektorý z nasledujúcich: %2$s.",
"ExceptionInvalidToken": "BezpeÄnostný reÅ¥azec (token) nie je platný.",
"ExceptionLanguageFileNotFound": "Jazykový súbor '%s' nebol nájdený.",
- "ExceptionMethodNotFound": "Metóda '%s' neexistuje alebo nie je dostupná v module '%s'.",
+ "ExceptionMethodNotFound": "Metóda '%1$s' neexistuje alebo nie je dostupná v module '%2$s'.",
"ExceptionMissingFile": "Chýba súbor: %s",
"ExceptionNonceMismatch": "Nepodarilo sa overiÅ¥ bezpeÄnostný reÅ¥azec formulára.",
"ExceptionPrivilege": "Nemôžete pristupovaÅ¥ k tomuto zdroju, keÄže vyžaduje úroveň prÃstupu \"%s\".",
@@ -164,7 +162,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Nemôžete pristupovaÅ¥ k tomuto zdroju, keÄže vyžaduje úroveň prÃstupu \"%s\" aspoň pre jedno webové sÃdlo.",
"ExceptionUnableToStartSession": "Nepodarilo sa zaÄaÅ¥ session.",
"ExceptionUndeletableFile": "Nemožno zmazať %s",
- "ExceptionUnreadableFileDisabledMethod": "KonfiguraÄný súbor {%s} sa nedá ÄÃtaÅ¥. Váš hostiteľ môže byÅ¥ poskodený %s.",
+ "ExceptionUnreadableFileDisabledMethod": "KonfiguraÄný súbor {%1$s} sa nedá ÄÃtaÅ¥. Váš hostiteľ môže byÅ¥ poskodený %2$s.",
"ExceptionReportNotFound": "Požadovaný report neexistuje.",
"ExceptionWidgetNotFound": "Požadovaná miniaplikácia neexistuje",
"ExceptionReportNotEnabled": "Požadovaný report nie je povolený. Toto obyÄajne znamená, že buÄto plugin, ktorý definuje report je deaktivovaný, alebo nemáte dostatoÄné povolenie pre prÃstup k tomuto reportu.",
@@ -212,7 +210,7 @@
"Logout": "Odhlásiť",
"MainMetrics": "Hlavné metriky",
"Matches": "Zhoduje sa",
- "MediumToHighTrafficItIsRecommendedTo": "Pre webové sÃdla, ktoré majú stredne veľkú až veľkú návÅ¡tevnosÅ¥, odporúÄame nastaviÅ¥ spracovanie reportov pre daný deň maximálne na každú každú pol hodinu (%s sekúnd), alebo každú hodinu (%s sekúnd).",
+ "MediumToHighTrafficItIsRecommendedTo": "Pre webové sÃdla, ktoré majú stredne veľkú až veľkú návÅ¡tevnosÅ¥, odporúÄame nastaviÅ¥ spracovanie reportov pre daný deň maximálne na každú každú pol hodinu (%1$s sekúnd), alebo každú hodinu (%2$s sekúnd).",
"Metadata": "Meta údaje",
"Metric": "Metrika",
"Metrics": "Metriky",
@@ -266,7 +264,7 @@
"OperationNotEquals": "Nerovná sa",
"OptionalSmtpPort": "Nepovinné. Východiskové nastavenie je port 25 pre neÅ¡ifrované spojenie a TLS STMP, Äi port 465 pre SSL STMP.",
"Options": "Možnosti",
- "OrCancel": "alebo %s Zatvoriť %s",
+ "OrCancel": "alebo %1$s Zatvoriť %2$s",
"Others": "Ostatné",
"Outlink": "Odchádzajúci preklik",
"Outlinks": "Konkajšie odkazy",
@@ -274,9 +272,8 @@
"OverlayRowActionTooltipTitle": "Otvoriť prekrytie stránky",
"Overview": "Prehľad",
"Pages": "Stránky",
- "Pagination": "%s - %s z %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Parameter %s musà byÅ¥ ÄÃselná hodnota medzi %s a %s.",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Parameter %1$s musà byÅ¥ ÄÃselná hodnota medzi %2$s a %3$s.",
"Password": "Heslo",
"Period": "Obdobie",
"Piechart": "KoláÄový graf",
@@ -328,7 +325,7 @@
"Clear": "VyÄisti",
"SearchNoResults": "Žiadne výsledky",
"SeeAll": "zobraziť všetky",
- "SeeTheOfficialDocumentationForMoreInformation": "Pre viac informácià pozri %sofficiálne dokumentácie%s.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Pre viac informácià pozri %1$sofficiálne dokumentácie%2$s.",
"SeeThisFaq": "Pozrite %1$s Äasto kladné otázky %2$s",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Vyberte \"Ãno\", ak chcete alebo musÃte odoslaÅ¥ e-mail cez názov servera namiesto lokálnej mail funkcie",
@@ -355,7 +352,7 @@
"Total": "Celkom",
"TotalRatioTooltip": "Toto je %1$s z celkového %2$s %3$s.",
"TotalRevenue": "Celkový prÃjem",
- "TotalVisitsPageviewsActionsRevenue": "(Celkom: %s návÅ¡tev, %s zobrazenÃ, %s akciÃ, tržby: %s)",
+ "TotalVisitsPageviewsActionsRevenue": "(Celkom: %1$s návÅ¡tev, %2$s zobrazenÃ, %3$s akciÃ, tržby: %4$s)",
"TransitionsRowActionTooltip": "Pozrite si Äo robili návÅ¡tevnÃci pred a po prezretà si tejto stránky.",
"TransitionsRowActionTooltipTitle": "Otvorené zmeny",
"TranslatorName": "Miroslav Habara, Zdenko Podobný, Juraj \"Lup0\" ViktorÃn, Ivanka",
@@ -389,8 +386,8 @@
"WarningFileIntegrityNoManifest": "Súbor kontrola integrity nemohla byť vykonaná z dôvodu chýbajúcich manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "Ak nasadzujete Piwik z Git-u, tak toto je normálna správa.",
"WarningFileIntegrityNoMd5file": "Súbor kontrola integrity nemožno dokonÄiÅ¥ z dôvodu chýbajúcich md5_file () funkcie.",
- "WarningPasswordStored": "%sVarovanie:%s Toto heslo bude uložené v konfiguraÄnom súbore viditeľné pre vÅ¡etkých, ako prÃstup.",
- "WarningDebugOnDemandEnabled": "Je povolený režim sledovaÄa (tracker) %s. Z bezpeÄnostných dôvodov by mal byÅ¥ povolený len veľmi krátky Äas. Na jeho ukonÄenie nastavte %s na %s v %s",
+ "WarningPasswordStored": "%1$sVarovanie:%2$s Toto heslo bude uložené v konfiguraÄnom súbore viditeľné pre vÅ¡etkých, ako prÃstup.",
+ "WarningDebugOnDemandEnabled": "Je povolený režim sledovaÄa (tracker) %1$s. Z bezpeÄnostných dôvodov by mal byÅ¥ povolený len veľmi krátky Äas. Na jeho ukonÄenie nastavte %2$s na %3$s v %4$s",
"Website": "Web",
"Weekly": "Týždenne",
"WeeklyReport": "týždenne",
@@ -444,7 +441,7 @@
"MultiChartLabel": "Zobraziť multi grafy",
"NavigationBack": "Späť",
"NetworkError": "Chyba siete",
- "NetworkErrorWithStatusCode": "Vyskytla sa chyba \"%s\". Požiadavka navrátila stav \"%s\". URL bol \"%s\". Pre viac informácià o tejto chybe a ako ju odstrániÅ¥, prosÃm skontrolujte zadanú URL a chybový protokol na tomto serveri.",
+ "NetworkErrorWithStatusCode": "Vyskytla sa chyba \"%1$s\". Požiadavka navrátila stav \"%2$s\". URL bol \"%3$s\". Pre viac informácià o tejto chybe a ako ju odstrániÅ¥, prosÃm skontrolujte zadanú URL a chybový protokol na tomto serveri.",
"NetworkErrorWithStatusCodeShort": "Chyba siete %s",
"NetworkNotReachable": "Sieť nie je dostupná",
"NoAccountIsSelected": "MusÃte vybraÅ¥ úÄet. PridaÅ¥ nový úÄet ak nemáte žiaden vytvorený.",
@@ -462,7 +459,7 @@
"RatingDontRemindMe": "NepripomÃnaÅ¥",
"RatingNotNow": "Teraz nie",
"RatingNow": "V poriadku, ohodnotÃm teraz",
- "RatingPleaseRateUs": "Piwik Mobile App je voľný softvér. Veľmi by sme ocenili, ak by ste venovali 1 minútu ohodnoteniu tejto aplikácie na %s. Ak máte návrhy ohľadom nových funkcià alebo chybových hlásenÃ, prosÃm kontaktujte %s",
+ "RatingPleaseRateUs": "Piwik Mobile App je voľný softvér. Veľmi by sme ocenili, ak by ste venovali 1 minútu ohodnoteniu tejto aplikácie na %1$s. Ak máte návrhy ohľadom nových funkcià alebo chybových hlásenÃ, prosÃm kontaktujte %2$s",
"ReleaseToRefresh": "Pre obnovenie uvoľni...",
"Reloading": "Znovu naÄÃtavanie",
"RequestTimedOutShort": "Chyba Network Timeout",
@@ -487,7 +484,7 @@
"CompareRows": "Porovnať záznamy",
"ComparingRecords": "Porovnávanie %s riadkov",
"Documentation": "Kliknite na metrics -metriky- a zobrazia sa vo veľkom vývojovom grafe. Použite shift-klik na zobrazenie viacnásobných metrických naraz.",
- "MetricBetweenText": "od %s do %s",
+ "MetricBetweenText": "od %1$s do %2$s",
"MetricChangeText": "%s za interval",
"MetricMinMax": "Behom tohoto obdobia %1$s sa pohyboval(a) medzi %2$s a %3$s",
"MetricsFor": "Metrika pre %s",
diff --git a/lang/sl.json b/lang/sl.json
index 52d6a42ee08b1dde9dc154f358158562516ace98..d1a09bcbbc569de5fa4b106f8c9df771105e7974 100644
--- a/lang/sl.json
+++ b/lang/sl.json
@@ -15,7 +15,7 @@
"API": "API",
"Apply": "Uveljavi",
"ArchivingInlineHelp": "Za srednje velike in velike spletne strani izklopite arhiviranje preko spletnega brskalnika. Namesto tega vam priporoÄamo, da nastavite \"cron job\" tako, da bodo poroÄila ustvarjena vsako uro.",
- "ArchivingTriggerDescription": "PriporoÄamo za veÄje namestitve. %sNastavite \"cron job\"%s za avtomatsko procesiranje.",
+ "ArchivingTriggerDescription": "PriporoÄamo za veÄje namestitve. %1$sNastavite \"cron job\"%2$s za avtomatsko procesiranje.",
"AuthenticationMethodSmtp": "Metoda potrditve verodostojnosti za SMTP",
"AverageOrderValue": "PovpreÄna vrednost naroÄila",
"AveragePrice": "PovpreÄna Cena",
@@ -26,10 +26,8 @@
"CannotUnzipFile": "Ne morem odzipati datoteke %1$s: %2$s",
"ChangePassword": "Spremeni geslo",
"ChangeTagCloudView": "Zavedajte se, da si lahko ogledate prooÄila na drugaÄne naÄine kot oblak oznak. Za spremembo uporabite izbire na dnu poroÄila.",
- "ChooseDate": "Izberite datum",
"ChooseLanguage": "Izberite jezik",
"ChoosePeriod": "Izberite obdobje",
- "ChooseWebsite": "Izberite spletno stran",
"ClickHere": "Za veÄ informacij, kliknite tu.",
"ClickToChangePeriod": "Kliknite ponovno za spremembo obdobja.",
"Close": "Zapri",
@@ -83,7 +81,7 @@
"ColumnViewedAfterSearchDocumentation": "Število obiskov te strani po tem, ko je obiskovalec izvedel iskanje na vašem spletnem mestu in kliknil na to stran v rezultatih iskanja.",
"ColumnVisitDuration": "Trajanje Obiska (v sekundah)",
"ColumnVisitsWithConversions": "Obiski s Spreobrnitvami",
- "ConfigFileIsNotWritable": "Piwik-ova konfiguracijska datoteka %s ni zapisljiva, zato nekaterih vaÅ¡ih sprememb ni bilo mogoÄe shraniti. %s Prosimo, da spremenite dovoljenja konfiguracijske datoteke tako, da bo zapisljiva.",
+ "ConfigFileIsNotWritable": "Piwik-ova konfiguracijska datoteka %1$s ni zapisljiva, zato nekaterih vaÅ¡ih sprememb ni bilo mogoÄe shraniti. %2$s Prosimo, da spremenite dovoljenja konfiguracijske datoteke tako, da bo zapisljiva.",
"Continue": "Nadaljuj",
"ContinueToPiwik": "Nadaljuj na Piwik",
"CurrentMonth": "Trenutni mesec",
@@ -99,7 +97,7 @@
"Date": "Datum",
"DateRange": "Datumski razpon:",
"DateRangeFrom": "Od",
- "DateRangeFromTo": "Od %s do %s",
+ "DateRangeFromTo": "Od %1$s do %2$s",
"DateRangeTo": "Za",
"DaysHours": "%1$s dni %2$s ur",
"DaysSinceFirstVisit": "Dni od prvega obiska",
@@ -131,8 +129,8 @@
"Edit": "Uredi",
"EncryptedSmtpTransport": "Vnesite nivo enkripcije, ki jo uporablja vaš SMTP strežnik.",
"Error": "Napaka",
- "ErrorRequest": "PriÅ¡lo je do težave pri izvedbi zahtevka. Morda gre za zaÄasno težavo na strežniku ali pa ste zahtevali poroÄilo s preveliko koliÄino podatkov. Prosimo, poskusite ponovno. ÄŒe se bo napaka ponavljala, se prosimo %sobrnite po pomoÄ%s na vaÅ¡ega Piwik skrbnika.",
- "ExceptionContactSupportGeneric": "ÄŒe težava vztraja, se prosimo %sobrnite po pomoÄ%s na vaÅ¡ega Piwik skrbnika.",
+ "ErrorRequest": "PriÅ¡lo je do težave pri izvedbi zahtevka. Morda gre za zaÄasno težavo na strežniku ali pa ste zahtevali poroÄilo s preveliko koliÄino podatkov. Prosimo, poskusite ponovno. ÄŒe se bo napaka ponavljala, se prosimo %1$sobrnite po pomoÄ%2$s na vaÅ¡ega Piwik skrbnika.",
+ "ExceptionContactSupportGeneric": "ÄŒe težava vztraja, se prosimo %1$sobrnite po pomoÄ%2$s na vaÅ¡ega Piwik skrbnika.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Uporabnik mora biti Super User ali uporabnik '%s'.",
"ExceptionConfigurationFileNotFound": "Konfiguracijska datoteka {%s} ni bila najdena.",
"ExceptionDatabaseVersion": "VaÅ¡a %1$s razliÄica je %2$s, vendar Piwik potrebuje vsaj %3$s.",
@@ -141,17 +139,17 @@
"ExceptionFileIntegrity": "Preverjanje integritete ni bilo uspešno: %s",
"ExceptionFilesizeMismatch": "Velikost datoteke se ne ujema: %1$s (priÄakovana dolžina: %2$s, najdeno: %3$s)",
"ExceptionIncompatibleClientServerVersions": "VaÅ¡a %1$s razliÄica odjemalca je %2$s, ki je nezdružljiva s strežniÅ¡ko razliÄico %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Oblika skupnega poroÄila '%s' ni pravilna. Namesto tega poskusite kaj od tega: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Oblika skupnega poroÄila '%1$s' ni pravilna. Namesto tega poskusite kaj od tega: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "\"Today archive time to live\" mora biti Å¡tevilo sekund veÄ kot niÄ.",
- "ExceptionInvalidDateFormat": "Oblika datuma mora biti: %s ali katerakoli kljuÄna beseda, podprta v funkciji %s (oglejte si %s za veÄ informacij)",
- "ExceptionInvalidDateRange": "'%s' ni pravilen datumski razpon. Moral bi imeti naslednjo obliko: %s.",
- "ExceptionInvalidPeriod": "Obdobje '%s' ni podprto. Namesto tega poskusite kaj od tega: %s.",
- "ExceptionInvalidRendererFormat": "Oblika prikaza '%s' ni pravilna. Namesto tega poskusite kaj od tega: %s.",
- "ExceptionInvalidReportRendererFormat": "Oblika poroÄila '%s' ni pravilna. Namesto tega poskusite kaj od tega: %s.",
- "ExceptionInvalidStaticGraphType": "Tip statiÄnega grafa '%s' ni pravilen. Namesto tega poskusite kaj od tega: %s.",
+ "ExceptionInvalidDateFormat": "Oblika datuma mora biti: %1$s ali katerakoli kljuÄna beseda, podprta v funkciji %2$s (oglejte si %3$s za veÄ informacij)",
+ "ExceptionInvalidDateRange": "'%1$s' ni pravilen datumski razpon. Moral bi imeti naslednjo obliko: %2$s.",
+ "ExceptionInvalidPeriod": "Obdobje '%1$s' ni podprto. Namesto tega poskusite kaj od tega: %2$s.",
+ "ExceptionInvalidRendererFormat": "Oblika prikaza '%1$s' ni pravilna. Namesto tega poskusite kaj od tega: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Oblika poroÄila '%1$s' ni pravilna. Namesto tega poskusite kaj od tega: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Tip statiÄnega grafa '%1$s' ni pravilen. Namesto tega poskusite kaj od tega: %2$s.",
"ExceptionInvalidToken": "Žeton ni veljaven.",
"ExceptionLanguageFileNotFound": "Jezikovne datoteke \"%s\" ni bilo mogoÄe najti.",
- "ExceptionMethodNotFound": "Metoda '%s' ne obstaja ali ni na voljo v modulu '%s'.",
+ "ExceptionMethodNotFound": "Metoda '%1$s' ne obstaja ali ni na voljo v modulu '%2$s'.",
"ExceptionMissingFile": "ManjkajoÄa datoteka: %s",
"ExceptionNonceMismatch": "Ne morem preveriti varnostnega žetona na tem obrazcu.",
"ExceptionPrivilege": "Ne morete dostopati do tega vira, saj je za to potreben %s dostop.",
@@ -159,7 +157,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Ne morete dostopati do tega vira, ker potrebujete %s dostop za vsaj eno spletno stran.",
"ExceptionUnableToStartSession": "Ne morem zaÄeti seje.",
"ExceptionUndeletableFile": "%s ni možno izbrisati.",
- "ExceptionUnreadableFileDisabledMethod": "Konfiguracijske datoteke {%s} ni bilo mogoÄe prebrati. Možno je, da je vaÅ¡ gostitelj onemogoÄil %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Konfiguracijske datoteke {%1$s} ni bilo mogoÄe prebrati. Možno je, da je vaÅ¡ gostitelj onemogoÄil %2$s.",
"ExceptionReportNotFound": "Zahtevano poroÄilo ne obstaja.",
"ExceptionReportNotEnabled": "Zahtevano poroÄilo ni omogoÄeno. To ponavadi pomeni, da vtiÄnik, ki definira poroÄilo, ni aktiviran ali, da nimate dovoljenj za dostop do tega poroÄila.",
"ExpandDataTableFooter": "Spremeni izgled ali uredi nastavitve poroÄila",
@@ -206,7 +204,7 @@
"Logout": "Izpis",
"MainMetrics": "Glavna meterika",
"Matches": "Zadetki",
- "MediumToHighTrafficItIsRecommendedTo": "Za srednje velike in velike spletne strani vam priporoÄamo, da procesirate poroÄila najveÄ na pol ure (%s sekund) ali na eno uro (%s sekund).",
+ "MediumToHighTrafficItIsRecommendedTo": "Za srednje velike in velike spletne strani vam priporoÄamo, da procesirate poroÄila najveÄ na pol ure (%1$s sekund) ali na eno uro (%2$s sekund).",
"Metadata": "Metadata",
"Metric": "Metrika",
"Metrics": "Metrike",
@@ -260,7 +258,7 @@
"OperationNotEquals": "Ni enako",
"OptionalSmtpPort": "Neobvezno. Privzeto je 25 za nekriptiran prometi in za TLS SMTP. 465 za SSL SMTP.",
"Options": "Možnosti",
- "OrCancel": "ali %s PrekliÄi %s",
+ "OrCancel": "ali %1$s PrekliÄi %2$s",
"Others": "Ostali",
"Outlink": "Izhodna povezaba",
"Outlinks": "Izhodne povezave",
@@ -268,9 +266,9 @@
"OverlayRowActionTooltipTitle": "Odpri prekrivanje strani",
"Overview": "Pregled",
"Pages": "Strani",
- "Pagination": "%s - %s od %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Parameter %s mora biti celo Å¡tevilo med %s in %s.",
+ "Pagination": "%1$s - %2$s od %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Parameter %1$s mora biti celo Å¡tevilo med %2$s in %3$s.",
"Password": "Geslo",
"Period": "Obdobje",
"Piechart": "KolaÄni diagram",
@@ -319,7 +317,7 @@
"Clear": "Izprazni",
"SearchNoResults": "Ni rezultatov",
"SeeAll": "poglej vse",
- "SeeTheOfficialDocumentationForMoreInformation": "Za veÄ informacij, si oglejte %suradno dokumentacijo%s.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Za veÄ informacij, si oglejte %1$suradno dokumentacijo%2$s.",
"SeeThisFaq": "Poglej %1$sta FAQ%2$s.",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Izberite \"da\" Äe želite poÅ¡iljanje emaila preko strežnika, namesto preko lokalne mail funkcije",
@@ -376,7 +374,7 @@
"WarningFileIntegrityNoManifest": "Pregleda integritete datotek ni bilo mogoÄe izvesti, saj manjka manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "ÄŒe nameÅ¡Äate Piwik iz Git repozitorija, je to sporoÄilo normalno.",
"WarningFileIntegrityNoMd5file": "Ne morem preveriti integritete datoteke, ker manjka funkcija md5_file().",
- "WarningPasswordStored": "%sPozor:%s To geslo bo shranjeno v config datoteki. Tako bo vidna vsem, ki imajo dostop do te datoteke.",
+ "WarningPasswordStored": "%1$sPozor:%2$s To geslo bo shranjeno v config datoteki. Tako bo vidna vsem, ki imajo dostop do te datoteke.",
"Website": "Spletna stran",
"Weekly": "Tedensko",
"WeeklyReport": "tedensko",
@@ -425,7 +423,7 @@
"LoginUseHttps": "Uporabi https",
"NavigationBack": "Nazaj",
"NetworkError": "Napaka omrežja",
- "NetworkErrorWithStatusCode": "PriÅ¡lo je do napake \"%s\". Zahtevek je vrnil status \"%s\". URL je bil \"%s\". Prosimo, preverite vneÅ¡eni URL in error loge na strežniku za veÄ informacij o napaki in namig kako jo reÅ¡iti.",
+ "NetworkErrorWithStatusCode": "PriÅ¡lo je do napake \"%1$s\". Zahtevek je vrnil status \"%2$s\". URL je bil \"%3$s\". Prosimo, preverite vneÅ¡eni URL in error loge na strežniku za veÄ informacij o napaki in namig kako jo reÅ¡iti.",
"NetworkErrorWithStatusCodeShort": "Napaka omrežja %s",
"NetworkNotReachable": "Omrežje ni dosegljivo",
"NoAccountIsSelected": "Najprej morate izbrati raÄun. Dodajte nov raÄun, Äe ga Å¡e niste nastavili.",
@@ -443,7 +441,7 @@
"RatingDontRemindMe": "Ne spomni me",
"RatingNotNow": "Ne zdaj",
"RatingNow": "OK, podal bom oceno",
- "RatingPleaseRateUs": "Piwik Mobile App je brezplaÄna programska oprema. Zelo bi vam bili hvaležni, Äe bi si vzeli 1 minuto Äasa in ocenili aplikacijo v %s. ÄŒe imate kakÅ¡ne predloge za nove funkcionalnosti ali bi radi prijavili napako, prosimo kontaktirajte %s",
+ "RatingPleaseRateUs": "Piwik Mobile App je brezplaÄna programska oprema. Zelo bi vam bili hvaležni, Äe bi si vzeli 1 minuto Äasa in ocenili aplikacijo v %1$s. ÄŒe imate kakÅ¡ne predloge za nove funkcionalnosti ali bi radi prijavili napako, prosimo kontaktirajte %2$s",
"ReleaseToRefresh": "Izpustite za osvežitev...",
"Reloading": "Nalagam...",
"RequestTimedOutShort": "Napaka - network timeout",
@@ -467,7 +465,7 @@
"CompareRows": "Primerjaj zapise",
"ComparingRecords": "Primerjaj %s vrstic",
"Documentation": "Kliknite metrike, da jih prikažete na velikem razvojnem grafu. Uporabite tipko Shift za prikaz veÄih metrik na enkrat.",
- "MetricBetweenText": "od %s do %s",
+ "MetricBetweenText": "od %1$s do %2$s",
"MetricChangeText": "%s sprememb v Äasovnem obdobju",
"MetricsFor": "Metrike za %s",
"PickAnotherRow": "Izberi Å¡e eno vrstico za primerjavo",
diff --git a/lang/sq.json b/lang/sq.json
index acf1e9822eb4af2b6546e941a6d8897d7ff17dd4..28df9c980c8c4f686c524f073b90113eb6f37a49 100644
--- a/lang/sq.json
+++ b/lang/sq.json
@@ -13,7 +13,7 @@
"API": "API",
"Apply": "Zbatoje",
"ArchivingInlineHelp": "Për sajte me trafik mesatar ose të shumtë këshillohet të çaktivizohet vënia në punë e arkivimit nga Piwik-u prej shfletuesit. Në vend të kësaj këshillojmë të rregulloni një akt cron që të përpunoni raporte Piwik-u çdo orë.",
- "ArchivingTriggerDescription": "E këshilluar për instalime më të ngarkuara të Piwik-ut, lypset të %s rregulloni një akt cron-i%s që të përpunohen raportet automatikisht.",
+ "ArchivingTriggerDescription": "E këshilluar për instalime më të ngarkuara të Piwik-ut, lypset të %1$s rregulloni një akt cron-i%2$s që të përpunohen raportet automatikisht.",
"AuthenticationMethodSmtp": "Metodë mirëfilltësimi për SMTP",
"AverageOrderValue": "Vlerë Mesatare Porosie",
"AveragePrice": "Çmim Mesatar",
@@ -25,10 +25,8 @@
"CannotUnzipFile": "S’mund të hapë kartelën zip %1$s: %2$s",
"ChangePassword": "Ndryshoni fjalëkalimin",
"ChangeTagCloudView": "Ju lutemi, mbani parasysh që raportin mund ta shihni në mënyra të tjera nga re etiketash. Për ta bërë këtë, përdorni kontrollet në fund të raportit.",
- "ChooseDate": "Zgjidhni datë",
"ChooseLanguage": "Zgjidhni gjuhën",
"ChoosePeriod": "Zgjidhni periudhën",
- "ChooseWebsite": "Zgjidhni sajtin",
"ClickHere": "Për më tepër të dhëna, klikoni këtu.",
"ClickToChangePeriod": "Klikoni sërish që të ndryshoni periudhën.",
"Close": "Mbylle",
@@ -82,7 +80,7 @@
"ColumnViewedAfterSearchDocumentation": "Numri i herëve që kjo Faqe qe vizituar nga një vizitor, pasi kreu një kërkim mbi sajtin tuaj, dhe klikoi mbi këtë faqe te përfundimet e kërkimit.",
"ColumnVisitDuration": "Kohëzgjatje Vizite (në sekonda)",
"ColumnVisitsWithConversions": "Vizita me Shndërrime",
- "ConfigFileIsNotWritable": "Kartela për formësimin e Piwik-ut %s nuk është e shkruajtshme, disa nga ndryshimet tuaja mund të mos ruhen dot. %s Ju lutemi, ndryshoni lejet mbi kartelën e formësimit për ta bërë të shkruajtshme.",
+ "ConfigFileIsNotWritable": "Kartela për formësimin e Piwik-ut %1$s nuk është e shkruajtshme, disa nga ndryshimet tuaja mund të mos ruhen dot. %2$s Ju lutemi, ndryshoni lejet mbi kartelën e formësimit për ta bërë të shkruajtshme.",
"Continue": "Vazhdo",
"ContinueToPiwik": "Vazhdoni te Piwik-u",
"CurrentMonth": "Muaji i Tanishëm",
@@ -98,7 +96,7 @@
"Date": "Datë",
"DateRange": "Interval datash:",
"DateRangeFrom": "Prej",
- "DateRangeFromTo": "Nga %s në %s",
+ "DateRangeFromTo": "Nga %1$s në %2$s",
"DateRangeTo": "Për",
"DaysHours": "%1$s ditë %2$s orë",
"DaysSinceFirstVisit": "Ditë që nga vizita e parë",
@@ -130,30 +128,30 @@
"Edit": "Përpunojeni",
"EncryptedSmtpTransport": "Jepni kodimin e shtresës së mbartjes siç e kërkon shërbyesi juaj SMTP.",
"Error": "Gabim",
- "ErrorRequest": "Hmm… pati një problem gjatë kërkesës. Ndoshta shërbyesi pati një problem të përkohshëm, ose ndoshta kërkuat një raport me shumë të dhëna. Ju lutemi, riprovoni. Nëse jy gabim përsëritet vazhdimisht, ju lutemi, %slidhuni me përgjegjësin tuaj për Piwik-un%s për asistancë.",
+ "ErrorRequest": "Hmm… pati një problem gjatë kërkesës. Ndoshta shërbyesi pati një problem të përkohshëm, ose ndoshta kërkuat një raport me shumë të dhëna. Ju lutemi, riprovoni. Nëse jy gabim përsëritet vazhdimisht, ju lutemi, %1$slidhuni me përgjegjësin tuaj për Piwik-un%2$s për asistancë.",
"EvolutionOverPeriod": "Zhvillime përgjatë periudhës",
"EvolutionSummaryGeneric": "%1$s in %2$s compared to %3$s in %4$s. Evolution: %5$s",
- "ExceptionContactSupportGeneric": "Nëse e keni ende këtë problem, ju lutemi, %slidhuni me përgjegjësin e Piwik-ut tuaj%s për asistencë.",
+ "ExceptionContactSupportGeneric": "Nëse e keni ende këtë problem, ju lutemi, %1$slidhuni me përgjegjësin e Piwik-ut tuaj%2$s për asistencë.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Përdoruesi duhet të jetë ose një Superpërdorues, ose vetë përdoruesi '%s'.",
"ExceptionConfigurationFileNotFound": "Nuk u gjet kartela {%s} e formësimit.",
- "ExceptionConfigurationFileNotFound2": "Nëse kartela ekziston, ju lutemi, kontrolloni nëse përdoruesi '%s' mundet ta lexojë %s.",
+ "ExceptionConfigurationFileNotFound2": "Nëse kartela ekziston, ju lutemi, kontrolloni nëse përdoruesi '%1$s' mundet ta lexojë %2$s.",
"ExceptionDatabaseVersion": "Versioni juaj për %1$s është %2$s por Piwik-u lyp të paktën %3$s.",
"ExceptionDatabaseVersionNewerThanCodebase": "Kodi i Piwik-ut tuaj po xhiron versionin e vjetër %1$s dhe kemi gjetur se Baza juaj e të Dhënave Piwik është përmirësuar tashmë me versionin e ri %2$s.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "Ndoshta përgjegjësit e Piwik-ut janë duke përfunduar procesin e përmirësimit të tij. Ju lutemi, riprovoni pas pak minutash.",
"ExceptionFileIntegrity": "Kontrolli i pacënueshmërisë dështoi: %s",
"ExceptionFilesizeMismatch": "Mospërputhje madhësie kartelash: %1$s (pritej gjatësi: %2$s, u gjet: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Versioni i klientit tuaj për %1$s është %2$s çka është e papërputhshme me versionin e shërbyesit %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Formati '%s' për raporte të grumbulluar nuk është i vlefshëm. Provoni më mirë ndonjë nga vijuesit: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Formati '%1$s' për raporte të grumbulluar nuk është i vlefshëm. Provoni më mirë ndonjë nga vijuesit: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Jetëgjatësia e arkivës për sot duhet të jetë një numër sekondash më i madh se zero",
- "ExceptionInvalidDateFormat": "Formati i datës duhet të jetë: %s ose çfarëdo fjalëkyçi që funksioni %s e mbulon (për më tepër të dhëna, shihni %s)",
- "ExceptionInvalidDateRange": "Data '%s' nuk është interval i saktë datash. Ky do të duhej të kishte formatin vijues: %s.",
- "ExceptionInvalidPeriod": "Nuk mbulohet periudha '%s'. Provoni më mirë ndonjë nga vijuesit: %s",
- "ExceptionInvalidRendererFormat": "Formati '%s' për vizatuesin nuk është i vlefshëm. Provoni më mirë ndonjë nga vijuesit: %s.",
- "ExceptionInvalidReportRendererFormat": "Formati '%s' për raportuesin nuk është i vlefshëm. Provoni më mirë ndonjë nga vijuesit: %s.",
- "ExceptionInvalidStaticGraphType": "Lloji '%s' për grafik statik nuk është i vlefshëm. Provoni më mirë ndonjë nga vijuesit: %s.",
+ "ExceptionInvalidDateFormat": "Formati i datës duhet të jetë: %1$s ose çfarëdo fjalëkyçi që funksioni %2$s e mbulon (për më tepër të dhëna, shihni %3$s)",
+ "ExceptionInvalidDateRange": "Data '%1$s' nuk është interval i saktë datash. Ky do të duhej të kishte formatin vijues: %2$s.",
+ "ExceptionInvalidPeriod": "Nuk mbulohet periudha '%1$s'. Provoni më mirë ndonjë nga vijuesit: %2$s",
+ "ExceptionInvalidRendererFormat": "Formati '%1$s' për vizatuesin nuk është i vlefshëm. Provoni më mirë ndonjë nga vijuesit: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Formati '%1$s' për raportuesin nuk është i vlefshëm. Provoni më mirë ndonjë nga vijuesit: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Lloji '%1$s' për grafik statik nuk është i vlefshëm. Provoni më mirë ndonjë nga vijuesit: %2$s.",
"ExceptionInvalidToken": "Token-i nuk është i vlefshëm.",
"ExceptionLanguageFileNotFound": "S’u gjet kartela e gjuhës '%s'.",
- "ExceptionMethodNotFound": "Metoda '%s' nuk ekziston ose nuk është e mundshme në modulin '%s'.",
+ "ExceptionMethodNotFound": "Metoda '%1$s' nuk ekziston ose nuk është e mundshme në modulin '%2$s'.",
"ExceptionMissingFile": "Kartelë që mungon: %s",
"ExceptionNonceMismatch": "Nuk u verifikua dot token-i i sigurisë në këtë formular.",
"ExceptionPrivilege": "Nuk mund të hyni në këtë burim, ngaqë lyp të drejta %s.",
@@ -161,7 +159,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Nuk mund të hyni në këtë burim, ngaqë lyp të drejta %s për të paktën një nga site-et web.",
"ExceptionUnableToStartSession": "I pazoti të nisë sesion.",
"ExceptionUndeletableFile": "I pazoti të fshijë %s",
- "ExceptionUnreadableFileDisabledMethod": "Nuk u lexua dot kartela {%s} e formësimit. Streha juaj mund të ketë çaktivizuar %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Nuk u lexua dot kartela {%1$s} e formësimit. Streha juaj mund të ketë çaktivizuar %2$s.",
"ExceptionReportNotFound": "Raporti i kërkuar s’ekziston.",
"ExceptionWidgetNotFound": "Widget-i i kërkuar s’ekziston.",
"ExceptionReportNotEnabled": "Raporti i kërkuar nuk është i aktivizuar. Kjo zakonisht nënkupton se ose shtojca që mbulon raportin është e çaktivizuar, ose se nuk keni leje të mjaftueshme ta hapni këtë raport.",
@@ -207,7 +205,7 @@
"Logout": "Dilni",
"MainMetrics": "Llogaritjet kryesore",
"Matches": "Përputhje",
- "MediumToHighTrafficItIsRecommendedTo": "Për sajte me trafik të shumtë, këshillojmë t’i përpunoni raportet për ditën e sotme e shumta çdo gjysmë ore (%s sekonda) ose çdo një orë (%s sekonda).",
+ "MediumToHighTrafficItIsRecommendedTo": "Për sajte me trafik të shumtë, këshillojmë t’i përpunoni raportet për ditën e sotme e shumta çdo gjysmë ore (%1$s sekonda) ose çdo një orë (%2$s sekonda).",
"Metadata": "Tejtëdhëna",
"Metric": "Matje",
"Metrics": "Matje",
@@ -261,7 +259,7 @@
"OperationNotEquals": "Jo Baraz Me",
"OptionalSmtpPort": "Opsionale. Parazgjedhjet janë 25 për të pakoduarat dhe TLS SMTP, dhe 465 për SSL SMTP.",
"Options": "Mundësi",
- "OrCancel": "ose %s Anulojeni %s",
+ "OrCancel": "ose %1$s Anulojeni %2$s",
"Others": "Tjetër",
"Outlink": "Lidhje për gjetiu",
"Outlinks": "Lidhje për Jashtë",
@@ -269,9 +267,9 @@
"OverlayRowActionTooltipTitle": "Hapni Përmbledhje Faqeje",
"Overview": "Përmbledhje",
"Pages": "Faqe",
- "Pagination": "%s - %s of %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Parametri %s duhet të jetë një numër i plotë nga %s në %s.",
+ "Pagination": "%1$s - %2$s of %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Parametri %1$s duhet të jetë një numër i plotë nga %2$s në %3$s.",
"Password": "Fjalëkalim",
"Period": "Periudhë",
"Piechart": "Qarkore",
@@ -323,7 +321,7 @@
"Clear": "Pastroje",
"SearchNoResults": "Pa përfundime",
"SeeAll": "shihni krejt",
- "SeeTheOfficialDocumentationForMoreInformation": "Për më tepër të dhëna, shihni %sdokumentimin zyrtar%s.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Për më tepër të dhëna, shihni %1$sdokumentimin zyrtar%2$s.",
"SeeThisFaq": "Shihni %1$skëtë ndarje FAQ%2$s.",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Përzgjidhni \"Po\" nëse doni të dërgoni, ose keni për të dërguar, email përmes një shërbyesi të emërtuar, në vend se përmes të një funksioni vendor poste",
@@ -349,7 +347,7 @@
"Total": "Gjithsej",
"TotalRatioTooltip": "Kjo është %1$s nga krejt %2$s %3$s.",
"TotalRevenue": "Të ardhura Gjithsej",
- "TotalVisitsPageviewsActionsRevenue": "(Gjithsej: %s vizita, %s shikime faqesh, %s veprime, %s të ardhura)",
+ "TotalVisitsPageviewsActionsRevenue": "(Gjithsej: %1$s vizita, %2$s shikime faqesh, %3$s veprime, %4$s të ardhura)",
"TransitionsRowActionTooltip": "Shihni se ç’bënë vizitorët para dhe pas parjes së kësaj faqeje",
"TransitionsRowActionTooltipTitle": "Ndërkalime të Hapura",
"TranslatorName": "Besnik Bleta",
@@ -382,8 +380,8 @@
"WarningFileIntegrityNoManifest": "Kontrolli i pacenueshmërisë së kartelës s’u krye dot, për shkak të mungesës së manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "Nëse po krijoni një instalim të Piwik-ut prej Git-i, ky mesazh është normal.",
"WarningFileIntegrityNoMd5file": "Kontrolli i pacenueshmërisë së kartelës s’u plotësua dot, për shkak të mungesës së funksionit md5_file().",
- "WarningPasswordStored": "%sKujdes:%s Ky fjalëkalim do të depozitohet te kartela e formësimit që është e dukshme për këdo që mund të mbërrijë deri te ajo.",
- "WarningDebugOnDemandEnabled": "Mënyra gjurmues %s është e aktivizuar. Për arsye sigurie, kjo do të duhej të aktivizohej vetëm për një kohë të shkurtër. Që ta çaktivizoni, caktojeni %s si %s te %s",
+ "WarningPasswordStored": "%1$sKujdes:%2$s Ky fjalëkalim do të depozitohet te kartela e formësimit që është e dukshme për këdo që mund të mbërrijë deri te ajo.",
+ "WarningDebugOnDemandEnabled": "Mënyra gjurmues %1$s është e aktivizuar. Për arsye sigurie, kjo do të duhej të aktivizohej vetëm për një kohë të shkurtër. Që ta çaktivizoni, caktojeni %2$s si %3$s te %4$s",
"Website": "Sajt",
"Weekly": "Përjavë",
"WeeklyReport": "përjavë",
@@ -437,7 +435,7 @@
"MultiChartLabel": "Shfaq vija grafiku",
"NavigationBack": "Mbrapsht",
"NetworkError": "Gabim Rrjeti",
- "NetworkErrorWithStatusCode": "Pati një gabim \"%s\". Kërkesa pati si përgjigje gjendjen \"%s\". URL-ja qe \"%s\". Për më tepër të dhëna mbi gabimin dhe se si të zgjidhet, ju lutemi, kontrolloni që e dhatë URL-në dhe regjistrat e gabimeve te ky shërbyes .",
+ "NetworkErrorWithStatusCode": "Pati një gabim \"%1$s\". Kërkesa pati si përgjigje gjendjen \"%2$s\". URL-ja qe \"%3$s\". Për më tepër të dhëna mbi gabimin dhe se si të zgjidhet, ju lutemi, kontrolloni që e dhatë URL-në dhe regjistrat e gabimeve te ky shërbyes .",
"NetworkErrorWithStatusCodeShort": "Gabim Rrjeti %s",
"NetworkNotReachable": "Rrjet i pakapshëm",
"NoAccountIsSelected": "Duhet të përzgjidhni një llogari. Shtoni një llogari të re, nëse s’keni ndonjë të formësuar.",
@@ -455,7 +453,7 @@
"RatingDontRemindMe": "Mos ma kujto më",
"RatingNotNow": "Jo tani",
"RatingNow": "OK, do ta vlerësoj tani",
- "RatingPleaseRateUs": "Aplikacioni për Celular Piwik është Software i Lirë, do t’jua dinim vërtet për nder nëse do të harxhonit një 1 minutë për të dhënë një vlerësim mbi të te %s. Nëse keni këshilla për veçori të reja apo njoftime të metash, ju lutemi, lidhuni me %s",
+ "RatingPleaseRateUs": "Aplikacioni për Celular Piwik është Software i Lirë, do t’jua dinim vërtet për nder nëse do të harxhonit një 1 minutë për të dhënë një vlerësim mbi të te %1$s. Nëse keni këshilla për veçori të reja apo njoftime të metash, ju lutemi, lidhuni me %2$s",
"ReleaseToRefresh": "Lëshojeni që të rifreskohet...",
"Reloading": "Po ringarkohet...",
"RequestTimedOutShort": "Gabim Mbarimi Kohe Rrjeti",
@@ -479,7 +477,7 @@
"CompareRows": "Krahasoni regjistrime",
"ComparingRecords": "Po krahasohen %s rreshta",
"Documentation": "Klikoni mbi matjet që të shfaqen në një grafik të madh rrjedhe kohore. Përdorni shkurtoren Shift-klikim që të shfaqen shumë matje njëherësh.",
- "MetricBetweenText": "nga %s në %s",
+ "MetricBetweenText": "nga %1$s në %2$s",
"MetricChangeText": "%s ndryshim gjatë periudhës",
"MetricMinMax": "%1$s doli diku mes %2$s dhe %3$s gjatë periudhës",
"MetricsFor": "Matje për %s",
diff --git a/lang/sr.json b/lang/sr.json
index acea21bac6c9345125fdb229b71d8328e27d07d4..578d41882135bc3d748636c31e7d81680c23a2fb 100644
--- a/lang/sr.json
+++ b/lang/sr.json
@@ -12,7 +12,7 @@
"And": "i",
"API": "API",
"ArchivingInlineHelp": "Za srednje i velike sajtove preporuka je da iskljuÄite ovu opciju i da podesite cron koji će procesirati Piwik izveÅ¡taje svaki sat",
- "ArchivingTriggerDescription": "PreporuÄljivo za velike Piwik instalacije; potrebno je da %spodesite cron%s da procesira izveÅ¡taje automatski",
+ "ArchivingTriggerDescription": "PreporuÄljivo za velike Piwik instalacije; potrebno je da %1$spodesite cron%2$s da procesira izveÅ¡taje automatski",
"AuthenticationMethodSmtp": "NaÄin autentikacije za SMTP",
"AverageOrderValue": "ProseÄna vrednost porudžbine",
"AveragePrice": "ProseÄna cena",
@@ -24,10 +24,8 @@
"CannotUnzipFile": "Ne mogu da raspakujem arhivu %1$s: %2$s",
"ChangePassword": "Promeni lozinku",
"ChangeTagCloudView": "Imajte na umu da izveÅ¡taj možete da vidite i u drugaÄijem obliku. Da biste to uÄinili, upotrebite kontrole na dnu izveÅ¡taja.",
- "ChooseDate": "Izaberite datum",
"ChooseLanguage": "Izaberite jezik",
"ChoosePeriod": "Izaberite period",
- "ChooseWebsite": "Izaberite sajt",
"ClickHere": "Kliknite ovde za više informacija.",
"ClickToChangePeriod": "Kliknite ponovo kako biste izmenili period.",
"Close": "Zatvoriti",
@@ -81,7 +79,7 @@
"ColumnViewedAfterSearchDocumentation": "Broj pregleda stranice nakon Å¡to je korisnik uradio pretragu sajta i kliknuo na nju kao na rezultat pretrage.",
"ColumnVisitDuration": "Dužina posete (u sekundama)",
"ColumnVisitsWithConversions": "Posete sa konverzijom",
- "ConfigFileIsNotWritable": "U Piwik datoteku sa podeÅ¡avanjima %s nije moguće pisati tako da neke od vaÅ¡ih izmena nije moguće saÄuvati. %s Molimo vas da promenite dozvole nad ovom datotekom kako bi se u nju moglo pisati.",
+ "ConfigFileIsNotWritable": "U Piwik datoteku sa podeÅ¡avanjima %1$s nije moguće pisati tako da neke od vaÅ¡ih izmena nije moguće saÄuvati. %2$s Molimo vas da promenite dozvole nad ovom datotekom kako bi se u nju moglo pisati.",
"Continue": "Nastavak",
"ContinueToPiwik": "Nastavite rad sa Piwik-om.",
"CurrentMonth": "Tekući mesec",
@@ -97,7 +95,7 @@
"Date": "Datum",
"DateRange": "Vremenski period:",
"DateRangeFrom": "Od",
- "DateRangeFromTo": "Od %s do %s",
+ "DateRangeFromTo": "Od %1$s do %2$s",
"DateRangeTo": "Do",
"DaysHours": "%1$s dani %2$s sati",
"DaysSinceFirstVisit": "Dana od prve posete",
@@ -129,30 +127,30 @@
"Edit": "Izmeni",
"EncryptedSmtpTransport": "Upišite tip enkripcije koji zahteva vaš SMTP server.",
"Error": "Greška",
- "ErrorRequest": "Ups, doÅ¡lo je do problema prilikom obrade zahteva. Možda server trenutno ima nekih problema ili ste zahtevali izveÅ¡taj sa previÅ¡e podataka. Molimo vas da pokuÅ¡ate ponovo. Ako se ovaj problem Äesto pojavljuje, %skontaktirajte Piwik administratora%s radi pomoći.",
+ "ErrorRequest": "Ups, doÅ¡lo je do problema prilikom obrade zahteva. Možda server trenutno ima nekih problema ili ste zahtevali izveÅ¡taj sa previÅ¡e podataka. Molimo vas da pokuÅ¡ate ponovo. Ako se ovaj problem Äesto pojavljuje, %1$skontaktirajte Piwik administratora%2$s radi pomoći.",
"EvolutionOverPeriod": "Trend za period",
"EvolutionSummaryGeneric": "%1$s u %2$s u odnosu na %3$s u %4$s. Razvoj: %5$s",
- "ExceptionContactSupportGeneric": "Ukoliko se ovo još uvek dešava, molimo vas %sda kontaktirate vašeg Piwik administratora%s za pomoć.",
+ "ExceptionContactSupportGeneric": "Ukoliko se ovo još uvek dešava, molimo vas %1$sda kontaktirate vašeg Piwik administratora%2$s za pomoć.",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Korisnik treba da bude ili superkorisnik ili sam korisnik '%s'.",
"ExceptionConfigurationFileNotFound": "Datoteka sa podešavanjima {%s} nije nađena.",
- "ExceptionConfigurationFileNotFound2": "Ukoliko datoteka postoji, molimo vas da proverite da je %s dostupna za Äitanje korisniku '%s'.",
+ "ExceptionConfigurationFileNotFound2": "Ukoliko datoteka postoji, molimo vas da proverite da je %1$s dostupna za Äitanje korisniku '%2$s'.",
"ExceptionDatabaseVersion": "Vaša %1$s verzija je %2$s ali Piwik zahteva barem %3$s.",
"ExceptionDatabaseVersionNewerThanCodebase": "Vaša Piwik aplikacija radi pod starom verzijom %1$s a otkrili smo da je Piwik baza već nadograđena na verziju %2$s.",
"ExceptionDatabaseVersionNewerThanCodebaseWait": "Možda vaš Piwik administrator baš sad završava proces nadogradnje. Molimo vas da pokušate ponovo za par minuta.",
"ExceptionFileIntegrity": "Provera integriteta nije uspela: %s",
"ExceptionFilesizeMismatch": "VeliÄina datoteke se ne poklapa: %1$s (oÄekivana veliÄina: %2$s, zateÄena: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Vaša %1$s klijentska verzija je %2$s što je nekompatibilno sa serverskom verzijom %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Format '%s' nije validan. Pokušajte neki od ovih: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Format '%1$s' nije validan. Pokušajte neki od ovih: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Vreme mora biti predstavljeno brojem sekundi koje je veće od nule.",
- "ExceptionInvalidDateFormat": "Oblik datima mora da bude: %s ili bilo koja kljuÄna reÄ podržana od strane funkcije %s (pogledajte %s za viÅ¡e informacija)",
- "ExceptionInvalidDateRange": "Datum '%s' nije validan vremenski raspon. Trebalo bi da ima sledeći oblik: %s",
- "ExceptionInvalidPeriod": "Period '%s' nije podržan. Pokušajte neki od ovih: %s.",
- "ExceptionInvalidRendererFormat": "Format '%s' nije validan. Pokušajte neki od ovih: %s.",
- "ExceptionInvalidReportRendererFormat": "Format '%s' nije validan. Pokušajte neki od ovih: %s.",
- "ExceptionInvalidStaticGraphType": "Tip grafikona '%s' nije validan. Pokušajte neki od ovih: %s.",
+ "ExceptionInvalidDateFormat": "Oblik datima mora da bude: %1$s ili bilo koja kljuÄna reÄ podržana od strane funkcije %2$s (pogledajte %3$s za viÅ¡e informacija)",
+ "ExceptionInvalidDateRange": "Datum '%1$s' nije validan vremenski raspon. Trebalo bi da ima sledeći oblik: %2$s",
+ "ExceptionInvalidPeriod": "Period '%1$s' nije podržan. Pokušajte neki od ovih: %2$s.",
+ "ExceptionInvalidRendererFormat": "Format '%1$s' nije validan. Pokušajte neki od ovih: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Format '%1$s' nije validan. Pokušajte neki od ovih: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Tip grafikona '%1$s' nije validan. Pokušajte neki od ovih: %2$s.",
"ExceptionInvalidToken": "Token nije validan.",
"ExceptionLanguageFileNotFound": "Datoteka sa jezikom '%s' nije nađena.",
- "ExceptionMethodNotFound": "Metod '%s' ne postoji ili nije na raspolaganju u modulu '%s'.",
+ "ExceptionMethodNotFound": "Metod '%1$s' ne postoji ili nije na raspolaganju u modulu '%2$s'.",
"ExceptionMissingFile": "Nedostajuća datoteka: %s",
"ExceptionNonceMismatch": "Nije moguće proveriti sigurnosni token na ovoj formi.",
"ExceptionPrivilege": "Ne možete pristupiti resursu pošto to zahteva %s.",
@@ -160,7 +158,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Ne možete pristupiti resursu pošto to zahteva %s za barem jedan sajt.",
"ExceptionUnableToStartSession": "Nije moguće pokrenuti sesiju",
"ExceptionUndeletableFile": "Nije moguće obrisati %s",
- "ExceptionUnreadableFileDisabledMethod": "Datoteka sa podeÅ¡avanjima {%s} ne može biti proÄitana. VaÅ¡ server možda ima onemogućen %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Datoteka sa podeÅ¡avanjima {%1$s} ne može biti proÄitana. VaÅ¡ server možda ima onemogućen %2$s.",
"ExceptionReportNotFound": "Zahtevani izveštaj ne postoji.",
"ExceptionWidgetNotFound": "Zahtevani vidžet ne postoji.",
"ExceptionReportNotEnabled": "Zahtevani izveÅ¡taj nije omogućen. To obiÄno znaÄi da je ili dodatak koji definiÅ¡e izveÅ¡taj deaktiviran ili nemate dovoljan nivo pristupa kako biste pristupili izveÅ¡taju.",
@@ -208,7 +206,7 @@
"Logout": "Odjava",
"MainMetrics": "Glavne metrike",
"Matches": "Pogodaka",
- "MediumToHighTrafficItIsRecommendedTo": "Za sajtove sa osrednjim ili velikim saobraćajem preporuÄujemo da danaÅ¡nje izveÅ¡taje procerirate na svakih barem pola sata (%s sekundi) ili svaki sat (%s sekundi)",
+ "MediumToHighTrafficItIsRecommendedTo": "Za sajtove sa osrednjim ili velikim saobraćajem preporuÄujemo da danaÅ¡nje izveÅ¡taje procerirate na svakih barem pola sata (%1$s sekundi) ili svaki sat (%2$s sekundi)",
"Metadata": "Meta podaci",
"Metric": "Metrika",
"Metrics": "Metrike",
@@ -262,7 +260,7 @@
"OperationNotEquals": "RazliÄito od",
"OptionalSmtpPort": "Opciono. Podrazumevana vrednost za neenkriptovani i TLS SMTP server je 25, z 465 za SSL SMTP server.",
"Options": "Opcije",
- "OrCancel": "ili %s prekid %s",
+ "OrCancel": "ili %1$s prekid %2$s",
"Others": "Ostalo",
"Outlink": "Izlazni link",
"Outlinks": "Izlazni linkovi",
@@ -270,9 +268,9 @@
"OverlayRowActionTooltipTitle": "Otvorite prikaz",
"Overview": "Pregled",
"Pages": "Stranice",
- "Pagination": "%s - %s od %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Parametar %s mora biti celobrojna vrednost između %s i %s",
+ "Pagination": "%1$s - %2$s od %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Parametar %1$s mora biti celobrojna vrednost između %2$s i %3$s",
"Password": "Lozinka",
"Period": "Period",
"Piechart": "Grafikon",
@@ -324,7 +322,7 @@
"Clear": "Obrisati",
"SearchNoResults": "Nema rezultata",
"SeeAll": "prikaži sve",
- "SeeTheOfficialDocumentationForMoreInformation": "Pogledajte %szvaniÄnu dokumentaciju%s za viÅ¡e informacija",
+ "SeeTheOfficialDocumentationForMoreInformation": "Pogledajte %1$szvaniÄnu dokumentaciju%2$s za viÅ¡e informacija",
"SeeThisFaq": "Pogledajte %1$suputstvo%2$s.",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Izaberite \"Da\" ukoliko želite da šaljete elektronska pisma preko posebnog servera umesto putem lokalne mail funkcije.",
@@ -350,7 +348,7 @@
"Total": "Ukupno",
"TotalRatioTooltip": "Ovo je %1$s od %2$s %3$s.",
"TotalRevenue": "Ukupan prihod",
- "TotalVisitsPageviewsActionsRevenue": "(Ukupno poseta %s, prikaza %s, akcija %s, zarada %s)",
+ "TotalVisitsPageviewsActionsRevenue": "(Ukupno poseta %1$s, prikaza %2$s, akcija %3$s, zarada %4$s)",
"TransitionsRowActionTooltip": "Pogledajte Å¡ta su posetioci radili pre i posle posete ovoj stranici",
"TransitionsRowActionTooltipTitle": "Otvori tranzicije",
"TranslatorName": "Petar Benke, Branislav Maksin, Nikola Stojković",
@@ -382,8 +380,8 @@
"WarningFileIntegrityNoManifest": "Proveru integriteta datoteka nije moguće sprovesti zato što nedostaje datoteka manifest.inc.php.",
"WarningFileIntegrityNoManifestDeployingFromGit": "Ukoliko podižete Piwik iz Git-a, ova poruka je sasvim prirodna.",
"WarningFileIntegrityNoMd5file": "Proveru integriteta datoteka nije moguće okonÄati zato Å¡to nedostaje funkcija md5_file().",
- "WarningPasswordStored": "%sUpozorenje:%s Ova lozinka će biti upisana u datoteku sa podešavanjima i biće vidljiva svakome ko ima pristup.",
- "WarningDebugOnDemandEnabled": "UkljuÄen je %s mod za praćenje. Iz bezbednosnih razloga ovo bi trebalo da bude ukljuÄeno samo u kratkom vremenskom periodu. Ukoliko želite da ga iskljuÄite, postavite %s na %s u %s",
+ "WarningPasswordStored": "%1$sUpozorenje:%2$s Ova lozinka će biti upisana u datoteku sa podešavanjima i biće vidljiva svakome ko ima pristup.",
+ "WarningDebugOnDemandEnabled": "UkljuÄen je %1$s mod za praćenje. Iz bezbednosnih razloga ovo bi trebalo da bude ukljuÄeno samo u kratkom vremenskom periodu. Ukoliko želite da ga iskljuÄite, postavite %2$s na %3$s u %4$s",
"Website": "Sajt",
"Weekly": "Nedeljno",
"WeeklyReport": "nedeljno",
@@ -436,7 +434,7 @@
"MultiChartLabel": "Prikaži male krive",
"NavigationBack": "Nazad",
"NetworkError": "Mrežna greška",
- "NetworkErrorWithStatusCode": "Došlo je do greške sa \"%s\". Status: \"%s\". URL: \"%s\". Molimo vas da proverite URL i serverske logove za više informacija o ovoj grešci i kako je ispraviti.",
+ "NetworkErrorWithStatusCode": "Došlo je do greške sa \"%1$s\". Status: \"%2$s\". URL: \"%3$s\". Molimo vas da proverite URL i serverske logove za više informacija o ovoj grešci i kako je ispraviti.",
"NetworkErrorWithStatusCodeShort": "Mrežna greška %s",
"NetworkNotReachable": "Mreža nije dostupna",
"NoAccountIsSelected": "Morate da izaberete nalog. Dodajte novi nalog ako to do sad niste uÄinili.",
@@ -454,7 +452,7 @@
"RatingDontRemindMe": "Nemoj da me podsećaš",
"RatingNotNow": "Ne sad",
"RatingNow": "U redu, oceniću ga sad",
- "RatingPleaseRateUs": "Mobilni Piwik je besplatna aplikacija. Zaista bismo cenili ako biste odvojili jedan minut i ocenili aplikaciju na %s. Ako imate predloge ili želite da prijavite problem, molimo vas da kontaktirate %s",
+ "RatingPleaseRateUs": "Mobilni Piwik je besplatna aplikacija. Zaista bismo cenili ako biste odvojili jedan minut i ocenili aplikaciju na %1$s. Ako imate predloge ili želite da prijavite problem, molimo vas da kontaktirate %2$s",
"ReleaseToRefresh": "Otpusti za osveženje...",
"Reloading": "Osvežavanje...",
"RequestTimedOutShort": "Istek vremena na mreži",
@@ -479,7 +477,7 @@
"CompareRows": "Uporedi zapise",
"ComparingRecords": "Poređenje %s redova",
"Documentation": "Kliknite na metrike kako biste ih prikazali u većem grafikonu. Držite Shift dok klikćete kako biste prikazali više metrika odjednom.",
- "MetricBetweenText": "Između %s i %s",
+ "MetricBetweenText": "Između %1$s i %2$s",
"MetricChangeText": "%s za period",
"MetricMinMax": "%1$s se prostire između %2$s i %3$s za dati period",
"MetricsFor": "Metrike za %s",
diff --git a/lang/sv.json b/lang/sv.json
index 25326597ab0afa120a0b7a2a6180c3cd17d8d1ac..ae4c5588c3c99c6a713033bf73277782d906160a 100644
--- a/lang/sv.json
+++ b/lang/sv.json
@@ -1,5 +1,7 @@
{
"General": {
+ "12HourClock": "12-timmars klocka",
+ "24HourClock": "24-timmars klocka",
"AbandonedCarts": "Övergivna varukorgar",
"AboutPiwikX": "Om Piwik %s",
"Action": "Handling",
@@ -11,8 +13,9 @@
"AllWebsitesDashboard": "Alla webbplatsers instrumentpanel",
"And": "och",
"API": "API",
+ "Apply": "Verkställ",
"ArchivingInlineHelp": "För webbplatser med medelhög till hög trafik rekommenderas det att du stänger av Piwik's funktion för arkivering att aktiveras från denna webbläsare.",
- "ArchivingTriggerDescription": "För större Piwik-installationer rekommenderas det att du %ssätta upp ett cron job%s för att behandla rapporterna automatiskt.",
+ "ArchivingTriggerDescription": "För större Piwik-installationer rekommenderas det att du %1$ssätta upp ett cron job%2$s för att behandla rapporterna automatiskt.",
"AuthenticationMethodSmtp": "Autentiseringsmetod för SMTP",
"AverageOrderValue": "Genomsnittligt ordervärde",
"AveragePrice": "Genomsnittligt pris",
@@ -24,14 +27,12 @@
"CannotUnzipFile": "Kan ej packa upp filen %1$s: %2$s",
"ChangePassword": "Byt lösenord",
"ChangeTagCloudView": "Observera att du kan visa rapporten på andra sätt än som ett taggmoln. Använd kontrollerna längst ned i rapporten för att göra det.",
- "ChooseDate": "Välj datum",
"ChooseLanguage": "Välj språk",
"ChoosePeriod": "Välj period",
- "ChooseWebsite": "Välj webbplats",
"ClickHere": "Klicka här för mer information.",
"ClickToChangePeriod": "Klicka igen för att byta period.",
"Close": "Stäng",
- "ClickToSearch": "Klicka för att säka",
+ "ClickToSearch": "Klicka för att söka",
"ColumnActionsPerVisit": "Händelser per besök",
"ColumnActionsPerVisitDocumentation": "Det genomsnittliga antalet händelser (sidvisningar, webbplatssökningar, nedladdningar eller utlänkar) som utfördes under besöken.",
"ColumnAverageGenerationTime": "Genomsnittlig tid för generering",
@@ -81,7 +82,7 @@
"ColumnViewedAfterSearchDocumentation": "Antalet besök som sidan fått genom att besökare sökt på webbplatsen och sidan fått klick i sökresultatet.",
"ColumnVisitDuration": "Besökstid (i sekunder)",
"ColumnVisitsWithConversions": "Besök med omvandlingar",
- "ConfigFileIsNotWritable": "Piwik's konfigurationsfil %s är inte skrivbar, de ändringar som du har gjort kommer kanske inte att sparas. %s Var vänlig och ändra rättigheterna på konfigurationsfilen för att göra den skrivbar.",
+ "ConfigFileIsNotWritable": "Piwik's konfigurationsfil %1$s är inte skrivbar, de ändringar som du har gjort kommer kanske inte att sparas. %2$s Var vänlig och ändra rättigheterna på konfigurationsfilen för att göra den skrivbar.",
"Continue": "Fortsätt",
"ContinueToPiwik": "Fortsätt till Piwik",
"CurrentMonth": "Denna månad",
@@ -97,7 +98,7 @@
"Date": "Datum",
"DateRange": "Intervall:",
"DateRangeFrom": "Från",
- "DateRangeFromTo": "Från %s till %s",
+ "DateRangeFromTo": "Från %1$s till %2$s",
"DateRangeTo": "Till",
"DaysHours": "%1$s dagar %2$s timmar",
"DaysSinceFirstVisit": "Dagar sedan första besöket",
@@ -121,7 +122,7 @@
"DownloadFail_FileExistsContinue": "Försökte att fortsätta nedladdning av %s, men en komplett nedladdad fil finns redan!",
"DownloadFail_HttpRequestFail": "Filen kunde inte hämtas! Det kan vara något fel med webbplasten du laddar ner filen från. Du kan försöka igen senare, eller hämta filen manuellt.",
"DownloadFullVersion": "%1$sLadda ner%2$s den fulla versionen! Kolla in %3$s",
- "DownloadPleaseRemoveExisting": "Var vänlig att radera den befintliga filen m du vill att den ska ersättas.",
+ "DownloadPleaseRemoveExisting": "Var vänlig att radera den befintliga filen om du vill att den ska ersättas.",
"Downloads": "Nedladdningar",
"EcommerceOrders": "E-handelsordrar",
"EcommerceVisitStatusDesc": "Besökets E-handelsstatus i slutet av besöket",
@@ -129,30 +130,30 @@
"Edit": "Redigera",
"EncryptedSmtpTransport": "Ange kryptering för transportlagret som krävs för din SMTP-server.",
"Error": "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å %skontakta din Piwik-administratör%s för hjälp.",
+ "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, %skontakta din Piwikadministratör%s för hjälp.",
+ "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.",
- "ExceptionConfigurationFileNotFound2": "Om filen existerar, vänligen kolla att %s är läsbar av användaren '%s'.",
+ "ExceptionConfigurationFileNotFound2": "Om filen existerar, vänligen kolla att %1$s är läsbar av användaren '%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.",
"ExceptionFileIntegrity": "Integritetskontrollen misslyckades: %s",
"ExceptionFilesizeMismatch": "Filstorleken matchar inte: %1$s (förväntad storlek: %2$s, aktuell: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Din %1$s klientversion är %2$s, vilket är inkompatibel med serverns version %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Samlingsrapportens format, '%s', är ogiltigt. Prova något av följande: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Samlingsrapportens format, '%1$s', är ogiltigt. Prova något av följande: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Arkiveringstidens giltighetstid för idag måste anges i sekunder och vara större än noll.",
- "ExceptionInvalidDateFormat": "Datumformatet måste vara: %s eller något nyckelord som stöds av %s funktionen (se %s för mer information)",
- "ExceptionInvalidDateRange": "Datumet '%s' är inte ett korrekt datumintervall. Det borde ha följande format: %s.",
- "ExceptionInvalidPeriod": "Perioden '%s' stöds inte. Prova med något av följande istället: %s",
- "ExceptionInvalidRendererFormat": "Renderingsformatet '%s' är inte giltigt. Prova med något av följande istället: %s.",
- "ExceptionInvalidReportRendererFormat": "Rapportens format '%s' är ogiltigt. Använd något av följande istället: %s.",
- "ExceptionInvalidStaticGraphType": "Den statiska graftypen '%s' är ogiltig. Prova någon av följande: %s.",
+ "ExceptionInvalidDateFormat": "Datumformatet måste vara: %1$s eller något nyckelord som stöds av %2$s funktionen (se %3$s för mer information)",
+ "ExceptionInvalidDateRange": "Datumet '%1$s' är inte ett korrekt datumintervall. Det borde ha följande format: %2$s.",
+ "ExceptionInvalidPeriod": "Perioden '%1$s' stöds inte. Prova med något av följande istället: %2$s",
+ "ExceptionInvalidRendererFormat": "Renderingsformatet '%1$s' är inte giltigt. Prova med något av följande istället: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "Rapportens format '%1$s' är ogiltigt. Använd något av följande istället: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Den statiska graftypen '%1$s' är ogiltig. Prova någon av följande: %2$s.",
"ExceptionInvalidToken": "Säkerhetsbeviset är inte giltigt.",
"ExceptionLanguageFileNotFound": "Språkfilen '%s' hittades inte.",
- "ExceptionMethodNotFound": "Metoden '%s' finns inte eller är inte tillgänglig i denna modulen '%s'.",
+ "ExceptionMethodNotFound": "Metoden '%1$s' finns inte eller är inte tillgänglig i denna modulen '%2$s'.",
"ExceptionMissingFile": "Fil saknas: %s",
"ExceptionNonceMismatch": "Kunde inte verifiera säkerhetsbeviset på detta formulär.",
"ExceptionPrivilege": "Du kan inte komma åt denna resurs eftersom det kräver %s tillträde.",
@@ -160,7 +161,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Du kan inte komma åt denna resurs eftersom det åtminstone kräver %s tillträde till en webbplats.",
"ExceptionUnableToStartSession": "Kan inte starta sessionen.",
"ExceptionUndeletableFile": "Det går inte att ta bort %s",
- "ExceptionUnreadableFileDisabledMethod": "Konfigurationsfilen {%s} kunde inte läsas. Din värd har kanske inaktiverat %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Konfigurationsfilen {%1$s} kunde inte läsas. Din värd har kanske inaktiverat %2$s.",
"ExceptionReportNotFound": "Den begärda rapporten finns inte.",
"ExceptionWidgetNotFound": "Den begärda widgeten finns inte.",
"ExceptionReportNotEnabled": "Den begärda rapporten är inte aktiverad. Det brukar bero på att den plugin som skapar rapporten har avaktiverats eller att du saknar behörighet att se denna rapport.",
@@ -208,7 +209,7 @@
"Logout": "Logga ut",
"MainMetrics": "Huvudvariabler",
"Matches": "Matchningar",
- "MediumToHighTrafficItIsRecommendedTo": "För webbplatser med medelhög till hög trafik rekommenderas det att du behandlar rapporterna för idag som mest varje halvtimma (%s sekunder) eller varje timma (%s sekunder).",
+ "MediumToHighTrafficItIsRecommendedTo": "För webbplatser med medelhög till hög trafik rekommenderas det att du behandlar rapporterna för idag som mest varje halvtimma (%1$s sekunder) eller varje timma (%2$s sekunder).",
"Metadata": "Metadata",
"Metric": "Variabel",
"Metrics": "Variabler",
@@ -237,7 +238,7 @@
"NoDataForTagCloud": "Ingen data för detta taggmoln.",
"NotDefined": "%s är inte definierat",
"Note": "Notering",
- "NotInstalled": "Inte Installerad",
+ "NotInstalled": "Inte installerad",
"NotRecommended": "ej rekommenderat",
"NotValid": "%s är ogiltig",
"NumberOfVisits": "Antalet besök",
@@ -260,19 +261,22 @@
"OperationIsNot": "Är inte",
"OperationLessThan": "Mindre än",
"OperationNotEquals": "Inte lika med",
+ "OperationStartsWith": "Börjar med",
+ "OperationEndsWith": "Slutar med",
"OptionalSmtpPort": "Frivilligt. Standardvärdet är port 25 för okrypterat och TLS SMTP och port 465 för SSL SMTP.",
"Options": "Alternativ",
- "OrCancel": "eller %s Avbryt %s",
+ "Or": "eller",
+ "OrCancel": "eller %1$s Avbryt %2$s",
"Others": "Andra",
"Outlink": "Utlänk",
"Outlinks": "Utlänkar",
"OverlayRowActionTooltip": "Se analysdata direkt på din webbplats (öppnas i ny flik)",
- "OverlayRowActionTooltipTitle": "Öppna Sidöverlägg",
+ "OverlayRowActionTooltipTitle": "Öppna sidöverlägg",
"Overview": "Översikt",
"Pages": "Sidor",
- "Pagination": "%s - %s av %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Parametern %s måste vara ett heltal mellan %s och %s.",
+ "Pagination": "%1$s - %2$s av %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Parametern %1$s måste vara ett heltal mellan %2$s och %3$s.",
"Password": "Lösenord",
"Period": "Period",
"Piechart": "Cirkeldiagram",
@@ -324,7 +328,7 @@
"Clear": "Rensa",
"SearchNoResults": "Inget resultat",
"SeeAll": "Se hela",
- "SeeTheOfficialDocumentationForMoreInformation": "Se den %sofficiella dokumentationen%s för mer information.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Se den %1$sofficiella dokumentationen%2$s för mer information.",
"SeeThisFaq": "Se %1$sdenna FAQ%2$s.",
"Segment": "Segment",
"SelectYesIfYouWantToSendEmailsViaServer": "Välj \"Ja\" om du vill eller måste skicka e-post via en namngiven server istället för den lokala e-postfunktionen.",
@@ -333,11 +337,11 @@
"Show": "visa",
"SingleWebsitesDashboard": "Instrumentpanel för enkel sida",
"SmallTrafficYouCanLeaveDefault": "För webbplatser med låg trafik så kan du lämna detta som standard (%s sekunder) och komma åt alla rapporter i realtid.",
- "SmtpEncryption": "SMTP kryptering",
- "SmtpPassword": "SMTP lösenord",
- "SmtpPort": "SMTP port",
- "SmtpServerAddress": "SMTP serveradress",
- "SmtpUsername": "SMTP användarnamn",
+ "SmtpEncryption": "SMTP-kryptering",
+ "SmtpPassword": "SMTP-lösenord",
+ "SmtpPort": "SMTP-port",
+ "SmtpServerAddress": "SMTP-serveradress",
+ "SmtpUsername": "SMTP-användarnamn",
"Source": "Källa",
"StatisticsAreNotRecorded": "Piwik Besöks Spårning är för närvarande inte tillgänglig. Möjliggör spårning igen genom att ställa in Total Statistik - 1 i din config\/config.ini.php file.",
"Subtotal": "Delsumma",
@@ -346,11 +350,15 @@
"TagCloud": "Taggmoln",
"Tax": "Moms",
"TimeAgo": "%s sedan",
+ "TimeFormat": "Tidsformat",
"TimeOnPage": "Tid på sidan",
"Total": "Totalt",
"TotalRatioTooltip": "Det här är %1$s av alla %2$s %3$s.",
"TotalRevenue": "Totala intäkter",
- "TotalVisitsPageviewsActionsRevenue": "(Totalt: %s besök, %s sidvisningar, %s händelser, %s intäkter)",
+ "TotalVisitsPageviewsActionsRevenue": "(Totalt: %1$s besök, %2$s sidvisningar, %3$s händelser, %4$s intäkter)",
+ "TrackingScopeAction": "Åtgärd",
+ "TrackingScopePage": "Sida",
+ "TrackingScopeVisit": "Besök",
"TransitionsRowActionTooltip": "Se vad besökarna gjorde före och efter att ha tittat på den här sidan",
"TransitionsRowActionTooltipTitle": "Öppna övergångar",
"TranslatorName": "<a href=\"http:\/\/xn--skmotoroptimering-zzb.se\/\">Sökmotoroptimering.se<\/a>, <a href=\"http:\/\/www.kampanjjakt.se\/\">Kampanjjakt.se<\/a>, <a href=\"http:\/\/www.lagun.se\/\">Fredrik Astrom<\/a>, <a href=\"http:\/\/www.dumsnal.se\/\">Tony<\/a>",
@@ -360,7 +368,7 @@
"UsePlusMinusIconsDocumentation": "Använd plus- och minusikonerna till höger för att navigera.",
"UserId": "Användar-ID",
"Username": "Användarnamn",
- "UseSMTPServerForEmail": "Använd SMTP server för e-post",
+ "UseSMTPServerForEmail": "Använd SMTP-server för e-post",
"Value": "Värde",
"VBarGraph": "Stapeldiagram",
"View": "Visa",
@@ -371,19 +379,21 @@
"VisitConvertedNGoals": "Besök omvandlade %s mål",
"VisitDuration": "Genomsnittlig besökstid (i sekunder)",
"Visitor": "Besökare",
- "VisitorID": "Besöks-id",
+ "VisitorID": "Besöks-ID",
"VisitorIP": "Besökarens IP",
"Visitors": "Besökare",
"VisitsWith": "Besök med %s",
"VisitorSettings": "Besökarinställningar",
+ "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",
"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.",
"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.",
- "WarningPasswordStored": "%sVarning:%s Detta lösenord kommer att sparas i konfigurationsfilen och kommer vara synligt för alla som har tillgång till den.",
- "WarningDebugOnDemandEnabled": "Spårningsläge %s är aktiverat. Av säkerhetsskäl bör detta endast vara aktiverat under en kortare period. För att avaktivera det, ställ in %s till %s i %s",
+ "WarningPasswordStored": "%1$sVarning:%2$s Detta lösenord kommer att sparas i konfigurationsfilen och kommer vara synligt för alla som har tillgång till den.",
+ "WarningDebugOnDemandEnabled": "Spårningsläge %1$s är aktiverat. Av säkerhetsskäl bör detta endast vara aktiverat under en kortare period. För att avaktivera det, ställ in %2$s till %3$s i %4$s",
"Website": "Webbplats",
"Weekly": "Veckovis",
"WeeklyReport": "veckovis",
@@ -398,6 +408,7 @@
"YearsDays": "%1$s år %2$s dagar",
"Yes": "Ja",
"YouAreCurrentlyUsing": "Du använder för närvarande Piwik %s.",
+ "YouAreViewingDemoShortMessage": "Du visar demonstrationen av Piwik",
"YouMustBeLoggedIn": "Du måste vara inloggad för att komma åt denna funktion.",
"YourChangesHaveBeenSaved": "Dina ändringar har sparats."
},
@@ -413,12 +424,12 @@
"AnonymousTracking": "Anonym spårning",
"AskForAnonymousTrackingPermission": "När funktionen är aktiverad, kommer Piwik Mobile skicka anonyma användningsdata till piwik.org. Avsikten är att använda dessa data för att hjälpa Piwiks mobila utvecklare att bättre förstå hur appen används. Information som skickas är: menyer och inställningar som klickats på, OS namn och version, eventuella fel som visas i Piwik Mobile. Vi kommer inte att spåra några av dina analysdata. Dessa anonyma uppgifter kommer aldrig att offentliggöras. Du kan inaktivera \/ aktivera anonym spårning under Inställningar när som helst.",
"ChooseHttpTimeout": "Välj HTTP-timeout värde",
- "ChooseMetric": "Välj Variabel",
+ "ChooseMetric": "Välj variabel",
"ChooseReport": "Välj en rapport",
"ChooseSegment": "Välj segment",
"ConfirmRemoveAccount": "Vill du ta bort kontot?",
"DefaultReportDate": "Rapportdatum",
- "EmailUs": "Eposta oss",
+ "EmailUs": "E-posta oss",
"EnableGraphsLabel": "Visa grafer",
"EvolutionGraph": "Historisk graf",
"HelpUsToImprovePiwikMobile": "Vill du aktivera anonym spårning i Piwik Mobile?",
@@ -426,7 +437,7 @@
"HowtoDeleteAnAccountOniOS": "Dra från vänster till höger för att radera ett konto",
"HowtoLoginAnonymous": "Lämna användarnamn och lösenord tomt för anonym inloggning",
"HttpIsNotSecureWarning": "Ditt Piwik tillståndsbevis (token_auth) skickas i klartext om du använder 'HTTP'. Av denna anledning rekommenderar vi HTTPS för säker transport av data över Internet. Vill du fortsätta?",
- "HttpTimeout": "HTTP Timeout",
+ "HttpTimeout": "HTTP timeout",
"IncompatiblePiwikVersion": "Den version av Piwik du använder är inkompatibel med Piwik Mobil 2. Uppdatera din Piwik installation, eller installera Piwik Mobil 1 och försök igen.",
"LastUpdated": "Senast uppdaterad: %s",
"LoadingReport": "Laddar %s",
@@ -436,11 +447,11 @@
"MultiChartLabel": "Visa miniatyrdiagram",
"NavigationBack": "Tillbaka",
"NetworkError": "Nätverksfel",
- "NetworkErrorWithStatusCode": "Ett fel påträffades \"%s\". Begäran svarade med statusen \"%s\". URL'en var \"%s\". Vänligen kontrollera den URL du angivit och felloggar på den här servern för att få mer information om felet och se hur det går att lösa.",
- "NetworkErrorWithStatusCodeShort": "Nätvärksfel %s",
+ "NetworkErrorWithStatusCode": "Ett fel påträffades \"%1$s\". Begäran svarade med statusen \"%2$s\". URL'en var \"%3$s\". Vänligen kontrollera den URL du angivit och felloggar på den här servern för att få mer information om felet och se hur det går att lösa.",
+ "NetworkErrorWithStatusCodeShort": "Nätverksfel %s",
"NetworkNotReachable": "Nätverket är inte tillgängligt",
"NoAccountIsSelected": "Du måste välja ett konto. Skapa ett nytt konto om du ännu inte gjort det.",
- "NoDataShort": "Inga Data",
+ "NoDataShort": "Inga data",
"NoPiwikAccount": "Inget Piwik-konto?",
"NoReportsShort": "Inga rapporter",
"NoVisitorFound": "Inga besökare hittades",
@@ -454,10 +465,10 @@
"RatingDontRemindMe": "PÃ¥minn mig inte",
"RatingNotNow": "Inte nu",
"RatingNow": "OK, jag betygsätter den nu",
- "RatingPleaseRateUs": "Piwik Mobile är en gratis programvara, vi skulle uppskatta om du tog en minut till att betygsätta appen i %s. Om du har förslag på nya funktioner eller vill rapportera buggar, vänligen kontakta %s",
+ "RatingPleaseRateUs": "Piwik Mobile är en gratis programvara, vi skulle uppskatta om du tog en minut till att betygsätta appen i %1$s. Om du har förslag på nya funktioner eller vill rapportera buggar, vänligen kontakta %2$s",
"ReleaseToRefresh": "Släpp för att uppdatera...",
"Reloading": "Laddar om...",
- "RequestTimedOutShort": "Nätvärks Timeout fel",
+ "RequestTimedOutShort": "Nätverkstimeout-fel",
"RestrictedCompatibility": "Begränsad tillgänglighet",
"RestrictedCompatibilityExplanation": "Den versionen av Piwik %s du har använder har inte fullt stöd av Piwik Mobil 2. Du kanske kommer stöta på några buggar. Vi rekommenderar att du antingen uppdaterar Piwik till den senaste versionen eller använder Piwik Mobil 1.",
"SaveSuccessError": "Vänligen verifiera inställningar",
@@ -479,7 +490,7 @@
"CompareRows": "Jämför uppgifter",
"ComparingRecords": "Jämför %s rader",
"Documentation": "Klicka på variablerna för att visa dom i deb stora utvecklingsgrafen. Använd shift-klick för att visa flera variabler samtidigt.",
- "MetricBetweenText": "mellan %s och %s",
+ "MetricBetweenText": "mellan %1$s och %2$s",
"MetricChangeText": "%s över perioden",
"MetricMinMax": "%1$s varierade mellan %2$s och %3$s över perioden",
"MetricsFor": "Statistik för %s",
diff --git a/lang/ta.json b/lang/ta.json
index fb05513c2c89270257c44adac633dc37e6049daa..c30c630e76a1a83b80ab42b09c8a10d6c38ffd09 100644
--- a/lang/ta.json
+++ b/lang/ta.json
@@ -10,6 +10,7 @@
"AllWebsitesDashboard": "அனைதà¯à®¤à¯ இணையதள கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯à®Ÿà¯ அறை",
"And": "மறà¯à®±à¯à®®à¯",
"API": "à®à®ªà®¿à®",
+ "ArchivingTriggerDescription": "Recomanat per instal·lacions grans de Piwik, es pot %1$sconfigurar una %2$stasca programada per processar les entrades automà ticament.",
"AuthenticationMethodSmtp": "SMTP கà¯à®•à®¾à®© உறà¯à®¤à®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®®à¯ à®®à¯à®±à¯ˆ",
"AverageOrderValue": "சராசரி à®’à®´à¯à®™à¯à®•à¯ மதிபà¯à®ªà¯",
"AveragePrice": "சராசரி விலை",
@@ -18,9 +19,7 @@
"Broken": "உடைவà¯",
"Cancel": "ரதà¯à®¤à¯",
"ChangePassword": "கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ மாறà¯à®±",
- "ChooseDate": "திகதியை தெரிவà¯à®šà¯†à®¯à¯à®¯",
"ChoosePeriod": "காலபà¯à®ªà®•à¯à®¤à®¿à®¯à¯ˆ தெரிவ௠செயà¯à®¯",
- "ChooseWebsite": "இணையதளதà¯à®¤à¯ˆ தெரிவ௠செயà¯à®¯",
"ClickHere": "மேலதிக தகவலà¯à®•à®³à¯à®•à¯à®•à¯ இஙà¯à®•à¯‡ சொடà¯à®•à¯à®•à¯à®•",
"Close": "மூட",
"ColumnActionsPerVisit": "வரà¯à®•à¯ˆà®•à¯à®•à¯‡à®Ÿà¯à®±à¯à®± நடவடிகà¯à®•à¯ˆà®•à®³à¯",
@@ -49,6 +48,7 @@
"ColumnUniqueExits": "தனிதà¯à®¤à¯à®µà®®à®¾à®© வெளியேறலà¯à®•à®³à¯",
"ColumnValuePerVisit": "ஒர௠வரà¯à®•à¯ˆà®•à¯à®•à®¾à®© வரà¯à®®à®¾à®©à®®à¯",
"ColumnVisitDuration": "வரà¯à®•à¯ˆ காலபà¯à®ªà®•à¯à®¤à®¿ (செகà¯à®•à®©à¯à®•à®³à®¿à®²à¯)",
+ "ConfigFileIsNotWritable": "El fitxer de configuració del Piwiki %1$s no es pot modificar, alguns dels canvis que has fet no es guardaran. Si us plau %2$s canvia els permisos del fitxer de configuració per tal que es pugui modificar.",
"Continue": "தொடர",
"ContinueToPiwik": "பிவிகà¯-கà¯à®•à¯ தொடரà¯à®•",
"CurrentMonth": "இநà¯à®¤ மாதமà¯",
@@ -60,7 +60,7 @@
"Date": "திகதி",
"DateRange": "திகதி வீசà¯à®šà¯",
"DateRangeFrom": "இரà¯à®¨à¯à®¤à¯",
- "DateRangeFromTo": "%s இரà¯à®¨à¯à®¤à¯ %s வரை",
+ "DateRangeFromTo": "%1$s இரà¯à®¨à¯à®¤à¯ %2$s வரை",
"DateRangeTo": "கà¯à®•à¯",
"DaysHours": "%1$s நாடà¯à®•à®³à¯ %2$s மணிதà¯à®¤à®¿à®¯à®¾à®²à®™à¯à®•à®³à¯",
"Default": "பொதà¯à®…மைபà¯à®ªà¯",
@@ -79,6 +79,15 @@
"EcommerceOrders": "மின௠வணிக கடà¯à®Ÿà®³à¯ˆà®•à®³à¯",
"Edit": "மாறà¯à®±",
"Error": "பிழை",
+ "ExceptionInvalidAggregateReportsFormat": "El format de informes agregats '%1$s' no és và lid. Proveu-ne algun dels següents en el seu lloc: %2$s.",
+ "ExceptionInvalidDateFormat": "El format de data ha de ser: %1$s o una altra paraula clau suportada per la funció %2$s (vegeu %3$s per més informació)",
+ "ExceptionInvalidDateRange": "La data '%1$s' no és un rang correcte de data. Hauria de tenir el format següent: %2$s.",
+ "ExceptionInvalidPeriod": "El perÃode '%1$s' no està suportat. Proveu-ne algun dels següents en el seu lloc: %2$s.",
+ "ExceptionInvalidRendererFormat": "El format generador '%1$s' no és và lid. Proveu-ne un dels següents en el seu lloc: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "El format de l'informe '%1$s' no és và lid. Proveu-ne un dels següent en el seu lloc: %2$s.",
+ "ExceptionInvalidStaticGraphType": "El grà fic està tic tipus '%1$s' no és và lid. Proveu-ne un dels següents en el seu lloc: %2$s.",
+ "ExceptionMethodNotFound": "El mètode '%1$s' no existeix o no està disponible en el mòdul '%2$s'.",
+ "ExceptionUnreadableFileDisabledMethod": "El fitxer de configuració {%1$s} no s'ha pogut llegir. El vostre host pot tenir deshabilitat %2$s.",
"Export": "à®à®±à¯à®±à¯à®®à®¤à®¿",
"Faq": "கேளà¯à®µà®¿à®•à®³à¯",
"First": "à®®à¯à®¤à®²à¯",
@@ -102,6 +111,7 @@
"Logout": "வெளியேற",
"MainMetrics": "à®®à¯à®•à¯à®•à®¿à®¯ அளவீடà¯à®•à®³à¯",
"Matches": "பொரà¯à®¤à¯à®¤à®™à¯à®•à®³à¯",
+ "MediumToHighTrafficItIsRecommendedTo": "Per llocs de mig i alt transit, recomanem processar informes per avui com a molt cada mitja hora (%1$s segons) o cada hora (%2$s segons)",
"Mobile": "கைபேசி",
"Monthly": "மாதாநà¯à®¤",
"MonthlyReport": "மாதாநà¯à®¤",
@@ -127,10 +137,12 @@
"OperationLessThan": "இதை விட கà¯à®±à¯ˆà®µà®¾à®•",
"OperationNotEquals": "சமனிலà¯à®²à¯ˆ",
"Options": "தெரிவà¯à®•à®³à¯",
+ "OrCancel": "o %1$s cancel·la %2$s",
"Others": "மறà¯à®±à®µà¯ˆ",
"Outlinks": "வெளி இணைபà¯à®ªà¯à®•à®³à¯",
"Overview": "மேறà¯à®ªà®¾à®°à¯à®µà¯ˆ",
"Pages": "பகà¯à®•à®™à¯à®•à®³à¯",
+ "ParameterMustIntegerBetween": "El parà metre %1$s ha de ser un enter entre %2$s i %3$s",
"Password": "கடவà¯à®šà¯à®šà¯Šà®²à¯",
"Period": "காலபà¯à®ªà®•à¯à®¤à®¿",
"Piechart": "பை வரைபà¯",
@@ -156,6 +168,7 @@
"Clear": "சà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯",
"SearchNoResults": "எநà¯à®¤ à®®à¯à®Ÿà®¿à®µà¯à®•à®³à¯à®®à¯ இலà¯à®²à¯ˆ",
"SeeAll": "எலà¯à®²à®¾à®µà®±à¯à®±à¯ˆà®¯à¯à®®à¯ காண",
+ "SeeTheOfficialDocumentationForMoreInformation": "Vegeu la %1$sinformació oficial%2$s per més informació.",
"Settings": "அமைபà¯à®ªà¯à®•à®³à¯",
"Shipping": "அனà¯à®ªà¯à®ªà¯à®¤à®²à¯",
"Show": "காணà¯à®ªà®¿",
@@ -192,6 +205,7 @@
"Visitors": "வரà¯à®•à¯ˆà®¯à®¾à®³à®°à¯à®•à®³à¯",
"VisitsWith": "%s உடன௠வரà¯à®•à¯ˆà®•à®³à¯",
"Warning": "எசà¯à®šà®°à®¿à®•à¯à®•à¯ˆ",
+ "WarningPasswordStored": "%1$sAlerta:%2$s Aquesta contrasenya es guardarà en un fitxer de configuració visible on tothom pot accedir.",
"Website": "இணையபà¯à®ªà®•à¯à®•à®®à¯",
"Weekly": "வாராநà¯à®¤à®®à¯",
"WeeklyReport": "வாராநà¯à®¤",
@@ -244,6 +258,6 @@
"RowEvolution": {
"CompareRows": "பதிவà¯à®•à®³à¯à®Ÿà®©à¯ ஒபà¯à®ªà®¿à®Ÿ",
"ComparingRecords": "%s வரிகளà¯à®Ÿà®©à¯ ஒபà¯à®ªà®¿à®Ÿà¯à®•à®¿à®±à®¤à¯",
- "MetricBetweenText": "%s இரà¯à®¨à¯à®¤à¯ %s வரை"
+ "MetricBetweenText": "%1$s இரà¯à®¨à¯à®¤à¯ %2$s வரை"
}
}
\ No newline at end of file
diff --git a/lang/te.json b/lang/te.json
index a18c1d9a3ebdb25a5fcdfe5b5c1609bc26e82003..af5b4711567021cd3a01687c9aa05ef50ddb5d1e 100644
--- a/lang/te.json
+++ b/lang/te.json
@@ -10,10 +10,8 @@
"AverageQuantity": "సగటౠపరిమాణం",
"BackToPiwik": "తిరిగి పివికà±â€Œà°•à°¿",
"Cancel": "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿",
- "ChooseDate": "తేదీని à°Žà°‚à°šà±à°•à±‹à°‚à°¡à°¿",
"ChooseLanguage": "à°à°¾à°·à°¨à°¿ à°Žà°‚à°šà±à°•à±‹à°‚à°¡à°¿",
"ChoosePeriod": "కాలవà±à°¯à°µà°§à°¿à°¨à°¿ à°Žà°‚à°šà±à°•à±‹à°‚à°¡à°¿",
- "ChooseWebsite": "వెబౠసైటà±à°¨à°¿ à°Žà°‚à°šà±à°•à±‹à°‚à°¡à°¿",
"Close": "మూసివేయి",
"ColumnActionsPerVisit": "సందరà±à°¶à°¨à°•à°¿ à°šà°°à±à°¯à°²à±",
"ColumnConversionRate": "మారà±à°ªà°¿à°¡à°¿ రేటà±",
@@ -77,7 +75,7 @@
"NVisits": "%s సందరà±à°¶à°¨à°²à±",
"Ok": "సరే",
"OneVisit": "1 సందరà±à°¶à°¨",
- "OrCancel": "లేదా %s à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿ %s",
+ "OrCancel": "లేదా %1$s à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿ %2$s",
"Others": "ఇతరాలà±",
"Outlinks": "బయటిలంకెలà±",
"Overview": "అవలోకనం",
diff --git a/lang/th.json b/lang/th.json
index 35a313845753979d5fad48328998d3d5de406545..bdc397f1ec6290c82f49f0c5f2bc40a3c6a18b06 100644
--- a/lang/th.json
+++ b/lang/th.json
@@ -9,7 +9,7 @@
"AllWebsitesDashboard": "à¹à¸œà¸‡à¸„วบคุมเว็บไซต์ทั้งหมด",
"API": "API",
"ArchivingInlineHelp": "เหมาะสำหรับเว็บไซต์ที่มีà¸à¸²à¸£à¸ˆà¸£à¸²à¸ˆà¸£à¸ªà¸¹à¸‡ เราà¹à¸™à¸°à¸™à¸³à¹ƒà¸«à¹‰à¸›à¸´à¸”à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ Piwik ในà¸à¸²à¸£à¹€à¸£à¸µà¸¢à¸à¹€à¸à¹‡à¸šà¸ˆà¸²à¸à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œ à¹à¸•à¹ˆà¹€à¸£à¸²à¸‚à¸à¹à¸™à¸°à¸™à¸³à¹ƒà¸«à¹‰à¸„ุณติดตั้ง Cron job ในà¸à¸²à¸£à¸›à¸£à¸°à¸¡à¸§à¸¥à¸œà¸¥à¹€à¸žà¸·à¹ˆà¸à¸£à¸²à¸¢à¸‡à¸²à¸™ Piwik ทุà¸à¸Šà¸±à¹ˆà¸§à¹‚มง",
- "ArchivingTriggerDescription": "à¹à¸™à¸°à¸™à¸³à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸•à¸´à¸”ตั้ง Piwik ขนาดใหà¸à¹ˆà¸—ี่คุณจะต้à¸à¸‡ %s ติดตั้ง Cron job%s เพื่à¸à¸”ำเนินà¸à¸²à¸£à¸£à¸²à¸¢à¸‡à¸²à¸™à¹‚ดยà¸à¸±à¸•à¹‚นมัติ",
+ "ArchivingTriggerDescription": "à¹à¸™à¸°à¸™à¸³à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸•à¸´à¸”ตั้ง Piwik ขนาดใหà¸à¹ˆà¸—ี่คุณจะต้à¸à¸‡ %1$s ติดตั้ง Cron job%2$s เพื่à¸à¸”ำเนินà¸à¸²à¸£à¸£à¸²à¸¢à¸‡à¸²à¸™à¹‚ดยà¸à¸±à¸•à¹‚นมัติ",
"AuthenticationMethodSmtp": "วิธีà¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡ SMTP",
"AverageOrderValue": "มูลค่าà¸à¸²à¸£à¸ªà¸±à¹ˆà¸‡à¸‹à¸·à¹‰à¸à¹€à¸‰à¸¥à¸µà¹ˆà¸¢",
"AveragePrice": "ราคาเฉลี่ย",
@@ -19,10 +19,8 @@
"Cancel": "ยà¸à¹€à¸¥à¸´à¸",
"ChangePassword": "เปลี่ยนรหัสผ่าน",
"ChangeTagCloudView": "โปรดทราบว่าคุณสามารถดูรายงานในรูปà¹à¸šà¸šà¸à¸·à¹ˆà¸™ ๆ à¸à¸§à¹ˆà¸²à¹€à¸›à¹‡à¸™à¹à¸—็ภCloud ใช้à¸à¸²à¸£à¸„วบคุมที่ด้านล่างขà¸à¸‡à¸£à¸²à¸¢à¸‡à¸²à¸™à¸—ี่จะทำเช่นนั้น",
- "ChooseDate": "เลืà¸à¸à¸§à¸±à¸™à¸—ี่",
"ChooseLanguage": "เลืà¸à¸à¸ าษา",
"ChoosePeriod": "เลืà¸à¸à¸Šà¹ˆà¸§à¸‡à¹€à¸§à¸¥à¸²",
- "ChooseWebsite": "เลืà¸à¸à¹€à¸§à¹‡à¸šà¹„ซต์",
"ClickHere": "คลิà¸à¸—ี่นี่สำหรับข้à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡",
"Close": "ปิด",
"ColumnActionsPerVisit": "à¸à¸²à¸£à¸”ำเนินà¸à¸²à¸£à¸•à¹ˆà¸à¸œà¸¹à¹‰à¸Šà¸¡",
@@ -67,7 +65,7 @@
"ColumnValuePerVisit": "ค่าต่à¸à¸œà¸¹à¹‰à¸Šà¸¡",
"ColumnVisitDuration": "ระยะเวลาเข้าเยี่ยมชม (เป็นวินาที)",
"ColumnVisitsWithConversions": "ผู้เข้าชมà¸à¸±à¸šà¸à¸²à¸£à¹€à¸›à¸¥à¸‡à¸‚้à¸à¸¡à¸¹à¸¥",
- "ConfigFileIsNotWritable": "à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าไฟล์ Piwik %s ไม่สามารถเขียนบางส่วนขà¸à¸‡à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¹„ด้ ซึ่งà¸à¸²à¸ˆà¸ˆà¸°à¹„ม่ถูà¸à¸šà¸±à¸™à¸—ึภ%s à¸à¸£à¸¸à¸“าเปลี่ยนสิทธิ์ขà¸à¸‡à¹„ฟล์à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าเพื่à¸à¹ƒà¸«à¹‰à¸ªà¸²à¸¡à¸²à¸£à¸–เขียนได้",
+ "ConfigFileIsNotWritable": "à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าไฟล์ Piwik %1$s ไม่สามารถเขียนบางส่วนขà¸à¸‡à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¹„ด้ ซึ่งà¸à¸²à¸ˆà¸ˆà¸°à¹„ม่ถูà¸à¸šà¸±à¸™à¸—ึภ%2$s à¸à¸£à¸¸à¸“าเปลี่ยนสิทธิ์ขà¸à¸‡à¹„ฟล์à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าเพื่à¸à¹ƒà¸«à¹‰à¸ªà¸²à¸¡à¸²à¸£à¸–เขียนได้",
"Continue": "ต่à¸à¹„ป",
"ContinueToPiwik": "ต่à¸à¹„ปยัง Piwik",
"CurrentMonth": "เดืà¸à¸™à¸™à¸µà¹‰",
@@ -80,7 +78,7 @@
"Date": "วันที่",
"DateRange": "ช่วงวันที่:",
"DateRangeFrom": "จาà¸",
- "DateRangeFromTo": "จาภ%s ไปยัง %s",
+ "DateRangeFromTo": "จาภ%1$s ไปยัง %2$s",
"DateRangeTo": "ถึง",
"DaysHours": "%1$s วัน %2$s ชั่วโมง",
"DaysSinceFirstVisit": "นับตั้งà¹à¸•à¹ˆà¸„รั้งà¹à¸£à¸",
@@ -112,17 +110,17 @@
"ExceptionFileIntegrity": "พบข้à¸à¸œà¸´à¸”พลาดในà¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸„วามสมบูรณ์: %s",
"ExceptionFilesizeMismatch": "ขนาดขà¸à¸‡à¹„ฟล์ไม่ตรงà¸à¸±à¸™: %1$s (ขนาดไฟล์ที่คาดไว้: %2$s, พบ: %3$s)",
"ExceptionIncompatibleClientServerVersions": "คุณ %1$s เวà¸à¸£à¹Œà¸Šà¸±à¹ˆà¸™à¸‚à¸à¸‡à¹„คลเà¸à¹‡à¸™à¸•à¹Œ %2$s ซึ่งไม่เข้าà¸à¸±à¸™à¸à¸±à¸šà¹€à¸§à¸à¸£à¹Œà¸Šà¸±à¹ˆà¸™à¸‚à¸à¸‡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "รูปà¹à¸šà¸šà¸à¸²à¸£à¸£à¸§à¸¡à¸£à¸²à¸¢à¸‡à¸²à¸™ '%s' ไม่ถูà¸à¸•à¹‰à¸à¸‡ à¸à¸£à¸¸à¸“าลà¸à¸‡à¸£à¸²à¸¢à¸à¸²à¸£à¸”ังต่à¸à¹„ปนี้à¹à¸—น: %s",
+ "ExceptionInvalidAggregateReportsFormat": "รูปà¹à¸šà¸šà¸à¸²à¸£à¸£à¸§à¸¡à¸£à¸²à¸¢à¸‡à¸²à¸™ '%1$s' ไม่ถูà¸à¸•à¹‰à¸à¸‡ à¸à¸£à¸¸à¸“าลà¸à¸‡à¸£à¸²à¸¢à¸à¸²à¸£à¸”ังต่à¸à¹„ปนี้à¹à¸—น: %2$s",
"ExceptionInvalidArchiveTimeToLive": "วันนี้เวลาเà¸à¹‡à¸šà¸à¸¢à¸¹à¹ˆà¸ˆà¸°à¸•à¹‰à¸à¸‡à¹€à¸›à¹‡à¸™à¸ˆà¸³à¸™à¸§à¸™à¸§à¸´à¸™à¸²à¸—ีที่มาà¸à¸à¸§à¹ˆà¸²à¸¨à¸¹à¸™à¸¢à¹Œ",
- "ExceptionInvalidDateFormat": "รูปà¹à¸šà¸šà¹€à¸§à¸¥à¸²à¸ˆà¸°à¹€à¸›à¹‡à¸™: %s หรืà¸à¸„ีย์บà¸à¸£à¹Œà¸”ใดที่รà¸à¸‡à¸£à¸±à¸šà¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¹ˆà¸™ %s (ดู %s สำหรับข้à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡)",
- "ExceptionInvalidDateRange": "วันที่ '%s' ไม่ใช่ช่วงวันที่ถูà¸à¸•à¹‰à¸à¸‡ ควรมีรูปà¹à¸šà¸šà¸”ังนี้: %s",
- "ExceptionInvalidPeriod": "ช่วงเวลา '%s' ไม่สนับสนุน ลà¸à¸‡à¸”ังต่à¸à¹„ปนี้à¹à¸—น: %s",
- "ExceptionInvalidRendererFormat": "รูปà¹à¸šà¸š Renderer '%s' ไม่ถูà¸à¸•à¹‰à¸à¸‡ ลà¸à¸‡à¹ƒà¸Šà¹‰à¸”ังต่à¸à¹„ปนี้à¹à¸—น: %s",
- "ExceptionInvalidReportRendererFormat": "รูปà¹à¸šà¸šà¸£à¸²à¸¢à¸‡à¸²à¸™ '%s' ไม่ถูà¸à¸•à¹‰à¸à¸‡ ลà¸à¸‡à¸žà¸¢à¸²à¸¢à¸²à¸¡à¹ƒà¸«à¸¡à¹ˆà¸à¸µà¸à¸„รั้งสำหรับสิ่งต่à¸à¹„ปนี้à¹à¸—น: %s",
- "ExceptionInvalidStaticGraphType": "ประเภทขà¸à¸‡à¸à¸£à¸²à¸Ÿà¸ªà¸–ิติ '%s' ไม่ถูà¸à¸•à¹‰à¸à¸‡ à¸à¸£à¸¸à¸“าลà¸à¸‡à¸£à¸²à¸¢à¸à¸²à¸£à¸”ังต่à¸à¹„ปนี้à¹à¸—น: %s",
+ "ExceptionInvalidDateFormat": "รูปà¹à¸šà¸šà¹€à¸§à¸¥à¸²à¸ˆà¸°à¹€à¸›à¹‡à¸™: %1$s หรืà¸à¸„ีย์บà¸à¸£à¹Œà¸”ใดที่รà¸à¸‡à¸£à¸±à¸šà¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¹ˆà¸™ %2$s (ดู %3$s สำหรับข้à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡)",
+ "ExceptionInvalidDateRange": "วันที่ '%1$s' ไม่ใช่ช่วงวันที่ถูà¸à¸•à¹‰à¸à¸‡ ควรมีรูปà¹à¸šà¸šà¸”ังนี้: %2$s",
+ "ExceptionInvalidPeriod": "ช่วงเวลา '%1$s' ไม่สนับสนุน ลà¸à¸‡à¸”ังต่à¸à¹„ปนี้à¹à¸—น: %2$s",
+ "ExceptionInvalidRendererFormat": "รูปà¹à¸šà¸š Renderer '%1$s' ไม่ถูà¸à¸•à¹‰à¸à¸‡ ลà¸à¸‡à¹ƒà¸Šà¹‰à¸”ังต่à¸à¹„ปนี้à¹à¸—น: %2$s",
+ "ExceptionInvalidReportRendererFormat": "รูปà¹à¸šà¸šà¸£à¸²à¸¢à¸‡à¸²à¸™ '%1$s' ไม่ถูà¸à¸•à¹‰à¸à¸‡ ลà¸à¸‡à¸žà¸¢à¸²à¸¢à¸²à¸¡à¹ƒà¸«à¸¡à¹ˆà¸à¸µà¸à¸„รั้งสำหรับสิ่งต่à¸à¹„ปนี้à¹à¸—น: %2$s",
+ "ExceptionInvalidStaticGraphType": "ประเภทขà¸à¸‡à¸à¸£à¸²à¸Ÿà¸ªà¸–ิติ '%1$s' ไม่ถูà¸à¸•à¹‰à¸à¸‡ à¸à¸£à¸¸à¸“าลà¸à¸‡à¸£à¸²à¸¢à¸à¸²à¸£à¸”ังต่à¸à¹„ปนี้à¹à¸—น: %2$s",
"ExceptionInvalidToken": "Token นี้ไม่สมบูรณ์",
"ExceptionLanguageFileNotFound": "ไม่พบไฟล์ภาษา '%s'",
- "ExceptionMethodNotFound": "ขั้นตà¸à¸™ '%s' ไม่มีà¸à¸¢à¸¹à¹ˆà¸«à¸£à¸·à¸à¹„ม่สามารถใช้ได้ในโมดูล '%s' นี้ได้",
+ "ExceptionMethodNotFound": "ขั้นตà¸à¸™ '%1$s' ไม่มีà¸à¸¢à¸¹à¹ˆà¸«à¸£à¸·à¸à¹„ม่สามารถใช้ได้ในโมดูล '%2$s' นี้ได้",
"ExceptionMissingFile": "ไฟล์สูà¸à¸«à¸²à¸¢: %s",
"ExceptionNonceMismatch": "ไม่สามารถตรวจสà¸à¸šà¸„วามปลà¸à¸”ภัยขà¸à¸‡ token ในฟà¸à¸£à¹Œà¸¡à¸™à¸µà¹‰à¹„ด้",
"ExceptionPrivilege": "คุณไม่สามารถเข้าถึงทรัพยาà¸à¸£à¸™à¸µà¹‰ จำเป็นต้à¸à¸‡à¹ƒà¸Šà¹‰ %s สำหรับà¸à¸²à¸£à¹€à¸‚้าใช้งาน",
@@ -130,7 +128,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "คุณไม่สามารถเข้าถึงทรัพยาà¸à¸£à¸™à¸µà¹‰ จำเป็นต้à¸à¸‡à¹ƒà¸Šà¹‰ %s เข้าใช้งานได้ à¸à¸¢à¹ˆà¸²à¸‡à¸™à¹‰à¸à¸¢à¸«à¸™à¸¶à¹ˆà¸‡à¹€à¸§à¹‡à¸šà¹„ซต์",
"ExceptionUnableToStartSession": "ไม่สามารถเริ่มต้นเซสชัน",
"ExceptionUndeletableFile": "ไม่สามารถทำà¸à¸²à¸£à¸¥à¸š %s",
- "ExceptionUnreadableFileDisabledMethod": "ไฟล์à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่า {%s} ไม่สามารถà¸à¹ˆà¸²à¸™à¹„ด้ โฮสต์ขà¸à¸‡à¸„ุณà¸à¸²à¸ˆà¸¡à¸µà¸›à¸´à¸”à¸à¸²à¸£à¸—ำงาน %s",
+ "ExceptionUnreadableFileDisabledMethod": "ไฟล์à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่า {%1$s} ไม่สามารถà¸à¹ˆà¸²à¸™à¹„ด้ โฮสต์ขà¸à¸‡à¸„ุณà¸à¸²à¸ˆà¸¡à¸µà¸›à¸´à¸”à¸à¸²à¸£à¸—ำงาน %2$s",
"Export": "ส่งà¸à¸à¸",
"ExportAsImage": "ส่งà¸à¸à¸à¹€à¸›à¹‡à¸™à¸£à¸¹à¸›à¸ าพ",
"ExportThisReport": "ส่งà¸à¸à¸à¸£à¸²à¸¢à¸‡à¸²à¸™à¹ƒà¸™à¸£à¸¹à¸›à¹à¸šà¸šà¸à¸·à¹ˆà¸™",
@@ -162,7 +160,7 @@
"Locale": "th_TH.UTF-8",
"Logout": "à¸à¸à¸à¸ˆà¸²à¸à¸£à¸°à¸šà¸š",
"MainMetrics": "ตัวชี้วัดหลัà¸",
- "MediumToHighTrafficItIsRecommendedTo": "สำหรับขนาดà¸à¸¥à¸²à¸‡à¹„ปยังเว็บไซต์à¸à¸²à¸£à¸ˆà¸£à¸²à¸ˆà¸£à¸—ี่สูง เราขà¸à¹à¸™à¸°à¸™à¸³à¹ƒà¸™à¸à¸²à¸£à¸›à¸£à¸°à¸¡à¸§à¸¥à¸œà¸¥à¸£à¸²à¸¢à¸‡à¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸§à¸±à¸™à¸™à¸µà¹‰ โดยส่วนใหà¸à¹ˆà¸ˆà¸°à¹€à¸›à¹‡à¸™à¸—ุà¸à¸„รึ่งชั่วโมง (%s วินาที) หรืà¸à¸—ุà¸à¸Šà¸±à¹ˆà¸§à¹‚มง (%s วินาที)",
+ "MediumToHighTrafficItIsRecommendedTo": "สำหรับขนาดà¸à¸¥à¸²à¸‡à¹„ปยังเว็บไซต์à¸à¸²à¸£à¸ˆà¸£à¸²à¸ˆà¸£à¸—ี่สูง เราขà¸à¹à¸™à¸°à¸™à¸³à¹ƒà¸™à¸à¸²à¸£à¸›à¸£à¸°à¸¡à¸§à¸¥à¸œà¸¥à¸£à¸²à¸¢à¸‡à¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸§à¸±à¸™à¸™à¸µà¹‰ โดยส่วนใหà¸à¹ˆà¸ˆà¸°à¹€à¸›à¹‡à¸™à¸—ุà¸à¸„รึ่งชั่วโมง (%1$s วินาที) หรืà¸à¸—ุà¸à¸Šà¸±à¹ˆà¸§à¹‚มง (%2$s วินาที)",
"Metadata": "เมตาดาต้า",
"Metric": "ตัวชี้วัด",
"Metrics": "ตัวชี้วัด",
@@ -197,13 +195,13 @@
"OnlyUsedIfUserPwdIsSet": "ถ้าใช้เฉพาะรูปà¹à¸šà¸šà¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰\/รหัสผ่านถูà¸à¸•à¸±à¹‰à¸‡à¸„่า ควรจะขà¸à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸«à¹‰à¸šà¸£à¸´à¸à¸²à¸£à¸‚à¸à¸‡à¸„ุณหาà¸à¹ƒà¸™à¸à¸£à¸“ีที่คุณไม่à¹à¸™à¹ˆà¹ƒà¸ˆà¸§à¹ˆà¸²à¸§à¸´à¸˜à¸µà¸—ี่จะใช้นี้",
"OpenSourceWebAnalytics": "สคริปต์วิเคราะห์เว็บไซต์ด้วยซà¸à¸£à¹Œà¸Ÿà¹à¸§à¸£à¹Œà¹€à¸ªà¸£à¸µ",
"OptionalSmtpPort": "ตัวเลืà¸à¸à¹€à¸ªà¸£à¸´à¸¡ ค่าเริ่มต้นถึง 25 สำหรับà¸à¸²à¸£à¹€à¸‚้ารหัสà¹à¸¥à¸° TLS SMTP, à¹à¸¥à¸° 465 สำหรับ SSL SMTP",
- "OrCancel": "หรืภ%s ยà¸à¹€à¸¥à¸´à¸ %s",
+ "OrCancel": "หรืภ%1$s ยà¸à¹€à¸¥à¸´à¸ %2$s",
"Others": "à¸à¸·à¹ˆà¸™à¹†",
"Outlink": "Outlink",
"Outlinks": "ลิงค์à¸à¸à¸",
"Overview": "ภาพรวม",
"Pages": "หน้า",
- "ParameterMustIntegerBetween": "พารามิเตà¸à¸£à¹Œ %s จะต้à¸à¸‡à¹€à¸›à¹‡à¸™à¸„่าจำนวนเต็มระหว่าง %s à¹à¸¥à¸° %s",
+ "ParameterMustIntegerBetween": "พารามิเตà¸à¸£à¹Œ %1$s จะต้à¸à¸‡à¹€à¸›à¹‡à¸™à¸„่าจำนวนเต็มระหว่าง %2$s à¹à¸¥à¸° %3$s",
"Password": "รหัสผ่าน",
"Period": "ช่วงเวลา",
"Piechart": "à¸à¸£à¸²à¸Ÿà¸§à¸‡à¸à¸¥à¸¡",
@@ -238,7 +236,7 @@
"Save": "บันทึà¸",
"SaveImageOnYourComputer": "เพื่à¸à¸šà¸±à¸™à¸—ึà¸à¸£à¸¹à¸›à¸ าพลงบนคà¸à¸¡à¸žà¸´à¸§à¹€à¸•à¸à¸£à¹Œà¸‚à¸à¸‡à¸„ุณ, คลิà¸à¸‚วาที่รูปภาพà¹à¸¥à¹‰à¸§à¹€à¸¥à¸·à¸à¸ \"บันทึà¸à¸ าพเป็น...\"",
"Search": "ค้นหา",
- "SeeTheOfficialDocumentationForMoreInformation": "สำหรับข้à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡ ให้ดู %s เà¸à¸à¸ªà¸²à¸£à¸à¸¢à¹ˆà¸²à¸‡à¹€à¸›à¹‡à¸™à¸—างà¸à¸²à¸£ %s",
+ "SeeTheOfficialDocumentationForMoreInformation": "สำหรับข้à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡ ให้ดู %1$s เà¸à¸à¸ªà¸²à¸£à¸à¸¢à¹ˆà¸²à¸‡à¹€à¸›à¹‡à¸™à¸—างà¸à¸²à¸£ %2$s",
"SelectYesIfYouWantToSendEmailsViaServer": "เมื่à¸à¹€à¸¥à¸·à¸à¸ \"ใช่\" ถ้าหาà¸à¸„ุณต้à¸à¸‡à¸à¸²à¸£à¸«à¸£à¸·à¸à¸¡à¸µà¸à¸²à¸£à¸ªà¹ˆà¸‡à¸à¸µà¹€à¸¡à¸¥à¹Œà¸œà¹ˆà¸²à¸™à¹€à¸™à¸¡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ ขà¸à¸‡à¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¹ˆà¸™à¸à¸²à¸£à¸ªà¹ˆà¸‡à¹€à¸¡à¸¥à¹Œà¸ ายใน",
"Settings": "ตั้งค่า",
"Shipping": "à¸à¸²à¸£à¸ˆà¸±à¸”ส่งสินค้า",
@@ -281,7 +279,7 @@
"Warning": "คำเตืà¸à¸™",
"WarningFileIntegrityNoManifest": "ไม่สามารถทำà¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸„วามสมบูรณ์ขà¸à¸‡à¹à¸Ÿà¹‰à¸¡à¹€à¸™à¸·à¹ˆà¸à¸‡à¸ˆà¸²à¸à¸à¸²à¸£à¸‚าดหายไปขà¸à¸‡à¹„ฟล์ manifest.inc.php",
"WarningFileIntegrityNoMd5file": "ตรวจสà¸à¸šà¸„วามสมบูรณ์ขà¸à¸‡à¹à¸Ÿà¹‰à¸¡à¸à¸²à¸ˆà¹„ม่เสร็จสมบูรณ์ เนื่à¸à¸‡à¸ˆà¸²à¸à¸à¸²à¸£à¸‚าดหายไปขà¸à¸‡à¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¹ˆà¸™ md5_file()",
- "WarningPasswordStored": "%sคำเตืà¸à¸™:%s รหัสผ่านนี้จะถูà¸à¹€à¸à¹‡à¸šà¹„ว้ในไฟล์ config ให้ทุà¸à¸„นมà¸à¸‡à¹€à¸«à¹‡à¸™à¸à¸¢à¹ˆà¸²à¸‡à¹„รà¸à¹‡à¸•à¸²à¸¡à¸„ุณสามารถเข้าถึงได้ดังà¸à¸¥à¹ˆà¸²à¸§à¸™à¸µà¹‰",
+ "WarningPasswordStored": "%1$sคำเตืà¸à¸™:%2$s รหัสผ่านนี้จะถูà¸à¹€à¸à¹‡à¸šà¹„ว้ในไฟล์ config ให้ทุà¸à¸„นมà¸à¸‡à¹€à¸«à¹‡à¸™à¸à¸¢à¹ˆà¸²à¸‡à¹„รà¸à¹‡à¸•à¸²à¸¡à¸„ุณสามารถเข้าถึงได้ดังà¸à¸¥à¹ˆà¸²à¸§à¸™à¸µà¹‰",
"Website": "เว็บไซต์",
"Weekly": "à¹à¸•à¹ˆà¸¥à¸°à¸ªà¸±à¸›à¸”าห์",
"WeeklyReports": "รายงาน รายà¸à¸²à¸—ิตย์",
@@ -323,7 +321,7 @@
},
"RowEvolution": {
"CompareRows": "เปรียบเทียบเรคคà¸à¸£à¹Œà¸”",
- "MetricBetweenText": "ระหว่าง %s à¹à¸¥à¸° %s",
+ "MetricBetweenText": "ระหว่าง %1$s à¹à¸¥à¸° %2$s",
"PickAnotherRow": "เลืà¸à¸à¹à¸–วà¸à¸·à¹ˆà¸™à¹†à¸—ี่ต้à¸à¸‡à¸à¸²à¸£à¹€à¸›à¸£à¸µà¸¢à¸šà¹€à¸—ียบ",
"PickARow": "เลืà¸à¸à¹à¸–วที่ต้à¸à¸‡à¸à¸²à¸£à¹€à¸›à¸£à¸µà¸¢à¸šà¹€à¸—ียบ"
}
diff --git a/lang/tl.json b/lang/tl.json
index cf93d000489df59b8ba2b1c61f3235df3614bbbb..006b1889f06bea87f5e2b75bf9a25a4b00c0f63c 100644
--- a/lang/tl.json
+++ b/lang/tl.json
@@ -11,7 +11,7 @@
"And": "at",
"API": "API",
"ArchivingInlineHelp": "Para sa katam-tamang dami ng traffic websites inirerekomenda na huwag paganahin ang Piwik-archive upang ma-trigger mula sa browser. Sa halip aming nirerekomenda na mag setup ng cron job upang i-proseso ang mga ulat kada oras.",
- "ArchivingTriggerDescription": "Inirerekomenda para sa mas malakihang pag-install ng Piwik kailangan mong %ssetup ang cron job%s upang awtomatikong iproseso ang mga ulat.",
+ "ArchivingTriggerDescription": "Inirerekomenda para sa mas malakihang pag-install ng Piwik kailangan mong %1$ssetup ang cron job%2$s upang awtomatikong iproseso ang mga ulat.",
"AuthenticationMethodSmtp": "Authentication method para sa SMTP",
"AverageOrderValue": "Average na Halaga ng Order",
"AveragePrice": "Pamantayang presyo",
@@ -23,10 +23,8 @@
"CannotUnzipFile": "Hindi ma-unzip ang file %1$s: %2$s",
"ChangePassword": "Baguhin ang password",
"ChangeTagCloudView": "Pakitandaan na maari mong tignan ang mga ulat sa ibat-ibang paraan bilang tag cloud. Upang magamit ito mangyaring gamitin ang mga kontrol na nasa ibaba ng ulat.",
- "ChooseDate": "Pumili ng petsa",
"ChooseLanguage": "pumili ng wika",
"ChoosePeriod": "Pumili ng panahon",
- "ChooseWebsite": "Pumili ng website",
"ClickHere": "Mag-click dito para sa karagdagang impormasyon.",
"ClickToChangePeriod": "I-click muli upang baguhin ang tagal ng period.",
"Close": "I-sara",
@@ -78,7 +76,7 @@
"ColumnViewedAfterSearchDocumentation": "Ang bilang ng numer na bumisita sa pahinang ito matapos maghanap sa iyong website at nag-click sa pahinang ito sa mga lumabas na resulta",
"ColumnVisitDuration": "Tagal ng pagbisita(sa segudon)",
"ColumnVisitsWithConversions": "Mga pagbisitang may mga Conversion",
- "ConfigFileIsNotWritable": "Ang Piwik configuration file %s ay hindi writable Ang iba sa iyong mga binago ay maaring hindi ma saved. %s Mangyaring baguhin ang permiso sa config upang maging writable ito.",
+ "ConfigFileIsNotWritable": "Ang Piwik configuration file %1$s ay hindi writable Ang iba sa iyong mga binago ay maaring hindi ma saved. %2$s Mangyaring baguhin ang permiso sa config upang maging writable ito.",
"Continue": "Ipagpatuloy",
"ContinueToPiwik": "Magpatuloy sa Piwik",
"CurrentMonth": "Kasalukuyang buwan",
@@ -125,26 +123,29 @@
"Edit": "I-edit",
"EncryptedSmtpTransport": "Ipasok ang kinakailangan na transport layer encryption na kinakailangan ng iyong SMTP server.",
"Error": "Mali",
- "ErrorRequest": "Oops? nagkaroon ng problema habang isinasagawa ang iyong request. Marahil may isang pansamantalang isyu sa server o marahil na iyong nirerequest ang ulat ng mga kasamang maraming data. Mangyaring subukan ito mul. Kung ang error na ito ay patuloy pa rin ng paulit-ulit mangyarin %s kontakin ang iyong Piwik admnistrator %s para sa mga tulong.",
+ "ErrorRequest": "Oops? nagkaroon ng problema habang isinasagawa ang iyong request. Marahil may isang pansamantalang isyu sa server o marahil na iyong nirerequest ang ulat ng mga kasamang maraming data. Mangyaring subukan ito mul. Kung ang error na ito ay patuloy pa rin ng paulit-ulit mangyarin %1$s kontakin ang iyong Piwik admnistrator %2$s para sa mga tulong.",
"EvolutionOverPeriod": "Ebolusyon sa paglipas ng panahon",
"ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Ang user ay kailangang maging alinman sa Super User o user '%s' mismo.",
"ExceptionFileIntegrity": "Nabigo ang integrity check: %s",
"ExceptionIncompatibleClientServerVersions": "Ang iyong %1$s bersyon ng client ay %2$s kung saan ay hindi tugma sa bersyon ng server %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Ang pinagsama-samang mga hindi wastong format '%s'. Subukan ang alinman sa mga sumusunod sa halip: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Ang pinagsama-samang mga hindi wastong format '%1$s'. Subukan ang alinman sa mga sumusunod sa halip: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Ngayon ang oras ng archive upang mabuhay ay dapat bilang ng segundo na higit pa sa zero",
- "ExceptionInvalidDateFormat": "Ang format ng petsa ay dapat na: %s o anumang keyword na suportado ng function na %s (tingnan ang %s para sa karagdagang impormasyon).",
- "ExceptionInvalidDateRange": "Ang petsa '%s' ay wala sa wastong hanay ng petsa. Dapat itong magkaroon ng mga sumusunod na format: %s.",
- "ExceptionInvalidPeriod": "Ang period ng '%s' ay hindi suportado. Sa halip ay subukan ang alinman sa mga sumusunod: %s",
- "ExceptionInvalidReportRendererFormat": "%s' ay hindi wastong format ng ulat. Sa halip ay subukan ang alinman sa mga sumusunod: %s.",
+ "ExceptionInvalidDateFormat": "Ang format ng petsa ay dapat na: %1$s o anumang keyword na suportado ng function na %2$s (tingnan ang %3$s para sa karagdagang impormasyon).",
+ "ExceptionInvalidDateRange": "Ang petsa '%1$s' ay wala sa wastong hanay ng petsa. Dapat itong magkaroon ng mga sumusunod na format: %2$s.",
+ "ExceptionInvalidPeriod": "Ang period ng '%1$s' ay hindi suportado. Sa halip ay subukan ang alinman sa mga sumusunod: %2$s",
+ "ExceptionInvalidRendererFormat": "'%1$s' ay hindi wastong format ng renderer. Sa halip ay subukan ang alinman sa mga sumusunod: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "'%1$s' ay hindi wastong format ng ulat. Sa halip ay subukan ang alinman sa mga sumusunod: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Ang uri ng Static graph '%1$s' ay hindi wasto. Sa halip ay subukan ang alinman sa mga sumusunod: %2$s.",
"ExceptionInvalidToken": "Token ay hindi wasto.",
"ExceptionLanguageFileNotFound": "Hindi nahanap ang file Wika na '%s'.",
+ "ExceptionMethodNotFound": "Ang module ng '%1$s' ay hindi nag-eexist o hindi available sa module '%2$s'.",
"ExceptionMissingFile": "Nawawalang file: %s",
"ExceptionNonceMismatch": "Hindi ma-verify ang security token sa form na ito.",
"ExceptionPrivilege": "Hindi mo maaaring i-access ang resource na ito dahil nangangailangan ito ng access ng %s.",
"ExceptionPrivilegeAtLeastOneWebsite": "Hindi mo maaaring i-access ang resources na ito dahil ito ay nangangailangan ng %s access na hindi bababa sa isa.",
"ExceptionUnableToStartSession": "Hindi masimulan ang session.",
"ExceptionUndeletableFile": "Hindi matanggal ang %s",
- "ExceptionUnreadableFileDisabledMethod": "Ang configuration file {%s} ay hindi mabasa. Maaring hindi pinagana ng iyong host ang %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Ang configuration file {%1$s} ay hindi mabasa. Maaring hindi pinagana ng iyong host ang %2$s.",
"ExceptionReportNotFound": "Wala pang ganitong ulat na iyong ni-rerequest.",
"ExceptionWidgetNotFound": "Wala pang ganitong widget na iyong ni-rerequest.",
"ExceptionReportNotEnabled": "Ang hinihiling na ulat ay hindi gumagana. Ibig sabihin nito na marahil ang plugin na nag sasagawa ng report ay hindi gumagana o kaya ikaw ay walang permiso upang ma-access ang report na ito.",
@@ -190,6 +191,7 @@
"Logout": "Mag-sign out",
"MainMetrics": "Pangunahing sukatan",
"Matches": "Matches",
+ "MediumToHighTrafficItIsRecommendedTo": "Para sa may katam-taman hanggang mataas na website traffic aming nirerekomenda na e-proseso ang ulat para sa ngayon araw o kada kalahating oras (%1$s segundo) o bawat oras (%2$s segundo)",
"Metadata": "Metadata",
"Metric": "Metrik",
"Metrics": "Mga Sukatan",
@@ -238,7 +240,7 @@
"OperationNotEquals": "hindi katumbas",
"OptionalSmtpPort": "Opsyonal. Ang mga default sa 25 ay para sa hindi na-encrypt at TLS SMTP at 465 para sa SSL SMTP.",
"Options": "Mga Pagpipilian",
- "OrCancel": "o %s Kanselahin ang %s",
+ "OrCancel": "o %1$s Kanselahin ang %2$s",
"Others": "Iba",
"Outlink": "Outlink",
"Outlinks": "Mga Outlink",
@@ -246,8 +248,8 @@
"OverlayRowActionTooltipTitle": "Buksan ang Overlay ng Pahina",
"Overview": "Overview",
"Pages": "pahina",
- "Pagination": "%s - %s ng %s",
- "ParameterMustIntegerBetween": "Ang parameter %s ay dapat na isang integer value sa pagitan ng %s at %s.",
+ "Pagination": "%1$s - %2$s ng %3$s",
+ "ParameterMustIntegerBetween": "Ang parameter %1$s ay dapat na isang integer value sa pagitan ng %2$s at %3$s.",
"Password": "Password",
"Period": "Panahon",
"Piechart": "Piechart",
@@ -292,7 +294,7 @@
"Clear": "Klaro",
"SearchNoResults": "Walang mga resulta",
"SeeAll": "tingnan lahat",
- "SeeTheOfficialDocumentationForMoreInformation": "Tingan ang %s opisyal na dokumentasyon %s para sa karagdagang impormasyon.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Tingan ang %1$s opisyal na dokumentasyon %2$s para sa karagdagang impormasyon.",
"SeeThisFaq": "Tingnan ang %1$s this faq %2$s.",
"Segment": "Bahagi",
"SelectYesIfYouWantToSendEmailsViaServer": "Piliin ang \"Oo\" kung gusto mo o magpadala ng e-mail sa pamamagitan ng isang server sa halip na ang mga lokal na mail function.",
@@ -339,7 +341,7 @@
"MultiChartLabel": "Ipakita ang sparklines",
"NavigationBack": "Balik",
"NetworkError": "Error sa Network",
- "NetworkErrorWithStatusCode": "Nagkaroon ng error \"%s\". Ang iyong request ay bumalik na may kasamang status \"%s\". URL ay \"%s\". Mangyaring suriin ang ipinasok na URL at ang mga nakalagay na error sa server na ito upang makakita pa ng higit pang impormasyon tungkol sa error at paanu ito malulutas.",
+ "NetworkErrorWithStatusCode": "Nagkaroon ng error \"%1$s\". Ang iyong request ay bumalik na may kasamang status \"%2$s\". URL ay \"%3$s\". Mangyaring suriin ang ipinasok na URL at ang mga nakalagay na error sa server na ito upang makakita pa ng higit pang impormasyon tungkol sa error at paanu ito malulutas.",
"NetworkErrorWithStatusCodeShort": "Network Error sa %s",
"NetworkNotReachable": "Hindi maabot ang network",
"NoAccountIsSelected": "Kailangan mong pumili ng isang account. Magdagdag ng isang bagong account kung hindi ka pa nakaka pag configure ng kahit na isa.",
@@ -357,7 +359,7 @@
"RatingDontRemindMe": "Huwag ipaalala sa akin",
"RatingNotNow": "Hindi ngayon",
"RatingNow": "OK I-rarate ko na ito ngayon",
- "RatingPleaseRateUs": "Ang Piwik Mobile App ay Libreng Software kami ay lubos na nagagalak sa pag-gugul ng 1 minuto upang e-rate ang na to sa %s. Kung meroon kayong suhesyon sa mga bagong features o di kaya may mga nakitang bug mangyaring makipag-ugnayan sa %s",
+ "RatingPleaseRateUs": "Ang Piwik Mobile App ay Libreng Software kami ay lubos na nagagalak sa pag-gugul ng 1 minuto upang e-rate ang na to sa %1$s. Kung meroon kayong suhesyon sa mga bagong features o di kaya may mga nakitang bug mangyaring makipag-ugnayan sa %2$s",
"ReleaseToRefresh": "I-release upang i-refresh ...",
"Reloading": "Muling pag-load ...",
"RequestTimedOutShort": "Network Timeout Error",
@@ -382,7 +384,7 @@
"CompareRows": "Ihambing ang mga talaan",
"ComparingRecords": "Paghahambing ng %s mga row",
"Documentation": "I-click ang sukatan upang ipakita ang mga ito sa malaking graph. Gamitin ang shift-click upang ipakita ang maramihang mga sukatan nang sabay-sabay.",
- "MetricBetweenText": "mula %s sa %s",
+ "MetricBetweenText": "mula %1$s sa %2$s",
"MetricChangeText": "pagbabago ng %s sa paglipas ng panahon",
"MetricMinMax": "%1$s ay nasa pagitan ng %2$s at %3$s sa paglipas ng panahon",
"MetricsFor": "Mga sukatan para sa %s",
diff --git a/lang/tr.json b/lang/tr.json
index 93fdace4ae2d11a36c4dcd9817a73cb1fd4d7591..14a9bdb103bbf6e37487aac2786aed693ec126ed 100644
--- a/lang/tr.json
+++ b/lang/tr.json
@@ -20,10 +20,8 @@
"Cancel": "Ä°ptal",
"CannotUnzipFile": "Zip'den çıkarılamıyor %1$s: %2$s",
"ChangePassword": "Åžifre deÄŸiÅŸtir",
- "ChooseDate": "Tarih Seçimi",
"ChooseLanguage": "Dil seçin",
"ChoosePeriod": "Zaman aralığı seçin",
- "ChooseWebsite": "Web sayfası seçin",
"ClickHere": "Daha fazla bilgi için buraya tıklayın.",
"ClickToChangePeriod": "Aralığı değiştirmek için tekrar tıklayın.",
"Close": "Kapat",
@@ -34,7 +32,7 @@
"ColumnAvgTimeOnSiteDocumentation": "Bir ziyaretin ortalama süresi.",
"ColumnBounceRate": "Hemen çıkma oranı",
"ColumnBounces": "Sıçramalar",
- "ColumnConversionRate": "DÖnüşüm Oranı",
+ "ColumnConversionRate": "Dönüşüm Oranı",
"ColumnDestinationPage": "Hedef Sayfa",
"ColumnEntrances": "GiriÅŸler",
"ColumnEntrancesDocumentation": "Bu sayfadan başlayan ziyaret sayısı",
@@ -77,7 +75,7 @@
"Date": "Tarih",
"DateRange": "Tarih aralığı:",
"DateRangeFrom": "Buradan",
- "DateRangeFromTo": "%s tarihinden %s tarihine",
+ "DateRangeFromTo": "%1$s tarihinden %2$s tarihine",
"DateRangeTo": "Buraya",
"DaysHours": "%1$s gün %2$s saat",
"DaysSinceFirstVisit": "İlk ziyaretten bu yana geçen gün",
@@ -107,7 +105,7 @@
"ExceptionFileIntegrity": "Bütünlük kontrolü başarısız: %s",
"ExceptionFilesizeMismatch": "Dosya boyutu uyumsuz: %1$s (beklenen uzunluk: %2$s, bulundu: %3$s)",
"ExceptionIncompatibleClientServerVersions": "%1$s istemci versiyonunuz %2$s. Ancak bu versiyon %3$s sunucu versiyonu ile uyumlu deÄŸildir.",
- "ExceptionInvalidDateRange": "'%s' Tarih aralığı geçerli değildir. Aşağidaki format gibi olmalıdır: %s.",
+ "ExceptionInvalidDateRange": "'%1$s' Tarih aralığı geçerli değildir. Aşağidaki format gibi olmalıdır: %2$s.",
"ExceptionInvalidToken": "Güvenlik jetonu geçerli değil.",
"ExceptionLanguageFileNotFound": "'%s' dil dosyası bulunamadı.",
"ExceptionMissingFile": "Kayıp dosya: %s",
@@ -116,7 +114,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Bu kaynak en az bir web sitesi için %s erişimi gerektirdiğinden erişiminize izin verilmemektedir.",
"ExceptionUnableToStartSession": "Oturum başlatılamadı.",
"ExceptionUndeletableFile": "%s silinemedi",
- "ExceptionUnreadableFileDisabledMethod": "Yapılandırma dosyası {%s} okunamadı. Sitenizi barındıran servis %s özelliğini devre dışı bırakmış olabilir.",
+ "ExceptionUnreadableFileDisabledMethod": "Yapılandırma dosyası {%1$s} okunamadı. Sitenizi barındıran servis %2$s özelliğini devre dışı bırakmış olabilir.",
"Export": "Dışa aktar",
"ExportAsImage": "Resim olarak dışa aktar",
"ExportThisReport": "Bu veri setini diğer formatlarda ihraç et",
@@ -156,7 +154,7 @@
"Logout": "Oturumu Kapat",
"MainMetrics": "Ana ölçümler",
"Matches": "EÅŸleÅŸmeler",
- "MediumToHighTrafficItIsRecommendedTo": "Orta ve büyük ölçekli sitelerin raporlarını bugün için yarım saatte bir (%s saniye) veya saatte bir (%s saniye) işlemelerini öneririz.",
+ "MediumToHighTrafficItIsRecommendedTo": "Orta ve büyük ölçekli sitelerin raporlarını bugün için yarım saatte bir (%1$s saniye) veya saatte bir (%2$s saniye) işlemelerini öneririz.",
"Metadata": "Meta verisi",
"Metric": "Metrik",
"Metrics": "Metrikler",
@@ -183,6 +181,7 @@
"NotDefined": "%s tanımlı değil",
"Note": "Not",
"NotInstalled": "Yüklenmedi",
+ "NotRecommended": "tavsiye edilmez",
"NotValid": "%s geçerli değil",
"NumberOfVisits": "Ziyaret sayısı",
"NVisits": "%s ziyaret",
@@ -200,14 +199,15 @@
"OperationNotEquals": "EÅŸit DeÄŸil",
"OptionalSmtpPort": "İsteğe bağlıdır. Şifresiz 25 için TLS SMTP ve güvenli bağlantı için SSL SMTP 465",
"Options": "Seçenekler",
- "OrCancel": "veya %s Ä°ptal %s",
+ "Or": "yada",
+ "OrCancel": "veya %1$s Ä°ptal %2$s",
"Others": "DiÄŸerleri",
"Outlink": "Dış link",
"Outlinks": "Dış Bağlantılar",
"OverlayRowActionTooltip": "İstatistik verilerini direkt site üzerinde gör (yeni sekmede açılır)",
"Overview": "Genel Bakış",
"Pages": "Sayfalar",
- "ParameterMustIntegerBetween": "%s değeri %s ve %s arasında sayısal bir değer olmalıdır.",
+ "ParameterMustIntegerBetween": "%1$s değeri %2$s ve %3$s arasında sayısal bir değer olmalıdır.",
"Password": "Åžifre",
"Period": "Zaman aralığı",
"Piechart": "Pasta grafik",
@@ -225,6 +225,7 @@
"ProductRevenue": "Ürün Kazancı",
"PurchasedProducts": "Satın Alınan Ürünler",
"Quantity": "Miktar",
+ "Recommended": "Önerilen",
"Refresh": "Yenile",
"RefreshPage": "Sayfayı yenile",
"RelatedReport": "Ä°lgili rapor",
@@ -263,9 +264,11 @@
"TimeOnPage": "Sayfadaki süre",
"Total": "Toplam",
"TotalRevenue": "Toplam Kazanç",
- "TotalVisitsPageviewsActionsRevenue": "(Toplam: %s ziyaretçiler, %s sayfa görüntülemeler, %s aksiyonlar, %s geliri)",
+ "TotalVisitsPageviewsActionsRevenue": "(Toplam: %1$s ziyaretçiler, %2$s sayfa görüntülemeler, %3$s aksiyonlar, %4$s geliri)",
+ "TrackingScopePage": "Sayfa",
+ "TrackingScopeVisit": "Ziyaret",
"TransitionsRowActionTooltipTitle": "Açık Geçişler",
- "TranslatorName": "Fabian Becker, Emre Yazici, Emre Saraçoğlu, <a href=\"http:\/\/www.ugureskici.com\">Uğur Eskici<\/a>",
+ "TranslatorName": "Fabian Becker, Emre Yazici, Emre Saraçoğlu, <a href=\"http:\/\/www.ugureskici.com\">Uğur Eskici<\/a>, <a href=\"http:\/\/www.umutarcn.com\">Umut ARICAN<\/a>",
"UniquePurchases": "Tekil Satın Alımlar",
"Unknown": "Bilinmeyen",
"Upload": "Yükle",
@@ -316,6 +319,7 @@
"DefaultReportDate": "Rapor tarihi",
"HowtoDeleteAnAccount": "Bir hesabı silmek için uzun basın.",
"HowtoDeleteAnAccountOniOS": "Bir hesabı silmek için sağdan sola kaydırın.",
+ "HowtoLoginAnonymous": "Anonim giriş yapmak için kullanıcı adı ve şifre kısmını boş bırakın",
"HttpTimeout": "HTTP Zamanaşımı",
"LastUpdated": "Son Güncelleme: %s",
"LoadingReport": "Yükleniyor %s",
@@ -337,6 +341,7 @@
"RequestTimedOutShort": "Ağ Zamanaşımı Hatası",
"ShowAll": "Tümünü göster",
"TryIt": "Dene!",
+ "VerifyAccount": "Hesap DoÄŸrulama",
"YouAreOffline": "Üzgünüm, şu anda çevrimdışısınız"
},
"RowEvolution": {
@@ -344,7 +349,7 @@
"CompareDocumentation": "Aşağıdaki bağlantıyı tıklayın ve birden çok kaydı karşılaştırmak için aynı tablodan başka bir satır için bu pencereyi açın<br \/>Bu pencereyi açmadan satırı karşılaştırma için işaretlemek istiyorsanız Üst Karakter tuşuna basarak tıklayın.",
"CompareRows": "Kayıtları karşılaştır",
"ComparingRecords": "%s satır karşılaştırılıyor",
- "MetricBetweenText": "%s - %s arası",
+ "MetricBetweenText": "%1$s - %2$s arası",
"MetricsFor": "%s için ölçümler"
}
}
\ No newline at end of file
diff --git a/lang/uk.json b/lang/uk.json
index 519aad1ad4dc598d679c9c9d3855331f1374c7fc..d2bca479d4197104be15af5854805cbb3d07a08a 100644
--- a/lang/uk.json
+++ b/lang/uk.json
@@ -6,14 +6,12 @@
"AllWebsitesDashboard": "Панель ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð²ÑÑ–Ñ… Ñайтів",
"API": "API",
"ArchivingInlineHelp": "Ð”Ð»Ñ Ð²ÐµÐ±-Ñайтів з Ñереднім та виÑоким трафіком рекомендуєтьÑÑ Ð²Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ можливіÑÑ‚ÑŒ запуÑку Piwik при переглÑді браузером. Ð’ такому випадку рекомендуєтьÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ планувальних завдань (cron job) та генерувати звіти що години.",
- "ArchivingTriggerDescription": "Ð”Ð»Ñ Ð²ÐµÐ»Ð¸ÐºÐ¸Ñ… інÑталÑцій Piwik рекомендуєтьÑÑ %sналаштувати планувальних завдань (cron job)%s щоб оброблÑти звіти автоматизовано.",
+ "ArchivingTriggerDescription": "Ð”Ð»Ñ Ð²ÐµÐ»Ð¸ÐºÐ¸Ñ… інÑталÑцій Piwik рекомендуєтьÑÑ %1$sналаштувати планувальних завдань (cron job)%2$s щоб оброблÑти звіти автоматизовано.",
"AuthenticationMethodSmtp": "Метод аутентифікації на SMTP Ñервері",
"BackToPiwik": "ПовернутиÑÑ Ð´Ð¾ Piwik",
"ChangePassword": "Змінити пароль",
- "ChooseDate": "Виберіть дату",
"ChooseLanguage": "Виберіть мову",
"ChoosePeriod": "Виберіть період",
- "ChooseWebsite": "Виберіть веб-Ñайт",
"Close": "Закрити",
"ColumnActionsPerVisit": "Дій на кожне відвідуваннÑ",
"ColumnAverageTimeOnPage": "Середній Ñ‡Ð°Ñ Ð½Ð° Ñтор.",
@@ -38,7 +36,7 @@
"ColumnUniquePageviews": "Унікальних переглÑдів Ñторінок",
"ColumnValuePerVisit": "ЦінніÑÑ‚ÑŒ на відвідуваннÑ",
"ColumnVisitsWithConversions": "Ð’Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð· конвертаціÑми",
- "ConfigFileIsNotWritable": "Файл конфігурації Piwik %s захищений від запиÑу, деÑкі зміни можуть бути не збережені. %s Змініть права доÑтупу до файла конфігурації щоб дозволити запиÑ.",
+ "ConfigFileIsNotWritable": "Файл конфігурації Piwik %1$s захищений від запиÑу, деÑкі зміни можуть бути не збережені. %2$s Змініть права доÑтупу до файла конфігурації щоб дозволити запиÑ.",
"ContinueToPiwik": "Перейти далі до Piwik",
"CurrentMonth": "Поточний міÑÑць",
"CurrentWeek": "Поточний тиждень",
@@ -70,20 +68,20 @@
"ExceptionFilesizeMismatch": "Розмір файлу відрізнÑєтьÑÑ: %1$s (очікувана довжина: %2$s, знайдено: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Ваша верÑÑ–Ñ ÐºÐ»Ñ–Ñ”Ð½Ñ‚Ð° %1$s Ñ” %2$s що неÑуміÑно з верÑією Ñервера %3$s.",
"ExceptionInvalidArchiveTimeToLive": "Ð§Ð°Ñ Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ— Ñьогоднішнього архіву має бути чиÑлом більшим від нулÑ.",
- "ExceptionInvalidDateFormat": "Формат дати: %s або текÑÑ‚ що підтримуєтьÑÑ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ”ÑŽ %s (див. %s Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÑŒÐ½Ñ–ÑˆÐ¾Ñ— інформації)",
- "ExceptionInvalidDateRange": "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ '%s' задає неправильний діапізон дат. Повинен викориÑтовуватиÑÑ Ð½Ð°Ñтупний формат: %s.",
- "ExceptionInvalidPeriod": "Період '%s' не підтримуєтьÑÑ. Спробуйте натоміÑÑ‚ÑŒ один з таких варіантів: %s.",
- "ExceptionInvalidRendererFormat": "Формат відображувача '%s' неправильний. Спробуйте натоміÑÑ‚ÑŒ один з таких варіантів: %s.",
+ "ExceptionInvalidDateFormat": "Формат дати: %1$s або текÑÑ‚ що підтримуєтьÑÑ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ”ÑŽ %2$s (див. %3$s Ð´Ð»Ñ Ð´ÐµÑ‚Ð°Ð»ÑŒÐ½Ñ–ÑˆÐ¾Ñ— інформації)",
+ "ExceptionInvalidDateRange": "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ '%1$s' задає неправильний діапізон дат. Повинен викориÑтовуватиÑÑ Ð½Ð°Ñтупний формат: %2$s.",
+ "ExceptionInvalidPeriod": "Період '%1$s' не підтримуєтьÑÑ. Спробуйте натоміÑÑ‚ÑŒ один з таких варіантів: %2$s.",
+ "ExceptionInvalidRendererFormat": "Формат відображувача '%1$s' неправильний. Спробуйте натоміÑÑ‚ÑŒ один з таких варіантів: %2$s.",
"ExceptionInvalidToken": "Маркер невірний.",
"ExceptionLanguageFileNotFound": "Файл мови '%s' не знайдено.",
- "ExceptionMethodNotFound": "Метод '%s' не Ñ–Ñнує або не доÑтупний у модулі '%s'.",
+ "ExceptionMethodNotFound": "Метод '%1$s' не Ñ–Ñнує або не доÑтупний у модулі '%2$s'.",
"ExceptionMissingFile": "ВідÑутній файл: %s",
"ExceptionNonceMismatch": "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚Ð¸ маркер безпеки Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— форми.",
"ExceptionPrivilege": "Ðеможливо отримати доÑтуп до даного реÑурÑу так Ñк треба мати доÑтуп на %s.",
"ExceptionPrivilegeAccessWebsite": "Ðеможливо отримати доÑтуп до даного реÑурÑу так Ñк треба мати доÑтуп на %s Ð´Ð»Ñ Ñайту з ідентифікатором %d",
"ExceptionPrivilegeAtLeastOneWebsite": "Ðеможливо отримати доÑтуп до даного реÑурÑу так Ñк треба мати доÑтуп на %s Ñк мінімум до одного Ñайту.",
"ExceptionUndeletableFile": "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ %s",
- "ExceptionUnreadableFileDisabledMethod": "Ðеможливо прочитати файл конфігурації {%s}. Ваш хоÑтинг можливо закрив доÑтуп %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Ðеможливо прочитати файл конфігурації {%1$s}. Ваш хоÑтинг можливо закрив доÑтуп %2$s.",
"Export": "ЕкÑпорт",
"ExportAsImage": "ЕкÑпортувати Ñк зображеннÑ",
"ExportThisReport": "ЕкÑпортувати цей набір даних в інші формати",
@@ -103,7 +101,7 @@
"LoadingData": "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ…...",
"Locale": "uk_UA.UTF-8",
"Logout": "Вийти",
- "MediumToHighTrafficItIsRecommendedTo": "Ð”Ð»Ñ Ð²ÐµÐ±-Ñайтів з Ñереднім та виÑоким трафіком рекомендуєтьÑÑ Ð¾Ð±Ñ€Ð¾Ð±Ð»Ñти звіти за поточний день не чаÑтіше ніж кожні пів години (%s Ñекунд) або що години (%s Ñекунд).",
+ "MediumToHighTrafficItIsRecommendedTo": "Ð”Ð»Ñ Ð²ÐµÐ±-Ñайтів з Ñереднім та виÑоким трафіком рекомендуєтьÑÑ Ð¾Ð±Ñ€Ð¾Ð±Ð»Ñти звіти за поточний день не чаÑтіше ніж кожні пів години (%1$s Ñекунд) або що години (%2$s Ñекунд).",
"MinutesSeconds": "%1$s хв. %2$s Ñек.",
"Monthly": "по міÑÑцÑÑ…",
"MultiSitesSummary": "Ð’ÑÑ– Ñайти",
@@ -122,7 +120,7 @@
"OnlyUsedIfUserPwdIsSet": "ВикориÑтовуєтьÑÑ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ñкщо задано логін\/пароль, запитайте адмініÑтратора хоÑтингу Ñкщо не впевнені Ñкий метод вибрати.",
"OpenSourceWebAnalytics": "Open Source Веб-аналітика",
"OptionalSmtpPort": "Ðе обовÑзково. Типово 25 Ð´Ð»Ñ Ð½ÐµÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¾Ñ— Ñ– TLS SMTP та 465 Ð´Ð»Ñ SSL SMTP.",
- "OrCancel": "або %s СкаÑувати %s",
+ "OrCancel": "або %1$s СкаÑувати %2$s",
"Others": "Інші",
"Outlinks": "Зовнішні поÑиланнÑ",
"Overview": "ОглÑд",
@@ -145,7 +143,7 @@
"Save": "Зберегти",
"SaveImageOnYourComputer": "Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾ щоб зберегти Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ð¿ÑŽÑ‚ÐµÑ€Ñ–, клацнути правою кнопкою на зображенні та вибрати \"Зберегти Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ñк...\"",
"Search": "Пошук",
- "SeeTheOfficialDocumentationForMoreInformation": "ПереглÑньте %sофіційну документацію%s щоб отримати більше інформації.",
+ "SeeTheOfficialDocumentationForMoreInformation": "ПереглÑньте %1$sофіційну документацію%2$s щоб отримати більше інформації.",
"SelectYesIfYouWantToSendEmailsViaServer": "Виберіть \"Так\" Ñкщо ви хочете надÑилати е-майли через SMTP а не локальною поштовою функцією.",
"Settings": "ÐалаштуваннÑ",
"SmallTrafficYouCanLeaveDefault": "Ð”Ð»Ñ Ð²ÐµÐ±-Ñайтів з малим Ð½Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾ трафіку, можна залишити типові %s Ñекунд, та матидоÑтуп до звітів в реальному чаÑÑ–.",
@@ -169,7 +167,7 @@
"Warning": "ЗаÑтереженнÑ",
"WarningFileIntegrityNoManifest": "Перевірка ціліÑноÑÑ‚Ñ– файлу не може бути виконана через відÑутніÑÑ‚ÑŒ manifest.inc.php",
"WarningFileIntegrityNoMd5file": "Перевірка ціліÑноÑÑ‚Ñ– файлу не може бути виконана через відÑутніÑÑ‚ÑŒ функції md5_file().",
- "WarningPasswordStored": "%sЗаÑтереженнÑ:%s Цей пароль буде зберігатиÑÑ Ð² файлі конфігурації та буде видимий Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ хто має доÑтуп до файлової ÑиÑтеми.",
+ "WarningPasswordStored": "%1$sЗаÑтереженнÑ:%2$s Цей пароль буде зберігатиÑÑ Ð² файлі конфігурації та буде видимий Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ хто має доÑтуп до файлової ÑиÑтеми.",
"Website": "Веб-Ñайт",
"Weekly": "по тижнÑÑ…",
"Widgets": "Віджет",
diff --git a/lang/vi.json b/lang/vi.json
index 351db49c3cb9b39957abcbca36d8f5f90dcd832e..87f3b070148e7370bfcafdfac1c053d5f47bef76 100644
--- a/lang/vi.json
+++ b/lang/vi.json
@@ -12,7 +12,7 @@
"And": "và ",
"API": "API",
"ArchivingInlineHelp": "Äối vá»›i những trang web có mức Ä‘á»™ truy cáºp trung bình và cao, chúng tôi khuyến cáo bạn bá» chế Ä‘á»™ cáºp nháºt lên Piwik dá»±a và o trigger phÃa trình duyệt. Thay và o đó, bạn nên thiết láºp lịch cho Piwik tá»± xá» lý báo cáo sau má»—i giỠđồng hồ (để tránh quá tải server).",
- "ArchivingTriggerDescription": "Äá» nghị cho cà i đặt Piwik lá»›n hÆ¡n, bạn cần phải %s thiết láºp má»™t cron %s để xá» lý các báo cáo tá»± Ä‘á»™ng.",
+ "ArchivingTriggerDescription": "Äá» nghị cho cà i đặt Piwik lá»›n hÆ¡n, bạn cần phải %1$s thiết láºp má»™t cron %2$s để xá» lý các báo cáo tá»± Ä‘á»™ng.",
"AuthenticationMethodSmtp": "Phương thức xác thực SMTP",
"AverageOrderValue": "TÃnh trung bình giá trị Ä‘Æ¡n hà ng",
"AveragePrice": "Giá trung bình",
@@ -24,10 +24,8 @@
"CannotUnzipFile": "Không thể giải nén file %1$s: %2$s",
"ChangePassword": "Thay đổi máºt khẩu",
"ChangeTagCloudView": "Xin lÆ°u ý, bạn có thể xem báo cáo theo những cách khác nhÆ° là má»™t Tag Cloud. Sá» dụng các Ä‘iá»u khiển ở dÆ°á»›i cùng của báo cáo để là m nhÆ° váºy.",
- "ChooseDate": "Chá»n ngà y",
"ChooseLanguage": "Chá»n ngôn ngữ",
"ChoosePeriod": "Chá»n khoảng thá»i gian",
- "ChooseWebsite": "Chá»n website",
"ClickHere": "Click và o đây để tìm hiểu thêm",
"ClickToChangePeriod": "Click lần nữa để thay đổi khoảng thá»i gian",
"Close": "Äóng",
@@ -80,7 +78,7 @@
"ColumnViewedAfterSearchDocumentation": "Số lần trang nà y được truy cáºp sau khi má»™t ngÆ°á»i dùng thá»±c hiện tìm kiếm trên trang web của bạn và nhấn và o trang web nà y trong kết quả tìm kiếm.",
"ColumnVisitDuration": "Thá»i gian truy cáºp(tÃnh bằng giây)",
"ColumnVisitsWithConversions": "Các lượt truy cáºp có sá»± chuyển đổi",
- "ConfigFileIsNotWritable": "Táºp tin cấu hình Piwik %s không ghi, má»™t số thay đổi của bạn có thể không được lÆ°u. %s Hãy cho phép thay đổi các táºp tin cấu hình để là m cho nó có thể ghi",
+ "ConfigFileIsNotWritable": "Táºp tin cấu hình Piwik %1$s không ghi, má»™t số thay đổi của bạn có thể không được lÆ°u. %2$s Hãy cho phép thay đổi các táºp tin cấu hình để là m cho nó có thể ghi",
"Continue": "Tiếp tục",
"ContinueToPiwik": "Tiếp tục Piwik",
"CurrentMonth": "Tháng nà y",
@@ -96,7 +94,7 @@
"Date": "Ngà y",
"DateRange": "Thá»i gian:",
"DateRangeFrom": "Từ",
- "DateRangeFromTo": "Từ %s đến %s",
+ "DateRangeFromTo": "Từ %1$s đến %2$s",
"DateRangeTo": "Äến",
"DaysHours": "%1$s ngà y %2$s giá»",
"DaysSinceFirstVisit": "Số ngà y từ lần ghé thăm đầu tiên",
@@ -135,17 +133,17 @@
"ExceptionFileIntegrity": "Kiểm tra tÃnh toà n vẹn không thà nh công: %s",
"ExceptionFilesizeMismatch": "KÃch thÆ°á»›c táºp tin không phù hợp: %1$s (​​chiá»u dà i dá»± kiến: %2$s, được tìm thấy: %3$s)",
"ExceptionIncompatibleClientServerVersions": "Phiên bản client %1$s của bạn Ä‘ang là %2$s nó không tÆ°Æ¡ng thÃch vá»›i phiên bản máy chủ %3$s.",
- "ExceptionInvalidAggregateReportsFormat": "Äịnh dạng báo cáo tổng hợp '%s' không hợp lệ. Hãy thá» các cách sau để thay thế: %s.",
+ "ExceptionInvalidAggregateReportsFormat": "Äịnh dạng báo cáo tổng hợp '%1$s' không hợp lệ. Hãy thá» các cách sau để thay thế: %2$s.",
"ExceptionInvalidArchiveTimeToLive": "Hiện nay thá»i gian lÆ°u trữ để tồn tại phải có số giây lá»›n hÆ¡n 0",
- "ExceptionInvalidDateFormat": "Äịnh dạng ngà y phải: %s hoặc các từ khoá được há»— trợ bởi hà m %s (xem %s để biết thêm thông tin)",
- "ExceptionInvalidDateRange": "Ngà y '%s' không phải khoảng thá»i gian chuẩn. Nó phải có định dạng nhÆ° sau: %s.",
- "ExceptionInvalidPeriod": "Giai đoạn '%s' không được hỗ trợ. Hãy thỠcác cách sau đây để thay thế: %s",
- "ExceptionInvalidRendererFormat": "Äịnh dạng Renderer '%s' không hợp lệ. Hãy thá» các cách sau để thay thế: %s.",
- "ExceptionInvalidReportRendererFormat": "định dạng báo cáo '%s' không hợp lệ. Hãy thỠcác cách sau để thay thế: %s.",
- "ExceptionInvalidStaticGraphType": "Kiểu đồ thị tĩnh '%s' không hợp lệ. Hãy thỠcác cách sau để thay thế: %s.",
+ "ExceptionInvalidDateFormat": "Äịnh dạng ngà y phải: %1$s hoặc các từ khoá được há»— trợ bởi hà m %2$s (xem %3$s để biết thêm thông tin)",
+ "ExceptionInvalidDateRange": "Ngà y '%1$s' không phải khoảng thá»i gian chuẩn. Nó phải có định dạng nhÆ° sau: %2$s.",
+ "ExceptionInvalidPeriod": "Giai đoạn '%1$s' không được hỗ trợ. Hãy thỠcác cách sau đây để thay thế: %2$s",
+ "ExceptionInvalidRendererFormat": "Äịnh dạng Renderer '%1$s' không hợp lệ. Hãy thá» các cách sau để thay thế: %2$s.",
+ "ExceptionInvalidReportRendererFormat": "định dạng báo cáo '%1$s' không hợp lệ. Hãy thỠcác cách sau để thay thế: %2$s.",
+ "ExceptionInvalidStaticGraphType": "Kiểu đồ thị tĩnh '%1$s' không hợp lệ. Hãy thỠcác cách sau để thay thế: %2$s.",
"ExceptionInvalidToken": "Mã thông báo không hợp lệ.",
"ExceptionLanguageFileNotFound": "Không tìm thấy file ngôn ngữ '%s'.",
- "ExceptionMethodNotFound": "Phương pháp '%s' không tồn tại hoặc không có hiệu lực trong mô-đun '%s'.",
+ "ExceptionMethodNotFound": "Phương pháp '%1$s' không tồn tại hoặc không có hiệu lực trong mô-đun '%2$s'.",
"ExceptionMissingFile": "Táºp tin lá»—i: %s",
"ExceptionNonceMismatch": "Không thể xác minh mã bảo máºt của mẫu(form) nà y.",
"ExceptionPrivilege": "Bạn không thể truy cáºp tà i nguyên nà y vì nó đòi há»i quyá»n truy cáºp %s.",
@@ -153,7 +151,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "Bạn không thể truy cáºp tà i nguyên nà y vì nó đòi há»i má»™t truy cáºp %s Ãt nhất trên má»™t trang web.",
"ExceptionUnableToStartSession": "Không thể bắt đầu phiên.",
"ExceptionUndeletableFile": "Không thể xóa %s",
- "ExceptionUnreadableFileDisabledMethod": "Táºp tin cấu hình {%s} không có thể Ä‘á»c. Máy chủ của bạn có thể đã bị vô hiệu hóa %s.",
+ "ExceptionUnreadableFileDisabledMethod": "Táºp tin cấu hình {%1$s} không có thể Ä‘á»c. Máy chủ của bạn có thể đã bị vô hiệu hóa %2$s.",
"Export": "Xuất",
"ExportAsImage": "Xuất ra dạng ảnh(Image)",
"ExportThisReport": "Xuất dữ liệu nà y với các định dạng khác",
@@ -194,7 +192,7 @@
"Logout": "Äăng xuất",
"MainMetrics": "Các số liệu chÃnh",
"Matches": "Mối liên kết (Matches)",
- "MediumToHighTrafficItIsRecommendedTo": "Äối vá»›i các trang web có mức Ä‘á»™ truy cáºp trung bình và cao, chúng tôi khuyến nghị xá» lý các báo cáo hiện nay má»—i ngà y ná»a giỠđồng hồ (%s giây) hoặc má»—i giá» (%s giây).",
+ "MediumToHighTrafficItIsRecommendedTo": "Äối vá»›i các trang web có mức Ä‘á»™ truy cáºp trung bình và cao, chúng tôi khuyến nghị xá» lý các báo cáo hiện nay má»—i ngà y ná»a giỠđồng hồ (%1$s giây) hoặc má»—i giá» (%2$s giây).",
"Metadata": "Siêu dữ liệu",
"Metric": "Số liệu",
"Metrics": "Các số liệu",
@@ -248,7 +246,7 @@
"OperationNotEquals": "Không bằng",
"OptionalSmtpPort": "Tùy chá»n. Mặc định 25 là không mã hóa và TLS SMTP, và 465 cho SSL SMTP.",
"Options": "Tùy chá»n",
- "OrCancel": "hoặc %s Hủy %s",
+ "OrCancel": "hoặc %1$s Hủy %2$s",
"Others": "Khác",
"Outlink": "Outlink",
"Outlinks": "Liên kết đưa ra",
@@ -256,9 +254,9 @@
"OverlayRowActionTooltipTitle": "Mở trang bị che",
"Overview": "Tổng quan",
"Pages": "Số trang",
- "Pagination": "%s - %s trên %s",
- "PaginationWithoutTotal": "%s - %s",
- "ParameterMustIntegerBetween": "Tham số %s phải là một số nguyên giữa %s và %s.",
+ "Pagination": "%1$s - %2$s trên %3$s",
+ "PaginationWithoutTotal": "%1$s - %2$s",
+ "ParameterMustIntegerBetween": "Tham số %1$s phải là một số nguyên giữa %2$s và %3$s.",
"Password": "máºt khẩu",
"Period": "Giai đoạn",
"Piechart": "Biểu đồ hình tròn",
@@ -302,7 +300,7 @@
"Search": "Tìm kiếm",
"SearchNoResults": "Không có kết quả",
"SeeAll": "Xem tất cả",
- "SeeTheOfficialDocumentationForMoreInformation": "Xem %s tà i liệu chÃnh thức %s để biết thêm thông tin.",
+ "SeeTheOfficialDocumentationForMoreInformation": "Xem %1$s tà i liệu chÃnh thức %2$s để biết thêm thông tin.",
"SelectYesIfYouWantToSendEmailsViaServer": "Chá»n \"Yes\" nếu bạn muốn hay phải gá»i e-mail thông qua má»™t máy chủ có tên thay vì chức năng thÆ° cục bá»™",
"Settings": "Thiết láºp",
"Shipping": "Váºn chuyển",
@@ -352,7 +350,7 @@
"Warning": "Cảnh báo",
"WarningFileIntegrityNoManifest": "Táºp tin kiểm tra tÃnh toà n vẹn không thể thá»±c hiện do thiếu manifest.inc.php.",
"WarningFileIntegrityNoMd5file": "Táºp tin kiểm tra tÃnh toà n vẹn không thể hoà n thà nh do thiếu md5_file() function.",
- "WarningPasswordStored": "%s Cảnh báo: %s Máºt khẩu nà y sẽ lÆ°u trữ trong táºp tin cấu hình có thể thấy để tất cả má»i ngÆ°á»i có thể truy cáºp nó.",
+ "WarningPasswordStored": "%1$s Cảnh báo: %2$s Máºt khẩu nà y sẽ lÆ°u trữ trong táºp tin cấu hình có thể thấy để tất cả má»i ngÆ°á»i có thể truy cáºp nó.",
"Website": "Website",
"Weekly": "Hà ng tuần",
"WeeklyReport": "Hà ng tuần",
@@ -404,7 +402,7 @@
"MultiChartLabel": "Hiển thị sparklines",
"NavigationBack": "Quay lại",
"NetworkError": "Lỗi mạng",
- "NetworkErrorWithStatusCode": "Có má»™t lá»—i \"%s\". Yêu cầu quay lại tình trạng \"%s\". URL là \"%s\". Vui lòng kiểm tra URL đã nháºp của bạn và các bản ghi lá»—i trên máy chủ nà y để biết thêm thông tin vá» lá»—i và cách để giải quyết nó.",
+ "NetworkErrorWithStatusCode": "Có má»™t lá»—i \"%1$s\". Yêu cầu quay lại tình trạng \"%2$s\". URL là \"%3$s\". Vui lòng kiểm tra URL đã nháºp của bạn và các bản ghi lá»—i trên máy chủ nà y để biết thêm thông tin vá» lá»—i và cách để giải quyết nó.",
"NetworkErrorWithStatusCodeShort": "Lỗi mạng %s",
"NetworkNotReachable": "Mạng không thể truy cáºp",
"NoAccountIsSelected": "Bạn phải chá»n má»™t tà i khoản. Thêm má»™t tà i khoản má»›i nếu bạn chÆ°a cấu hình được nó.",
@@ -420,7 +418,7 @@
"RatingDontRemindMe": "Äừng nhắc tôi",
"RatingNotNow": "Không phải bây giá»",
"RatingNow": "Äược, bây giá» tôi sẽ đánh giá",
- "RatingPleaseRateUs": "Piwik Mobile App là má»™t phần má»m miá»…n phÃ, chúng tôi rất cảm Æ¡n nếu bạn dà nh má»™t phút để đánh giá app ở %s. Nếu bạn có bất kỳ gợi ý gì vá» các chức năng má»›i hay các báo cáo lá»—i, là m Æ¡n liên hệ %s",
+ "RatingPleaseRateUs": "Piwik Mobile App là má»™t phần má»m miá»…n phÃ, chúng tôi rất cảm Æ¡n nếu bạn dà nh má»™t phút để đánh giá app ở %1$s. Nếu bạn có bất kỳ gợi ý gì vá» các chức năng má»›i hay các báo cáo lá»—i, là m Æ¡n liên hệ %2$s",
"ReleaseToRefresh": "Giải phóng để là m mới ...",
"Reloading": "Tải lại ...",
"RequestTimedOutShort": "Thá»i gian trá»… mạng bị lá»—i",
@@ -444,7 +442,7 @@
"CompareRows": "So sánh số liệu",
"ComparingRecords": "So sánh %s hà ng",
"Documentation": "Click và o các số liệu để hiển thị chúng trong đồ thị tiến hóa rá»™ng. Sá» dụng shift-click để hiển thị nhiá»u số liệu cùng má»™t lúc.",
- "MetricBetweenText": "từ %s và %s",
+ "MetricBetweenText": "từ %1$s và %2$s",
"MetricChangeText": "%s trong giai đoạn nà y",
"MetricMinMax": "%1$s trong khoảng %2$s và %3$s",
"MetricsFor": "Các số liệu cho %s",
diff --git a/lang/zh-cn.json b/lang/zh-cn.json
index 74f5cb6570ebab6e608e14f28706549f4f0acf36..42e11ac18466b137ef2288d659f56c6fc3a31529 100644
--- a/lang/zh-cn.json
+++ b/lang/zh-cn.json
@@ -12,7 +12,7 @@
"And": "和",
"API": "API",
"ArchivingInlineHelp": "对于ä¸é«˜æµé‡çš„网站，建议ç¦ç”¨Piwikæµè§ˆå™¨è§¦å‘处ç†ã€‚最好是设置定时任务(Cron job)，æ¯å°æ—¶å¤„ç†ä¸€æ¬¡Piwik报表。",
- "ArchivingTriggerDescription": "适åˆå¤§åž‹çš„Piwik安装，需è¦%s设置定时任务(Cron job) %sæ¥è‡ªåŠ¨å¤„ç†æŠ¥è¡¨ã€‚",
+ "ArchivingTriggerDescription": "适åˆå¤§åž‹çš„Piwik安装，需è¦%1$s设置定时任务(Cron job) %2$sæ¥è‡ªåŠ¨å¤„ç†æŠ¥è¡¨ã€‚",
"AuthenticationMethodSmtp": "SMTP 验è¯æ–¹æ³•",
"AverageOrderValue": "å¹³å‡è®¢å•é¢",
"AveragePrice": "å¹³å‡ä»·æ ¼",
@@ -24,10 +24,8 @@
"CannotUnzipFile": "ä¸èƒ½è§£åŽ‹ç¼©æ–‡ä»¶%1$s: %2$s",
"ChangePassword": "修改密ç ",
"ChangeTagCloudView": "æ示: 您å¯ä»¥é€šè¿‡æŠ¥è¡¨ä¸‹æ–¹çš„控制按钮，用ä¸åŒäºŽæ ‡ç¾äº‘çš„å…¶å®ƒæ ¼å¼æ˜¾ç¤ºæŠ¥è¡¨ã€‚",
- "ChooseDate": "选择日期",
"ChooseLanguage": "选择è¯è¨€",
"ChoosePeriod": "选择时间段",
- "ChooseWebsite": "选择网站",
"ClickHere": "点击查看更多信æ¯",
"ClickToChangePeriod": "点击更改时间段",
"Close": "å…³é—",
@@ -79,7 +77,7 @@
"ColumnViewedAfterSearchDocumentation": "访客在站内æœç´¢åŽï¼Œåœ¨æœç´¢ç»“æžœä¸ç‚¹å‡»è¿™ä¸ªé¡µé¢çš„次数。",
"ColumnVisitDuration": "åœç•™æ—¶é—´ (秒)",
"ColumnVisitsWithConversions": "访问转化",
- "ConfigFileIsNotWritable": "Piwik é…置文件 %s æ— æ³•å†™å…¥ï¼Œæ— æ³•ä¿å˜éƒ¨åˆ†ä¿®æ”¹ã€‚%s 请修改é…置文件的æƒé™ä¸ºå¯å†™ã€‚",
+ "ConfigFileIsNotWritable": "Piwik é…置文件 %1$s æ— æ³•å†™å…¥ï¼Œæ— æ³•ä¿å˜éƒ¨åˆ†ä¿®æ”¹ã€‚%2$s 请修改é…置文件的æƒé™ä¸ºå¯å†™ã€‚",
"Continue": "继ç»",
"ContinueToPiwik": "ç»§ç» Piwik",
"CurrentMonth": "本月",
@@ -95,7 +93,7 @@
"Date": "日期",
"DateRange": "报表时间:",
"DateRangeFrom": "从",
- "DateRangeFromTo": "从 %s 至 %s",
+ "DateRangeFromTo": "从 %1$s 至 %2$s",
"DateRangeTo": "至",
"DaysHours": "%1$s 天 %2$s å°æ—¶",
"DaysSinceFirstVisit": "第一次访问至今的天数",
@@ -134,17 +132,17 @@
"ExceptionFileIntegrity": "完整性检查失败: %s",
"ExceptionFilesizeMismatch": "文件大å°ä¸ç¬¦: %1$s (预计长度: %2$s, 找到: %3$s)",
"ExceptionIncompatibleClientServerVersions": "您的 %1$s 客户端版本为 %2$s，与æœåŠ¡å™¨ç‰ˆæœ¬ %3$s ä¸å…¼å®¹ã€‚",
- "ExceptionInvalidAggregateReportsFormat": "æ±‡æ€»æŠ¥è¡¨æ ¼å¼ '%s' ä¸æ£ç¡®ï¼Œè¯·ç”¨ä¸‹é¢çš„代替: %s。",
+ "ExceptionInvalidAggregateReportsFormat": "æ±‡æ€»æŠ¥è¡¨æ ¼å¼ '%1$s' ä¸æ£ç¡®ï¼Œè¯·ç”¨ä¸‹é¢çš„代替: %2$s。",
"ExceptionInvalidArchiveTimeToLive": "今日处ç†æ—¶é—´å¿…须是一个大于 0 的秒数",
- "ExceptionInvalidDateFormat": "æ—¥æœŸæ ¼å¼å¿…须为: %s 或任何被 %s 函数支æŒçš„å…³é”®å— (详情查看%s)",
- "ExceptionInvalidDateRange": "时间段 '%s' ä¸æ£ç¡®ï¼Œæ ¼å¼åº”为: %s。",
- "ExceptionInvalidPeriod": "ç›®å‰ä¸æ”¯æŒ '%s' ，å°è¯•ä¸‹é¢çš„选择: %s",
- "ExceptionInvalidRendererFormat": "'%s' 是ä¸åˆæ³•çš„。å°è¯•ä»¥ä¸‹ä»»ä¸€æ¥å–代: %s 。",
- "ExceptionInvalidReportRendererFormat": "æŠ¥è¡¨æ ¼å¼ %s æ— æ•ˆï¼Œå°è¯•ä»¥ä¸‹å†…容 %s",
- "ExceptionInvalidStaticGraphType": "ç»Ÿè®¡å›¾å½¢æ ¼å¼ '%s' ä¸æ£ç¡®ï¼Œè¯·ç”¨ä¸‹é¢çš„代替: %s。",
+ "ExceptionInvalidDateFormat": "æ—¥æœŸæ ¼å¼å¿…须为: %1$s 或任何被 %2$s 函数支æŒçš„å…³é”®å— (详情查看%3$s)",
+ "ExceptionInvalidDateRange": "时间段 '%1$s' ä¸æ£ç¡®ï¼Œæ ¼å¼åº”为: %2$s。",
+ "ExceptionInvalidPeriod": "ç›®å‰ä¸æ”¯æŒ '%1$s' ，å°è¯•ä¸‹é¢çš„选择: %2$s",
+ "ExceptionInvalidRendererFormat": "'%1$s' 是ä¸åˆæ³•çš„。å°è¯•ä»¥ä¸‹ä»»ä¸€æ¥å–代: %2$s 。",
+ "ExceptionInvalidReportRendererFormat": "æŠ¥è¡¨æ ¼å¼ %1$s æ— æ•ˆï¼Œå°è¯•ä»¥ä¸‹å†…容 %2$s",
+ "ExceptionInvalidStaticGraphType": "ç»Ÿè®¡å›¾å½¢æ ¼å¼ '%1$s' ä¸æ£ç¡®ï¼Œè¯·ç”¨ä¸‹é¢çš„代替: %2$s。",
"ExceptionInvalidToken": "符å·ä¸æ£ç¡®ã€‚",
"ExceptionLanguageFileNotFound": "没有è¯è¨€æ–‡ä»¶ '%s'。",
- "ExceptionMethodNotFound": "'%s' ä¸å˜åœ¨æˆ–ä¸é€‚ç”¨äºŽæ¨¡å— '%s' 里。",
+ "ExceptionMethodNotFound": "'%1$s' ä¸å˜åœ¨æˆ–ä¸é€‚ç”¨äºŽæ¨¡å— '%2$s' 里。",
"ExceptionMissingFile": "缺少文件: %s",
"ExceptionNonceMismatch": "æ— æ³•éªŒè¯æ¤è¡¨å•çš„安全性。",
"ExceptionPrivilege": "æ‚¨æ— æ³•å˜å–这个资æºï¼Œå¿…é¡»è¦ä¸€ä¸ª %s æƒé™ã€‚",
@@ -152,7 +150,7 @@
"ExceptionPrivilegeAtLeastOneWebsite": "æ‚¨æ— æ³•å˜å–这个资æºï¼Œå¿…须至少è¦ä¸€ä¸ªç½‘站的 %s æƒé™ã€‚",
"ExceptionUnableToStartSession": "æ— æ³•å¯åŠ¨ä¼šè¯",
"ExceptionUndeletableFile": "æ— æ³•åˆªé™¤ %s",
- "ExceptionUnreadableFileDisabledMethod": "é…置文件 {%s} æ— æ³•è¯»å–。您的主机空间å¯èƒ½ç¦ç”¨ %s。",
+ "ExceptionUnreadableFileDisabledMethod": "é…置文件 {%1$s} æ— æ³•è¯»å–。您的主机空间å¯èƒ½ç¦ç”¨ %2$s。",
"Export": "导出",
"ExportAsImage": "导出为图片",
"ExportThisReport": "å¯¼å‡ºä¸ºå…¶å®ƒæ ¼å¼",
@@ -194,7 +192,7 @@
"Logout": "退出",
"MainMetrics": "主è¦æŒ‡æ ‡",
"Matches": "匹é…",
- "MediumToHighTrafficItIsRecommendedTo": "对于ä¸é«˜æµé‡çš„网站，我们建议最多æ¯éš”åŠå°æ—¶(%s秒)或一å°æ—¶(%s秒)处ç†ä¸€æ¬¡æŠ¥è¡¨ã€‚",
+ "MediumToHighTrafficItIsRecommendedTo": "对于ä¸é«˜æµé‡çš„网站，我们建议最多æ¯éš”åŠå°æ—¶(%1$s秒)或一å°æ—¶(%2$s秒)处ç†ä¸€æ¬¡æŠ¥è¡¨ã€‚",
"Metadata": "Metadata",
"Metric": "æŒ‡æ ‡",
"Metrics": "æŒ‡æ ‡",
@@ -246,7 +244,7 @@
"OperationNotEquals": "ä¸ç‰äºŽ",
"OptionalSmtpPort": "å¯é€‰é¡¹ï¼Œé»˜è®¤æ˜¯æœªåŠ 密和TLS SMTPä½¿ç”¨ç«¯å£ 25，SSL åŠ å¯†ä½¿ç”¨ç«¯å£ 465",
"Options": "选项",
- "OrCancel": "或 %s å–消 %s",
+ "OrCancel": "或 %1$s å–消 %2$s",
"Others": "其它",
"Outlink": "离站链接",
"Outlinks": "离站链接数é‡",
@@ -254,7 +252,7 @@
"OverlayRowActionTooltipTitle": "显示页é¢å åŠ ",
"Overview": "æ¥æºæ€»è¡¨",
"Pages": "页é¢",
- "ParameterMustIntegerBetween": "å‚æ•° %s 必须为介于 %s å’Œ %s 之间的整数",
+ "ParameterMustIntegerBetween": "å‚æ•° %1$s 必须为介于 %2$s å’Œ %3$s 之间的整数",
"Password": "密ç ",
"Period": "统计时间",
"Piechart": "圆饼图",
@@ -297,7 +295,7 @@
"Search": "æœç´¢",
"SearchNoResults": "没有结果",
"SeeAll": "查看全部",
- "SeeTheOfficialDocumentationForMoreInformation": "查看%s官方文件%så–得更多资讯",
+ "SeeTheOfficialDocumentationForMoreInformation": "查看%1$s官方文件%2$så–得更多资讯",
"SelectYesIfYouWantToSendEmailsViaServer": "如果您想通过邮件æœåŠ¡å™¨æ¥å‘é€ç”µå邮件，而ä¸æ˜¯ mail 函数的è¯è¯·é€‰æ‹© \"是\"",
"Settings": "管ç†è®¾ç½®",
"Shipping": "è¿è´¹",
@@ -348,7 +346,7 @@
"Warning": "è¦å‘Š",
"WarningFileIntegrityNoManifest": "缺少 manifest.inc.phpï¼Œæ‰€ä»¥æ–‡ä»¶å®Œæ•´æ€§æ£€æŸ¥æ— æ³•å®Œæˆã€‚",
"WarningFileIntegrityNoMd5file": "缺少 md5_file() å‡½æ•°ï¼Œæ‰€ä»¥æ–‡ä»¶å®Œæ•´æ€§æ£€æŸ¥æ— æ³•å®Œæˆã€‚",
- "WarningPasswordStored": "%sè¦å‘Š:%s æ¤å¯†ç 将被ä¿å˜åœ¨é…置文件ä¸ï¼Œä¸”æ¯ä¸ªèƒ½è¯»å–它的人都看得到。",
+ "WarningPasswordStored": "%1$sè¦å‘Š:%2$s æ¤å¯†ç 将被ä¿å˜åœ¨é…置文件ä¸ï¼Œä¸”æ¯ä¸ªèƒ½è¯»å–它的人都看得到。",
"Website": "网站",
"Weekly": "æ¯å‘¨",
"WeeklyReport": "æ¯å‘¨",
@@ -400,7 +398,7 @@
"MultiChartLabel": "显示图形",
"NavigationBack": "åŽé€€",
"NetworkError": "网络错误",
- "NetworkErrorWithStatusCode": "出现错误 \"%s\"ï¼Œè¯·æ±‚è¿”å›žçŠ¶æ€ \"%s\"，网å€ä¸º \"%s\"。请检查输入的网å€å’ŒæœåŠ¡å™¨ä¸Šçš„错误日志，了解错误详情åŠå¦‚何解决问题。",
+ "NetworkErrorWithStatusCode": "出现错误 \"%1$s\"ï¼Œè¯·æ±‚è¿”å›žçŠ¶æ€ \"%2$s\"，网å€ä¸º \"%3$s\"。请检查输入的网å€å’ŒæœåŠ¡å™¨ä¸Šçš„错误日志，了解错误详情åŠå¦‚何解决问题。",
"NetworkErrorWithStatusCodeShort": "网络错误%s",
"NetworkNotReachable": "ç½‘ç»œæ— æ³•è®¿é—®",
"NoAccountIsSelected": "您è¦é€‰æ‹©ä¸€ä¸ªå¸å·ã€‚å¦‚æžœæ‚¨è¿˜æ²¡æœ‰è®¾ç½®ï¼Œè¯·å¢žåŠ ä¸€ä¸ªå¸å·ã€‚",
@@ -416,7 +414,7 @@
"RatingDontRemindMe": "ä¸è¦è®°ä½æˆ‘",
"RatingNotNow": "ä¸æ˜¯çŽ°åœ¨",
"RatingNow": "好的，我会马上给它好评",
- "RatingPleaseRateUs": "Piwik 移动应用是å…费软件，感谢您能花一分钟到 %s 评价这个应用。如有新功能建议或者bug报告，请è”ç³» %s",
+ "RatingPleaseRateUs": "Piwik 移动应用是å…费软件，感谢您能花一分钟到 %1$s 评价这个应用。如有新功能建议或者bug报告，请è”ç³» %2$s",
"ReleaseToRefresh": "放开以更新...",
"Reloading": "é‡æ–°åŠ è½½ä¸...",
"RequestTimedOutShort": "网络超时错误",
@@ -440,7 +438,7 @@
"CompareRows": "比较记录",
"ComparingRecords": "æ£åœ¨æ¯”较 %s è¡Œ",
"Documentation": "ç‚¹å‡»æŒ‡æ ‡æ˜¾ç¤ºè¶‹åŠ¿å›¾ï¼ŒæŒ‰ä½ Shift 键点击å¯åŒæ—¶æ˜¾ç¤ºå¤šä¸ªæŒ‡æ ‡ã€‚",
- "MetricBetweenText": "在%s和%s之间",
+ "MetricBetweenText": "在%1$s和%2$s之间",
"MetricChangeText": "%s",
"MetricsFor": "%s çš„æŒ‡æ ‡",
"MultiRowEvolutionTitle": "多个记录的趋势图",
diff --git a/lang/zh-tw.json b/lang/zh-tw.json
index 431b52109a2e4ff318cdf516afd3780652647857..eed9e644b064176f8214d4811c89d32a672eb71c 100644
--- a/lang/zh-tw.json
+++ b/lang/zh-tw.json
@@ -10,14 +10,13 @@
"And": "和",
"API": "API",
"ArchivingInlineHelp": "å°æ–¼ä¸æˆ–高æµé‡çš„網站，建è°åœç”¨ Piwik 彙整觸發ç€è¦½å™¨ã€‚å之，我們建è°ä½ è¨å®šä¸€å€‹å·¥ä½œæŽ’程(Cron job)，æ¯å°æ™‚è™•ç† Piwik å ±å‘Šã€‚",
- "ArchivingTriggerDescription": "推薦大型的 Piwik 安è£ï¼Œä½ 需è¦%sè¨å®šä¸€å€‹å·¥ä½œæŽ’程(Cron job)%s來自動處ç†å ±å‘Šã€‚",
+ "ArchivingTriggerDescription": "推薦大型的 Piwik 安è£ï¼Œä½ 需è¦%1$sè¨å®šä¸€å€‹å·¥ä½œæŽ’程(Cron job)%2$s來自動處ç†å ±å‘Šã€‚",
"AuthenticationMethodSmtp": "SMTP é©—è‰æ–¹æ³•",
"BackToPiwik": "返回 Piwik",
"Cancel": "å–消",
"ChangePassword": "變更密碼",
"ChooseLanguage": "é¸æ“‡èªžç³»",
"ChoosePeriod": "é¸æ“‡æœŸé–“",
- "ChooseWebsite": "é¸æ“‡ç¶²ç«™",
"Close": "關閉",
"ColumnActionsPerVisit": "å„å€‹é€ è¨ªçš„æ´»å‹•é‡",
"ColumnAverageTimeOnPage": "å¹³å‡ç¶²ç«™åœç•™æ™‚é–“",
@@ -47,7 +46,7 @@
"ColumnUniquePageviews": "ç¨ç«‹éžé‡è¿”訪客ç€è¦½æ•¸",
"ColumnValuePerVisit": "æ¯æ¬¡é€ 訪價值",
"ColumnVisitsWithConversions": "é€ è¨ªè½‰æ›",
- "ConfigFileIsNotWritable": "Piwik è¨å®šæª” %s ç„¡æ³•å¯«å…¥ï¼Œä½ çš„è®Šæ›´å°‡ç„¡æ³•å„²å˜ã€‚%s 請變更è¨å®šæª”權é™è®“它å¯è¢«å¯«å…¥ã€‚",
+ "ConfigFileIsNotWritable": "Piwik è¨å®šæª” %1$s ç„¡æ³•å¯«å…¥ï¼Œä½ çš„è®Šæ›´å°‡ç„¡æ³•å„²å˜ã€‚%2$s 請變更è¨å®šæª”權é™è®“它å¯è¢«å¯«å…¥ã€‚",
"ContinueToPiwik": "繼續 Piwik",
"CurrentMonth": "本月",
"CurrentWeek": "本週",
@@ -78,20 +77,20 @@
"ExceptionFilesizeMismatch": "檔案大å°ä¸ç¬¦: %1$s （é 計長度: %2$s, 找到: %3$s）",
"ExceptionIncompatibleClientServerVersions": "ä½ çš„ %1$s 客戶端版本為 %2$s，與伺æœå™¨ç‰ˆæœ¬ %3$s ä¸ç›¸å®¹ã€‚",
"ExceptionInvalidArchiveTimeToLive": "ä»Šæ—¥å½™æ•´æ™‚é–“å¿…é ˆæ˜¯ä¸€å€‹å¤§æ–¼ 0 秒的數å—",
- "ExceptionInvalidDateFormat": "æ—¥æœŸæ ¼å¼å¿…é ˆç‚º: %s 或任何被 %s 函å¼æ”¯æ´çš„é—œéµå—（查看 %s å–得更多資訊）",
- "ExceptionInvalidDateRange": "'%s' ä¸æ˜¯ä¸€å€‹æ£ç¢ºçš„日期範åœã€‚它應該æ“æœ‰ä»¥ä¸‹æ ¼å¼: %s。",
- "ExceptionInvalidPeriod": "ç›®å‰ä¸æ”¯æ´ '%s' 。嘗試以下任一來å–代: %s",
- "ExceptionInvalidRendererFormat": "'%s' 是ä¸åˆæ³•çš„。嘗試以下任一來å–代: %s 。",
+ "ExceptionInvalidDateFormat": "æ—¥æœŸæ ¼å¼å¿…é ˆç‚º: %1$s 或任何被 %2$s 函å¼æ”¯æ´çš„é—œéµå—（查看 %3$s å–得更多資訊）",
+ "ExceptionInvalidDateRange": "'%1$s' ä¸æ˜¯ä¸€å€‹æ£ç¢ºçš„日期範åœã€‚它應該æ“æœ‰ä»¥ä¸‹æ ¼å¼: %2$s。",
+ "ExceptionInvalidPeriod": "ç›®å‰ä¸æ”¯æ´ '%1$s' 。嘗試以下任一來å–代: %2$s",
+ "ExceptionInvalidRendererFormat": "'%1$s' 是ä¸åˆæ³•çš„。嘗試以下任一來å–代: %2$s 。",
"ExceptionInvalidToken": "符號ä¸åˆæ³•ã€‚",
"ExceptionLanguageFileNotFound": "語系檔案 '%s' 找ä¸åˆ°ã€‚",
- "ExceptionMethodNotFound": "'%s' ä¸å˜åœ¨æˆ–ä¸é©ç”¨æ–¼æ¨¡çµ„ '%s' 裡。",
+ "ExceptionMethodNotFound": "'%1$s' ä¸å˜åœ¨æˆ–ä¸é©ç”¨æ–¼æ¨¡çµ„ '%2$s' 裡。",
"ExceptionMissingFile": "éºå¤±æª”案: %s",
"ExceptionNonceMismatch": "無法驗è‰æ¤è¡¨å–®çš„安全性。",
"ExceptionPrivilege": "ä½ ç„¡æ³•å˜å–這個資æºï¼Œå¿…é ˆè¦ä¸€å€‹ %s 權é™ã€‚",
"ExceptionPrivilegeAccessWebsite": "ä½ ç„¡æ³•å˜å–這個資æºï¼Œå¿…é ˆæ“有網站 ID = %d çš„ %s 權é™ã€‚",
"ExceptionPrivilegeAtLeastOneWebsite": "ä½ ç„¡æ³•å˜å–這個資æºï¼Œå¿…é ˆè‡³å°‘è¦ä¸€å€‹ç¶²ç«™çš„ %s 權é™ã€‚",
"ExceptionUndeletableFile": "無法刪除 %s",
- "ExceptionUnreadableFileDisabledMethod": "è¨å®šæª” {%s} 無法讀å–ã€‚ä½ çš„ä¸»æ©Ÿç©ºé–“å¯èƒ½åœç”¨ %s。",
+ "ExceptionUnreadableFileDisabledMethod": "è¨å®šæª” {%1$s} 無法讀å–ã€‚ä½ çš„ä¸»æ©Ÿç©ºé–“å¯èƒ½åœç”¨ %2$s。",
"Export": "匯出",
"ExportAsImage": "匯出為圖片",
"ExportThisReport": "å°‡æ¤è³‡æ–™é›†åŒ¯å‡ºç‚ºå…¶ä»–æ ¼å¼",
@@ -117,7 +116,7 @@
"LoadingData": "載入資料ä¸...",
"Locale": "zh_TW.UTF-8",
"Logout": "登出",
- "MediumToHighTrafficItIsRecommendedTo": "å°æ–¼ä¸æˆ–高æµé‡çš„網站，我們建è°æœ€å¤šæ¯éš”åŠå°æ™‚(%s 秒)或æ¯å°æ™‚(%s 秒)處ç†å ±å‘Šã€‚",
+ "MediumToHighTrafficItIsRecommendedTo": "å°æ–¼ä¸æˆ–高æµé‡çš„網站，我們建è°æœ€å¤šæ¯éš”åŠå°æ™‚(%1$s 秒)或æ¯å°æ™‚(%2$s 秒)處ç†å ±å‘Šã€‚",
"Metric": "指標",
"Metrics": "指標",
"MetricsToPlot": "圖形指標",
@@ -143,7 +142,7 @@
"OnlyEnterIfRequiredPassword": "åªåœ¨ä½ çš„ SMTP 伺æœå™¨éœ€è¦å¯†ç¢¼æ™‚æ‰éœ€è¦è¼¸å…¥",
"OnlyUsedIfUserPwdIsSet": "åªåœ¨ä½¿ç”¨è€…å稱 \/ 密碼è¨å®šå¾Œæ‰æœƒç”Ÿæ•ˆï¼Œå¦‚æžœä½ ä¸ç¢ºå®šè¦ä½¿ç”¨ä½•ç¨®æ–¹æ³•ï¼Œè«‹è©¢å•ä½ çš„æ供商。",
"OpenSourceWebAnalytics": "開放原始碼的網站æµé‡åˆ†æžè»Ÿé«”",
- "OrCancel": "或 %s å–消 %s",
+ "OrCancel": "或 %1$s å–消 %2$s",
"Others": "其他",
"Outlinks": "離開連çµ",
"Overview": "總覽",
@@ -168,7 +167,7 @@
"Save": "儲å˜",
"SaveImageOnYourComputer": "將圖片儲å˜è‡³æ‚¨çš„電腦，在圖片上點é¸æ»‘é¼ å³éµç„¶å¾Œé¸æ“‡ \"將圖片儲å˜ç‚º...\"",
"Search": "æœå°‹",
- "SeeTheOfficialDocumentationForMoreInformation": "查看%s官方文件%så–得更多資訊",
+ "SeeTheOfficialDocumentationForMoreInformation": "查看%1$s官方文件%2$så–得更多資訊",
"SelectYesIfYouWantToSendEmailsViaServer": "å¦‚æžœä½ æƒ³é€éŽä¸€å€‹ named server 來寄é€é›»å郵件，而ä¸æ˜¯ mail 函å¼çš„話請é¸æ“‡ \"Yes\"",
"Settings": "è¨å®š",
"SmallTrafficYouCanLeaveDefault": "å°æ–¼ä½Žæµé‡çš„ç¶²ç«™ï¼Œä½ å¯ä»¥ä½¿ç”¨é è¨çš„ %s 秒，然後å³æ™‚å˜å–æ‰€æœ‰å ±å‘Šã€‚",
@@ -192,7 +191,7 @@
"Warning": "è¦å‘Š",
"WarningFileIntegrityNoManifest": "缺少 manifest.inc.php 所以檔案完整性檢查無法執行。",
"WarningFileIntegrityNoMd5file": "缺少 md5_file() 函å¼æ‰€ä»¥æª”案完整性檢查無法玩æˆã€‚",
- "WarningPasswordStored": "%sè¦å‘Š:%s æ¤å¯†ç¢¼å°‡è¢«å„²å˜åœ¨è¨å®šæª”ä¸ï¼Œä¸”æ¯å€‹èƒ½å˜å–它的人都看得到。",
+ "WarningPasswordStored": "%1$sè¦å‘Š:%2$s æ¤å¯†ç¢¼å°‡è¢«å„²å˜åœ¨è¨å®šæª”ä¸ï¼Œä¸”æ¯å€‹èƒ½å˜å–它的人都看得到。",
"Website": "網站",
"Weekly": "æ¯é€±",
"Widgets": "組件",
@@ -226,7 +225,7 @@
"AvailableMetrics": "å¯ç”¨æŒ‡æ¨™",
"CompareRows": "比較紀錄",
"ComparingRecords": "æ£åœ¨æ¯”較 %s è¡Œ",
- "MetricBetweenText": "從 %s 到 %s",
+ "MetricBetweenText": "從 %1$s 到 %2$s",
"MetricChangeText": "在這段時間改變了 %s",
"PickAnotherRow": "é¸æ“‡å…¶ä»–行來進行比較"
}
diff --git a/libs/README.md b/libs/README.md
index f5a061a1dcc98cc05a595df30c6e2b2e45170624..083684c962c3026bcbd93d36cd4bab0357825667 100644
--- a/libs/README.md
+++ b/libs/README.md
@@ -30,3 +30,4 @@ third-party libraries:
- ZF-10871 - undefined variables when socket support disabled
- fix #6980 ("Array to string conversion") in `Zend/Session/Exception.php`
- fix Zend/Validate using deprecated iconv_set_encoding()
+ - Make sure sessions work when storing notifications
diff --git a/libs/Zend/Session.php b/libs/Zend/Session.php
index b5177c18fd565906af4039fd2795d76b5c754302..8b55a17b6df25aa43338d7dc5822da95f514243d 100644
--- a/libs/Zend/Session.php
+++ b/libs/Zend/Session.php
@@ -491,6 +491,10 @@ class Zend_Session extends Zend_Session_Abstract
self::regenerateId();
}
+ if (isset($_SESSION['data']) && is_string($_SESSION['data'])) {
+ $_SESSION = unserialize(base64_decode($_SESSION['data']));
+ }
+
// run validators if they exist
if (isset($_SESSION['__ZF']['VALID'])) {
self::_processValidators();
@@ -688,8 +692,17 @@ class Zend_Session extends Zend_Session_Abstract
parent::$_writable = false;
}
+ if (isset($_SESSION)) {
+ $sessionBkp = $_SESSION;
+ $_SESSION = array('data' => base64_encode(serialize($_SESSION)));
+ }
+
session_write_close();
self::$_writeClosed = true;
+
+ if (isset($sessionBkp)) {
+ $_SESSION = $sessionBkp;
+ }
}
diff --git a/libs/Zend/Validate/Hostname.php b/libs/Zend/Validate/Hostname.php
index e485a5d5466a15daa3aebdabb4f4d0279f9df9aa..cd5db5abcbf0ab5bcf9bc2f9cd7fd72cb5d5dab3 100644
--- a/libs/Zend/Validate/Hostname.php
+++ b/libs/Zend/Validate/Hostname.php
@@ -115,25 +115,103 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
* @var array
*/
protected $_validTlds = array(
- 'ac', 'ad', 'ae', 'aero', 'af', 'ag', 'ai', 'al', 'am', 'an', 'ao', 'aq', 'ar', 'arpa',
- 'as', 'asia', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bb', 'bd', 'be', 'bf', 'bg', 'bh', 'bi',
- 'biz', 'bj', 'bm', 'bn', 'bo', 'br', 'bs', 'bt', 'bv', 'bw', 'by', 'bz', 'ca', 'cat', 'cc',
- 'cd', 'cf', 'cg', 'ch', 'ci', 'ck', 'cl', 'cm', 'cn', 'co', 'com', 'coop', 'cr', 'cu',
- 'cv', 'cx', 'cy', 'cz', 'de', 'dj', 'dk', 'dm', 'do', 'dz', 'ec', 'edu', 'ee', 'eg', 'er',
- 'es', 'et', 'eu', 'fi', 'fj', 'fk', 'fm', 'fo', 'fr', 'ga', 'gb', 'gd', 'ge', 'gf', 'gg',
- 'gh', 'gi', 'gl', 'gm', 'gn', 'gov', 'gp', 'gq', 'gr', 'gs', 'gt', 'gu', 'gw', 'gy', 'hk',
- 'hm', 'hn', 'hr', 'ht', 'hu', 'id', 'ie', 'il', 'im', 'in', 'info', 'int', 'io', 'iq',
- 'ir', 'is', 'it', 'je', 'jm', 'jo', 'jobs', 'jp', 'ke', 'kg', 'kh', 'ki', 'km', 'kn', 'kp',
- 'kr', 'kw', 'ky', 'kz', 'la', 'lb', 'lc', 'li', 'lk', 'lr', 'ls', 'lt', 'lu', 'lv', 'ly',
- 'ma', 'mc', 'md', 'me', 'mg', 'mh', 'mil', 'mk', 'ml', 'mm', 'mn', 'mo', 'mobi', 'mp',
- 'mq', 'mr', 'ms', 'mt', 'mu', 'museum', 'mv', 'mw', 'mx', 'my', 'mz', 'na', 'name', 'nc',
- 'ne', 'net', 'nf', 'ng', 'ni', 'nl', 'no', 'np', 'nr', 'nu', 'nz', 'om', 'org', 'pa', 'pe',
- 'pf', 'pg', 'ph', 'pk', 'pl', 'pm', 'pn', 'pr', 'pro', 'ps', 'pt', 'pw', 'py', 'qa', 're',
- 'ro', 'rs', 'ru', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sg', 'sh', 'si', 'sj', 'sk', 'sl',
- 'sm', 'sn', 'so', 'sr', 'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tel', 'tf', 'tg', 'th',
- 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'travel', 'tt', 'tv', 'tw', 'tz', 'ua',
- 'ug', 'uk', 'um', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws',
- 'ye', 'yt', 'yu', 'za', 'zm', 'zw'
+ 'aaa', 'aarp', 'abb', 'abbott', 'abogado', 'ac', 'academy', 'accenture', 'accountant', 'accountants',
+ 'aco', 'active', 'actor', 'ad', 'ads', 'adult', 'ae', 'aeg', 'aero', 'af', 'afl', 'ag', 'agency', 'ai',
+ 'aig', 'airforce', 'airtel', 'al', 'allfinanz', 'alsace', 'am', 'amica', 'amsterdam', 'analytics',
+ 'android', 'ao', 'apartments', 'app', 'apple', 'aq', 'aquarelle', 'ar', 'aramco', 'archi', 'army', 'arpa',
+ 'arte', 'as', 'asia', 'associates', 'at', 'attorney', 'au', 'auction', 'audi', 'audio', 'author', 'auto',
+ 'autos', 'aw', 'ax', 'axa', 'az', 'azure', 'ba', 'baidu', 'band', 'bank', 'bar', 'barcelona', 'barclaycard',
+ 'barclays', 'bargains', 'bauhaus', 'bayern', 'bb', 'bbc', 'bbva', 'bcn', 'bd', 'be', 'beats', 'beer',
+ 'bentley', 'berlin', 'best', 'bet', 'bf', 'bg', 'bh', 'bharti', 'bi', 'bible', 'bid', 'bike', 'bing',
+ 'bingo', 'bio', 'biz', 'bj', 'black', 'blackfriday', 'bloomberg', 'blue', 'bm', 'bms', 'bmw', 'bn', 'bnl',
+ 'bnpparibas', 'bo', 'boats', 'boehringer', 'bom', 'bond', 'boo', 'book', 'boots', 'bosch', 'bostik', 'bot',
+ 'boutique', 'br', 'bradesco', 'bridgestone', 'broadway', 'broker', 'brother', 'brussels', 'bs', 'bt',
+ 'budapest', 'bugatti', 'build', 'builders', 'business', 'buy', 'buzz', 'bv', 'bw', 'by', 'bz', 'bzh', 'ca',
+ 'cab', 'cafe', 'cal', 'call', 'camera', 'camp', 'cancerresearch', 'canon', 'capetown', 'capital', 'car',
+ 'caravan', 'cards', 'care', 'career', 'careers', 'cars', 'cartier', 'casa', 'cash', 'casino', 'cat',
+ 'catering', 'cba', 'cbn', 'cc', 'cd', 'ceb', 'center', 'ceo', 'cern', 'cf', 'cfa', 'cfd', 'cg', 'ch',
+ 'chanel', 'channel', 'chat', 'cheap', 'chloe', 'christmas', 'chrome', 'church', 'ci', 'cipriani',
+ 'circle', 'cisco', 'citic', 'city', 'cityeats', 'ck', 'cl', 'claims', 'cleaning', 'click', 'clinic',
+ 'clinique', 'clothing', 'cloud', 'club', 'clubmed', 'cm', 'cn', 'co', 'coach', 'codes', 'coffee',
+ 'college', 'cologne', 'com', 'commbank', 'community', 'company', 'computer', 'comsec', 'condos',
+ 'construction', 'consulting', 'contact', 'contractors', 'cooking', 'cool', 'coop', 'corsica', 'country',
+ 'coupons', 'courses', 'cr', 'credit', 'creditcard', 'creditunion', 'cricket', 'crown', 'crs', 'cruises',
+ 'csc', 'cu', 'cuisinella', 'cv', 'cw', 'cx', 'cy', 'cymru', 'cyou', 'cz', 'dabur', 'dad', 'dance', 'date',
+ 'dating', 'datsun', 'day', 'dclk', 'de', 'dealer', 'deals', 'degree', 'delivery', 'dell', 'delta', 'democrat',
+ 'dental', 'dentist', 'desi', 'design', 'dev', 'diamonds', 'diet', 'digital', 'direct', 'directory',
+ 'discount', 'dj', 'dk', 'dm', 'dnp', 'do', 'docs', 'dog', 'doha', 'domains', 'doosan', 'download', 'drive',
+ 'dubai', 'durban', 'dvag', 'dz', 'earth', 'eat', 'ec', 'edu', 'education', 'ee', 'eg', 'email', 'emerck',
+ 'energy', 'engineer', 'engineering', 'enterprises', 'epson', 'equipment', 'er', 'erni', 'es', 'esq',
+ 'estate', 'et', 'eu', 'eurovision', 'eus', 'events', 'everbank', 'exchange', 'expert', 'exposed', 'express',
+ 'fage', 'fail', 'fairwinds', 'faith', 'family', 'fan', 'fans', 'farm', 'fashion', 'fast', 'feedback',
+ 'ferrero', 'fi', 'film', 'final', 'finance', 'financial', 'firestone', 'firmdale', 'fish', 'fishing',
+ 'fit', 'fitness', 'fj', 'fk', 'flights', 'florist', 'flowers', 'flsmidth', 'fly', 'fm', 'fo', 'foo',
+ 'football', 'ford', 'forex', 'forsale', 'forum', 'foundation', 'fox', 'fr', 'frl', 'frogans', 'fund',
+ 'furniture', 'futbol', 'fyi', 'ga', 'gal', 'gallery', 'game', 'garden', 'gb', 'gbiz', 'gd', 'gdn', 'ge',
+ 'gea', 'gent', 'genting', 'gf', 'gg', 'ggee', 'gh', 'gi', 'gift', 'gifts', 'gives', 'giving', 'gl', 'glass',
+ 'gle', 'global', 'globo', 'gm', 'gmail', 'gmo', 'gmx', 'gn', 'gold', 'goldpoint', 'golf', 'goo', 'goog',
+ 'google', 'gop', 'got', 'gov', 'gp', 'gq', 'gr', 'grainger', 'graphics', 'gratis', 'green', 'gripe', 'group',
+ 'gs', 'gt', 'gu', 'gucci', 'guge', 'guide', 'guitars', 'guru', 'gw', 'gy', 'hamburg', 'hangout', 'haus',
+ 'healthcare', 'help', 'here', 'hermes', 'hiphop', 'hitachi', 'hiv', 'hk', 'hm', 'hn', 'hockey', 'holdings',
+ 'holiday', 'homedepot', 'homes', 'honda', 'horse', 'host', 'hosting', 'hoteles', 'hotmail', 'house', 'how',
+ 'hr', 'hsbc', 'ht', 'hu', 'hyundai', 'ibm', 'icbc', 'ice', 'icu', 'id', 'ie', 'ifm', 'iinet', 'il', 'im',
+ 'immo', 'immobilien', 'in', 'industries', 'infiniti', 'info', 'ing', 'ink', 'institute', 'insurance', 'insure',
+ 'int', 'international', 'investments', 'io', 'ipiranga', 'iq', 'ir', 'irish', 'is', 'ist', 'istanbul', 'it',
+ 'itau', 'iwc', 'jaguar', 'java', 'jcb', 'je', 'jetzt', 'jewelry', 'jlc', 'jll', 'jm', 'jmp', 'jo', 'jobs',
+ 'joburg', 'jot', 'joy', 'jp', 'jprs', 'juegos', 'kaufen', 'kddi', 'ke', 'kfh', 'kg', 'kh', 'ki', 'kia', 'kim',
+ 'kinder', 'kitchen', 'kiwi', 'km', 'kn', 'koeln', 'komatsu', 'kp', 'kpn', 'kr', 'krd', 'kred', 'kw', 'ky',
+ 'kyoto', 'kz', 'la', 'lacaixa', 'lamborghini', 'lamer', 'lancaster', 'land', 'landrover', 'lasalle', 'lat',
+ 'latrobe', 'law', 'lawyer', 'lb', 'lc', 'lds', 'lease', 'leclerc', 'legal', 'lexus', 'lgbt', 'li', 'liaison',
+ 'lidl', 'life', 'lifestyle', 'lighting', 'like', 'limited', 'limo', 'lincoln', 'linde', 'link', 'live',
+ 'living', 'lixil', 'lk', 'loan', 'loans', 'lol', 'london', 'lotte', 'lotto', 'love', 'lr', 'ls', 'lt', 'ltd',
+ 'ltda', 'lu', 'lupin', 'luxe', 'luxury', 'lv', 'ly', 'ma', 'madrid', 'maif', 'maison', 'man', 'management',
+ 'mango', 'market', 'marketing', 'markets', 'marriott', 'mba', 'mc', 'md', 'me', 'med', 'media', 'meet',
+ 'melbourne', 'meme', 'memorial', 'men', 'menu', 'meo', 'mg', 'mh', 'miami', 'microsoft', 'mil', 'mini', 'mk',
+ 'ml', 'mm', 'mma', 'mn', 'mo', 'mobi', 'mobily', 'moda', 'moe', 'moi', 'mom', 'monash', 'money', 'montblanc',
+ 'mormon', 'mortgage', 'moscow', 'motorcycles', 'mov', 'movie', 'movistar', 'mp', 'mq', 'mr', 'ms', 'mt',
+ 'mtn', 'mtpc', 'mtr', 'mu', 'museum', 'mutuelle', 'mv', 'mw', 'mx', 'my', 'mz', 'na', 'nadex', 'nagoya',
+ 'name', 'navy', 'nc', 'ne', 'nec', 'net', 'netbank', 'network', 'neustar', 'new', 'news', 'nexus', 'nf',
+ 'ng', 'ngo', 'nhk', 'ni', 'nico', 'ninja', 'nissan', 'nl', 'no', 'nokia', 'norton', 'nowruz', 'np', 'nr',
+ 'nra', 'nrw', 'ntt', 'nu', 'nyc', 'nz', 'obi', 'office', 'okinawa', 'om', 'omega', 'one', 'ong', 'onl',
+ 'online', 'ooo', 'oracle', 'orange', 'org', 'organic', 'origins', 'osaka', 'otsuka', 'ovh', 'pa', 'page',
+ 'panerai', 'paris', 'pars', 'partners', 'parts', 'party', 'pe', 'pet', 'pf', 'pg', 'ph', 'pharmacy',
+ 'philips', 'photo', 'photography', 'photos', 'physio', 'piaget', 'pics', 'pictet', 'pictures', 'pid', 'pin',
+ 'ping', 'pink', 'pizza', 'pk', 'pl', 'place', 'play', 'playstation', 'plumbing', 'plus', 'pm', 'pn', 'pohl',
+ 'poker', 'porn', 'post', 'pr', 'praxi', 'press', 'pro', 'prod', 'productions', 'prof', 'promo', 'properties',
+ 'property', 'protection', 'ps', 'pt', 'pub', 'pw', 'py', 'qa', 'qpon', 'quebec', 'racing', 're', 'read',
+ 'realtor', 'realty', 'recipes', 'red', 'redstone', 'redumbrella', 'rehab', 'reise', 'reisen', 'reit', 'ren',
+ 'rent', 'rentals', 'repair', 'report', 'republican', 'rest', 'restaurant', 'review', 'reviews', 'rexroth',
+ 'rich', 'ricoh', 'rio', 'rip', 'ro', 'rocher', 'rocks', 'rodeo', 'room', 'rs', 'rsvp', 'ru', 'ruhr', 'run',
+ 'rw', 'rwe', 'ryukyu', 'sa', 'saarland', 'safe', 'safety', 'sakura', 'sale', 'salon', 'samsung', 'sandvik',
+ 'sandvikcoromant', 'sanofi', 'sap', 'sapo', 'sarl', 'sas', 'saxo', 'sb', 'sbs', 'sc', 'sca', 'scb',
+ 'schaeffler', 'schmidt', 'scholarships', 'school', 'schule', 'schwarz', 'science', 'scor', 'scot', 'sd',
+ 'se', 'seat', 'security', 'seek', 'sener', 'services', 'seven', 'sew', 'sex', 'sexy', 'sfr', 'sg', 'sh',
+ 'sharp', 'shell', 'shia', 'shiksha', 'shoes', 'show', 'shriram', 'si', 'singles', 'site', 'sj', 'sk', 'ski',
+ 'sky', 'skype', 'sl', 'sm', 'smile', 'sn', 'sncf', 'so', 'soccer', 'social', 'software', 'sohu', 'solar',
+ 'solutions', 'sony', 'soy', 'space', 'spiegel', 'spreadbetting', 'sr', 'srl', 'st', 'stada', 'star', 'starhub',
+ 'statefarm', 'statoil', 'stc', 'stcgroup', 'stockholm', 'storage', 'studio', 'study', 'style', 'su', 'sucks',
+ 'supplies', 'supply', 'support', 'surf', 'surgery', 'suzuki', 'sv', 'swatch', 'swiss', 'sx', 'sy', 'sydney',
+ 'symantec', 'systems', 'sz', 'tab', 'taipei', 'tatamotors', 'tatar', 'tattoo', 'tax', 'taxi', 'tc', 'tci',
+ 'td', 'team', 'tech', 'technology', 'tel', 'telefonica', 'temasek', 'tennis', 'tf', 'tg', 'th', 'thd',
+ 'theater', 'theatre', 'tickets', 'tienda', 'tips', 'tires', 'tirol', 'tj', 'tk', 'tl', 'tm', 'tn', 'to',
+ 'today', 'tokyo', 'tools', 'top', 'toray', 'toshiba', 'tours', 'town', 'toyota', 'toys', 'tr', 'trade',
+ 'trading', 'training', 'travel', 'travelers', 'travelersinsurance', 'trust', 'trv', 'tt', 'tui', 'tushu',
+ 'tv', 'tw', 'tz', 'ua', 'ubs', 'ug', 'uk', 'university', 'uno', 'uol', 'us', 'uy', 'uz', 'va', 'vacations',
+ 'vana', 'vc', 've', 'vegas', 'ventures', 'verisign', 'versicherung', 'vet', 'vg', 'vi', 'viajes', 'video',
+ 'villas', 'vin', 'vip', 'virgin', 'vision', 'vista', 'vistaprint', 'viva', 'vlaanderen', 'vn', 'vodka', 'vote',
+ 'voting', 'voto', 'voyage', 'vu', 'wales', 'walter', 'wang', 'wanggou', 'watch', 'watches', 'webcam', 'weber',
+ 'website', 'wed', 'wedding', 'weir', 'wf', 'whoswho', 'wien', 'wiki', 'williamhill', 'win', 'windows', 'wine',
+ 'wme', 'work', 'works', 'world', 'ws', 'wtc', 'wtf', 'xbox', 'xerox', 'xin', 'कॉम', '佛山', '慈善', '集团',
+ '在线', 'í•œêµ', '点看', 'คà¸à¸¡', 'à¦à¦¾à¦°à¦¤', 'å…«å¦', 'موقع', '公益', 'å…¬å¸', '移动', 'æˆ‘çˆ±ä½ ', 'моÑква', 'қаз', 'онлайн',
+ 'Ñайт', 'Ñрб', 'бел', 'קו×', '时尚', '淡马锡', 'орг', 'नेट', '삼성', 'சிஙà¯à®•à®ªà¯à®ªà¯‚à®°à¯', 'å•†æ ‡', '商店', '商城', 'дети',
+ 'мкд', 'ãƒã‚¤ãƒ³ãƒˆ', 'æ–°é—»', '工行', 'كوم', 'ä¸æ–‡ç½‘', 'ä¸ä¿¡', 'ä¸å›½', 'ä¸åœ‹', '娱ä¹', 'è°·æŒ', 'à°à°¾à°°à°¤à±', 'ලංකà·', 'àªàª¾àª°àª¤',
+ 'à¤à¤¾à¤°à¤¤', '网店', 'संगठन', 'é¤åŽ…', '网络', 'ком', 'укр', '香港', '诺基亚', '飞利浦', 'å°æ¹¾', 'å°ç£', '手表', '手机',
+ 'мон', 'الجزائر', 'عمان', 'ارامكو', 'ایران', 'امارات', 'بازار', 'الاردن', 'موبايلي', 'بھارت', 'المغرب',
+ 'السعودية', 'سودان', 'همراه', 'عراق', 'مليسيا', '닷컴', '政府', 'شبكة', 'بيتك', 'გე', '机构', '组织机构',
+ 'å¥åº·', 'ไทย', 'سورية', 'руÑ', 'рф', 'ç å®', 'تونس', '大拿', 'ã¿ã‚“ãª', 'グーグル', 'ελ', '世界', 'à¨à¨¾à¨°à¨¤', '网å€',
+ 'ë‹·ë„·', 'コム', '游æˆ', 'vermögensberater', 'vermögensberatung', 'ä¼ä¸š', 'ä¿¡æ¯', 'مصر', 'قطر', '广东', 'இலஙà¯à®•à¯ˆ',
+ 'இநà¯à®¤à®¿à®¯à®¾', 'Õ°Õ¡Õµ', 'æ–°åŠ å¡', 'Ùلسطين', '政务', 'xperia', 'xxx', 'xyz', 'yachts', 'yamaxun', 'yandex', 'ye',
+ 'yodobashi', 'yoga', 'yokohama', 'youtube', 'yt', 'za', 'zara', 'zero', 'zip', 'zm', 'zone', 'zuerich', 'zw'
);
/**
@@ -557,7 +635,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
do {
// First check TLD
$matches = array();
- if (preg_match('/([^.]{2,10})$/i', end($domainParts), $matches) ||
+ if (preg_match('/([^.]{2,63})$/i', end($domainParts), $matches) ||
(end($domainParts) == 'ایران') || (end($domainParts) == 'ä¸å›½') ||
(end($domainParts) == 'å…¬å¸') || (end($domainParts) == '网络')) {
diff --git a/libs/bower_components/angular/angular.js b/libs/bower_components/angular/angular.js
index f7442c0b031cc8afab578e779f9adda096d7eb47..708243489644c5a2abfd5f54b30d623c096d6d36 100644
--- a/libs/bower_components/angular/angular.js
+++ b/libs/bower_components/angular/angular.js
@@ -16429,7 +16429,7 @@ function adjustMatchers(matchers) {
*
* - your app is hosted at url `http://myapp.example.com/`
* - but some of your templates are hosted on other domains you control such as
- * `http://srv01.assets.example.com/`, `http://srv02.assets.example.com/`, etc.
+ * `http://srv01.assets.example.com/`, `http://srv02.assets.example.com/`, etc.
* - and you have an open redirect at `http://myapp.example.com/clickThru?...`.
*
* Here is what a secure configuration for this scenario might look like:
@@ -28361,4 +28361,4 @@ var minlengthDirective = function() {
})(window, document);
-!window.angular.$$csp() && window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
\ No newline at end of file
+!window.angular.$$csp() && window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
diff --git a/libs/pChart/class/pData.class.php b/libs/pChart/class/pData.class.php
index 49d16a33bd2f52c63ed9eda1da90bb95f2006f09..d29e0d499c214d1ed6b37c775d12525ef362461e 100755
--- a/libs/pChart/class/pData.class.php
+++ b/libs/pChart/class/pData.class.php
@@ -1,789 +1,789 @@
-<?php
- /*
- pDraw - class to manipulate data arrays
-
- Version : 2.1.4
- Made by : Jean-Damien POGOLOTTI
- Last Update : 19/01/2014
-
- This file can be distributed under the license you can find at :
-
- http://www.pchart.net/license
-
- You can find the whole class documentation on the pChart web site.
- */
-
- /* Axis configuration */
- define("AXIS_FORMAT_DEFAULT" , 680001);
- define("AXIS_FORMAT_TIME" , 680002);
- define("AXIS_FORMAT_DATE" , 680003);
- define("AXIS_FORMAT_METRIC" , 680004);
- define("AXIS_FORMAT_CURRENCY" , 680005);
- define("AXIS_FORMAT_TRAFFIC" , 680006);
- define("AXIS_FORMAT_CUSTOM" , 680007);
-
- /* Axis position */
- define("AXIS_POSITION_LEFT" , 681001);
- define("AXIS_POSITION_RIGHT" , 681002);
- define("AXIS_POSITION_TOP" , 681001);
- define("AXIS_POSITION_BOTTOM" , 681002);
-
- /* Families of data points */
- define("SERIE_SHAPE_FILLEDCIRCLE" , 681011);
- define("SERIE_SHAPE_FILLEDTRIANGLE" , 681012);
- define("SERIE_SHAPE_FILLEDSQUARE" , 681013);
- define("SERIE_SHAPE_FILLEDDIAMOND" , 681017);
- define("SERIE_SHAPE_CIRCLE" , 681014);
- define("SERIE_SHAPE_TRIANGLE" , 681015);
- define("SERIE_SHAPE_SQUARE" , 681016);
- define("SERIE_SHAPE_DIAMOND" , 681018);
-
- /* Axis position */
- define("AXIS_X" , 682001);
- define("AXIS_Y" , 682002);
-
- /* Define value limits */
- define("ABSOLUTE_MIN" , -10000000000000);
- define("ABSOLUTE_MAX" , 10000000000000);
-
- /* Replacement to the PHP NULL keyword */
- define("VOID" , 0.123456789);
-
- /* Euro symbol for GD fonts */
- define("EURO_SYMBOL" , utf8_encode("€"));
-
- /* pData class definition */
- class pData
- {
- var $Data;
-
- var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46,"Alpha"=>100),
- "1"=>array("R"=>224,"G"=>100,"B"=>46,"Alpha"=>100),
- "2"=>array("R"=>224,"G"=>214,"B"=>46,"Alpha"=>100),
- "3"=>array("R"=>46,"G"=>151,"B"=>224,"Alpha"=>100),
- "4"=>array("R"=>176,"G"=>46,"B"=>224,"Alpha"=>100),
- "5"=>array("R"=>224,"G"=>46,"B"=>117,"Alpha"=>100),
- "6"=>array("R"=>92,"G"=>224,"B"=>46,"Alpha"=>100),
- "7"=>array("R"=>224,"G"=>176,"B"=>46,"Alpha"=>100));
-
- /* Class creator */
- function pData()
- {
- $this->Data = "";
- $this->Data["XAxisDisplay"] = AXIS_FORMAT_DEFAULT;
- $this->Data["XAxisFormat"] = NULL;
- $this->Data["XAxisName"] = NULL;
- $this->Data["XAxisUnit"] = NULL;
- $this->Data["Abscissa"] = NULL;
- $this->Data["AbsicssaPosition"] = AXIS_POSITION_BOTTOM;
-
- $this->Data["Axis"][0]["Display"] = AXIS_FORMAT_DEFAULT;
- $this->Data["Axis"][0]["Position"] = AXIS_POSITION_LEFT;
- $this->Data["Axis"][0]["Identity"] = AXIS_Y;
- }
-
- /* Add a single point or an array to the given serie */
- function addPoints($Values,$SerieName="Serie1")
- {
- if (!isset($this->Data["Series"][$SerieName]))
- $this->initialise($SerieName);
-
- if ( is_array($Values) )
- {
- foreach($Values as $Key => $Value)
- { $this->Data["Series"][$SerieName]["Data"][] = $Value; }
- }
- else
- $this->Data["Series"][$SerieName]["Data"][] = $Values;
-
- if ( $Values != VOID )
- {
- $StrippedData = $this->stripVOID($this->Data["Series"][$SerieName]["Data"]);
- if ( empty($StrippedData) ) { $this->Data["Series"][$SerieName]["Max"] = 0; $this->Data["Series"][$SerieName]["Min"] =0; return(0); }
- $this->Data["Series"][$SerieName]["Max"] = max($StrippedData);
- $this->Data["Series"][$SerieName]["Min"] = min($StrippedData);
- }
- }
-
- /* Strip VOID values */
- function stripVOID($Values)
- { if (!is_array($Values)) { return(array()); } $Result = array(); foreach($Values as $Key => $Value) { if ( $Value != VOID ) { $Result[] = $Value; } } return($Result); }
-
- /* Return the number of values contained in a given serie */
- function getSerieCount($Serie)
- { if (isset($this->Data["Series"][$Serie]["Data"])) { return(sizeof($this->Data["Series"][$Serie]["Data"])); } else { return(0); } }
-
- /* Remove a serie from the pData object */
- function removeSerie($Series)
- {
- if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
- foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie])) { unset($this->Data["Series"][$Serie]); } }
- }
-
- /* Return a value from given serie & index */
- function getValueAt($Serie,$Index=0)
- { if (isset($this->Data["Series"][$Serie]["Data"][$Index])) { return($this->Data["Series"][$Serie]["Data"][$Index]); } else { return(NULL); } }
-
- /* Return the values array */
- function getValues($Serie)
- { if (isset($this->Data["Series"][$Serie]["Data"])) { return($this->Data["Series"][$Serie]["Data"]); } else { return(NULL); } }
-
- /* Reverse the values in the given serie */
- function reverseSerie($Series)
- {
- if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
- foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]["Data"])) { $this->Data["Series"][$Serie]["Data"] = array_reverse($this->Data["Series"][$Serie]["Data"]); } }
- }
-
- /* Return the sum of the serie values */
- function getSum($Serie)
- { if (isset($this->Data["Series"][$Serie])) { return(array_sum($this->Data["Series"][$Serie]["Data"])); } else { return(NULL); } }
-
- /* Return the max value of a given serie */
- function getMax($Serie)
- { if (isset($this->Data["Series"][$Serie]["Max"])) { return($this->Data["Series"][$Serie]["Max"]); } else { return(NULL); } }
-
- /* Return the min value of a given serie */
- function getMin($Serie)
- { if (isset($this->Data["Series"][$Serie]["Min"])) { return($this->Data["Series"][$Serie]["Min"]); } else { return(NULL); } }
-
- /* Set the description of a given serie */
- function setSerieShape($Series,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
- {
- if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
- foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Shape"] = $Shape; } }
- }
-
- /* Set the description of a given serie */
- function setSerieDescription($Series,$Description="My serie")
- {
- if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
- foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Description"] = $Description; } }
- }
-
- /* Set a serie as "drawable" while calling a rendering function */
- function setSerieDrawable($Series,$Drawable=TRUE)
- {
- if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
- foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["isDrawable"] = $Drawable; } }
- }
-
- /* Set the icon associated to a given serie */
- function setSeriePicture($Series,$Picture=NULL)
- {
- if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
- foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Picture"] = $Picture; } }
- }
-
- /* Set the name of the X Axis */
- function setXAxisName($Name)
- { $this->Data["XAxisName"] = $Name; }
-
- /* Set the display mode of the X Axis */
- function setXAxisDisplay($Mode,$Format=NULL)
- { $this->Data["XAxisDisplay"] = $Mode; $this->Data["XAxisFormat"] = $Format; }
-
- /* Set the unit that will be displayed on the X axis */
- function setXAxisUnit($Unit)
- { $this->Data["XAxisUnit"] = $Unit; }
-
- /* Set the serie that will be used as abscissa */
- function setAbscissa($Serie)
- { if (isset($this->Data["Series"][$Serie])) { $this->Data["Abscissa"] = $Serie; } }
-
- function setAbsicssaPosition($Position = AXIS_POSITION_BOTTOM)
- { $this->Data["AbsicssaPosition"] = $Position; }
-
- /* Set the name of the abscissa axis */
- function setAbscissaName($Name)
- { $this->Data["AbscissaName"] = $Name; }
-
- /* Create a scatter group specifyin X and Y data series */
- function setScatterSerie($SerieX,$SerieY,$ID=0)
- { if (isset($this->Data["Series"][$SerieX]) && isset($this->Data["Series"][$SerieY]) ) { $this->initScatterSerie($ID); $this->Data["ScatterSeries"][$ID]["X"] = $SerieX; $this->Data["ScatterSeries"][$ID]["Y"] = $SerieY; } }
-
- /* Set the shape of a given sctatter serie */
- function setScatterSerieShape($ID,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
- { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Shape"] = $Shape; } }
-
- /* Set the description of a given scatter serie */
- function setScatterSerieDescription($ID,$Description="My serie")
- { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Description"] = $Description; } }
-
- /* Set the icon associated to a given scatter serie */
- function setScatterSeriePicture($ID,$Picture=NULL)
- { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Picture"] = $Picture; } }
-
- /* Set a scatter serie as "drawable" while calling a rendering function */
- function setScatterSerieDrawable($ID ,$Drawable=TRUE)
- { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["isDrawable"] = $Drawable; } }
-
- /* Define if a scatter serie should be draw with ticks */
- function setScatterSerieTicks($ID,$Width=0)
- { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Ticks"] = $Width; } }
-
- /* Define if a scatter serie should be draw with a special weight */
- function setScatterSerieWeight($ID,$Weight=0)
- { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Weight"] = $Weight; } }
-
- /* Associate a color to a scatter serie */
- function setScatterSerieColor($ID,$Format)
- {
- $R = isset($Format["R"]) ? $Format["R"] : 0;
- $G = isset($Format["G"]) ? $Format["G"] : 0;
- $B = isset($Format["B"]) ? $Format["B"] : 0;
- $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-
- if ( isset($this->Data["ScatterSeries"][$ID]) )
- {
- $this->Data["ScatterSeries"][$ID]["Color"]["R"] = $R;
- $this->Data["ScatterSeries"][$ID]["Color"]["G"] = $G;
- $this->Data["ScatterSeries"][$ID]["Color"]["B"] = $B;
- $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = $Alpha;
- }
- }
-
- /* Compute the series limits for an individual and global point of view */
- function limits()
- {
- $GlobalMin = ABSOLUTE_MAX;
- $GlobalMax = ABSOLUTE_MIN;
-
- foreach($this->Data["Series"] as $Key => $Value)
- {
- if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"] == TRUE)
- {
- if ( $GlobalMin > $this->Data["Series"][$Key]["Min"] ) { $GlobalMin = $this->Data["Series"][$Key]["Min"]; }
- if ( $GlobalMax < $this->Data["Series"][$Key]["Max"] ) { $GlobalMax = $this->Data["Series"][$Key]["Max"]; }
- }
- }
- $this->Data["Min"] = $GlobalMin;
- $this->Data["Max"] = $GlobalMax;
-
- return(array($GlobalMin,$GlobalMax));
- }
-
- /* Mark all series as drawable */
- function drawAll()
- { foreach($this->Data["Series"] as $Key => $Value) { if ( $this->Data["Abscissa"] != $Key ) { $this->Data["Series"][$Key]["isDrawable"]=TRUE; } } }
-
- /* Return the average value of the given serie */
- function getSerieAverage($Serie)
- {
- if ( isset($this->Data["Series"][$Serie]) )
- {
- $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
- return(array_sum($SerieData)/sizeof($SerieData));
- }
- else
- return(NULL);
- }
-
- /* Return the geometric mean of the given serie */
- function getGeometricMean($Serie)
- {
- if ( isset($this->Data["Series"][$Serie]) )
- {
- $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
- $Seriesum = 1; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum * $Value; }
- return(pow($Seriesum,1/sizeof($SerieData)));
- }
- else
- return(NULL);
- }
-
- /* Return the harmonic mean of the given serie */
- function getHarmonicMean($Serie)
- {
- if ( isset($this->Data["Series"][$Serie]) )
- {
- $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
- $Seriesum = 0; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum + 1/$Value; }
- return(sizeof($SerieData)/$Seriesum);
- }
- else
- return(NULL);
- }
-
- /* Return the standard deviation of the given serie */
- function getStandardDeviation($Serie)
- {
- if ( isset($this->Data["Series"][$Serie]) )
- {
- $Average = $this->getSerieAverage($Serie);
- $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
-
- $DeviationSum = 0;
- foreach($SerieData as $Key => $Value)
- $DeviationSum = $DeviationSum + ($Value-$Average)*($Value-$Average);
-
- $Deviation = sqrt($DeviationSum/count($SerieData));
-
- return($Deviation);
- }
- else
- return(NULL);
- }
-
- /* Return the Coefficient of variation of the given serie */
- function getCoefficientOfVariation($Serie)
- {
- if ( isset($this->Data["Series"][$Serie]) )
- {
- $Average = $this->getSerieAverage($Serie);
- $StandardDeviation = $this->getStandardDeviation($Serie);
-
- if ( $StandardDeviation != 0 )
- return($StandardDeviation/$Average);
- else
- return(NULL);
- }
- else
- return(NULL);
- }
-
- /* Return the median value of the given serie */
- function getSerieMedian($Serie)
- {
- if ( isset($this->Data["Series"][$Serie]) )
- {
- $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
- sort($SerieData);
- $SerieCenter = floor(sizeof($SerieData)/2);
-
- if ( isset($SerieData[$SerieCenter]) )
- return($SerieData[$SerieCenter]);
- else
- return(NULL);
- }
- else
- return(NULL);
- }
-
- /* Return the x th percentil of the given serie */
- function getSeriePercentile($Serie="Serie1",$Percentil=95)
- {
- if (!isset($this->Data["Series"][$Serie]["Data"])) { return(NULL); }
-
- $Values = count($this->Data["Series"][$Serie]["Data"])-1;
- if ( $Values < 0 ) { $Values = 0; }
-
- $PercentilID = floor(($Values/100)*$Percentil+.5);
- $SortedValues = $this->Data["Series"][$Serie]["Data"];
- sort($SortedValues);
-
- if ( is_numeric($SortedValues[$PercentilID]) )
- return($SortedValues[$PercentilID]);
- else
- return(NULL);
- }
-
- /* Add random values to a given serie */
- function addRandomValues($SerieName="Serie1",$Options="")
- {
- $Values = isset($Options["Values"]) ? $Options["Values"] : 20;
- $Min = isset($Options["Min"]) ? $Options["Min"] : 0;
- $Max = isset($Options["Max"]) ? $Options["Max"] : 100;
- $withFloat = isset($Options["withFloat"]) ? $Options["withFloat"] : FALSE;
-
- for ($i=0;$i<=$Values;$i++)
- {
- if ( $withFloat ) { $Value = rand($Min*100,$Max*100)/100; } else { $Value = rand($Min,$Max); }
- $this->addPoints($Value,$SerieName);
- }
- }
-
- /* Test if we have valid data */
- function containsData()
- {
- if (!isset($this->Data["Series"])) { return(FALSE); }
-
- $Result = FALSE;
- foreach($this->Data["Series"] as $Key => $Value)
- { if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"]==TRUE) { $Result=TRUE; } }
- return($Result);
- }
-
- /* Set the display mode of an Axis */
- function setAxisDisplay($AxisID,$Mode=AXIS_FORMAT_DEFAULT,$Format=NULL)
- {
- if ( isset($this->Data["Axis"][$AxisID] ) )
- {
- $this->Data["Axis"][$AxisID]["Display"] = $Mode;
- if ( $Format != NULL ) { $this->Data["Axis"][$AxisID]["Format"] = $Format; }
- }
- }
-
- /* Set the position of an Axis */
- function setAxisPosition($AxisID,$Position=AXIS_POSITION_LEFT)
- { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Position"] = $Position; } }
-
- /* Associate an unit to an axis */
- function setAxisUnit($AxisID,$Unit)
- { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Unit"] = $Unit; } }
-
- /* Associate a name to an axis */
- function setAxisName($AxisID,$Name)
- { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Name"] = $Name; } }
-
- /* Associate a color to an axis */
- function setAxisColor($AxisID,$Format)
- {
- $R = isset($Format["R"]) ? $Format["R"] : 0;
- $G = isset($Format["G"]) ? $Format["G"] : 0;
- $B = isset($Format["B"]) ? $Format["B"] : 0;
- $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-
- if ( isset($this->Data["Axis"][$AxisID] ) )
- {
- $this->Data["Axis"][$AxisID]["Color"]["R"] = $R;
- $this->Data["Axis"][$AxisID]["Color"]["G"] = $G;
- $this->Data["Axis"][$AxisID]["Color"]["B"] = $B;
- $this->Data["Axis"][$AxisID]["Color"]["Alpha"] = $Alpha;
- }
- }
-
-
- /* Design an axis as X or Y member */
- function setAxisXY($AxisID,$Identity=AXIS_Y)
- { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Identity"] = $Identity; } }
-
- /* Associate one data serie with one axis */
- function setSerieOnAxis($Series,$AxisID)
- {
- if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
- foreach($Series as $Key => $Serie)
- {
- $PreviousAxis = $this->Data["Series"][$Serie]["Axis"];
-
- /* Create missing axis */
- if ( !isset($this->Data["Axis"][$AxisID] ) )
- { $this->Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_LEFT; $this->Data["Axis"][$AxisID]["Identity"] = AXIS_Y;}
-
- $this->Data["Series"][$Serie]["Axis"] = $AxisID;
-
- /* Cleanup unused axis */
- $Found = FALSE;
- foreach($this->Data["Series"] as $SerieName => $Values) { if ( $Values["Axis"] == $PreviousAxis ) { $Found = TRUE; } }
- if (!$Found) { unset($this->Data["Axis"][$PreviousAxis]); }
- }
- }
-
- /* Define if a serie should be draw with ticks */
- function setSerieTicks($Series,$Width=0)
- {
- if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
- foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Ticks"] = $Width; } }
- }
-
- /* Define if a serie should be draw with a special weight */
- function setSerieWeight($Series,$Weight=0)
- {
- if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
- foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Weight"] = $Weight; } }
- }
-
- /* Returns the palette of the given serie */
- function getSeriePalette($Serie)
- {
- if ( !isset($this->Data["Series"][$Serie]) ) { return(NULL); }
-
- $Result = "";
- $Result["R"] = $this->Data["Series"][$Serie]["Color"]["R"];
- $Result["G"] = $this->Data["Series"][$Serie]["Color"]["G"];
- $Result["B"] = $this->Data["Series"][$Serie]["Color"]["B"];
- $Result["Alpha"] = $this->Data["Series"][$Serie]["Color"]["Alpha"];
-
- return($Result);
- }
-
- /* Set the color of one serie */
- function setPalette($Series,$Format=NULL)
- {
- if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-
- foreach($Series as $Key => $Serie)
- {
- $R = isset($Format["R"]) ? $Format["R"] : 0;
- $G = isset($Format["G"]) ? $Format["G"] : 0;
- $B = isset($Format["B"]) ? $Format["B"] : 0;
- $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-
- if ( isset($this->Data["Series"][$Serie]) )
- {
- $OldR = $this->Data["Series"][$Serie]["Color"]["R"]; $OldG = $this->Data["Series"][$Serie]["Color"]["G"]; $OldB = $this->Data["Series"][$Serie]["Color"]["B"];
- $this->Data["Series"][$Serie]["Color"]["R"] = $R;
- $this->Data["Series"][$Serie]["Color"]["G"] = $G;
- $this->Data["Series"][$Serie]["Color"]["B"] = $B;
- $this->Data["Series"][$Serie]["Color"]["Alpha"] = $Alpha;
-
- /* Do reverse processing on the internal palette array */
- foreach ($this->Palette as $Key => $Value)
- { if ($Value["R"] == $OldR && $Value["G"] == $OldG && $Value["B"] == $OldB) { $this->Palette[$Key]["R"] = $R; $this->Palette[$Key]["G"] = $G; $this->Palette[$Key]["B"] = $B; $this->Palette[$Key]["Alpha"] = $Alpha;} }
- }
- }
- }
-
- /* Load a palette file */
- function loadPalette($FileName,$Overwrite=FALSE)
- {
- if ( !file_exists($FileName) ) { return(-1); }
- if ( $Overwrite ) { $this->Palette = ""; }
-
- $fileHandle = @fopen($FileName, "r");
- if (!$fileHandle) { return(-1); }
- while (!feof($fileHandle))
- {
- $buffer = fgets($fileHandle, 4096);
- if ( preg_match("/,/",$buffer) )
- {
- list($R,$G,$B,$Alpha) = preg_split("/,/",$buffer);
- if ( $this->Palette == "" ) { $ID = 0; } else { $ID = count($this->Palette); }
- $this->Palette[$ID] = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
- }
- }
- fclose($fileHandle);
-
- /* Apply changes to current series */
- $ID = 0;
- if ( isset($this->Data["Series"]))
- {
- foreach($this->Data["Series"] as $Key => $Value)
- {
- if ( !isset($this->Palette[$ID]) )
- $this->Data["Series"][$Key]["Color"] = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>0);
- else
- $this->Data["Series"][$Key]["Color"] = $this->Palette[$ID];
- $ID++;
- }
- }
- }
-
- /* Initialise a given scatter serie */
- function initScatterSerie($ID)
- {
- if ( isset($this->Data["ScatterSeries"][$ID]) ) { return(0); }
-
- $this->Data["ScatterSeries"][$ID]["Description"] = "Scatter ".$ID;
- $this->Data["ScatterSeries"][$ID]["isDrawable"] = TRUE;
- $this->Data["ScatterSeries"][$ID]["Picture"] = NULL;
- $this->Data["ScatterSeries"][$ID]["Ticks"] = 0;
- $this->Data["ScatterSeries"][$ID]["Weight"] = 0;
-
- if ( isset($this->Palette[$ID]) )
- $this->Data["ScatterSeries"][$ID]["Color"] = $this->Palette[$ID];
- else
- {
- $this->Data["ScatterSeries"][$ID]["Color"]["R"] = rand(0,255);
- $this->Data["ScatterSeries"][$ID]["Color"]["G"] = rand(0,255);
- $this->Data["ScatterSeries"][$ID]["Color"]["B"] = rand(0,255);
- $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = 100;
- }
- }
-
- /* Initialise a given serie */
- function initialise($Serie)
- {
- if ( isset($this->Data["Series"]) ) { $ID = count($this->Data["Series"]); } else { $ID = 0; }
-
- $this->Data["Series"][$Serie]["Description"] = $Serie;
- $this->Data["Series"][$Serie]["isDrawable"] = TRUE;
- $this->Data["Series"][$Serie]["Picture"] = NULL;
- $this->Data["Series"][$Serie]["Max"] = NULL;
- $this->Data["Series"][$Serie]["Min"] = NULL;
- $this->Data["Series"][$Serie]["Axis"] = 0;
- $this->Data["Series"][$Serie]["Ticks"] = 0;
- $this->Data["Series"][$Serie]["Weight"] = 0;
- $this->Data["Series"][$Serie]["Shape"] = SERIE_SHAPE_FILLEDCIRCLE;
-
- if ( isset($this->Palette[$ID]) )
- $this->Data["Series"][$Serie]["Color"] = $this->Palette[$ID];
- else
- {
- $this->Data["Series"][$Serie]["Color"]["R"] = rand(0,255);
- $this->Data["Series"][$Serie]["Color"]["G"] = rand(0,255);
- $this->Data["Series"][$Serie]["Color"]["B"] = rand(0,255);
- $this->Data["Series"][$Serie]["Color"]["Alpha"] = 100;
- }
- }
-
- function normalize($NormalizationFactor=100,$UnitChange=NULL,$Round=1)
- {
- $Abscissa = $this->Data["Abscissa"];
-
- $SelectedSeries = "";
- $MaxVal = 0;
- foreach($this->Data["Axis"] as $AxisID => $Axis)
- {
- if ( $UnitChange != NULL ) { $this->Data["Axis"][$AxisID]["Unit"] = $UnitChange; }
-
- foreach($this->Data["Series"] as $SerieName => $Serie)
- {
- if ($Serie["Axis"] == $AxisID && $Serie["isDrawable"] == TRUE && $SerieName != $Abscissa)
- {
- $SelectedSeries[$SerieName] = $SerieName;
-
- if ( count($Serie["Data"] ) > $MaxVal ) { $MaxVal = count($Serie["Data"]); }
- }
- }
- }
-
- for($i=0;$i<=$MaxVal-1;$i++)
- {
- $Factor = 0;
- foreach ($SelectedSeries as $Key => $SerieName )
- {
- $Value = $this->Data["Series"][$SerieName]["Data"][$i];
- if ( $Value != VOID )
- $Factor = $Factor + abs($Value);
- }
-
- if ( $Factor != 0 )
- {
- $Factor = $NormalizationFactor / $Factor;
-
- foreach ($SelectedSeries as $Key => $SerieName )
- {
- $Value = $this->Data["Series"][$SerieName]["Data"][$i];
-
- if ( $Value != VOID && $Factor != $NormalizationFactor )
- $this->Data["Series"][$SerieName]["Data"][$i] = round(abs($Value)*$Factor,$Round);
- elseif ( $Value == VOID || $Value == 0 )
- $this->Data["Series"][$SerieName]["Data"][$i] = VOID;
- elseif ( $Factor == $NormalizationFactor )
- $this->Data["Series"][$SerieName]["Data"][$i] = $NormalizationFactor;
- }
- }
- }
-
- foreach ($SelectedSeries as $Key => $SerieName )
- {
- $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
- $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
- }
- }
-
- /* Load data from a CSV (or similar) data source */
- function importFromCSV($FileName,$Options="")
- {
- $Delimiter = isset($Options["Delimiter"]) ? $Options["Delimiter"] : ",";
- $GotHeader = isset($Options["GotHeader"]) ? $Options["GotHeader"] : FALSE;
- $SkipColumns = isset($Options["SkipColumns"]) ? $Options["SkipColumns"] : array(-1);
- $DefaultSerieName = isset($Options["DefaultSerieName"]) ? $Options["DefaultSerieName"] : "Serie";
-
- $Handle = @fopen($FileName,"r");
- if ($Handle)
- {
- $HeaderParsed = FALSE; $SerieNames = "";
- while (!feof($Handle))
- {
- $Buffer = fgets($Handle, 4096);
- $Buffer = str_replace(chr(10),"",$Buffer);
- $Buffer = str_replace(chr(13),"",$Buffer);
- $Values = preg_split("/".$Delimiter."/",$Buffer);
-
- if ( $Buffer != "" )
- {
- if ( $GotHeader && !$HeaderParsed )
- {
- foreach($Values as $Key => $Name) { if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $Name; } }
- $HeaderParsed = TRUE;
- }
- else
- {
- if ($SerieNames == "" ) { foreach($Values as $Key => $Name) { if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $DefaultSerieName.$Key; } } }
- foreach($Values as $Key => $Value) { if ( !in_array($Key,$SkipColumns) ) { $this->addPoints($Value,$SerieNames[$Key]); } }
- }
- }
- }
- fclose($Handle);
- }
- }
-
- /* Create a dataset based on a formula */
- /* COMMENTED BY PIWIK to avoid eval()
- function createFunctionSerie($SerieName,$Formula="",$Options="")
- {
- $MinX = isset($Options["MinX"]) ? $Options["MinX"] : -10;
- $MaxX = isset($Options["MaxX"]) ? $Options["MaxX"] : 10;
- $XStep = isset($Options["XStep"]) ? $Options["XStep"] : 1;
- $AutoDescription = isset($Options["AutoDescription"]) ? $Options["AutoDescription"] : FALSE;
- $RecordAbscissa = isset($Options["RecordAbscissa"]) ? $Options["RecordAbscissa"] : FALSE;
- $AbscissaSerie = isset($Options["AbscissaSerie"]) ? $Options["AbscissaSerie"] : "Abscissa";
-
- if ( $Formula == "" ) { return(0); }
-
- $Result = ""; $Abscissa = "";
- for($i=$MinX; $i<=$MaxX; $i=$i+$XStep)
- {
- $Expression = "\$return = '!'.(".str_replace("z",$i,$Formula).");";
- if ( @eval($Expression) === FALSE ) { $return = VOID; }
- if ( $return == "!" ) { $return = VOID; } else { $return = $this->right($return,strlen($return)-1); }
- if ( $return == "NAN" ) { $return = VOID; }
- if ( $return == "INF" ) { $return = VOID; }
- if ( $return == "-INF" ) { $return = VOID; }
-
- $Abscissa[] = $i;
- $Result[] = $return;
- }
-
- $this->addPoints($Result,$SerieName);
- if ( $AutoDescription ) { $this->setSerieDescription($SerieName,$Formula); }
- if ( $RecordAbscissa ) { $this->addPoints($Abscissa,$AbscissaSerie); }
- }*/
-
- function negateValues($Series)
- {
- if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
- foreach($Series as $Key => $SerieName)
- {
- if (isset($this->Data["Series"][$SerieName]))
- {
- $Data = "";
- foreach($this->Data["Series"][$SerieName]["Data"] as $Key => $Value)
- { if ( $Value == VOID ) { $Data[] = VOID; } else { $Data[] = -$Value; } }
- $this->Data["Series"][$SerieName]["Data"] = $Data;
-
- $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
- $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
- }
- }
- }
-
- /* Return the data & configuration of the series */
- function getData()
- { return($this->Data); }
-
- /* Save a palette element */
- function savePalette($ID,$Color)
- { $this->Palette[$ID] = $Color; }
-
- /* Return the palette of the series */
- function getPalette()
- { return($this->Palette); }
-
- /* Called by the scaling algorithm to save the config */
- function saveAxisConfig($Axis) { $this->Data["Axis"]=$Axis; }
-
- /* Save the Y Margin if set */
- function saveYMargin($Value) { $this->Data["YMargin"]=$Value; }
-
- /* Save extended configuration to the pData object */
- function saveExtendedData($Tag,$Values) { $this->Data["Extended"][$Tag]=$Values; }
-
- /* Called by the scaling algorithm to save the orientation of the scale */
- function saveOrientation($Orientation) { $this->Data["Orientation"]=$Orientation; }
-
- /* Convert a string to a single elements array */
- function convertToArray($Value)
- { $Values = ""; $Values[] = $Value; return($Values); }
-
- /* Class string wrapper */
- function __toString()
- { return("pData object."); }
-
- function left($value,$NbChar) { return substr($value,0,$NbChar); }
- function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }
- function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }
- }
+<?php
+ /*
+ pDraw - class to manipulate data arrays
+
+ Version : 2.1.4
+ Made by : Jean-Damien POGOLOTTI
+ Last Update : 19/01/2014
+
+ This file can be distributed under the license you can find at :
+
+ http://www.pchart.net/license
+
+ You can find the whole class documentation on the pChart web site.
+ */
+
+ /* Axis configuration */
+ define("AXIS_FORMAT_DEFAULT" , 680001);
+ define("AXIS_FORMAT_TIME" , 680002);
+ define("AXIS_FORMAT_DATE" , 680003);
+ define("AXIS_FORMAT_METRIC" , 680004);
+ define("AXIS_FORMAT_CURRENCY" , 680005);
+ define("AXIS_FORMAT_TRAFFIC" , 680006);
+ define("AXIS_FORMAT_CUSTOM" , 680007);
+
+ /* Axis position */
+ define("AXIS_POSITION_LEFT" , 681001);
+ define("AXIS_POSITION_RIGHT" , 681002);
+ define("AXIS_POSITION_TOP" , 681001);
+ define("AXIS_POSITION_BOTTOM" , 681002);
+
+ /* Families of data points */
+ define("SERIE_SHAPE_FILLEDCIRCLE" , 681011);
+ define("SERIE_SHAPE_FILLEDTRIANGLE" , 681012);
+ define("SERIE_SHAPE_FILLEDSQUARE" , 681013);
+ define("SERIE_SHAPE_FILLEDDIAMOND" , 681017);
+ define("SERIE_SHAPE_CIRCLE" , 681014);
+ define("SERIE_SHAPE_TRIANGLE" , 681015);
+ define("SERIE_SHAPE_SQUARE" , 681016);
+ define("SERIE_SHAPE_DIAMOND" , 681018);
+
+ /* Axis position */
+ define("AXIS_X" , 682001);
+ define("AXIS_Y" , 682002);
+
+ /* Define value limits */
+ define("ABSOLUTE_MIN" , -10000000000000);
+ define("ABSOLUTE_MAX" , 10000000000000);
+
+ /* Replacement to the PHP NULL keyword */
+ define("VOID" , 0.123456789);
+
+ /* Euro symbol for GD fonts */
+ define("EURO_SYMBOL" , utf8_encode("€"));
+
+ /* pData class definition */
+ class pData
+ {
+ var $Data;
+
+ var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46,"Alpha"=>100),
+ "1"=>array("R"=>224,"G"=>100,"B"=>46,"Alpha"=>100),
+ "2"=>array("R"=>224,"G"=>214,"B"=>46,"Alpha"=>100),
+ "3"=>array("R"=>46,"G"=>151,"B"=>224,"Alpha"=>100),
+ "4"=>array("R"=>176,"G"=>46,"B"=>224,"Alpha"=>100),
+ "5"=>array("R"=>224,"G"=>46,"B"=>117,"Alpha"=>100),
+ "6"=>array("R"=>92,"G"=>224,"B"=>46,"Alpha"=>100),
+ "7"=>array("R"=>224,"G"=>176,"B"=>46,"Alpha"=>100));
+
+ /* Class creator */
+ function __construct()
+ {
+ $this->Data = "";
+ $this->Data["XAxisDisplay"] = AXIS_FORMAT_DEFAULT;
+ $this->Data["XAxisFormat"] = NULL;
+ $this->Data["XAxisName"] = NULL;
+ $this->Data["XAxisUnit"] = NULL;
+ $this->Data["Abscissa"] = NULL;
+ $this->Data["AbsicssaPosition"] = AXIS_POSITION_BOTTOM;
+
+ $this->Data["Axis"][0]["Display"] = AXIS_FORMAT_DEFAULT;
+ $this->Data["Axis"][0]["Position"] = AXIS_POSITION_LEFT;
+ $this->Data["Axis"][0]["Identity"] = AXIS_Y;
+ }
+
+ /* Add a single point or an array to the given serie */
+ function addPoints($Values,$SerieName="Serie1")
+ {
+ if (!isset($this->Data["Series"][$SerieName]))
+ $this->initialise($SerieName);
+
+ if ( is_array($Values) )
+ {
+ foreach($Values as $Key => $Value)
+ { $this->Data["Series"][$SerieName]["Data"][] = $Value; }
+ }
+ else
+ $this->Data["Series"][$SerieName]["Data"][] = $Values;
+
+ if ( $Values != VOID )
+ {
+ $StrippedData = $this->stripVOID($this->Data["Series"][$SerieName]["Data"]);
+ if ( empty($StrippedData) ) { $this->Data["Series"][$SerieName]["Max"] = 0; $this->Data["Series"][$SerieName]["Min"] =0; return(0); }
+ $this->Data["Series"][$SerieName]["Max"] = max($StrippedData);
+ $this->Data["Series"][$SerieName]["Min"] = min($StrippedData);
+ }
+ }
+
+ /* Strip VOID values */
+ function stripVOID($Values)
+ { if (!is_array($Values)) { return(array()); } $Result = array(); foreach($Values as $Key => $Value) { if ( $Value != VOID ) { $Result[] = $Value; } } return($Result); }
+
+ /* Return the number of values contained in a given serie */
+ function getSerieCount($Serie)
+ { if (isset($this->Data["Series"][$Serie]["Data"])) { return(sizeof($this->Data["Series"][$Serie]["Data"])); } else { return(0); } }
+
+ /* Remove a serie from the pData object */
+ function removeSerie($Series)
+ {
+ if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+ foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie])) { unset($this->Data["Series"][$Serie]); } }
+ }
+
+ /* Return a value from given serie & index */
+ function getValueAt($Serie,$Index=0)
+ { if (isset($this->Data["Series"][$Serie]["Data"][$Index])) { return($this->Data["Series"][$Serie]["Data"][$Index]); } else { return(NULL); } }
+
+ /* Return the values array */
+ function getValues($Serie)
+ { if (isset($this->Data["Series"][$Serie]["Data"])) { return($this->Data["Series"][$Serie]["Data"]); } else { return(NULL); } }
+
+ /* Reverse the values in the given serie */
+ function reverseSerie($Series)
+ {
+ if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+ foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]["Data"])) { $this->Data["Series"][$Serie]["Data"] = array_reverse($this->Data["Series"][$Serie]["Data"]); } }
+ }
+
+ /* Return the sum of the serie values */
+ function getSum($Serie)
+ { if (isset($this->Data["Series"][$Serie])) { return(array_sum($this->Data["Series"][$Serie]["Data"])); } else { return(NULL); } }
+
+ /* Return the max value of a given serie */
+ function getMax($Serie)
+ { if (isset($this->Data["Series"][$Serie]["Max"])) { return($this->Data["Series"][$Serie]["Max"]); } else { return(NULL); } }
+
+ /* Return the min value of a given serie */
+ function getMin($Serie)
+ { if (isset($this->Data["Series"][$Serie]["Min"])) { return($this->Data["Series"][$Serie]["Min"]); } else { return(NULL); } }
+
+ /* Set the description of a given serie */
+ function setSerieShape($Series,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
+ {
+ if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+ foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Shape"] = $Shape; } }
+ }
+
+ /* Set the description of a given serie */
+ function setSerieDescription($Series,$Description="My serie")
+ {
+ if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+ foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Description"] = $Description; } }
+ }
+
+ /* Set a serie as "drawable" while calling a rendering function */
+ function setSerieDrawable($Series,$Drawable=TRUE)
+ {
+ if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+ foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["isDrawable"] = $Drawable; } }
+ }
+
+ /* Set the icon associated to a given serie */
+ function setSeriePicture($Series,$Picture=NULL)
+ {
+ if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+ foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Picture"] = $Picture; } }
+ }
+
+ /* Set the name of the X Axis */
+ function setXAxisName($Name)
+ { $this->Data["XAxisName"] = $Name; }
+
+ /* Set the display mode of the X Axis */
+ function setXAxisDisplay($Mode,$Format=NULL)
+ { $this->Data["XAxisDisplay"] = $Mode; $this->Data["XAxisFormat"] = $Format; }
+
+ /* Set the unit that will be displayed on the X axis */
+ function setXAxisUnit($Unit)
+ { $this->Data["XAxisUnit"] = $Unit; }
+
+ /* Set the serie that will be used as abscissa */
+ function setAbscissa($Serie)
+ { if (isset($this->Data["Series"][$Serie])) { $this->Data["Abscissa"] = $Serie; } }
+
+ function setAbsicssaPosition($Position = AXIS_POSITION_BOTTOM)
+ { $this->Data["AbsicssaPosition"] = $Position; }
+
+ /* Set the name of the abscissa axis */
+ function setAbscissaName($Name)
+ { $this->Data["AbscissaName"] = $Name; }
+
+ /* Create a scatter group specifyin X and Y data series */
+ function setScatterSerie($SerieX,$SerieY,$ID=0)
+ { if (isset($this->Data["Series"][$SerieX]) && isset($this->Data["Series"][$SerieY]) ) { $this->initScatterSerie($ID); $this->Data["ScatterSeries"][$ID]["X"] = $SerieX; $this->Data["ScatterSeries"][$ID]["Y"] = $SerieY; } }
+
+ /* Set the shape of a given sctatter serie */
+ function setScatterSerieShape($ID,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
+ { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Shape"] = $Shape; } }
+
+ /* Set the description of a given scatter serie */
+ function setScatterSerieDescription($ID,$Description="My serie")
+ { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Description"] = $Description; } }
+
+ /* Set the icon associated to a given scatter serie */
+ function setScatterSeriePicture($ID,$Picture=NULL)
+ { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Picture"] = $Picture; } }
+
+ /* Set a scatter serie as "drawable" while calling a rendering function */
+ function setScatterSerieDrawable($ID ,$Drawable=TRUE)
+ { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["isDrawable"] = $Drawable; } }
+
+ /* Define if a scatter serie should be draw with ticks */
+ function setScatterSerieTicks($ID,$Width=0)
+ { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Ticks"] = $Width; } }
+
+ /* Define if a scatter serie should be draw with a special weight */
+ function setScatterSerieWeight($ID,$Weight=0)
+ { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Weight"] = $Weight; } }
+
+ /* Associate a color to a scatter serie */
+ function setScatterSerieColor($ID,$Format)
+ {
+ $R = isset($Format["R"]) ? $Format["R"] : 0;
+ $G = isset($Format["G"]) ? $Format["G"] : 0;
+ $B = isset($Format["B"]) ? $Format["B"] : 0;
+ $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+
+ if ( isset($this->Data["ScatterSeries"][$ID]) )
+ {
+ $this->Data["ScatterSeries"][$ID]["Color"]["R"] = $R;
+ $this->Data["ScatterSeries"][$ID]["Color"]["G"] = $G;
+ $this->Data["ScatterSeries"][$ID]["Color"]["B"] = $B;
+ $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = $Alpha;
+ }
+ }
+
+ /* Compute the series limits for an individual and global point of view */
+ function limits()
+ {
+ $GlobalMin = ABSOLUTE_MAX;
+ $GlobalMax = ABSOLUTE_MIN;
+
+ foreach($this->Data["Series"] as $Key => $Value)
+ {
+ if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"] == TRUE)
+ {
+ if ( $GlobalMin > $this->Data["Series"][$Key]["Min"] ) { $GlobalMin = $this->Data["Series"][$Key]["Min"]; }
+ if ( $GlobalMax < $this->Data["Series"][$Key]["Max"] ) { $GlobalMax = $this->Data["Series"][$Key]["Max"]; }
+ }
+ }
+ $this->Data["Min"] = $GlobalMin;
+ $this->Data["Max"] = $GlobalMax;
+
+ return(array($GlobalMin,$GlobalMax));
+ }
+
+ /* Mark all series as drawable */
+ function drawAll()
+ { foreach($this->Data["Series"] as $Key => $Value) { if ( $this->Data["Abscissa"] != $Key ) { $this->Data["Series"][$Key]["isDrawable"]=TRUE; } } }
+
+ /* Return the average value of the given serie */
+ function getSerieAverage($Serie)
+ {
+ if ( isset($this->Data["Series"][$Serie]) )
+ {
+ $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+ return(array_sum($SerieData)/sizeof($SerieData));
+ }
+ else
+ return(NULL);
+ }
+
+ /* Return the geometric mean of the given serie */
+ function getGeometricMean($Serie)
+ {
+ if ( isset($this->Data["Series"][$Serie]) )
+ {
+ $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+ $Seriesum = 1; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum * $Value; }
+ return(pow($Seriesum,1/sizeof($SerieData)));
+ }
+ else
+ return(NULL);
+ }
+
+ /* Return the harmonic mean of the given serie */
+ function getHarmonicMean($Serie)
+ {
+ if ( isset($this->Data["Series"][$Serie]) )
+ {
+ $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+ $Seriesum = 0; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum + 1/$Value; }
+ return(sizeof($SerieData)/$Seriesum);
+ }
+ else
+ return(NULL);
+ }
+
+ /* Return the standard deviation of the given serie */
+ function getStandardDeviation($Serie)
+ {
+ if ( isset($this->Data["Series"][$Serie]) )
+ {
+ $Average = $this->getSerieAverage($Serie);
+ $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+
+ $DeviationSum = 0;
+ foreach($SerieData as $Key => $Value)
+ $DeviationSum = $DeviationSum + ($Value-$Average)*($Value-$Average);
+
+ $Deviation = sqrt($DeviationSum/count($SerieData));
+
+ return($Deviation);
+ }
+ else
+ return(NULL);
+ }
+
+ /* Return the Coefficient of variation of the given serie */
+ function getCoefficientOfVariation($Serie)
+ {
+ if ( isset($this->Data["Series"][$Serie]) )
+ {
+ $Average = $this->getSerieAverage($Serie);
+ $StandardDeviation = $this->getStandardDeviation($Serie);
+
+ if ( $StandardDeviation != 0 )
+ return($StandardDeviation/$Average);
+ else
+ return(NULL);
+ }
+ else
+ return(NULL);
+ }
+
+ /* Return the median value of the given serie */
+ function getSerieMedian($Serie)
+ {
+ if ( isset($this->Data["Series"][$Serie]) )
+ {
+ $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+ sort($SerieData);
+ $SerieCenter = floor(sizeof($SerieData)/2);
+
+ if ( isset($SerieData[$SerieCenter]) )
+ return($SerieData[$SerieCenter]);
+ else
+ return(NULL);
+ }
+ else
+ return(NULL);
+ }
+
+ /* Return the x th percentil of the given serie */
+ function getSeriePercentile($Serie="Serie1",$Percentil=95)
+ {
+ if (!isset($this->Data["Series"][$Serie]["Data"])) { return(NULL); }
+
+ $Values = count($this->Data["Series"][$Serie]["Data"])-1;
+ if ( $Values < 0 ) { $Values = 0; }
+
+ $PercentilID = floor(($Values/100)*$Percentil+.5);
+ $SortedValues = $this->Data["Series"][$Serie]["Data"];
+ sort($SortedValues);
+
+ if ( is_numeric($SortedValues[$PercentilID]) )
+ return($SortedValues[$PercentilID]);
+ else
+ return(NULL);
+ }
+
+ /* Add random values to a given serie */
+ function addRandomValues($SerieName="Serie1",$Options="")
+ {
+ $Values = isset($Options["Values"]) ? $Options["Values"] : 20;
+ $Min = isset($Options["Min"]) ? $Options["Min"] : 0;
+ $Max = isset($Options["Max"]) ? $Options["Max"] : 100;
+ $withFloat = isset($Options["withFloat"]) ? $Options["withFloat"] : FALSE;
+
+ for ($i=0;$i<=$Values;$i++)
+ {
+ if ( $withFloat ) { $Value = rand($Min*100,$Max*100)/100; } else { $Value = rand($Min,$Max); }
+ $this->addPoints($Value,$SerieName);
+ }
+ }
+
+ /* Test if we have valid data */
+ function containsData()
+ {
+ if (!isset($this->Data["Series"])) { return(FALSE); }
+
+ $Result = FALSE;
+ foreach($this->Data["Series"] as $Key => $Value)
+ { if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"]==TRUE) { $Result=TRUE; } }
+ return($Result);
+ }
+
+ /* Set the display mode of an Axis */
+ function setAxisDisplay($AxisID,$Mode=AXIS_FORMAT_DEFAULT,$Format=NULL)
+ {
+ if ( isset($this->Data["Axis"][$AxisID] ) )
+ {
+ $this->Data["Axis"][$AxisID]["Display"] = $Mode;
+ if ( $Format != NULL ) { $this->Data["Axis"][$AxisID]["Format"] = $Format; }
+ }
+ }
+
+ /* Set the position of an Axis */
+ function setAxisPosition($AxisID,$Position=AXIS_POSITION_LEFT)
+ { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Position"] = $Position; } }
+
+ /* Associate an unit to an axis */
+ function setAxisUnit($AxisID,$Unit)
+ { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Unit"] = $Unit; } }
+
+ /* Associate a name to an axis */
+ function setAxisName($AxisID,$Name)
+ { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Name"] = $Name; } }
+
+ /* Associate a color to an axis */
+ function setAxisColor($AxisID,$Format)
+ {
+ $R = isset($Format["R"]) ? $Format["R"] : 0;
+ $G = isset($Format["G"]) ? $Format["G"] : 0;
+ $B = isset($Format["B"]) ? $Format["B"] : 0;
+ $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+
+ if ( isset($this->Data["Axis"][$AxisID] ) )
+ {
+ $this->Data["Axis"][$AxisID]["Color"]["R"] = $R;
+ $this->Data["Axis"][$AxisID]["Color"]["G"] = $G;
+ $this->Data["Axis"][$AxisID]["Color"]["B"] = $B;
+ $this->Data["Axis"][$AxisID]["Color"]["Alpha"] = $Alpha;
+ }
+ }
+
+
+ /* Design an axis as X or Y member */
+ function setAxisXY($AxisID,$Identity=AXIS_Y)
+ { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Identity"] = $Identity; } }
+
+ /* Associate one data serie with one axis */
+ function setSerieOnAxis($Series,$AxisID)
+ {
+ if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+ foreach($Series as $Key => $Serie)
+ {
+ $PreviousAxis = $this->Data["Series"][$Serie]["Axis"];
+
+ /* Create missing axis */
+ if ( !isset($this->Data["Axis"][$AxisID] ) )
+ { $this->Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_LEFT; $this->Data["Axis"][$AxisID]["Identity"] = AXIS_Y;}
+
+ $this->Data["Series"][$Serie]["Axis"] = $AxisID;
+
+ /* Cleanup unused axis */
+ $Found = FALSE;
+ foreach($this->Data["Series"] as $SerieName => $Values) { if ( $Values["Axis"] == $PreviousAxis ) { $Found = TRUE; } }
+ if (!$Found) { unset($this->Data["Axis"][$PreviousAxis]); }
+ }
+ }
+
+ /* Define if a serie should be draw with ticks */
+ function setSerieTicks($Series,$Width=0)
+ {
+ if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+ foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Ticks"] = $Width; } }
+ }
+
+ /* Define if a serie should be draw with a special weight */
+ function setSerieWeight($Series,$Weight=0)
+ {
+ if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+ foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Weight"] = $Weight; } }
+ }
+
+ /* Returns the palette of the given serie */
+ function getSeriePalette($Serie)
+ {
+ if ( !isset($this->Data["Series"][$Serie]) ) { return(NULL); }
+
+ $Result = "";
+ $Result["R"] = $this->Data["Series"][$Serie]["Color"]["R"];
+ $Result["G"] = $this->Data["Series"][$Serie]["Color"]["G"];
+ $Result["B"] = $this->Data["Series"][$Serie]["Color"]["B"];
+ $Result["Alpha"] = $this->Data["Series"][$Serie]["Color"]["Alpha"];
+
+ return($Result);
+ }
+
+ /* Set the color of one serie */
+ function setPalette($Series,$Format=NULL)
+ {
+ if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+
+ foreach($Series as $Key => $Serie)
+ {
+ $R = isset($Format["R"]) ? $Format["R"] : 0;
+ $G = isset($Format["G"]) ? $Format["G"] : 0;
+ $B = isset($Format["B"]) ? $Format["B"] : 0;
+ $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+
+ if ( isset($this->Data["Series"][$Serie]) )
+ {
+ $OldR = $this->Data["Series"][$Serie]["Color"]["R"]; $OldG = $this->Data["Series"][$Serie]["Color"]["G"]; $OldB = $this->Data["Series"][$Serie]["Color"]["B"];
+ $this->Data["Series"][$Serie]["Color"]["R"] = $R;
+ $this->Data["Series"][$Serie]["Color"]["G"] = $G;
+ $this->Data["Series"][$Serie]["Color"]["B"] = $B;
+ $this->Data["Series"][$Serie]["Color"]["Alpha"] = $Alpha;
+
+ /* Do reverse processing on the internal palette array */
+ foreach ($this->Palette as $Key => $Value)
+ { if ($Value["R"] == $OldR && $Value["G"] == $OldG && $Value["B"] == $OldB) { $this->Palette[$Key]["R"] = $R; $this->Palette[$Key]["G"] = $G; $this->Palette[$Key]["B"] = $B; $this->Palette[$Key]["Alpha"] = $Alpha;} }
+ }
+ }
+ }
+
+ /* Load a palette file */
+ function loadPalette($FileName,$Overwrite=FALSE)
+ {
+ if ( !file_exists($FileName) ) { return(-1); }
+ if ( $Overwrite ) { $this->Palette = ""; }
+
+ $fileHandle = @fopen($FileName, "r");
+ if (!$fileHandle) { return(-1); }
+ while (!feof($fileHandle))
+ {
+ $buffer = fgets($fileHandle, 4096);
+ if ( preg_match("/,/",$buffer) )
+ {
+ list($R,$G,$B,$Alpha) = preg_split("/,/",$buffer);
+ if ( $this->Palette == "" ) { $ID = 0; } else { $ID = count($this->Palette); }
+ $this->Palette[$ID] = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+ }
+ }
+ fclose($fileHandle);
+
+ /* Apply changes to current series */
+ $ID = 0;
+ if ( isset($this->Data["Series"]))
+ {
+ foreach($this->Data["Series"] as $Key => $Value)
+ {
+ if ( !isset($this->Palette[$ID]) )
+ $this->Data["Series"][$Key]["Color"] = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>0);
+ else
+ $this->Data["Series"][$Key]["Color"] = $this->Palette[$ID];
+ $ID++;
+ }
+ }
+ }
+
+ /* Initialise a given scatter serie */
+ function initScatterSerie($ID)
+ {
+ if ( isset($this->Data["ScatterSeries"][$ID]) ) { return(0); }
+
+ $this->Data["ScatterSeries"][$ID]["Description"] = "Scatter ".$ID;
+ $this->Data["ScatterSeries"][$ID]["isDrawable"] = TRUE;
+ $this->Data["ScatterSeries"][$ID]["Picture"] = NULL;
+ $this->Data["ScatterSeries"][$ID]["Ticks"] = 0;
+ $this->Data["ScatterSeries"][$ID]["Weight"] = 0;
+
+ if ( isset($this->Palette[$ID]) )
+ $this->Data["ScatterSeries"][$ID]["Color"] = $this->Palette[$ID];
+ else
+ {
+ $this->Data["ScatterSeries"][$ID]["Color"]["R"] = rand(0,255);
+ $this->Data["ScatterSeries"][$ID]["Color"]["G"] = rand(0,255);
+ $this->Data["ScatterSeries"][$ID]["Color"]["B"] = rand(0,255);
+ $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = 100;
+ }
+ }
+
+ /* Initialise a given serie */
+ function initialise($Serie)
+ {
+ if ( isset($this->Data["Series"]) ) { $ID = count($this->Data["Series"]); } else { $ID = 0; }
+
+ $this->Data["Series"][$Serie]["Description"] = $Serie;
+ $this->Data["Series"][$Serie]["isDrawable"] = TRUE;
+ $this->Data["Series"][$Serie]["Picture"] = NULL;
+ $this->Data["Series"][$Serie]["Max"] = NULL;
+ $this->Data["Series"][$Serie]["Min"] = NULL;
+ $this->Data["Series"][$Serie]["Axis"] = 0;
+ $this->Data["Series"][$Serie]["Ticks"] = 0;
+ $this->Data["Series"][$Serie]["Weight"] = 0;
+ $this->Data["Series"][$Serie]["Shape"] = SERIE_SHAPE_FILLEDCIRCLE;
+
+ if ( isset($this->Palette[$ID]) )
+ $this->Data["Series"][$Serie]["Color"] = $this->Palette[$ID];
+ else
+ {
+ $this->Data["Series"][$Serie]["Color"]["R"] = rand(0,255);
+ $this->Data["Series"][$Serie]["Color"]["G"] = rand(0,255);
+ $this->Data["Series"][$Serie]["Color"]["B"] = rand(0,255);
+ $this->Data["Series"][$Serie]["Color"]["Alpha"] = 100;
+ }
+ }
+
+ function normalize($NormalizationFactor=100,$UnitChange=NULL,$Round=1)
+ {
+ $Abscissa = $this->Data["Abscissa"];
+
+ $SelectedSeries = "";
+ $MaxVal = 0;
+ foreach($this->Data["Axis"] as $AxisID => $Axis)
+ {
+ if ( $UnitChange != NULL ) { $this->Data["Axis"][$AxisID]["Unit"] = $UnitChange; }
+
+ foreach($this->Data["Series"] as $SerieName => $Serie)
+ {
+ if ($Serie["Axis"] == $AxisID && $Serie["isDrawable"] == TRUE && $SerieName != $Abscissa)
+ {
+ $SelectedSeries[$SerieName] = $SerieName;
+
+ if ( count($Serie["Data"] ) > $MaxVal ) { $MaxVal = count($Serie["Data"]); }
+ }
+ }
+ }
+
+ for($i=0;$i<=$MaxVal-1;$i++)
+ {
+ $Factor = 0;
+ foreach ($SelectedSeries as $Key => $SerieName )
+ {
+ $Value = $this->Data["Series"][$SerieName]["Data"][$i];
+ if ( $Value != VOID )
+ $Factor = $Factor + abs($Value);
+ }
+
+ if ( $Factor != 0 )
+ {
+ $Factor = $NormalizationFactor / $Factor;
+
+ foreach ($SelectedSeries as $Key => $SerieName )
+ {
+ $Value = $this->Data["Series"][$SerieName]["Data"][$i];
+
+ if ( $Value != VOID && $Factor != $NormalizationFactor )
+ $this->Data["Series"][$SerieName]["Data"][$i] = round(abs($Value)*$Factor,$Round);
+ elseif ( $Value == VOID || $Value == 0 )
+ $this->Data["Series"][$SerieName]["Data"][$i] = VOID;
+ elseif ( $Factor == $NormalizationFactor )
+ $this->Data["Series"][$SerieName]["Data"][$i] = $NormalizationFactor;
+ }
+ }
+ }
+
+ foreach ($SelectedSeries as $Key => $SerieName )
+ {
+ $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+ $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+ }
+ }
+
+ /* Load data from a CSV (or similar) data source */
+ function importFromCSV($FileName,$Options="")
+ {
+ $Delimiter = isset($Options["Delimiter"]) ? $Options["Delimiter"] : ",";
+ $GotHeader = isset($Options["GotHeader"]) ? $Options["GotHeader"] : FALSE;
+ $SkipColumns = isset($Options["SkipColumns"]) ? $Options["SkipColumns"] : array(-1);
+ $DefaultSerieName = isset($Options["DefaultSerieName"]) ? $Options["DefaultSerieName"] : "Serie";
+
+ $Handle = @fopen($FileName,"r");
+ if ($Handle)
+ {
+ $HeaderParsed = FALSE; $SerieNames = "";
+ while (!feof($Handle))
+ {
+ $Buffer = fgets($Handle, 4096);
+ $Buffer = str_replace(chr(10),"",$Buffer);
+ $Buffer = str_replace(chr(13),"",$Buffer);
+ $Values = preg_split("/".$Delimiter."/",$Buffer);
+
+ if ( $Buffer != "" )
+ {
+ if ( $GotHeader && !$HeaderParsed )
+ {
+ foreach($Values as $Key => $Name) { if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $Name; } }
+ $HeaderParsed = TRUE;
+ }
+ else
+ {
+ if ($SerieNames == "" ) { foreach($Values as $Key => $Name) { if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $DefaultSerieName.$Key; } } }
+ foreach($Values as $Key => $Value) { if ( !in_array($Key,$SkipColumns) ) { $this->addPoints($Value,$SerieNames[$Key]); } }
+ }
+ }
+ }
+ fclose($Handle);
+ }
+ }
+
+ /* Create a dataset based on a formula */
+ /* COMMENTED BY PIWIK to avoid eval()
+ function createFunctionSerie($SerieName,$Formula="",$Options="")
+ {
+ $MinX = isset($Options["MinX"]) ? $Options["MinX"] : -10;
+ $MaxX = isset($Options["MaxX"]) ? $Options["MaxX"] : 10;
+ $XStep = isset($Options["XStep"]) ? $Options["XStep"] : 1;
+ $AutoDescription = isset($Options["AutoDescription"]) ? $Options["AutoDescription"] : FALSE;
+ $RecordAbscissa = isset($Options["RecordAbscissa"]) ? $Options["RecordAbscissa"] : FALSE;
+ $AbscissaSerie = isset($Options["AbscissaSerie"]) ? $Options["AbscissaSerie"] : "Abscissa";
+
+ if ( $Formula == "" ) { return(0); }
+
+ $Result = ""; $Abscissa = "";
+ for($i=$MinX; $i<=$MaxX; $i=$i+$XStep)
+ {
+ $Expression = "\$return = '!'.(".str_replace("z",$i,$Formula).");";
+ if ( @eval($Expression) === FALSE ) { $return = VOID; }
+ if ( $return == "!" ) { $return = VOID; } else { $return = $this->right($return,strlen($return)-1); }
+ if ( $return == "NAN" ) { $return = VOID; }
+ if ( $return == "INF" ) { $return = VOID; }
+ if ( $return == "-INF" ) { $return = VOID; }
+
+ $Abscissa[] = $i;
+ $Result[] = $return;
+ }
+
+ $this->addPoints($Result,$SerieName);
+ if ( $AutoDescription ) { $this->setSerieDescription($SerieName,$Formula); }
+ if ( $RecordAbscissa ) { $this->addPoints($Abscissa,$AbscissaSerie); }
+ }*/
+
+ function negateValues($Series)
+ {
+ if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+ foreach($Series as $Key => $SerieName)
+ {
+ if (isset($this->Data["Series"][$SerieName]))
+ {
+ $Data = "";
+ foreach($this->Data["Series"][$SerieName]["Data"] as $Key => $Value)
+ { if ( $Value == VOID ) { $Data[] = VOID; } else { $Data[] = -$Value; } }
+ $this->Data["Series"][$SerieName]["Data"] = $Data;
+
+ $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+ $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+ }
+ }
+ }
+
+ /* Return the data & configuration of the series */
+ function getData()
+ { return($this->Data); }
+
+ /* Save a palette element */
+ function savePalette($ID,$Color)
+ { $this->Palette[$ID] = $Color; }
+
+ /* Return the palette of the series */
+ function getPalette()
+ { return($this->Palette); }
+
+ /* Called by the scaling algorithm to save the config */
+ function saveAxisConfig($Axis) { $this->Data["Axis"]=$Axis; }
+
+ /* Save the Y Margin if set */
+ function saveYMargin($Value) { $this->Data["YMargin"]=$Value; }
+
+ /* Save extended configuration to the pData object */
+ function saveExtendedData($Tag,$Values) { $this->Data["Extended"][$Tag]=$Values; }
+
+ /* Called by the scaling algorithm to save the orientation of the scale */
+ function saveOrientation($Orientation) { $this->Data["Orientation"]=$Orientation; }
+
+ /* Convert a string to a single elements array */
+ function convertToArray($Value)
+ { $Values = ""; $Values[] = $Value; return($Values); }
+
+ /* Class string wrapper */
+ function __toString()
+ { return("pData object."); }
+
+ function left($value,$NbChar) { return substr($value,0,$NbChar); }
+ function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }
+ function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }
+ }
?>
\ No newline at end of file
diff --git a/libs/pChart/class/pImage.class.php b/libs/pChart/class/pImage.class.php
index 900174d720b34e1849136b0c4a770ac65bb7da96..562dd089222eb51fab6eba97c2d6976fc77ca5e7 100755
--- a/libs/pChart/class/pImage.class.php
+++ b/libs/pChart/class/pImage.class.php
@@ -1,482 +1,482 @@
-<?php
- /*
- pDraw - pChart core class
-
- Version : 2.1.4
- Made by : Jean-Damien POGOLOTTI
- Last Update : 19/01/2014
-
- This file can be distributed under the license you can find at :
-
- http://www.pchart.net/license
-
- You can find the whole class documentation on the pChart web site.
- */
-
- /* The GD extension is mandatory */
- if (!extension_loaded('gd') && !extension_loaded('gd2'))
- {
- echo "GD extension must be loaded. \r\n";
- exit();
- }
-
- /* Image map handling */
- define("IMAGE_MAP_STORAGE_FILE" , 680001);
- define("IMAGE_MAP_STORAGE_SESSION" , 680002);
-
- /* Last generated chart layout */
- define("CHART_LAST_LAYOUT_REGULAR" , 680011);
- define("CHART_LAST_LAYOUT_STACKED" , 680012);
-
- /* ImageMap string delimiter */
- define("IMAGE_MAP_DELIMITER" , chr(1));
-
- class pImage extends pDraw
- {
- /* Image settings, size, quality, .. */
- var $XSize = NULL; // Width of the picture
- var $YSize = NULL; // Height of the picture
- var $Picture = NULL; // GD picture object
- var $Antialias = TRUE; // Turn antialias on or off
- var $AntialiasQuality = 0; // Quality of the antialiasing implementation (0-1)
- var $Mask = ""; // Already drawn pixels mask (Filled circle implementation)
- var $TransparentBackground = FALSE; // Just to know if we need to flush the alpha channels when rendering
-
- /* Graph area settings */
- var $GraphAreaX1 = NULL; // Graph area X origin
- var $GraphAreaY1 = NULL; // Graph area Y origin
- var $GraphAreaX2 = NULL; // Graph area bottom right X position
- var $GraphAreaY2 = NULL; // Graph area bottom right Y position
-
- /* Scale settings */
- var $ScaleMinDivHeight = 20; // Minimum height for scame divs
-
- /* Font properties */
- var $FontName = "fonts/GeosansLight.ttf"; // Default font file
- var $FontSize = 12; // Default font size
- var $FontBox = NULL; // Return the bounding box of the last written string
- var $FontColorR = 0; // Default color settings
- var $FontColorG = 0; // Default color settings
- var $FontColorB = 0; // Default color settings
- var $FontColorA = 100; // Default transparency
-
- /* Shadow properties */
- var $Shadow = FALSE; // Turn shadows on or off
- var $ShadowX = NULL; // X Offset of the shadow
- var $ShadowY = NULL; // Y Offset of the shadow
- var $ShadowR = NULL; // R component of the shadow
- var $ShadowG = NULL; // G component of the shadow
- var $ShadowB = NULL; // B component of the shadow
- var $Shadowa = NULL; // Alpha level of the shadow
-
- /* Image map */
- var $ImageMap = NULL; // Aray containing the image map
- var $ImageMapIndex = "pChart"; // Name of the session array
- var $ImageMapStorageMode = NULL; // Save the current imagemap storage mode
- var $ImageMapAutoDelete = TRUE; // Automatic deletion of the image map temp files
-
- /* Data Set */
- var $DataSet = NULL; // Attached dataset
-
- /* Last generated chart info */
- var $LastChartLayout = CHART_LAST_LAYOUT_REGULAR; // Last layout : regular or stacked
-
- /* Class constructor */
- function pImage($XSize,$YSize,$DataSet=NULL,$TransparentBackground=FALSE)
- {
- $this->TransparentBackground = $TransparentBackground;
-
- if ( $DataSet != NULL ) { $this->DataSet = $DataSet; }
-
- $this->XSize = $XSize;
- $this->YSize = $YSize;
- $this->Picture = imagecreatetruecolor($XSize,$YSize);
-
- if ( $this->TransparentBackground )
- {
- imagealphablending($this->Picture,FALSE);
- imagefilledrectangle($this->Picture, 0,0,$XSize, $YSize, imagecolorallocatealpha($this->Picture, 255, 255, 255, 127));
- imagealphablending($this->Picture,TRUE);
- imagesavealpha($this->Picture,true);
- }
- else
- {
- $C_White = $this->AllocateColor($this->Picture,255,255,255);
- imagefilledrectangle($this->Picture,0,0,$XSize,$YSize,$C_White);
- }
- }
-
- /* Enable / Disable and set shadow properties */
- function setShadow($Enabled=TRUE,$Format="")
- {
- $X = isset($Format["X"]) ? $Format["X"] : 2;
- $Y = isset($Format["Y"]) ? $Format["Y"] : 2;
- $R = isset($Format["R"]) ? $Format["R"] : 0;
- $G = isset($Format["G"]) ? $Format["G"] : 0;
- $B = isset($Format["B"]) ? $Format["B"] : 0;
- $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 10;
-
- $this->Shadow = $Enabled;
- $this->ShadowX = $X;
- $this->ShadowY = $Y;
- $this->ShadowR = $R;
- $this->ShadowG = $G;
- $this->ShadowB = $B;
- $this->Shadowa = $Alpha;
- }
-
- /* Set the graph area position */
- function setGraphArea($X1,$Y1,$X2,$Y2)
- {
- if ( $X2 < $X1 || $X1 == $X2 || $Y2 < $Y1 || $Y1 == $Y2 ) { return(-1); }
-
- $this->GraphAreaX1 = $X1; $this->DataSet->Data["GraphArea"]["X1"] = $X1;
- $this->GraphAreaY1 = $Y1; $this->DataSet->Data["GraphArea"]["Y1"] = $Y1;
- $this->GraphAreaX2 = $X2; $this->DataSet->Data["GraphArea"]["X2"] = $X2;
- $this->GraphAreaY2 = $Y2; $this->DataSet->Data["GraphArea"]["Y2"] = $Y2;
- }
-
- /* Return the width of the picture */
- function getWidth()
- { return($this->XSize); }
-
- /* Return the heigth of the picture */
- function getHeight()
- { return($this->YSize); }
-
- /* Render the picture to a file */
- function render($FileName)
- {
- if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
- imagepng($this->Picture,$FileName);
- }
-
- /* Render the picture to a web browser stream */
- function stroke($BrowserExpire=FALSE)
- {
- if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
-
- if ( $BrowserExpire )
- {
- header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
- header("Cache-Control: no-cache");
- header("Pragma: no-cache");
- }
-
- header('Content-type: image/png');
- imagepng($this->Picture);
- }
-
- /* Automatic output method based on the calling interface */
- function autoOutput($FileName="output.png")
- {
- if (php_sapi_name() == "cli")
- $this->Render($FileName);
- else
- $this->Stroke();
- }
-
- /* Return the length between two points */
- function getLength($X1,$Y1,$X2,$Y2)
- { return(sqrt(pow(max($X1,$X2)-min($X1,$X2),2)+pow(max($Y1,$Y2)-min($Y1,$Y2),2))); }
-
- /* Return the orientation of a line */
- function getAngle($X1,$Y1,$X2,$Y2)
- {
- $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
- if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
- }
-
- /* Return the surrounding box of text area */
- function getTextBox_deprecated($X,$Y,$FontName,$FontSize,$Angle,$Text)
- {
- $Size = imagettfbbox($FontSize,$Angle,$FontName,$this->getEncodedText($Text));
- $Width = $this->getLength($Size[0],$Size[1],$Size[2],$Size[3])+1;
- $Height = $this->getLength($Size[2],$Size[3],$Size[4],$Size[5])+1;
-
- $RealPos[0]["X"] = $X; $RealPos[0]["Y"] = $Y;
- $RealPos[1]["X"] = cos((360-$Angle)*PI/180)*$Width + $RealPos[0]["X"]; $RealPos[1]["Y"] = sin((360-$Angle)*PI/180)*$Width + $RealPos[0]["Y"];
- $RealPos[2]["X"] = cos((270-$Angle)*PI/180)*$Height + $RealPos[1]["X"]; $RealPos[2]["Y"] = sin((270-$Angle)*PI/180)*$Height + $RealPos[1]["Y"];
- $RealPos[3]["X"] = cos((180-$Angle)*PI/180)*$Width + $RealPos[2]["X"]; $RealPos[3]["Y"] = sin((180-$Angle)*PI/180)*$Width + $RealPos[2]["Y"];
-
- $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"] = $RealPos[0]["X"]; $RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"] = $RealPos[0]["Y"];
- $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"] = $RealPos[1]["X"]; $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"] = $RealPos[1]["Y"];
-
- return($RealPos);
- }
-
- function getEncodedText($text)
- {
- $gdinfo = gd_info();
- if (!empty($gdinfo['JIS-mapped Japanese Font Support'])) {
- return mb_convert_encoding($text, "SJIS", "UTF-8");
- }
-
- return $text;
- }
-
- /* Return the surrounding box of text area */
- function getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text)
- {
- $coords = imagettfbbox($FontSize, 0, $FontName, $this->getEncodedText($Text));
-
- $a = deg2rad($Angle); $ca = cos($a); $sa = sin($a); $RealPos = array();
- for($i = 0; $i < 7; $i += 2)
- {
- $RealPos[$i/2]["X"] = $X + round($coords[$i] * $ca + $coords[$i+1] * $sa);
- $RealPos[$i/2]["Y"] = $Y + round($coords[$i+1] * $ca - $coords[$i] * $sa);
- }
-
- $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"] = $RealPos[0]["X"]; $RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"] = $RealPos[0]["Y"];
- $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"] = $RealPos[1]["X"]; $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"] = $RealPos[1]["Y"];
- $RealPos[TEXT_ALIGN_TOPLEFT]["X"] = $RealPos[3]["X"]; $RealPos[TEXT_ALIGN_TOPLEFT]["Y"] = $RealPos[3]["Y"];
- $RealPos[TEXT_ALIGN_TOPRIGHT]["X"] = $RealPos[2]["X"]; $RealPos[TEXT_ALIGN_TOPRIGHT]["Y"] = $RealPos[2]["Y"];
- $RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["X"] = ($RealPos[1]["X"]-$RealPos[0]["X"])/2+$RealPos[0]["X"]; $RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["Y"] = ($RealPos[0]["Y"]-$RealPos[1]["Y"])/2+$RealPos[1]["Y"];
- $RealPos[TEXT_ALIGN_TOPMIDDLE]["X"] = ($RealPos[2]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"]; $RealPos[TEXT_ALIGN_TOPMIDDLE]["Y"] = ($RealPos[3]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
- $RealPos[TEXT_ALIGN_MIDDLELEFT]["X"] = ($RealPos[0]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"]; $RealPos[TEXT_ALIGN_MIDDLELEFT]["Y"] = ($RealPos[0]["Y"]-$RealPos[3]["Y"])/2+$RealPos[3]["Y"];
- $RealPos[TEXT_ALIGN_MIDDLERIGHT]["X"] = ($RealPos[1]["X"]-$RealPos[2]["X"])/2+$RealPos[2]["X"]; $RealPos[TEXT_ALIGN_MIDDLERIGHT]["Y"] = ($RealPos[1]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
- $RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["X"] = ($RealPos[1]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"]; $RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["Y"] = ($RealPos[0]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
-
- return($RealPos);
- }
-
- /* Set current font properties */
- function setFontProperties($Format="")
- {
- $R = isset($Format["R"]) ? $Format["R"] : -1;
- $G = isset($Format["G"]) ? $Format["G"] : -1;
- $B = isset($Format["B"]) ? $Format["B"] : -1;
- $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
- $FontName = isset($Format["FontName"]) ? $Format["FontName"] : NULL;
- $FontSize = isset($Format["FontSize"]) ? $Format["FontSize"] : NULL;
-
- if ( $R != -1) { $this->FontColorR = $R; }
- if ( $G != -1) { $this->FontColorG = $G; }
- if ( $B != -1) { $this->FontColorB = $B; }
- if ( $Alpha != NULL) { $this->FontColorA = $Alpha; }
-
- if ( $FontName != NULL )
- $this->FontName = $FontName;
-
- if ( $FontSize != NULL )
- $this->FontSize = $FontSize;
- }
-
- /* Returns the 1st decimal values (used to correct AA bugs) */
- function getFirstDecimal($Value)
- {
- $Values = preg_split("/\./",$Value);
- if ( isset($Values[1]) ) { return(substr($Values[1],0,1)); } else { return(0); }
- }
-
- /* Attach a dataset to your pChart Object */
- function setDataSet(&$DataSet)
- { $this->DataSet = $DataSet; }
-
- /* Print attached dataset contents to STDOUT */
- function printDataSet()
- { print_r($this->DataSet); }
-
- /* Initialise the image map methods */
- function initialiseImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
- {
- $this->ImageMapIndex = $Name;
- $this->ImageMapStorageMode = $StorageMode;
-
- if ($StorageMode == IMAGE_MAP_STORAGE_SESSION)
- {
- if(!isset($_SESSION)) { session_start(); }
- $_SESSION[$this->ImageMapIndex] = NULL;
- }
- elseif($StorageMode == IMAGE_MAP_STORAGE_FILE)
- {
- $this->ImageMapFileName = $UniqueID;
- $this->ImageMapStorageFolder = $StorageFolder;
-
- if (file_exists($StorageFolder."/".$UniqueID.".map")) { unlink($StorageFolder."/".$UniqueID.".map"); }
- }
- }
-
- /* Add a zone to the image map */
- function addToImageMap($Type,$Plots,$Color=NULL,$Title=NULL,$Message=NULL,$HTMLEncode=FALSE)
- {
- if ( $this->ImageMapStorageMode == NULL ) { $this->initialiseImageMap(); }
-
- /* Encode the characters in the imagemap in HTML standards */
- $Title = str_replace("€","\u20AC",$Title);
- $Title = htmlentities($Title,ENT_QUOTES,"ISO-8859-15");
- if ( $HTMLEncode )
- {
- $Message = htmlentities($Message,ENT_QUOTES,"ISO-8859-15");
- $Message = str_replace("<","<",$Message);
- $Message = str_replace(">",">",$Message);
- }
-
- if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
- {
- if(!isset($_SESSION)) { $this->initialiseImageMap(); }
- $_SESSION[$this->ImageMapIndex][] = array($Type,$Plots,$Color,$Title,$Message);
- }
- elseif($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
- {
- $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'a');
- fwrite($Handle, $Type.IMAGE_MAP_DELIMITER.$Plots.IMAGE_MAP_DELIMITER.$Color.IMAGE_MAP_DELIMITER.$Title.IMAGE_MAP_DELIMITER.$Message."\r\n");
- fclose($Handle);
- }
- }
-
- /* Remove VOID values from an imagemap custom values array */
- function removeVOIDFromArray($SerieName, $Values)
- {
- if ( !isset($this->DataSet->Data["Series"][$SerieName]) ) { return(-1); }
-
- $Result = "";
- foreach($this->DataSet->Data["Series"][$SerieName]["Data"] as $Key => $Value)
- { if ( $Value != VOID && isset($Values[$Key]) ) { $Result[] = $Values[$Key]; } }
- return($Result);
- }
-
- /* Replace the title of one image map serie */
- function replaceImageMapTitle($OldTitle, $NewTitle)
- {
- if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
-
- if ( is_array($NewTitle) ) { $NewTitle = $this->removeVOIDFromArray($OldTitle, $NewTitle); }
-
- if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
- {
- if(!isset($_SESSION)) { return(-1); }
- if ( is_array($NewTitle) )
- { $ID = 0; foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID])) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle[$ID]; $ID++; } } }
- else
- { foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle; } } }
- }
- elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
- {
- $TempArray = "";
- $Handle = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
- if ($Handle)
- {
- while (($Buffer = fgets($Handle, 4096)) !== false)
- {
- $Fields = preg_split("/".IMAGE_MAP_DELIMITER."/",str_replace(array(chr(10),chr(13)),"",$Buffer));
- $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
- }
- fclose($Handle);
-
- if ( is_array($NewTitle) )
- { $ID = 0; foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID]) ) { $TempArray[$Key][3] = $NewTitle[$ID]; $ID++; } } }
- else
- { foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $TempArray[$Key][3] = $NewTitle; } } }
-
- $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
- foreach($TempArray as $Key => $Settings)
- { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
- fclose($Handle);
- }
- }
- }
-
- /* Replace the values of the image map contents */
- function replaceImageMapValues($Title, $Values)
- {
- if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
-
- $Values = $this->removeVOIDFromArray($Title, $Values);
- $ID = 0;
- if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
- {
- if(!isset($_SESSION)) { return(-1); }
- foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $_SESSION[$this->ImageMapIndex][$Key][4] = $Values[$ID]; } $ID++; } }
- }
- elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
- {
- $TempArray = "";
- $Handle = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
- if ($Handle)
- {
- while (($Buffer = fgets($Handle, 4096)) !== false)
- {
- $Fields = preg_split("/".IMAGE_MAP_DELIMITER."/",str_replace(array(chr(10),chr(13)),"",$Buffer));
- $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
- }
- fclose($Handle);
-
- foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $TempArray[$Key][4] = $Values[$ID]; } $ID++; } }
-
- $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
- foreach($TempArray as $Key => $Settings)
- { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
- fclose($Handle);
- }
- }
- }
-
- /* Dump the image map */
- function dumpImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
- {
- $this->ImageMapIndex = $Name;
- $this->ImageMapStorageMode = $StorageMode;
-
- if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
- {
- if(!isset($_SESSION)) { session_start(); }
- if ( $_SESSION[$Name] != NULL )
- {
- foreach($_SESSION[$Name] as $Key => $Params)
- { echo $Params[0].IMAGE_MAP_DELIMITER.$Params[1].IMAGE_MAP_DELIMITER.$Params[2].IMAGE_MAP_DELIMITER.$Params[3].IMAGE_MAP_DELIMITER.$Params[4]."\r\n"; }
- }
- }
- elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
- {
- if (file_exists($StorageFolder."/".$UniqueID.".map"))
- {
- $Handle = @fopen($StorageFolder."/".$UniqueID.".map", "r");
- if ($Handle) { while (($Buffer = fgets($Handle, 4096)) !== false) { echo $Buffer; } }
- fclose($Handle);
-
- if ( $this->ImageMapAutoDelete ) { unlink($StorageFolder."/".$UniqueID.".map"); }
- }
- }
-
- /* When the image map is returned to the client, the script ends */
- exit();
- }
-
- /* Return the HTML converted color from the RGB composite values */
- function toHTMLColor($R,$G,$B)
- {
- $R=intval($R); $G=intval($G); $B=intval($B);
- $R=dechex($R<0?0:($R>255?255:$R)); $G=dechex($G<0?0:($G>255?255:$G));$B=dechex($B<0?0:($B>255?255:$B));
- $Color="#".(strlen($R) < 2?'0':'').$R; $Color.=(strlen($G) < 2?'0':'').$G; $Color.= (strlen($B) < 2?'0':'').$B;
- return($Color);
- }
-
- /* Reverse an array of points */
- function reversePlots($Plots)
- {
- $Result = "";
- for($i=count($Plots)-2;$i>=0;$i=$i-2) { $Result[] = $Plots[$i]; $Result[] = $Plots[$i+1]; }
- return($Result);
- }
-
- /* Mirror Effect */
- function drawAreaMirror($X,$Y,$Width,$Height,$Format="")
- {
- $StartAlpha = isset($Format["StartAlpha"]) ? $Format["StartAlpha"] : 80;
- $EndAlpha = isset($Format["EndAlpha"]) ? $Format["EndAlpha"] : 0;
-
- $AlphaStep = ($StartAlpha-$EndAlpha)/$Height;
-
- $Picture = imagecreatetruecolor($this->XSize,$this->YSize);
- imagecopy($Picture,$this->Picture,0,0,0,0,$this->XSize,$this->YSize);
-
- for($i=1;$i<=$Height;$i++)
- {
- if ( $Y+($i-1) < $this->YSize && $Y-$i > 0 ) { imagecopymerge($Picture,$this->Picture,$X,$Y+($i-1),$X,$Y-$i,$Width,1,$StartAlpha-$AlphaStep*$i); }
- }
-
- imagecopy($this->Picture,$Picture,0,0,0,0,$this->XSize,$this->YSize);
- }
- }
+<?php
+ /*
+ pDraw - pChart core class
+
+ Version : 2.1.4
+ Made by : Jean-Damien POGOLOTTI
+ Last Update : 19/01/2014
+
+ This file can be distributed under the license you can find at :
+
+ http://www.pchart.net/license
+
+ You can find the whole class documentation on the pChart web site.
+ */
+
+ /* The GD extension is mandatory */
+ if (!extension_loaded('gd') && !extension_loaded('gd2'))
+ {
+ echo "GD extension must be loaded. \r\n";
+ exit();
+ }
+
+ /* Image map handling */
+ define("IMAGE_MAP_STORAGE_FILE" , 680001);
+ define("IMAGE_MAP_STORAGE_SESSION" , 680002);
+
+ /* Last generated chart layout */
+ define("CHART_LAST_LAYOUT_REGULAR" , 680011);
+ define("CHART_LAST_LAYOUT_STACKED" , 680012);
+
+ /* ImageMap string delimiter */
+ define("IMAGE_MAP_DELIMITER" , chr(1));
+
+ class pImage extends pDraw
+ {
+ /* Image settings, size, quality, .. */
+ var $XSize = NULL; // Width of the picture
+ var $YSize = NULL; // Height of the picture
+ var $Picture = NULL; // GD picture object
+ var $Antialias = TRUE; // Turn antialias on or off
+ var $AntialiasQuality = 0; // Quality of the antialiasing implementation (0-1)
+ var $Mask = ""; // Already drawn pixels mask (Filled circle implementation)
+ var $TransparentBackground = FALSE; // Just to know if we need to flush the alpha channels when rendering
+
+ /* Graph area settings */
+ var $GraphAreaX1 = NULL; // Graph area X origin
+ var $GraphAreaY1 = NULL; // Graph area Y origin
+ var $GraphAreaX2 = NULL; // Graph area bottom right X position
+ var $GraphAreaY2 = NULL; // Graph area bottom right Y position
+
+ /* Scale settings */
+ var $ScaleMinDivHeight = 20; // Minimum height for scame divs
+
+ /* Font properties */
+ var $FontName = "fonts/GeosansLight.ttf"; // Default font file
+ var $FontSize = 12; // Default font size
+ var $FontBox = NULL; // Return the bounding box of the last written string
+ var $FontColorR = 0; // Default color settings
+ var $FontColorG = 0; // Default color settings
+ var $FontColorB = 0; // Default color settings
+ var $FontColorA = 100; // Default transparency
+
+ /* Shadow properties */
+ var $Shadow = FALSE; // Turn shadows on or off
+ var $ShadowX = NULL; // X Offset of the shadow
+ var $ShadowY = NULL; // Y Offset of the shadow
+ var $ShadowR = NULL; // R component of the shadow
+ var $ShadowG = NULL; // G component of the shadow
+ var $ShadowB = NULL; // B component of the shadow
+ var $Shadowa = NULL; // Alpha level of the shadow
+
+ /* Image map */
+ var $ImageMap = NULL; // Aray containing the image map
+ var $ImageMapIndex = "pChart"; // Name of the session array
+ var $ImageMapStorageMode = NULL; // Save the current imagemap storage mode
+ var $ImageMapAutoDelete = TRUE; // Automatic deletion of the image map temp files
+
+ /* Data Set */
+ var $DataSet = NULL; // Attached dataset
+
+ /* Last generated chart info */
+ var $LastChartLayout = CHART_LAST_LAYOUT_REGULAR; // Last layout : regular or stacked
+
+ /* Class constructor */
+ function __construct($XSize,$YSize,$DataSet=NULL,$TransparentBackground=FALSE)
+ {
+ $this->TransparentBackground = $TransparentBackground;
+
+ if ( $DataSet != NULL ) { $this->DataSet = $DataSet; }
+
+ $this->XSize = $XSize;
+ $this->YSize = $YSize;
+ $this->Picture = imagecreatetruecolor($XSize,$YSize);
+
+ if ( $this->TransparentBackground )
+ {
+ imagealphablending($this->Picture,FALSE);
+ imagefilledrectangle($this->Picture, 0,0,$XSize, $YSize, imagecolorallocatealpha($this->Picture, 255, 255, 255, 127));
+ imagealphablending($this->Picture,TRUE);
+ imagesavealpha($this->Picture,true);
+ }
+ else
+ {
+ $C_White = $this->AllocateColor($this->Picture,255,255,255);
+ imagefilledrectangle($this->Picture,0,0,$XSize,$YSize,$C_White);
+ }
+ }
+
+ /* Enable / Disable and set shadow properties */
+ function setShadow($Enabled=TRUE,$Format="")
+ {
+ $X = isset($Format["X"]) ? $Format["X"] : 2;
+ $Y = isset($Format["Y"]) ? $Format["Y"] : 2;
+ $R = isset($Format["R"]) ? $Format["R"] : 0;
+ $G = isset($Format["G"]) ? $Format["G"] : 0;
+ $B = isset($Format["B"]) ? $Format["B"] : 0;
+ $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 10;
+
+ $this->Shadow = $Enabled;
+ $this->ShadowX = $X;
+ $this->ShadowY = $Y;
+ $this->ShadowR = $R;
+ $this->ShadowG = $G;
+ $this->ShadowB = $B;
+ $this->Shadowa = $Alpha;
+ }
+
+ /* Set the graph area position */
+ function setGraphArea($X1,$Y1,$X2,$Y2)
+ {
+ if ( $X2 < $X1 || $X1 == $X2 || $Y2 < $Y1 || $Y1 == $Y2 ) { return(-1); }
+
+ $this->GraphAreaX1 = $X1; $this->DataSet->Data["GraphArea"]["X1"] = $X1;
+ $this->GraphAreaY1 = $Y1; $this->DataSet->Data["GraphArea"]["Y1"] = $Y1;
+ $this->GraphAreaX2 = $X2; $this->DataSet->Data["GraphArea"]["X2"] = $X2;
+ $this->GraphAreaY2 = $Y2; $this->DataSet->Data["GraphArea"]["Y2"] = $Y2;
+ }
+
+ /* Return the width of the picture */
+ function getWidth()
+ { return($this->XSize); }
+
+ /* Return the heigth of the picture */
+ function getHeight()
+ { return($this->YSize); }
+
+ /* Render the picture to a file */
+ function render($FileName)
+ {
+ if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
+ imagepng($this->Picture,$FileName);
+ }
+
+ /* Render the picture to a web browser stream */
+ function stroke($BrowserExpire=FALSE)
+ {
+ if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
+
+ if ( $BrowserExpire )
+ {
+ header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+ header("Cache-Control: no-cache");
+ header("Pragma: no-cache");
+ }
+
+ header('Content-type: image/png');
+ imagepng($this->Picture);
+ }
+
+ /* Automatic output method based on the calling interface */
+ function autoOutput($FileName="output.png")
+ {
+ if (php_sapi_name() == "cli")
+ $this->Render($FileName);
+ else
+ $this->Stroke();
+ }
+
+ /* Return the length between two points */
+ function getLength($X1,$Y1,$X2,$Y2)
+ { return(sqrt(pow(max($X1,$X2)-min($X1,$X2),2)+pow(max($Y1,$Y2)-min($Y1,$Y2),2))); }
+
+ /* Return the orientation of a line */
+ function getAngle($X1,$Y1,$X2,$Y2)
+ {
+ $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
+ if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
+ }
+
+ /* Return the surrounding box of text area */
+ function getTextBox_deprecated($X,$Y,$FontName,$FontSize,$Angle,$Text)
+ {
+ $Size = imagettfbbox($FontSize,$Angle,$FontName,$this->getEncodedText($Text));
+ $Width = $this->getLength($Size[0],$Size[1],$Size[2],$Size[3])+1;
+ $Height = $this->getLength($Size[2],$Size[3],$Size[4],$Size[5])+1;
+
+ $RealPos[0]["X"] = $X; $RealPos[0]["Y"] = $Y;
+ $RealPos[1]["X"] = cos((360-$Angle)*PI/180)*$Width + $RealPos[0]["X"]; $RealPos[1]["Y"] = sin((360-$Angle)*PI/180)*$Width + $RealPos[0]["Y"];
+ $RealPos[2]["X"] = cos((270-$Angle)*PI/180)*$Height + $RealPos[1]["X"]; $RealPos[2]["Y"] = sin((270-$Angle)*PI/180)*$Height + $RealPos[1]["Y"];
+ $RealPos[3]["X"] = cos((180-$Angle)*PI/180)*$Width + $RealPos[2]["X"]; $RealPos[3]["Y"] = sin((180-$Angle)*PI/180)*$Width + $RealPos[2]["Y"];
+
+ $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"] = $RealPos[0]["X"]; $RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"] = $RealPos[0]["Y"];
+ $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"] = $RealPos[1]["X"]; $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"] = $RealPos[1]["Y"];
+
+ return($RealPos);
+ }
+
+ function getEncodedText($text)
+ {
+ $gdinfo = gd_info();
+ if (!empty($gdinfo['JIS-mapped Japanese Font Support'])) {
+ return mb_convert_encoding($text, "SJIS", "UTF-8");
+ }
+
+ return $text;
+ }
+
+ /* Return the surrounding box of text area */
+ function getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text)
+ {
+ $coords = imagettfbbox($FontSize, 0, $FontName, $this->getEncodedText($Text));
+
+ $a = deg2rad($Angle); $ca = cos($a); $sa = sin($a); $RealPos = array();
+ for($i = 0; $i < 7; $i += 2)
+ {
+ $RealPos[$i/2]["X"] = $X + round($coords[$i] * $ca + $coords[$i+1] * $sa);
+ $RealPos[$i/2]["Y"] = $Y + round($coords[$i+1] * $ca - $coords[$i] * $sa);
+ }
+
+ $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"] = $RealPos[0]["X"]; $RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"] = $RealPos[0]["Y"];
+ $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"] = $RealPos[1]["X"]; $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"] = $RealPos[1]["Y"];
+ $RealPos[TEXT_ALIGN_TOPLEFT]["X"] = $RealPos[3]["X"]; $RealPos[TEXT_ALIGN_TOPLEFT]["Y"] = $RealPos[3]["Y"];
+ $RealPos[TEXT_ALIGN_TOPRIGHT]["X"] = $RealPos[2]["X"]; $RealPos[TEXT_ALIGN_TOPRIGHT]["Y"] = $RealPos[2]["Y"];
+ $RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["X"] = ($RealPos[1]["X"]-$RealPos[0]["X"])/2+$RealPos[0]["X"]; $RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["Y"] = ($RealPos[0]["Y"]-$RealPos[1]["Y"])/2+$RealPos[1]["Y"];
+ $RealPos[TEXT_ALIGN_TOPMIDDLE]["X"] = ($RealPos[2]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"]; $RealPos[TEXT_ALIGN_TOPMIDDLE]["Y"] = ($RealPos[3]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
+ $RealPos[TEXT_ALIGN_MIDDLELEFT]["X"] = ($RealPos[0]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"]; $RealPos[TEXT_ALIGN_MIDDLELEFT]["Y"] = ($RealPos[0]["Y"]-$RealPos[3]["Y"])/2+$RealPos[3]["Y"];
+ $RealPos[TEXT_ALIGN_MIDDLERIGHT]["X"] = ($RealPos[1]["X"]-$RealPos[2]["X"])/2+$RealPos[2]["X"]; $RealPos[TEXT_ALIGN_MIDDLERIGHT]["Y"] = ($RealPos[1]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
+ $RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["X"] = ($RealPos[1]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"]; $RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["Y"] = ($RealPos[0]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
+
+ return($RealPos);
+ }
+
+ /* Set current font properties */
+ function setFontProperties($Format="")
+ {
+ $R = isset($Format["R"]) ? $Format["R"] : -1;
+ $G = isset($Format["G"]) ? $Format["G"] : -1;
+ $B = isset($Format["B"]) ? $Format["B"] : -1;
+ $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+ $FontName = isset($Format["FontName"]) ? $Format["FontName"] : NULL;
+ $FontSize = isset($Format["FontSize"]) ? $Format["FontSize"] : NULL;
+
+ if ( $R != -1) { $this->FontColorR = $R; }
+ if ( $G != -1) { $this->FontColorG = $G; }
+ if ( $B != -1) { $this->FontColorB = $B; }
+ if ( $Alpha != NULL) { $this->FontColorA = $Alpha; }
+
+ if ( $FontName != NULL )
+ $this->FontName = $FontName;
+
+ if ( $FontSize != NULL )
+ $this->FontSize = $FontSize;
+ }
+
+ /* Returns the 1st decimal values (used to correct AA bugs) */
+ function getFirstDecimal($Value)
+ {
+ $Values = preg_split("/\./",$Value);
+ if ( isset($Values[1]) ) { return(substr($Values[1],0,1)); } else { return(0); }
+ }
+
+ /* Attach a dataset to your pChart Object */
+ function setDataSet(&$DataSet)
+ { $this->DataSet = $DataSet; }
+
+ /* Print attached dataset contents to STDOUT */
+ function printDataSet()
+ { print_r($this->DataSet); }
+
+ /* Initialise the image map methods */
+ function initialiseImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
+ {
+ $this->ImageMapIndex = $Name;
+ $this->ImageMapStorageMode = $StorageMode;
+
+ if ($StorageMode == IMAGE_MAP_STORAGE_SESSION)
+ {
+ if(!isset($_SESSION)) { session_start(); }
+ $_SESSION[$this->ImageMapIndex] = NULL;
+ }
+ elseif($StorageMode == IMAGE_MAP_STORAGE_FILE)
+ {
+ $this->ImageMapFileName = $UniqueID;
+ $this->ImageMapStorageFolder = $StorageFolder;
+
+ if (file_exists($StorageFolder."/".$UniqueID.".map")) { unlink($StorageFolder."/".$UniqueID.".map"); }
+ }
+ }
+
+ /* Add a zone to the image map */
+ function addToImageMap($Type,$Plots,$Color=NULL,$Title=NULL,$Message=NULL,$HTMLEncode=FALSE)
+ {
+ if ( $this->ImageMapStorageMode == NULL ) { $this->initialiseImageMap(); }
+
+ /* Encode the characters in the imagemap in HTML standards */
+ $Title = str_replace("€","\u20AC",$Title);
+ $Title = htmlentities($Title,ENT_QUOTES,"ISO-8859-15");
+ if ( $HTMLEncode )
+ {
+ $Message = htmlentities($Message,ENT_QUOTES,"ISO-8859-15");
+ $Message = str_replace("<","<",$Message);
+ $Message = str_replace(">",">",$Message);
+ }
+
+ if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+ {
+ if(!isset($_SESSION)) { $this->initialiseImageMap(); }
+ $_SESSION[$this->ImageMapIndex][] = array($Type,$Plots,$Color,$Title,$Message);
+ }
+ elseif($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
+ {
+ $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'a');
+ fwrite($Handle, $Type.IMAGE_MAP_DELIMITER.$Plots.IMAGE_MAP_DELIMITER.$Color.IMAGE_MAP_DELIMITER.$Title.IMAGE_MAP_DELIMITER.$Message."\r\n");
+ fclose($Handle);
+ }
+ }
+
+ /* Remove VOID values from an imagemap custom values array */
+ function removeVOIDFromArray($SerieName, $Values)
+ {
+ if ( !isset($this->DataSet->Data["Series"][$SerieName]) ) { return(-1); }
+
+ $Result = "";
+ foreach($this->DataSet->Data["Series"][$SerieName]["Data"] as $Key => $Value)
+ { if ( $Value != VOID && isset($Values[$Key]) ) { $Result[] = $Values[$Key]; } }
+ return($Result);
+ }
+
+ /* Replace the title of one image map serie */
+ function replaceImageMapTitle($OldTitle, $NewTitle)
+ {
+ if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
+
+ if ( is_array($NewTitle) ) { $NewTitle = $this->removeVOIDFromArray($OldTitle, $NewTitle); }
+
+ if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+ {
+ if(!isset($_SESSION)) { return(-1); }
+ if ( is_array($NewTitle) )
+ { $ID = 0; foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID])) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle[$ID]; $ID++; } } }
+ else
+ { foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle; } } }
+ }
+ elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+ {
+ $TempArray = "";
+ $Handle = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
+ if ($Handle)
+ {
+ while (($Buffer = fgets($Handle, 4096)) !== false)
+ {
+ $Fields = preg_split("/".IMAGE_MAP_DELIMITER."/",str_replace(array(chr(10),chr(13)),"",$Buffer));
+ $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
+ }
+ fclose($Handle);
+
+ if ( is_array($NewTitle) )
+ { $ID = 0; foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID]) ) { $TempArray[$Key][3] = $NewTitle[$ID]; $ID++; } } }
+ else
+ { foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $TempArray[$Key][3] = $NewTitle; } } }
+
+ $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
+ foreach($TempArray as $Key => $Settings)
+ { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
+ fclose($Handle);
+ }
+ }
+ }
+
+ /* Replace the values of the image map contents */
+ function replaceImageMapValues($Title, $Values)
+ {
+ if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
+
+ $Values = $this->removeVOIDFromArray($Title, $Values);
+ $ID = 0;
+ if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+ {
+ if(!isset($_SESSION)) { return(-1); }
+ foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $_SESSION[$this->ImageMapIndex][$Key][4] = $Values[$ID]; } $ID++; } }
+ }
+ elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+ {
+ $TempArray = "";
+ $Handle = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
+ if ($Handle)
+ {
+ while (($Buffer = fgets($Handle, 4096)) !== false)
+ {
+ $Fields = preg_split("/".IMAGE_MAP_DELIMITER."/",str_replace(array(chr(10),chr(13)),"",$Buffer));
+ $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
+ }
+ fclose($Handle);
+
+ foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $TempArray[$Key][4] = $Values[$ID]; } $ID++; } }
+
+ $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
+ foreach($TempArray as $Key => $Settings)
+ { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
+ fclose($Handle);
+ }
+ }
+ }
+
+ /* Dump the image map */
+ function dumpImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
+ {
+ $this->ImageMapIndex = $Name;
+ $this->ImageMapStorageMode = $StorageMode;
+
+ if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+ {
+ if(!isset($_SESSION)) { session_start(); }
+ if ( $_SESSION[$Name] != NULL )
+ {
+ foreach($_SESSION[$Name] as $Key => $Params)
+ { echo $Params[0].IMAGE_MAP_DELIMITER.$Params[1].IMAGE_MAP_DELIMITER.$Params[2].IMAGE_MAP_DELIMITER.$Params[3].IMAGE_MAP_DELIMITER.$Params[4]."\r\n"; }
+ }
+ }
+ elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+ {
+ if (file_exists($StorageFolder."/".$UniqueID.".map"))
+ {
+ $Handle = @fopen($StorageFolder."/".$UniqueID.".map", "r");
+ if ($Handle) { while (($Buffer = fgets($Handle, 4096)) !== false) { echo $Buffer; } }
+ fclose($Handle);
+
+ if ( $this->ImageMapAutoDelete ) { unlink($StorageFolder."/".$UniqueID.".map"); }
+ }
+ }
+
+ /* When the image map is returned to the client, the script ends */
+ exit();
+ }
+
+ /* Return the HTML converted color from the RGB composite values */
+ function toHTMLColor($R,$G,$B)
+ {
+ $R=intval($R); $G=intval($G); $B=intval($B);
+ $R=dechex($R<0?0:($R>255?255:$R)); $G=dechex($G<0?0:($G>255?255:$G));$B=dechex($B<0?0:($B>255?255:$B));
+ $Color="#".(strlen($R) < 2?'0':'').$R; $Color.=(strlen($G) < 2?'0':'').$G; $Color.= (strlen($B) < 2?'0':'').$B;
+ return($Color);
+ }
+
+ /* Reverse an array of points */
+ function reversePlots($Plots)
+ {
+ $Result = "";
+ for($i=count($Plots)-2;$i>=0;$i=$i-2) { $Result[] = $Plots[$i]; $Result[] = $Plots[$i+1]; }
+ return($Result);
+ }
+
+ /* Mirror Effect */
+ function drawAreaMirror($X,$Y,$Width,$Height,$Format="")
+ {
+ $StartAlpha = isset($Format["StartAlpha"]) ? $Format["StartAlpha"] : 80;
+ $EndAlpha = isset($Format["EndAlpha"]) ? $Format["EndAlpha"] : 0;
+
+ $AlphaStep = ($StartAlpha-$EndAlpha)/$Height;
+
+ $Picture = imagecreatetruecolor($this->XSize,$this->YSize);
+ imagecopy($Picture,$this->Picture,0,0,0,0,$this->XSize,$this->YSize);
+
+ for($i=1;$i<=$Height;$i++)
+ {
+ if ( $Y+($i-1) < $this->YSize && $Y-$i > 0 ) { imagecopymerge($Picture,$this->Picture,$X,$Y+($i-1),$X,$Y-$i,$Width,1,$StartAlpha-$AlphaStep*$i); }
+ }
+
+ imagecopy($this->Picture,$Picture,0,0,0,0,$this->XSize,$this->YSize);
+ }
+ }
?>
\ No newline at end of file
diff --git a/libs/pChart/class/pPie.class.php b/libs/pChart/class/pPie.class.php
index 209b74979e58de3308644696c0cee7ddeff50cee..845f81ca9858e9f6069b4680219d4502d269c8b1 100755
--- a/libs/pChart/class/pPie.class.php
+++ b/libs/pChart/class/pPie.class.php
@@ -1,1500 +1,1500 @@
-<?php
- /*
- pPie - class to draw pie charts
-
- Version : 2.1.4
- Made by : Jean-Damien POGOLOTTI
- Last Update : 19/01/2014
-
- This file can be distributed under the license you can find at :
-
- http://www.pchart.net/license
-
- You can find the whole class documentation on the pChart web site.
- */
-
- /* Class return codes */
- define("PIE_NO_ABSCISSA" , 140001);
- define("PIE_NO_DATASERIE" , 140002);
- define("PIE_SUMISNULL" , 140003);
- define("PIE_RENDERED" , 140000);
-
- define("PIE_LABEL_COLOR_AUTO" , 140010);
- define("PIE_LABEL_COLOR_MANUAL", 140011);
-
- define("PIE_VALUE_NATURAL" , 140020);
- define("PIE_VALUE_PERCENTAGE" , 140021);
-
- define("PIE_VALUE_INSIDE" , 140030);
- define("PIE_VALUE_OUTSIDE" , 140031);
-
- /* pPie class definition */
- class pPie
- {
- var $pChartObject;
- var $pDataObject;
- var $LabelPos = "" ;
-
- /* Class creator */
- function pPie($Object,$pDataObject)
- {
- /* Cache the pChart object reference */
- $this->pChartObject = $Object;
-
- /* Cache the pData object reference */
- $this->pDataObject = $pDataObject;
- }
-
- /* Draw a pie chart */
- function draw2DPie($X,$Y,$Format="")
- {
- $Radius = isset($Format["Radius"]) ? $Format["Radius"] : 60;
- $Precision = isset($Format["Precision"]) ? $Format["Precision"] : 0;
- $DataGapAngle = isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 0;
- $DataGapRadius = isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 0;
- $SecondPass = isset($Format["SecondPass"]) ? $Format["SecondPass"] : TRUE;
- $Border = isset($Format["Border"]) ? $Format["Border"] : FALSE;
- $BorderR = isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
- $BorderG = isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
- $BorderB = isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
- $Shadow = isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
- $DrawLabels = isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
- $LabelStacked = isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
- $LabelColor = isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
- $LabelR = isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
- $LabelG = isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
- $LabelB = isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
- $LabelAlpha = isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
- $WriteValues = isset($Format["WriteValues"]) ? $Format["WriteValues"] : NULL;
- $ValuePosition = isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
- $ValuePadding = isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 15;
- $ValueSuffix = isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
- $ValueR = isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
- $ValueG = isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
- $ValueB = isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
- $ValueAlpha = isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
- $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-
- /* Data Processing */
- $Data = $this->pDataObject->getData();
- $Palette = $this->pDataObject->getPalette();
-
- /* Do we have an abscissa serie defined? */
- if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
-
- /* Try to find the data serie */
- $DataSerie = "";
- foreach ($Data["Series"] as $SerieName => $SerieData)
- { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
-
- /* Do we have data to compute? */
- if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
-
- /* Remove unused data */
- list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
-
- /* Compute the pie sum */
- $SerieSum = $this->pDataObject->getSum($DataSerie);
-
- /* Do we have data to draw? */
- if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
-
- /* Dump the real number of data to draw */
- $Values = "";
- foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
- { if ($Value != 0) { $Values[] = $Value; } }
-
- /* Compute the wasted angular space between series */
- if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = count($Values) * $DataGapAngle; }
-
- /* Compute the scale */
- $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
-
- $RestoreShadow = $this->pChartObject->Shadow;
- if ( $this->pChartObject->Shadow )
- {
- $this->pChartObject->Shadow = FALSE;
-
- $ShadowFormat = $Format; $ShadowFormat["Shadow"] = TRUE;
- $this->draw2DPie($X+$this->pChartObject->ShadowX,$Y+$this->pChartObject->ShadowY,$ShadowFormat);
- }
-
- /* Draw the polygon pie elements */
- $Step = 360 / (2 * PI * $Radius);
- $Offset = 0; $ID = 0;
- foreach($Values as $Key => $Value)
- {
- if ( $Shadow )
- $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
- else
- {
- if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
- $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
- }
-
- if ( !$SecondPass && !$Shadow )
- {
- if ( !$Border )
- $Settings["Surrounding"] = 10;
- else
- { $Settings["BorderR"] = $BorderR; $Settings["BorderG"] = $BorderG; $Settings["BorderB"] = $BorderB; }
- }
-
- $Plots = "";
- $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
-
- $Angle = ($EndAngle - $Offset)/2 + $Offset;
- if ($DataGapAngle == 0)
- { $X0 = $X; $Y0 = $Y; }
- else
- {
- $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
- $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius + $Y;
- }
-
- $Plots[] = $X0; $Plots[] = $Y0;
-
-
- for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
- {
- $Xc = cos(($i-90)*PI/180) * $Radius + $X;
- $Yc = sin(($i-90)*PI/180) * $Radius + $Y;
-
- if ( $SecondPass && ( $i<90 )) { $Yc++; }
- if ( $SecondPass && ( $i>180 && $i<270 )) { $Xc++; }
- if ( $SecondPass && ( $i>=270 )) { $Xc++; $Yc++; }
-
- $Plots[] = $Xc; $Plots[] = $Yc;
- }
-
- $this->pChartObject->drawPolygon($Plots,$Settings);
- if ( $RecordImageMap && !$Shadow ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Plots),$this->pChartObject->toHTMLColor($Palette[$ID]["R"],$Palette[$ID]["G"],$Palette[$ID]["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][$Key],$Value); }
-
- if ( $DrawLabels && !$Shadow && !$SecondPass )
- {
- if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
- { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
- else
- { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
-
- $Angle = ($EndAngle - $Offset)/2 + $Offset;
- $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
- $Yc = sin(($Angle-90)*PI/180) * $Radius + $Y;
-
- $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
-
- if ( $LabelStacked )
- $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius);
- else
- $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
- }
-
- $Offset = $i + $DataGapAngle; $ID++;
- }
-
- /* Second pass to smooth the angles */
- if ( $SecondPass )
- {
- $Step = 360 / (2 * PI * $Radius);
- $Offset = 0; $ID = 0;
- foreach($Values as $Key => $Value)
- {
- $FirstPoint = TRUE;
- if ( $Shadow )
- $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
- else
- {
- if ( $Border )
- $Settings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB);
- else
- $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
- }
-
- $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
-
- if ($DataGapAngle == 0)
- { $X0 = $X; $Y0 = $Y; }
- else
- {
- $Angle = ($EndAngle - $Offset)/2 + $Offset;
- $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
- $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius + $Y;
- }
- $Plots[] = $X0; $Plots[] = $Y0;
-
- for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
- {
- $Xc = cos(($i-90)*PI/180) * $Radius + $X;
- $Yc = sin(($i-90)*PI/180) * $Radius + $Y;
-
- if ( $FirstPoint ) { $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings); } { $FirstPoint = FALSE; }
-
- $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
- }
- $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings);
-
- if ( $DrawLabels && !$Shadow )
- {
- if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
- { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
- else
- { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
-
- $Angle = ($EndAngle - $Offset)/2 + $Offset;
- $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
- $Yc = sin(($Angle-90)*PI/180) * $Radius + $Y;
-
- $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
-
- if ( $LabelStacked )
- $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius);
- else
- $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
- }
-
- $Offset = $i + $DataGapAngle; $ID++;
- }
- }
-
- if ( $WriteValues != NULL && !$Shadow )
- {
- $Step = 360 / (2 * PI * $Radius);
- $Offset = 0; $ID = count($Values)-1;
- $Settings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"R"=>$ValueR,"G"=>$ValueG,"B"=>$ValueB,"Alpha"=>$ValueAlpha);
- foreach($Values as $Key => $Value)
- {
- $EndAngle = ($Value*$ScaleFactor) + $Offset; if ( (int)$EndAngle > 360 ) { $EndAngle = 0; }
- $Angle = ($EndAngle - $Offset)/2 + $Offset;
-
- if ( $ValuePosition == PIE_VALUE_OUTSIDE )
- {
- $Xc = cos(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $X;
- $Yc = sin(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $Y;
- }
- else
- {
- $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
- $Yc = sin(($Angle-90)*PI/180) * ($Radius)/2 + $Y;
- }
-
- if ( $WriteValues == PIE_VALUE_PERCENTAGE )
- $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
- elseif ( $WriteValues == PIE_VALUE_NATURAL )
- $Display = $Value.$ValueSuffix;
-
- $this->pChartObject->drawText($Xc,$Yc,$Display,$Settings);
-
- $Offset = $EndAngle + $DataGapAngle; $ID--;
- }
- }
-
- if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
-
- $this->pChartObject->Shadow = $RestoreShadow;
-
- return(PIE_RENDERED);
- }
-
- /* Draw a 3D pie chart */
- function draw3DPie($X,$Y,$Format="")
- {
- /* Rendering layout */
- $Radius = isset($Format["Radius"]) ? $Format["Radius"] : 80;
- $Precision = isset($Format["Precision"]) ? $Format["Precision"] : 0;
- $SkewFactor = isset($Format["SkewFactor"]) ? $Format["SkewFactor"] : .5;
- $SliceHeight = isset($Format["SliceHeight"]) ? $Format["SliceHeight"] : 20;
- $DataGapAngle = isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 0;
- $DataGapRadius = isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 0;
- $SecondPass = isset($Format["SecondPass"]) ? $Format["SecondPass"] : TRUE;
- $Border = isset($Format["Border"]) ? $Format["Border"] : FALSE;
- $Shadow = isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
- $DrawLabels = isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
- $LabelStacked = isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
- $LabelColor = isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
- $LabelR = isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
- $LabelG = isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
- $LabelB = isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
- $LabelAlpha = isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
- $WriteValues = isset($Format["WriteValues"]) ? $Format["WriteValues"] : NULL; //PIE_VALUE_PERCENTAGE
- $ValuePosition = isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_INSIDE;
- $ValuePadding = isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 15;
- $ValueSuffix = isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
- $ValueR = isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
- $ValueG = isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
- $ValueB = isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
- $ValueAlpha = isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
- $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-
- /* Error correction for overlaying rounded corners */
- if ( $SkewFactor < .5 ) { $SkewFactor = .5; }
-
- /* Data Processing */
- $Data = $this->pDataObject->getData();
- $Palette = $this->pDataObject->getPalette();
-
- /* Do we have an abscissa serie defined? */
- if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
-
- /* Try to find the data serie */
- $DataSerie = "";
- foreach ($Data["Series"] as $SerieName => $SerieData)
- { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
-
- /* Do we have data to compute? */
- if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
-
- /* Remove unused data */
- list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
-
- /* Compute the pie sum */
- $SerieSum = $this->pDataObject->getSum($DataSerie);
-
- /* Do we have data to draw? */
- if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
-
- /* Dump the real number of data to draw */
- $Values = "";
- foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
- { if ($Value != 0) { $Values[] = $Value; } }
-
- /* Compute the wasted angular space between series */
- if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = count($Values) * $DataGapAngle; }
-
- /* Compute the scale */
- $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
-
- $RestoreShadow = $this->pChartObject->Shadow;
- if ( $this->pChartObject->Shadow ) { $this->pChartObject->Shadow = FALSE; }
-
- /* Draw the polygon pie elements */
- $Step = 360 / (2 * PI * $Radius);
- $Offset = 360; $ID = count($Values)-1;
- $Values = array_reverse($Values);
- $Slice = 0; $Slices = ""; $SliceColors = ""; $Visible = ""; $SliceAngle = "";
- foreach($Values as $Key => $Value)
- {
- if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
- $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
-
- $SliceColors[$Slice] = $Settings;
-
- $StartAngle = $Offset;
- $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
-
- if ( $StartAngle > 180 ) { $Visible[$Slice]["Start"] = TRUE; } else { $Visible[$Slice]["Start"] = TRUE; }
- if ( $EndAngle < 180 ) { $Visible[$Slice]["End"] = FALSE; } else { $Visible[$Slice]["End"] = TRUE; }
-
- if ($DataGapAngle == 0)
- { $X0 = $X; $Y0 = $Y; }
- else
- {
- $Angle = ($EndAngle - $Offset)/2 + $Offset;
- $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
- $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius*$SkewFactor + $Y;
- }
- $Slices[$Slice][] = $X0; $Slices[$Slice][] = $Y0; $SliceAngle[$Slice][] = 0;
-
- for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
- {
- $Xc = cos(($i-90)*PI/180) * $Radius + $X;
- $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y;
-
- if ( ($SecondPass || $RestoreShadow ) && ( $i<90 )) { $Yc++; }
- if ( ($SecondPass || $RestoreShadow ) && ( $i>90 && $i<180 )) { $Xc++; }
- if ( ($SecondPass || $RestoreShadow ) && ( $i>180 && $i<270 )) { $Xc++; }
- if ( ($SecondPass || $RestoreShadow ) && ( $i>=270 )) { $Xc++; $Yc++; }
-
- $Slices[$Slice][] = $Xc; $Slices[$Slice][] = $Yc; $SliceAngle[$Slice][] = $i;
- }
-
- $Offset = $i - $DataGapAngle; $ID--; $Slice++;
- }
-
- /* Draw the bottom shadow if needed */
- if ( $RestoreShadow && ($this->pChartObject->ShadowX != 0 || $this->pChartObject->ShadowY !=0 ))
- {
- foreach($Slices as $SliceID => $Plots)
- {
- $ShadowPie = "";
- for($i=0;$i<count($Plots);$i=$i+2)
- { $ShadowPie[] = $Plots[$i]+$this->pChartObject->ShadowX; $ShadowPie[] = $Plots[$i+1]+$this->pChartObject->ShadowY; }
-
- $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa,"NoBorder"=>TRUE);
- $this->pChartObject->drawPolygon($ShadowPie,$Settings);
- }
-
- $Step = 360 / (2 * PI * $Radius);
- $Offset = 360;
- foreach($Values as $Key => $Value)
- {
- $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
-
- for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
- {
- $Xc = cos(($i-90)*PI/180) * $Radius + $X + $this->pChartObject->ShadowX;
- $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y + $this->pChartObject->ShadowY;
-
- $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
- }
-
- $Offset = $i - $DataGapAngle; $ID--;
- }
- }
-
- /* Draw the bottom pie splice */
- foreach($Slices as $SliceID => $Plots)
- {
- $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
- $this->pChartObject->drawPolygon($Plots,$Settings);
-
- if ( $SecondPass )
- {
- $Settings = $SliceColors[$SliceID];
- if ( $Border )
- { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30;; }
-
- if ( isset($SliceAngle[$SliceID][1]) ) /* Empty error handling */
- {
- $Angle = $SliceAngle[$SliceID][1];
- $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
- $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
- $this->pChartObject->drawLine($Plots[0],$Plots[1],$Xc,$Yc,$Settings);
-
- $Angle = $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1];
- $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
- $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
- $this->pChartObject->drawLine($Plots[0],$Plots[1],$Xc,$Yc,$Settings);
- }
- }
- }
-
- /* Draw the two vertical edges */
- $Slices = array_reverse($Slices);
- $SliceColors = array_reverse($SliceColors);
- foreach($Slices as $SliceID => $Plots)
- {
- $Settings = $SliceColors[$SliceID];
- $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
-
- if ( $Visible[$SliceID]["Start"] && isset($Plots[2])) /* Empty error handling */
- {
- $this->pChartObject->drawLine($Plots[2],$Plots[3],$Plots[2],$Plots[3]- $SliceHeight,array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]));
- $Border = "";
- $Border[] = $Plots[0]; $Border[] = $Plots[1]; $Border[] = $Plots[0]; $Border[] = $Plots[1] - $SliceHeight;
- $Border[] = $Plots[2]; $Border[] = $Plots[3] - $SliceHeight; $Border[] = $Plots[2]; $Border[] = $Plots[3];
- $this->pChartObject->drawPolygon($Border,$Settings);
- }
- }
-
- $Slices = array_reverse($Slices);
- $SliceColors = array_reverse($SliceColors);
- foreach($Slices as $SliceID => $Plots)
- {
- $Settings = $SliceColors[$SliceID];
- $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
- if ( $Visible[$SliceID]["End"] )
- {
- $this->pChartObject->drawLine($Plots[count($Plots)-2],$Plots[count($Plots)-1],$Plots[count($Plots)-2],$Plots[count($Plots)-1]- $SliceHeight,array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]));
-
- $Border = "";
- $Border[] = $Plots[0]; $Border[] = $Plots[1]; $Border[] = $Plots[0]; $Border[] = $Plots[1] - $SliceHeight;
- $Border[] = $Plots[count($Plots)-2]; $Border[] = $Plots[count($Plots)-1] - $SliceHeight; $Border[] = $Plots[count($Plots)-2]; $Border[] = $Plots[count($Plots)-1];
- $this->pChartObject->drawPolygon($Border,$Settings);
- }
- }
-
- /* Draw the rounded edges */
- foreach($Slices as $SliceID => $Plots)
- {
- $Settings = $SliceColors[$SliceID];
- $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
-
- for ($j=2;$j<count($Plots)-2;$j=$j+2)
- {
- $Angle = $SliceAngle[$SliceID][$j/2];
- if ( $Angle < 270 && $Angle > 90 )
- {
- $Border = "";
- $Border[] = $Plots[$j]; $Border[] = $Plots[$j+1];
- $Border[] = $Plots[$j+2]; $Border[] = $Plots[$j+3];
- $Border[] = $Plots[$j+2]; $Border[] = $Plots[$j+3] - $SliceHeight;
- $Border[] = $Plots[$j]; $Border[] = $Plots[$j+1] - $SliceHeight;
- $this->pChartObject->drawPolygon($Border,$Settings);
- }
- }
-
- if ( $SecondPass )
- {
- $Settings = $SliceColors[$SliceID];
- if ( $Border )
- { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30; }
-
- if ( isset($SliceAngle[$SliceID][1]) ) /* Empty error handling */
- {
- $Angle = $SliceAngle[$SliceID][1];
- if ( $Angle < 270 && $Angle > 90 )
- {
- $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
- $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
- $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
- }
- }
-
- $Angle = $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1];
- if ( $Angle < 270 && $Angle > 90 )
- {
- $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
- $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
- $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
- }
-
- if ( isset($SliceAngle[$SliceID][1]) && $SliceAngle[$SliceID][1] > 270 && $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1] < 270 )
- {
- $Xc = cos((270-90)*PI/180) * $Radius + $X;
- $Yc = sin((270-90)*PI/180) * $Radius*$SkewFactor + $Y;
- $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
- }
-
- if ( isset($SliceAngle[$SliceID][1]) && $SliceAngle[$SliceID][1] > 90 && $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1] < 90 )
- {
- $Xc = cos((0)*PI/180) * $Radius + $X;
- $Yc = sin((0)*PI/180) * $Radius*$SkewFactor + $Y;
- $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
- }
-
- }
- }
-
- /* Draw the top splice */
- foreach($Slices as $SliceID => $Plots)
- {
- $Settings = $SliceColors[$SliceID];
- $Settings["R"]+= 20; $Settings["G"]+= 20; $Settings["B"]+= 20;
-
- $Top = "";
- for($j=0;$j<count($Plots);$j=$j+2) { $Top[] = $Plots[$j]; $Top[] = $Plots[$j+1]- $SliceHeight; }
- $this->pChartObject->drawPolygon($Top,$Settings);
-
- if ( $RecordImageMap && !$Shadow ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Top),$this->pChartObject->toHTMLColor($Settings["R"],$Settings["G"],$Settings["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][count($Slices)-$SliceID-1],$Values[$SliceID]); }
- }
-
-
- /* Second pass to smooth the angles */
- if ( $SecondPass )
- {
- $Step = 360 / (2 * PI * $Radius);
- $Offset = 360; $ID = count($Values)-1;
- foreach($Values as $Key => $Value)
- {
- $FirstPoint = TRUE;
- if ( $Shadow )
- $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
- else
- {
- if ( $Border )
- { $Settings = array("R"=>$Palette[$ID]["R"]+30,"G"=>$Palette[$ID]["G"]+30,"B"=>$Palette[$ID]["B"]+30,"Alpha"=>$Palette[$ID]["Alpha"]); }
- else
- $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
- }
-
- $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
-
- if ($DataGapAngle == 0)
- { $X0 = $X; $Y0 = $Y- $SliceHeight; }
- else
- {
- $Angle = ($EndAngle - $Offset)/2 + $Offset;
- $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
- $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius*$SkewFactor + $Y - $SliceHeight;
- }
- $Plots[] = $X0; $Plots[] = $Y0;
-
- for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
- {
- $Xc = cos(($i-90)*PI/180) * $Radius + $X;
- $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y - $SliceHeight;
-
- if ( $FirstPoint ) { $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings); } { $FirstPoint = FALSE; }
-
- $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
- if ($i < 270 && $i > 90 ) { $this->pChartObject->drawAntialiasPixel($Xc,$Yc+$SliceHeight,$Settings); }
- }
- $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings);
-
- $Offset = $i - $DataGapAngle; $ID--;
- }
- }
-
- if ( $WriteValues != NULL )
- {
- $Step = 360 / (2 * PI * $Radius);
- $Offset = 360; $ID = count($Values)-1;
- $Settings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"R"=>$ValueR,"G"=>$ValueG,"B"=>$ValueB,"Alpha"=>$ValueAlpha);
- foreach($Values as $Key => $Value)
- {
- $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
-
- $Angle = ($EndAngle - $Offset)/2 + $Offset;
-
- if ( $ValuePosition == PIE_VALUE_OUTSIDE )
- {
- $Xc = cos(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $X;
- $Yc = sin(($Angle-90)*PI/180) * (($Radius*$SkewFactor)+$ValuePadding) + $Y - $SliceHeight;
- }
- else
- {
- $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
- $Yc = sin(($Angle-90)*PI/180) * ($Radius*$SkewFactor)/2 + $Y - $SliceHeight;
- }
-
- if ( $WriteValues == PIE_VALUE_PERCENTAGE )
- $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
- elseif ( $WriteValues == PIE_VALUE_NATURAL )
- $Display = $Value.$ValueSuffix;
-
- $this->pChartObject->drawText($Xc,$Yc,$Display,$Settings);
-
- $Offset = $EndAngle - $DataGapAngle; $ID--;
- }
- }
-
- if ( $DrawLabels )
- {
- $Step = 360 / (2 * PI * $Radius);
- $Offset = 360; $ID = count($Values)-1;
- foreach($Values as $Key => $Value)
- {
- if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
- { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
- else
- { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
-
- $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
-
- $Angle = ($EndAngle - $Offset)/2 + $Offset;
- $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
- $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y - $SliceHeight;
-
- if ( isset($Data["Series"][$Data["Abscissa"]]["Data"][$ID]) )
- {
- $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$ID];
-
- if ( $LabelStacked )
- $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius,TRUE);
- else
- $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
- }
-
- $Offset = $EndAngle - $DataGapAngle; $ID--;
- }
- }
-
- if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
-
- $this->pChartObject->Shadow = $RestoreShadow;
-
- return(PIE_RENDERED);
- }
-
- /* Draw the legend of pie chart */
- function drawPieLegend($X,$Y,$Format="")
- {
- $FontName = isset($Format["FontName"]) ? $Format["FontName"] : $this->pChartObject->FontName;
- $FontSize = isset($Format["FontSize"]) ? $Format["FontSize"] : $this->pChartObject->FontSize;
- $FontR = isset($Format["FontR"]) ? $Format["FontR"] : $this->pChartObject->FontColorR;
- $FontG = isset($Format["FontG"]) ? $Format["FontG"] : $this->pChartObject->FontColorG;
- $FontB = isset($Format["FontB"]) ? $Format["FontB"] : $this->pChartObject->FontColorB;
- $BoxSize = isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
- $Margin = isset($Format["Margin"]) ? $Format["Margin"] : 5;
- $R = isset($Format["R"]) ? $Format["R"] : 200;
- $G = isset($Format["G"]) ? $Format["G"] : 200;
- $B = isset($Format["B"]) ? $Format["B"] : 200;
- $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
- $BorderR = isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
- $BorderG = isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
- $BorderB = isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
- $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
- $Style = isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
- $Mode = isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
-
- if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
-
- $YStep = max($this->pChartObject->FontSize,$BoxSize) + 5;
- $XStep = $BoxSize + 5;
-
- /* Data Processing */
- $Data = $this->pDataObject->getData();
- $Palette = $this->pDataObject->getPalette();
-
- /* Do we have an abscissa serie defined? */
- if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
-
- $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
- foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $Value)
- {
- $BoxArray = $this->pChartObject->getTextBox($vX+$BoxSize+4,$vY+$BoxSize/2,$FontName,$FontSize,0,$Value);
-
- if ( $Mode == LEGEND_VERTICAL )
- {
- if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$BoxSize/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$BoxSize/2; }
- if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
- if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$BoxSize/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$BoxSize/2; }
- $vY=$vY+$YStep;
- }
- elseif ( $Mode == LEGEND_HORIZONTAL )
- {
- if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$BoxSize/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$BoxSize/2; }
- if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
- if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$BoxSize/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$BoxSize/2; }
- $vX=$Boundaries["R"]+$XStep;
- }
- }
- $vY=$vY-$YStep; $vX=$vX-$XStep;
-
- $TopOffset = $Y - $Boundaries["T"];
- if ( $Boundaries["B"]-($vY+$BoxSize) < $TopOffset ) { $Boundaries["B"] = $vY+$BoxSize+$TopOffset; }
-
- if ( $Style == LEGEND_ROUND )
- $this->pChartObject->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
- elseif ( $Style == LEGEND_BOX )
- $this->pChartObject->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
-
- $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE;
- foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $Value)
- {
- $R = $Palette[$Key]["R"]; $G = $Palette[$Key]["G"]; $B = $Palette[$Key]["B"];
-
- $this->pChartObject->drawFilledRectangle($X+1,$Y+1,$X+$BoxSize+1,$Y+$BoxSize+1,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
- $this->pChartObject->drawFilledRectangle($X,$Y,$X+$BoxSize,$Y+$BoxSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
- if ( $Mode == LEGEND_VERTICAL )
- {
- $this->pChartObject->drawText($X+$BoxSize+4,$Y+$BoxSize/2,$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontName"=>$FontName,"FontSize"=>$FontSize));
- $Y=$Y+$YStep;
- }
- elseif ( $Mode == LEGEND_HORIZONTAL )
- {
- $BoxArray = $this->pChartObject->drawText($X+$BoxSize+4,$Y+$BoxSize/2,$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontName"=>$FontName,"FontSize"=>$FontSize));
- $X=$BoxArray[1]["X"]+2+$XStep;
- }
- }
-
- $this->Shadow = $RestoreShadow;
- }
-
- /* Set the color of the specified slice */
- function setSliceColor($SliceID,$Format="")
- {
- $R = isset($Format["R"]) ? $Format["R"] : 0;
- $G = isset($Format["G"]) ? $Format["G"] : 0;
- $B = isset($Format["B"]) ? $Format["B"] : 0;
- $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-
- $this->pDataObject->Palette[$SliceID]["R"] = $R;
- $this->pDataObject->Palette[$SliceID]["G"] = $G;
- $this->pDataObject->Palette[$SliceID]["B"] = $B;
- $this->pDataObject->Palette[$SliceID]["Alpha"] = $Alpha;
- }
-
- /* Internally used compute the label positions */
- function writePieLabel($X,$Y,$Label,$Angle,$Settings,$Stacked,$Xc=0,$Yc=0,$Radius=0,$Reversed=FALSE)
- {
- $LabelOffset = 30;
- $FontName = $this->pChartObject->FontName;
- $FontSize = $this->pChartObject->FontSize;
-
- if ( !$Stacked )
- {
- $Settings["Angle"] = 360-$Angle;
- $Settings["Length"] = 25;
- $Settings["Size"] = 8;
-
- $this->pChartObject->drawArrowLabel($X,$Y," ".$Label." ",$Settings);
- }
- else
- {
- $X2 = cos(deg2rad($Angle-90))*20+$X;
- $Y2 = sin(deg2rad($Angle-90))*20+$Y;
-
- $TxtPos = $this->pChartObject->getTextBox($X,$Y,$FontName,$FontSize,0,$Label);
- $Height = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
- $YTop = $Y2 - $Height/2 - 2;
- $YBottom = $Y2 + $Height/2 + 2;
-
- if ( $this->LabelPos != "" )
- {
- $Done = FALSE;
- foreach($this->LabelPos as $Key => $Settings)
- {
- if ( !$Done )
- {
- if ( $Angle <= 90 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
- { $this->shift(0,180,-($Height+2),$Reversed); $Done = TRUE; }
- if ( $Angle > 90 && $Angle <= 180 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
- { $this->shift(0,180,-($Height+2),$Reversed); $Done = TRUE; }
- if ( $Angle > 180 && $Angle <= 270 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
- { $this->shift(180,360,($Height+2),$Reversed); $Done = TRUE; }
- if ( $Angle > 270 && $Angle <= 360 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
- { $this->shift(180,360,($Height+2),$Reversed); $Done = TRUE; }
- }
- }
- }
-
- $LabelSettings = array("YTop"=>$YTop,"YBottom"=>$YBottom,"Label"=>$Label,"Angle"=>$Angle,"X1"=>$X,"Y1"=>$Y,"X2"=>$X2,"Y2"=>$Y2);
- if ( $Angle <= 180 ) { $LabelSettings["X3"] = $Xc+$Radius+$LabelOffset; }
- if ( $Angle > 180 ) { $LabelSettings["X3"] = $Xc-$Radius-$LabelOffset; }
- $this->LabelPos[] = $LabelSettings;
- }
- }
-
- /* Internally used to shift label positions */
- function shift($StartAngle,$EndAngle,$Offset,$Reversed)
- {
- if ( $Reversed ) { $Offset = -$Offset; }
- foreach($this->LabelPos as $Key => $Settings)
- {
- if ( $Settings["Angle"] > $StartAngle && $Settings["Angle"] <= $EndAngle ) { $this->LabelPos[$Key]["YTop"] = $Settings["YTop"] + $Offset; $this->LabelPos[$Key]["YBottom"] = $Settings["YBottom"] + $Offset; $this->LabelPos[$Key]["Y2"] = $Settings["Y2"] + $Offset; }
- }
- }
-
- /* Internally used to write the re-computed labels */
- function writeShiftedLabels()
- {
- if ( $this->LabelPos == "" ) { return(0); }
- foreach($this->LabelPos as $Key => $Settings)
- {
- $X1 = $Settings["X1"]; $Y1 = $Settings["Y1"];
- $X2 = $Settings["X2"]; $Y2 = $Settings["Y2"];
- $X3 = $Settings["X3"];
- $Angle = $Settings["Angle"];
- $Label = $Settings["Label"];
-
- $this->pChartObject->drawArrow($X2,$Y2,$X1,$Y1,array("Size"=>8));
- if ( $Angle <= 180 )
- {
- $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
- $this->pChartObject->drawText($X3+2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
- }
- else
- {
- $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
- $this->pChartObject->drawText($X3-2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
- }
- }
- }
-
- /* Draw a ring chart */
- function draw2DRing($X,$Y,$Format="")
- {
- $OuterRadius = isset($Format["Radius"]) ? $Format["Radius"] : 60;
- $Precision = isset($Format["Precision"]) ? $Format["Precision"] : 0;
- $InnerRadius = isset($Format["Radius"]) ? $Format["Radius"] : 30;
- $Border = isset($Format["Border"]) ? $Format["Border"] : FALSE;
- $BorderR = isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
- $BorderG = isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
- $BorderB = isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
- $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 100;
- $Shadow = isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
- $DrawLabels = isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
- $LabelStacked = isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
- $LabelColor = isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
- $LabelR = isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
- $LabelG = isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
- $LabelB = isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
- $LabelAlpha = isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
- $WriteValues = isset($Format["WriteValues"]) ? $Format["WriteValues"] : NULL; //PIE_VALUE_PERCENTAGE
- $ValuePadding = isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 5;
- $ValuePosition = isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
- $ValueSuffix = isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
- $ValueR = isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
- $ValueG = isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
- $ValueB = isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
- $ValueAlpha = isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
- $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-
- /* Data Processing */
- $Data = $this->pDataObject->getData();
- $Palette = $this->pDataObject->getPalette();
-
- /* Do we have an abscissa serie defined? */
- if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
-
- /* Try to find the data serie */
- $DataSerie = "";
- foreach ($Data["Series"] as $SerieName => $SerieData)
- { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
-
- /* Do we have data to compute? */
- if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
-
- /* Remove unused data */
- list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
-
- /* Compute the pie sum */
- $SerieSum = $this->pDataObject->getSum($DataSerie);
-
- /* Do we have data to draw? */
- if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
-
- /* Dump the real number of data to draw */
- $Values = "";
- foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
- { if ($Value != 0) { $Values[] = $Value; } }
-
- /* Compute the wasted angular space between series */
- if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = 0; } // count($Values)
-
- /* Compute the scale */
- $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
-
- $RestoreShadow = $this->pChartObject->Shadow;
- if ( $this->pChartObject->Shadow )
- {
- $this->pChartObject->Shadow = FALSE;
-
- $ShadowFormat = $Format; $ShadowFormat["Shadow"] = TRUE;
- $this->draw2DRing($X+$this->pChartObject->ShadowX,$Y+$this->pChartObject->ShadowY,$ShadowFormat);
- }
-
- /* Draw the polygon pie elements */
- $Step = 360 / (2 * PI * $OuterRadius);
- $Offset = 0; $ID = 0;
- foreach($Values as $Key => $Value)
- {
- if ( $Shadow )
- {
- $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
- $BorderColor = $Settings;
- }
- else
- {
- if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
- $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
-
- if ( $Border )
- $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
- else
- $BorderColor = $Settings;
- }
-
- $Plots = ""; $Boundaries = ""; $AAPixels = "";
- $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
- for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
- {
- $Xc = cos(($i-90)*PI/180) * $OuterRadius + $X;
- $Yc = sin(($i-90)*PI/180) * $OuterRadius + $Y;
-
- if ( !isset($Boundaries[0]["X1"]) ) { $Boundaries[0]["X1"] = $Xc; $Boundaries[0]["Y1"] = $Yc; }
- $AAPixels[] = array($Xc,$Yc);
-
- if ( $i<90 ) { $Yc++; }
- if ( $i>180 && $i<270 ) { $Xc++; }
- if ( $i>=270 ) { $Xc++; $Yc++; }
-
- $Plots[] = $Xc; $Plots[] = $Yc;
- }
- $Boundaries[1]["X1"] = $Xc; $Boundaries[1]["Y1"] = $Yc;
- $Lasti = $EndAngle;
-
- for($i=$EndAngle;$i>=$Offset;$i=$i-$Step)
- {
- $Xc = cos(($i-90)*PI/180) * ($InnerRadius-1) + $X;
- $Yc = sin(($i-90)*PI/180) * ($InnerRadius-1) + $Y;
-
- if ( !isset($Boundaries[1]["X2"]) ) { $Boundaries[1]["X2"] = $Xc; $Boundaries[1]["Y2"] = $Yc; }
- $AAPixels[] = array($Xc,$Yc);
-
- $Xc = cos(($i-90)*PI/180) * $InnerRadius + $X;
- $Yc = sin(($i-90)*PI/180) * $InnerRadius + $Y;
-
- if ( $i<90 ) { $Yc++; }
- if ( $i>180 && $i<270 ) { $Xc++; }
- if ( $i>=270 ) { $Xc++; $Yc++; }
-
- $Plots[] = $Xc; $Plots[] = $Yc;
- }
- $Boundaries[0]["X2"] = $Xc; $Boundaries[0]["Y2"] = $Yc;
-
- /* Draw the polygon */
- $this->pChartObject->drawPolygon($Plots,$Settings);
- if ( $RecordImageMap && !$Shadow ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Plots),$this->pChartObject->toHTMLColor($Palette[$ID]["R"],$Palette[$ID]["G"],$Palette[$ID]["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][$Key],$Value); }
-
- /* Smooth the edges using AA */
- foreach($AAPixels as $iKey => $Pos ) { $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1],$BorderColor); }
- $this->pChartObject->drawLine($Boundaries[0]["X1"],$Boundaries[0]["Y1"],$Boundaries[0]["X2"],$Boundaries[0]["Y2"],$BorderColor);
- $this->pChartObject->drawLine($Boundaries[1]["X1"],$Boundaries[1]["Y1"],$Boundaries[1]["X2"],$Boundaries[1]["Y2"],$BorderColor);
-
- if ( $DrawLabels && !$Shadow )
- {
- if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
- { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
- else
- { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
-
- $Angle = ($EndAngle - $Offset)/2 + $Offset;
- $Xc = cos(($Angle-90)*PI/180) * $OuterRadius + $X;
- $Yc = sin(($Angle-90)*PI/180) * $OuterRadius + $Y;
-
- $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
-
- if ( $LabelStacked )
- $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$OuterRadius);
- else
- $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
- }
-
- $Offset = $Lasti; $ID++;
- }
-
- if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
-
- if ( $WriteValues && !$Shadow )
- {
- $Step = 360 / (2 * PI * $OuterRadius);
- $Offset = 0;
- foreach($Values as $Key => $Value)
- {
- $EndAngle = $Offset+($Value*$ScaleFactor);
- if ( $EndAngle > 360 ) { $EndAngle = 360; }
-
- $Angle = $Offset+($Value*$ScaleFactor)/2;
- if ( $ValuePosition == PIE_VALUE_OUTSIDE )
- {
- $Xc = cos(($Angle-90)*PI/180) * ($OuterRadius+$ValuePadding) + $X;
- $Yc = sin(($Angle-90)*PI/180) * ($OuterRadius+$ValuePadding) + $Y;
- if ( $Angle >=0 && $Angle <= 90 ) { $Align = TEXT_ALIGN_BOTTOMLEFT; }
- if ( $Angle > 90 && $Angle <= 180 ) { $Align = TEXT_ALIGN_TOPLEFT; }
- if ( $Angle > 180 && $Angle <= 270 ) { $Align = TEXT_ALIGN_TOPRIGHT; }
- if ( $Angle > 270 ) { $Align = TEXT_ALIGN_BOTTOMRIGHT; }
- }
- else
- {
- $Xc = cos(($Angle-90)*PI/180) * (($OuterRadius-$InnerRadius)/2+$InnerRadius) + $X;
- $Yc = sin(($Angle-90)*PI/180) * (($OuterRadius-$InnerRadius)/2+$InnerRadius) + $Y;
- $Align = TEXT_ALIGN_MIDDLEMIDDLE;
- }
-
- if ( $WriteValues == PIE_VALUE_PERCENTAGE )
- $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
- elseif ( $WriteValues == PIE_VALUE_NATURAL )
- $Display = $Value.$ValueSuffix;
- else
- $Label = "";
-
- $this->pChartObject->drawText($Xc,$Yc,$Display,array("Align"=>$Align,"R"=>$ValueR,"G"=>$ValueG,"B"=>$ValueB));
- $Offset = $EndAngle;
- }
- }
-
- $this->pChartObject->Shadow = $RestoreShadow;
-
- return(PIE_RENDERED);
- }
-
- /* Draw a 3D ring chart */
- function draw3DRing($X,$Y,$Format="")
- {
- $OuterRadius = isset($Format["OuterRadius"]) ? $Format["OuterRadius"] : 100;
- $Precision = isset($Format["Precision"]) ? $Format["Precision"] : 0;
- $InnerRadius = isset($Format["InnerRadius"]) ? $Format["InnerRadius"] : 30;
- $SkewFactor = isset($Format["SkewFactor"]) ? $Format["SkewFactor"] : .6;
- $SliceHeight = isset($Format["SliceHeight"]) ? $Format["SliceHeight"] : 10;
- $DataGapAngle = isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 10;
- $DataGapRadius = isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 10;
- $Border = isset($Format["Border"]) ? $Format["Border"] : FALSE;
- $Shadow = isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
- $DrawLabels = isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
- $LabelStacked = isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
- $LabelColor = isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
- $LabelR = isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
- $LabelG = isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
- $LabelB = isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
- $LabelAlpha = isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
- $Cf = isset($Format["Cf"]) ? $Format["Cf"] : 20;
- $WriteValues = isset($Format["WriteValues"]) ? $Format["WriteValues"] : PIE_VALUE_NATURAL;
- $ValuePadding = isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : $SliceHeight + 15;
- $ValuePosition = isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
- $ValueSuffix = isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
- $ValueR = isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
- $ValueG = isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
- $ValueB = isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
- $ValueAlpha = isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
- $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-
- /* Error correction for overlaying rounded corners */
- if ( $SkewFactor < .5 ) { $SkewFactor = .5; }
-
- /* Data Processing */
- $Data = $this->pDataObject->getData();
- $Palette = $this->pDataObject->getPalette();
-
- /* Do we have an abscissa serie defined? */
- if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
-
- /* Try to find the data serie */
- $DataSerie = "";
- foreach ($Data["Series"] as $SerieName => $SerieData)
- { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
-
- /* Do we have data to compute? */
- if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
-
- /* Remove unused data */
- list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
-
- /* Compute the pie sum */
- $SerieSum = $this->pDataObject->getSum($DataSerie);
-
- /* Do we have data to draw? */
- if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
-
- /* Dump the real number of data to draw */
- $Values = "";
- foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
- { if ($Value != 0) { $Values[] = $Value; } }
-
- /* Compute the wasted angular space between series */
- if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = count($Values) * $DataGapAngle; }
-
- /* Compute the scale */
- $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
-
- $RestoreShadow = $this->pChartObject->Shadow;
- if ( $this->pChartObject->Shadow ) { $this->pChartObject->Shadow = FALSE; }
-
- /* Draw the polygon ring elements */
- $Offset = 360; $ID = count($Values)-1;
- $Values = array_reverse($Values);
- $Slice = 0; $Slices = ""; $SliceColors = ""; $Visible = ""; $SliceAngle = "";
- foreach($Values as $Key => $Value)
- {
- if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
- $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
-
- $SliceColors[$Slice] = $Settings;
-
- $StartAngle = $Offset;
- $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
-
- if ( $StartAngle > 180 ) { $Visible[$Slice]["Start"] = TRUE; } else { $Visible[$Slice]["Start"] = TRUE; }
- if ( $EndAngle < 180 ) { $Visible[$Slice]["End"] = FALSE; } else { $Visible[$Slice]["End"] = TRUE; }
-
- $Step = (360 / (2 * PI * $OuterRadius))/2;
- $OutX1 = VOID; $OutY1 = VOID;
- for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
- {
- $Xc = cos(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-2) + $X;
- $Yc = sin(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-2)*$SkewFactor + $Y;
- $Slices[$Slice]["AA"][] = array($Xc,$Yc);
-
- $Xc = cos(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-1) + $X;
- $Yc = sin(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-1)*$SkewFactor + $Y;
- $Slices[$Slice]["AA"][] = array($Xc,$Yc);
-
- $Xc = cos(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius) + $X;
- $Yc = sin(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius)*$SkewFactor + $Y;
- $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
-
- if ( $OutX1 == VOID ) { $OutX1 = $Xc; $OutY1 = $Yc; }
-
- if ( $i<90 ) { $Yc++; }
- if ( $i>90 && $i<180 ) { $Xc++; }
- if ( $i>180 && $i<270 ) { $Xc++; }
- if ( $i>=270 ) { $Xc++; $Yc++; }
-
- $Slices[$Slice]["BottomPoly"][] = floor($Xc); $Slices[$Slice]["BottomPoly"][] = floor($Yc);
- $Slices[$Slice]["TopPoly"][] = floor($Xc); $Slices[$Slice]["TopPoly"][] = floor($Yc)-$SliceHeight;
- $Slices[$Slice]["Angle"][] = $i;
- }
- $OutX2 = $Xc; $OutY2 = $Yc;
-
- $Slices[$Slice]["Angle"][] = VOID;
- $Lasti = $i;
-
- $Step = (360 / (2 * PI * $InnerRadius))/2;
- $InX1 = VOID; $InY1 = VOID;
- for($i=$EndAngle;$i<=$Offset;$i=$i+$Step)
- {
- $Xc = cos(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius-1) + $X;
- $Yc = sin(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius-1)*$SkewFactor + $Y;
- $Slices[$Slice]["AA"][] = array($Xc,$Yc);
-
- $Xc = cos(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius) + $X;
- $Yc = sin(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius)*$SkewFactor + $Y;
- $Slices[$Slice]["AA"][] = array($Xc,$Yc);
-
- if ( $InX1 == VOID ) { $InX1 = $Xc; $InY1 = $Yc; }
-
- if ( $i<90 ) { $Yc++; }
- if ( $i>90 && $i<180 ) { $Xc++; }
- if ( $i>180 && $i<270 ) { $Xc++; }
- if ( $i>=270 ) { $Xc++; $Yc++; }
-
- $Slices[$Slice]["BottomPoly"][] = floor($Xc); $Slices[$Slice]["BottomPoly"][] = floor($Yc);
- $Slices[$Slice]["TopPoly"][] = floor($Xc); $Slices[$Slice]["TopPoly"][] = floor($Yc)-$SliceHeight;
- $Slices[$Slice]["Angle"][] = $i;
- }
- $InX2 = $Xc; $InY2 = $Yc;
-
- $Slices[$Slice]["InX1"] = $InX1; $Slices[$Slice]["InY1"] = $InY1;
- $Slices[$Slice]["InX2"] = $InX2; $Slices[$Slice]["InY2"] = $InY2;
- $Slices[$Slice]["OutX1"] = $OutX1; $Slices[$Slice]["OutY1"] = $OutY1;
- $Slices[$Slice]["OutX2"] = $OutX2; $Slices[$Slice]["OutY2"] = $OutY2;
-
- $Offset = $Lasti - $DataGapAngle; $ID--; $Slice++;
- }
-
- /* Draw the bottom pie splice */
- foreach($Slices as $SliceID => $Plots)
- {
- $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
- $this->pChartObject->drawPolygon($Plots["BottomPoly"],$Settings);
-
- foreach($Plots["AA"] as $Key => $Pos)
- $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1],$Settings);
-
- $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"],$Plots["OutX2"],$Plots["OutY2"],$Settings);
- $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"],$Plots["OutX1"],$Plots["OutY1"],$Settings);
- }
-
- $Slices = array_reverse($Slices);
- $SliceColors = array_reverse($SliceColors);
-
- /* Draw the vertical edges (semi-visible) */
- foreach($Slices as $SliceID => $Plots)
- {
- $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
- $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
-
- $StartAngle = $Plots["Angle"][0];
- foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
-
- if ( $StartAngle >= 270 || $StartAngle <= 90 )
- $this->pChartObject->drawLine($Plots["OutX1"],$Plots["OutY1"],$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
- if ( $StartAngle >= 270 || $StartAngle <= 90 )
- $this->pChartObject->drawLine($Plots["OutX2"],$Plots["OutY2"],$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
-
- $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"],$Plots["InX1"],$Plots["InY1"]-$SliceHeight,$Settings);
- $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"],$Plots["InX2"],$Plots["InY2"]-$SliceHeight,$Settings);
- }
-
- /* Draw the inner vertical slices */
- foreach($Slices as $SliceID => $Plots)
- {
- $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
- $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
-
- $Outer = TRUE; $Inner = FALSE;
- $InnerPlotsA = ""; $InnerPlotsB = "";
- foreach($Plots["Angle"] as $ID => $Angle)
- {
- if ( $Angle == VOID )
- { $Outer = FALSE; $Inner = TRUE; }
- elseif( $Inner )
- {
- if (( $Angle < 90 || $Angle > 270 ) && isset($Plots["BottomPoly"][$ID*2]) )
- {
- $Xo = $Plots["BottomPoly"][$ID*2];
- $Yo = $Plots["BottomPoly"][$ID*2+1];
-
- $InnerPlotsA[] = $Xo; $InnerPlotsA[] = $Yo;
- $InnerPlotsB[] = $Xo; $InnerPlotsB[] = $Yo-$SliceHeight;
- }
- }
- }
-
- if ( $InnerPlotsA != "" )
- { $InnerPlots = array_merge($InnerPlotsA,$this->arrayReverse($InnerPlotsB)); $this->pChartObject->drawPolygon($InnerPlots,$Settings); }
- }
-
- /* Draw the splice top and left poly */
- foreach($Slices as $SliceID => $Plots)
- {
- $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
- $Settings["R"] = $Settings["R"]+$Cf*1.5; $Settings["G"] = $Settings["G"]+$Cf*1.5; $Settings["B"] = $Settings["B"]+$Cf*1.5;
-
- $StartAngle = $Plots["Angle"][0];
- foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
-
- if ( $StartAngle < 180 )
- {
- $Points = "";
- $Points[] = $Plots["InX2"];
- $Points[] = $Plots["InY2"];
- $Points[] = $Plots["InX2"];
- $Points[] = $Plots["InY2"]-$SliceHeight;
- $Points[] = $Plots["OutX1"];
- $Points[] = $Plots["OutY1"]-$SliceHeight;
- $Points[] = $Plots["OutX1"];
- $Points[] = $Plots["OutY1"];
-
- $this->pChartObject->drawPolygon($Points,$Settings);
- }
-
- if ( $EndAngle > 180 )
- {
- $Points = "";
- $Points[] = $Plots["InX1"];
- $Points[] = $Plots["InY1"];
- $Points[] = $Plots["InX1"];
- $Points[] = $Plots["InY1"]-$SliceHeight;
- $Points[] = $Plots["OutX2"];
- $Points[] = $Plots["OutY2"]-$SliceHeight;
- $Points[] = $Plots["OutX2"];
- $Points[] = $Plots["OutY2"];
-
- $this->pChartObject->drawPolygon($Points,$Settings);
- }
- }
-
-
- /* Draw the vertical edges (visible) */
- foreach($Slices as $SliceID => $Plots)
- {
- $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
- $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
-
- $StartAngle = $Plots["Angle"][0];
- foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
-
- if ( $StartAngle <= 270 && $StartAngle >= 90 )
- $this->pChartObject->drawLine($Plots["OutX1"],$Plots["OutY1"],$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
- if ( $EndAngle <= 270 && $EndAngle >= 90 )
- $this->pChartObject->drawLine($Plots["OutX2"],$Plots["OutY2"],$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
- }
-
-
- /* Draw the outer vertical slices */
- foreach($Slices as $SliceID => $Plots)
- {
- $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
- $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
-
- $Outer = TRUE; $Inner = FALSE;
- $OuterPlotsA = ""; $OuterPlotsB = ""; $InnerPlotsA = ""; $InnerPlotsB = "";
- foreach($Plots["Angle"] as $ID => $Angle)
- {
- if ( $Angle == VOID )
- { $Outer = FALSE; $Inner = TRUE; }
- elseif( $Outer )
- {
- if ( ( $Angle > 90 && $Angle < 270 ) && isset($Plots["BottomPoly"][$ID*2]) )
- {
- $Xo = $Plots["BottomPoly"][$ID*2];
- $Yo = $Plots["BottomPoly"][$ID*2+1];
-
- $OuterPlotsA[] = $Xo; $OuterPlotsA[] = $Yo;
- $OuterPlotsB[] = $Xo; $OuterPlotsB[] = $Yo-$SliceHeight;
- }
- }
- }
- if ( $OuterPlotsA != "" )
- { $OuterPlots = array_merge($OuterPlotsA,$this->arrayReverse($OuterPlotsB)); $this->pChartObject->drawPolygon($OuterPlots,$Settings); }
- }
-
- $Slices = array_reverse($Slices);
- $SliceColors = array_reverse($SliceColors);
-
-
- /* Draw the top pie splice */
- foreach($Slices as $SliceID => $Plots)
- {
- $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
- $Settings["R"] = $Settings["R"]+$Cf*2; $Settings["G"] = $Settings["G"]+$Cf*2; $Settings["B"] = $Settings["B"]+$Cf*2;
-
- $this->pChartObject->drawPolygon($Plots["TopPoly"],$Settings);
-
- if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Plots["TopPoly"]),$this->pChartObject->toHTMLColor($Settings["R"],$Settings["G"],$Settings["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][$SliceID],$Data["Series"][$DataSerie]["Data"][count($Slices)-$SliceID-1]); }
-
- foreach($Plots["AA"] as $Key => $Pos)
- $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1]-$SliceHeight,$Settings);
-
- $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"]-$SliceHeight,$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
- $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"]-$SliceHeight,$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
- }
-
- if ( $DrawLabels )
- {
- $Offset = 360;
- foreach($Values as $Key => $Value)
- {
- $StartAngle = $Offset;
- $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
-
- if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
- { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
- else
- { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
-
- $Angle = ($EndAngle - $Offset)/2 + $Offset;
- $Xc = cos(($Angle-90)*PI/180) * ($OuterRadius+$DataGapRadius) + $X;
- $Yc = sin(($Angle-90)*PI/180) * ($OuterRadius+$DataGapRadius)*$SkewFactor + $Y;
-
- if ( $WriteValues == PIE_VALUE_PERCENTAGE )
- $Label = $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
- elseif ( $WriteValues == PIE_VALUE_NATURAL )
- $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
- else
- $Label = "";
-
- if ( $LabelStacked )
- $this->writePieLabel($Xc,$Yc-$SliceHeight,$Label,$Angle,$Settings,TRUE,$X,$Y,$OuterRadius);
- else
- $this->writePieLabel($Xc,$Yc-$SliceHeight,$Label,$Angle,$Settings,FALSE);
-
- $Offset = $EndAngle - $DataGapAngle; $ID--; $Slice++;
- }
- }
- if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
-
- $this->pChartObject->Shadow = $RestoreShadow;
-
- return(PIE_RENDERED);
- }
-
- /* Serialize an array */
- function arraySerialize($Data)
- {
- $Result = "";
- foreach($Data as $Key => $Value)
- { if ($Result == "") { $Result = floor($Value); } else { $Result = $Result.",".floor($Value); } }
-
- return($Result);
- }
-
- /* Reverse an array */
- function arrayReverse($Plots)
- {
- $Result = "";
-
- for($i=count($Plots)-1;$i>=0;$i=$i-2)
- { $Result[] = $Plots[$i-1]; $Result[] = $Plots[$i]; }
-
- return($Result);
- }
-
- /* Remove unused series & values */
- function clean0Values($Data,$Palette,$DataSerie,$AbscissaSerie)
- {
- $NewPalette = ""; $NewData = ""; $NewAbscissa = "";
-
- /* Remove unused series */
- foreach($Data["Series"] as $SerieName => $SerieSettings)
- { if ( $SerieName != $DataSerie && $SerieName != $AbscissaSerie ) { unset($Data["Series"][$SerieName]); } }
-
- /* Remove NULL values */
- foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
- {
- if ($Value != 0 )
- {
- $NewData[] = $Value;
- $NewAbscissa[] = $Data["Series"][$AbscissaSerie]["Data"][$Key];
- if ( isset($Palette[$Key]) ) { $NewPalette[] = $Palette[$Key]; }
- }
- }
- $Data["Series"][$DataSerie]["Data"] = $NewData;
- $Data["Series"][$AbscissaSerie]["Data"] = $NewAbscissa;
-
- return(array($Data,$NewPalette));
- }
- }
+<?php
+ /*
+ pPie - class to draw pie charts
+
+ Version : 2.1.4
+ Made by : Jean-Damien POGOLOTTI
+ Last Update : 19/01/2014
+
+ This file can be distributed under the license you can find at :
+
+ http://www.pchart.net/license
+
+ You can find the whole class documentation on the pChart web site.
+ */
+
+ /* Class return codes */
+ define("PIE_NO_ABSCISSA" , 140001);
+ define("PIE_NO_DATASERIE" , 140002);
+ define("PIE_SUMISNULL" , 140003);
+ define("PIE_RENDERED" , 140000);
+
+ define("PIE_LABEL_COLOR_AUTO" , 140010);
+ define("PIE_LABEL_COLOR_MANUAL", 140011);
+
+ define("PIE_VALUE_NATURAL" , 140020);
+ define("PIE_VALUE_PERCENTAGE" , 140021);
+
+ define("PIE_VALUE_INSIDE" , 140030);
+ define("PIE_VALUE_OUTSIDE" , 140031);
+
+ /* pPie class definition */
+ class pPie
+ {
+ var $pChartObject;
+ var $pDataObject;
+ var $LabelPos = "" ;
+
+ /* Class creator */
+ function __construct($Object,$pDataObject)
+ {
+ /* Cache the pChart object reference */
+ $this->pChartObject = $Object;
+
+ /* Cache the pData object reference */
+ $this->pDataObject = $pDataObject;
+ }
+
+ /* Draw a pie chart */
+ function draw2DPie($X,$Y,$Format="")
+ {
+ $Radius = isset($Format["Radius"]) ? $Format["Radius"] : 60;
+ $Precision = isset($Format["Precision"]) ? $Format["Precision"] : 0;
+ $DataGapAngle = isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 0;
+ $DataGapRadius = isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 0;
+ $SecondPass = isset($Format["SecondPass"]) ? $Format["SecondPass"] : TRUE;
+ $Border = isset($Format["Border"]) ? $Format["Border"] : FALSE;
+ $BorderR = isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
+ $BorderG = isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
+ $BorderB = isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
+ $Shadow = isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
+ $DrawLabels = isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
+ $LabelStacked = isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
+ $LabelColor = isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
+ $LabelR = isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
+ $LabelG = isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
+ $LabelB = isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
+ $LabelAlpha = isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
+ $WriteValues = isset($Format["WriteValues"]) ? $Format["WriteValues"] : NULL;
+ $ValuePosition = isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
+ $ValuePadding = isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 15;
+ $ValueSuffix = isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
+ $ValueR = isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
+ $ValueG = isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
+ $ValueB = isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
+ $ValueAlpha = isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
+ $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+ /* Data Processing */
+ $Data = $this->pDataObject->getData();
+ $Palette = $this->pDataObject->getPalette();
+
+ /* Do we have an abscissa serie defined? */
+ if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+
+ /* Try to find the data serie */
+ $DataSerie = "";
+ foreach ($Data["Series"] as $SerieName => $SerieData)
+ { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
+
+ /* Do we have data to compute? */
+ if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
+
+ /* Remove unused data */
+ list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
+
+ /* Compute the pie sum */
+ $SerieSum = $this->pDataObject->getSum($DataSerie);
+
+ /* Do we have data to draw? */
+ if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
+
+ /* Dump the real number of data to draw */
+ $Values = "";
+ foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+ { if ($Value != 0) { $Values[] = $Value; } }
+
+ /* Compute the wasted angular space between series */
+ if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = count($Values) * $DataGapAngle; }
+
+ /* Compute the scale */
+ $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
+
+ $RestoreShadow = $this->pChartObject->Shadow;
+ if ( $this->pChartObject->Shadow )
+ {
+ $this->pChartObject->Shadow = FALSE;
+
+ $ShadowFormat = $Format; $ShadowFormat["Shadow"] = TRUE;
+ $this->draw2DPie($X+$this->pChartObject->ShadowX,$Y+$this->pChartObject->ShadowY,$ShadowFormat);
+ }
+
+ /* Draw the polygon pie elements */
+ $Step = 360 / (2 * PI * $Radius);
+ $Offset = 0; $ID = 0;
+ foreach($Values as $Key => $Value)
+ {
+ if ( $Shadow )
+ $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
+ else
+ {
+ if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
+ $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+ }
+
+ if ( !$SecondPass && !$Shadow )
+ {
+ if ( !$Border )
+ $Settings["Surrounding"] = 10;
+ else
+ { $Settings["BorderR"] = $BorderR; $Settings["BorderG"] = $BorderG; $Settings["BorderB"] = $BorderB; }
+ }
+
+ $Plots = "";
+ $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
+
+ $Angle = ($EndAngle - $Offset)/2 + $Offset;
+ if ($DataGapAngle == 0)
+ { $X0 = $X; $Y0 = $Y; }
+ else
+ {
+ $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
+ $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius + $Y;
+ }
+
+ $Plots[] = $X0; $Plots[] = $Y0;
+
+
+ for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
+ {
+ $Xc = cos(($i-90)*PI/180) * $Radius + $X;
+ $Yc = sin(($i-90)*PI/180) * $Radius + $Y;
+
+ if ( $SecondPass && ( $i<90 )) { $Yc++; }
+ if ( $SecondPass && ( $i>180 && $i<270 )) { $Xc++; }
+ if ( $SecondPass && ( $i>=270 )) { $Xc++; $Yc++; }
+
+ $Plots[] = $Xc; $Plots[] = $Yc;
+ }
+
+ $this->pChartObject->drawPolygon($Plots,$Settings);
+ if ( $RecordImageMap && !$Shadow ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Plots),$this->pChartObject->toHTMLColor($Palette[$ID]["R"],$Palette[$ID]["G"],$Palette[$ID]["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][$Key],$Value); }
+
+ if ( $DrawLabels && !$Shadow && !$SecondPass )
+ {
+ if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
+ { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
+ else
+ { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+
+ $Angle = ($EndAngle - $Offset)/2 + $Offset;
+ $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
+ $Yc = sin(($Angle-90)*PI/180) * $Radius + $Y;
+
+ $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
+
+ if ( $LabelStacked )
+ $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius);
+ else
+ $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+ }
+
+ $Offset = $i + $DataGapAngle; $ID++;
+ }
+
+ /* Second pass to smooth the angles */
+ if ( $SecondPass )
+ {
+ $Step = 360 / (2 * PI * $Radius);
+ $Offset = 0; $ID = 0;
+ foreach($Values as $Key => $Value)
+ {
+ $FirstPoint = TRUE;
+ if ( $Shadow )
+ $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
+ else
+ {
+ if ( $Border )
+ $Settings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB);
+ else
+ $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+ }
+
+ $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
+
+ if ($DataGapAngle == 0)
+ { $X0 = $X; $Y0 = $Y; }
+ else
+ {
+ $Angle = ($EndAngle - $Offset)/2 + $Offset;
+ $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
+ $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius + $Y;
+ }
+ $Plots[] = $X0; $Plots[] = $Y0;
+
+ for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
+ {
+ $Xc = cos(($i-90)*PI/180) * $Radius + $X;
+ $Yc = sin(($i-90)*PI/180) * $Radius + $Y;
+
+ if ( $FirstPoint ) { $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings); } { $FirstPoint = FALSE; }
+
+ $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
+ }
+ $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings);
+
+ if ( $DrawLabels && !$Shadow )
+ {
+ if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
+ { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
+ else
+ { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+
+ $Angle = ($EndAngle - $Offset)/2 + $Offset;
+ $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
+ $Yc = sin(($Angle-90)*PI/180) * $Radius + $Y;
+
+ $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
+
+ if ( $LabelStacked )
+ $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius);
+ else
+ $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+ }
+
+ $Offset = $i + $DataGapAngle; $ID++;
+ }
+ }
+
+ if ( $WriteValues != NULL && !$Shadow )
+ {
+ $Step = 360 / (2 * PI * $Radius);
+ $Offset = 0; $ID = count($Values)-1;
+ $Settings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"R"=>$ValueR,"G"=>$ValueG,"B"=>$ValueB,"Alpha"=>$ValueAlpha);
+ foreach($Values as $Key => $Value)
+ {
+ $EndAngle = ($Value*$ScaleFactor) + $Offset; if ( (int)$EndAngle > 360 ) { $EndAngle = 0; }
+ $Angle = ($EndAngle - $Offset)/2 + $Offset;
+
+ if ( $ValuePosition == PIE_VALUE_OUTSIDE )
+ {
+ $Xc = cos(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $X;
+ $Yc = sin(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $Y;
+ }
+ else
+ {
+ $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
+ $Yc = sin(($Angle-90)*PI/180) * ($Radius)/2 + $Y;
+ }
+
+ if ( $WriteValues == PIE_VALUE_PERCENTAGE )
+ $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
+ elseif ( $WriteValues == PIE_VALUE_NATURAL )
+ $Display = $Value.$ValueSuffix;
+
+ $this->pChartObject->drawText($Xc,$Yc,$Display,$Settings);
+
+ $Offset = $EndAngle + $DataGapAngle; $ID--;
+ }
+ }
+
+ if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
+
+ $this->pChartObject->Shadow = $RestoreShadow;
+
+ return(PIE_RENDERED);
+ }
+
+ /* Draw a 3D pie chart */
+ function draw3DPie($X,$Y,$Format="")
+ {
+ /* Rendering layout */
+ $Radius = isset($Format["Radius"]) ? $Format["Radius"] : 80;
+ $Precision = isset($Format["Precision"]) ? $Format["Precision"] : 0;
+ $SkewFactor = isset($Format["SkewFactor"]) ? $Format["SkewFactor"] : .5;
+ $SliceHeight = isset($Format["SliceHeight"]) ? $Format["SliceHeight"] : 20;
+ $DataGapAngle = isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 0;
+ $DataGapRadius = isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 0;
+ $SecondPass = isset($Format["SecondPass"]) ? $Format["SecondPass"] : TRUE;
+ $Border = isset($Format["Border"]) ? $Format["Border"] : FALSE;
+ $Shadow = isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
+ $DrawLabels = isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
+ $LabelStacked = isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
+ $LabelColor = isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
+ $LabelR = isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
+ $LabelG = isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
+ $LabelB = isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
+ $LabelAlpha = isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
+ $WriteValues = isset($Format["WriteValues"]) ? $Format["WriteValues"] : NULL; //PIE_VALUE_PERCENTAGE
+ $ValuePosition = isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_INSIDE;
+ $ValuePadding = isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 15;
+ $ValueSuffix = isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
+ $ValueR = isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
+ $ValueG = isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
+ $ValueB = isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
+ $ValueAlpha = isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
+ $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+ /* Error correction for overlaying rounded corners */
+ if ( $SkewFactor < .5 ) { $SkewFactor = .5; }
+
+ /* Data Processing */
+ $Data = $this->pDataObject->getData();
+ $Palette = $this->pDataObject->getPalette();
+
+ /* Do we have an abscissa serie defined? */
+ if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+
+ /* Try to find the data serie */
+ $DataSerie = "";
+ foreach ($Data["Series"] as $SerieName => $SerieData)
+ { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
+
+ /* Do we have data to compute? */
+ if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
+
+ /* Remove unused data */
+ list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
+
+ /* Compute the pie sum */
+ $SerieSum = $this->pDataObject->getSum($DataSerie);
+
+ /* Do we have data to draw? */
+ if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
+
+ /* Dump the real number of data to draw */
+ $Values = "";
+ foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+ { if ($Value != 0) { $Values[] = $Value; } }
+
+ /* Compute the wasted angular space between series */
+ if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = count($Values) * $DataGapAngle; }
+
+ /* Compute the scale */
+ $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
+
+ $RestoreShadow = $this->pChartObject->Shadow;
+ if ( $this->pChartObject->Shadow ) { $this->pChartObject->Shadow = FALSE; }
+
+ /* Draw the polygon pie elements */
+ $Step = 360 / (2 * PI * $Radius);
+ $Offset = 360; $ID = count($Values)-1;
+ $Values = array_reverse($Values);
+ $Slice = 0; $Slices = ""; $SliceColors = ""; $Visible = ""; $SliceAngle = "";
+ foreach($Values as $Key => $Value)
+ {
+ if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
+ $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+
+ $SliceColors[$Slice] = $Settings;
+
+ $StartAngle = $Offset;
+ $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+
+ if ( $StartAngle > 180 ) { $Visible[$Slice]["Start"] = TRUE; } else { $Visible[$Slice]["Start"] = TRUE; }
+ if ( $EndAngle < 180 ) { $Visible[$Slice]["End"] = FALSE; } else { $Visible[$Slice]["End"] = TRUE; }
+
+ if ($DataGapAngle == 0)
+ { $X0 = $X; $Y0 = $Y; }
+ else
+ {
+ $Angle = ($EndAngle - $Offset)/2 + $Offset;
+ $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
+ $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius*$SkewFactor + $Y;
+ }
+ $Slices[$Slice][] = $X0; $Slices[$Slice][] = $Y0; $SliceAngle[$Slice][] = 0;
+
+ for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
+ {
+ $Xc = cos(($i-90)*PI/180) * $Radius + $X;
+ $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y;
+
+ if ( ($SecondPass || $RestoreShadow ) && ( $i<90 )) { $Yc++; }
+ if ( ($SecondPass || $RestoreShadow ) && ( $i>90 && $i<180 )) { $Xc++; }
+ if ( ($SecondPass || $RestoreShadow ) && ( $i>180 && $i<270 )) { $Xc++; }
+ if ( ($SecondPass || $RestoreShadow ) && ( $i>=270 )) { $Xc++; $Yc++; }
+
+ $Slices[$Slice][] = $Xc; $Slices[$Slice][] = $Yc; $SliceAngle[$Slice][] = $i;
+ }
+
+ $Offset = $i - $DataGapAngle; $ID--; $Slice++;
+ }
+
+ /* Draw the bottom shadow if needed */
+ if ( $RestoreShadow && ($this->pChartObject->ShadowX != 0 || $this->pChartObject->ShadowY !=0 ))
+ {
+ foreach($Slices as $SliceID => $Plots)
+ {
+ $ShadowPie = "";
+ for($i=0;$i<count($Plots);$i=$i+2)
+ { $ShadowPie[] = $Plots[$i]+$this->pChartObject->ShadowX; $ShadowPie[] = $Plots[$i+1]+$this->pChartObject->ShadowY; }
+
+ $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa,"NoBorder"=>TRUE);
+ $this->pChartObject->drawPolygon($ShadowPie,$Settings);
+ }
+
+ $Step = 360 / (2 * PI * $Radius);
+ $Offset = 360;
+ foreach($Values as $Key => $Value)
+ {
+ $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+
+ for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
+ {
+ $Xc = cos(($i-90)*PI/180) * $Radius + $X + $this->pChartObject->ShadowX;
+ $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y + $this->pChartObject->ShadowY;
+
+ $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
+ }
+
+ $Offset = $i - $DataGapAngle; $ID--;
+ }
+ }
+
+ /* Draw the bottom pie splice */
+ foreach($Slices as $SliceID => $Plots)
+ {
+ $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+ $this->pChartObject->drawPolygon($Plots,$Settings);
+
+ if ( $SecondPass )
+ {
+ $Settings = $SliceColors[$SliceID];
+ if ( $Border )
+ { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30;; }
+
+ if ( isset($SliceAngle[$SliceID][1]) ) /* Empty error handling */
+ {
+ $Angle = $SliceAngle[$SliceID][1];
+ $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
+ $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
+ $this->pChartObject->drawLine($Plots[0],$Plots[1],$Xc,$Yc,$Settings);
+
+ $Angle = $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1];
+ $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
+ $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
+ $this->pChartObject->drawLine($Plots[0],$Plots[1],$Xc,$Yc,$Settings);
+ }
+ }
+ }
+
+ /* Draw the two vertical edges */
+ $Slices = array_reverse($Slices);
+ $SliceColors = array_reverse($SliceColors);
+ foreach($Slices as $SliceID => $Plots)
+ {
+ $Settings = $SliceColors[$SliceID];
+ $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
+
+ if ( $Visible[$SliceID]["Start"] && isset($Plots[2])) /* Empty error handling */
+ {
+ $this->pChartObject->drawLine($Plots[2],$Plots[3],$Plots[2],$Plots[3]- $SliceHeight,array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]));
+ $Border = "";
+ $Border[] = $Plots[0]; $Border[] = $Plots[1]; $Border[] = $Plots[0]; $Border[] = $Plots[1] - $SliceHeight;
+ $Border[] = $Plots[2]; $Border[] = $Plots[3] - $SliceHeight; $Border[] = $Plots[2]; $Border[] = $Plots[3];
+ $this->pChartObject->drawPolygon($Border,$Settings);
+ }
+ }
+
+ $Slices = array_reverse($Slices);
+ $SliceColors = array_reverse($SliceColors);
+ foreach($Slices as $SliceID => $Plots)
+ {
+ $Settings = $SliceColors[$SliceID];
+ $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
+ if ( $Visible[$SliceID]["End"] )
+ {
+ $this->pChartObject->drawLine($Plots[count($Plots)-2],$Plots[count($Plots)-1],$Plots[count($Plots)-2],$Plots[count($Plots)-1]- $SliceHeight,array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]));
+
+ $Border = "";
+ $Border[] = $Plots[0]; $Border[] = $Plots[1]; $Border[] = $Plots[0]; $Border[] = $Plots[1] - $SliceHeight;
+ $Border[] = $Plots[count($Plots)-2]; $Border[] = $Plots[count($Plots)-1] - $SliceHeight; $Border[] = $Plots[count($Plots)-2]; $Border[] = $Plots[count($Plots)-1];
+ $this->pChartObject->drawPolygon($Border,$Settings);
+ }
+ }
+
+ /* Draw the rounded edges */
+ foreach($Slices as $SliceID => $Plots)
+ {
+ $Settings = $SliceColors[$SliceID];
+ $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
+
+ for ($j=2;$j<count($Plots)-2;$j=$j+2)
+ {
+ $Angle = $SliceAngle[$SliceID][$j/2];
+ if ( $Angle < 270 && $Angle > 90 )
+ {
+ $Border = "";
+ $Border[] = $Plots[$j]; $Border[] = $Plots[$j+1];
+ $Border[] = $Plots[$j+2]; $Border[] = $Plots[$j+3];
+ $Border[] = $Plots[$j+2]; $Border[] = $Plots[$j+3] - $SliceHeight;
+ $Border[] = $Plots[$j]; $Border[] = $Plots[$j+1] - $SliceHeight;
+ $this->pChartObject->drawPolygon($Border,$Settings);
+ }
+ }
+
+ if ( $SecondPass )
+ {
+ $Settings = $SliceColors[$SliceID];
+ if ( $Border )
+ { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30; }
+
+ if ( isset($SliceAngle[$SliceID][1]) ) /* Empty error handling */
+ {
+ $Angle = $SliceAngle[$SliceID][1];
+ if ( $Angle < 270 && $Angle > 90 )
+ {
+ $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
+ $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
+ $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
+ }
+ }
+
+ $Angle = $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1];
+ if ( $Angle < 270 && $Angle > 90 )
+ {
+ $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
+ $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
+ $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
+ }
+
+ if ( isset($SliceAngle[$SliceID][1]) && $SliceAngle[$SliceID][1] > 270 && $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1] < 270 )
+ {
+ $Xc = cos((270-90)*PI/180) * $Radius + $X;
+ $Yc = sin((270-90)*PI/180) * $Radius*$SkewFactor + $Y;
+ $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
+ }
+
+ if ( isset($SliceAngle[$SliceID][1]) && $SliceAngle[$SliceID][1] > 90 && $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1] < 90 )
+ {
+ $Xc = cos((0)*PI/180) * $Radius + $X;
+ $Yc = sin((0)*PI/180) * $Radius*$SkewFactor + $Y;
+ $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
+ }
+
+ }
+ }
+
+ /* Draw the top splice */
+ foreach($Slices as $SliceID => $Plots)
+ {
+ $Settings = $SliceColors[$SliceID];
+ $Settings["R"]+= 20; $Settings["G"]+= 20; $Settings["B"]+= 20;
+
+ $Top = "";
+ for($j=0;$j<count($Plots);$j=$j+2) { $Top[] = $Plots[$j]; $Top[] = $Plots[$j+1]- $SliceHeight; }
+ $this->pChartObject->drawPolygon($Top,$Settings);
+
+ if ( $RecordImageMap && !$Shadow ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Top),$this->pChartObject->toHTMLColor($Settings["R"],$Settings["G"],$Settings["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][count($Slices)-$SliceID-1],$Values[$SliceID]); }
+ }
+
+
+ /* Second pass to smooth the angles */
+ if ( $SecondPass )
+ {
+ $Step = 360 / (2 * PI * $Radius);
+ $Offset = 360; $ID = count($Values)-1;
+ foreach($Values as $Key => $Value)
+ {
+ $FirstPoint = TRUE;
+ if ( $Shadow )
+ $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
+ else
+ {
+ if ( $Border )
+ { $Settings = array("R"=>$Palette[$ID]["R"]+30,"G"=>$Palette[$ID]["G"]+30,"B"=>$Palette[$ID]["B"]+30,"Alpha"=>$Palette[$ID]["Alpha"]); }
+ else
+ $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+ }
+
+ $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+
+ if ($DataGapAngle == 0)
+ { $X0 = $X; $Y0 = $Y- $SliceHeight; }
+ else
+ {
+ $Angle = ($EndAngle - $Offset)/2 + $Offset;
+ $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
+ $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius*$SkewFactor + $Y - $SliceHeight;
+ }
+ $Plots[] = $X0; $Plots[] = $Y0;
+
+ for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
+ {
+ $Xc = cos(($i-90)*PI/180) * $Radius + $X;
+ $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y - $SliceHeight;
+
+ if ( $FirstPoint ) { $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings); } { $FirstPoint = FALSE; }
+
+ $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
+ if ($i < 270 && $i > 90 ) { $this->pChartObject->drawAntialiasPixel($Xc,$Yc+$SliceHeight,$Settings); }
+ }
+ $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings);
+
+ $Offset = $i - $DataGapAngle; $ID--;
+ }
+ }
+
+ if ( $WriteValues != NULL )
+ {
+ $Step = 360 / (2 * PI * $Radius);
+ $Offset = 360; $ID = count($Values)-1;
+ $Settings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"R"=>$ValueR,"G"=>$ValueG,"B"=>$ValueB,"Alpha"=>$ValueAlpha);
+ foreach($Values as $Key => $Value)
+ {
+ $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+
+ $Angle = ($EndAngle - $Offset)/2 + $Offset;
+
+ if ( $ValuePosition == PIE_VALUE_OUTSIDE )
+ {
+ $Xc = cos(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $X;
+ $Yc = sin(($Angle-90)*PI/180) * (($Radius*$SkewFactor)+$ValuePadding) + $Y - $SliceHeight;
+ }
+ else
+ {
+ $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
+ $Yc = sin(($Angle-90)*PI/180) * ($Radius*$SkewFactor)/2 + $Y - $SliceHeight;
+ }
+
+ if ( $WriteValues == PIE_VALUE_PERCENTAGE )
+ $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
+ elseif ( $WriteValues == PIE_VALUE_NATURAL )
+ $Display = $Value.$ValueSuffix;
+
+ $this->pChartObject->drawText($Xc,$Yc,$Display,$Settings);
+
+ $Offset = $EndAngle - $DataGapAngle; $ID--;
+ }
+ }
+
+ if ( $DrawLabels )
+ {
+ $Step = 360 / (2 * PI * $Radius);
+ $Offset = 360; $ID = count($Values)-1;
+ foreach($Values as $Key => $Value)
+ {
+ if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
+ { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
+ else
+ { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+
+ $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+
+ $Angle = ($EndAngle - $Offset)/2 + $Offset;
+ $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
+ $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y - $SliceHeight;
+
+ if ( isset($Data["Series"][$Data["Abscissa"]]["Data"][$ID]) )
+ {
+ $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$ID];
+
+ if ( $LabelStacked )
+ $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius,TRUE);
+ else
+ $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+ }
+
+ $Offset = $EndAngle - $DataGapAngle; $ID--;
+ }
+ }
+
+ if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
+
+ $this->pChartObject->Shadow = $RestoreShadow;
+
+ return(PIE_RENDERED);
+ }
+
+ /* Draw the legend of pie chart */
+ function drawPieLegend($X,$Y,$Format="")
+ {
+ $FontName = isset($Format["FontName"]) ? $Format["FontName"] : $this->pChartObject->FontName;
+ $FontSize = isset($Format["FontSize"]) ? $Format["FontSize"] : $this->pChartObject->FontSize;
+ $FontR = isset($Format["FontR"]) ? $Format["FontR"] : $this->pChartObject->FontColorR;
+ $FontG = isset($Format["FontG"]) ? $Format["FontG"] : $this->pChartObject->FontColorG;
+ $FontB = isset($Format["FontB"]) ? $Format["FontB"] : $this->pChartObject->FontColorB;
+ $BoxSize = isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
+ $Margin = isset($Format["Margin"]) ? $Format["Margin"] : 5;
+ $R = isset($Format["R"]) ? $Format["R"] : 200;
+ $G = isset($Format["G"]) ? $Format["G"] : 200;
+ $B = isset($Format["B"]) ? $Format["B"] : 200;
+ $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+ $BorderR = isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
+ $BorderG = isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
+ $BorderB = isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
+ $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+ $Style = isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
+ $Mode = isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
+
+ if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+
+ $YStep = max($this->pChartObject->FontSize,$BoxSize) + 5;
+ $XStep = $BoxSize + 5;
+
+ /* Data Processing */
+ $Data = $this->pDataObject->getData();
+ $Palette = $this->pDataObject->getPalette();
+
+ /* Do we have an abscissa serie defined? */
+ if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+
+ $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
+ foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $Value)
+ {
+ $BoxArray = $this->pChartObject->getTextBox($vX+$BoxSize+4,$vY+$BoxSize/2,$FontName,$FontSize,0,$Value);
+
+ if ( $Mode == LEGEND_VERTICAL )
+ {
+ if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$BoxSize/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$BoxSize/2; }
+ if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+ if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$BoxSize/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$BoxSize/2; }
+ $vY=$vY+$YStep;
+ }
+ elseif ( $Mode == LEGEND_HORIZONTAL )
+ {
+ if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$BoxSize/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$BoxSize/2; }
+ if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+ if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$BoxSize/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$BoxSize/2; }
+ $vX=$Boundaries["R"]+$XStep;
+ }
+ }
+ $vY=$vY-$YStep; $vX=$vX-$XStep;
+
+ $TopOffset = $Y - $Boundaries["T"];
+ if ( $Boundaries["B"]-($vY+$BoxSize) < $TopOffset ) { $Boundaries["B"] = $vY+$BoxSize+$TopOffset; }
+
+ if ( $Style == LEGEND_ROUND )
+ $this->pChartObject->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+ elseif ( $Style == LEGEND_BOX )
+ $this->pChartObject->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+
+ $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE;
+ foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $Value)
+ {
+ $R = $Palette[$Key]["R"]; $G = $Palette[$Key]["G"]; $B = $Palette[$Key]["B"];
+
+ $this->pChartObject->drawFilledRectangle($X+1,$Y+1,$X+$BoxSize+1,$Y+$BoxSize+1,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
+ $this->pChartObject->drawFilledRectangle($X,$Y,$X+$BoxSize,$Y+$BoxSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
+ if ( $Mode == LEGEND_VERTICAL )
+ {
+ $this->pChartObject->drawText($X+$BoxSize+4,$Y+$BoxSize/2,$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontName"=>$FontName,"FontSize"=>$FontSize));
+ $Y=$Y+$YStep;
+ }
+ elseif ( $Mode == LEGEND_HORIZONTAL )
+ {
+ $BoxArray = $this->pChartObject->drawText($X+$BoxSize+4,$Y+$BoxSize/2,$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontName"=>$FontName,"FontSize"=>$FontSize));
+ $X=$BoxArray[1]["X"]+2+$XStep;
+ }
+ }
+
+ $this->Shadow = $RestoreShadow;
+ }
+
+ /* Set the color of the specified slice */
+ function setSliceColor($SliceID,$Format="")
+ {
+ $R = isset($Format["R"]) ? $Format["R"] : 0;
+ $G = isset($Format["G"]) ? $Format["G"] : 0;
+ $B = isset($Format["B"]) ? $Format["B"] : 0;
+ $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+
+ $this->pDataObject->Palette[$SliceID]["R"] = $R;
+ $this->pDataObject->Palette[$SliceID]["G"] = $G;
+ $this->pDataObject->Palette[$SliceID]["B"] = $B;
+ $this->pDataObject->Palette[$SliceID]["Alpha"] = $Alpha;
+ }
+
+ /* Internally used compute the label positions */
+ function writePieLabel($X,$Y,$Label,$Angle,$Settings,$Stacked,$Xc=0,$Yc=0,$Radius=0,$Reversed=FALSE)
+ {
+ $LabelOffset = 30;
+ $FontName = $this->pChartObject->FontName;
+ $FontSize = $this->pChartObject->FontSize;
+
+ if ( !$Stacked )
+ {
+ $Settings["Angle"] = 360-$Angle;
+ $Settings["Length"] = 25;
+ $Settings["Size"] = 8;
+
+ $this->pChartObject->drawArrowLabel($X,$Y," ".$Label." ",$Settings);
+ }
+ else
+ {
+ $X2 = cos(deg2rad($Angle-90))*20+$X;
+ $Y2 = sin(deg2rad($Angle-90))*20+$Y;
+
+ $TxtPos = $this->pChartObject->getTextBox($X,$Y,$FontName,$FontSize,0,$Label);
+ $Height = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
+ $YTop = $Y2 - $Height/2 - 2;
+ $YBottom = $Y2 + $Height/2 + 2;
+
+ if ( $this->LabelPos != "" )
+ {
+ $Done = FALSE;
+ foreach($this->LabelPos as $Key => $Settings)
+ {
+ if ( !$Done )
+ {
+ if ( $Angle <= 90 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
+ { $this->shift(0,180,-($Height+2),$Reversed); $Done = TRUE; }
+ if ( $Angle > 90 && $Angle <= 180 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
+ { $this->shift(0,180,-($Height+2),$Reversed); $Done = TRUE; }
+ if ( $Angle > 180 && $Angle <= 270 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
+ { $this->shift(180,360,($Height+2),$Reversed); $Done = TRUE; }
+ if ( $Angle > 270 && $Angle <= 360 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
+ { $this->shift(180,360,($Height+2),$Reversed); $Done = TRUE; }
+ }
+ }
+ }
+
+ $LabelSettings = array("YTop"=>$YTop,"YBottom"=>$YBottom,"Label"=>$Label,"Angle"=>$Angle,"X1"=>$X,"Y1"=>$Y,"X2"=>$X2,"Y2"=>$Y2);
+ if ( $Angle <= 180 ) { $LabelSettings["X3"] = $Xc+$Radius+$LabelOffset; }
+ if ( $Angle > 180 ) { $LabelSettings["X3"] = $Xc-$Radius-$LabelOffset; }
+ $this->LabelPos[] = $LabelSettings;
+ }
+ }
+
+ /* Internally used to shift label positions */
+ function shift($StartAngle,$EndAngle,$Offset,$Reversed)
+ {
+ if ( $Reversed ) { $Offset = -$Offset; }
+ foreach($this->LabelPos as $Key => $Settings)
+ {
+ if ( $Settings["Angle"] > $StartAngle && $Settings["Angle"] <= $EndAngle ) { $this->LabelPos[$Key]["YTop"] = $Settings["YTop"] + $Offset; $this->LabelPos[$Key]["YBottom"] = $Settings["YBottom"] + $Offset; $this->LabelPos[$Key]["Y2"] = $Settings["Y2"] + $Offset; }
+ }
+ }
+
+ /* Internally used to write the re-computed labels */
+ function writeShiftedLabels()
+ {
+ if ( $this->LabelPos == "" ) { return(0); }
+ foreach($this->LabelPos as $Key => $Settings)
+ {
+ $X1 = $Settings["X1"]; $Y1 = $Settings["Y1"];
+ $X2 = $Settings["X2"]; $Y2 = $Settings["Y2"];
+ $X3 = $Settings["X3"];
+ $Angle = $Settings["Angle"];
+ $Label = $Settings["Label"];
+
+ $this->pChartObject->drawArrow($X2,$Y2,$X1,$Y1,array("Size"=>8));
+ if ( $Angle <= 180 )
+ {
+ $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
+ $this->pChartObject->drawText($X3+2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
+ }
+ else
+ {
+ $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
+ $this->pChartObject->drawText($X3-2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
+ }
+ }
+ }
+
+ /* Draw a ring chart */
+ function draw2DRing($X,$Y,$Format="")
+ {
+ $OuterRadius = isset($Format["Radius"]) ? $Format["Radius"] : 60;
+ $Precision = isset($Format["Precision"]) ? $Format["Precision"] : 0;
+ $InnerRadius = isset($Format["Radius"]) ? $Format["Radius"] : 30;
+ $Border = isset($Format["Border"]) ? $Format["Border"] : FALSE;
+ $BorderR = isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
+ $BorderG = isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
+ $BorderB = isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
+ $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 100;
+ $Shadow = isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
+ $DrawLabels = isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
+ $LabelStacked = isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
+ $LabelColor = isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
+ $LabelR = isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
+ $LabelG = isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
+ $LabelB = isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
+ $LabelAlpha = isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
+ $WriteValues = isset($Format["WriteValues"]) ? $Format["WriteValues"] : NULL; //PIE_VALUE_PERCENTAGE
+ $ValuePadding = isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 5;
+ $ValuePosition = isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
+ $ValueSuffix = isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
+ $ValueR = isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
+ $ValueG = isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
+ $ValueB = isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
+ $ValueAlpha = isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
+ $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+ /* Data Processing */
+ $Data = $this->pDataObject->getData();
+ $Palette = $this->pDataObject->getPalette();
+
+ /* Do we have an abscissa serie defined? */
+ if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+
+ /* Try to find the data serie */
+ $DataSerie = "";
+ foreach ($Data["Series"] as $SerieName => $SerieData)
+ { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
+
+ /* Do we have data to compute? */
+ if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
+
+ /* Remove unused data */
+ list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
+
+ /* Compute the pie sum */
+ $SerieSum = $this->pDataObject->getSum($DataSerie);
+
+ /* Do we have data to draw? */
+ if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
+
+ /* Dump the real number of data to draw */
+ $Values = "";
+ foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+ { if ($Value != 0) { $Values[] = $Value; } }
+
+ /* Compute the wasted angular space between series */
+ if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = 0; } // count($Values)
+
+ /* Compute the scale */
+ $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
+
+ $RestoreShadow = $this->pChartObject->Shadow;
+ if ( $this->pChartObject->Shadow )
+ {
+ $this->pChartObject->Shadow = FALSE;
+
+ $ShadowFormat = $Format; $ShadowFormat["Shadow"] = TRUE;
+ $this->draw2DRing($X+$this->pChartObject->ShadowX,$Y+$this->pChartObject->ShadowY,$ShadowFormat);
+ }
+
+ /* Draw the polygon pie elements */
+ $Step = 360 / (2 * PI * $OuterRadius);
+ $Offset = 0; $ID = 0;
+ foreach($Values as $Key => $Value)
+ {
+ if ( $Shadow )
+ {
+ $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
+ $BorderColor = $Settings;
+ }
+ else
+ {
+ if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
+ $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+
+ if ( $Border )
+ $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
+ else
+ $BorderColor = $Settings;
+ }
+
+ $Plots = ""; $Boundaries = ""; $AAPixels = "";
+ $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
+ for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
+ {
+ $Xc = cos(($i-90)*PI/180) * $OuterRadius + $X;
+ $Yc = sin(($i-90)*PI/180) * $OuterRadius + $Y;
+
+ if ( !isset($Boundaries[0]["X1"]) ) { $Boundaries[0]["X1"] = $Xc; $Boundaries[0]["Y1"] = $Yc; }
+ $AAPixels[] = array($Xc,$Yc);
+
+ if ( $i<90 ) { $Yc++; }
+ if ( $i>180 && $i<270 ) { $Xc++; }
+ if ( $i>=270 ) { $Xc++; $Yc++; }
+
+ $Plots[] = $Xc; $Plots[] = $Yc;
+ }
+ $Boundaries[1]["X1"] = $Xc; $Boundaries[1]["Y1"] = $Yc;
+ $Lasti = $EndAngle;
+
+ for($i=$EndAngle;$i>=$Offset;$i=$i-$Step)
+ {
+ $Xc = cos(($i-90)*PI/180) * ($InnerRadius-1) + $X;
+ $Yc = sin(($i-90)*PI/180) * ($InnerRadius-1) + $Y;
+
+ if ( !isset($Boundaries[1]["X2"]) ) { $Boundaries[1]["X2"] = $Xc; $Boundaries[1]["Y2"] = $Yc; }
+ $AAPixels[] = array($Xc,$Yc);
+
+ $Xc = cos(($i-90)*PI/180) * $InnerRadius + $X;
+ $Yc = sin(($i-90)*PI/180) * $InnerRadius + $Y;
+
+ if ( $i<90 ) { $Yc++; }
+ if ( $i>180 && $i<270 ) { $Xc++; }
+ if ( $i>=270 ) { $Xc++; $Yc++; }
+
+ $Plots[] = $Xc; $Plots[] = $Yc;
+ }
+ $Boundaries[0]["X2"] = $Xc; $Boundaries[0]["Y2"] = $Yc;
+
+ /* Draw the polygon */
+ $this->pChartObject->drawPolygon($Plots,$Settings);
+ if ( $RecordImageMap && !$Shadow ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Plots),$this->pChartObject->toHTMLColor($Palette[$ID]["R"],$Palette[$ID]["G"],$Palette[$ID]["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][$Key],$Value); }
+
+ /* Smooth the edges using AA */
+ foreach($AAPixels as $iKey => $Pos ) { $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1],$BorderColor); }
+ $this->pChartObject->drawLine($Boundaries[0]["X1"],$Boundaries[0]["Y1"],$Boundaries[0]["X2"],$Boundaries[0]["Y2"],$BorderColor);
+ $this->pChartObject->drawLine($Boundaries[1]["X1"],$Boundaries[1]["Y1"],$Boundaries[1]["X2"],$Boundaries[1]["Y2"],$BorderColor);
+
+ if ( $DrawLabels && !$Shadow )
+ {
+ if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
+ { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
+ else
+ { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+
+ $Angle = ($EndAngle - $Offset)/2 + $Offset;
+ $Xc = cos(($Angle-90)*PI/180) * $OuterRadius + $X;
+ $Yc = sin(($Angle-90)*PI/180) * $OuterRadius + $Y;
+
+ $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
+
+ if ( $LabelStacked )
+ $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$OuterRadius);
+ else
+ $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+ }
+
+ $Offset = $Lasti; $ID++;
+ }
+
+ if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
+
+ if ( $WriteValues && !$Shadow )
+ {
+ $Step = 360 / (2 * PI * $OuterRadius);
+ $Offset = 0;
+ foreach($Values as $Key => $Value)
+ {
+ $EndAngle = $Offset+($Value*$ScaleFactor);
+ if ( $EndAngle > 360 ) { $EndAngle = 360; }
+
+ $Angle = $Offset+($Value*$ScaleFactor)/2;
+ if ( $ValuePosition == PIE_VALUE_OUTSIDE )
+ {
+ $Xc = cos(($Angle-90)*PI/180) * ($OuterRadius+$ValuePadding) + $X;
+ $Yc = sin(($Angle-90)*PI/180) * ($OuterRadius+$ValuePadding) + $Y;
+ if ( $Angle >=0 && $Angle <= 90 ) { $Align = TEXT_ALIGN_BOTTOMLEFT; }
+ if ( $Angle > 90 && $Angle <= 180 ) { $Align = TEXT_ALIGN_TOPLEFT; }
+ if ( $Angle > 180 && $Angle <= 270 ) { $Align = TEXT_ALIGN_TOPRIGHT; }
+ if ( $Angle > 270 ) { $Align = TEXT_ALIGN_BOTTOMRIGHT; }
+ }
+ else
+ {
+ $Xc = cos(($Angle-90)*PI/180) * (($OuterRadius-$InnerRadius)/2+$InnerRadius) + $X;
+ $Yc = sin(($Angle-90)*PI/180) * (($OuterRadius-$InnerRadius)/2+$InnerRadius) + $Y;
+ $Align = TEXT_ALIGN_MIDDLEMIDDLE;
+ }
+
+ if ( $WriteValues == PIE_VALUE_PERCENTAGE )
+ $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
+ elseif ( $WriteValues == PIE_VALUE_NATURAL )
+ $Display = $Value.$ValueSuffix;
+ else
+ $Label = "";
+
+ $this->pChartObject->drawText($Xc,$Yc,$Display,array("Align"=>$Align,"R"=>$ValueR,"G"=>$ValueG,"B"=>$ValueB));
+ $Offset = $EndAngle;
+ }
+ }
+
+ $this->pChartObject->Shadow = $RestoreShadow;
+
+ return(PIE_RENDERED);
+ }
+
+ /* Draw a 3D ring chart */
+ function draw3DRing($X,$Y,$Format="")
+ {
+ $OuterRadius = isset($Format["OuterRadius"]) ? $Format["OuterRadius"] : 100;
+ $Precision = isset($Format["Precision"]) ? $Format["Precision"] : 0;
+ $InnerRadius = isset($Format["InnerRadius"]) ? $Format["InnerRadius"] : 30;
+ $SkewFactor = isset($Format["SkewFactor"]) ? $Format["SkewFactor"] : .6;
+ $SliceHeight = isset($Format["SliceHeight"]) ? $Format["SliceHeight"] : 10;
+ $DataGapAngle = isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 10;
+ $DataGapRadius = isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 10;
+ $Border = isset($Format["Border"]) ? $Format["Border"] : FALSE;
+ $Shadow = isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
+ $DrawLabels = isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
+ $LabelStacked = isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
+ $LabelColor = isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
+ $LabelR = isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
+ $LabelG = isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
+ $LabelB = isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
+ $LabelAlpha = isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
+ $Cf = isset($Format["Cf"]) ? $Format["Cf"] : 20;
+ $WriteValues = isset($Format["WriteValues"]) ? $Format["WriteValues"] : PIE_VALUE_NATURAL;
+ $ValuePadding = isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : $SliceHeight + 15;
+ $ValuePosition = isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
+ $ValueSuffix = isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
+ $ValueR = isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
+ $ValueG = isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
+ $ValueB = isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
+ $ValueAlpha = isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
+ $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+ /* Error correction for overlaying rounded corners */
+ if ( $SkewFactor < .5 ) { $SkewFactor = .5; }
+
+ /* Data Processing */
+ $Data = $this->pDataObject->getData();
+ $Palette = $this->pDataObject->getPalette();
+
+ /* Do we have an abscissa serie defined? */
+ if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+
+ /* Try to find the data serie */
+ $DataSerie = "";
+ foreach ($Data["Series"] as $SerieName => $SerieData)
+ { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
+
+ /* Do we have data to compute? */
+ if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
+
+ /* Remove unused data */
+ list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
+
+ /* Compute the pie sum */
+ $SerieSum = $this->pDataObject->getSum($DataSerie);
+
+ /* Do we have data to draw? */
+ if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
+
+ /* Dump the real number of data to draw */
+ $Values = "";
+ foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+ { if ($Value != 0) { $Values[] = $Value; } }
+
+ /* Compute the wasted angular space between series */
+ if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = count($Values) * $DataGapAngle; }
+
+ /* Compute the scale */
+ $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
+
+ $RestoreShadow = $this->pChartObject->Shadow;
+ if ( $this->pChartObject->Shadow ) { $this->pChartObject->Shadow = FALSE; }
+
+ /* Draw the polygon ring elements */
+ $Offset = 360; $ID = count($Values)-1;
+ $Values = array_reverse($Values);
+ $Slice = 0; $Slices = ""; $SliceColors = ""; $Visible = ""; $SliceAngle = "";
+ foreach($Values as $Key => $Value)
+ {
+ if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
+ $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+
+ $SliceColors[$Slice] = $Settings;
+
+ $StartAngle = $Offset;
+ $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+
+ if ( $StartAngle > 180 ) { $Visible[$Slice]["Start"] = TRUE; } else { $Visible[$Slice]["Start"] = TRUE; }
+ if ( $EndAngle < 180 ) { $Visible[$Slice]["End"] = FALSE; } else { $Visible[$Slice]["End"] = TRUE; }
+
+ $Step = (360 / (2 * PI * $OuterRadius))/2;
+ $OutX1 = VOID; $OutY1 = VOID;
+ for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
+ {
+ $Xc = cos(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-2) + $X;
+ $Yc = sin(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-2)*$SkewFactor + $Y;
+ $Slices[$Slice]["AA"][] = array($Xc,$Yc);
+
+ $Xc = cos(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-1) + $X;
+ $Yc = sin(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-1)*$SkewFactor + $Y;
+ $Slices[$Slice]["AA"][] = array($Xc,$Yc);
+
+ $Xc = cos(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius) + $X;
+ $Yc = sin(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius)*$SkewFactor + $Y;
+ $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
+
+ if ( $OutX1 == VOID ) { $OutX1 = $Xc; $OutY1 = $Yc; }
+
+ if ( $i<90 ) { $Yc++; }
+ if ( $i>90 && $i<180 ) { $Xc++; }
+ if ( $i>180 && $i<270 ) { $Xc++; }
+ if ( $i>=270 ) { $Xc++; $Yc++; }
+
+ $Slices[$Slice]["BottomPoly"][] = floor($Xc); $Slices[$Slice]["BottomPoly"][] = floor($Yc);
+ $Slices[$Slice]["TopPoly"][] = floor($Xc); $Slices[$Slice]["TopPoly"][] = floor($Yc)-$SliceHeight;
+ $Slices[$Slice]["Angle"][] = $i;
+ }
+ $OutX2 = $Xc; $OutY2 = $Yc;
+
+ $Slices[$Slice]["Angle"][] = VOID;
+ $Lasti = $i;
+
+ $Step = (360 / (2 * PI * $InnerRadius))/2;
+ $InX1 = VOID; $InY1 = VOID;
+ for($i=$EndAngle;$i<=$Offset;$i=$i+$Step)
+ {
+ $Xc = cos(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius-1) + $X;
+ $Yc = sin(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius-1)*$SkewFactor + $Y;
+ $Slices[$Slice]["AA"][] = array($Xc,$Yc);
+
+ $Xc = cos(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius) + $X;
+ $Yc = sin(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius)*$SkewFactor + $Y;
+ $Slices[$Slice]["AA"][] = array($Xc,$Yc);
+
+ if ( $InX1 == VOID ) { $InX1 = $Xc; $InY1 = $Yc; }
+
+ if ( $i<90 ) { $Yc++; }
+ if ( $i>90 && $i<180 ) { $Xc++; }
+ if ( $i>180 && $i<270 ) { $Xc++; }
+ if ( $i>=270 ) { $Xc++; $Yc++; }
+
+ $Slices[$Slice]["BottomPoly"][] = floor($Xc); $Slices[$Slice]["BottomPoly"][] = floor($Yc);
+ $Slices[$Slice]["TopPoly"][] = floor($Xc); $Slices[$Slice]["TopPoly"][] = floor($Yc)-$SliceHeight;
+ $Slices[$Slice]["Angle"][] = $i;
+ }
+ $InX2 = $Xc; $InY2 = $Yc;
+
+ $Slices[$Slice]["InX1"] = $InX1; $Slices[$Slice]["InY1"] = $InY1;
+ $Slices[$Slice]["InX2"] = $InX2; $Slices[$Slice]["InY2"] = $InY2;
+ $Slices[$Slice]["OutX1"] = $OutX1; $Slices[$Slice]["OutY1"] = $OutY1;
+ $Slices[$Slice]["OutX2"] = $OutX2; $Slices[$Slice]["OutY2"] = $OutY2;
+
+ $Offset = $Lasti - $DataGapAngle; $ID--; $Slice++;
+ }
+
+ /* Draw the bottom pie splice */
+ foreach($Slices as $SliceID => $Plots)
+ {
+ $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+ $this->pChartObject->drawPolygon($Plots["BottomPoly"],$Settings);
+
+ foreach($Plots["AA"] as $Key => $Pos)
+ $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1],$Settings);
+
+ $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"],$Plots["OutX2"],$Plots["OutY2"],$Settings);
+ $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"],$Plots["OutX1"],$Plots["OutY1"],$Settings);
+ }
+
+ $Slices = array_reverse($Slices);
+ $SliceColors = array_reverse($SliceColors);
+
+ /* Draw the vertical edges (semi-visible) */
+ foreach($Slices as $SliceID => $Plots)
+ {
+ $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+ $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
+
+ $StartAngle = $Plots["Angle"][0];
+ foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
+
+ if ( $StartAngle >= 270 || $StartAngle <= 90 )
+ $this->pChartObject->drawLine($Plots["OutX1"],$Plots["OutY1"],$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
+ if ( $StartAngle >= 270 || $StartAngle <= 90 )
+ $this->pChartObject->drawLine($Plots["OutX2"],$Plots["OutY2"],$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
+
+ $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"],$Plots["InX1"],$Plots["InY1"]-$SliceHeight,$Settings);
+ $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"],$Plots["InX2"],$Plots["InY2"]-$SliceHeight,$Settings);
+ }
+
+ /* Draw the inner vertical slices */
+ foreach($Slices as $SliceID => $Plots)
+ {
+ $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+ $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
+
+ $Outer = TRUE; $Inner = FALSE;
+ $InnerPlotsA = ""; $InnerPlotsB = "";
+ foreach($Plots["Angle"] as $ID => $Angle)
+ {
+ if ( $Angle == VOID )
+ { $Outer = FALSE; $Inner = TRUE; }
+ elseif( $Inner )
+ {
+ if (( $Angle < 90 || $Angle > 270 ) && isset($Plots["BottomPoly"][$ID*2]) )
+ {
+ $Xo = $Plots["BottomPoly"][$ID*2];
+ $Yo = $Plots["BottomPoly"][$ID*2+1];
+
+ $InnerPlotsA[] = $Xo; $InnerPlotsA[] = $Yo;
+ $InnerPlotsB[] = $Xo; $InnerPlotsB[] = $Yo-$SliceHeight;
+ }
+ }
+ }
+
+ if ( $InnerPlotsA != "" )
+ { $InnerPlots = array_merge($InnerPlotsA,$this->arrayReverse($InnerPlotsB)); $this->pChartObject->drawPolygon($InnerPlots,$Settings); }
+ }
+
+ /* Draw the splice top and left poly */
+ foreach($Slices as $SliceID => $Plots)
+ {
+ $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+ $Settings["R"] = $Settings["R"]+$Cf*1.5; $Settings["G"] = $Settings["G"]+$Cf*1.5; $Settings["B"] = $Settings["B"]+$Cf*1.5;
+
+ $StartAngle = $Plots["Angle"][0];
+ foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
+
+ if ( $StartAngle < 180 )
+ {
+ $Points = "";
+ $Points[] = $Plots["InX2"];
+ $Points[] = $Plots["InY2"];
+ $Points[] = $Plots["InX2"];
+ $Points[] = $Plots["InY2"]-$SliceHeight;
+ $Points[] = $Plots["OutX1"];
+ $Points[] = $Plots["OutY1"]-$SliceHeight;
+ $Points[] = $Plots["OutX1"];
+ $Points[] = $Plots["OutY1"];
+
+ $this->pChartObject->drawPolygon($Points,$Settings);
+ }
+
+ if ( $EndAngle > 180 )
+ {
+ $Points = "";
+ $Points[] = $Plots["InX1"];
+ $Points[] = $Plots["InY1"];
+ $Points[] = $Plots["InX1"];
+ $Points[] = $Plots["InY1"]-$SliceHeight;
+ $Points[] = $Plots["OutX2"];
+ $Points[] = $Plots["OutY2"]-$SliceHeight;
+ $Points[] = $Plots["OutX2"];
+ $Points[] = $Plots["OutY2"];
+
+ $this->pChartObject->drawPolygon($Points,$Settings);
+ }
+ }
+
+
+ /* Draw the vertical edges (visible) */
+ foreach($Slices as $SliceID => $Plots)
+ {
+ $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+ $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
+
+ $StartAngle = $Plots["Angle"][0];
+ foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
+
+ if ( $StartAngle <= 270 && $StartAngle >= 90 )
+ $this->pChartObject->drawLine($Plots["OutX1"],$Plots["OutY1"],$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
+ if ( $EndAngle <= 270 && $EndAngle >= 90 )
+ $this->pChartObject->drawLine($Plots["OutX2"],$Plots["OutY2"],$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
+ }
+
+
+ /* Draw the outer vertical slices */
+ foreach($Slices as $SliceID => $Plots)
+ {
+ $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+ $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
+
+ $Outer = TRUE; $Inner = FALSE;
+ $OuterPlotsA = ""; $OuterPlotsB = ""; $InnerPlotsA = ""; $InnerPlotsB = "";
+ foreach($Plots["Angle"] as $ID => $Angle)
+ {
+ if ( $Angle == VOID )
+ { $Outer = FALSE; $Inner = TRUE; }
+ elseif( $Outer )
+ {
+ if ( ( $Angle > 90 && $Angle < 270 ) && isset($Plots["BottomPoly"][$ID*2]) )
+ {
+ $Xo = $Plots["BottomPoly"][$ID*2];
+ $Yo = $Plots["BottomPoly"][$ID*2+1];
+
+ $OuterPlotsA[] = $Xo; $OuterPlotsA[] = $Yo;
+ $OuterPlotsB[] = $Xo; $OuterPlotsB[] = $Yo-$SliceHeight;
+ }
+ }
+ }
+ if ( $OuterPlotsA != "" )
+ { $OuterPlots = array_merge($OuterPlotsA,$this->arrayReverse($OuterPlotsB)); $this->pChartObject->drawPolygon($OuterPlots,$Settings); }
+ }
+
+ $Slices = array_reverse($Slices);
+ $SliceColors = array_reverse($SliceColors);
+
+
+ /* Draw the top pie splice */
+ foreach($Slices as $SliceID => $Plots)
+ {
+ $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+ $Settings["R"] = $Settings["R"]+$Cf*2; $Settings["G"] = $Settings["G"]+$Cf*2; $Settings["B"] = $Settings["B"]+$Cf*2;
+
+ $this->pChartObject->drawPolygon($Plots["TopPoly"],$Settings);
+
+ if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Plots["TopPoly"]),$this->pChartObject->toHTMLColor($Settings["R"],$Settings["G"],$Settings["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][$SliceID],$Data["Series"][$DataSerie]["Data"][count($Slices)-$SliceID-1]); }
+
+ foreach($Plots["AA"] as $Key => $Pos)
+ $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1]-$SliceHeight,$Settings);
+
+ $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"]-$SliceHeight,$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
+ $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"]-$SliceHeight,$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
+ }
+
+ if ( $DrawLabels )
+ {
+ $Offset = 360;
+ foreach($Values as $Key => $Value)
+ {
+ $StartAngle = $Offset;
+ $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+
+ if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
+ { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
+ else
+ { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+
+ $Angle = ($EndAngle - $Offset)/2 + $Offset;
+ $Xc = cos(($Angle-90)*PI/180) * ($OuterRadius+$DataGapRadius) + $X;
+ $Yc = sin(($Angle-90)*PI/180) * ($OuterRadius+$DataGapRadius)*$SkewFactor + $Y;
+
+ if ( $WriteValues == PIE_VALUE_PERCENTAGE )
+ $Label = $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
+ elseif ( $WriteValues == PIE_VALUE_NATURAL )
+ $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
+ else
+ $Label = "";
+
+ if ( $LabelStacked )
+ $this->writePieLabel($Xc,$Yc-$SliceHeight,$Label,$Angle,$Settings,TRUE,$X,$Y,$OuterRadius);
+ else
+ $this->writePieLabel($Xc,$Yc-$SliceHeight,$Label,$Angle,$Settings,FALSE);
+
+ $Offset = $EndAngle - $DataGapAngle; $ID--; $Slice++;
+ }
+ }
+ if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
+
+ $this->pChartObject->Shadow = $RestoreShadow;
+
+ return(PIE_RENDERED);
+ }
+
+ /* Serialize an array */
+ function arraySerialize($Data)
+ {
+ $Result = "";
+ foreach($Data as $Key => $Value)
+ { if ($Result == "") { $Result = floor($Value); } else { $Result = $Result.",".floor($Value); } }
+
+ return($Result);
+ }
+
+ /* Reverse an array */
+ function arrayReverse($Plots)
+ {
+ $Result = "";
+
+ for($i=count($Plots)-1;$i>=0;$i=$i-2)
+ { $Result[] = $Plots[$i-1]; $Result[] = $Plots[$i]; }
+
+ return($Result);
+ }
+
+ /* Remove unused series & values */
+ function clean0Values($Data,$Palette,$DataSerie,$AbscissaSerie)
+ {
+ $NewPalette = ""; $NewData = ""; $NewAbscissa = "";
+
+ /* Remove unused series */
+ foreach($Data["Series"] as $SerieName => $SerieSettings)
+ { if ( $SerieName != $DataSerie && $SerieName != $AbscissaSerie ) { unset($Data["Series"][$SerieName]); } }
+
+ /* Remove NULL values */
+ foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+ {
+ if ($Value != 0 )
+ {
+ $NewData[] = $Value;
+ $NewAbscissa[] = $Data["Series"][$AbscissaSerie]["Data"][$Key];
+ if ( isset($Palette[$Key]) ) { $NewPalette[] = $Palette[$Key]; }
+ }
+ }
+ $Data["Series"][$DataSerie]["Data"] = $NewData;
+ $Data["Series"][$AbscissaSerie]["Data"] = $NewAbscissa;
+
+ return(array($Data,$NewPalette));
+ }
+ }
?>
\ No newline at end of file
diff --git a/misc/log-analytics b/misc/log-analytics
index f0d8d9722962275ff72316904d82a35bc78930cb..f15f7271439380dbc7366aa117d3c8add358c264 160000
--- a/misc/log-analytics
+++ b/misc/log-analytics
@@ -1 +1 @@
-Subproject commit f0d8d9722962275ff72316904d82a35bc78930cb
+Subproject commit f15f7271439380dbc7366aa117d3c8add358c264
diff --git a/misc/phpstorm-codestyles/Piwik_codestyle.xml b/misc/phpstorm-codestyles/Piwik_codestyle.xml
deleted file mode 100644
index e863de94cd5c2a202bac86c66dd231da8230461a..0000000000000000000000000000000000000000
--- a/misc/phpstorm-codestyles/Piwik_codestyle.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<code_scheme name="Piwik-codestyle">
- <option name="LINE_SEPARATOR" value=" " />
- <option name="RIGHT_MARGIN" value="160" />
- <PHPCodeStyleSettings>
- <option name="ALIGN_KEY_VALUE_PAIRS" value="true" />
- <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
- <option name="LOWER_CASE_NULL_CONST" value="true" />
- </PHPCodeStyleSettings>
- <XML>
- <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
- </XML>
- <codeStyleSettings language="JavaScript">
- <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
- <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
- <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="LESS">
- <indentOptions>
- <option name="INDENT_SIZE" value="4" />
- </indentOptions>
- </codeStyleSettings>
- <codeStyleSettings language="PHP">
- <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
- <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
- <arrangement>
- <groups>
- <group>
- <type>DEPENDENT_METHODS</type>
- <order>BREADTH_FIRST</order>
- </group>
- </groups>
- </arrangement>
- </codeStyleSettings>
-</code_scheme>
\ No newline at end of file
diff --git a/misc/phpstorm-codestyles/README.md b/misc/phpstorm-codestyles/README.md
deleted file mode 100644
index 020f5d1cc893369e410ef1176ac532155a6c3f2b..0000000000000000000000000000000000000000
--- a/misc/phpstorm-codestyles/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Phpstorm has an awesome feature called "Reformat code" which reformats all PHP code to follow a particular selected coding style.
-
-Piwik uses PSR coding standard for php source code. We use a slightly customized PSR style
-(because the default PSR style in Phpstorm results in some unwanted changes).
-
-Steps:
- * Use latest Phpstorm
- * Copy this Piwik_codestyle.xml file in your `~/.WebIde80/config/codestyles/`
- * If you use Windows or Mac see which path to copy at: http://intellij-support.jetbrains.com/entries/23358108
- * To automatically link to the file in Piwik:
- `$ ln -s ~/dev/piwik-master/misc/phpstorm-codestyles/Piwik_codestyle.xml ~/.WebIde80/config/codestyles/Piwik_codestyle.xml`
-
- * Restart PhpStorm
- * Select this coding in Settings > Code style.
-
-Phpstorm can also be configured to apply the style automatically before commit.
-
-You are now writing code that respects Piwik coding standards. Enjoy!
-
-Reference: [Piwik Coding standards](http://developer.piwik.org/guides/contributing-to-piwik-core#piwik-core-code-standards)
-
diff --git a/piwik.js b/piwik.js
index 72f7bf39d96f04905c6d505e08ca6dc53df3a75b..08107280f43e89e9c38af24501907186a5322c18 100644
--- a/piwik.js
+++ b/piwik.js
@@ -18,49 +18,49 @@ var I="000000";var t=function(ac,ad){return(I+(ad||0)).slice(-ac)};var z="\\u00"
}else{at=null}}else{if(typeof at.toJSON=="function"&&((ae!=N&&ae!=O&&ae!=E)||r.call(at,"toJSON"))){at=at.toJSON(ai)}}}if(ag){at=ag.call(aA,ai,at)}if(at===null){return"null"}ae=u.call(at);if(ae==A){return""+at}else{if(ae==N){return at>-1/0&&at<1/0?""+at:"null"}else{if(ae==O){return C(""+at)}}}if(typeof at=="object"){for(af=aj.length;af--;){if(aj[af]===at){throw aa()}}aj.push(at);ar=[];av=ac;ac+=ax;if(ae==E){for(ah=0,af=at.length;ah<af;ah++){ad=p(ah,at,ag,al,ax,ac,aj);ar.push(ad===L?"null":ad)}ao=ar.length?(ax?"[\n"+ac+ar.join(",\n"+ac)+"\n"+av+"]":("["+ar.join(",")+"]")):"[]"}else{m(al||at,function(aC){var aB=p(aC,at,ag,al,ax,ac,aj);if(aB!==L){ar.push(C(aC)+":"+(ax?" ":"")+aB)}});ao=ar.length?(ax?"{\n"+ac+ar.join(",\n"+ac)+"\n"+av+"}":("{"+ar.join(",")+"}")):"{}"}aj.pop();return ao}};V.stringify=function(ac,ae,af){var ad,al,aj,ai;if(e[typeof ae]&&ae){if((ai=u.call(ae))==U){al=ae}else{if(ai==E){aj={};for(var ah=0,ag=ae.length,ak;ah<ag;ak=ae[ah++],((ai=u.call(ak)),ai==O||ai==N)&&(aj[ak]=1)){}}}}if(af){if((ai=u.call(af))==N){if((af-=af%1)>0){for(ad="",af>10&&(af=10);
ad.length<af;ad+=" "){}}}else{if(ai==O){ad=af.length<=10?af:af.slice(0,10)}}}return p("",(ak={},ak[""]=ac,ak),al,aj,ad,"",[])}}if(!o("json-parse")){var M=R.fromCharCode;var l={92:"\\",34:'"',47:"/",98:"\b",116:"\t",110:"\n",102:"\f",114:"\r"};var G,X;var H=function(){G=X=null;throw T()};var y=function(){var ah=X,af=ah.length,ag,ae,ac,ai,ad;while(G<af){ad=ah.charCodeAt(G);switch(ad){case 9:case 10:case 13:case 32:G++;break;case 123:case 125:case 91:case 93:case 58:case 44:ag=F?ah.charAt(G):ah[G];G++;return ag;case 34:for(ag="@",G++;G<af;){ad=ah.charCodeAt(G);if(ad<32){H()}else{if(ad==92){ad=ah.charCodeAt(++G);switch(ad){case 92:case 34:case 47:case 98:case 116:case 110:case 102:case 114:ag+=l[ad];G++;break;case 117:ae=++G;for(ac=G+4;G<ac;G++){ad=ah.charCodeAt(G);if(!(ad>=48&&ad<=57||ad>=97&&ad<=102||ad>=65&&ad<=70)){H()}}ag+=M("0x"+ah.slice(ae,G));break;default:H()}}else{if(ad==34){break}ad=ah.charCodeAt(G);ae=G;while(ad>=32&&ad!=92&&ad!=34){ad=ah.charCodeAt(++G)}ag+=ah.slice(ae,G)}}}if(ah.charCodeAt(G)==34){G++;
return ag}H();default:ae=G;if(ad==45){ai=true;ad=ah.charCodeAt(++G)}if(ad>=48&&ad<=57){if(ad==48&&((ad=ah.charCodeAt(G+1)),ad>=48&&ad<=57)){H()}ai=false;for(;G<af&&((ad=ah.charCodeAt(G)),ad>=48&&ad<=57);G++){}if(ah.charCodeAt(G)==46){ac=++G;for(;ac<af&&((ad=ah.charCodeAt(ac)),ad>=48&&ad<=57);ac++){}if(ac==G){H()}G=ac}ad=ah.charCodeAt(G);if(ad==101||ad==69){ad=ah.charCodeAt(++G);if(ad==43||ad==45){G++}for(ac=G;ac<af&&((ad=ah.charCodeAt(ac)),ad>=48&&ad<=57);ac++){}if(ac==G){H()}G=ac}return +ah.slice(ae,G)}if(ai){H()}if(ah.slice(G,G+4)=="true"){G+=4;return true}else{if(ah.slice(G,G+5)=="false"){G+=5;return false}else{if(ah.slice(G,G+4)=="null"){G+=4;return null}}}H()}}return"$"};var W=function(ad){var ac,ae;if(ad=="$"){H()}if(typeof ad=="string"){if((F?ad.charAt(0):ad[0])=="@"){return ad.slice(1)}if(ad=="["){ac=[];for(;;ae||(ae=true)){ad=y();if(ad=="]"){break}if(ae){if(ad==","){ad=y();if(ad=="]"){H()}}else{H()}}if(ad==","){H()}ac.push(W(ad))}return ac}else{if(ad=="{"){ac={};for(;;ae||(ae=true)){ad=y();
-if(ad=="}"){break}if(ae){if(ad==","){ad=y();if(ad=="}"){H()}}else{H()}}if(ad==","||typeof ad!="string"||(F?ad.charAt(0):ad[0])!="@"||y()!=":"){H()}ac[ad.slice(1)]=W(y())}return ac}}H()}return ad};var P=function(ae,ad,af){var ac=w(ae,ad,af);if(ac===L){delete ae[ad]}else{ae[ad]=ac}};var w=function(af,ae,ag){var ad=af[ae],ac;if(typeof ad=="object"&&ad){if(u.call(ad)==E){for(ac=ad.length;ac--;){P(ad,ac,ag)}}else{m(ad,function(ah){P(ad,ah,ag)})}}return ag.call(af,ae,ad)};V.parse=function(ae,af){var ac,ad;G=0;X=""+ae;ac=W(y());if(y()!="$"){H()}G=X=null;return af&&u.call(af)==U?w((ad={},ad[""]=ac,ad),"",af):ac}}}V.runInContext=j;return V}if(h&&!c){j(i,h)}else{var f=i.JSON,k=i.JSON3,d=false;var g=j(i,(i.JSON3={noConflict:function(){if(!d){d=true;i.JSON=f;i.JSON3=k;f=k=null}return g}}));i.JSON={parse:g.parse,stringify:g.stringify}}if(c){define(function(){return g})}}).call(this);JSON2=a})()}if(typeof _paq!=="object"){_paq=[]}if(typeof Piwik!=="object"){Piwik=(function(){var k,a={},w=document,e=navigator,M=screen,I=window,f=I.performance||I.mozPerformance||I.msPerformance||I.webkitPerformance,q=false,G=[],m=I.encodeURIComponent,H=I.decodeURIComponent,h=unescape,N,v,d;
-function j(Y){try{return H(Y)}catch(Z){return unescape(Y)}}function y(Z){var Y=typeof Z;return Y!=="undefined"}function r(Y){return typeof Y==="function"}function L(Y){return typeof Y==="object"}function o(Y){return typeof Y==="string"||Y instanceof String}function s(Z){if(!Z){return true}var Y;var aa=true;for(Y in Z){if(Object.prototype.hasOwnProperty.call(Z,Y)){aa=false}}return aa}function T(){var Y,aa,Z;for(Y=0;Y<arguments.length;Y+=1){Z=arguments[Y];aa=Z.shift();if(o(aa)){N[aa].apply(N,Z)}else{aa.apply(N,Z)}}}function X(ab,aa,Z,Y){if(ab.addEventListener){ab.addEventListener(aa,Z,Y);return true}if(ab.attachEvent){return ab.attachEvent("on"+aa,Z)}ab["on"+aa]=Z}function Q(Z,ac){var Y="",ab,aa;for(ab in a){if(Object.prototype.hasOwnProperty.call(a,ab)){aa=a[ab][Z];if(r(aa)){Y+=aa(ac)}}}return Y}function U(){var Y;Q("unload");if(k){do{Y=new Date()}while(Y.getTimeAlias()<k)}}function R(){var Y;if(!q){q=true;Q("load");for(Y=0;Y<G.length;Y++){G[Y]()}}return true}function p(){var Z;if(w.addEventListener){X(w,"DOMContentLoaded",function Y(){w.removeEventListener("DOMContentLoaded",Y,false);
-R()})}else{if(w.attachEvent){w.attachEvent("onreadystatechange",function Y(){if(w.readyState==="complete"){w.detachEvent("onreadystatechange",Y);R()}});if(w.documentElement.doScroll&&I===I.top){(function Y(){if(!q){try{w.documentElement.doScroll("left")}catch(aa){setTimeout(Y,0);return}R()}}())}}}if((new RegExp("WebKit")).test(e.userAgent)){Z=setInterval(function(){if(q||/loaded|complete/.test(w.readyState)){clearInterval(Z);R()}},10)}X(I,"load",R,false)}function i(aa,Z){var Y=w.createElement("script");Y.type="text/javascript";Y.src=aa;if(Y.readyState){Y.onreadystatechange=function(){var ab=this.readyState;if(ab==="loaded"||ab==="complete"){Y.onreadystatechange=null;Z()}}}else{Y.onload=Z}w.getElementsByTagName("head")[0].appendChild(Y)}function z(){var Y="";try{Y=I.top.document.referrer}catch(aa){if(I.parent){try{Y=I.parent.document.referrer}catch(Z){Y=""}}}if(Y===""){Y=w.referrer}return Y}function l(Y){var aa=new RegExp("^([a-z]+):"),Z=aa.exec(Y);return Z?Z[1]:null}function c(Y){var aa=new RegExp("^(?:(?:https?|ftp):)/*(?:[^@]+@)?([^:/#]+)"),Z=aa.exec(Y);
-return Z?Z[1]:Y}function K(aa,Z){var Y="[\\?&#]"+Z+"=([^&#]*)";var ac=new RegExp(Y);var ab=ac.exec(aa);return ab?H(ab[1]):""}function u(Y){return unescape(m(Y))}function W(an){var aa=function(au,at){return(au<<at)|(au>>>(32-at))},ao=function(aw){var au="",av,at;for(av=7;av>=0;av--){at=(aw>>>(av*4))&15;au+=at.toString(16)}return au},ad,aq,ap,Z=[],ah=1732584193,af=4023233417,ae=2562383102,ac=271733878,ab=3285377520,am,al,ak,aj,ai,ar,Y,ag=[];an=u(an);Y=an.length;for(aq=0;aq<Y-3;aq+=4){ap=an.charCodeAt(aq)<<24|an.charCodeAt(aq+1)<<16|an.charCodeAt(aq+2)<<8|an.charCodeAt(aq+3);ag.push(ap)}switch(Y&3){case 0:aq=2147483648;break;case 1:aq=an.charCodeAt(Y-1)<<24|8388608;break;case 2:aq=an.charCodeAt(Y-2)<<24|an.charCodeAt(Y-1)<<16|32768;break;case 3:aq=an.charCodeAt(Y-3)<<24|an.charCodeAt(Y-2)<<16|an.charCodeAt(Y-1)<<8|128;break}ag.push(aq);while((ag.length&15)!==14){ag.push(0)}ag.push(Y>>>29);ag.push((Y<<3)&4294967295);for(ad=0;ad<ag.length;ad+=16){for(aq=0;aq<16;aq++){Z[aq]=ag[ad+aq]}for(aq=16;
-aq<=79;aq++){Z[aq]=aa(Z[aq-3]^Z[aq-8]^Z[aq-14]^Z[aq-16],1)}am=ah;al=af;ak=ae;aj=ac;ai=ab;for(aq=0;aq<=19;aq++){ar=(aa(am,5)+((al&ak)|(~al&aj))+ai+Z[aq]+1518500249)&4294967295;ai=aj;aj=ak;ak=aa(al,30);al=am;am=ar}for(aq=20;aq<=39;aq++){ar=(aa(am,5)+(al^ak^aj)+ai+Z[aq]+1859775393)&4294967295;ai=aj;aj=ak;ak=aa(al,30);al=am;am=ar}for(aq=40;aq<=59;aq++){ar=(aa(am,5)+((al&ak)|(al&aj)|(ak&aj))+ai+Z[aq]+2400959708)&4294967295;ai=aj;aj=ak;ak=aa(al,30);al=am;am=ar}for(aq=60;aq<=79;aq++){ar=(aa(am,5)+(al^ak^aj)+ai+Z[aq]+3395469782)&4294967295;ai=aj;aj=ak;ak=aa(al,30);al=am;am=ar}ah=(ah+am)&4294967295;af=(af+al)&4294967295;ae=(ae+ak)&4294967295;ac=(ac+aj)&4294967295;ab=(ab+ai)&4294967295}ar=ao(ah)+ao(af)+ao(ae)+ao(ac)+ao(ab);return ar.toLowerCase()}function P(aa,Y,Z){if(!aa){aa=""}if(!Y){Y=""}if(aa==="translate.googleusercontent.com"){if(Z===""){Z=Y}Y=K(Y,"u");aa=c(Y)}else{if(aa==="cc.bingj.com"||aa==="webcache.googleusercontent.com"||aa.slice(0,5)==="74.6."){Y=w.links[0].href;aa=c(Y)}}return[aa,Y,Z]
-}function A(Z){var Y=Z.length;if(Z.charAt(--Y)==="."){Z=Z.slice(0,Y)}if(Z.slice(0,2)==="*."){Z=Z.slice(1)}if(Z.indexOf("/")!==-1){Z=Z.substr(0,Z.indexOf("/"))}return Z}function V(Z){Z=Z&&Z.text?Z.text:Z;if(!o(Z)){var Y=w.getElementsByTagName("title");if(Y&&y(Y[0])){Z=Y[0].text}}return Z}function E(Y){if(!Y){return[]}if(!y(Y.children)&&y(Y.childNodes)){return Y.children}if(y(Y.children)){return Y.children}return[]}function J(Z,Y){if(!Z||!Y){return false}if(Z.contains){return Z.contains(Y)}if(Z===Y){return true}if(Z.compareDocumentPosition){return !!(Z.compareDocumentPosition(Y)&16)}return false}function B(aa,ab){if(aa&&aa.indexOf){return aa.indexOf(ab)}if(!y(aa)||aa===null){return -1}if(!aa.length){return -1}var Y=aa.length;if(Y===0){return -1}var Z=0;while(Z<Y){if(aa[Z]===ab){return Z}Z++}return -1}function g(aa){if(!aa){return false}function Y(ac,ad){if(I.getComputedStyle){return w.defaultView.getComputedStyle(ac,null)[ad]}if(ac.currentStyle){return ac.currentStyle[ad]}}function ab(ac){ac=ac.parentNode;
-while(ac){if(ac===w){return true}ac=ac.parentNode}return false}function Z(ae,ak,ac,ah,af,ai,ag){var ad=ae.parentNode,aj=1;if(!ab(ae)){return false}if(9===ad.nodeType){return true}if("0"===Y(ae,"opacity")||"none"===Y(ae,"display")||"hidden"===Y(ae,"visibility")){return false}if(!y(ak)||!y(ac)||!y(ah)||!y(af)||!y(ai)||!y(ag)){ak=ae.offsetTop;af=ae.offsetLeft;ah=ak+ae.offsetHeight;ac=af+ae.offsetWidth;ai=ae.offsetWidth;ag=ae.offsetHeight}if(aa===ae&&(0===ag||0===ai)&&"hidden"===Y(ae,"overflow")){return false}if(ad){if(("hidden"===Y(ad,"overflow")||"scroll"===Y(ad,"overflow"))){if(af+aj>ad.offsetWidth+ad.scrollLeft||af+ai-aj<ad.scrollLeft||ak+aj>ad.offsetHeight+ad.scrollTop||ak+ag-aj<ad.scrollTop){return false}}if(ae.offsetParent===ad){af+=ad.offsetLeft;ak+=ad.offsetTop}return Z(ad,ak,ac,ah,af,ai,ag)}return true}return Z(aa)}var S={htmlCollectionToArray:function(aa){var Y=[],Z;if(!aa||!aa.length){return Y}for(Z=0;Z<aa.length;Z++){Y.push(aa[Z])}return Y},find:function(Y){if(!document.querySelectorAll||!Y){return[]
-}var Z=document.querySelectorAll(Y);return this.htmlCollectionToArray(Z)},findMultiple:function(aa){if(!aa||!aa.length){return[]}var Z,ab;var Y=[];for(Z=0;Z<aa.length;Z++){ab=this.find(aa[Z]);Y=Y.concat(ab)}Y=this.makeNodesUnique(Y);return Y},findNodesByTagName:function(Z,Y){if(!Z||!Y||!Z.getElementsByTagName){return[]}var aa=Z.getElementsByTagName(Y);return this.htmlCollectionToArray(aa)},makeNodesUnique:function(Y){var ad=[].concat(Y);Y.sort(function(af,ae){if(af===ae){return 0}var ah=B(ad,af);var ag=B(ad,ae);if(ah===ag){return 0}return ah>ag?-1:1});if(Y.length<=1){return Y}var Z=0;var ab=0;var ac=[];var aa;aa=Y[Z++];while(aa){if(aa===Y[Z]){ab=ac.push(Z)}aa=Y[Z++]||null}while(ab--){Y.splice(ac[ab],1)}return Y},getAttributeValueFromNode:function(ac,aa){if(!this.hasNodeAttribute(ac,aa)){return}if(ac&&ac.getAttribute){return ac.getAttribute(aa)}if(!ac||!ac.attributes){return}var ab=(typeof ac.attributes[aa]);if("undefined"===ab){return}if(ac.attributes[aa].value){return ac.attributes[aa].value
-}if(ac.attributes[aa].nodeValue){return ac.attributes[aa].nodeValue}var Z;var Y=ac.attributes;if(!Y){return}for(Z=0;Z<Y.length;Z++){if(Y[Z].nodeName===aa){return Y[Z].nodeValue}}return null},hasNodeAttributeWithValue:function(Z,Y){var aa=this.getAttributeValueFromNode(Z,Y);return !!aa},hasNodeAttribute:function(aa,Y){if(aa&&aa.hasAttribute){return aa.hasAttribute(Y)}if(aa&&aa.attributes){var Z=(typeof aa.attributes[Y]);return"undefined"!==Z}return false},hasNodeCssClass:function(aa,Y){if(aa&&Y&&aa.className){var Z=typeof aa.className==="string"?aa.className.split(" "):[];if(-1!==B(Z,Y)){return true}}return false},findNodesHavingAttribute:function(ac,aa,Y){if(!Y){Y=[]}if(!ac||!aa){return Y}var ab=E(ac);if(!ab||!ab.length){return Y}var Z,ad;for(Z=0;Z<ab.length;Z++){ad=ab[Z];if(this.hasNodeAttribute(ad,aa)){Y.push(ad)}Y=this.findNodesHavingAttribute(ad,aa,Y)}return Y},findFirstNodeHavingAttribute:function(aa,Z){if(!aa||!Z){return}if(this.hasNodeAttribute(aa,Z)){return aa}var Y=this.findNodesHavingAttribute(aa,Z);
-if(Y&&Y.length){return Y[0]}},findFirstNodeHavingAttributeWithValue:function(ab,aa){if(!ab||!aa){return}if(this.hasNodeAttributeWithValue(ab,aa)){return ab}var Y=this.findNodesHavingAttribute(ab,aa);if(!Y||!Y.length){return}var Z;for(Z=0;Z<Y.length;Z++){if(this.getAttributeValueFromNode(Y[Z],aa)){return Y[Z]}}},findNodesHavingCssClass:function(ac,ab,Y){if(!Y){Y=[]}if(!ac||!ab){return Y}if(ac.getElementsByClassName){var ad=ac.getElementsByClassName(ab);return this.htmlCollectionToArray(ad)}var aa=E(ac);if(!aa||!aa.length){return[]}var Z,ae;for(Z=0;Z<aa.length;Z++){ae=aa[Z];if(this.hasNodeCssClass(ae,ab)){Y.push(ae)}Y=this.findNodesHavingCssClass(ae,ab,Y)}return Y},findFirstNodeHavingClass:function(aa,Z){if(!aa||!Z){return}if(this.hasNodeCssClass(aa,Z)){return aa}var Y=this.findNodesHavingCssClass(aa,Z);if(Y&&Y.length){return Y[0]}},isLinkElement:function(Z){if(!Z){return false}var Y=String(Z.nodeName).toLowerCase();var ab=["a","area"];var aa=B(ab,Y);return aa!==-1},setAnyAttribute:function(Z,Y,aa){if(!Z||!Y){return
-}if(Z.setAttribute){Z.setAttribute(Y,aa)}else{Z[Y]=aa}}};var n={CONTENT_ATTR:"data-track-content",CONTENT_CLASS:"piwikTrackContent",CONTENT_NAME_ATTR:"data-content-name",CONTENT_PIECE_ATTR:"data-content-piece",CONTENT_PIECE_CLASS:"piwikContentPiece",CONTENT_TARGET_ATTR:"data-content-target",CONTENT_TARGET_CLASS:"piwikContentTarget",CONTENT_IGNOREINTERACTION_ATTR:"data-content-ignoreinteraction",CONTENT_IGNOREINTERACTION_CLASS:"piwikContentIgnoreInteraction",location:undefined,findContentNodes:function(){var Z="."+this.CONTENT_CLASS;var Y="["+this.CONTENT_ATTR+"]";var aa=S.findMultiple([Z,Y]);return aa},findContentNodesWithinNode:function(ab){if(!ab){return[]}var Z=S.findNodesHavingCssClass(ab,this.CONTENT_CLASS);var Y=S.findNodesHavingAttribute(ab,this.CONTENT_ATTR);if(Y&&Y.length){var aa;for(aa=0;aa<Y.length;aa++){Z.push(Y[aa])}}if(S.hasNodeAttribute(ab,this.CONTENT_ATTR)){Z.push(ab)}else{if(S.hasNodeCssClass(ab,this.CONTENT_CLASS)){Z.push(ab)}}Z=S.makeNodesUnique(Z);return Z},findParentContentNode:function(Z){if(!Z){return
-}var aa=Z;var Y=0;while(aa&&aa!==w&&aa.parentNode){if(S.hasNodeAttribute(aa,this.CONTENT_ATTR)){return aa}if(S.hasNodeCssClass(aa,this.CONTENT_CLASS)){return aa}aa=aa.parentNode;if(Y>1000){break}Y++}},findPieceNode:function(Z){var Y;Y=S.findFirstNodeHavingAttribute(Z,this.CONTENT_PIECE_ATTR);if(!Y){Y=S.findFirstNodeHavingClass(Z,this.CONTENT_PIECE_CLASS)}if(Y){return Y}return Z},findTargetNodeNoDefault:function(Y){if(!Y){return}var Z=S.findFirstNodeHavingAttributeWithValue(Y,this.CONTENT_TARGET_ATTR);if(Z){return Z}Z=S.findFirstNodeHavingAttribute(Y,this.CONTENT_TARGET_ATTR);if(Z){return Z}Z=S.findFirstNodeHavingClass(Y,this.CONTENT_TARGET_CLASS);if(Z){return Z}},findTargetNode:function(Y){var Z=this.findTargetNodeNoDefault(Y);if(Z){return Z}return Y},findContentName:function(Z){if(!Z){return}var ac=S.findFirstNodeHavingAttributeWithValue(Z,this.CONTENT_NAME_ATTR);if(ac){return S.getAttributeValueFromNode(ac,this.CONTENT_NAME_ATTR)}var Y=this.findContentPiece(Z);if(Y){return this.removeDomainIfIsInLink(Y)
-}if(S.hasNodeAttributeWithValue(Z,"title")){return S.getAttributeValueFromNode(Z,"title")}var aa=this.findPieceNode(Z);if(S.hasNodeAttributeWithValue(aa,"title")){return S.getAttributeValueFromNode(aa,"title")}var ab=this.findTargetNode(Z);if(S.hasNodeAttributeWithValue(ab,"title")){return S.getAttributeValueFromNode(ab,"title")}},findContentPiece:function(Z){if(!Z){return}var ab=S.findFirstNodeHavingAttributeWithValue(Z,this.CONTENT_PIECE_ATTR);if(ab){return S.getAttributeValueFromNode(ab,this.CONTENT_PIECE_ATTR)}var Y=this.findPieceNode(Z);var aa=this.findMediaUrlInNode(Y);if(aa){return this.toAbsoluteUrl(aa)}},findContentTarget:function(aa){if(!aa){return}var ab=this.findTargetNode(aa);if(S.hasNodeAttributeWithValue(ab,this.CONTENT_TARGET_ATTR)){return S.getAttributeValueFromNode(ab,this.CONTENT_TARGET_ATTR)}var Z;if(S.hasNodeAttributeWithValue(ab,"href")){Z=S.getAttributeValueFromNode(ab,"href");return this.toAbsoluteUrl(Z)}var Y=this.findPieceNode(aa);if(S.hasNodeAttributeWithValue(Y,"href")){Z=S.getAttributeValueFromNode(Y,"href");
-return this.toAbsoluteUrl(Z)}},isSameDomain:function(Y){if(!Y||!Y.indexOf){return false}if(0===Y.indexOf(this.getLocation().origin)){return true}var Z=Y.indexOf(this.getLocation().host);if(8>=Z&&0<=Z){return true}return false},removeDomainIfIsInLink:function(aa){var Z="^https?://[^/]+";var Y="^.*//[^/]+";if(aa&&aa.search&&-1!==aa.search(new RegExp(Z))&&this.isSameDomain(aa)){aa=aa.replace(new RegExp(Y),"");if(!aa){aa="/"}}return aa},findMediaUrlInNode:function(ac){if(!ac){return}var aa=["img","embed","video","audio"];var Y=ac.nodeName.toLowerCase();if(-1!==B(aa,Y)&&S.findFirstNodeHavingAttributeWithValue(ac,"src")){var ab=S.findFirstNodeHavingAttributeWithValue(ac,"src");return S.getAttributeValueFromNode(ab,"src")}if(Y==="object"&&S.hasNodeAttributeWithValue(ac,"data")){return S.getAttributeValueFromNode(ac,"data")}if(Y==="object"){var ad=S.findNodesByTagName(ac,"param");if(ad&&ad.length){var Z;for(Z=0;Z<ad.length;Z++){if("movie"===S.getAttributeValueFromNode(ad[Z],"name")&&S.hasNodeAttributeWithValue(ad[Z],"value")){return S.getAttributeValueFromNode(ad[Z],"value")
-}}}var ae=S.findNodesByTagName(ac,"embed");if(ae&&ae.length){return this.findMediaUrlInNode(ae[0])}}},trim:function(Y){if(Y&&String(Y)===Y){return Y.replace(/^\s+|\s+$/g,"")}return Y},isOrWasNodeInViewport:function(ad){if(!ad||!ad.getBoundingClientRect||ad.nodeType!==1){return true}var ac=ad.getBoundingClientRect();var ab=w.documentElement||{};var aa=ac.top<0;if(aa&&ad.offsetTop){aa=(ad.offsetTop+ac.height)>0}var Z=ab.clientWidth;if(I.innerWidth&&Z>I.innerWidth){Z=I.innerWidth}var Y=ab.clientHeight;if(I.innerHeight&&Y>I.innerHeight){Y=I.innerHeight}return((ac.bottom>0||aa)&&ac.right>0&&ac.left<Z&&((ac.top<Y)||aa))},isNodeVisible:function(Z){var Y=g(Z);var aa=this.isOrWasNodeInViewport(Z);return Y&&aa},buildInteractionRequestParams:function(Y,Z,aa,ab){var ac="";if(Y){ac+="c_i="+m(Y)}if(Z){if(ac){ac+="&"}ac+="c_n="+m(Z)}if(aa){if(ac){ac+="&"}ac+="c_p="+m(aa)}if(ab){if(ac){ac+="&"}ac+="c_t="+m(ab)}return ac},buildImpressionRequestParams:function(Y,Z,aa){var ab="c_n="+m(Y)+"&c_p="+m(Z);if(aa){ab+="&c_t="+m(aa)
-}return ab},buildContentBlock:function(aa){if(!aa){return}var Y=this.findContentName(aa);var Z=this.findContentPiece(aa);var ab=this.findContentTarget(aa);Y=this.trim(Y);Z=this.trim(Z);ab=this.trim(ab);return{name:Y||"Unknown",piece:Z||"Unknown",target:ab||""}},collectContent:function(ab){if(!ab||!ab.length){return[]}var aa=[];var Y,Z;for(Y=0;Y<ab.length;Y++){Z=this.buildContentBlock(ab[Y]);if(y(Z)){aa.push(Z)}}return aa},setLocation:function(Y){this.location=Y},getLocation:function(){var Y=this.location||I.location;if(!Y.origin){Y.origin=Y.protocol+"//"+Y.hostname+(Y.port?":"+Y.port:"")}return Y},toAbsoluteUrl:function(Z){if((!Z||String(Z)!==Z)&&Z!==""){return Z}if(""===Z){return this.getLocation().href}if(Z.search(/^\/\//)!==-1){return this.getLocation().protocol+Z}if(Z.search(/:\/\//)!==-1){return Z}if(0===Z.indexOf("#")){return this.getLocation().origin+this.getLocation().pathname+Z}if(0===Z.indexOf("?")){return this.getLocation().origin+this.getLocation().pathname+Z}if(0===Z.search("^[a-zA-Z]{2,11}:")){return Z
-}if(Z.search(/^\//)!==-1){return this.getLocation().origin+Z}var Y="(.*/)";var aa=this.getLocation().origin+this.getLocation().pathname.match(new RegExp(Y))[0];return aa+Z},isUrlToCurrentDomain:function(Z){var aa=this.toAbsoluteUrl(Z);if(!aa){return false}var Y=this.getLocation().origin;if(Y===aa){return true}if(0===String(aa).indexOf(Y)){if(":"===String(aa).substr(Y.length,1)){return false}return true}return false},setHrefAttribute:function(Z,Y){if(!Z||!Y){return}S.setAnyAttribute(Z,"href",Y)},shouldIgnoreInteraction:function(aa){var Z=S.hasNodeAttribute(aa,this.CONTENT_IGNOREINTERACTION_ATTR);var Y=S.hasNodeCssClass(aa,this.CONTENT_IGNOREINTERACTION_CLASS);return Z||Y}};function D(Y,Z){if(Z){return Z}if(Y.slice(-9)==="piwik.php"){Y=Y.slice(0,Y.length-9)}return Y}function C(ae){var ag="Piwik_Overlay";var Z=new RegExp("index\\.php\\?module=Overlay&action=startOverlaySession&idSite=([0-9]+)&period=([^&]+)&date=([^&]+)(&segment=.*)?$");var aa=Z.exec(w.referrer);if(aa){var ac=aa[1];if(ac!==String(ae)){return false
-}var ad=aa[2],Y=aa[3],ab=aa[4];if(!ab){ab=""}else{if(ab.indexOf("&segment=")===0){ab=ab.substr("&segment=".length)}}I.name=ag+"###"+ad+"###"+Y+"###"+ab}var af=I.name.split("###");return af.length===4&&af[0]===ag}function O(Z,af,ab){var ae=I.name.split("###"),ad=ae[1],Y=ae[2],ac=ae[3],aa=D(Z,af);i(aa+"plugins/Overlay/client/client.js?v=1",function(){Piwik_Overlay_Client.initialize(aa,ab,ad,Y,ac)})}function F(bH,bB){var bx=P(w.domain,I.location.href,z()),cf=A(bx[0]),bh=j(bx[1]),aW=j(bx[2]),cd=false,bL="GET",cs=bL,am="application/x-www-form-urlencoded; charset=UTF-8",bX=am,ai=bH||"",bc="",cj="",bz=bB||"",a5="",bi="",aG,aS=w.title,cp=["7z","aac","apk","arc","arj","asf","asx","avi","azw3","bin","csv","deb","dmg","doc","docx","epub","exe","flv","gif","gz","gzip","hqx","ibooks","jar","jpg","jpeg","js","mobi","mp2","mp3","mp4","mpg","mpeg","mov","movie","msi","msp","odb","odf","odg","ods","odt","ogg","ogv","pdf","phps","png","ppt","pptx","qt","qtm","ra","ram","rar","rpm","sea","sit","tar","tbz","tbz2","bz","bz2","tgz","torrent","txt","wav","wma","wmv","wpd","xls","xlsx","xml","z","zip"],ae=[cf],a6=[],bf=[],aJ=[],bd=500,b6,aH,bl,bj,Y,bT=["pk_campaign","piwik_campaign","utm_campaign","utm_source","utm_medium"],bb=["pk_kwd","piwik_kwd","utm_term"],aT="_pk_",ch,aY,aU=false,cb,aQ,a2,b7=33955200000,bR=1800000,co=15768000000,aE=true,bP=0,bk=false,at=false,bE,bp={},bO={},aV={},a1=200,ck={},cq={},bD=[],bI=false,b0=false,Z=false,cr=false,aq=false,ci=null,bF,au,a7,bA=W,aX;
-function cv(cF,cC,cB,cE,cA,cD){if(aU){return}var cz;if(cB){cz=new Date();cz.setTime(cz.getTime()+cB)}w.cookie=cF+"="+m(cC)+(cB?";expires="+cz.toGMTString():"")+";path="+(cE||"/")+(cA?";domain="+cA:"")+(cD?";secure":"")}function ah(cB){if(aU){return 0}var cz=new RegExp("(^|;)[ ]*"+cB+"=([^;]*)"),cA=cz.exec(w.cookie);return cA?H(cA[2]):0}function bv(cz){var cA;if(bj){cA=new RegExp("#.*");return cz.replace(cA,"")}return cz}function bo(cB,cz){var cC=l(cz),cA;if(cC){return cz}if(cz.slice(0,1)==="/"){return l(cB)+"://"+c(cB)+cz}cB=bv(cB);cA=cB.indexOf("?");if(cA>=0){cB=cB.slice(0,cA)}cA=cB.lastIndexOf("/");if(cA!==cB.length-1){cB=cB.slice(0,cA+1)}return cB+cz}function b4(cB,cz){var cA;cB=String(cB).toLowerCase();cz=String(cz).toLowerCase();if(cB===cz){return true}if(cz.slice(0,1)==="."){if(cB===cz.slice(1)){return true}cA=cB.length-cz.length;if((cA>0)&&(cB.slice(cA)===cz)){return true}}return false}function cm(cA,cz){cA=String(cA);return cA.indexOf(cz,cA.length-cz.length)!==-1}function aP(cA,cz){cA=String(cA);
-return cA.substr(0,cA.length-cz)}function bN(cz){var cA=document.createElement("a");if(cz.indexOf("//")!==0&&cz.indexOf("http")!==0){cz="http://"+cz}cA.href=n.toAbsoluteUrl(cz);if(cA.pathname){return cA.pathname}return""}function aF(cA,cz){var cB=(!cz||cz==="/");if(cB){return true}if(cA===cz){return true}if(!cA){return false}cz=String(cz).toLowerCase();cA=String(cA).toLowerCase();if(!cm(cA,"/")){cA+="/"}if(!cm(cz,"/")){cz+="/"}return cA.indexOf(cz)===0}function ab(cD,cF){var cA,cz,cB,cC,cE;for(cA=0;cA<ae.length;cA++){cC=A(ae[cA]);cE=bN(ae[cA]);if(b4(cD,cC)&&aF(cF,cE)){return true}}return false}function ay(cC){var cA,cz,cB;for(cA=0;cA<ae.length;cA++){cz=A(ae[cA].toLowerCase());if(cC===cz){return true}if(cz.slice(0,1)==="."){if(cC===cz.slice(1)){return true}cB=cC.length-cz.length;if((cB>0)&&(cC.slice(cB)===cz)){return true}}}return false}function bS(cz,cB){var cA=new Image(1,1);cA.onload=function(){v=0;if(typeof cB==="function"){cB()}};cA.src=ai+(ai.indexOf("?")<0?"?":"&")+cz}function cn(cA,cD,cz){if(!y(cz)||null===cz){cz=true
-}try{var cC=I.XMLHttpRequest?new I.XMLHttpRequest():I.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;cC.open("POST",ai,true);cC.onreadystatechange=function(){if(this.readyState===4&&!(this.status>=200&&this.status<300)&&cz){bS(cA,cD)}else{if(typeof cD==="function"){cD()}}};cC.setRequestHeader("Content-Type",bX);cC.send(cA)}catch(cB){if(cz){bS(cA,cD)}}}function bJ(cA){var cz=new Date();var cB=cz.getTime()+cA;if(!k||cB>k){k=cB}}function bQ(cz){if(bF||!aH){return}bF=setTimeout(function cA(){bF=null;if(bl()){return}var cB=new Date(),cC=aH-(cB.getTime()-ci);cC=Math.min(aH,cC);bQ(cC)},cz||aH)}function be(){if(!bF){return}clearTimeout(bF);bF=null}function aM(){if(bl()){return}bQ()}function af(){be()}function cx(){if(aq||!aH){return}aq=true;X(I,"focus",aM);X(I,"blur",af);bQ()}function b1(cD){var cA=new Date();var cz=cA.getTime();ci=cz;if(b0&&cz<b0){var cB=b0-cz;setTimeout(cD,cB);bJ(cB+50);b0+=50;return}if(b0===false){var cC=800;b0=cz+cC}cD()}function ba(cA,cz,cB){if(!cb&&cA){b1(function(){if(cs==="POST"){cn(cA,cB)
-}else{bS(cA,cB)}bJ(cz)})}if(!aq){cx()}else{bQ()}}function bM(cz){if(cb){return false}return(cz&&cz.length)}function cw(cB,cz){if(!bM(cB)){return}var cA='{"requests":["?'+cB.join('","?')+'"]}';b1(function(){cn(cA,null,false);bJ(cz)})}function aw(cz){return aT+cz+"."+bz+"."+aX}function by(){if(aU){return"0"}if(!y(e.cookieEnabled)){var cz=aw("testcookie");cv(cz,"1");return ah(cz)==="1"?"1":"0"}return e.cookieEnabled?"1":"0"}function aR(){aX=bA((ch||cf)+(aY||"/")).slice(0,4)}function bq(){var cA=aw("cvar"),cz=ah(cA);if(cz.length){cz=JSON2.parse(cz);if(L(cz)){return cz}}return{}}function b2(){if(at===false){at=bq()}}function cc(){return bA((e.userAgent||"")+(e.platform||"")+JSON2.stringify(cq)+(new Date()).getTime()+Math.random()).slice(0,16)}function b9(){var cB=new Date(),cz=Math.round(cB.getTime()/1000),cA=aw("id"),cE=ah(cA),cD,cC;if(cE){cD=cE.split(".");cD.unshift("0");if(bi.length){cD[1]=bi}return cD}if(bi.length){cC=bi}else{if("0"===by()){cC=""}else{cC=cc()}}cD=["1",cC,cz,0,cz,"",""];return cD
-}function aA(){var cG=b9(),cC=cG[0],cD=cG[1],cA=cG[2],cz=cG[3],cE=cG[4],cB=cG[5];if(!y(cG[6])){cG[6]=""}var cF=cG[6];return{newVisitor:cC,uuid:cD,createTs:cA,visitCount:cz,currentVisitTs:cE,lastVisitTs:cB,lastEcommerceOrderTs:cF}}function al(){var cC=new Date(),cA=cC.getTime(),cD=aA().createTs;var cz=parseInt(cD,10);var cB=(cz*1000)+b7-cA;return cB}function ao(cz){if(!bz){return}var cB=new Date(),cA=Math.round(cB.getTime()/1000);if(!y(cz)){cz=aA()}var cC=cz.uuid+"."+cz.createTs+"."+cz.visitCount+"."+cA+"."+cz.lastVisitTs+"."+cz.lastEcommerceOrderTs;cv(aw("id"),cC,al(),aY,ch)}function bg(){var cz=ah(aw("ref"));if(cz.length){try{cz=JSON2.parse(cz);if(L(cz)){return cz}}catch(cA){}}return["","",0,""]}function br(cB,cA,cz){cv(cB,"",-86400,cA,cz)}function a3(cA){var cz="testvalue";cv("test",cz,10000,null,cA);if(ah("test")===cz){br("test",null,cA);return true}return false}function aj(){var cB=aU;aU=false;var cz=["id","ses","cvar","ref"];var cA,cC;for(cA=0;cA<cz.length;cA++){cC=aw(cz[cA]);if(0!==ah(cC)){br(cC,aY,ch)
-}}aU=cB}function bw(cz){bz=cz;ao()}function cy(cD){if(!cD||!L(cD)){return}var cC=[];var cB;for(cB in cD){if(Object.prototype.hasOwnProperty.call(cD,cB)){cC.push(cB)}}var cE={};cC.sort();var cz=cC.length;var cA;for(cA=0;cA<cz;cA++){cE[cC[cA]]=cD[cC[cA]]}return cE}function bG(){cv(aw("ses"),"*",bR,aY,ch)}function bU(cB,cW,cX,cC){var cV,cA=new Date(),cJ=Math.round(cA.getTime()/1000),cG,cU,cD=1024,c2,cK,cS=at,cE=aw("ses"),cQ=aw("ref"),cN=aw("cvar"),cO=ah(cE),cT=bg(),cZ=aG||bh,cH,cz;if(aU){aj()}if(cb){return""}var cP=aA();if(!y(cC)){cC=""}var cM=w.characterSet||w.charset;if(!cM||cM.toLowerCase()==="utf-8"){cM=null}cH=cT[0];cz=cT[1];cG=cT[2];cU=cT[3];if(!cO){var cY=bR/1000;if(!cP.lastVisitTs||(cJ-cP.lastVisitTs)>cY){cP.visitCount++;cP.lastVisitTs=cP.currentVisitTs}if(!a2||!cH.length){for(cV in bT){if(Object.prototype.hasOwnProperty.call(bT,cV)){cH=K(cZ,bT[cV]);if(cH.length){break}}}for(cV in bb){if(Object.prototype.hasOwnProperty.call(bb,cV)){cz=K(cZ,bb[cV]);if(cz.length){break}}}}c2=c(aW);cK=cU.length?c(cU):"";
-if(c2.length&&!ay(c2)&&(!a2||!cK.length||ay(cK))){cU=aW}if(cU.length||cH.length){cG=cJ;cT=[cH,cz,cG,bv(cU.slice(0,cD))];cv(cQ,JSON2.stringify(cT),co,aY,ch)}}cB+="&idsite="+bz+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+cA.getHours()+"&m="+cA.getMinutes()+"&s="+cA.getSeconds()+"&url="+m(bv(cZ))+(aW.length?"&urlref="+m(bv(aW)):"")+((a5&&a5.length)?"&uid="+m(a5):"")+"&_id="+cP.uuid+"&_idts="+cP.createTs+"&_idvc="+cP.visitCount+"&_idn="+cP.newVisitor+(cH.length?"&_rcn="+m(cH):"")+(cz.length?"&_rck="+m(cz):"")+"&_refts="+cG+"&_viewts="+cP.lastVisitTs+(String(cP.lastEcommerceOrderTs).length?"&_ects="+cP.lastEcommerceOrderTs:"")+(String(cU).length?"&_ref="+m(bv(cU.slice(0,cD))):"")+(cM?"&cs="+m(cM):"")+"&send_image=0";for(cV in cq){if(Object.prototype.hasOwnProperty.call(cq,cV)){cB+="&"+cV+"="+cq[cV]}}var c1=[];if(cW){for(cV in cW){if(Object.prototype.hasOwnProperty.call(cW,cV)&&/^dimension\d+$/.test(cV)){var cF=cV.replace("dimension","");c1.push(parseInt(cF,10));c1.push(String(cF));cB+="&"+cV+"="+cW[cV];
-delete cW[cV]}}}if(cW&&s(cW)){cW=null}for(cV in aV){if(Object.prototype.hasOwnProperty.call(aV,cV)){var cL=(-1===c1.indexOf(cV));if(cL){cB+="&dimension"+cV+"="+aV[cV]}}}if(cW){cB+="&data="+m(JSON2.stringify(cW))}else{if(Y){cB+="&data="+m(JSON2.stringify(Y))}}function cI(c3,c4){var c5=JSON2.stringify(c3);if(c5.length>2){return"&"+c4+"="+m(c5)}return""}var c0=cy(bp);var cR=cy(bO);cB+=cI(c0,"cvar");cB+=cI(cR,"e_cvar");if(at){cB+=cI(at,"_cvar");for(cV in cS){if(Object.prototype.hasOwnProperty.call(cS,cV)){if(at[cV][0]===""||at[cV][1]===""){delete at[cV]}}}if(bk){cv(cN,JSON2.stringify(at),bR,aY,ch)}}if(aE){if(bP){cB+=">_ms="+bP}else{if(f&&f.timing&&f.timing.requestStart&&f.timing.responseEnd){cB+=">_ms="+(f.timing.responseEnd-f.timing.requestStart)}}}cP.lastEcommerceOrderTs=y(cC)&&String(cC).length?cC:cP.lastEcommerceOrderTs;ao(cP);bG();cB+=Q(cX);if(cj.length){cB+="&"+cj}if(r(bE)){cB=bE(cB)}return cB}bl=function aI(){var cz=new Date();if(ci+aH<=cz.getTime()){var cA=bU("ping=1",null,"ping");
-ba(cA,bd);return true}return false};function aZ(cC,cB,cG,cD,cz,cJ){var cE="idgoal=0",cF,cA=new Date(),cH=[],cI;if(String(cC).length){cE+="&ec_id="+m(cC);cF=Math.round(cA.getTime()/1000)}cE+="&revenue="+cB;if(String(cG).length){cE+="&ec_st="+cG}if(String(cD).length){cE+="&ec_tx="+cD}if(String(cz).length){cE+="&ec_sh="+cz}if(String(cJ).length){cE+="&ec_dt="+cJ}if(ck){for(cI in ck){if(Object.prototype.hasOwnProperty.call(ck,cI)){if(!y(ck[cI][1])){ck[cI][1]=""}if(!y(ck[cI][2])){ck[cI][2]=""}if(!y(ck[cI][3])||String(ck[cI][3]).length===0){ck[cI][3]=0}if(!y(ck[cI][4])||String(ck[cI][4]).length===0){ck[cI][4]=1}cH.push(ck[cI])}}cE+="&ec_items="+m(JSON2.stringify(cH))}cE=bU(cE,Y,"ecommerce",cF);ba(cE,bd)}function bs(cz,cD,cC,cB,cA,cE){if(String(cz).length&&y(cD)){aZ(cz,cD,cC,cB,cA,cE)}}function a0(cz){if(y(cz)){aZ("",cz,"","","","")}}function bt(cB,cC){var cz=new Date(),cA=bU("action_name="+m(V(cB||aS)),cC,"log");ba(cA,bd)}function aC(cB,cA){var cC,cz="(^| )(piwik[_-]"+cA;if(cB){for(cC=0;cC<cB.length;
-cC++){cz+="|"+cB[cC]}}cz+=")( |$)";return new RegExp(cz)}function ax(cz){return(ai&&cz&&0===String(cz).indexOf(ai))}function bV(cD,cz,cE,cA){if(ax(cz)){return 0}var cC=aC(bf,"download"),cB=aC(aJ,"link"),cF=new RegExp("\\.("+cp.join("|")+")([?&#]|$)","i");if(cB.test(cD)){return"link"}if(cA||cC.test(cD)||cF.test(cz)){return"download"}if(cE){return 0}return"link"}function ac(cA){var cz;cz=cA.parentNode;while(cz!==null&&y(cz)){if(S.isLinkElement(cA)){break}cA=cz;cz=cA.parentNode}return cA}function ct(cE){cE=ac(cE);if(!S.hasNodeAttribute(cE,"href")){return}if(!y(cE.href)){return}var cD=S.getAttributeValueFromNode(cE,"href");if(ax(cD)){return}var cA=cE.pathname||bN(cE.href);var cF=cE.hostname||c(cE.href);var cG=cF.toLowerCase();var cB=cE.href.replace(cF,cG);var cC=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto):","i");if(!cC.test(cB)){var cz=bV(cE.className,cB,ab(cG,cA),S.hasNodeAttribute(cE,"download"));if(cz){return{type:cz,href:cB}}}}function ar(cz,cA,cB,cC){var cD=n.buildInteractionRequestParams(cz,cA,cB,cC);
-if(!cD){return}return bU(cD,null,"contentInteraction")}function b8(cB,cC,cG,cz,cA){if(!y(cB)){return}if(ax(cB)){return cB}var cE=n.toAbsoluteUrl(cB);var cD="redirecturl="+m(cE)+"&";cD+=ar(cC,cG,cz,(cA||cB));var cF="&";if(ai.indexOf("?")<0){cF="?"}return ai+cF+cD}function aN(cz,cA){if(!cz||!cA){return false}var cB=n.findTargetNode(cz);if(n.shouldIgnoreInteraction(cB)){return false}cB=n.findTargetNodeNoDefault(cz);if(cB&&!J(cB,cA)){return false}return true}function bW(cB,cA,cD){if(!cB){return}var cz=n.findParentContentNode(cB);if(!cz){return}if(!aN(cz,cB)){return}var cC=n.buildContentBlock(cz);if(!cC){return}if(!cC.target&&cD){cC.target=cD}return n.buildInteractionRequestParams(cA,cC.name,cC.piece,cC.target)}function az(cA){if(!bD||!bD.length){return false}var cz,cB;for(cz=0;cz<bD.length;cz++){cB=bD[cz];if(cB&&cB.name===cA.name&&cB.piece===cA.piece&&cB.target===cA.target){return true}}return false}function a9(cC){if(!cC){return false}var cF=n.findTargetNode(cC);if(!cF||n.shouldIgnoreInteraction(cF)){return false
-}var cG=ct(cF);if(cr&&cG&&cG.type){return false}if(S.isLinkElement(cF)&&S.hasNodeAttributeWithValue(cF,"href")){var cz=String(S.getAttributeValueFromNode(cF,"href"));if(0===cz.indexOf("#")){return false}if(ax(cz)){return true}if(!n.isUrlToCurrentDomain(cz)){return false}var cD=n.buildContentBlock(cC);if(!cD){return}var cB=cD.name;var cH=cD.piece;var cE=cD.target;if(!S.hasNodeAttributeWithValue(cF,n.CONTENT_TARGET_ATTR)||cF.wasContentTargetAttrReplaced){cF.wasContentTargetAttrReplaced=true;cE=n.toAbsoluteUrl(cz);S.setAnyAttribute(cF,n.CONTENT_TARGET_ATTR,cE)}var cA=b8(cz,"click",cB,cH,cE);n.setHrefAttribute(cF,cA);return true}return false}function ap(cA){if(!cA||!cA.length){return}var cz;for(cz=0;cz<cA.length;cz++){a9(cA[cz])}}function aB(cz){return function(cA){if(!cz){return}var cD=n.findParentContentNode(cz);var cE;if(cA){cE=cA.target||cA.srcElement}if(!cE){cE=cz}if(!aN(cD,cE)){return}bJ(bd);if(S.isLinkElement(cz)&&S.hasNodeAttributeWithValue(cz,"href")&&S.hasNodeAttributeWithValue(cz,n.CONTENT_TARGET_ATTR)){var cB=S.getAttributeValueFromNode(cz,"href");
-if(!ax(cB)&&cz.wasContentTargetAttrReplaced){S.setAnyAttribute(cz,n.CONTENT_TARGET_ATTR,"")}}var cI=ct(cz);if(Z&&cI&&cI.type){return cI.type}if(a9(cD)){return"href"}var cF=n.buildContentBlock(cD);if(!cF){return}var cC=cF.name;var cJ=cF.piece;var cH=cF.target;var cG=ar("click",cC,cJ,cH);ba(cG,bd);return cG}}function bu(cB){if(!cB||!cB.length){return}var cz,cA;for(cz=0;cz<cB.length;cz++){cA=n.findTargetNode(cB[cz]);if(cA&&!cA.contentInteractionTrackingSetupDone){cA.contentInteractionTrackingSetupDone=true;X(cA,"click",aB(cA))}}}function a4(cB,cC){if(!cB||!cB.length){return[]}var cz,cA;for(cz=0;cz<cB.length;cz++){if(az(cB[cz])){cB.splice(cz,1);cz--}else{bD.push(cB[cz])}}if(!cB||!cB.length){return[]}ap(cC);bu(cC);var cD=[];for(cz=0;cz<cB.length;cz++){cA=bU(n.buildImpressionRequestParams(cB[cz].name,cB[cz].piece,cB[cz].target),undefined,"contentImpressions");cD.push(cA)}return cD}function bZ(cA){var cz=n.collectContent(cA);return a4(cz,cA)}function aL(cA){if(!cA||!cA.length){return[]}var cz;
-for(cz=0;cz<cA.length;cz++){if(!n.isNodeVisible(cA[cz])){cA.splice(cz,1);cz--}}if(!cA||!cA.length){return[]}return bZ(cA)}function ak(cB,cz,cA){var cC=n.buildImpressionRequestParams(cB,cz,cA);return bU(cC,null,"contentImpression")}function cu(cC,cA){if(!cC){return}var cz=n.findParentContentNode(cC);var cB=n.buildContentBlock(cz);if(!cB){return}if(!cA){cA="Unknown"}return ar(cA,cB.name,cB.piece,cB.target)}function ca(cA,cC,cz,cB){return"e_c="+m(cA)+"&e_a="+m(cC)+(y(cz)?"&e_n="+m(cz):"")+(y(cB)?"&e_v="+m(cB):"")}function ad(cB,cD,cz,cC,cE){if(String(cB).length===0||String(cD).length===0){return false}var cA=bU(ca(cB,cD,cz,cC),cE,"event");ba(cA,bd)}function bC(cz,cC,cA,cD){var cB=bU("search="+m(cz)+(cC?"&search_cat="+m(cC):"")+(y(cA)?"&search_count="+cA:""),cD,"sitesearch");ba(cB,bd)}function ce(cz,cC,cB){var cA=bU("idgoal="+cz+(cC?"&revenue="+cC:""),cB,"goal");ba(cA,bd)}function cl(cC,cz,cG,cF,cB){var cE=cz+"="+m(bv(cC));var cA=bW(cB,"click",cC);if(cA){cE+="&"+cA}var cD=bU(cE,cG,"link");ba(cD,(cF?0:bd),cF)
-}function bm(cA,cz){if(cA!==""){return cA+cz.charAt(0).toUpperCase()+cz.slice(1)}return cz}function bK(cE){var cD,cz,cC=["","webkit","ms","moz"],cB;if(!aQ){for(cz=0;cz<cC.length;cz++){cB=cC[cz];if(Object.prototype.hasOwnProperty.call(w,bm(cB,"hidden"))){if(w[bm(cB,"visibilityState")]==="prerender"){cD=true}break}}}if(cD){X(w,cB+"visibilitychange",function cA(){w.removeEventListener(cB+"visibilitychange",cA,false);cE()});return}cE()}function an(cz){if(w.readyState==="complete"){cz()}else{if(I.addEventListener){I.addEventListener("load",cz)}else{if(I.attachEvent){I.attachEvent("onLoad",cz)}}}}function aO(cA){var cz=false;if(w.attachEvent){cz=w.readyState==="complete"}else{cz=w.readyState!=="loading"}if(cz){cA()}else{if(w.addEventListener){w.addEventListener("DOMContentLoaded",cA)}else{if(w.attachEvent){w.attachEvent("onreadystatechange",cA)}}}}function b5(cz){var cA=ct(cz);if(cA&&cA.type){cA.href=j(cA.href);cl(cA.href,cA.type,undefined,null,cz)}}function bY(){return w.all&&!w.addEventListener
-}function cg(cz){var cB=cz.which;var cA=(typeof cz.button);if(!cB&&cA!=="undefined"){if(bY()){if(cz.button&1){cB=1}else{if(cz.button&2){cB=3}else{if(cz.button&4){cB=2}}}}else{if(cz.button===0||cz.button==="0"){cB=1}else{if(cz.button&1){cB=2}else{if(cz.button&2){cB=3}}}}}return cB}function bn(cz){switch(cg(cz)){case 1:return"left";case 2:return"middle";case 3:return"right"}}function aD(cz){return cz.target||cz.srcElement}function ag(cz){return function(cC){cC=cC||I.event;var cB=bn(cC);var cD=aD(cC);if(cC.type==="click"){var cA=false;if(cz&&cB==="middle"){cA=true}if(cD&&!cA){b5(cD)}}else{if(cC.type==="mousedown"){if(cB==="middle"&&cD){au=cB;a7=cD}else{au=a7=null}}else{if(cC.type==="mouseup"){if(cB===au&&cD===a7){b5(cD)}au=a7=null}else{if(cC.type==="contextmenu"){b5(cD)}}}}}}function aa(cA,cz){X(cA,"click",ag(cz),false);if(cz){X(cA,"mouseup",ag(cz),false);X(cA,"mousedown",ag(cz),false);X(cA,"contextmenu",ag(cz),false)}}function a8(cA){if(!Z){Z=true;var cB,cz=aC(a6,"ignore"),cC=w.links;if(cC){for(cB=0;
-cB<cC.length;cB++){if(!cz.test(cC[cB].className)){aa(cC[cB],cA)}}}}}function av(cB,cD,cE){if(bI){return true}bI=true;var cF=false;var cC,cA;function cz(){cF=true}an(function(){function cG(cI){setTimeout(function(){if(!bI){return}cF=false;cE.trackVisibleContentImpressions();cG(cI)},cI)}function cH(cI){setTimeout(function(){if(!bI){return}if(cF){cF=false;cE.trackVisibleContentImpressions()}cH(cI)},cI)}if(cB){cC=["scroll","resize"];for(cA=0;cA<cC.length;cA++){if(w.addEventListener){w.addEventListener(cC[cA],cz)}else{I.attachEvent("on"+cC[cA],cz)}}cH(100)}if(cD&&cD>0){cD=parseInt(cD,10);cG(cD)}})}function aK(cD,cF){var cE=bN(cD);var cC=bN(cF);if(!cE||cE==="/"||!cC||cC==="/"){return}var cB=A(cD);if(ab(cB,"/")){return}if(cm(cE,"/")){cE=aP(cE,1)}var cG=cE.split("/");var cA;for(cA=2;cA<cG.length;cA++){var cz=cG.slice(0,cA).join("/");if(ab(cB,cz)){cE=cz;break}}if(!aF(cC,cE)){return}return cE}function b3(){var cB,cD,cE={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"},cA=I.devicePixelRatio||1;
-if(!((new RegExp("MSIE")).test(e.userAgent))){if(e.mimeTypes&&e.mimeTypes.length){for(cB in cE){if(Object.prototype.hasOwnProperty.call(cE,cB)){cD=e.mimeTypes[cE[cB]];cq[cB]=(cD&&cD.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&y(e.javaEnabled)&&e.javaEnabled()){cq.java="1"}if(r(I.GearsFactory)){cq.gears="1"}cq.cookie=by()}var cC=parseInt(M.width,10)*cA;var cz=parseInt(M.height,10)*cA;cq.res=parseInt(cC,10)+"x"+parseInt(cz,10)}b3();aR();ao();return{getVisitorId:function(){return aA().uuid},getVisitorInfo:function(){return b9()},getAttributionInfo:function(){return bg()},getAttributionCampaignName:function(){return bg()[0]},getAttributionCampaignKeyword:function(){return bg()[1]},getAttributionReferrerTimestamp:function(){return bg()[2]},getAttributionReferrerUrl:function(){return bg()[3]},setTrackerUrl:function(cz){ai=cz},getTrackerUrl:function(){return ai},getSiteId:function(){return bz},setSiteId:function(cz){bw(cz)},setUserId:function(cz){if(!y(cz)||!cz.length){return
-}a5=cz;bi=bA(a5).substr(0,16)},getUserId:function(){return a5},setCustomData:function(cz,cA){if(L(cz)){Y=cz}else{if(!Y){Y={}}Y[cz]=cA}},getCustomData:function(){return Y},setCustomRequestProcessing:function(cz){bE=cz},appendToTrackingUrl:function(cz){cj=cz},getRequest:function(cz){return bU(cz)},addPlugin:function(cz,cA){a[cz]=cA},setCustomDimension:function(cz,cA){cz=parseInt(cz,10);if(cz>0){if(!y(cA)){cA=""}if(!o(cA)){cA=String(cA)}aV[cz]=cA}},getCustomDimension:function(cz){cz=parseInt(cz,10);if(cz>0&&Object.prototype.hasOwnProperty.call(aV,cz)){return aV[cz]}},deleteCustomDimension:function(cz){cz=parseInt(cz,10);if(cz>0){delete aV[cz]}},setCustomVariable:function(cA,cz,cD,cB){var cC;if(!y(cB)){cB="visit"}if(!y(cz)){return}if(!y(cD)){cD=""}if(cA>0){cz=!o(cz)?String(cz):cz;cD=!o(cD)?String(cD):cD;cC=[cz.slice(0,a1),cD.slice(0,a1)];if(cB==="visit"||cB===2){b2();at[cA]=cC}else{if(cB==="page"||cB===3){bp[cA]=cC}else{if(cB==="event"){bO[cA]=cC}}}}},getCustomVariable:function(cA,cB){var cz;
-if(!y(cB)){cB="visit"}if(cB==="page"||cB===3){cz=bp[cA]}else{if(cB==="event"){cz=bO[cA]}else{if(cB==="visit"||cB===2){b2();cz=at[cA]}}}if(!y(cz)||(cz&&cz[0]==="")){return false}return cz},deleteCustomVariable:function(cz,cA){if(this.getCustomVariable(cz,cA)){this.setCustomVariable(cz,"","",cA)}},storeCustomVariablesInCookie:function(){bk=true},setLinkTrackingTimer:function(cz){bd=cz},setDownloadExtensions:function(cz){if(o(cz)){cz=cz.split("|")}cp=cz},addDownloadExtensions:function(cA){var cz;if(o(cA)){cA=cA.split("|")}for(cz=0;cz<cA.length;cz++){cp.push(cA[cz])}},removeDownloadExtensions:function(cB){var cA,cz=[];if(o(cB)){cB=cB.split("|")}for(cA=0;cA<cp.length;cA++){if(B(cB,cp[cA])===-1){cz.push(cp[cA])}}cp=cz},setDomains:function(cz){ae=o(cz)?[cz]:cz;var cB=false,cA;for(cA in ae){if(Object.prototype.hasOwnProperty.call(ae,cA)&&b4(cf,A(String(ae[cA])))){cB=true;if(!aY){var cC=aK(ae[cA],bh);if(cC){this.setCookiePath(cC)}break}}}if(!cB){ae.push(cf)}},setIgnoreClasses:function(cz){a6=o(cz)?[cz]:cz
-},setRequestMethod:function(cz){cs=cz||bL},setRequestContentType:function(cz){bX=cz||am},setReferrerUrl:function(cz){aW=cz},setCustomUrl:function(cz){aG=bo(bh,cz)},setDocumentTitle:function(cz){aS=cz},setAPIUrl:function(cz){bc=cz},setDownloadClasses:function(cz){bf=o(cz)?[cz]:cz},setLinkClasses:function(cz){aJ=o(cz)?[cz]:cz},setCampaignNameKey:function(cz){bT=o(cz)?[cz]:cz},setCampaignKeywordKey:function(cz){bb=o(cz)?[cz]:cz},discardHashTag:function(cz){bj=cz},setCookieNamePrefix:function(cz){aT=cz;at=bq()},setCookieDomain:function(cz){var cA=A(cz);if(a3(cA)){ch=cA;aR()}},setCookiePath:function(cz){aY=cz;aR()},setVisitorCookieTimeout:function(cz){b7=cz*1000},setSessionCookieTimeout:function(cz){bR=cz*1000},setReferralCookieTimeout:function(cz){co=cz*1000},setConversionAttributionFirstReferrer:function(cz){a2=cz},disableCookies:function(){aU=true;cq.cookie="0";if(bz){aj()}},deleteCookies:function(){aj()},setDoNotTrack:function(cA){var cz=e.doNotTrack||e.msDoNotTrack;cb=cA&&(cz==="yes"||cz==="1");
-if(cb){this.disableCookies()}},addListener:function(cA,cz){aa(cA,cz)},enableLinkTracking:function(cz){cr=true;if(q){a8(cz)}else{G.push(function(){a8(cz)})}},enableJSErrorTracking:function(){if(cd){return}cd=true;var cz=I.onerror;I.onerror=function(cE,cC,cB,cD,cA){bK(function(){var cF="JavaScript Errors";var cG=cC+":"+cB;if(cD){cG+=":"+cD}ad(cF,cG,cE)});if(cz){return cz(cE,cC,cB,cD,cA)}return false}},disablePerformanceTracking:function(){aE=false},setGenerationTimeMs:function(cz){bP=parseInt(cz,10)},enableHeartBeatTimer:function(cz){cz=Math.max(cz,1);aH=(cz||15)*1000;if(ci!==null){cx()}},killFrame:function(){if(I.location!==I.top.location){I.top.location=I.location}},redirectFile:function(cz){if(I.location.protocol==="file:"){I.location=cz}},setCountPreRendered:function(cz){aQ=cz},trackGoal:function(cz,cB,cA){bK(function(){ce(cz,cB,cA)})},trackLink:function(cA,cz,cC,cB){bK(function(){cl(cA,cz,cC,cB)})},trackPageView:function(cz,cA){bD=[];if(C(bz)){bK(function(){O(ai,bc,bz)})}else{bK(function(){bt(cz,cA)
-})}},trackAllContentImpressions:function(){if(C(bz)){return}bK(function(){aO(function(){var cz=n.findContentNodes();var cA=bZ(cz);cw(cA,bd)})})},trackVisibleContentImpressions:function(cz,cA){if(C(bz)){return}if(!y(cz)){cz=true}if(!y(cA)){cA=750}av(cz,cA,this);bK(function(){an(function(){var cB=n.findContentNodes();var cC=aL(cB);cw(cC,bd)})})},trackContentImpression:function(cB,cz,cA){if(C(bz)){return}if(!cB){return}cz=cz||"Unknown";bK(function(){var cC=ak(cB,cz,cA);ba(cC,bd)})},trackContentImpressionsWithinNode:function(cz){if(C(bz)||!cz){return}bK(function(){if(bI){an(function(){var cA=n.findContentNodesWithinNode(cz);var cB=aL(cA);cw(cB,bd)})}else{aO(function(){var cA=n.findContentNodesWithinNode(cz);var cB=bZ(cA);cw(cB,bd)})}})},trackContentInteraction:function(cB,cC,cz,cA){if(C(bz)){return}if(!cB||!cC){return}cz=cz||"Unknown";bK(function(){var cD=ar(cB,cC,cz,cA);ba(cD,bd)})},trackContentInteractionNode:function(cA,cz){if(C(bz)||!cA){return}bK(function(){var cB=cu(cA,cz);ba(cB,bd)})
-},logAllContentBlocksOnPage:function(){var cA=n.findContentNodes();var cz=n.collectContent(cA);if(console!==undefined&&console&&console.log){console.log(cz)}},trackEvent:function(cA,cC,cz,cB,cD){bK(function(){ad(cA,cC,cz,cB,cD)})},trackSiteSearch:function(cz,cB,cA,cC){bK(function(){bC(cz,cB,cA,cC)})},setEcommerceView:function(cC,cz,cB,cA){if(!y(cB)||!cB.length){cB=""}else{if(cB instanceof Array){cB=JSON2.stringify(cB)}}bp[5]=["_pkc",cB];if(y(cA)&&String(cA).length){bp[2]=["_pkp",cA]}if((!y(cC)||!cC.length)&&(!y(cz)||!cz.length)){return}if(y(cC)&&cC.length){bp[3]=["_pks",cC]}if(!y(cz)||!cz.length){cz=""}bp[4]=["_pkn",cz]},addEcommerceItem:function(cD,cz,cB,cA,cC){if(cD.length){ck[cD]=[cD,cz,cB,cA,cC]}},trackEcommerceOrder:function(cz,cD,cC,cB,cA,cE){bs(cz,cD,cC,cB,cA,cE)},trackEcommerceCartUpdate:function(cz){a0(cz)}}}function x(){return{push:T}}function b(ad,ac){var ae={};var aa,ab;for(aa=0;aa<ac.length;aa++){var Y=ac[aa];ae[Y]=1;for(ab=0;ab<ad.length;ab++){if(ad[ab]&&ad[ab][0]){var Z=ad[ab][0];
-if(Y===Z){T(ad[ab]);delete ad[ab];if(ae[Z]>1){if(console!==undefined&&console&&console.error){console.error("The method "+Z+' 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')}}ae[Z]++}}}}return ad}X(I,"beforeunload",U,false);p();Date.prototype.getTimeAlias=Date.prototype.getTime;N=new F();var t=["disableCookies","setTrackerUrl","setAPIUrl","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","enableLinkTracking"];_paq=b(_paq,t);for(v=0;v<_paq.length;v++){if(_paq[v]){T(_paq[v])}}_paq=new x();d={addPlugin:function(Y,Z){a[Y]=Z},getTracker:function(Y,Z){if(!y(Z)){Z=this.getAsyncTracker().getSiteId()}if(!y(Y)){Y=this.getAsyncTracker().getTrackerUrl()}return new F(Y,Z)},getAsyncTracker:function(){return N}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return d})}return d
-}())}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=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=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()}};
+if(ad=="}"){break}if(ae){if(ad==","){ad=y();if(ad=="}"){H()}}else{H()}}if(ad==","||typeof ad!="string"||(F?ad.charAt(0):ad[0])!="@"||y()!=":"){H()}ac[ad.slice(1)]=W(y())}return ac}}H()}return ad};var P=function(ae,ad,af){var ac=w(ae,ad,af);if(ac===L){delete ae[ad]}else{ae[ad]=ac}};var w=function(af,ae,ag){var ad=af[ae],ac;if(typeof ad=="object"&&ad){if(u.call(ad)==E){for(ac=ad.length;ac--;){P(ad,ac,ag)}}else{m(ad,function(ah){P(ad,ah,ag)})}}return ag.call(af,ae,ad)};V.parse=function(ae,af){var ac,ad;G=0;X=""+ae;ac=W(y());if(y()!="$"){H()}G=X=null;return af&&u.call(af)==U?w((ad={},ad[""]=ac,ad),"",af):ac}}}V.runInContext=j;return V}if(h&&!c){j(i,h)}else{var f=i.JSON,k=i.JSON3,d=false;var g=j(i,(i.JSON3={noConflict:function(){if(!d){d=true;i.JSON=f;i.JSON3=k;f=k=null}return g}}));i.JSON={parse:g.parse,stringify:g.stringify}}if(c){define(function(){return g})}}).call(this);JSON2=a})()}if(typeof _paq!=="object"){_paq=[]}if(typeof Piwik!=="object"){Piwik=(function(){var k,a={},x=document,e=navigator,N=screen,J=window,f=J.performance||J.mozPerformance||J.msPerformance||J.webkitPerformance,r=false,H=[],m=J.encodeURIComponent,I=J.decodeURIComponent,h=unescape,O,w,d;
+function j(Z){try{return I(Z)}catch(aa){return unescape(Z)}}function z(aa){var Z=typeof aa;return Z!=="undefined"}function s(Z){return typeof Z==="function"}function M(Z){return typeof Z==="object"}function p(Z){return typeof Z==="string"||Z instanceof String}function t(aa){if(!aa){return true}var Z;var ab=true;for(Z in aa){if(Object.prototype.hasOwnProperty.call(aa,Z)){ab=false}}return ab}function U(){var Z,ab,aa;for(Z=0;Z<arguments.length;Z+=1){aa=arguments[Z];ab=aa.shift();if(p(ab)){O[ab].apply(O,aa)}else{ab.apply(O,aa)}}}function Y(ac,ab,aa,Z){if(ac.addEventListener){ac.addEventListener(ab,aa,Z);return true}if(ac.attachEvent){return ac.attachEvent("on"+ab,aa)}ac["on"+ab]=aa}function R(aa,ad){var Z="",ac,ab;for(ac in a){if(Object.prototype.hasOwnProperty.call(a,ac)){ab=a[ac][aa];if(s(ab)){Z+=ab(ad)}}}return Z}function V(){var Z;R("unload");if(k){do{Z=new Date()}while(Z.getTimeAlias()<k)}}function S(){var Z;if(!r){r=true;R("load");for(Z=0;Z<H.length;Z++){H[Z]()}}return true}function q(){var aa;
+if(x.addEventListener){Y(x,"DOMContentLoaded",function Z(){x.removeEventListener("DOMContentLoaded",Z,false);S()})}else{if(x.attachEvent){x.attachEvent("onreadystatechange",function Z(){if(x.readyState==="complete"){x.detachEvent("onreadystatechange",Z);S()}});if(x.documentElement.doScroll&&J===J.top){(function Z(){if(!r){try{x.documentElement.doScroll("left")}catch(ab){setTimeout(Z,0);return}S()}}())}}}if((new RegExp("WebKit")).test(e.userAgent)){aa=setInterval(function(){if(r||/loaded|complete/.test(x.readyState)){clearInterval(aa);S()}},10)}Y(J,"load",S,false)}function i(ab,aa){var Z=x.createElement("script");Z.type="text/javascript";Z.src=ab;if(Z.readyState){Z.onreadystatechange=function(){var ac=this.readyState;if(ac==="loaded"||ac==="complete"){Z.onreadystatechange=null;aa()}}}else{Z.onload=aa}x.getElementsByTagName("head")[0].appendChild(Z)}function A(){var Z="";try{Z=J.top.document.referrer}catch(ab){if(J.parent){try{Z=J.parent.document.referrer}catch(aa){Z=""}}}if(Z===""){Z=x.referrer
+}return Z}function l(Z){var ab=new RegExp("^([a-z]+):"),aa=ab.exec(Z);return aa?aa[1]:null}function c(Z){var ab=new RegExp("^(?:(?:https?|ftp):)/*(?:[^@]+@)?([^:/#]+)"),aa=ab.exec(Z);return aa?aa[1]:Z}function L(ab,aa){var Z="[\\?&#]"+aa+"=([^&#]*)";var ad=new RegExp(Z);var ac=ad.exec(ab);return ac?I(ac[1]):""}function v(Z){return unescape(m(Z))}function X(ao){var ab=function(av,au){return(av<<au)|(av>>>(32-au))},ap=function(ax){var av="",aw,au;for(aw=7;aw>=0;aw--){au=(ax>>>(aw*4))&15;av+=au.toString(16)}return av},ae,ar,aq,aa=[],ai=1732584193,ag=4023233417,af=2562383102,ad=271733878,ac=3285377520,an,am,al,ak,aj,at,Z,ah=[];ao=v(ao);Z=ao.length;for(ar=0;ar<Z-3;ar+=4){aq=ao.charCodeAt(ar)<<24|ao.charCodeAt(ar+1)<<16|ao.charCodeAt(ar+2)<<8|ao.charCodeAt(ar+3);ah.push(aq)}switch(Z&3){case 0:ar=2147483648;break;case 1:ar=ao.charCodeAt(Z-1)<<24|8388608;break;case 2:ar=ao.charCodeAt(Z-2)<<24|ao.charCodeAt(Z-1)<<16|32768;break;case 3:ar=ao.charCodeAt(Z-3)<<24|ao.charCodeAt(Z-2)<<16|ao.charCodeAt(Z-1)<<8|128;
+break}ah.push(ar);while((ah.length&15)!==14){ah.push(0)}ah.push(Z>>>29);ah.push((Z<<3)&4294967295);for(ae=0;ae<ah.length;ae+=16){for(ar=0;ar<16;ar++){aa[ar]=ah[ae+ar]}for(ar=16;ar<=79;ar++){aa[ar]=ab(aa[ar-3]^aa[ar-8]^aa[ar-14]^aa[ar-16],1)}an=ai;am=ag;al=af;ak=ad;aj=ac;for(ar=0;ar<=19;ar++){at=(ab(an,5)+((am&al)|(~am&ak))+aj+aa[ar]+1518500249)&4294967295;aj=ak;ak=al;al=ab(am,30);am=an;an=at}for(ar=20;ar<=39;ar++){at=(ab(an,5)+(am^al^ak)+aj+aa[ar]+1859775393)&4294967295;aj=ak;ak=al;al=ab(am,30);am=an;an=at}for(ar=40;ar<=59;ar++){at=(ab(an,5)+((am&al)|(am&ak)|(al&ak))+aj+aa[ar]+2400959708)&4294967295;aj=ak;ak=al;al=ab(am,30);am=an;an=at}for(ar=60;ar<=79;ar++){at=(ab(an,5)+(am^al^ak)+aj+aa[ar]+3395469782)&4294967295;aj=ak;ak=al;al=ab(am,30);am=an;an=at}ai=(ai+an)&4294967295;ag=(ag+am)&4294967295;af=(af+al)&4294967295;ad=(ad+ak)&4294967295;ac=(ac+aj)&4294967295}at=ap(ai)+ap(ag)+ap(af)+ap(ad)+ap(ac);return at.toLowerCase()}function Q(ab,Z,aa){if(!ab){ab=""}if(!Z){Z=""}if(ab==="translate.googleusercontent.com"){if(aa===""){aa=Z
+}Z=L(Z,"u");ab=c(Z)}else{if(ab==="cc.bingj.com"||ab==="webcache.googleusercontent.com"||ab.slice(0,5)==="74.6."){Z=x.links[0].href;ab=c(Z)}}return[ab,Z,aa]}function B(aa){var Z=aa.length;if(aa.charAt(--Z)==="."){aa=aa.slice(0,Z)}if(aa.slice(0,2)==="*."){aa=aa.slice(1)}if(aa.indexOf("/")!==-1){aa=aa.substr(0,aa.indexOf("/"))}return aa}function W(aa){aa=aa&&aa.text?aa.text:aa;if(!p(aa)){var Z=x.getElementsByTagName("title");if(Z&&z(Z[0])){aa=Z[0].text}}return aa}function F(Z){if(!Z){return[]}if(!z(Z.children)&&z(Z.childNodes)){return Z.children}if(z(Z.children)){return Z.children}return[]}function K(aa,Z){if(!aa||!Z){return false}if(aa.contains){return aa.contains(Z)}if(aa===Z){return true}if(aa.compareDocumentPosition){return !!(aa.compareDocumentPosition(Z)&16)}return false}function C(ab,ac){if(ab&&ab.indexOf){return ab.indexOf(ac)}if(!z(ab)||ab===null){return -1}if(!ab.length){return -1}var Z=ab.length;if(Z===0){return -1}var aa=0;while(aa<Z){if(ab[aa]===ac){return aa}aa++}return -1}function g(ab){if(!ab){return false
+}function Z(ad,ae){if(J.getComputedStyle){return x.defaultView.getComputedStyle(ad,null)[ae]}if(ad.currentStyle){return ad.currentStyle[ae]}}function ac(ad){ad=ad.parentNode;while(ad){if(ad===x){return true}ad=ad.parentNode}return false}function aa(af,al,ad,ai,ag,aj,ah){var ae=af.parentNode,ak=1;if(!ac(af)){return false}if(9===ae.nodeType){return true}if("0"===Z(af,"opacity")||"none"===Z(af,"display")||"hidden"===Z(af,"visibility")){return false}if(!z(al)||!z(ad)||!z(ai)||!z(ag)||!z(aj)||!z(ah)){al=af.offsetTop;ag=af.offsetLeft;ai=al+af.offsetHeight;ad=ag+af.offsetWidth;aj=af.offsetWidth;ah=af.offsetHeight}if(ab===af&&(0===ah||0===aj)&&"hidden"===Z(af,"overflow")){return false}if(ae){if(("hidden"===Z(ae,"overflow")||"scroll"===Z(ae,"overflow"))){if(ag+ak>ae.offsetWidth+ae.scrollLeft||ag+aj-ak<ae.scrollLeft||al+ak>ae.offsetHeight+ae.scrollTop||al+ah-ak<ae.scrollTop){return false}}if(af.offsetParent===ae){ag+=ae.offsetLeft;al+=ae.offsetTop}return aa(ae,al,ad,ai,ag,aj,ah)}return true}return aa(ab)
+}var T={htmlCollectionToArray:function(ab){var Z=[],aa;if(!ab||!ab.length){return Z}for(aa=0;aa<ab.length;aa++){Z.push(ab[aa])}return Z},find:function(Z){if(!document.querySelectorAll||!Z){return[]}var aa=document.querySelectorAll(Z);return this.htmlCollectionToArray(aa)},findMultiple:function(ab){if(!ab||!ab.length){return[]}var aa,ac;var Z=[];for(aa=0;aa<ab.length;aa++){ac=this.find(ab[aa]);Z=Z.concat(ac)}Z=this.makeNodesUnique(Z);return Z},findNodesByTagName:function(aa,Z){if(!aa||!Z||!aa.getElementsByTagName){return[]}var ab=aa.getElementsByTagName(Z);return this.htmlCollectionToArray(ab)},makeNodesUnique:function(Z){var ae=[].concat(Z);Z.sort(function(ag,af){if(ag===af){return 0}var ai=C(ae,ag);var ah=C(ae,af);if(ai===ah){return 0}return ai>ah?-1:1});if(Z.length<=1){return Z}var aa=0;var ac=0;var ad=[];var ab;ab=Z[aa++];while(ab){if(ab===Z[aa]){ac=ad.push(aa)}ab=Z[aa++]||null}while(ac--){Z.splice(ad[ac],1)}return Z},getAttributeValueFromNode:function(ad,ab){if(!this.hasNodeAttribute(ad,ab)){return
+}if(ad&&ad.getAttribute){return ad.getAttribute(ab)}if(!ad||!ad.attributes){return}var ac=(typeof ad.attributes[ab]);if("undefined"===ac){return}if(ad.attributes[ab].value){return ad.attributes[ab].value}if(ad.attributes[ab].nodeValue){return ad.attributes[ab].nodeValue}var aa;var Z=ad.attributes;if(!Z){return}for(aa=0;aa<Z.length;aa++){if(Z[aa].nodeName===ab){return Z[aa].nodeValue}}return null},hasNodeAttributeWithValue:function(aa,Z){var ab=this.getAttributeValueFromNode(aa,Z);return !!ab},hasNodeAttribute:function(ab,Z){if(ab&&ab.hasAttribute){return ab.hasAttribute(Z)}if(ab&&ab.attributes){var aa=(typeof ab.attributes[Z]);return"undefined"!==aa}return false},hasNodeCssClass:function(ab,Z){if(ab&&Z&&ab.className){var aa=typeof ab.className==="string"?ab.className.split(" "):[];if(-1!==C(aa,Z)){return true}}return false},findNodesHavingAttribute:function(ad,ab,Z){if(!Z){Z=[]}if(!ad||!ab){return Z}var ac=F(ad);if(!ac||!ac.length){return Z}var aa,ae;for(aa=0;aa<ac.length;aa++){ae=ac[aa];
+if(this.hasNodeAttribute(ae,ab)){Z.push(ae)}Z=this.findNodesHavingAttribute(ae,ab,Z)}return Z},findFirstNodeHavingAttribute:function(ab,aa){if(!ab||!aa){return}if(this.hasNodeAttribute(ab,aa)){return ab}var Z=this.findNodesHavingAttribute(ab,aa);if(Z&&Z.length){return Z[0]}},findFirstNodeHavingAttributeWithValue:function(ac,ab){if(!ac||!ab){return}if(this.hasNodeAttributeWithValue(ac,ab)){return ac}var Z=this.findNodesHavingAttribute(ac,ab);if(!Z||!Z.length){return}var aa;for(aa=0;aa<Z.length;aa++){if(this.getAttributeValueFromNode(Z[aa],ab)){return Z[aa]}}},findNodesHavingCssClass:function(ad,ac,Z){if(!Z){Z=[]}if(!ad||!ac){return Z}if(ad.getElementsByClassName){var ae=ad.getElementsByClassName(ac);return this.htmlCollectionToArray(ae)}var ab=F(ad);if(!ab||!ab.length){return[]}var aa,af;for(aa=0;aa<ab.length;aa++){af=ab[aa];if(this.hasNodeCssClass(af,ac)){Z.push(af)}Z=this.findNodesHavingCssClass(af,ac,Z)}return Z},findFirstNodeHavingClass:function(ab,aa){if(!ab||!aa){return}if(this.hasNodeCssClass(ab,aa)){return ab
+}var Z=this.findNodesHavingCssClass(ab,aa);if(Z&&Z.length){return Z[0]}},isLinkElement:function(aa){if(!aa){return false}var Z=String(aa.nodeName).toLowerCase();var ac=["a","area"];var ab=C(ac,Z);return ab!==-1},setAnyAttribute:function(aa,Z,ab){if(!aa||!Z){return}if(aa.setAttribute){aa.setAttribute(Z,ab)}else{aa[Z]=ab}}};var o={CONTENT_ATTR:"data-track-content",CONTENT_CLASS:"piwikTrackContent",CONTENT_NAME_ATTR:"data-content-name",CONTENT_PIECE_ATTR:"data-content-piece",CONTENT_PIECE_CLASS:"piwikContentPiece",CONTENT_TARGET_ATTR:"data-content-target",CONTENT_TARGET_CLASS:"piwikContentTarget",CONTENT_IGNOREINTERACTION_ATTR:"data-content-ignoreinteraction",CONTENT_IGNOREINTERACTION_CLASS:"piwikContentIgnoreInteraction",location:undefined,findContentNodes:function(){var aa="."+this.CONTENT_CLASS;var Z="["+this.CONTENT_ATTR+"]";var ab=T.findMultiple([aa,Z]);return ab},findContentNodesWithinNode:function(ac){if(!ac){return[]}var aa=T.findNodesHavingCssClass(ac,this.CONTENT_CLASS);var Z=T.findNodesHavingAttribute(ac,this.CONTENT_ATTR);
+if(Z&&Z.length){var ab;for(ab=0;ab<Z.length;ab++){aa.push(Z[ab])}}if(T.hasNodeAttribute(ac,this.CONTENT_ATTR)){aa.push(ac)}else{if(T.hasNodeCssClass(ac,this.CONTENT_CLASS)){aa.push(ac)}}aa=T.makeNodesUnique(aa);return aa},findParentContentNode:function(aa){if(!aa){return}var ab=aa;var Z=0;while(ab&&ab!==x&&ab.parentNode){if(T.hasNodeAttribute(ab,this.CONTENT_ATTR)){return ab}if(T.hasNodeCssClass(ab,this.CONTENT_CLASS)){return ab}ab=ab.parentNode;if(Z>1000){break}Z++}},findPieceNode:function(aa){var Z;Z=T.findFirstNodeHavingAttribute(aa,this.CONTENT_PIECE_ATTR);if(!Z){Z=T.findFirstNodeHavingClass(aa,this.CONTENT_PIECE_CLASS)}if(Z){return Z}return aa},findTargetNodeNoDefault:function(Z){if(!Z){return}var aa=T.findFirstNodeHavingAttributeWithValue(Z,this.CONTENT_TARGET_ATTR);if(aa){return aa}aa=T.findFirstNodeHavingAttribute(Z,this.CONTENT_TARGET_ATTR);if(aa){return aa}aa=T.findFirstNodeHavingClass(Z,this.CONTENT_TARGET_CLASS);if(aa){return aa}},findTargetNode:function(Z){var aa=this.findTargetNodeNoDefault(Z);
+if(aa){return aa}return Z},findContentName:function(aa){if(!aa){return}var ad=T.findFirstNodeHavingAttributeWithValue(aa,this.CONTENT_NAME_ATTR);if(ad){return T.getAttributeValueFromNode(ad,this.CONTENT_NAME_ATTR)}var Z=this.findContentPiece(aa);if(Z){return this.removeDomainIfIsInLink(Z)}if(T.hasNodeAttributeWithValue(aa,"title")){return T.getAttributeValueFromNode(aa,"title")}var ab=this.findPieceNode(aa);if(T.hasNodeAttributeWithValue(ab,"title")){return T.getAttributeValueFromNode(ab,"title")}var ac=this.findTargetNode(aa);if(T.hasNodeAttributeWithValue(ac,"title")){return T.getAttributeValueFromNode(ac,"title")}},findContentPiece:function(aa){if(!aa){return}var ac=T.findFirstNodeHavingAttributeWithValue(aa,this.CONTENT_PIECE_ATTR);if(ac){return T.getAttributeValueFromNode(ac,this.CONTENT_PIECE_ATTR)}var Z=this.findPieceNode(aa);var ab=this.findMediaUrlInNode(Z);if(ab){return this.toAbsoluteUrl(ab)}},findContentTarget:function(ab){if(!ab){return}var ac=this.findTargetNode(ab);if(T.hasNodeAttributeWithValue(ac,this.CONTENT_TARGET_ATTR)){return T.getAttributeValueFromNode(ac,this.CONTENT_TARGET_ATTR)
+}var aa;if(T.hasNodeAttributeWithValue(ac,"href")){aa=T.getAttributeValueFromNode(ac,"href");return this.toAbsoluteUrl(aa)}var Z=this.findPieceNode(ab);if(T.hasNodeAttributeWithValue(Z,"href")){aa=T.getAttributeValueFromNode(Z,"href");return this.toAbsoluteUrl(aa)}},isSameDomain:function(Z){if(!Z||!Z.indexOf){return false}if(0===Z.indexOf(this.getLocation().origin)){return true}var aa=Z.indexOf(this.getLocation().host);if(8>=aa&&0<=aa){return true}return false},removeDomainIfIsInLink:function(ab){var aa="^https?://[^/]+";var Z="^.*//[^/]+";if(ab&&ab.search&&-1!==ab.search(new RegExp(aa))&&this.isSameDomain(ab)){ab=ab.replace(new RegExp(Z),"");if(!ab){ab="/"}}return ab},findMediaUrlInNode:function(ad){if(!ad){return}var ab=["img","embed","video","audio"];var Z=ad.nodeName.toLowerCase();if(-1!==C(ab,Z)&&T.findFirstNodeHavingAttributeWithValue(ad,"src")){var ac=T.findFirstNodeHavingAttributeWithValue(ad,"src");return T.getAttributeValueFromNode(ac,"src")}if(Z==="object"&&T.hasNodeAttributeWithValue(ad,"data")){return T.getAttributeValueFromNode(ad,"data")
+}if(Z==="object"){var ae=T.findNodesByTagName(ad,"param");if(ae&&ae.length){var aa;for(aa=0;aa<ae.length;aa++){if("movie"===T.getAttributeValueFromNode(ae[aa],"name")&&T.hasNodeAttributeWithValue(ae[aa],"value")){return T.getAttributeValueFromNode(ae[aa],"value")}}}var af=T.findNodesByTagName(ad,"embed");if(af&&af.length){return this.findMediaUrlInNode(af[0])}}},trim:function(Z){if(Z&&String(Z)===Z){return Z.replace(/^\s+|\s+$/g,"")}return Z},isOrWasNodeInViewport:function(ae){if(!ae||!ae.getBoundingClientRect||ae.nodeType!==1){return true}var ad=ae.getBoundingClientRect();var ac=x.documentElement||{};var ab=ad.top<0;if(ab&&ae.offsetTop){ab=(ae.offsetTop+ad.height)>0}var aa=ac.clientWidth;if(J.innerWidth&&aa>J.innerWidth){aa=J.innerWidth}var Z=ac.clientHeight;if(J.innerHeight&&Z>J.innerHeight){Z=J.innerHeight}return((ad.bottom>0||ab)&&ad.right>0&&ad.left<aa&&((ad.top<Z)||ab))},isNodeVisible:function(aa){var Z=g(aa);var ab=this.isOrWasNodeInViewport(aa);return Z&&ab},buildInteractionRequestParams:function(Z,aa,ab,ac){var ad="";
+if(Z){ad+="c_i="+m(Z)}if(aa){if(ad){ad+="&"}ad+="c_n="+m(aa)}if(ab){if(ad){ad+="&"}ad+="c_p="+m(ab)}if(ac){if(ad){ad+="&"}ad+="c_t="+m(ac)}return ad},buildImpressionRequestParams:function(Z,aa,ab){var ac="c_n="+m(Z)+"&c_p="+m(aa);if(ab){ac+="&c_t="+m(ab)}return ac},buildContentBlock:function(ab){if(!ab){return}var Z=this.findContentName(ab);var aa=this.findContentPiece(ab);var ac=this.findContentTarget(ab);Z=this.trim(Z);aa=this.trim(aa);ac=this.trim(ac);return{name:Z||"Unknown",piece:aa||"Unknown",target:ac||""}},collectContent:function(ac){if(!ac||!ac.length){return[]}var ab=[];var Z,aa;for(Z=0;Z<ac.length;Z++){aa=this.buildContentBlock(ac[Z]);if(z(aa)){ab.push(aa)}}return ab},setLocation:function(Z){this.location=Z},getLocation:function(){var Z=this.location||J.location;if(!Z.origin){Z.origin=Z.protocol+"//"+Z.hostname+(Z.port?":"+Z.port:"")}return Z},toAbsoluteUrl:function(aa){if((!aa||String(aa)!==aa)&&aa!==""){return aa}if(""===aa){return this.getLocation().href}if(aa.search(/^\/\//)!==-1){return this.getLocation().protocol+aa
+}if(aa.search(/:\/\//)!==-1){return aa}if(0===aa.indexOf("#")){return this.getLocation().origin+this.getLocation().pathname+aa}if(0===aa.indexOf("?")){return this.getLocation().origin+this.getLocation().pathname+aa}if(0===aa.search("^[a-zA-Z]{2,11}:")){return aa}if(aa.search(/^\//)!==-1){return this.getLocation().origin+aa}var Z="(.*/)";var ab=this.getLocation().origin+this.getLocation().pathname.match(new RegExp(Z))[0];return ab+aa},isUrlToCurrentDomain:function(aa){var ab=this.toAbsoluteUrl(aa);if(!ab){return false}var Z=this.getLocation().origin;if(Z===ab){return true}if(0===String(ab).indexOf(Z)){if(":"===String(ab).substr(Z.length,1)){return false}return true}return false},setHrefAttribute:function(aa,Z){if(!aa||!Z){return}T.setAnyAttribute(aa,"href",Z)},shouldIgnoreInteraction:function(ab){var aa=T.hasNodeAttribute(ab,this.CONTENT_IGNOREINTERACTION_ATTR);var Z=T.hasNodeCssClass(ab,this.CONTENT_IGNOREINTERACTION_CLASS);return aa||Z}};function E(Z,aa){if(aa){return aa}if(Z.slice(-9)==="piwik.php"){Z=Z.slice(0,Z.length-9)
+}return Z}function D(af){var ah="Piwik_Overlay";var aa=new RegExp("index\\.php\\?module=Overlay&action=startOverlaySession&idSite=([0-9]+)&period=([^&]+)&date=([^&]+)(&segment=.*)?$");var ab=aa.exec(x.referrer);if(ab){var ad=ab[1];if(ad!==String(af)){return false}var ae=ab[2],Z=ab[3],ac=ab[4];if(!ac){ac=""}else{if(ac.indexOf("&segment=")===0){ac=ac.substr("&segment=".length)}}J.name=ah+"###"+ae+"###"+Z+"###"+ac}var ag=J.name.split("###");return ag.length===4&&ag[0]===ah}function P(aa,ag,ac){var af=J.name.split("###"),ae=af[1],Z=af[2],ad=af[3],ab=E(aa,ag);i(ab+"plugins/Overlay/client/client.js?v=1",function(){Piwik_Overlay_Client.initialize(ab,ac,ae,Z,ad)})}function n(){if(z(J.frameElement)){return(J.frameElement&&String(J.frameElement.nodeName).toLowerCase()==="iframe")}try{return J.self!==J.top}catch(Z){return true}}function G(bJ,bD){var bz=Q(x.domain,J.location.href,A()),ch=B(bz[0]),bj=j(bz[1]),aY=j(bz[2]),cf=false,bN="GET",cu=bN,an="application/x-www-form-urlencoded; charset=UTF-8",bZ=an,aj=bJ||"",be="",cl="",bB=bD||"",a7="",bk="",aH,aU=x.title,cr=["7z","aac","apk","arc","arj","asf","asx","avi","azw3","bin","csv","deb","dmg","doc","docx","epub","exe","flv","gif","gz","gzip","hqx","ibooks","jar","jpg","jpeg","js","mobi","mp2","mp3","mp4","mpg","mpeg","mov","movie","msi","msp","odb","odf","odg","ods","odt","ogg","ogv","pdf","phps","png","ppt","pptx","qt","qtm","ra","ram","rar","rpm","sea","sit","tar","tbz","tbz2","bz","bz2","tgz","torrent","txt","wav","wma","wmv","wpd","xls","xlsx","xml","z","zip"],af=[ch],a8=[],bh=[],aK=[],bf=500,b8,aI,bn,bl,Z,bV=["pk_campaign","piwik_campaign","utm_campaign","utm_source","utm_medium"],bd=["pk_kwd","piwik_kwd","utm_term"],aV="_pk_",cj,a0,aW=false,cd,aS,a4,b9=33955200000,bT=1800000,cq=15768000000,aF=true,bR=0,bm=false,au=false,bG,br={},bQ={},aX={},a3=200,cm={},cs={},bF=[],bK=false,b2=false,aa=false,ct=false,ar=false,aR=n(),ck=null,bH,av,a9,bC=X,aZ;
+function cx(cH,cE,cD,cG,cC,cF){if(aW){return}var cB;if(cD){cB=new Date();cB.setTime(cB.getTime()+cD)}x.cookie=cH+"="+m(cE)+(cD?";expires="+cB.toGMTString():"")+";path="+(cG||"/")+(cC?";domain="+cC:"")+(cF?";secure":"")}function ai(cD){if(aW){return 0}var cB=new RegExp("(^|;)[ ]*"+cD+"=([^;]*)"),cC=cB.exec(x.cookie);return cC?I(cC[2]):0}function bx(cB){var cC;if(bl){cC=new RegExp("#.*");return cB.replace(cC,"")}return cB}function bq(cD,cB){var cE=l(cB),cC;if(cE){return cB}if(cB.slice(0,1)==="/"){return l(cD)+"://"+c(cD)+cB}cD=bx(cD);cC=cD.indexOf("?");if(cC>=0){cD=cD.slice(0,cC)}cC=cD.lastIndexOf("/");if(cC!==cD.length-1){cD=cD.slice(0,cC+1)}return cD+cB}function b6(cD,cB){var cC;cD=String(cD).toLowerCase();cB=String(cB).toLowerCase();if(cD===cB){return true}if(cB.slice(0,1)==="."){if(cD===cB.slice(1)){return true}cC=cD.length-cB.length;if((cC>0)&&(cD.slice(cC)===cB)){return true}}return false}function co(cC,cB){cC=String(cC);return cC.indexOf(cB,cC.length-cB.length)!==-1}function aQ(cC,cB){cC=String(cC);
+return cC.substr(0,cC.length-cB)}function bP(cB){var cC=document.createElement("a");if(cB.indexOf("//")!==0&&cB.indexOf("http")!==0){cB="http://"+cB}cC.href=o.toAbsoluteUrl(cB);if(cC.pathname){return cC.pathname}return""}function aG(cC,cB){var cD=(!cB||cB==="/");if(cD){return true}if(cC===cB){return true}if(!cC){return false}cB=String(cB).toLowerCase();cC=String(cC).toLowerCase();if(!co(cC,"/")){cC+="/"}if(!co(cB,"/")){cB+="/"}return cC.indexOf(cB)===0}function ac(cF,cH){var cC,cB,cD,cE,cG;for(cC=0;cC<af.length;cC++){cE=B(af[cC]);cG=bP(af[cC]);if(b6(cF,cE)&&aG(cH,cG)){return true}}return false}function az(cE){var cC,cB,cD;for(cC=0;cC<af.length;cC++){cB=B(af[cC].toLowerCase());if(cE===cB){return true}if(cB.slice(0,1)==="."){if(cE===cB.slice(1)){return true}cD=cE.length-cB.length;if((cD>0)&&(cE.slice(cD)===cB)){return true}}}return false}function bU(cB,cD){var cC=new Image(1,1);cC.onload=function(){w=0;if(typeof cD==="function"){cD()}};cC.src=aj+(aj.indexOf("?")<0?"?":"&")+cB}function cp(cC,cF,cB){if(!z(cB)||null===cB){cB=true
+}try{var cE=J.XMLHttpRequest?new J.XMLHttpRequest():J.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;cE.open("POST",aj,true);cE.onreadystatechange=function(){if(this.readyState===4&&!(this.status>=200&&this.status<300)&&cB){bU(cC,cF)}else{if(typeof cF==="function"){cF()}}};cE.setRequestHeader("Content-Type",bZ);cE.send(cC)}catch(cD){if(cB){bU(cC,cF)}}}function bL(cC){var cB=new Date();var cD=cB.getTime()+cC;if(!k||cD>k){k=cD}}function bS(cB){if(bH||!aI){return}bH=setTimeout(function cC(){bH=null;if(!aR){aR=(!x.hasFocus||x.hasFocus())}if(!aR){bS(aI);return}if(bn()){return}var cD=new Date(),cE=aI-(cD.getTime()-ck);cE=Math.min(aI,cE);bS(cE)},cB||aI)}function bg(){if(!bH){return}clearTimeout(bH);bH=null}function aN(){aR=true;if(bn()){return}bS()}function ag(){bg()}function cz(){if(ar||!aI){return}ar=true;Y(J,"focus",aN);Y(J,"blur",ag);bS()}function b3(cF){var cC=new Date();var cB=cC.getTime();ck=cB;if(b2&&cB<b2){var cD=b2-cB;setTimeout(cF,cD);bL(cD+50);b2+=50;return}if(b2===false){var cE=800;
+b2=cB+cE}cF()}function bc(cC,cB,cD){if(!cd&&cC){b3(function(){if(cu==="POST"){cp(cC,cD)}else{bU(cC,cD)}bL(cB)})}if(!ar){cz()}else{bS()}}function bO(cB){if(cd){return false}return(cB&&cB.length)}function cy(cD,cB){if(!bO(cD)){return}var cC='{"requests":["?'+cD.join('","?')+'"]}';b3(function(){cp(cC,null,false);bL(cB)})}function ax(cB){return aV+cB+"."+bB+"."+aZ}function bA(){if(aW){return"0"}if(!z(e.cookieEnabled)){var cB=ax("testcookie");cx(cB,"1");return ai(cB)==="1"?"1":"0"}return e.cookieEnabled?"1":"0"}function aT(){aZ=bC((cj||ch)+(a0||"/")).slice(0,4)}function bs(){var cC=ax("cvar"),cB=ai(cC);if(cB.length){cB=JSON2.parse(cB);if(M(cB)){return cB}}return{}}function b4(){if(au===false){au=bs()}}function ce(){return bC((e.userAgent||"")+(e.platform||"")+JSON2.stringify(cs)+(new Date()).getTime()+Math.random()).slice(0,16)}function cb(){var cD=new Date(),cB=Math.round(cD.getTime()/1000),cC=ax("id"),cG=ai(cC),cF,cE;if(cG){cF=cG.split(".");cF.unshift("0");if(bk.length){cF[1]=bk}return cF}if(bk.length){cE=bk
+}else{if("0"===bA()){cE=""}else{cE=ce()}}cF=["1",cE,cB,0,cB,"",""];return cF}function aB(){var cI=cb(),cE=cI[0],cF=cI[1],cC=cI[2],cB=cI[3],cG=cI[4],cD=cI[5];if(!z(cI[6])){cI[6]=""}var cH=cI[6];return{newVisitor:cE,uuid:cF,createTs:cC,visitCount:cB,currentVisitTs:cG,lastVisitTs:cD,lastEcommerceOrderTs:cH}}function am(){var cE=new Date(),cC=cE.getTime(),cF=aB().createTs;var cB=parseInt(cF,10);var cD=(cB*1000)+b9-cC;return cD}function ap(cB){if(!bB){return}var cD=new Date(),cC=Math.round(cD.getTime()/1000);if(!z(cB)){cB=aB()}var cE=cB.uuid+"."+cB.createTs+"."+cB.visitCount+"."+cC+"."+cB.lastVisitTs+"."+cB.lastEcommerceOrderTs;cx(ax("id"),cE,am(),a0,cj)}function bi(){var cB=ai(ax("ref"));if(cB.length){try{cB=JSON2.parse(cB);if(M(cB)){return cB}}catch(cC){}}return["","",0,""]}function bt(cD,cC,cB){cx(cD,"",-86400,cC,cB)}function a5(cC){var cB="testvalue";cx("test",cB,10000,null,cC);if(ai("test")===cB){bt("test",null,cC);return true}return false}function ak(){var cD=aW;aW=false;var cB=["id","ses","cvar","ref"];
+var cC,cE;for(cC=0;cC<cB.length;cC++){cE=ax(cB[cC]);if(0!==ai(cE)){bt(cE,a0,cj)}}aW=cD}function by(cB){bB=cB;ap()}function cA(cF){if(!cF||!M(cF)){return}var cE=[];var cD;for(cD in cF){if(Object.prototype.hasOwnProperty.call(cF,cD)){cE.push(cD)}}var cG={};cE.sort();var cB=cE.length;var cC;for(cC=0;cC<cB;cC++){cG[cE[cC]]=cF[cE[cC]]}return cG}function bI(){cx(ax("ses"),"*",bT,a0,cj)}function bW(cD,cY,cZ,cE){var cX,cC=new Date(),cL=Math.round(cC.getTime()/1000),cI,cW,cF=1024,c4,cM,cU=au,cG=ax("ses"),cS=ax("ref"),cP=ax("cvar"),cQ=ai(cG),cV=bi(),c1=aH||bj,cJ,cB;if(aW){ak()}if(cd){return""}var cR=aB();if(!z(cE)){cE=""}var cO=x.characterSet||x.charset;if(!cO||cO.toLowerCase()==="utf-8"){cO=null}cJ=cV[0];cB=cV[1];cI=cV[2];cW=cV[3];if(!cQ){var c0=bT/1000;if(!cR.lastVisitTs||(cL-cR.lastVisitTs)>c0){cR.visitCount++;cR.lastVisitTs=cR.currentVisitTs}if(!a4||!cJ.length){for(cX in bV){if(Object.prototype.hasOwnProperty.call(bV,cX)){cJ=L(c1,bV[cX]);if(cJ.length){break}}}for(cX in bd){if(Object.prototype.hasOwnProperty.call(bd,cX)){cB=L(c1,bd[cX]);
+if(cB.length){break}}}}c4=c(aY);cM=cW.length?c(cW):"";if(c4.length&&!az(c4)&&(!a4||!cM.length||az(cM))){cW=aY}if(cW.length||cJ.length){cI=cL;cV=[cJ,cB,cI,bx(cW.slice(0,cF))];cx(cS,JSON2.stringify(cV),cq,a0,cj)}}cD+="&idsite="+bB+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+cC.getHours()+"&m="+cC.getMinutes()+"&s="+cC.getSeconds()+"&url="+m(bx(c1))+(aY.length?"&urlref="+m(bx(aY)):"")+((a7&&a7.length)?"&uid="+m(a7):"")+"&_id="+cR.uuid+"&_idts="+cR.createTs+"&_idvc="+cR.visitCount+"&_idn="+cR.newVisitor+(cJ.length?"&_rcn="+m(cJ):"")+(cB.length?"&_rck="+m(cB):"")+"&_refts="+cI+"&_viewts="+cR.lastVisitTs+(String(cR.lastEcommerceOrderTs).length?"&_ects="+cR.lastEcommerceOrderTs:"")+(String(cW).length?"&_ref="+m(bx(cW.slice(0,cF))):"")+(cO?"&cs="+m(cO):"")+"&send_image=0";for(cX in cs){if(Object.prototype.hasOwnProperty.call(cs,cX)){cD+="&"+cX+"="+cs[cX]}}var c3=[];if(cY){for(cX in cY){if(Object.prototype.hasOwnProperty.call(cY,cX)&&/^dimension\d+$/.test(cX)){var cH=cX.replace("dimension","");
+c3.push(parseInt(cH,10));c3.push(String(cH));cD+="&"+cX+"="+cY[cX];delete cY[cX]}}}if(cY&&t(cY)){cY=null}for(cX in aX){if(Object.prototype.hasOwnProperty.call(aX,cX)){var cN=(-1===c3.indexOf(cX));if(cN){cD+="&dimension"+cX+"="+aX[cX]}}}if(cY){cD+="&data="+m(JSON2.stringify(cY))}else{if(Z){cD+="&data="+m(JSON2.stringify(Z))}}function cK(c5,c6){var c7=JSON2.stringify(c5);if(c7.length>2){return"&"+c6+"="+m(c7)}return""}var c2=cA(br);var cT=cA(bQ);cD+=cK(c2,"cvar");cD+=cK(cT,"e_cvar");if(au){cD+=cK(au,"_cvar");for(cX in cU){if(Object.prototype.hasOwnProperty.call(cU,cX)){if(au[cX][0]===""||au[cX][1]===""){delete au[cX]}}}if(bm){cx(cP,JSON2.stringify(au),bT,a0,cj)}}if(aF){if(bR){cD+=">_ms="+bR}else{if(f&&f.timing&&f.timing.requestStart&&f.timing.responseEnd){cD+=">_ms="+(f.timing.responseEnd-f.timing.requestStart)}}}cR.lastEcommerceOrderTs=z(cE)&&String(cE).length?cE:cR.lastEcommerceOrderTs;ap(cR);bI();cD+=R(cZ);if(cl.length){cD+="&"+cl}if(s(bG)){cD=bG(cD)}return cD}bn=function aJ(){var cB=new Date();
+if(ck+aI<=cB.getTime()){var cC=bW("ping=1",null,"ping");bc(cC,bf);return true}return false};function a1(cE,cD,cI,cF,cB,cL){var cG="idgoal=0",cH,cC=new Date(),cJ=[],cK;if(String(cE).length){cG+="&ec_id="+m(cE);cH=Math.round(cC.getTime()/1000)}cG+="&revenue="+cD;if(String(cI).length){cG+="&ec_st="+cI}if(String(cF).length){cG+="&ec_tx="+cF}if(String(cB).length){cG+="&ec_sh="+cB}if(String(cL).length){cG+="&ec_dt="+cL}if(cm){for(cK in cm){if(Object.prototype.hasOwnProperty.call(cm,cK)){if(!z(cm[cK][1])){cm[cK][1]=""}if(!z(cm[cK][2])){cm[cK][2]=""}if(!z(cm[cK][3])||String(cm[cK][3]).length===0){cm[cK][3]=0}if(!z(cm[cK][4])||String(cm[cK][4]).length===0){cm[cK][4]=1}cJ.push(cm[cK])}}cG+="&ec_items="+m(JSON2.stringify(cJ))}cG=bW(cG,Z,"ecommerce",cH);bc(cG,bf)}function bu(cB,cF,cE,cD,cC,cG){if(String(cB).length&&z(cF)){a1(cB,cF,cE,cD,cC,cG)}}function a2(cB){if(z(cB)){a1("",cB,"","","","")}}function bv(cD,cE){var cB=new Date(),cC=bW("action_name="+m(W(cD||aU)),cE,"log");bc(cC,bf)}function aD(cD,cC){var cE,cB="(^| )(piwik[_-]"+cC;
+if(cD){for(cE=0;cE<cD.length;cE++){cB+="|"+cD[cE]}}cB+=")( |$)";return new RegExp(cB)}function ay(cB){return(aj&&cB&&0===String(cB).indexOf(aj))}function bX(cF,cB,cG,cC){if(ay(cB)){return 0}var cE=aD(bh,"download"),cD=aD(aK,"link"),cH=new RegExp("\\.("+cr.join("|")+")([?&#]|$)","i");if(cD.test(cF)){return"link"}if(cC||cE.test(cF)||cH.test(cB)){return"download"}if(cG){return 0}return"link"}function ad(cC){var cB;cB=cC.parentNode;while(cB!==null&&z(cB)){if(T.isLinkElement(cC)){break}cC=cB;cB=cC.parentNode}return cC}function cv(cG){cG=ad(cG);if(!T.hasNodeAttribute(cG,"href")){return}if(!z(cG.href)){return}var cF=T.getAttributeValueFromNode(cG,"href");if(ay(cF)){return}var cC=cG.pathname||bP(cG.href);var cH=cG.hostname||c(cG.href);var cI=cH.toLowerCase();var cD=cG.href.replace(cH,cI);var cE=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto):","i");if(!cE.test(cD)){var cB=bX(cG.className,cD,ac(cI,cC),T.hasNodeAttribute(cG,"download"));if(cB){return{type:cB,href:cD}
+}}}function at(cB,cC,cD,cE){var cF=o.buildInteractionRequestParams(cB,cC,cD,cE);if(!cF){return}return bW(cF,null,"contentInteraction")}function ca(cD,cE,cI,cB,cC){if(!z(cD)){return}if(ay(cD)){return cD}var cG=o.toAbsoluteUrl(cD);var cF="redirecturl="+m(cG)+"&";cF+=at(cE,cI,cB,(cC||cD));var cH="&";if(aj.indexOf("?")<0){cH="?"}return aj+cH+cF}function aO(cB,cC){if(!cB||!cC){return false}var cD=o.findTargetNode(cB);if(o.shouldIgnoreInteraction(cD)){return false}cD=o.findTargetNodeNoDefault(cB);if(cD&&!K(cD,cC)){return false}return true}function bY(cD,cC,cF){if(!cD){return}var cB=o.findParentContentNode(cD);if(!cB){return}if(!aO(cB,cD)){return}var cE=o.buildContentBlock(cB);if(!cE){return}if(!cE.target&&cF){cE.target=cF}return o.buildInteractionRequestParams(cC,cE.name,cE.piece,cE.target)}function aA(cC){if(!bF||!bF.length){return false}var cB,cD;for(cB=0;cB<bF.length;cB++){cD=bF[cB];if(cD&&cD.name===cC.name&&cD.piece===cC.piece&&cD.target===cC.target){return true}}return false}function bb(cE){if(!cE){return false
+}var cH=o.findTargetNode(cE);if(!cH||o.shouldIgnoreInteraction(cH)){return false}var cI=cv(cH);if(ct&&cI&&cI.type){return false}if(T.isLinkElement(cH)&&T.hasNodeAttributeWithValue(cH,"href")){var cB=String(T.getAttributeValueFromNode(cH,"href"));if(0===cB.indexOf("#")){return false}if(ay(cB)){return true}if(!o.isUrlToCurrentDomain(cB)){return false}var cF=o.buildContentBlock(cE);if(!cF){return}var cD=cF.name;var cJ=cF.piece;var cG=cF.target;if(!T.hasNodeAttributeWithValue(cH,o.CONTENT_TARGET_ATTR)||cH.wasContentTargetAttrReplaced){cH.wasContentTargetAttrReplaced=true;cG=o.toAbsoluteUrl(cB);T.setAnyAttribute(cH,o.CONTENT_TARGET_ATTR,cG)}var cC=ca(cB,"click",cD,cJ,cG);o.setHrefAttribute(cH,cC);return true}return false}function aq(cC){if(!cC||!cC.length){return}var cB;for(cB=0;cB<cC.length;cB++){bb(cC[cB])}}function aC(cB){return function(cC){if(!cB){return}var cF=o.findParentContentNode(cB);var cG;if(cC){cG=cC.target||cC.srcElement}if(!cG){cG=cB}if(!aO(cF,cG)){return}bL(bf);if(T.isLinkElement(cB)&&T.hasNodeAttributeWithValue(cB,"href")&&T.hasNodeAttributeWithValue(cB,o.CONTENT_TARGET_ATTR)){var cD=T.getAttributeValueFromNode(cB,"href");
+if(!ay(cD)&&cB.wasContentTargetAttrReplaced){T.setAnyAttribute(cB,o.CONTENT_TARGET_ATTR,"")}}var cK=cv(cB);if(aa&&cK&&cK.type){return cK.type}if(bb(cF)){return"href"}var cH=o.buildContentBlock(cF);if(!cH){return}var cE=cH.name;var cL=cH.piece;var cJ=cH.target;var cI=at("click",cE,cL,cJ);bc(cI,bf);return cI}}function bw(cD){if(!cD||!cD.length){return}var cB,cC;for(cB=0;cB<cD.length;cB++){cC=o.findTargetNode(cD[cB]);if(cC&&!cC.contentInteractionTrackingSetupDone){cC.contentInteractionTrackingSetupDone=true;Y(cC,"click",aC(cC))}}}function a6(cD,cE){if(!cD||!cD.length){return[]}var cB,cC;for(cB=0;cB<cD.length;cB++){if(aA(cD[cB])){cD.splice(cB,1);cB--}else{bF.push(cD[cB])}}if(!cD||!cD.length){return[]}aq(cE);bw(cE);var cF=[];for(cB=0;cB<cD.length;cB++){cC=bW(o.buildImpressionRequestParams(cD[cB].name,cD[cB].piece,cD[cB].target),undefined,"contentImpressions");cF.push(cC)}return cF}function b1(cC){var cB=o.collectContent(cC);return a6(cB,cC)}function aM(cC){if(!cC||!cC.length){return[]}var cB;
+for(cB=0;cB<cC.length;cB++){if(!o.isNodeVisible(cC[cB])){cC.splice(cB,1);cB--}}if(!cC||!cC.length){return[]}return b1(cC)}function al(cD,cB,cC){var cE=o.buildImpressionRequestParams(cD,cB,cC);return bW(cE,null,"contentImpression")}function cw(cE,cC){if(!cE){return}var cB=o.findParentContentNode(cE);var cD=o.buildContentBlock(cB);if(!cD){return}if(!cC){cC="Unknown"}return at(cC,cD.name,cD.piece,cD.target)}function cc(cC,cE,cB,cD){return"e_c="+m(cC)+"&e_a="+m(cE)+(z(cB)?"&e_n="+m(cB):"")+(z(cD)?"&e_v="+m(cD):"")}function ae(cD,cF,cB,cE,cG){if(String(cD).length===0||String(cF).length===0){return false}var cC=bW(cc(cD,cF,cB,cE),cG,"event");bc(cC,bf)}function bE(cB,cE,cC,cF){var cD=bW("search="+m(cB)+(cE?"&search_cat="+m(cE):"")+(z(cC)?"&search_count="+cC:""),cF,"sitesearch");bc(cD,bf)}function cg(cB,cE,cD){var cC=bW("idgoal="+cB+(cE?"&revenue="+cE:""),cD,"goal");bc(cC,bf)}function cn(cE,cB,cI,cH,cD){var cG=cB+"="+m(bx(cE));var cC=bY(cD,"click",cE);if(cC){cG+="&"+cC}var cF=bW(cG,cI,"link");bc(cF,(cH?0:bf),cH)
+}function bp(cC,cB){if(cC!==""){return cC+cB.charAt(0).toUpperCase()+cB.slice(1)}return cB}function bM(cG){var cF,cB,cE=["","webkit","ms","moz"],cD;if(!aS){for(cB=0;cB<cE.length;cB++){cD=cE[cB];if(Object.prototype.hasOwnProperty.call(x,bp(cD,"hidden"))){if(x[bp(cD,"visibilityState")]==="prerender"){cF=true}break}}}if(cF){Y(x,cD+"visibilitychange",function cC(){x.removeEventListener(cD+"visibilitychange",cC,false);cG()});return}cG()}function ao(cB){if(x.readyState==="complete"){cB()}else{if(J.addEventListener){J.addEventListener("load",cB)}else{if(J.attachEvent){J.attachEvent("onLoad",cB)}}}}function aP(cC){var cB=false;if(x.attachEvent){cB=x.readyState==="complete"}else{cB=x.readyState!=="loading"}if(cB){cC()}else{if(x.addEventListener){x.addEventListener("DOMContentLoaded",cC)}else{if(x.attachEvent){x.attachEvent("onreadystatechange",cC)}}}}function b7(cB){var cC=cv(cB);if(cC&&cC.type){cC.href=j(cC.href);cn(cC.href,cC.type,undefined,null,cB)}}function b0(){return x.all&&!x.addEventListener
+}function ci(cB){var cD=cB.which;var cC=(typeof cB.button);if(!cD&&cC!=="undefined"){if(b0()){if(cB.button&1){cD=1}else{if(cB.button&2){cD=3}else{if(cB.button&4){cD=2}}}}else{if(cB.button===0||cB.button==="0"){cD=1}else{if(cB.button&1){cD=2}else{if(cB.button&2){cD=3}}}}}return cD}function bo(cB){switch(ci(cB)){case 1:return"left";case 2:return"middle";case 3:return"right"}}function aE(cB){return cB.target||cB.srcElement}function ah(cB){return function(cE){cE=cE||J.event;var cD=bo(cE);var cF=aE(cE);if(cE.type==="click"){var cC=false;if(cB&&cD==="middle"){cC=true}if(cF&&!cC){b7(cF)}}else{if(cE.type==="mousedown"){if(cD==="middle"&&cF){av=cD;a9=cF}else{av=a9=null}}else{if(cE.type==="mouseup"){if(cD===av&&cF===a9){b7(cF)}av=a9=null}else{if(cE.type==="contextmenu"){b7(cF)}}}}}}function ab(cC,cB){Y(cC,"click",ah(cB),false);if(cB){Y(cC,"mouseup",ah(cB),false);Y(cC,"mousedown",ah(cB),false);Y(cC,"contextmenu",ah(cB),false)}}function ba(cC){if(!aa){aa=true;var cD,cB=aD(a8,"ignore"),cE=x.links;if(cE){for(cD=0;
+cD<cE.length;cD++){if(!cB.test(cE[cD].className)){ab(cE[cD],cC)}}}}}function aw(cD,cF,cG){if(bK){return true}bK=true;var cH=false;var cE,cC;function cB(){cH=true}ao(function(){function cI(cK){setTimeout(function(){if(!bK){return}cH=false;cG.trackVisibleContentImpressions();cI(cK)},cK)}function cJ(cK){setTimeout(function(){if(!bK){return}if(cH){cH=false;cG.trackVisibleContentImpressions()}cJ(cK)},cK)}if(cD){cE=["scroll","resize"];for(cC=0;cC<cE.length;cC++){if(x.addEventListener){x.addEventListener(cE[cC],cB)}else{J.attachEvent("on"+cE[cC],cB)}}cJ(100)}if(cF&&cF>0){cF=parseInt(cF,10);cI(cF)}})}function aL(cF,cH){var cG=bP(cF);var cE=bP(cH);if(!cG||cG==="/"||!cE||cE==="/"){return}var cD=B(cF);if(ac(cD,"/")){return}if(co(cG,"/")){cG=aQ(cG,1)}var cI=cG.split("/");var cC;for(cC=2;cC<cI.length;cC++){var cB=cI.slice(0,cC).join("/");if(ac(cD,cB)){cG=cB;break}}if(!aG(cE,cG)){return}return cG}function b5(){var cD,cF,cG={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"},cC=J.devicePixelRatio||1;
+if(!((new RegExp("MSIE")).test(e.userAgent))){if(e.mimeTypes&&e.mimeTypes.length){for(cD in cG){if(Object.prototype.hasOwnProperty.call(cG,cD)){cF=e.mimeTypes[cG[cD]];cs[cD]=(cF&&cF.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&z(e.javaEnabled)&&e.javaEnabled()){cs.java="1"}if(s(J.GearsFactory)){cs.gears="1"}cs.cookie=bA()}var cE=parseInt(N.width,10)*cC;var cB=parseInt(N.height,10)*cC;cs.res=parseInt(cE,10)+"x"+parseInt(cB,10)}b5();aT();ap();return{getVisitorId:function(){return aB().uuid},getVisitorInfo:function(){return cb()},getAttributionInfo:function(){return bi()},getAttributionCampaignName:function(){return bi()[0]},getAttributionCampaignKeyword:function(){return bi()[1]},getAttributionReferrerTimestamp:function(){return bi()[2]},getAttributionReferrerUrl:function(){return bi()[3]},setTrackerUrl:function(cB){aj=cB},getTrackerUrl:function(){return aj},getSiteId:function(){return bB},setSiteId:function(cB){by(cB)},setUserId:function(cB){if(!z(cB)||!cB.length){return
+}a7=cB;bk=bC(a7).substr(0,16)},getUserId:function(){return a7},setCustomData:function(cB,cC){if(M(cB)){Z=cB}else{if(!Z){Z={}}Z[cB]=cC}},getCustomData:function(){return Z},setCustomRequestProcessing:function(cB){bG=cB},appendToTrackingUrl:function(cB){cl=cB},getRequest:function(cB){return bW(cB)},addPlugin:function(cB,cC){a[cB]=cC},setCustomDimension:function(cB,cC){cB=parseInt(cB,10);if(cB>0){if(!z(cC)){cC=""}if(!p(cC)){cC=String(cC)}aX[cB]=cC}},getCustomDimension:function(cB){cB=parseInt(cB,10);if(cB>0&&Object.prototype.hasOwnProperty.call(aX,cB)){return aX[cB]}},deleteCustomDimension:function(cB){cB=parseInt(cB,10);if(cB>0){delete aX[cB]}},setCustomVariable:function(cC,cB,cF,cD){var cE;if(!z(cD)){cD="visit"}if(!z(cB)){return}if(!z(cF)){cF=""}if(cC>0){cB=!p(cB)?String(cB):cB;cF=!p(cF)?String(cF):cF;cE=[cB.slice(0,a3),cF.slice(0,a3)];if(cD==="visit"||cD===2){b4();au[cC]=cE}else{if(cD==="page"||cD===3){br[cC]=cE}else{if(cD==="event"){bQ[cC]=cE}}}}},getCustomVariable:function(cC,cD){var cB;
+if(!z(cD)){cD="visit"}if(cD==="page"||cD===3){cB=br[cC]}else{if(cD==="event"){cB=bQ[cC]}else{if(cD==="visit"||cD===2){b4();cB=au[cC]}}}if(!z(cB)||(cB&&cB[0]==="")){return false}return cB},deleteCustomVariable:function(cB,cC){if(this.getCustomVariable(cB,cC)){this.setCustomVariable(cB,"","",cC)}},storeCustomVariablesInCookie:function(){bm=true},setLinkTrackingTimer:function(cB){bf=cB},setDownloadExtensions:function(cB){if(p(cB)){cB=cB.split("|")}cr=cB},addDownloadExtensions:function(cC){var cB;if(p(cC)){cC=cC.split("|")}for(cB=0;cB<cC.length;cB++){cr.push(cC[cB])}},removeDownloadExtensions:function(cD){var cC,cB=[];if(p(cD)){cD=cD.split("|")}for(cC=0;cC<cr.length;cC++){if(C(cD,cr[cC])===-1){cB.push(cr[cC])}}cr=cB},setDomains:function(cB){af=p(cB)?[cB]:cB;var cD=false,cC;for(cC in af){if(Object.prototype.hasOwnProperty.call(af,cC)&&b6(ch,B(String(af[cC])))){cD=true;if(!a0){var cE=aL(af[cC],bj);if(cE){this.setCookiePath(cE)}break}}}if(!cD){af.push(ch)}},setIgnoreClasses:function(cB){a8=p(cB)?[cB]:cB
+},setRequestMethod:function(cB){cu=cB||bN},setRequestContentType:function(cB){bZ=cB||an},setReferrerUrl:function(cB){aY=cB},setCustomUrl:function(cB){aH=bq(bj,cB)},setDocumentTitle:function(cB){aU=cB},setAPIUrl:function(cB){be=cB},setDownloadClasses:function(cB){bh=p(cB)?[cB]:cB},setLinkClasses:function(cB){aK=p(cB)?[cB]:cB},setCampaignNameKey:function(cB){bV=p(cB)?[cB]:cB},setCampaignKeywordKey:function(cB){bd=p(cB)?[cB]:cB},discardHashTag:function(cB){bl=cB},setCookieNamePrefix:function(cB){aV=cB;au=bs()},setCookieDomain:function(cB){var cC=B(cB);if(a5(cC)){cj=cC;aT()}},setCookiePath:function(cB){a0=cB;aT()},setVisitorCookieTimeout:function(cB){b9=cB*1000},setSessionCookieTimeout:function(cB){bT=cB*1000},setReferralCookieTimeout:function(cB){cq=cB*1000},setConversionAttributionFirstReferrer:function(cB){a4=cB},disableCookies:function(){aW=true;cs.cookie="0";if(bB){ak()}},deleteCookies:function(){ak()},setDoNotTrack:function(cC){var cB=e.doNotTrack||e.msDoNotTrack;cd=cC&&(cB==="yes"||cB==="1");
+if(cd){this.disableCookies()}},addListener:function(cC,cB){ab(cC,cB)},enableLinkTracking:function(cB){ct=true;if(r){ba(cB)}else{H.push(function(){ba(cB)})}},enableJSErrorTracking:function(){if(cf){return}cf=true;var cB=J.onerror;J.onerror=function(cG,cE,cD,cF,cC){bM(function(){var cH="JavaScript Errors";var cI=cE+":"+cD;if(cF){cI+=":"+cF}ae(cH,cI,cG)});if(cB){return cB(cG,cE,cD,cF,cC)}return false}},disablePerformanceTracking:function(){aF=false},setGenerationTimeMs:function(cB){bR=parseInt(cB,10)},enableHeartBeatTimer:function(cB){cB=Math.max(cB,1);aI=(cB||15)*1000;if(ck!==null){cz()}},killFrame:function(){if(J.location!==J.top.location){J.top.location=J.location}},redirectFile:function(cB){if(J.location.protocol==="file:"){J.location=cB}},setCountPreRendered:function(cB){aS=cB},trackGoal:function(cB,cD,cC){bM(function(){cg(cB,cD,cC)})},trackLink:function(cC,cB,cE,cD){bM(function(){cn(cC,cB,cE,cD)})},trackPageView:function(cB,cC){bF=[];if(D(bB)){bM(function(){P(aj,be,bB)})}else{bM(function(){bv(cB,cC)
+})}},trackAllContentImpressions:function(){if(D(bB)){return}bM(function(){aP(function(){var cB=o.findContentNodes();var cC=b1(cB);cy(cC,bf)})})},trackVisibleContentImpressions:function(cB,cC){if(D(bB)){return}if(!z(cB)){cB=true}if(!z(cC)){cC=750}aw(cB,cC,this);bM(function(){ao(function(){var cD=o.findContentNodes();var cE=aM(cD);cy(cE,bf)})})},trackContentImpression:function(cD,cB,cC){if(D(bB)){return}if(!cD){return}cB=cB||"Unknown";bM(function(){var cE=al(cD,cB,cC);bc(cE,bf)})},trackContentImpressionsWithinNode:function(cB){if(D(bB)||!cB){return}bM(function(){if(bK){ao(function(){var cC=o.findContentNodesWithinNode(cB);var cD=aM(cC);cy(cD,bf)})}else{aP(function(){var cC=o.findContentNodesWithinNode(cB);var cD=b1(cC);cy(cD,bf)})}})},trackContentInteraction:function(cD,cE,cB,cC){if(D(bB)){return}if(!cD||!cE){return}cB=cB||"Unknown";bM(function(){var cF=at(cD,cE,cB,cC);bc(cF,bf)})},trackContentInteractionNode:function(cC,cB){if(D(bB)||!cC){return}bM(function(){var cD=cw(cC,cB);bc(cD,bf)})
+},logAllContentBlocksOnPage:function(){var cC=o.findContentNodes();var cB=o.collectContent(cC);if(console!==undefined&&console&&console.log){console.log(cB)}},trackEvent:function(cC,cE,cB,cD,cF){bM(function(){ae(cC,cE,cB,cD,cF)})},trackSiteSearch:function(cB,cD,cC,cE){bM(function(){bE(cB,cD,cC,cE)})},setEcommerceView:function(cE,cB,cD,cC){if(!z(cD)||!cD.length){cD=""}else{if(cD instanceof Array){cD=JSON2.stringify(cD)}}br[5]=["_pkc",cD];if(z(cC)&&String(cC).length){br[2]=["_pkp",cC]}if((!z(cE)||!cE.length)&&(!z(cB)||!cB.length)){return}if(z(cE)&&cE.length){br[3]=["_pks",cE]}if(!z(cB)||!cB.length){cB=""}br[4]=["_pkn",cB]},addEcommerceItem:function(cF,cB,cD,cC,cE){if(cF.length){cm[cF]=[cF,cB,cD,cC,cE]}},trackEcommerceOrder:function(cB,cF,cE,cD,cC,cG){bu(cB,cF,cE,cD,cC,cG)},trackEcommerceCartUpdate:function(cB){a2(cB)}}}function y(){return{push:U}}function b(ae,ad){var af={};var ab,ac;for(ab=0;ab<ad.length;ab++){var Z=ad[ab];af[Z]=1;for(ac=0;ac<ae.length;ac++){if(ae[ac]&&ae[ac][0]){var aa=ae[ac][0];
+if(Z===aa){U(ae[ac]);delete ae[ac];if(af[aa]>1){if(console!==undefined&&console&&console.error){console.error("The method "+aa+' 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')}}af[aa]++}}}}return ae}Y(J,"beforeunload",V,false);q();Date.prototype.getTimeAlias=Date.prototype.getTime;O=new G();var u=["disableCookies","setTrackerUrl","setAPIUrl","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","enableLinkTracking"];_paq=b(_paq,u);for(w=0;w<_paq.length;w++){if(_paq[w]){U(_paq[w])}}_paq=new y();d={addPlugin:function(Z,aa){a[Z]=aa},getTracker:function(Z,aa){if(!z(aa)){aa=this.getAsyncTracker().getSiteId()}if(!z(Z)){Z=this.getAsyncTracker().getTrackerUrl()}return new G(Z,aa)},getAsyncTracker:function(){return O}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return d
+})}return d}())}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=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=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/API.php b/plugins/API/API.php
index 4eab2c63fd7f8c447218580cbcd88b7119a562cf..528d17e8cf115fc92242e9389b08244e03936d0d 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -434,7 +434,21 @@ class API extends \Piwik\Plugin\API
$result = array();
foreach ($urls as $url) {
- $req = new Request($url . '&format=php&serialize=0');
+ $params = Request::getRequestArrayFromString($url . '&format=php&serialize=0');
+
+ if (isset($params['urls']) && $params['urls'] == $urls) {
+ // by default 'urls' is added to $params as Request::getRequestArrayFromString adds all $_GET/$_POST
+ // default parameters
+ unset($params['urls']);
+ }
+
+ if (!empty($params['segment']) && strpos($url, 'segment=') > -1) {
+ // only unsanitize input when segment is actually present in URL, not when it was used from
+ // $defaultRequest in Request::getRequestArrayFromString from $_GET/$_POST
+ $params['segment'] = urlencode(Common::unsanitizeInputValue($params['segment']));
+ }
+
+ $req = new Request($params);
$result[] = $req->process();
}
return $result;
diff --git a/plugins/API/Renderer/Original.php b/plugins/API/Renderer/Original.php
index 33722b7026a38f34292de6c3f2041758d1c35e15..a0730acf2b8719536b9bb83dff75fb91dd212e6b 100644
--- a/plugins/API/Renderer/Original.php
+++ b/plugins/API/Renderer/Original.php
@@ -50,7 +50,9 @@ class Original extends ApiRenderer
public function sendHeader()
{
- Common::sendHeader('Content-Type: text/plain; charset=utf-8');
+ if ($this->shouldSerialize()) {
+ Common::sendHeader('Content-Type: text/plain; charset=utf-8');
+ }
}
/**
diff --git a/plugins/API/SegmentMetadata.php b/plugins/API/SegmentMetadata.php
index caf89b7ea3fa220f109f488789fe5070645147d7..4be514978c2db143d770a35ab02809f6a9e7ceb4 100644
--- a/plugins/API/SegmentMetadata.php
+++ b/plugins/API/SegmentMetadata.php
@@ -101,7 +101,7 @@ class SegmentMetadata
'category' => Piwik::translate('General_Visit'),
'name' => Piwik::translate('General_Visit') . " ID",
'segment' => 'visitId',
- 'acceptedValues' => 'Any integer. ',
+ 'acceptedValues' => 'Any integer.',
'sqlSegment' => 'log_visit.idvisit',
'permission' => $isAuthenticatedWithViewAccess,
);
diff --git a/plugins/API/lang/ar.json b/plugins/API/lang/ar.json
index 0a89babfd4f2a1e7f3913de6c135676288384355..d5396d9aee21bd9630fa75a6bc18e38eef4d4e3f 100644
--- a/plugins/API/lang/ar.json
+++ b/plugins/API/lang/ar.json
@@ -1,12 +1,12 @@
{
"API": {
- "GenerateVisits": "إذا كنت لا تملك بيانات لليوم الØالي، Ùيمكنك أن تنشئ بعض البيانات باستخدام تطبيق %s. يمكنك تÙعيل تطبيق %sØŒ ثم النقر على قائمة \"مولد الزوا\" ÙÙŠ لوØØ© إدارة Piwik.",
- "KeepTokenSecret": "Ù…ÙØªØ§Ø Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© هذا سري كما هو الØال ÙÙŠ اسم المستخدم ولكلمة المرور، %s لا تعطه لأØد قط%s!",
+ "GenerateVisits": "إذا كنت لا تملك بيانات لليوم الØالي، Ùيمكنك أن تنشئ بعض البيانات باستخدام تطبيق %1$s. يمكنك تÙعيل تطبيق %2$sØŒ ثم النقر على قائمة \"مولد الزوا\" ÙÙŠ لوØØ© إدارة Piwik.",
+ "KeepTokenSecret": "Ù…ÙØªØ§Ø Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© هذا سري كما هو الØال ÙÙŠ اسم المستخدم ولكلمة المرور، %1$s لا تعطه لأØد قط%2$s!",
"LoadedAPIs": "تم تØميل %s واجهة تطبيقات.",
- "MoreInformation": "لمزيد من المعلومات Øول واجهة التطبيقات لبرنامج PiwikØŒ الرجاء مراجعة %s مقدمة إلى واجهة تطبيقات Piwik %s وكذلك %sدليل واجهة تطبيقات Piwik %s.",
+ "MoreInformation": "لمزيد من المعلومات Øول واجهة التطبيقات لبرنامج PiwikØŒ الرجاء مراجعة %1$s مقدمة إلى واجهة تطبيقات Piwik %2$s وكذلك %3$sدليل واجهة تطبيقات Piwik %4$s.",
"PluginDescription": "يمكن الØصول على جميع بيانات Piwik عبر واجهات برمجية بسيطة. وهذه الإضاÙØ© هي نقطة بداية خدمة وب يمكنك استدعاؤها للØصول على بيانات تØليلات وب بصيغ xml ØŒ json ØŒ php ØŒ csv وغيرها",
"TopLinkTooltip": "الوصول إلى تØليلات ويب الخاصة بك برمجياً عبر واجهة تطبيقات بسيطة API على شكل json, xml وغيرها.",
"UserAuthentication": "مصادقة المستخدم",
- "UsingTokenAuth": "إذا كنت ترغب ÙÙŠ %s طلب بيانات من خلال نص برمجي أو CrontabØŒ أو غيرها %s ÙستØتاج إلى إضاÙØ© باراميتر %s ÙÙŠ روابط طلبات API والتي تتطلب المصادقة."
+ "UsingTokenAuth": "إذا كنت ترغب ÙÙŠ %1$s طلب بيانات من خلال نص برمجي أو CrontabØŒ أو غيرها %2$s ÙستØتاج إلى إضاÙØ© باراميتر %3$s ÙÙŠ روابط طلبات API والتي تتطلب المصادقة."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/be.json b/plugins/API/lang/be.json
index c93365a068b47c9795d36ae548eb98796dff32a5..bb2846663d7a271299ae2ba765696c7cb1c7b1b0 100644
--- a/plugins/API/lang/be.json
+++ b/plugins/API/lang/be.json
@@ -1,10 +1,10 @@
{
"API": {
- "GenerateVisits": "Калі Ñž Ð²Ð°Ñ Ð½Ñма дадзеных на ÑённÑшні дзень, вы можаце Ñтварыць Ð½ÐµÐºÐ°Ñ‚Ð¾Ñ€Ñ‹Ñ Ð´Ð°Ð´Ð·ÐµÐ½Ñ‹Ñ, выкарыÑтоўваючы даданы модуль %s. Уключыце даданы модуль %s, затым націÑніце на \"Генератар наведваннÑÑž\" у адмініÑтрацыйнай чаÑтцы Piwik.",
- "KeepTokenSecret": "ГÑта ідÑнтыфікацыйны токÑн, ён такі жа ÑакрÑтны, Ñк ваш лагін Ñ– пароль, %s не дзеліцеÑÑ Ñ–Ð¼ Ð½Ñ Ð· кім%s!",
+ "GenerateVisits": "Калі Ñž Ð²Ð°Ñ Ð½Ñма дадзеных на ÑённÑшні дзень, вы можаце Ñтварыць Ð½ÐµÐºÐ°Ñ‚Ð¾Ñ€Ñ‹Ñ Ð´Ð°Ð´Ð·ÐµÐ½Ñ‹Ñ, выкарыÑтоўваючы даданы модуль %1$s. Уключыце даданы модуль %2$s, затым націÑніце на \"Генератар наведваннÑÑž\" у адмініÑтрацыйнай чаÑтцы Piwik.",
+ "KeepTokenSecret": "ГÑта ідÑнтыфікацыйны токÑн, ён такі жа ÑакрÑтны, Ñк ваш лагін Ñ– пароль, %1$s не дзеліцеÑÑ Ñ–Ð¼ Ð½Ñ Ð· кім%2$s!",
"LoadedAPIs": "%s API паÑпÑхова загружаны",
- "MoreInformation": "Ð”Ð°Ð´Ð°Ñ‚ÐºÐ¾Ð²Ñ‹Ñ Ð·Ð²ÐµÑткі аб Piwik API, калі лаÑка, звÑрніце ўвагу на %s Уводзіны Ñž Piwik API %s Ñ– %s Piwik API ÑпаÑылкі %s.",
+ "MoreInformation": "Ð”Ð°Ð´Ð°Ñ‚ÐºÐ¾Ð²Ñ‹Ñ Ð·Ð²ÐµÑткі аб Piwik API, калі лаÑка, звÑрніце ўвагу на %1$s Уводзіны Ñž Piwik API %2$s Ñ– %3$s Piwik API ÑпаÑылкі %4$s.",
"UserAuthentication": "ÐўтÑÐ½Ñ‚Ñ‹Ñ„Ñ–ÐºÐ°Ñ†Ñ‹Ñ ÐºÐ°Ñ€Ñ‹Ñтальніка",
- "UsingTokenAuth": "Калі вы жадаеце %s запытаць Ð´Ð°Ð´Ð·ÐµÐ½Ñ‹Ñ Ñž рамках Ñкрыпта, кронтаба Ñ– г.д. %s. Вам патрабуецца дадаць параметр %s да API каб выклікаць URL-адраÑоў, ÑÐºÑ–Ñ Ð¿Ð°Ñ‚Ñ€Ð°Ð±ÑƒÑŽÑ†ÑŒ праверкі ÑапраўднаÑці."
+ "UsingTokenAuth": "Калі вы жадаеце %1$s запытаць Ð´Ð°Ð´Ð·ÐµÐ½Ñ‹Ñ Ñž рамках Ñкрыпта, кронтаба Ñ– г.д. %2$s. Вам патрабуецца дадаць параметр %3$s да API каб выклікаць URL-адраÑоў, ÑÐºÑ–Ñ Ð¿Ð°Ñ‚Ñ€Ð°Ð±ÑƒÑŽÑ†ÑŒ праверкі ÑапраўднаÑці."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/bg.json b/plugins/API/lang/bg.json
index fd377bf4a3416ee86d8e641fc198f6f7f97e91f3..360fb546cf4bbbf092bf4fa4d761e8117d17eec3 100644
--- a/plugins/API/lang/bg.json
+++ b/plugins/API/lang/bg.json
@@ -1,11 +1,11 @@
{
"API": {
- "GenerateVisits": "Ðко не разполагате Ñ Ð´Ð°Ð½Ð½Ð¸ за Ð´Ð½ÐµÑ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ да генерирате такива Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰Ñ‚Ð° на добавката %s. Вие можете да активирате добавката %s, Ñлед което натиÑнете на „Генератор на поÑещениÑ“, намиращ Ñе в менюто на админиÑтраторÑката Ñреда на Piwik.",
- "KeepTokenSecret": "Това token_auth е тайна, като Вашето потребителÑко име и парола, %s не го ÑподелÑйте%s!",
+ "GenerateVisits": "Ðко не разполагате Ñ Ð´Ð°Ð½Ð½Ð¸ за Ð´Ð½ÐµÑ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ да генерирате такива Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰Ñ‚Ð° на добавката %1$s. Вие можете да активирате добавката %2$s, Ñлед което натиÑнете на „Генератор на поÑещениÑ“, намиращ Ñе в менюто на админиÑтраторÑката Ñреда на Piwik.",
+ "KeepTokenSecret": "Това token_auth е тайна, като Вашето потребителÑко име и парола, %1$s не го ÑподелÑйте%2$s!",
"LoadedAPIs": "УÑпешно заредени %s API-та",
- "MoreInformation": "За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Piwik API-тата, Ð¼Ð¾Ð»Ñ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ‚Ðµ %s Въведение в Piwik API%s и %s Piwik API Референт%s.",
+ "MoreInformation": "За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Piwik API-тата, Ð¼Ð¾Ð»Ñ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð½ÐµÑ‚Ðµ %1$s Въведение в Piwik API%2$s и %3$s Piwik API Референт%4$s.",
"TopLinkTooltip": "ИнформациÑта за уеб анализите може да бъде доÑтъпена чрез проÑÑ‚ приложно-програмен Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð² json, xml и др. формат.",
"UserAuthentication": "УдоÑтоверÑване на потребителÑ",
- "UsingTokenAuth": "Ðко иÑкате да %s вмъкнете данните ÑÑŠÑ Ñкрипт, crontab, др. %s Ñ‚Ñ€Ñбва да добавите параметър %s на API кода за Ð¿Ð¾Ð²Ð¸ÐºÐ²Ð°Ð½Ð¸Ñ Ð½Ð° URL адреÑи, които изиÑкват удоÑтоверÑване."
+ "UsingTokenAuth": "Ðко иÑкате да %1$s вмъкнете данните ÑÑŠÑ Ñкрипт, crontab, др. %2$s Ñ‚Ñ€Ñбва да добавите параметър %3$s на API кода за Ð¿Ð¾Ð²Ð¸ÐºÐ²Ð°Ð½Ð¸Ñ Ð½Ð° URL адреÑи, които изиÑкват удоÑтоверÑване."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/bs.json b/plugins/API/lang/bs.json
index 282c1167fc79100981d3580a5f3f8072b73bc816..c4af484c2f116e2df22a6656762a0c56aec0f432 100644
--- a/plugins/API/lang/bs.json
+++ b/plugins/API/lang/bs.json
@@ -1,7 +1,7 @@
{
"API": {
- "GenerateVisits": "Ako nemate podataka za danas onda možete prvo generisati neke podatke sa dodatkom %s. Ovo možete uraditi ako ukljuÄite dodatak %s i zatim kliknete na 'ProizvoÄ‘aÄ posjetilaca' u meniju koja se nalazi u Piwik adminskom prostoru.",
- "KeepTokenSecret": "Ovaj token_auth je povjerljiv podatak poput vaÅ¡eg korisniÄkog imena i lozine. %s Nemojte ga dijeliti sa drugima%s!",
+ "GenerateVisits": "Ako nemate podataka za danas onda možete prvo generisati neke podatke sa dodatkom %1$s. Ovo možete uraditi ako ukljuÄite dodatak %2$s i zatim kliknete na 'ProizvoÄ‘aÄ posjetilaca' u meniju koja se nalazi u Piwik adminskom prostoru.",
+ "KeepTokenSecret": "Ovaj token_auth je povjerljiv podatak poput vaÅ¡eg korisniÄkog imena i lozine. %1$s Nemojte ga dijeliti sa drugima%2$s!",
"LoadedAPIs": "UspjeÅ¡no uÄitani %s API(-ovi)"
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/ca.json b/plugins/API/lang/ca.json
index 74d13ad58c3a35c5dd3908a2fadb17819e595a6a..4222e8869e33d00c38c531315cfd11e378949d67 100644
--- a/plugins/API/lang/ca.json
+++ b/plugins/API/lang/ca.json
@@ -1,11 +1,11 @@
{
"API": {
- "GenerateVisits": "Si no disposeu d'informació d'avui podeu generar informació utilitzant l'extensió: %s. Heu d'activar l'extensió %s i desprès anar al menú 'Generador de visites' de l'espai d'administració del Piwik.",
- "KeepTokenSecret": "El token_auth es tan secret com el vostre usuari i la vostra contrasenya, %s no compartiu el seu %s!",
+ "GenerateVisits": "Si no disposeu d'informació d'avui podeu generar informació utilitzant l'extensió: %1$s. Heu d'activar l'extensió %2$s i desprès anar al menú 'Generador de visites' de l'espai d'administració del Piwik.",
+ "KeepTokenSecret": "El token_auth es tan secret com el vostre usuari i la vostra contrasenya, %1$s no compartiu el seu %2$s!",
"LoadedAPIs": "S'ha carregat correctament un total de %s API",
- "MoreInformation": "Per mes informació sobre les APIs de Piwik, siusplau reviseu %s Introducció a l'API de Piwik %s i %s la Referència de l'API de Piwik %s.",
+ "MoreInformation": "Per mes informació sobre les APIs de Piwik, siusplau reviseu %1$s Introducció a l'API de Piwik %2$s i %3$s la Referència de l'API de Piwik %4$s.",
"TopLinkTooltip": "Accediu a la vostra informació de l'anà lisis Web d'una forma programada a través d'una API simple en json, xml, etc.",
"UserAuthentication": "Autentificació de l'usuari",
- "UsingTokenAuth": "Si voleu %s obtenir informació a través d'un script, un crontab, etc %s heu d'afegir el parà metre %s a les crides a la APU per les URLs que requereixen autentificació."
+ "UsingTokenAuth": "Si voleu %1$s obtenir informació a través d'un script, un crontab, etc %2$s heu d'afegir el parà metre %3$s a les crides a la APU per les URLs que requereixen autentificació."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/cs.json b/plugins/API/lang/cs.json
index 32d7dcba79c2b72f79151ebe7724e86488e2baf1..8ff3f774effff1c0f019a0b69b777a6c829f7e98 100644
--- a/plugins/API/lang/cs.json
+++ b/plugins/API/lang/cs.json
@@ -1,15 +1,15 @@
{
"API": {
- "GenerateVisits": "Pokud pro dneÅ¡ek nemáte data, můžete je nejprve vygenerovat pomocà zásuvného modulu %s. Můžete povolit zásuvný modul %s a poté kliknout na 'Generátor návÅ¡tÄ›v' v menu v administraÄnà Äásti Piwiku",
- "KeepTokenSecret": "Tento token_auth je tajný jako vaÅ¡e uživatelské jméno a heslo, %s neÅ™Ãkejte jej nikomu jinému %s!",
+ "GenerateVisits": "Pokud pro dneÅ¡ek nemáte data, můžete je nejprve vygenerovat pomocà zásuvného modulu %1$s. Můžete povolit zásuvný modul %2$s a poté kliknout na 'Generátor návÅ¡tÄ›v' v menu v administraÄnà Äásti Piwiku",
+ "KeepTokenSecret": "Tento token_auth je tajný jako vaÅ¡e uživatelské jméno a heslo, %1$s neÅ™Ãkejte jej nikomu jinému %2$s!",
"LoadedAPIs": "ÚspěšnÄ› naÄteno %s API",
- "MoreInformation": "Pro vÃce informacà o API Piwiku se podÃvejte na %s Úvod do API Piwiku %s a %s Referenci API Piwiku %s",
+ "MoreInformation": "Pro vÃce informacà o API Piwiku se podÃvejte na %1$s Úvod do API Piwiku %2$s a %3$s Referenci API Piwiku %4$s",
"PluginDescription": "VÅ¡echna data v Piwiku jsou dostupná pomocà jednoduchých API. Tento zásuvný modul je vstupnÃm bodem tÄ›chto webových služeb, který vám umožňuje zÃskat vaÅ¡e analytická data jako XML, JSON, CSV, PHP atd.",
"ReportingApiReference": "Reference API hlášenÃ",
"TopLinkTooltip": "ZpÅ™ÃstupnÄ›te svoje Webové analýzy programovÄ› skrze jednoduché API pomocà json, xml a dalÅ¡Ãch.",
"UserAuthentication": "Autentifikace uživatele",
- "UsingTokenAuth": "Pokud chcete %s naÄÃst data ze skriptu, cronu, atd. %s PotÅ™ebujete pÅ™idat parametr %s k volánÃm API, které vyžadujà pÅ™ihlášenÃ",
+ "UsingTokenAuth": "Pokud chcete %1$s naÄÃst data ze skriptu, cronu, atd. %2$s PotÅ™ebujete pÅ™idat parametr %3$s k volánÃm API, které vyžadujà pÅ™ihlášenÃ",
"Glossary": "Glosář",
- "LearnAboutCommonlyUsedTerms": "ZjistÄ›te vÃc o nejÄastÄ›jÅ¡Ãch termÃnech, abyste mohli využÃt Piwik naplno %s a %s."
+ "LearnAboutCommonlyUsedTerms": "ZjistÄ›te vÃc o nejÄastÄ›jÅ¡Ãch termÃnech, abyste mohli využÃt Piwik naplno %1$s a %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/da.json b/plugins/API/lang/da.json
index ecb8ddd6fca37f6534ac5911cfbd86adf146896b..701cfc28b67229c09c75cb927e2a87335a753942 100644
--- a/plugins/API/lang/da.json
+++ b/plugins/API/lang/da.json
@@ -1,12 +1,12 @@
{
"API": {
- "GenerateVisits": "Hvis du ikke har data for i dag ,kan du generere nogle data ved hjælp af %s programudvidelsen. Aktiver %s programudvidelsen, og klik derefter på 'Besøgsgenerator' i menuen under indstillinger.",
- "KeepTokenSecret": "Token_auth er ligeså hemmeligt som brugernavn og adgangskode, %sdel det ikke ud%s!",
+ "GenerateVisits": "Hvis du ikke har data for i dag ,kan du generere nogle data ved hjælp af %1$s programudvidelsen. Aktiver %2$s programudvidelsen, og klik derefter på 'Besøgsgenerator' i menuen under indstillinger.",
+ "KeepTokenSecret": "Token_auth er ligeså hemmeligt som brugernavn og adgangskode, %1$sdel det ikke ud%2$s!",
"LoadedAPIs": "%s APIs indlæst",
- "MoreInformation": "Mere information om Piwik API'er, findes på %sIntroduktion til Piwik API%s og %sPiwik API Reference%s.",
+ "MoreInformation": "Mere information om Piwik API'er, findes på %1$sIntroduktion til Piwik API%2$s og %3$sPiwik API Reference%4$s.",
"PluginDescription": "Alle data i Piwik er tilgængelig gennem enkle API'er. Denne udvidelse er en webservice indgang, som kaldes for at få Web Analytics-data i xml, JSON, php, csv etc.",
"TopLinkTooltip": "Få adgang til dine webanalyse data programmeringsmæssigt gennem en simpel API i JSON, XML, etc.",
"UserAuthentication": "Brugergodkendelse",
- "UsingTokenAuth": "Hvis du ønsker at %s hente data i et script, med crontab, m.m. %s skal du tilføje parameteren %s til API-kaldes netadresse, som kræver godkendelse."
+ "UsingTokenAuth": "Hvis du ønsker at %1$s hente data i et script, med crontab, m.m. %2$s skal du tilføje parameteren %3$s til API-kaldes netadresse, som kræver godkendelse."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/de.json b/plugins/API/lang/de.json
index 4dc1428c0a3aa086bba554a22bc15548c76976e4..7ad2ec2d1c4145128d3dc521b87ceb3ba08810b3 100644
--- a/plugins/API/lang/de.json
+++ b/plugins/API/lang/de.json
@@ -1,15 +1,15 @@
{
"API": {
- "GenerateVisits": "Sollten für heute keine Daten verfügbar sein, so können Sie mit dem %s Plugin Testdaten erzeugen. Aktivieren Sie das %s Plugin und klicken dann auf das 'Besuchergenerator' Menu in der Piwik-Administration.",
- "KeepTokenSecret": "Der token_auth ist so geheim wie Ihr Login und Passwort, %s teilen Sie es niemandem mit%s!",
+ "GenerateVisits": "Sollten für heute keine Daten verfügbar sein, so können Sie mit dem %1$s Plugin Testdaten erzeugen. Aktivieren Sie das %2$s Plugin und klicken dann auf das 'Besuchergenerator' Menu in der Piwik-Administration.",
+ "KeepTokenSecret": "Der token_auth ist so geheim wie Ihr Login und Passwort, %1$s teilen Sie es niemandem mit%2$s!",
"LoadedAPIs": "%s APIs erfolgreich geladen",
- "MoreInformation": "Für weitere Informationen über die Piwik-APIs lesen Sie bitte %s Einführung in die Piwik-API %s und die %s Piwik-API-Referenz %s.",
+ "MoreInformation": "Für weitere Informationen über die Piwik-APIs lesen Sie bitte %1$s Einführung in die Piwik-API %2$s und die %3$s Piwik-API-Referenz %4$s.",
"PluginDescription": "Alle Daten in Piwik sind über einfache APIs verfügbar. Dieses Plugin ist der Web Service Eingangspunkt, welchen Sie nutzen können um Daten der Webanalyse in XML, JSON, PHP, CSV usw. abzufragen.",
"ReportingApiReference": "Reporting-API-Referenz",
"TopLinkTooltip": "Greife auf die Webanalytikdaten über eine einfache API mit json, xml, usw. zu.",
"UserAuthentication": "Benutzerauthentifizierung",
- "UsingTokenAuth": "Wenn Sie %s Daten mit einem Script, einem Crontab, etc. abrufen wollen, %s müssen Sie den Parameter %s an die URLs anhängen, deren API-Aufrufe eine Authentifizierung benötigen.",
+ "UsingTokenAuth": "Wenn Sie %1$s Daten mit einem Script, einem Crontab, etc. abrufen wollen, %2$s müssen Sie den Parameter %3$s an die URLs anhängen, deren API-Aufrufe eine Authentifizierung benötigen.",
"Glossary": "Glossar",
- "LearnAboutCommonlyUsedTerms": "Lernen Sie mehr über die häufig verwendeten Begriffe um das Beste aus Ihren Piwik Analysen zu machen: %s und %s"
+ "LearnAboutCommonlyUsedTerms": "Lernen Sie mehr über die häufig verwendeten Begriffe um das Beste aus Ihren Piwik Analysen zu machen: %1$s und %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/el.json b/plugins/API/lang/el.json
index 5b0bbfd872899566d9f2d0f256d5dccd58db51cf..ab3782857040baf5a687adab37195aa054d93ae5 100644
--- a/plugins/API/lang/el.json
+++ b/plugins/API/lang/el.json
@@ -1,15 +1,15 @@
{
"API": {
- "GenerateVisits": "Αν δεν Îχετε δεδομÎνα για σήμεÏα μποÏείτε να δημιουÏγήσετε χÏησιμοποιώντας το Ï€Ïόσθετο %s. ΜποÏείτε να ενεÏγοποιήσετε το Ï€Ïόσθετο %s, μετά να επιλÎξετε το Î¼ÎµÎ½Î¿Ï Â«Î Î±Ïαγωγή Επισκεπτών» στην πεÏιοχή ΔιαχείÏισης του Piwik.",
- "KeepTokenSecret": "Αυτή το πειστήÏιο πιστοποίησης είναι μυστικό το όνομα χÏήστη και ο κωδικός Ï€Ïόσβασης. %s Μη το δημοσιεÏετε%s!",
+ "GenerateVisits": "Αν δεν Îχετε δεδομÎνα για σήμεÏα μποÏείτε να δημιουÏγήσετε χÏησιμοποιώντας το Ï€Ïόσθετο %1$s. ΜποÏείτε να ενεÏγοποιήσετε το Ï€Ïόσθετο %2$s, μετά να επιλÎξετε το Î¼ÎµÎ½Î¿Ï Â«Î Î±Ïαγωγή Επισκεπτών» στην πεÏιοχή ΔιαχείÏισης του Piwik.",
+ "KeepTokenSecret": "Αυτό το token_auth είναι μυστικό όπως και το όνομα χÏήστη και συνθηματικό σας, %1$sγια το λόγο αυτό, μην το δίνετε πουθενά%2$s!",
"LoadedAPIs": "ΦοÏτώθηκαν επιτυχώς %s APIs",
- "MoreInformation": "Για πεÏισσότεÏες πληÏοφοÏίες για τα APIs του Piwik, δείτε την %s ΠαÏουσίαση των API του Piwik %s και την %s ΤεκμηÏίωση των API του Piwik %s.",
+ "MoreInformation": "Για πεÏισσότεÏες πληÏοφοÏίες σχετικά με τα APIs του Piwik, δείτε στην %1$s Εισαγωγή για το Piwik API %2$s και την %3$s ΠαÏαπομπή για το Piwik API %4$s.",
"PluginDescription": "Όλα τα δεδομÎνα στο Piwik είναι διαθÎσιμα μÎσω απλών API. Το Ï€Ïόσθετο αυτό είναι Îνα σημείο εισόδου μιας υπηÏεσίας ιστοÏ, που μποÏείτε να καλείτε για να λαμβάνετε τα δεδομÎνα αναλυτικών σας σε μοÏφή xml, json, php, csv, κτλ.",
"ReportingApiReference": "ΠαÏαπομπή API ΑναφοÏών",
"TopLinkTooltip": "Î Ïοσπελάστε τα δεδομÎνα Στατιστικών Î™ÏƒÏ„Î¿Ï Ï€ÏογÏαμματιστικά μÎσω μιας απλής εφαÏμογής σε json, xml, κλπ.",
"UserAuthentication": "Πιστοποίηση χÏήστη",
- "UsingTokenAuth": "Αν θÎλετε να %s αιτηθείτε δεδομÎνα εντός κώδικα, Îνα crontab, κλπ. %s Ï€ÏÎπει να Ï€ÏοσθÎσετε την παÏάμετÏο %s στο API που καλεί URLs που απαιτοÏν πιστοποίηση.",
+ "UsingTokenAuth": "Αν θÎλετε να %1$s ζητήσετε δεδομÎνα από Îνα σενάÏιο, μια εÏγασία crontab, κτλ. %2$s χÏειάζεται να Ï€ÏοσθÎσετε την παÏάμετÏο %3$s στα URLs των κλήσεων API που απαιτοÏν αυθεντικοποίηση.",
"Glossary": "ΓλωσσάÏι",
- "LearnAboutCommonlyUsedTerms": "Μάθετε για συχνά χÏησιμοποιοÏμενους ÏŒÏους για να λάβετε τα μÎγιστα από τα αναλυτικά του Piwik: %s και %s."
+ "LearnAboutCommonlyUsedTerms": "Δείτε πεÏισσότεÏα σχετικά με συχνά χÏησιμοποιοÏμενους ÏŒÏους για να εκμεταλλευτείτε στο ÎπακÏο το Piwik Analytics: %1$s και %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/en.json b/plugins/API/lang/en.json
index 57ef19aa29e553f715bd0000e5956f4b27a98a0f..95152566a2fe77f9a2318e23907b54d0b38174cf 100644
--- a/plugins/API/lang/en.json
+++ b/plugins/API/lang/en.json
@@ -1,15 +1,15 @@
{
"API": {
- "GenerateVisits": "If you don't have data for today you can first generate some data using the %s plugin. You can enable the %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, %s do not share it%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",
- "MoreInformation": "For more information about the Piwik APIs, please have a look at the %s Introduction to Piwik API %s and the %s Piwik API Reference %s.",
+ "MoreInformation": "For more information about the Piwik APIs, please have a look at the %1$s Introduction to Piwik API %2$s and the %3$s Piwik API Reference %4$s.",
"PluginDescription": "All the data in Piwik is available through simple APIs. This plugin is the web service entry point, that you can call to get your Web Analytics data in xml, json, php, csv, etc.",
"ReportingApiReference": "Reporting API Reference",
"TopLinkTooltip": "Access your Web Analytics data programmatically through a simple API in json, xml, etc.",
"UserAuthentication": "User authentication",
- "UsingTokenAuth": "If you want to %s request data within a script, a crontab, etc. %s you need to add the parameter %s to the API calls URLs that require authentication.",
+ "UsingTokenAuth": "If you want to %1$s request data within a script, a crontab, etc. %2$s you need to add the parameter %3$s to the API calls URLs that require authentication.",
"Glossary": "Glossary",
- "LearnAboutCommonlyUsedTerms": "Learn about the commonly used terms to make the most of Piwik Analytics: %s and %s."
+ "LearnAboutCommonlyUsedTerms": "Learn about the commonly used terms to make the most of Piwik Analytics: %1$s and %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/es.json b/plugins/API/lang/es.json
index 47cc18999a4c772ba7144dd6d67eec4ad2be8049..ee7308033f39975f7369fb92cafa171220aa7d21 100644
--- a/plugins/API/lang/es.json
+++ b/plugins/API/lang/es.json
@@ -1,13 +1,13 @@
{
"API": {
- "GenerateVisits": "Si no tiene los datos de hoy puede generar primero algunos datos mediante el complemento %s. Puede habilitar el complemento %s, a continuación, haga clic en el menú 'Generador de Visitas' en la area Administrativa de Piwik.",
- "KeepTokenSecret": "Este token_auth es tan secreto como su nombre de usuario y contraseña, %s no lo comparta %s!",
+ "GenerateVisits": "Si no tiene los datos de hoy puede generar primero algunos datos mediante el complemento %1$s. Puede habilitar el complemento %2$s, a continuación, haga clic en el menú 'Generador de Visitas' en la area Administrativa de Piwik.",
+ "KeepTokenSecret": "Este token_auth es tan secreto como su nombre de usuario y contraseña, %1$s no lo comparta %2$s!",
"LoadedAPIs": "Se han cargado %s APIs exitosamente",
- "MoreInformation": "Para mayor información acerca de las APIs de Piwik, por favor lea la %s Introducción a las API Piwik %s y la %s Referencia de las API Piwik %s.",
+ "MoreInformation": "Para mayor información acerca de las APIs de Piwik, por favor lea la %1$s Introducción a las API Piwik %2$s y la %3$s Referencia de las API Piwik %4$s.",
"PluginDescription": "Toda la información en Piwik está disponible a través de simples APIs. Este complemento es el punto de entrada del servicio de internet, al que puede convocar para obtener la información analÃtica de internet en formato xml, json, php, csv, etc.",
"ReportingApiReference": "Informando Referencia API",
"TopLinkTooltip": "Acceda a sus datos de análisis de internet programáticamente, a través de una sencilla API en json, xml, etc.",
"UserAuthentication": "Autenticación de usuario",
- "UsingTokenAuth": "Si quieres %s solicitar datos dentro de un script, un crontab, etc. %s tiene que agregar el parámetro %s a las llamadas a la URL de la API que requieren autenticación."
+ "UsingTokenAuth": "Si quieres %1$s solicitar datos dentro de un script, un crontab, etc. %2$s tiene que agregar el parámetro %3$s a las llamadas a la URL de la API que requieren autenticación."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/et.json b/plugins/API/lang/et.json
index 00540812d35b516e3265eabd9c7315018b75f1e1..253cdf805374b212bf63c7beff0e871dee07e785 100644
--- a/plugins/API/lang/et.json
+++ b/plugins/API/lang/et.json
@@ -1,7 +1,7 @@
{
"API": {
"LoadedAPIs": "Edukalt laetud %s API-id",
- "MoreInformation": "Et saada rohkem infot Piwiku API-st, vaata %sPiwiku API tutvustus%s ja %sPiwiku API juhend%s.",
+ "MoreInformation": "Et saada rohkem infot Piwiku API-st, vaata %1$sPiwiku API tutvustus%2$s ja %3$sPiwiku API juhend%4$s.",
"UserAuthentication": "Kasutaja autentimine"
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/fa.json b/plugins/API/lang/fa.json
index e58a66014dea6868404b75e38e02bccb1a07e92e..3ac3cbe52b6625630bb6aa46692bbcb182a3bbb2 100644
--- a/plugins/API/lang/fa.json
+++ b/plugins/API/lang/fa.json
@@ -1,6 +1,6 @@
{
"API": {
- "KeepTokenSecret": "این token_auth برای رمزعبور و ورود شما مثل یک راز است , %s آن را به کسی نگویید %s!",
+ "KeepTokenSecret": "این token_auth برای رمزعبور و ورود شما مثل یک راز است , %1$s آن را به کسی نگویید %2$s!",
"LoadedAPIs": "API های %s با موÙقیت بارگزاری شدند",
"TopLinkTooltip": "با استÙاده از یک API ساده به اطلاعات آماری وب خود از طریق کدنویسی در Ùرمت های json Ùˆ xml Ùˆ غیره دسترسی پیدا کنید.",
"UserAuthentication": "تأیید هویت کاربر"
diff --git a/plugins/API/lang/fi.json b/plugins/API/lang/fi.json
index 4a139d5480a86916b711de7de71f7af59022fa89..22e886ce2c93d0a24747452adbba80474218a5f2 100644
--- a/plugins/API/lang/fi.json
+++ b/plugins/API/lang/fi.json
@@ -1,11 +1,11 @@
{
"API": {
- "GenerateVisits": "Jos sinulla ei ole yhtään tietoja tälle päivälle, voit generoida satunnaisia tietoja käyttämällä lisäosaa %s. Voit ottaa käyttöön %s-lisäosan ja painaa 'Vierailijoiden luominen'-linkkiä Piwikin ylläpitosivulla.",
- "KeepTokenSecret": "Tämä token_auth on yhtä salainen kuin salasanasi, %s älä jaa sitä%s!",
+ "GenerateVisits": "Jos sinulla ei ole yhtään tietoja tälle päivälle, voit generoida satunnaisia tietoja käyttämällä lisäosaa %1$s. Voit ottaa käyttöön %2$s-lisäosan ja painaa 'Vierailijoiden luominen'-linkkiä Piwikin ylläpitosivulla.",
+ "KeepTokenSecret": "Tämä token_auth on yhtä salainen kuin salasanasi, %1$s älä jaa sitä%2$s!",
"LoadedAPIs": "Ladattiin %s APIa",
- "MoreInformation": "Lisätietoa Piwikin APIsta löytyy sivulta %sJohdatus Piwikin APIin%s ja %sPiwikin API%s.",
+ "MoreInformation": "Lisätietoa Piwikin APIsta löytyy sivulta %1$sJohdatus Piwikin APIin%2$s ja %3$sPiwikin API%4$s.",
"TopLinkTooltip": "Hae analytiikkatietoja automaattisesti yksinkertaisella API:lla JSON:lla, XML:llä jne.",
"UserAuthentication": "Käyttäjän autentikointi",
- "UsingTokenAuth": "Jos haluat %s hakea tietoja skriptillä, crontabista jne. %s sinun täytyy lisätä parametri %s API-kutsujen osoitteisiin, jos kutsu vaatii autentikoinnin."
+ "UsingTokenAuth": "Jos haluat %1$s hakea tietoja skriptillä, crontabista jne. %2$s sinun täytyy lisätä parametri %3$s API-kutsujen osoitteisiin, jos kutsu vaatii autentikoinnin."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/fr.json b/plugins/API/lang/fr.json
index e6584e230279d2e8deda080e930efd42483bb424..b9358e562aeee4e3d4b25539ba8a4a3d949a6b6d 100644
--- a/plugins/API/lang/fr.json
+++ b/plugins/API/lang/fr.json
@@ -1,15 +1,15 @@
{
"API": {
- "GenerateVisits": "Si vous n'avez pas de données pour aujourd'hui vous pouvez en générer en utilisant le plugin %s. Vous pouvez activer le plugin %s puis cliquer sur le menu 'Générateur de visites' dans la zone d'administration de Piwik.",
- "KeepTokenSecret": "Cette clef partagée (tocken_auth) est aussi secrète que votre login et mot de passe, %s ne la partagez pas%s !",
+ "GenerateVisits": "Si vous n'avez pas de données pour aujourd'hui vous pouvez en générer en utilisant le plugin %1$s. Vous pouvez activer le plugin %2$s puis cliquer sur le menu 'Générateur de visites' dans la zone d'administration de Piwik.",
+ "KeepTokenSecret": "Cette clef partagée (tocken_auth) est aussi secrète que votre login et mot de passe, %1$s ne la partagez pas%2$s !",
"LoadedAPIs": "%s API chargées avec succès",
- "MoreInformation": "Pour plus d'informations à propos de l'API de Piwik, merci de visiter %s l'introduction à Piwik %s et %s la référence de l'API Piwik %s.",
+ "MoreInformation": "Pour plus d'informations à propos de l'API de Piwik, merci de visiter %1$s l'introduction à Piwik %2$s et %3$s la référence de l'API Piwik %4$s.",
"PluginDescription": "Toutes les données de Piwik sont disponibles via des API simples. Ce composant est le service web que vous pouvez appeler afin d'obtenir vos données d'analyse web en xml, json, php, csv, etc",
"ReportingApiReference": "Référence de l'API de rapports",
"TopLinkTooltip": "Accédez à vos données de statistiques web depuis votre code via une API simple en JSON, XML, Etc.",
"UserAuthentication": "Authentification de l'utilisateur",
- "UsingTokenAuth": "Si vous souhaitez %s récupérer des données depuis un script, un crontab, etc %s vous devez ajouter le paramètre %s aux appels d'URLs de l'API qui requièrent une authentification.",
+ "UsingTokenAuth": "Si vous souhaitez %1$s récupérer des données depuis un script, un crontab, etc %2$s vous devez ajouter le paramètre %3$s aux appels d'URLs de l'API qui requièrent une authentification.",
"Glossary": "Glossaire",
- "LearnAboutCommonlyUsedTerms": "En savoir plus sur les termes les plus couramment utilisés composant principalement Piwik Analytics : %s et %s."
+ "LearnAboutCommonlyUsedTerms": "En savoir plus sur les termes les plus couramment utilisés composant principalement Piwik Analytics : %1$s et %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/he.json b/plugins/API/lang/he.json
index b50010c028bc29b432cc9165a1dc579f5ebe7948..41b265ad7eb7a2485b013c3d1071b48db8a39ae1 100644
--- a/plugins/API/lang/he.json
+++ b/plugins/API/lang/he.json
@@ -1,10 +1,10 @@
{
"API": {
- "GenerateVisits": "×× ×ין לך מידע ×œ×”×™×•× × ×™×ª×Ÿ ×§×•×“× ×›×œ לחולל מידע בעזרת התוסף %s. × ×™×ª×Ÿ להפעיל ×ת התוסף %s, ול×חר מכן לחולל מידע על ×ž×‘×§×¨×™× ×“×¨×š פ×× ×œ ×”× ×™×”×•×œ של Piwik.",
- "KeepTokenSecret": "×”token_auth סודי ביותר כמו ×©× ×”×ž×©×ª×ž×© והסיסמה, %s ×ין לשתף ××£ ×חד ×‘×¤×¨×˜×™× ×לו%s!",
+ "GenerateVisits": "×× ×ין לך מידע ×œ×”×™×•× × ×™×ª×Ÿ ×§×•×“× ×›×œ לחולל מידע בעזרת התוסף %1$s. × ×™×ª×Ÿ להפעיל ×ת התוסף %2$s, ול×חר מכן לחולל מידע על ×ž×‘×§×¨×™× ×“×¨×š פ×× ×œ ×”× ×™×”×•×œ של Piwik.",
+ "KeepTokenSecret": "×”token_auth סודי ביותר כמו ×©× ×”×ž×©×ª×ž×© והסיסמה, %1$s ×ין לשתף ××£ ×חד ×‘×¤×¨×˜×™× ×לו%2$s!",
"LoadedAPIs": "%s API×™× × ×˜×¢× ×• בהצלחה",
- "MoreInformation": "למידע × ×•×¡×£ עבור ×”API×™× ×©×œ Piwik, מומלץ להציץ ב%sהיכרות ×¢× ×”API של Piwik%s ×•×’× ×‘%sהעמקה ×ודות ×”API של Piwik%s.",
+ "MoreInformation": "למידע × ×•×¡×£ עבור ×”API×™× ×©×œ Piwik, מומלץ להציץ ב%1$sהיכרות ×¢× ×”API של Piwik%2$s ×•×’× ×‘%3$sהעמקה ×ודות ×”API של Piwik%4$s.",
"UserAuthentication": "×ימות משתמש",
- "UsingTokenAuth": "×× ×‘×¨×¦×•× ×š %s לדרוש מידע מתוך סקריטפ, עבודה ×›×¨×•× ×™×ª וכד' %s יש צורך להוסיף ×ת הפרמטר %s לכל קרי×ת API מהURL×™× ×©×“×•×¨×©×™× ×ימות."
+ "UsingTokenAuth": "×× ×‘×¨×¦×•× ×š %1$s לדרוש מידע מתוך סקריטפ, עבודה ×›×¨×•× ×™×ª וכד' %2$s יש צורך להוסיף ×ת הפרמטר %3$s לכל קרי×ת API מהURL×™× ×©×“×•×¨×©×™× ×ימות."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/hi.json b/plugins/API/lang/hi.json
index d27c777ecc19c3eb3285e477b36f4ffbdf62fce0..4fa94cedaf8446000dce9e8f741e066ccbf7f2fb 100644
--- a/plugins/API/lang/hi.json
+++ b/plugins/API/lang/hi.json
@@ -1,11 +1,11 @@
{
"API": {
- "GenerateVisits": "आप आज के लिठडेटा नहीं है, तो आप पहले %s पà¥à¤²à¤—इन का उपयोग कर कà¥à¤› डेटा उतà¥à¤ªà¤¨à¥à¤¨ कर सकते हैं. आप %s पà¥à¤²à¤—इन सकà¥à¤·à¤® कर सकते हैं, तो Piwik वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤• कà¥à¤·à¥‡à¤¤à¥à¤° में 'आगंतà¥à¤• जेनरेटर' मेनू पर कà¥à¤²à¤¿à¤• करें.",
- "KeepTokenSecret": "इस टोकन पà¥à¤°à¤®à¤¾à¤£à¤¨ अपने लॉगिन और पासवरà¥à¤¡ के रूप में गà¥à¤ªà¥à¤¤ रूप है, %s %s यह साà¤à¤¾ नहीं करते हैं!",
+ "GenerateVisits": "आप आज के लिठडेटा नहीं है, तो आप पहले %1$s पà¥à¤²à¤—इन का उपयोग कर कà¥à¤› डेटा उतà¥à¤ªà¤¨à¥à¤¨ कर सकते हैं. आप %2$s पà¥à¤²à¤—इन सकà¥à¤·à¤® कर सकते हैं, तो Piwik वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤• कà¥à¤·à¥‡à¤¤à¥à¤° में 'आगंतà¥à¤• जेनरेटर' मेनू पर कà¥à¤²à¤¿à¤• करें.",
+ "KeepTokenSecret": "इस टोकन पà¥à¤°à¤®à¤¾à¤£à¤¨ अपने लॉगिन और पासवरà¥à¤¡ के रूप में गà¥à¤ªà¥à¤¤ रूप है, %1$s %2$s यह साà¤à¤¾ नहीं करते हैं!",
"LoadedAPIs": "सफलतापूरà¥à¤µà¤• लोड %s à¤à¤ªà¥€à¤†à¤ˆ",
- "MoreInformation": "Piwik à¤à¤ªà¥€à¤†à¤ˆ के बारे में अधिक जानकारी के लिà¤,कृपया %s Piwik à¤à¤ªà¥€à¤†à¤ˆ %s और %s Piwik à¤à¤ªà¥€à¤†à¤ˆ संदरà¥à¤ %s के परिचय पर à¤à¤• नजर डाले",
+ "MoreInformation": "Piwik à¤à¤ªà¥€à¤†à¤ˆ के बारे में अधिक जानकारी के लिà¤,कृपया %1$s Piwik à¤à¤ªà¥€à¤†à¤ˆ %2$s और %3$s Piwik à¤à¤ªà¥€à¤†à¤ˆ संदरà¥à¤ %4$s के परिचय पर à¤à¤• नजर डाले",
"TopLinkTooltip": "Json, xml, आदि में à¤à¤• सरल à¤à¤ªà¥€à¤†à¤ˆ के माधà¥à¤¯à¤® से पà¥à¤°à¥‹à¤—à¥à¤°à¤¾à¤® के रूप में अपने वेब विशà¥à¤²à¥‡à¤·à¤¿à¤•à¥€ डेटा का उपयोग करे",
"UserAuthentication": "पà¥à¤°à¤¯à¥‹à¤—करà¥à¤¤à¤¾ का पà¥à¤°à¤¾à¤®à¤¾à¤£à¥€à¤•à¤°à¤£",
- "UsingTokenAuth": "आप à¤à¤• सà¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿ के à¤à¥€à¤¤à¤° %s डेटा, à¤à¤• crontab, आदि %s के लिठअनà¥à¤°à¥‹à¤§ करना चाहते हैं तो पà¥à¤°à¤®à¤¾à¤£à¥€à¤•à¤°à¤£ की आवशà¥à¤¯à¤•à¤¤à¤¾ है कि यूआरà¤à¤² कॉल आप à¤à¤ªà¥€à¤†à¤ˆ के लिठपैरामीटर %s जोड़ने की जरूरत है."
+ "UsingTokenAuth": "आप à¤à¤• सà¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿ के à¤à¥€à¤¤à¤° %1$s डेटा, à¤à¤• crontab, आदि %2$s के लिठअनà¥à¤°à¥‹à¤§ करना चाहते हैं तो पà¥à¤°à¤®à¤¾à¤£à¥€à¤•à¤°à¤£ की आवशà¥à¤¯à¤•à¤¤à¤¾ है कि यूआरà¤à¤² कॉल आप à¤à¤ªà¥€à¤†à¤ˆ के लिठपैरामीटर %3$s जोड़ने की जरूरत है."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/hr.json b/plugins/API/lang/hr.json
index 6e330d757df167c6b494563e9123e7f523ca5dc8..79ce0cfb92271ad20e1a01b0e742073264e58a76 100644
--- a/plugins/API/lang/hr.json
+++ b/plugins/API/lang/hr.json
@@ -1,6 +1,6 @@
{
"API": {
- "GenerateVisits": "Ako ne postoje podaci za danas, možete ih kreirati pomoću %s plugina. Prvo ukljuÄite %s plugin, zatim koristite opciju 'Kreiraj posjetitelje' u izborniku Piwik administracije.",
+ "GenerateVisits": "Ako ne postoje podaci za danas, možete ih kreirati pomoću %1$s plugina. Prvo ukljuÄite %2$s plugin, zatim koristite opciju 'Kreiraj posjetitelje' u izborniku Piwik administracije.",
"LoadedAPIs": "%s API je uspjeÅ¡no uÄitan"
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/hu.json b/plugins/API/lang/hu.json
index c4b053a7f3f602372c99d9bd143242df3e13dd40..2465af69db61c38859afc257dbdc632cea8cf6d8 100644
--- a/plugins/API/lang/hu.json
+++ b/plugins/API/lang/hu.json
@@ -1,10 +1,10 @@
{
"API": {
- "GenerateVisits": "Ha nem volt még ma látogató, automatikusan generálhatsz mintaadatokat a %s kiegészÃtÅ‘ segÃtségével. A %s kiegészÃtÅ‘t a Piwik adminisztrációs felületén megjelenÅ‘ Látogatógenerálás menüpontra kattintva engedélyezheted.",
- "KeepTokenSecret": "Ez a token_auth nevű kód pontosan annyira érzékeny adat mint a felhasználói neved és jelszavad, ezért %s ne oszd meg mindenkivel%s!",
+ "GenerateVisits": "Ha nem volt még ma látogató, automatikusan generálhatsz mintaadatokat a %1$s kiegészÃtÅ‘ segÃtségével. A %2$s kiegészÃtÅ‘t a Piwik adminisztrációs felületén megjelenÅ‘ Látogatógenerálás menüpontra kattintva engedélyezheted.",
+ "KeepTokenSecret": "Ez a token_auth nevű kód pontosan annyira érzékeny adat mint a felhasználói neved és jelszavad, ezért %1$s ne oszd meg mindenkivel%2$s!",
"LoadedAPIs": "A(z) %s API sikeresen betöltődött.",
- "MoreInformation": "További információkért a Piwik API-kkal kapcsolatban kérjük, tekintse meg a %s Introduction to Piwik API %s és a %s Piwik API Reference %s cÃmű leÃrásokat.",
+ "MoreInformation": "További információkért a Piwik API-kkal kapcsolatban kérjük, tekintse meg a %1$s Introduction to Piwik API %2$s és a %3$s Piwik API Reference %4$s cÃmű leÃrásokat.",
"UserAuthentication": "Felhasználó autentikációja",
- "UsingTokenAuth": "Ha azt szeretné, hogy a %s külsÅ‘ alkalmazás adatot kérjen a szkripten belül, a crontab segÃtségével, stb. %s hozzá kell adnia a %s paramétert az API hÃvásoknál használt URL-ekhez, ha autentikáció szükséges számukra."
+ "UsingTokenAuth": "Ha azt szeretné, hogy a %1$s külsÅ‘ alkalmazás adatot kérjen a szkripten belül, a crontab segÃtségével, stb. %2$s hozzá kell adnia a %3$s paramétert az API hÃvásoknál használt URL-ekhez, ha autentikáció szükséges számukra."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/id.json b/plugins/API/lang/id.json
index 681bc8e37b8a12a04c83ff58a72d9442ed1ffee0..138242ef3f745bdbf69076340db0d7984f82f12f 100644
--- a/plugins/API/lang/id.json
+++ b/plugins/API/lang/id.json
@@ -1,11 +1,11 @@
{
"API": {
- "GenerateVisits": "Bila Anda tidak memiliki data untuk hari ini, Anda dapat membuat beberapa menggunakan pengaya %s. Anda dapat mengaktifkan pengaya %s, lalu klik menu 'Pembangkit Kunjungan' di halaman Pengurus Piwik.",
- "KeepTokenSecret": "token_auth ini merupakan hal yang rahasia sebagaimana nama-id dan sandi Anda, %s sehingga jangan memberitahukannya%s!",
+ "GenerateVisits": "Bila Anda tidak memiliki data untuk hari ini, Anda dapat membuat beberapa menggunakan pengaya %1$s. Anda dapat mengaktifkan pengaya %2$s, lalu klik menu 'Pembangkit Kunjungan' di halaman Pengurus Piwik.",
+ "KeepTokenSecret": "token_auth ini merupakan hal yang rahasia sebagaimana nama-id dan sandi Anda, %1$s sehingga jangan memberitahukannya%2$s!",
"LoadedAPIs": "Berhasil memuat API %s",
- "MoreInformation": "Untuk informasi selengkapnya tentang API Piwik, silakan melihat %s Pengenalan API Piwik%s dan %sReferensi API Piwik%s.",
+ "MoreInformation": "Untuk informasi selengkapnya tentang API Piwik, silakan melihat %1$s Pengenalan API Piwik%2$s dan %3$sReferensi API Piwik%4$s.",
"TopLinkTooltip": "Akses data Analisis Ramatraya terprogram melalui API sederhana dalam json, xml, dan lain lain.",
"UserAuthentication": "Otentikasi pengguna",
- "UsingTokenAuth": "Jika Anda ingin melakukan permintaan data %s menggunakan skrip, crontab, dll. %s Anda harus menambah parameter %s agar API memanggil URL yang membutuhkan otentikasi."
+ "UsingTokenAuth": "Jika Anda ingin melakukan permintaan data %1$s menggunakan skrip, crontab, dll. %2$s Anda harus menambah parameter %3$s agar API memanggil URL yang membutuhkan otentikasi."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/it.json b/plugins/API/lang/it.json
index a365bd298a97c3546dbfab9ad27cd6c8a4fe3f63..624a780cb799281f48b0f5f463dd495d98636a3e 100644
--- a/plugins/API/lang/it.json
+++ b/plugins/API/lang/it.json
@@ -1,15 +1,15 @@
{
"API": {
- "GenerateVisits": "Se oggi non hai ricevuto visite, le puoi generare usando il plugin %s. Abilita il plugin %s, quindi clicca su \"Generatore di Visite\" nell'area amministrazione Piwik.",
- "KeepTokenSecret": "Questo token_auth è segreto come il tuo login e la tua password, %s non condividerlo %s!",
+ "GenerateVisits": "Se oggi non hai ricevuto visite, le puoi generare usando il plugin %1$s. Abilita il plugin %2$s, quindi clicca su \"Generatore di Visite\" nell'area amministrazione Piwik.",
+ "KeepTokenSecret": "Questo token_auth è segreto come il tuo login e la tua password, %1$s non condividerlo %2$s!",
"LoadedAPIs": "Sono state caricate con successo %s API",
- "MoreInformation": "Per ulteriori informazioni sulle API di Piwik, si prega di dare un'occhiata all'introduzione delle API di Pwik %s e a %s %s Piwik API di riferimento API %s.",
+ "MoreInformation": "Per ulteriori informazioni sulle API di Piwik, si prega di dare un'occhiata all'introduzione delle API di Pwik %1$s e a %2$s %3$s Piwik API di riferimento API %4$s.",
"PluginDescription": "Tutti i dati di Piwik sono disponibili tramite semplici API. Questo plugin è la porta d'accesso al servizio web che puoi utilizzare per avere i dati delle tue statistiche web in xml, json, php, csv, ecc.",
"ReportingApiReference": "Segnalazione Riferimenti API",
"TopLinkTooltip": "Accedi ai tuoi dati di Web Analytics tramite le semplici API in JSON, XML, ecc",
"UserAuthentication": "Autenticazione utente",
- "UsingTokenAuth": "Se si vogliono i dati di richiesta %s all'interno di uno script, un crontab, ecc %s è necessario aggiungere il parametro %s per le chiamate API URL che richiedono l'autenticazione.",
+ "UsingTokenAuth": "Se si vogliono i dati di richiesta %1$s all'interno di uno script, un crontab, ecc %2$s è necessario aggiungere il parametro %3$s per le chiamate API URL che richiedono l'autenticazione.",
"Glossary": "Glossario",
- "LearnAboutCommonlyUsedTerms": "Impara i termini comunemente usati per sfruttare al meglio Piwik Analytics: %s e %s."
+ "LearnAboutCommonlyUsedTerms": "Impara i termini comunemente usati per sfruttare al meglio Piwik Analytics: %1$s e %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/ja.json b/plugins/API/lang/ja.json
index f32bf15992133ef40ab447218369c19a8cf3b3e3..b926ec3f5ba38b88993a449214fe7a58267494aa 100644
--- a/plugins/API/lang/ja.json
+++ b/plugins/API/lang/ja.json
@@ -1,15 +1,15 @@
{
"API": {
- "GenerateVisits": "今日ã®ãƒ‡ãƒ¼ã‚¿ãŒãªã„å ´åˆã¯ã€%s プラグインを使用ã—ã¦ã€ã¯ã˜ã‚ã«è‹¥å¹²ã®ãƒ‡ãƒ¼ã‚¿ã‚’生æˆã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ ã“れを行ã†ã«ã¯ã€%s プラグインを有効ã«ã—ã€ç®¡ç†ã‚¨ãƒªã‚¢ã§ 'ビジタージェãƒãƒ¬ãƒ¼ã‚¿' メニューをクリックã—ã¾ã™ã€‚",
- "KeepTokenSecret": "token_auth ã¯ã€ãƒã‚°ã‚¤ãƒ³åã¨ãƒ‘スワードã®ã‚ˆã†ã«ç§˜å¯†ã«ã—ã€%s絶対ã«å…±æœ‰ã—ãªã„ã§ãã ã•ã„%sï¼",
+ "GenerateVisits": "今日ã®ãƒ‡ãƒ¼ã‚¿ãŒãªã„å ´åˆã¯ã€%1$s プラグインを使用ã—ã¦ã€ã¯ã˜ã‚ã«è‹¥å¹²ã®ãƒ‡ãƒ¼ã‚¿ã‚’生æˆã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ ã“れを行ã†ã«ã¯ã€%2$s プラグインを有効ã«ã—ã€ç®¡ç†ã‚¨ãƒªã‚¢ã§ 'ビジタージェãƒãƒ¬ãƒ¼ã‚¿' メニューをクリックã—ã¾ã™ã€‚",
+ "KeepTokenSecret": "token_auth ã¯ã€ãƒã‚°ã‚¤ãƒ³åã¨ãƒ‘スワードã®ã‚ˆã†ã«ç§˜å¯†ã«ã—ã€%1$s絶対ã«å…±æœ‰ã—ãªã„ã§ãã ã•ã„%2$sï¼",
"LoadedAPIs": "%s API ãŒæ£å¸¸ã«èªã¿è¾¼ã¾ã‚Œã¾ã—ãŸ",
- "MoreInformation": "Piwik API ã®è©³ç´°ã«ã¤ã„ã¦ã¯ã€%sIntroduction to Piwik API%s ã‚„ %sPiwik API Reference%s ã‚’å‚ç…§ã—ã¦ãã ã•ã„。",
+ "MoreInformation": "Piwik API ã®è©³ç´°ã«ã¤ã„ã¦ã¯ã€%1$sIntroduction to Piwik API%2$s ã‚„ %3$sPiwik API Reference%4$s ã‚’å‚ç…§ã—ã¦ãã ã•ã„。",
"PluginDescription": "Pwik ã®å…¨ã¦ã®ãƒ‡ãƒ¼ã‚¿ã¯ç°¡å˜ãª API を通ã—ã¦åˆ©ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã®ãƒ—ラグインã¯ã‚¦ã‚§ãƒ–サービスã®å…¥ã‚Šå£ã§ã€xml , json , php , csv ãªã©ã®ã‚ãªãŸã®ã‚¦ã‚§ãƒ–分æžãƒ‡ãƒ¼ã‚¿ã‚’入手ã™ã‚‹ãŸã‚ã«å‘¼ã³å‡ºã™ã“ã¨ãŒã§ãã¾ã™ã€‚",
"ReportingApiReference": "API ãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ã‚’å ±å‘Š",
"TopLinkTooltip": "jsopnã€xmlç‰ã‚·ãƒ³ãƒ—ルãªAPIを介ã—ã¦ã€ãƒ—ãƒã‚°ãƒ©ãƒ ã§åˆ†æžãƒ‡ãƒ¼ã‚¿ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã™",
"UserAuthentication": "ユーザーèªè¨¼",
- "UsingTokenAuth": "%sスクリプト（crontab ç‰ï¼‰ã§ãƒªã‚¯ã‚¨ã‚¹ãƒˆãƒ‡ãƒ¼ã‚¿ã‚’å¾—ãŸã„å ´åˆ%sã¯ã€API をコールã™ã‚‹ URL（èªè¨¼ãŒå¿…è¦ï¼‰ã«ãƒ‘ラメータ %s ã‚’ä»˜åŠ ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚",
+ "UsingTokenAuth": "%1$sスクリプト（crontab ç‰ï¼‰ã§ãƒªã‚¯ã‚¨ã‚¹ãƒˆãƒ‡ãƒ¼ã‚¿ã‚’å¾—ãŸã„å ´åˆ%2$sã¯ã€API をコールã™ã‚‹ URL（èªè¨¼ãŒå¿…è¦ï¼‰ã«ãƒ‘ラメータ %3$s ã‚’ä»˜åŠ ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚",
"Glossary": "用語集",
- "LearnAboutCommonlyUsedTerms": "Piwik Analytics ã®æœ€ã‚‚よã使ã‚れる用語ã«ã¤ã„ã¦: %s 㨠%s"
+ "LearnAboutCommonlyUsedTerms": "Piwik Analytics ã®æœ€ã‚‚よã使ã‚れる用語ã«ã¤ã„ã¦: %1$s 㨠%2$s"
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/ko.json b/plugins/API/lang/ko.json
index b64a0e4b5b6399da7cb8d369a24ceb92078ea10e..afd69e28ec7a1c37fc814aa4bd7aef979284635b 100644
--- a/plugins/API/lang/ko.json
+++ b/plugins/API/lang/ko.json
@@ -1,15 +1,15 @@
{
"API": {
- "GenerateVisits": "ì˜¤ëŠ˜ì— í•´ë‹¹í•˜ëŠ” ë°ì´í„°ê°€ 없는 경우는 %s 플러그ì¸ì„ 사용하여 ì²˜ìŒ ì•½ê°„ì˜ ë°ì´í„°ë¥¼ ìƒì„±í• 수 있습니다. %s 플러그ì¸ì„ í™œì„±í™”í•˜ê³ ê´€ë¦¬ ì˜ì—ì—ì„œ 'ë°©ë¬¸ìž ìƒì„±ê¸°'메뉴를 í´ë¦í•˜ì„¸ìš”.",
- "KeepTokenSecret": "token_auth는 외부 로그ì¸ì„ 위한 비밀키입니다. %s ì ˆëŒ€ë¡œ ê³µìœ í•˜ì§€ 마세요 %s!",
+ "GenerateVisits": "ì˜¤ëŠ˜ì— í•´ë‹¹í•˜ëŠ” ë°ì´í„°ê°€ 없는 경우는 %1$s 플러그ì¸ì„ 사용하여 ì²˜ìŒ ì•½ê°„ì˜ ë°ì´í„°ë¥¼ ìƒì„±í• 수 있습니다. %2$s 플러그ì¸ì„ í™œì„±í™”í•˜ê³ ê´€ë¦¬ ì˜ì—ì—ì„œ 'ë°©ë¬¸ìž ìƒì„±ê¸°'메뉴를 í´ë¦í•˜ì„¸ìš”.",
+ "KeepTokenSecret": "token_auth는 외부 로그ì¸ì„ 위한 비밀키입니다. %1$s ì ˆëŒ€ë¡œ ê³µìœ í•˜ì§€ 마세요 %2$s!",
"LoadedAPIs": "성공ì 으로 %s API를 불러옴",
- "MoreInformation": "Piwik APIì— ëŒ€í•œ ìžì„¸í•œ ë‚´ìš©ì€ %sIntroduction to Piwik API %s 문서와 %sPiwik API Reference%s 문서를 참조하세요.",
+ "MoreInformation": "Piwik APIì— ëŒ€í•œ ìžì„¸í•œ ë‚´ìš©ì€ %1$sIntroduction to Piwik API %2$s 문서와 %3$sPiwik API Reference%4$s 문서를 참조하세요.",
"PluginDescription": "Piwik ë‚´ ëª¨ë“ ë°ì´í„°ëŠ” 간단한 API를 통해서 ì ‘ê·¼í• ìˆ˜ 있습니다. ì´ í”ŒëŸ¬ê·¸ì¸ì€ 웹 ë¶„ì„ ë°ì´í„°ë¥¼ xml, json, php, csv ë“±ì˜ í˜•íƒœë¡œ ë°›ì„ ìˆ˜ 있는 웹 서비스 진입로입니다.",
"ReportingApiReference": "API ë ˆí¼ëŸ°ìŠ¤ ë³´ê³ ",
"TopLinkTooltip": "JSON, XML ë“±ì˜ ê°„ë‹¨í•œ API를 통해 í”„ë¡œê·¸ëž˜ë° ë°©ì‹ìœ¼ë¡œ 웹 로그 ë¶„ì„ ë°ì´í„°ì— ì ‘ê·¼í• ìˆ˜ 있습니다.",
"UserAuthentication": "ì‚¬ìš©ìž ì¸ì¦",
- "UsingTokenAuth": "%s 스í¬ë¦½íŠ¸ (crontab 등)ì—ì„œ ìš”ì² ë°ì´í„°ë¥¼ ì–»ê³ ì‹¶ë‹¤ë©´ %s는 API를 호출하는 URL (ì¸ì¦ í•„ìš”)ì— ë§¤ê°œ 변수 %s를 추가해야합니다.",
+ "UsingTokenAuth": "%1$s 스í¬ë¦½íŠ¸ (crontab 등)ì—ì„œ ìš”ì² ë°ì´í„°ë¥¼ ì–»ê³ ì‹¶ë‹¤ë©´ %2$s는 API를 호출하는 URL (ì¸ì¦ í•„ìš”)ì— ë§¤ê°œ 변수 %3$s를 추가해야합니다.",
"Glossary": "ìš©ì–´",
- "LearnAboutCommonlyUsedTerms": "Piwik 분ì„ì— ìžˆì–´ ìžì£¼ 사용ë˜ëŠ” ìš©ì–´ %s 와 %s 배우기"
+ "LearnAboutCommonlyUsedTerms": "Piwik 분ì„ì— ìžˆì–´ ìžì£¼ 사용ë˜ëŠ” ìš©ì–´ %1$s 와 %2$s 배우기"
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/lt.json b/plugins/API/lang/lt.json
index 44e4d8e79e933bc5b07e271827f99a6e74995719..e391a0181efe19a2a4cae602a5ae48f14ea97355 100644
--- a/plugins/API/lang/lt.json
+++ b/plugins/API/lang/lt.json
@@ -1,10 +1,10 @@
{
"API": {
- "GenerateVisits": "Jei neturite duomenų šiandienai , galite sugeneruoti jų pasinaudoję %s papildiniu. Įjunkite šį %s papildinį, tada spauskite ant 'Apsilankymų generatorius' meniu Piwik administratoriaus srityje.",
- "KeepTokenSecret": "Šis token_auth yra slaptas kaip ir naudotojo vardas bei slaptažodis, %s neviešinkite jo%s!",
+ "GenerateVisits": "Jei neturite duomenų šiandienai , galite sugeneruoti jų pasinaudoję %1$s papildiniu. Įjunkite šį %2$s papildinį, tada spauskite ant 'Apsilankymų generatorius' meniu Piwik administratoriaus srityje.",
+ "KeepTokenSecret": "Šis token_auth yra slaptas kaip ir naudotojo vardas bei slaptažodis, %1$s neviešinkite jo%2$s!",
"LoadedAPIs": "Sėkmingai įkrautos API sąsajos (%s).",
- "MoreInformation": "NorinÄius gauti daugiau informacijos apie Piwik API sÄ…sajas, praÅ¡ome žvilgtelÄ—ti į %s Ä®vadas į Piwik API %s ir %s Piwik API informacija %s.",
+ "MoreInformation": "NorinÄius gauti daugiau informacijos apie Piwik API sÄ…sajas, praÅ¡ome žvilgtelÄ—ti į %1$s Ä®vadas į Piwik API %2$s ir %3$s Piwik API informacija %4$s.",
"UserAuthentication": "Naudotojo autentifikavimas",
- "UsingTokenAuth": "Jei norite %s gauti duomenis scenarijų, crontab ir pan. įrankių pagalba, %s turite pridėti parametrus %s į API užklausų URLs, kurios reikalauja autentifikacijos."
+ "UsingTokenAuth": "Jei norite %1$s gauti duomenis scenarijų, crontab ir pan. įrankių pagalba, %2$s turite pridėti parametrus %3$s į API užklausų URLs, kurios reikalauja autentifikacijos."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/nb.json b/plugins/API/lang/nb.json
index c659502646d916f5ee0df4887303cc3d601acfcd..accf3ecfa404c7bad1d41e1a7b3cc6f9f2edecd1 100644
--- a/plugins/API/lang/nb.json
+++ b/plugins/API/lang/nb.json
@@ -1,15 +1,15 @@
{
"API": {
- "GenerateVisits": "Hvis du ikke har data for i dag kan du først generere noe data med utvidelsen %s. Du kan aktivere %s, så klikker du på «Besøksgenerator»-menyen i Piwik admin.",
- "KeepTokenSecret": "Denne token_auth er like hemmelig som ditt brukernavn og passord. %sIkke del den!%s",
+ "GenerateVisits": "Hvis du ikke har data for i dag kan du først generere noe data med utvidelsen %1$s. Du kan aktivere %2$s, så klikker du på «Besøksgenerator»-menyen i Piwik admin.",
+ "KeepTokenSecret": "Denne token_auth er like hemmelig som ditt brukernavn og passord. %1$sIkke del den!%2$s",
"LoadedAPIs": "Lastet %s API-er",
- "MoreInformation": "For mer informasjon om Piwik API-er, vennligst se på %s Introduction to Piwik API %s og %s Piwik API Reference %s.",
+ "MoreInformation": "For mer informasjon om Piwik API-er, vennligst se på %1$s Introduction to Piwik API %2$s og %3$s Piwik API Reference %4$s.",
"PluginDescription": "Alle data i Piwik er tilgjengelig gjennom enkle API-er. Denne utvidelsen er web-tjenestens inngangspunkt, som du kan kalle opp for å få ut dine data i xml, json, php, csv, etc.",
"ReportingApiReference": "Referanse for rapporterings-API",
"TopLinkTooltip": "FÃ¥ tilgang til dine analysedata programmatisk gjennom en enkel API i json, xml, etc.",
"UserAuthentication": "Brukerautentisering",
- "UsingTokenAuth": "Hvis du vil %s spørre etter data i et script, en crontab, etc. %s må du legge til parameteret %s til API-spørringer som krever autentisering.",
+ "UsingTokenAuth": "Hvis du vil %1$s spørre etter data i et script, en crontab, etc. %2$s må du legge til parameteret %3$s til API-spørringer som krever autentisering.",
"Glossary": "Ordliste",
- "LearnAboutCommonlyUsedTerms": "Lær mer om vanlige termer for å få mest mulig ut av Piwik Analytics: %s og %s."
+ "LearnAboutCommonlyUsedTerms": "Lær mer om vanlige termer for å få mest mulig ut av Piwik Analytics: %1$s og %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/nl.json b/plugins/API/lang/nl.json
index 41bef308076e3971a2cc3016e9ca9d3e2eeb2544..6e4547944dee4f8bc6e992accfc9ca93035f9c8f 100644
--- a/plugins/API/lang/nl.json
+++ b/plugins/API/lang/nl.json
@@ -1,13 +1,13 @@
{
"API": {
- "GenerateVisits": "Als u geen data hebt voor vandaag, kunt u eerst wat data genereren met de %s plugin. U kunt de %s plugin inschakelen, en dan klikken op het Bezoekers generator menu in het Piwik beheer gedeelte.",
- "KeepTokenSecret": "Deze token_auth is even geheim als uw gebruikersnaam en wachtwoord, %sdeel het met niemand%s!",
+ "GenerateVisits": "Als u geen data hebt voor vandaag, kunt u eerst wat data genereren met de %1$s plugin. U kunt de %2$s plugin inschakelen, en dan klikken op het Bezoekers generator menu in het Piwik beheer gedeelte.",
+ "KeepTokenSecret": "Deze token_auth is even geheim als uw gebruikersnaam en wachtwoord, %1$sdeel het met niemand%2$s!",
"LoadedAPIs": "%s API's succesvol geladen",
- "MoreInformation": "Voor meer informatie over de Piwik API's, lees even de %s introductie van de Piwik API %s en de %s Piwik API referenties %s.",
+ "MoreInformation": "Voor meer informatie over de Piwik API's, lees even de %1$s introductie van de Piwik API %2$s en de %3$s Piwik API referenties %4$s.",
"PluginDescription": "Alle data in Piwik is beschikbaar via eenvoudige API's. Deze plugin is het web service contactpunt, waarmee je je Web Analytics data in xml, json, php, csv, etc. kunt verkrijgen.",
"ReportingApiReference": "Rapportage API verwijzing",
"TopLinkTooltip": "Benader je Web Analyse data via een simpele API in josn, xml, enz.",
"UserAuthentication": "Gebruikers authenticatie.",
- "UsingTokenAuth": "Als u data wil %s opvragen via een script, een cronjob, enz. waarvoor authenticatie vereist is, %s moet u de parameter %s aan de API aanvraag URL's toevoegen"
+ "UsingTokenAuth": "Als u data wil %1$s opvragen via een script, een cronjob, enz. waarvoor authenticatie vereist is, %2$s moet u de parameter %3$s aan de API aanvraag URL's toevoegen"
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/pl.json b/plugins/API/lang/pl.json
index 4c0b6f1a6b739ede3ba78cff6a8d4cfe179183f9..0a83b6c205646d9a83c632f5a47eb1bbddcdcc2f 100644
--- a/plugins/API/lang/pl.json
+++ b/plugins/API/lang/pl.json
@@ -1,11 +1,13 @@
{
"API": {
- "GenerateVisits": "Jeżeli nie posiadasz żadnych danych do dnia dzisiejszego, możesz na początek wygenerować trochę symulowanych danych testowych używając wtyczki o nazwie %s. Możesz aktywować i uruchomić wtyczkę %s, a następnie kliknąć w menu przycisk Potwierdź w 'generatorze odwiedzin', w strefie menu Konfiguracja administratora systemu Piwik.",
- "KeepTokenSecret": "Ten token_auth jest tak samo tajny jak twój login i hasło, %s nie upowszechniaj go%s!",
+ "GenerateVisits": "Jeżeli nie posiadasz żadnych danych do dnia dzisiejszego, możesz na początek wygenerować trochę symulowanych danych testowych używając wtyczki o nazwie %1$s. Możesz aktywować i uruchomić wtyczkę %2$s, a następnie kliknąć w menu przycisk Potwierdź w 'generatorze odwiedzin', w strefie menu Konfiguracja administratora systemu Piwik.",
+ "KeepTokenSecret": "Ten token_auth jest tak samo tajny jak twój login i hasło, %1$s nie upowszechniaj go%2$s!",
"LoadedAPIs": "Środowisko API załadowano %s pomyślnie",
- "MoreInformation": "Aby uzyskać więcej informacji o interfejsie API statystyk Piwik, prosimy przeczytać %s Wprowadzenie do interfejsu API w Piwik%s, a także na stronie opracowania %s Piwik API Reference%s.",
+ "MoreInformation": "Aby uzyskać więcej informacji o interfejsie API statystyk Piwik, prosimy przeczytać %1$s Wprowadzenie do interfejsu API w Piwik%2$s, a także na stronie opracowania %3$s Piwik API Reference%4$s.",
+ "PluginDescription": "Wszystkie dane w Piwiku są dostępne poprzez proste API. Ten plugin jest punktem końcowym serwisu web,",
"TopLinkTooltip": "Dostęp do twoich danych analitycznych programistycznie poprzez proste API w formatach json, xml itp.",
"UserAuthentication": "Uwierzytelnianie użytkownika",
- "UsingTokenAuth": "Jeżeli wysuniesz żądanie %s ujęcia pewnych danych w statystyce za pomocą crontab, %s musisz dodać poniższy parametr %s do interfejsu API, wywołując URL-e które wymagają uwierzytelniania."
+ "UsingTokenAuth": "Jeżeli wysuniesz żądanie %1$s ujęcia pewnych danych w statystyce za pomocą crontab, %2$s musisz dodać poniższy parametr %3$s do interfejsu API, wywołując URL-e które wymagają uwierzytelniania.",
+ "Glossary": "SÅ‚ownik"
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/pt-br.json b/plugins/API/lang/pt-br.json
index 930396245f5fb3f7e2848caf0db19a7d5b14d05f..2ab4d322ba1a4190264ec1f814f3a0cc41f224de 100644
--- a/plugins/API/lang/pt-br.json
+++ b/plugins/API/lang/pt-br.json
@@ -1,15 +1,15 @@
{
"API": {
- "GenerateVisits": "Se você não tem nenhum dado hoje, primeiro você pode gerar alguns dados usando o plugin %s. Basta ativar o plugin %s e clicar no menu \"Gerador de Visitantes\" na área de Admin do Piwik.",
- "KeepTokenSecret": "Esse token_auth é tão secreto quanto seu login e sua senha, %s não compartilhe isso %s!",
+ "GenerateVisits": "Se você não tem nenhum dado hoje, primeiro você pode gerar alguns dados usando o plugin %1$s. Basta ativar o plugin %2$s e clicar no menu \"Gerador de Visitantes\" na área de Admin do Piwik.",
+ "KeepTokenSecret": "Esse token_auth é tão secreto quanto seu login e sua senha, %1$s não compartilhe isso %2$s!",
"LoadedAPIs": "%s APIs carregadas com sucesso",
- "MoreInformation": "Para mais informações sobre as APIs Piwik, por favor, dê uma olhada no %s Introdução para Piwik API %s e a %s API Piwik de Referência %s .",
+ "MoreInformation": "Para mais informações sobre as APIs Piwik, por favor, dê uma olhada no %1$s Introdução para Piwik API %2$s e a %3$s API Piwik de Referência %4$s.",
"PluginDescription": "Todos os dados em Piwik estão disponÃveis através da APIs simples. Este plugin é o ponto de entrada do serviço web, que você pode chamar para obter seus dados de Web Analytics em XML, JSON, php, CSV, etc.",
"ReportingApiReference": "Reportando Referência do API",
"TopLinkTooltip": "Acesse seus dados de Análise Web de forma programática através de uma API simples em json, xml, etc.",
"UserAuthentication": "Autenticação de usuário",
- "UsingTokenAuth": "Se você quer %s requisitar dados dentro de um script, um crontab, etc. %s você precisa adicionar o parâmetro %s para a API chamar URLS que requerem autenticação.",
+ "UsingTokenAuth": "Se você quer %1$s requisitar dados dentro de um script, um crontab, etc. %2$s você precisa adicionar o parâmetro %3$s para a API chamar URLS que requerem autenticação.",
"Glossary": "Glossário",
- "LearnAboutCommonlyUsedTerms": "Saiba mais sobre os termos comumente utilizados ​​para tirar o máximo do Piwik Analytics: %s e %s."
+ "LearnAboutCommonlyUsedTerms": "Saiba mais sobre os termos comumente utilizados ​​para tirar o máximo do Piwik Analytics: %1$s e %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/pt.json b/plugins/API/lang/pt.json
index d1717faf1e13a9b2cfc351b15245d8e7468e3579..5531fbad56a0a75ebf1eefa04e146f75a75367cc 100644
--- a/plugins/API/lang/pt.json
+++ b/plugins/API/lang/pt.json
@@ -1,11 +1,11 @@
{
"API": {
- "GenerateVisits": "Se não tiver dados para hoje pode gerar alguns através do plugin %s. Pode activar o plugin %s, e depois clicar no menu 'Gerador de Visitantes' na área de Administração do Piwik.",
- "KeepTokenSecret": "Este token_auth é tão secreto como o seu nome de utilizador e palavra-passe. %s não o partilhe%s!",
+ "GenerateVisits": "Se não tiver dados para hoje pode gerar alguns através do plugin %1$s. Pode activar o plugin %2$s, e depois clicar no menu 'Gerador de Visitantes' na área de Administração do Piwik.",
+ "KeepTokenSecret": "Este token_auth é tão secreto como o seu nome de utilizador e palavra-passe. %1$s não o partilhe%2$s!",
"LoadedAPIs": "%s APIs carregadas com sucesso",
- "MoreInformation": "Para mais informação sobre os APIs de Piwik, por favor dê uma vista de olhos na %s Introdução ao API Piwik %s e a %s Referência do API Piwik %s.",
+ "MoreInformation": "Para mais informação sobre os APIs de Piwik, por favor dê uma vista de olhos na %1$s Introdução ao API Piwik %2$s e a %3$s Referência do API Piwik %4$s.",
"TopLinkTooltip": "Aceda programaticamente à sua informação através de uma simples API em json, xml, etc.",
"UserAuthentication": "Autenticação do utilizador",
- "UsingTokenAuth": "Se quer %s pedir dados através de um script, crontab, etc. %s tem que adicionar o parâmetro %s aos URLs das chamadas do API que necessitam de autenticação."
+ "UsingTokenAuth": "Se quer %1$s pedir dados através de um script, crontab, etc. %2$s tem que adicionar o parâmetro %3$s aos URLs das chamadas do API que necessitam de autenticação."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/ro.json b/plugins/API/lang/ro.json
index 12c2bbb1dabbe8adec77bcea2693ebbe30e99841..673c34dd3dea513b1c1ea7e6f15689b92f316602 100644
--- a/plugins/API/lang/ro.json
+++ b/plugins/API/lang/ro.json
@@ -1,11 +1,11 @@
{
"API": {
- "GenerateVisits": "Daca nu ai date pentru astazi, prima data poti genera date folosind pluginul %s. Poti activa pluginul %s, apoi apasa pe meniul 'Visitor Generator' in aria de administrare Piwik Admin.",
- "KeepTokenSecret": "Acest token_auth este secret cum sunt login-ul si parola, %s nu le fa publice%s!",
+ "GenerateVisits": "Daca nu ai date pentru astazi, prima data poti genera date folosind pluginul %1$s. Poti activa pluginul %2$s, apoi apasa pe meniul 'Visitor Generator' in aria de administrare Piwik Admin.",
+ "KeepTokenSecret": "Acest token_auth este secret cum sunt login-ul si parola, %1$s nu le fa publice%2$s!",
"LoadedAPIs": "%s API-uri încarcate cu succes",
- "MoreInformation": "Pentru mai multe informatii despre API-urile Piwik, va rugam sa va uitati la %s Introducere la Piwik API %s si la %s Referinte Piwik API %s.",
+ "MoreInformation": "Pentru mai multe informatii despre API-urile Piwik, va rugam sa va uitati la %1$s Introducere la Piwik API %2$s si la %3$s Referinte Piwik API %4$s.",
"TopLinkTooltip": "Acceseaza datele tale de Web Analytics in mod organizat prin intermediul unui simplu API in json, xml, etc.",
"UserAuthentication": "Identificare utilizator",
- "UsingTokenAuth": "Daca vrei sa %s preiei date printr-un script, crontab etc. %s este necesar sa adaugi parametrul %s la URL-urile API care cer autentificare."
+ "UsingTokenAuth": "Daca vrei sa %1$s preiei date printr-un script, crontab etc. %2$s este necesar sa adaugi parametrul %3$s la URL-urile API care cer autentificare."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/ru.json b/plugins/API/lang/ru.json
index e8db8ddd877d8bdad272109fce8cfe32d2f3c621..fd5378fa78bb51f35a4b46c92bc38ab81f4279c5 100644
--- a/plugins/API/lang/ru.json
+++ b/plugins/API/lang/ru.json
@@ -1,12 +1,12 @@
{
"API": {
- "GenerateVisits": "ЕÑли у Ð²Ð°Ñ Ð½ÐµÑ‚ данных на ÑегоднÑ, вы можете Ð´Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° Ñгенерировать немного ÑтатиÑтики, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¿Ð»Ð°Ð³Ð¸Ð½: %s. Включите плагин %s, кликните на ’Visitor Generator’ в панели админиÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Piwik.",
- "KeepTokenSecret": "Ðтот token_auth ÑвлÑетÑÑ Ñ‚Ð°ÐºÐ¸Ð¼ же Ñекретным, как ваш логин и пароль. %s ÐЕ СООБЩÐЙТЕ ЕГО ÐИКОМУ%s!",
+ "GenerateVisits": "ЕÑли у Ð²Ð°Ñ Ð½ÐµÑ‚ данных на ÑегоднÑ, вы можете Ð´Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° Ñгенерировать немного ÑтатиÑтики, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¿Ð»Ð°Ð³Ð¸Ð½: %1$s. Включите плагин %2$s, кликните на ’Visitor Generator’ в панели админиÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Piwik.",
+ "KeepTokenSecret": "Ðтот token_auth ÑвлÑетÑÑ Ñ‚Ð°ÐºÐ¸Ð¼ же Ñекретным, как ваш логин и пароль. %1$s ÐЕ СООБЩÐЙТЕ ЕГО ÐИКОМУ%2$s!",
"LoadedAPIs": "%s API уÑпешно загружен",
- "MoreInformation": "Чтобы узнать больше информации о Piwik API, пожалуйÑта, поÑмотрите раздел %s Introduction to Piwik API %s в %s Piwik API Reference %s.",
+ "MoreInformation": "Чтобы узнать больше информации о Piwik API, пожалуйÑта, поÑмотрите раздел %1$s Introduction to Piwik API %2$s в %3$s Piwik API Reference %4$s.",
"PluginDescription": "Ð’Ñе данные из Piwik доÑтупны через проÑтые API. Ðтот плагин ÑвлÑетÑÑ Ð²Ñ…Ð¾Ð´Ð½Ð¾Ð¹ точкой Ð´Ð»Ñ Ð²ÐµÐ± ÑервиÑа, который можно вызвать чтобы получить данные веб аналитики в xml, json, php, csv и др.",
"TopLinkTooltip": "Получайте доÑтуп к вашей веб-аналитике Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ проÑтого API и иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ json, xml и др.",
"UserAuthentication": "ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
- "UsingTokenAuth": "ЕÑли вам необходимо %s запрашивать данные в ваших Ñкриптах, cron-задачах, или другого иÑточника, то вам %s необходимо добавить Ñледующий ключ %s к URL API-вызова, который требует аутентификации."
+ "UsingTokenAuth": "ЕÑли вам необходимо %1$s запрашивать данные в ваших Ñкриптах, cron-задачах, или другого иÑточника, то вам %2$s необходимо добавить Ñледующий ключ %3$s к URL API-вызова, который требует аутентификации."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/sl.json b/plugins/API/lang/sl.json
index 67cdee6d6c645cdf3e5ad5658d381388e8d5bcde..71ea9c7d7488c183ed3dd1ccc42c21c63292e34b 100644
--- a/plugins/API/lang/sl.json
+++ b/plugins/API/lang/sl.json
@@ -1,10 +1,10 @@
{
"API": {
- "GenerateVisits": "ÄŒe nimate danaÅ¡njih podatkov, potem lahko najprej ustvarite nekaj podatkov s %s vtiÄnikom. VtiÄnik %s lahko omogoÄite in nato kliknete na 'Visitor Generator' meni v Piwik administraciji.",
- "KeepTokenSecret": "Ta žeton je skriven, kot vaše uporabniško ime in geslo, %s ne delite ga z drugimi %s!",
+ "GenerateVisits": "ÄŒe nimate danaÅ¡njih podatkov, potem lahko najprej ustvarite nekaj podatkov s %1$s vtiÄnikom. VtiÄnik %2$s lahko omogoÄite in nato kliknete na 'Visitor Generator' meni v Piwik administraciji.",
+ "KeepTokenSecret": "Ta žeton je skriven, kot vaše uporabniško ime in geslo, %1$s ne delite ga z drugimi %2$s!",
"LoadedAPIs": "Uspešno naloženih %s API-jev",
- "MoreInformation": "Za veÄ informacij o Piwik API-ju, si oglejte %sNavodila za uporabo Piwik API-ja %s in %s Piwik API Reference %s.",
+ "MoreInformation": "Za veÄ informacij o Piwik API-ju, si oglejte %1$sNavodila za uporabo Piwik API-ja %2$s in %3$s Piwik API Reference %4$s.",
"UserAuthentication": "Overitev uporabnika",
- "UsingTokenAuth": "Če želite %s zahtevati podatke preko skripte, crontaba, itd. %s potem morate dodati parameter %s v URL API klica za overitev."
+ "UsingTokenAuth": "Če želite %1$s zahtevati podatke preko skripte, crontaba, itd. %2$s potem morate dodati parameter %3$s v URL API klica za overitev."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/sq.json b/plugins/API/lang/sq.json
index 96bf9847c5d5e061355e63d85e3a14ddbb428547..ce3df6871a4ea3affee9c91ef71a5d540aaa499a 100644
--- a/plugins/API/lang/sq.json
+++ b/plugins/API/lang/sq.json
@@ -1,11 +1,11 @@
{
"API": {
- "GenerateVisits": "Nëse nuk keni të dhëna për ditën e sotme, mund të prodhonit ca të dhëna duke përdorur shtojcën %s. Shtojcën %s mund ta aktivizoni, mandej klikoni mbi menunë 'Gjenerator Vizitorësh' te pjesa Përgjegjës Piwik-u.",
- "KeepTokenSecret": "Ky token_auth është po aq i fshehtë sa të dhënat tuaja për hyrjen dhe fjalëkalimi juaj, %s mos ia jepni kujt%s!",
+ "GenerateVisits": "Nëse nuk keni të dhëna për ditën e sotme, mund të prodhonit ca të dhëna duke përdorur shtojcën %1$s. Shtojcën %2$s mund ta aktivizoni, mandej klikoni mbi menunë 'Gjenerator Vizitorësh' te pjesa Përgjegjës Piwik-u.",
+ "KeepTokenSecret": "Ky token_auth është po aq i fshehtë sa të dhënat tuaja për hyrjen dhe fjalëkalimi juaj, %1$s mos ia jepni kujt%2$s!",
"LoadedAPIs": "U ngarkua me sukses API %s",
- "MoreInformation": "Për më tepër të dhëna rreth API-ve të Piwik-ut, ju lutem, hidhini një sy %s Hyrje në API-t e Piwik-ut %s dhe %s Referencë API-sh Piwik-u %s.",
+ "MoreInformation": "Për më tepër të dhëna rreth API-ve të Piwik-ut, ju lutem, hidhini një sy %1$s Hyrje në API-t e Piwik-ut %2$s dhe %3$s Referencë API-sh Piwik-u %4$s.",
"TopLinkTooltip": "Hyni programatikisht te të dhënat tuaja të Analizave Web përmes një API-je të thjeshtë json, xml, etj.",
"UserAuthentication": "Mirëfilltësim përdoruesi",
- "UsingTokenAuth": "Nëse doni të %s kërkoni të dhëna brenda një programthi, një crontab-i, etj. %s lypset të shtoni parametrin %s te URL-të për thirrje API që lypin mirëfilltësim."
+ "UsingTokenAuth": "Nëse doni të %1$s kërkoni të dhëna brenda një programthi, një crontab-i, etj. %2$s lypset të shtoni parametrin %3$s te URL-të për thirrje API që lypin mirëfilltësim."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/sr.json b/plugins/API/lang/sr.json
index 1118164af81324bf793cd422ecd8d80b9c786e93..11361f201fc3b3847f1e388310e8097a8f4a0bf9 100644
--- a/plugins/API/lang/sr.json
+++ b/plugins/API/lang/sr.json
@@ -1,12 +1,12 @@
{
"API": {
- "GenerateVisits": "Ukoliko nema podataka za danas, onda ih prvo generišite pomoću dodatka %s. Aktivirajte dodatak %s a onda kliknite na 'Generator posetilaca' na stranici za Piwik administraciju.",
- "KeepTokenSecret": "token_auth je poverljivi podatak poput vaÅ¡eg korisniÄkog imena i lozinke, stoga ga %s nemojte nikome pokazivati%s!",
+ "GenerateVisits": "Ukoliko nema podataka za danas, onda ih prvo generišite pomoću dodatka %1$s. Aktivirajte dodatak %2$s a onda kliknite na 'Generator posetilaca' na stranici za Piwik administraciju.",
+ "KeepTokenSecret": "token_auth je poverljivi podatak poput vaÅ¡eg korisniÄkog imena i lozinke, stoga ga %1$s nemojte nikome pokazivati%2$s!",
"LoadedAPIs": "UspeÅ¡no uÄitano API-ja: %s",
- "MoreInformation": "Za više informacija o Piwik API-ju molimo vas da pogledate %s uvod u Piwik API %s i %s Piwik API referenc listu %s.",
+ "MoreInformation": "Za više informacija o Piwik API-ju molimo vas da pogledate %1$s uvod u Piwik API %2$s i %3$s Piwik API referenc listu %4$s.",
"PluginDescription": "Svi podaci su u Piwik-u dostupni preko jednostavnih API-ja. Ovaj dodatak je ulazna taÄka za veb servis koji možete pozivati kako biste dobili vaÅ¡e analitiÄke podatke u XML, JSON, PHP, CSV i drugim formatima.",
"TopLinkTooltip": "Pristupite analitiÄkim podacima iz vaÅ¡eg programa pomoću jednostavnog API-ja u json-u, xml-u itd.",
"UserAuthentication": "Autentifikacija korisnika",
- "UsingTokenAuth": "Ukoliko želite da %s doÄ‘ete do podataka putem skripta, crontaba i sliÄno %s potrebno je da dodate parametar %s API pozivima."
+ "UsingTokenAuth": "Ukoliko želite da %1$s doÄ‘ete do podataka putem skripta, crontaba i sliÄno %2$s potrebno je da dodate parametar %3$s API pozivima."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/sv.json b/plugins/API/lang/sv.json
index 6f8b2a3b9c3255f93f80cc991228e4fdbb5f05f9..bdd60c8c239b4a83e642f6fa1ac4b4658c3132bd 100644
--- a/plugins/API/lang/sv.json
+++ b/plugins/API/lang/sv.json
@@ -1,11 +1,13 @@
{
"API": {
- "GenerateVisits": "Om du inte har data för idag så kan du först skapa några data med hjälp av %s plugin. Du kan aktivera %s plugin, klicka sedan på 'Besöksgeneratorn'-menyn i Piwik administrationsområdet.",
- "KeepTokenSecret": "Detta token_auth är lika hemligt som ditt användarnamn och lösenord, %s dela inte med dig av detta! %s!",
+ "GenerateVisits": "Om du inte har data för idag så kan du först skapa några data med hjälp av %1$s plugin. Du kan aktivera %2$s plugin, klicka sedan på 'Besöksgeneratorn'-menyn i Piwik administrationsområdet.",
+ "KeepTokenSecret": "Detta token_auth är lika hemligt som ditt användarnamn och lösenord, %1$s dela inte med dig av detta! %2$s!",
"LoadedAPIs": "Laddade in %s API'er utan problem",
- "MoreInformation": "För mer information om Piwiks API'er, ta en titt i %s Introduction to Piwik API %s och %s Piwik API Reference %s.",
+ "MoreInformation": "För mer information om Piwiks API'er, ta en titt i %1$s Introduction to Piwik API %2$s och %3$s Piwik API Reference %4$s.",
+ "PluginDescription": "Allt data i Piwik finns tillgängligt genom enkla API:er. Denna plugin är en web service entry point, vilken du kan använda för att hämta ditt Piwik-data i formaten xml, json, php, csv, etc.",
"TopLinkTooltip": "Få åtkomst till webbanalysdata programmatiskt genom ett enkelt API i t.ex. json, xml etc.",
"UserAuthentication": "Användarautentisering",
- "UsingTokenAuth": "Om du vill %s begära uppgifter inom ett skript, ett crontab-jobb, etc. %s måste du lägga till parametern %s till API-anrop webbadresser som kräver autentisering."
+ "UsingTokenAuth": "Om du vill %1$s begära uppgifter inom ett skript, ett crontab-jobb, etc. %2$s måste du lägga till parametern %3$s till API-anrop webbadresser som kräver autentisering.",
+ "Glossary": "Ordbok"
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/ta.json b/plugins/API/lang/ta.json
index e03c4fe2a9f9a3997c33991d39c0be49fd981abb..28b9295b593ccfc9d4f4265df34ef6a49ad2cc4a 100644
--- a/plugins/API/lang/ta.json
+++ b/plugins/API/lang/ta.json
@@ -1,6 +1,6 @@
{
"API": {
- "KeepTokenSecret": "இநà¯à®¤ token_auth ஆனத௠உஙà¯à®•à®³à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ போனà¯à®±à¯ இரகசியமானதà¯. %s பகிர வேணà¯à®Ÿà®¾à®®à¯%s!",
+ "KeepTokenSecret": "இநà¯à®¤ token_auth ஆனத௠உஙà¯à®•à®³à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ போனà¯à®±à¯ இரகசியமானதà¯. %1$s பகிர வேணà¯à®Ÿà®¾à®®à¯%2$s!",
"LoadedAPIs": "%s à®à®ªà®¿à®-கள௠வெறà¯à®±à®¿à®•à®°à®®à®¾à®• à®à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®©",
"TopLinkTooltip": "JSON, XML à®®à¯à®¤à®²à®¿à®¯ எளிய பயனà¯à®ªà®¾à®Ÿà¯à®Ÿà¯ நிரலாகà¯à®• இடைமà¯à®•à®®à¯ மூலம௠நிரலாகà¯à®•à®¤à¯à®¤à®¿à®©à¯à®ªà®Ÿà®¿ உஙà¯à®•à®³à¯ இணைய பகà¯à®ªà¯à®ªà®¾à®¯à¯à®µà¯ தரவ௠அணà¯à®•",
"UserAuthentication": "பயனர௠உறà¯à®¤à®¿à®ªà¯à®ªà®¾à®Ÿà¯"
diff --git a/plugins/API/lang/th.json b/plugins/API/lang/th.json
index 7848a2f92dfdcee9896f832e1dfe61296bec34f4..2ddd28ca699aeb369e8c40dd3c90c3113ce03d90 100644
--- a/plugins/API/lang/th.json
+++ b/plugins/API/lang/th.json
@@ -1,10 +1,10 @@
{
"API": {
- "GenerateVisits": "ถ้าคุณไม่มีข้à¸à¸¡à¸¹à¸¥à¸ªà¸³à¸«à¸£à¸±à¸šà¸§à¸±à¸™à¸™à¸µà¹‰ คุณสามารถสร้างข้à¸à¸¡à¸¹à¸¥à¸šà¸²à¸‡à¸à¸¢à¹ˆà¸²à¸‡à¹ƒà¸Šà¹‰à¸›à¸¥à¸±à¹Šà¸à¸à¸´à¸™à¸à¸²à¸£ %s เป็นครั้งà¹à¸£à¸ คุณสามารถเปิดใช้งานปลั๊à¸à¸à¸´à¸™ %s à¹à¸¥à¹‰à¸§à¸„ลิà¸à¸—ี่เมนู 'ตัวสร้างผู้เข้าชม' ในพื้นที่จัดà¸à¸²à¸£ Piwik",
- "KeepTokenSecret": "token_auth นี้จะเป็นความลับในà¸à¸²à¸£à¹€à¸‚้าสู่ระบบà¹à¸¥à¸°à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„ุณ %s ไม่à¹à¸Šà¸£à¹Œ %s ได้",
+ "GenerateVisits": "ถ้าคุณไม่มีข้à¸à¸¡à¸¹à¸¥à¸ªà¸³à¸«à¸£à¸±à¸šà¸§à¸±à¸™à¸™à¸µà¹‰ คุณสามารถสร้างข้à¸à¸¡à¸¹à¸¥à¸šà¸²à¸‡à¸à¸¢à¹ˆà¸²à¸‡à¹ƒà¸Šà¹‰à¸›à¸¥à¸±à¹Šà¸à¸à¸´à¸™à¸à¸²à¸£ %1$s เป็นครั้งà¹à¸£à¸ คุณสามารถเปิดใช้งานปลั๊à¸à¸à¸´à¸™ %2$s à¹à¸¥à¹‰à¸§à¸„ลิà¸à¸—ี่เมนู 'ตัวสร้างผู้เข้าชม' ในพื้นที่จัดà¸à¸²à¸£ Piwik",
+ "KeepTokenSecret": "token_auth นี้จะเป็นความลับในà¸à¸²à¸£à¹€à¸‚้าสู่ระบบà¹à¸¥à¸°à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„ุณ %1$s ไม่à¹à¸Šà¸£à¹Œ %2$s ได้",
"LoadedAPIs": "โหลด API %s สำเร็จà¹à¸¥à¹‰à¸§",
- "MoreInformation": "สำหรับข้à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸š Piwik APIs โปรดให้ดูที่ %s บทนำสู่à¸à¸²à¸£à¹ƒà¸Šà¹‰ Piwik API %s à¹à¸¥à¸° %s à¹à¸«à¸¥à¹ˆà¸‡à¸—ี่มาขà¸à¸‡ Piwik API %s.",
+ "MoreInformation": "สำหรับข้à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸š Piwik APIs โปรดให้ดูที่ %1$s บทนำสู่à¸à¸²à¸£à¹ƒà¸Šà¹‰ Piwik API %2$s à¹à¸¥à¸° %3$s à¹à¸«à¸¥à¹ˆà¸‡à¸—ี่มาขà¸à¸‡ Piwik API %4$s.",
"UserAuthentication": "à¸à¸²à¸£à¸£à¸±à¸šà¸£à¸à¸‡à¸„วามถูà¸à¸•à¹‰à¸à¸‡à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰",
- "UsingTokenAuth": "ถ้าคุณต้à¸à¸‡à¸à¸²à¸£ ข้à¸à¸¡à¸¹à¸¥à¸—ี่ร้à¸à¸‡à¸‚ภ%s ภายในสคริปต์ crontab ฯลฯ %s คุณต้à¸à¸‡à¸à¸²à¸£à¹€à¸žà¸´à¹ˆà¸¡à¸žà¸²à¸£à¸²à¸¡à¸´à¹€à¸•à¸à¸£à¹Œ %s API เรียภurl ที่ต้à¸à¸‡à¸à¸²à¸£à¸à¸²à¸£à¸£à¸±à¸šà¸£à¸à¸‡à¸„วามถูà¸à¸•à¹‰à¸à¸‡"
+ "UsingTokenAuth": "ถ้าคุณต้à¸à¸‡à¸à¸²à¸£ ข้à¸à¸¡à¸¹à¸¥à¸—ี่ร้à¸à¸‡à¸‚ภ%1$s ภายในสคริปต์ crontab ฯลฯ %2$s คุณต้à¸à¸‡à¸à¸²à¸£à¹€à¸žà¸´à¹ˆà¸¡à¸žà¸²à¸£à¸²à¸¡à¸´à¹€à¸•à¸à¸£à¹Œ %3$s API เรียภurl ที่ต้à¸à¸‡à¸à¸²à¸£à¸à¸²à¸£à¸£à¸±à¸šà¸£à¸à¸‡à¸„วามถูà¸à¸•à¹‰à¸à¸‡"
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/tl.json b/plugins/API/lang/tl.json
index 9865132583296637ea461d9dce490ee5a33fa22a..94d5bff2c94add3b32418f407c97523dc55dc904 100644
--- a/plugins/API/lang/tl.json
+++ b/plugins/API/lang/tl.json
@@ -1,11 +1,11 @@
{
"API": {
- "GenerateVisits": "Kung wala kang data para sa araw na ito maaari ka munang bumuo ng ilang data gamit ang %s na plugin. Maaari mong i-enable ang %s na plugin, at pagkatapos ay i-click ang 'Tagabuo ng Bisita' na menu sa Piwik Admin area.",
- "KeepTokenSecret": "Ang token_auth na ito ay isang lihim gaya ng iyong login at password, %s huwag itong ibahagi sa iba %s!",
+ "GenerateVisits": "Kung wala kang data para sa araw na ito maaari ka munang bumuo ng ilang data gamit ang %1$s na plugin. Maaari mong i-enable ang %2$s na plugin, at pagkatapos ay i-click ang 'Tagabuo ng Bisita' na menu sa Piwik Admin area.",
+ "KeepTokenSecret": "Ang token_auth na ito ay isang lihim gaya ng iyong login at password, %1$s huwag itong ibahagi sa iba %2$s!",
"LoadedAPIs": "Matagumpay na nai-load ang %s APIs",
- "MoreInformation": "Para sa karagdagang impormasyon tungkol sa Piwik API, mangyaring tumingin sa %s Panimula sa Piwik API %s at ang %s Piwik API Reference %s.",
+ "MoreInformation": "Para sa karagdagang impormasyon tungkol sa Piwik API, mangyaring tumingin sa %1$s Panimula sa Piwik API %2$s at ang %3$s Piwik API Reference %4$s.",
"TopLinkTooltip": "I-access ang iyong data ng Web Analytics programmatically sa pamamagitan ng isang simpleng API sa json, xml, atbp.",
"UserAuthentication": "Pagpapatunay sa User",
- "UsingTokenAuth": "Kung nais mong %s mag-request ng data sa loob ng isang script, crontab, atbp. %s kailangan mong idagdag ang parameter na %s sa mga tumatawag ng API na URL na nangangailangan ng pagpapatunay."
+ "UsingTokenAuth": "Kung nais mong %1$s mag-request ng data sa loob ng isang script, crontab, atbp. %2$s kailangan mong idagdag ang parameter na %3$s sa mga tumatawag ng API na URL na nangangailangan ng pagpapatunay."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/tr.json b/plugins/API/lang/tr.json
index 458b2f09af7892f151ce5741bfc642f84fe90b2f..cdc3253411ce8c019b679a548136b19d501ccc1d 100644
--- a/plugins/API/lang/tr.json
+++ b/plugins/API/lang/tr.json
@@ -1,11 +1,11 @@
{
"API": {
- "GenerateVisits": "Eğer bugün için bir veri yoksa öncelikle %s eklentisiyle biraz veri oluşturabilirsiniz. %s eklentisini aktifleştirin, sonrasında Piwik Yönetim alanından 'Ziyaretçi Oluşturucu' menüsüne tıklayınız.",
- "KeepTokenSecret": "token_auth kullanıcı adı ve şifreniz kadar gizlidir, %s kimseyle paylaşmayınız%s!",
+ "GenerateVisits": "Eğer bugün için bir veri yoksa öncelikle %1$s eklentisiyle biraz veri oluşturabilirsiniz. %2$s eklentisini aktifleştirin, sonrasında Piwik Yönetim alanından 'Ziyaretçi Oluşturucu' menüsüne tıklayınız.",
+ "KeepTokenSecret": "token_auth kullanıcı adı ve şifreniz kadar gizlidir, %1$s kimseyle paylaşmayınız%2$s!",
"LoadedAPIs": "%s API başarılı şekilde yüklendi",
- "MoreInformation": "Piwik APIsi hakkında daha fazla bilgi için lütfen %s Piwik API Kullanımı %s ve %s Piwik API Referansına %s bakınız.",
+ "MoreInformation": "Piwik APIsi hakkında daha fazla bilgi için lütfen %1$s Piwik API Kullanımı %2$s ve %3$s Piwik API Referansına %4$s bakınız.",
"TopLinkTooltip": "Json, xml veya diÄŸerleri ile Api kullanarak eriÅŸin.",
"UserAuthentication": "Kullanıcı kimlik doğrulaması",
- "UsingTokenAuth": "Bir script, cron vb içerisinden %s verisi çağırmak isterseniz, %s kimlik doğrulama gerektiren API bağlantılarına %s parametresini eklemelisiniz."
+ "UsingTokenAuth": "Bir script, cron vb içerisinden %1$s verisi çağırmak isterseniz, %2$s kimlik doğrulama gerektiren API bağlantılarına %3$s parametresini eklemelisiniz."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/uk.json b/plugins/API/lang/uk.json
index b33161e1ebcac132d56f52e897b49f678d070e61..20e3eae228e0cc9ff56a9ed4ab1a56d0ebc54c7c 100644
--- a/plugins/API/lang/uk.json
+++ b/plugins/API/lang/uk.json
@@ -1,10 +1,10 @@
{
"API": {
- "GenerateVisits": "Якщо на Ñьогодні ще немає даних то можна влаÑноручно згенерувати дані викориÑтовуючи плагін %s . Щоб увімкнути плагін %s , клацніть \"Visitor Generator\" меню в Панелі ÐдмініÑтратора Piwik.",
- "KeepTokenSecret": "token_auth Ñ” Ñекретним, на рівні з логіном та паролем, тож %s тримайте цю інформацію Ñекреті%s!",
+ "GenerateVisits": "Якщо на Ñьогодні ще немає даних то можна влаÑноручно згенерувати дані викориÑтовуючи плагін %1$s . Щоб увімкнути плагін %2$s , клацніть \"Visitor Generator\" меню в Панелі ÐдмініÑтратора Piwik.",
+ "KeepTokenSecret": "token_auth Ñ” Ñекретним, на рівні з логіном та паролем, тож %1$s тримайте цю інформацію Ñекреті%2$s!",
"LoadedAPIs": "%s API уÑпішно завантажено",
- "MoreInformation": "Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´ÐµÑ‚Ð°Ð»ÑŒÐ½Ñ–ÑˆÐ¾Ñ— інформації про API Piwik, переглÑньте %s Ð’Ñтуп до Piwik API %s та %s Довідковий матеріал по Piwik API %s.",
+ "MoreInformation": "Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´ÐµÑ‚Ð°Ð»ÑŒÐ½Ñ–ÑˆÐ¾Ñ— інформації про API Piwik, переглÑньте %1$s Ð’Ñтуп до Piwik API %2$s та %3$s Довідковий матеріал по Piwik API %4$s.",
"UserAuthentication": "ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ ÐºÐ¾Ñ€Ð¸Ñтоувача",
- "UsingTokenAuth": "Ð”Ð»Ñ %sдоÑтупу до інформації Ñкриптом, програмою Ñ– Ñ‚.д.%s треба додавати параметр %s до кожного виклику API Ñкищо викориÑтовуваний URL вимагає аутентифікації."
+ "UsingTokenAuth": "Ð”Ð»Ñ %1$sдоÑтупу до інформації Ñкриптом, програмою Ñ– Ñ‚.д.%2$s треба додавати параметр %3$s до кожного виклику API Ñкищо викориÑтовуваний URL вимагає аутентифікації."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/vi.json b/plugins/API/lang/vi.json
index 18bf5e4d5b060bf46925b06f351e4f10ea25f3d5..05c908db9a79490fece87c3fbb54b459c022ba45 100644
--- a/plugins/API/lang/vi.json
+++ b/plugins/API/lang/vi.json
@@ -1,13 +1,13 @@
{
"API": {
- "GenerateVisits": "Nếu bạn không có dữ liệu cho ngà y hôm nay, bạn có thể sinh má»™t số dữ liệu (vá» ngÆ°á»i thăm website) bằng cách sá» dụng plugin %s. Bạn có thể khởi Ä‘á»™ng plugin %s, sau đó click và o menu \"Visitor Generator\" trên khu vá»±c quản trị Piwik.",
- "KeepTokenSecret": "token_auth nà y chặt chẽ nhÆ° máºt khẩu đăng nháºp của bạn, %s không thể chia sẻ nó %s!",
+ "GenerateVisits": "Nếu bạn không có dữ liệu cho ngà y hôm nay, bạn có thể sinh má»™t số dữ liệu (vá» ngÆ°á»i thăm website) bằng cách sá» dụng plugin %1$s. Bạn có thể khởi Ä‘á»™ng plugin %2$s, sau đó click và o menu \"Visitor Generator\" trên khu vá»±c quản trị Piwik.",
+ "KeepTokenSecret": "token_auth nà y chặt chẽ nhÆ° máºt khẩu đăng nháºp của bạn, %1$s không thể chia sẻ nó %2$s!",
"LoadedAPIs": "Nạp thà nh công API %s",
- "MoreInformation": "Äể biết thêm thông tin vá» các API của Piwik, vui lòng xem ở Giá»›i thiệu %s vá» %s API Piwik và API %s Piwik Reference %s",
+ "MoreInformation": "Äể biết thêm thông tin vá» các API của Piwik, vui lòng xem ở Giá»›i thiệu %1$s vá» %2$s API Piwik và API %3$s Piwik Reference %4$s",
"PluginDescription": "Tất cả dữ liệu của Piwik Ä‘á»u tủy cáºp được thông qua API. Plugin nà y là 1 web service, từ đó bạn có thể gá»i để truy cáºp dữ liệu dÆ°á»›i dạng xml, json, csv,...",
"ReportingApiReference": "Tham chiếu API báo cáo",
"TopLinkTooltip": "Truy cáºp dữ liệu láºp trình Web Analytics của bạn thông qua má»™t API Ä‘Æ¡n giản trong JSON, xml, vv",
"UserAuthentication": "Xác thá»±c ngÆ°á»i dùng",
- "UsingTokenAuth": "Nếu bạn muốn %s truy vấn dữ liệu trong script hoặc crontab, ... %s bạn cần phải thêm tham số %s và o các API call URL yêu cầu xác thực."
+ "UsingTokenAuth": "Nếu bạn muốn %1$s truy vấn dữ liệu trong script hoặc crontab, ... %2$s bạn cần phải thêm tham số %3$s và o các API call URL yêu cầu xác thực."
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/zh-cn.json b/plugins/API/lang/zh-cn.json
index 88023c92fb0f644afbf3a2333d8af76950bab268..69404354653dcfb1d86fa337935dae20fcb29ace 100644
--- a/plugins/API/lang/zh-cn.json
+++ b/plugins/API/lang/zh-cn.json
@@ -1,11 +1,11 @@
{
"API": {
- "GenerateVisits": "如果您今天还沒有任何资料，å¯ä»¥å…ˆç”¨ %s æ’件æ¥äº§ç”Ÿä¸€äº›æ•°æ®ã€‚您å¯ä»¥å¯ç”¨ %s æ’件，然åŽç‚¹å‡»åœ¨ Piwik 管ç†èœå•ä¸‹çš„'生æˆè®¿å®¢'选项。",
- "KeepTokenSecret": "授æƒå· token_auth 与您的å¸å·å’Œå¯†ç ä¸€æ ·é‡è¦ï¼Œ%s请ä¸è¦å…¬å¼€%sï¼",
+ "GenerateVisits": "如果您今天还沒有任何资料，å¯ä»¥å…ˆç”¨ %1$s æ’件æ¥äº§ç”Ÿä¸€äº›æ•°æ®ã€‚您å¯ä»¥å¯ç”¨ %2$s æ’件，然åŽç‚¹å‡»åœ¨ Piwik 管ç†èœå•ä¸‹çš„'生æˆè®¿å®¢'选项。",
+ "KeepTokenSecret": "授æƒå· token_auth 与您的å¸å·å’Œå¯†ç ä¸€æ ·é‡è¦ï¼Œ%1$s请ä¸è¦å…¬å¼€%2$sï¼",
"LoadedAPIs": "å·²æˆåŠŸè½½å…¥ %s 个 APIs",
- "MoreInformation": "了解更多关于 Piwik APIs 的资讯，请访问 %sPiwik API 介ç»%s å’Œ %s Piwik API å‚考资料%s。",
+ "MoreInformation": "了解更多关于 Piwik APIs 的资讯，请访问 %1$sPiwik API 介ç»%2$s å’Œ %3$s Piwik API å‚考资料%4$s。",
"TopLinkTooltip": "通过一个简å•çš„ API，让您å¯ä»¥ä»¥ xml, json, åŠå…¶å®ƒæ ¼å¼å–得网站统计数æ®ã€‚",
"UserAuthentication": "身份验è¯",
- "UsingTokenAuth": "如果您想在代ç ã€å®šæ—¶ä»»åŠ¡ä¸ %s 请求资料，%s è¦åœ¨ API 调用需è¦è®¤è¯çš„网å€æ—¶å¢žåŠ å‚æ•° %s。"
+ "UsingTokenAuth": "如果您想在代ç ã€å®šæ—¶ä»»åŠ¡ä¸ %1$s 请求资料，%2$s è¦åœ¨ API 调用需è¦è®¤è¯çš„网å€æ—¶å¢žåŠ å‚æ•° %3$s。"
}
}
\ No newline at end of file
diff --git a/plugins/API/lang/zh-tw.json b/plugins/API/lang/zh-tw.json
index 5bd89475f59c7a17a694574cc72f7579b86ad1a3..40c35b57313fdcd9ea135671d7532e1568150754 100644
--- a/plugins/API/lang/zh-tw.json
+++ b/plugins/API/lang/zh-tw.json
@@ -1,12 +1,12 @@
{
"API": {
- "GenerateVisits": "å¦‚æžœä½ ä»Šå¤©é‚„æ²’æœ‰ä»»ä½•è³‡æ–™ï¼Œä½ å¯ä»¥å…ˆä½¿ç”¨ %s å¤–æŽ›ä¾†ç”¢ç”Ÿä¸€äº›æ•¸æ“šã€‚ä½ å¯ä»¥å•Ÿç”¨ %s 外掛，然後點擊在 Piwik 管ç†å“¡å€åŸŸè£¡çš„'產生訪客'é¸å–®ã€‚",
- "KeepTokenSecret": "token_auth å¦‚ä½ çš„å¸³è™Ÿå’Œå¯†ç¢¼èˆ¬é‡è¦ï¼Œ%sè«‹ä¸è¦å…¬é–‹å®ƒ%sï¼",
+ "GenerateVisits": "å¦‚æžœä½ ä»Šå¤©é‚„æ²’æœ‰ä»»ä½•è³‡æ–™ï¼Œä½ å¯ä»¥å…ˆä½¿ç”¨ %1$s å¤–æŽ›ä¾†ç”¢ç”Ÿä¸€äº›æ•¸æ“šã€‚ä½ å¯ä»¥å•Ÿç”¨ %2$s 外掛，然後點擊在 Piwik 管ç†å“¡å€åŸŸè£¡çš„'產生訪客'é¸å–®ã€‚",
+ "KeepTokenSecret": "token_auth å¦‚ä½ çš„å¸³è™Ÿå’Œå¯†ç¢¼èˆ¬é‡è¦ï¼Œ%1$sè«‹ä¸è¦å…¬é–‹å®ƒ%2$sï¼",
"LoadedAPIs": "å·²æˆåŠŸè¼‰å…¥ %s 個 APIs",
- "MoreInformation": "å–得更多關於 Piwik APIs 的資訊，請å‰å¾€ %sPiwik API 指引%s 與 %s Piwik API åƒè€ƒè³‡æ–™%s。",
+ "MoreInformation": "å–得更多關於 Piwik APIs 的資訊，請å‰å¾€ %1$sPiwik API 指引%2$s 與 %3$s Piwik API åƒè€ƒè³‡æ–™%4$s。",
"PluginDescription": "所有在Piwikå…§é€éŽç°¡å–®çš„API所å–得資料都是å¯ç”¨çš„，這個外掛是網站æœå‹™çš„å…¥å£é»žï¼Œå› æ¤ï¼Œä½ å¯ä»¥é€éŽä¸‹åˆ—網路分æžçš„資料：xmlã€jsonã€phpã€csv，諸如æ¤é¡žçš„æ–¹å¼ä¾†åŠ 以呼å«ã€‚",
"TopLinkTooltip": "é€éŽAPIå¯ä»¥å–得網站æµé‡çµ±è¨ˆåˆ†æžjson與xmlæ ¼å¼çš„數據。",
"UserAuthentication": "使用者驗è‰",
- "UsingTokenAuth": "å¦‚æžœä½ æƒ³å¾žç¨‹å¼ã€å·¥ä½œæŽ’程在 %s 請求資料。%s ä½ éœ€è¦æ–°å¢žä¸€å€‹ %s å—串至 API 呼å«ç¶²å€ä¾†é€²è¡Œé©—è‰ã€‚"
+ "UsingTokenAuth": "å¦‚æžœä½ æƒ³å¾žç¨‹å¼ã€å·¥ä½œæŽ’程在 %1$s 請求資料。%2$s ä½ éœ€è¦æ–°å¢žä¸€å€‹ %3$s å—串至 API 呼å«ç¶²å€ä¾†é€²è¡Œé©—è‰ã€‚"
}
}
\ No newline at end of file
diff --git a/plugins/API/tests/Integration/APITest.php b/plugins/API/tests/Integration/APITest.php
index 2362bebdf21273342a497dd2e88d6cc278b2f79b..c60f1769ab8c60ef6536c524134fa760b3b5d300 100644
--- a/plugins/API/tests/Integration/APITest.php
+++ b/plugins/API/tests/Integration/APITest.php
@@ -59,6 +59,7 @@ class APITest extends IntegrationTestCase
"method%3dVisitsSummary.get%26token_auth%3d$token%26idSite%3d1%26date%3d2015-01-26%26period%3dday",
"method%3dVisitsSummary.get%26idSite%3d1%26date%3d2015-01-26%26period%3dday",
"method%3dVisitsSummary.get%26idSite%3d1%26token_auth%3danonymous%26date%3d2015-01-26%26period%3dday",
+ "method%3dVisitsSummary.get%26token_auth%3d$token%26idSite%3d1%26date%3d2015-01-26%26period%3dday%26segment%3dvisitDuration%3d%3d30%3bactions%3e2",
);
$response = $this->api->getBulkRequest($urls);
@@ -67,6 +68,7 @@ class APITest extends IntegrationTestCase
$this->assertSame(0, $response[1]['nb_visits']);
$this->assertResponseIsPermissionError($response[2]);
$this->assertResponseIsPermissionError($response[3]);
+ $this->assertResponseIsSuccess($response[4]);
}
private function assertResponseIsPermissionError($response)
diff --git a/plugins/Actions/Columns/ActionType.php b/plugins/Actions/Columns/ActionType.php
index 3d6e9b599aa4f15c50a642286f4681cd41321ce6..59f09c87e9cd1d46311965b24dd54d69825bce58 100644
--- a/plugins/Actions/Columns/ActionType.php
+++ b/plugins/Actions/Columns/ActionType.php
@@ -47,7 +47,7 @@ class ActionType extends ActionDimension
$segment->setSegment('actionType');
$segment->setName('Actions_ActionType');
$segment->setSqlSegment('log_action.type');
- $segment->setType(Segment::TYPE_METRIC);
+ $segment->setType(Segment::TYPE_DIMENSION);
$segment->setAcceptedValues(sprintf('A type of action, such as: %s', implode(', ', $types)));
$segment->setSqlFilter(function ($type) use ($types) {
if (array_key_exists($type, $types)) {
diff --git a/plugins/Actions/Columns/Metrics/AverageTimeOnPage.php b/plugins/Actions/Columns/Metrics/AverageTimeOnPage.php
index a11c60e8537de79d4d296300f9ca595f546fd8db..934ee987b14924888444aceeb99378bcc51b7e89 100644
--- a/plugins/Actions/Columns/Metrics/AverageTimeOnPage.php
+++ b/plugins/Actions/Columns/Metrics/AverageTimeOnPage.php
@@ -34,7 +34,7 @@ class AverageTimeOnPage extends ProcessedMetric
public function compute(Row $row)
{
$sumTimeSpent = $this->getMetric($row, 'sum_time_spent');
- $visits = $this->getMetric($row, 'nb_visits');
+ $visits = $this->getMetric($row, 'nb_hits');
return Piwik::getQuotientSafe($sumTimeSpent, $visits, $precision = 0);
}
@@ -46,6 +46,6 @@ class AverageTimeOnPage extends ProcessedMetric
public function getDependentMetrics()
{
- return array('sum_time_spent', 'nb_visits');
+ return array('sum_time_spent', 'nb_hits');
}
-}
\ No newline at end of file
+}
diff --git a/plugins/Actions/javascripts/actionsDataTable.js b/plugins/Actions/javascripts/actionsDataTable.js
index ad64445c22ccf32e7afbc7a9cd6ddc7a5a87f629..ef8442e1bd65988d88fafaf946bc1ab61d698c93 100644
--- a/plugins/Actions/javascripts/actionsDataTable.js
+++ b/plugins/Actions/javascripts/actionsDataTable.js
@@ -318,7 +318,12 @@
$('tr#' + idToReplace, root).after(response).remove();
- var missingColumns = (response.prev().find('td').size() - response.find('td').size());
+ var requiredColumnCount = 0, availableColumnCount = 0;
+
+ response.prev().find('td').each(function(){ requiredColumnCount += $(this).attr('colspan') || 1; });
+ response.find('td').each(function(){ availableColumnCount += $(this).attr('colspan') || 1; });
+
+ var missingColumns = requiredColumnCount - availableColumnCount;
for (var i = 0; i < missingColumns; i++) {
// if the subtable has fewer columns than the parent table, add some columns.
// this happens for example, when the parent table has performance metrics and the subtable doesn't.
diff --git a/plugins/Actions/javascripts/rowactions.js b/plugins/Actions/javascripts/rowactions.js
index 33050b90edf1f37790260fff863c1912e7518a46..87b77868e445e2696241fe6486c34e751f7cbc18 100644
--- a/plugins/Actions/javascripts/rowactions.js
+++ b/plugins/Actions/javascripts/rowactions.js
@@ -25,41 +25,45 @@ $(function () {
return link;
}
- DataTable_RowActions_Transitions.registerReport({
- isAvailableOnReport: function (dataTableParams) {
- return isPageUrlReport(dataTableParams);
- },
- isAvailableOnRow: function (dataTableParams, tr) {
- return isPageUrlReport(dataTableParams) && tr.find('> td:first span.label').parent().is('a')
- },
- trigger: function (tr, e, subTableLabel) {
- var link = getLinkForTransitionAndOverlayPopover(tr);
- this.openPopover('url:' + link);
- }
- });
+ if (window.DataTable_RowActions_Transitions) {
+ DataTable_RowActions_Transitions.registerReport({
+ isAvailableOnReport: function (dataTableParams) {
+ return isPageUrlReport(dataTableParams);
+ },
+ isAvailableOnRow: function (dataTableParams, tr) {
+ return isPageUrlReport(dataTableParams) && tr.find('> td:first span.label').parent().is('a')
+ },
+ trigger: function (tr, e, subTableLabel) {
+ var link = getLinkForTransitionAndOverlayPopover(tr);
+ this.openPopover('url:' + link);
+ }
+ });
- DataTable_RowActions_Transitions.registerReport({
- isAvailableOnReport: function (dataTableParams) {
- return isPageTitleReport(dataTableParams);
- },
- isAvailableOnRow: function (dataTableParams, tr) {
- return isPageTitleReport(dataTableParams);
- },
- trigger: function (tr, e, subTableLabel) {
- DataTable_RowAction.prototype.trigger.apply(this, [tr, e, subTableLabel]);
- }
- });
+ DataTable_RowActions_Transitions.registerReport({
+ isAvailableOnReport: function (dataTableParams) {
+ return isPageTitleReport(dataTableParams);
+ },
+ isAvailableOnRow: function (dataTableParams, tr) {
+ return isPageTitleReport(dataTableParams);
+ },
+ trigger: function (tr, e, subTableLabel) {
+ DataTable_RowAction.prototype.trigger.apply(this, [tr, e, subTableLabel]);
+ }
+ });
+ }
- DataTable_RowActions_Overlay.registerReport({
- isAvailableOnReport: function (dataTableParams) {
- return isPageUrlReport(dataTableParams);
- },
- onClick: function (actionA, tr, e) {
- return {
- link: getLinkForTransitionAndOverlayPopover(tr),
- segment: null
+ if (window.DataTable_RowActions_Overlay) {
+ DataTable_RowActions_Overlay.registerReport({
+ isAvailableOnReport: function (dataTableParams) {
+ return isPageUrlReport(dataTableParams);
+ },
+ onClick: function (actionA, tr, e) {
+ return {
+ link: getLinkForTransitionAndOverlayPopover(tr),
+ segment: null
+ }
}
- }
- });
+ });
+ }
});
\ No newline at end of file
diff --git a/plugins/Actions/lang/ar.json b/plugins/Actions/lang/ar.json
index 3142990e992f7804659c3d1638c4ba7753d6ac69..a6de6924bfc84cbe11c3952de0c747af1711290b 100644
--- a/plugins/Actions/lang/ar.json
+++ b/plugins/Actions/lang/ar.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "متوسط على أساس %s كبسة %s ما بين %s و %s",
+ "AvgGenerationTimeTooltip": "متوسط على أساس %1$s كبسة %2$s ما بين %3$s و %4$s",
"ColumnClickedURL": "الرابط المتبوع",
"ColumnClicks": "النقرات",
"ColumnClicksDocumentation": "عدد مرات النقر على هذا الرابط.",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "الرابط الصادر هو رابط يقود الزائر بعيداً عن موقعك (إلى اسم نطاق آخر).",
"OutlinksReportDocumentation": "يعرض هذا التقرير قائمة هيكلية بالروابط الصادرة والتي تم النقر عليها بواسطة زوارك.",
"PagesReportDocumentation": "يتضمن هذا التقرير معلومات عن روابط الصÙØات التي تم زيارتها. %s الجدول منظم هيكلياً، والروابط معروضة ÙÙŠ شكل شجرة مجلدات.",
- "PageTitlesReportDocumentation": "يتضمن هذا التقرير معلومات عن عناوين الصÙØات التي تم زيارتها. %s عنوان الصÙØØ© هو وسم لغة %s HTML الذي تعرضه أغلب متصÙØات ويب كعناون الناÙذة.",
+ "PageTitlesReportDocumentation": "يتضمن هذا التقرير معلومات عن عناوين الصÙØات التي تم زيارتها. %1$s عنوان الصÙØØ© هو وسم لغة %2$s HTML الذي تعرضه أغلب متصÙØات ويب كعناون الناÙذة.",
"PageUrls": "روابط الصÙØØ©",
"PluginDescription": "تقارير عرض الصÙØات وعناوين الصÙØات. ØªØªÙŠØ Ù„Ùƒ هذه التقارير قياس خدمة البØØ« الداخلية ÙÙŠ موقعك. كما تقدم تتبعاً آلياً للنقرات للروابط الخارجية وتنزيلات الملÙات.",
"SiteSearchCategories1": "يعرض هذا التقرير قائمة الÙئات التي اختارها زوارك عندما قاموا بالبØØ« ÙÙŠ موقعك.",
diff --git a/plugins/Actions/lang/be.json b/plugins/Actions/lang/be.json
index b86bded152fb3026f757b8e5aa270a2138e0805b..13d053b0d89d86076a70db2606dd42a2d852fa72 100644
--- a/plugins/Actions/lang/be.json
+++ b/plugins/Actions/lang/be.json
@@ -19,7 +19,7 @@
"OutlinkDocumentation": "ЗнешнÑÑ ÑпаÑылка - гÑта Ñ‚Ð°ÐºÐ°Ñ ÑпаÑылка, ÑÐºÐ°Ñ Ð²Ñдзе наведвальніка прÑч з вашага Ñайта (да іншага дамену).",
"OutlinksReportDocumentation": "ГÑÑ‚Ð°Ñ Ñправаздача паказвае іерархічны ÑÐ¿Ñ–Ñ URL-адраÑоў знешніх ÑпаÑылак, ÑÐºÑ–Ñ Ð±Ñ‹Ð»Ñ– націÑнуты вашымі наведвальнікамі.",
"PagesReportDocumentation": "ГÑÑ‚Ð°Ñ Ñправаздача змÑшчае інфармацыю аб URL-адраÑах Ñтаронак, ÑÐºÑ–Ñ Ð±Ñ‹Ð»Ñ– наведаны. %s Табліца арганізавана іерархічна, URL-адраÑÑ‹ адлюÑтроўваюцца Ñž выглÑдзе Ñ‚Ñчакавай Ñтруктуры.",
- "PageTitlesReportDocumentation": "ГÑÑ‚Ð°Ñ Ñправаздача змÑшчае інфармацыю аб назвах Ñтаронак, ÑÐºÑ–Ñ Ð±Ñ‹Ð»Ñ– наведаны. %s Ðазва Ñтаронкі гÑта HTML %s Ñ‚Ñг, Ñкі большаÑць браÑзÑраў паказваюць у загалоўке акна.",
+ "PageTitlesReportDocumentation": "ГÑÑ‚Ð°Ñ Ñправаздача змÑшчае інфармацыю аб назвах Ñтаронак, ÑÐºÑ–Ñ Ð±Ñ‹Ð»Ñ– наведаны. %1$s Ðазва Ñтаронкі гÑта HTML %2$s Ñ‚Ñг, Ñкі большаÑць браÑзÑраў паказваюць у загалоўке акна.",
"SubmenuPagesEntry": "Старонкі ўваходу",
"SubmenuPagesExit": "Старонкі выхаду",
"SubmenuPageTitles": "Ðазвы Ñтаронак"
diff --git a/plugins/Actions/lang/bg.json b/plugins/Actions/lang/bg.json
index c5b02ecf37bb7854710ca68db305022329dba652..b6de7afa2e8ce48a913f0af9dffdff69f79e5d13 100644
--- a/plugins/Actions/lang/bg.json
+++ b/plugins/Actions/lang/bg.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Средно базирано на %s поÑещение(Ñ) %s между %s и %s",
+ "AvgGenerationTimeTooltip": "Средно базирано на %1$s поÑещение(Ñ) %2$s между %3$s и %4$s",
"ColumnClickedURL": "ПоÑетена връзка",
"ColumnClicks": "ЩракваниÑ",
"ColumnClicksDocumentation": "Брой Ñ‰Ñ€Ð°ÐºÐ²Ð°Ð½Ð¸Ñ Ð½Ð° тази връзка",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "ИзходÑщата връзка е връзка, коÑто води поÑÐµÑ‚Ð¸Ñ‚ÐµÐ»Ñ Ð¸Ð·Ð²ÑŠÐ½ Ð’Ð°ÑˆÐ¸Ñ Ñайт (към друг домейн).",
"OutlinksReportDocumentation": "Този доклад показва йерархичен ÑпиÑък на изходÑщите адреÑи, които Ñа избрани от поÑетителите.",
"PagesReportDocumentation": "Този доклад включва Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° поÑетените връзки. %s Таблицата е организирана йерархично, връзките Ñа показани като Ñтруктура от папки.",
- "PageTitlesReportDocumentation": "Този доклад включва Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° заглавиÑта на поÑетена Ñтраница. %s Заглавието на Ñтраницата е HTML %s таг, който Ñе изобразÑва в заглавната чаÑÑ‚ на повечето браузери.",
+ "PageTitlesReportDocumentation": "Този доклад включва Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° заглавиÑта на поÑетена Ñтраница. %1$s Заглавието на Ñтраницата е HTML %2$s таг, който Ñе изобразÑва в заглавната чаÑÑ‚ на повечето браузери.",
"PageUrls": "URLs Ñтраница",
"PluginDescription": "Показва отчет за Ð±Ñ€Ð¾Ñ Ð¿Ð¾Ñетени Ñтраници и техните заглавиÑ. ПозволÑва ви да видите заÑвките към Ñ‚ÑŠÑ€Ñачката на Ð²Ð°ÑˆÐ¸Ñ Ñайт. Ðвтоматично проÑледÑва щракваниÑта върху външни връзки и изтеглÑне на файлове.",
"SiteSearchCategories1": "Този доклад показва ÑпиÑък Ñ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¸Ñ‚Ðµ, които поÑетителите Ñа избрали при Ñ‚ÑŠÑ€Ñене във Ð’Ð°ÑˆÐ¸Ñ Ñайт.",
diff --git a/plugins/Actions/lang/bs.json b/plugins/Actions/lang/bs.json
index c9631733413c47ec9aa5704eef0c383f28cb7ba9..e3ec982dd9edbeb82ee6ece0a2e0d51400b1d1b8 100644
--- a/plugins/Actions/lang/bs.json
+++ b/plugins/Actions/lang/bs.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Prosijek baziran na %s pogodak(a) %s između %s i %s",
+ "AvgGenerationTimeTooltip": "Prosijek baziran na %1$s pogodak(a) %2$s između %3$s i %4$s",
"ColumnClickedURL": "Kliknut URL",
"ColumnClicks": "Klikovi",
"ColumnClicksDocumentation": "Broj klikova na ovaj link",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "Izlazni link je link na kojeg je izašao posjetilac sa tvoje stranica na neki drugi websajt (druga domena)",
"OutlinksReportDocumentation": "Ovaj izvještaj sadrži hijerarhalnu listu izlaznih linkova koji su kliknuti od strane tvojih posjetilaca.",
"PagesReportDocumentation": "Ovaj izvještaj sadrži informacije o stranicama koje su posjećene. %s tabela je organizovana hijerarhijski, URL-ovi su prikazani kao struktura foldera.",
- "PageTitlesReportDocumentation": "Ovaj raport sadrži informacije o naslovima stranica koje su posjećene. %s Naslov stranice je HTML %s Oznaka koju većina pregledaÄa prikazuje u njihovom prozornom imenu.",
+ "PageTitlesReportDocumentation": "Ovaj raport sadrži informacije o naslovima stranica koje su posjećene. %1$s Naslov stranice je HTML %2$s Oznaka koju većina pregledaÄa prikazuje u njihovom prozornom imenu.",
"PageUrls": "Veze stranice",
"SiteSearchCategories1": "Ovaj raport prikazuje spisak kategorija koje su posjetioci odabrali kad su vršili istragu na vašoj stranici.",
"SiteSearchCategories2": "Na primjer, stranice sa elektronskom trgovinom tipiÄno imaju biraÄ kategorija tako da se posjetioci mogu ograniÄiti na pretrage na svim proizvodima u specifiÄnoj kategoriji.",
diff --git a/plugins/Actions/lang/ca.json b/plugins/Actions/lang/ca.json
index 688e8f3f82000ab3a7fe526700904afec43a7d02..2b9634655ffc64ca12da1fadb77c430c37ab9f18 100644
--- a/plugins/Actions/lang/ca.json
+++ b/plugins/Actions/lang/ca.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Promig basat en %s accessos %s entre %s i %s",
+ "AvgGenerationTimeTooltip": "Promig basat en %1$s accessos %2$s entre %3$s i %4$s",
"ColumnClickedURL": "URL picada",
"ColumnClicks": "Clics",
"ColumnClicksDocumentation": "Nombre de vegades que s'ha fet clic en aquest enllaç",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "Un enllaç de sortida es un enllaç que porta el visitant fora del teu lloc web (a un altre domini)",
"OutlinksReportDocumentation": "Aquest informe mostra una lista jerà rquica de les URL de sortida que han estat clicades pels vostres visitants.",
"PagesReportDocumentation": "Aquest informe conté les URL de les pà gines que s'han visitat. %s La taula s'organitza jerarquicament, i les URL es mostren amb estructura de directoris.",
- "PageTitlesReportDocumentation": "Aquest informe conté informació sobre els tÃtols de les pà gines que s'han visitat. %s El tÃtol de la pà gina es el tag HTML: %s, que es mostra al tÃtol de la finestra en la majorÃa de navegadors.",
+ "PageTitlesReportDocumentation": "Aquest informe conté informació sobre els tÃtols de les pà gines que s'han visitat. %1$s El tÃtol de la pà gina es el tag HTML: %2$s, que es mostra al tÃtol de la finestra en la majorÃa de navegadors.",
"PageUrls": "URLs de les pà gines",
"PluginDescription": "Informa sobre les vistes i tÃtols de pà gina. Et permet mesurar el motor de cerca intern del teu lloc web. Monitoritza automà ticament els clics en enllaços externs i descà rregues de fitxers.",
"SiteSearchCategories1": "Aquest informe mostra les categorÃes que han seleccionat els visitants quan han fet una cerca al vostre lloc web",
diff --git a/plugins/Actions/lang/cs.json b/plugins/Actions/lang/cs.json
index 77c1aabb5b4d704f085a4b272c404eb841c3f7db..e55c2038ff6c99801c7cbe4410185c4084bb9b10 100644
--- a/plugins/Actions/lang/cs.json
+++ b/plugins/Actions/lang/cs.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "PrůmÄ›r dle %s pÅ™Ãstupů %s mezi %s a %s",
+ "AvgGenerationTimeTooltip": "PrůmÄ›r dle %1$s pÅ™Ãstupů %2$s mezi %3$s a %4$s",
"ColumnClickedURL": "URL prokliku",
"ColumnActionURL": "URL akce",
"ColumnClicks": "Prokliků",
@@ -38,7 +38,7 @@
"OutlinkDocumentation": "Externà odkaz je odkaz, který vede z vašich stránek na jinou domén.",
"OutlinksReportDocumentation": "Toto hlášenà zobrazuje hyerarchický seznam URL externÃch odkazů, na které vaÅ¡i návÅ¡tÄ›vnÃci klikli.",
"PagesReportDocumentation": "Toto hlášenà obsahuje informace o URL navÅ¡tÃvených. %s Tabulka je organizována hyerarchicky jako strom složek.",
- "PageTitlesReportDocumentation": "Toto hlášenà obsahuje informace o titulcÃch navÅ¡tÃvených stránek. %s Titulek je HTML tag %s, který vÄ›tÅ¡ina prohlÞeÄů zobrazuje v titulku okna.",
+ "PageTitlesReportDocumentation": "Toto hlášenà obsahuje informace o titulcÃch navÅ¡tÃvených stránek. %1$s Titulek je HTML tag %2$s, který vÄ›tÅ¡ina prohlÞeÄů zobrazuje v titulku okna.",
"PageUrls": "URL stránky",
"PluginDescription": "Podává hlášenà o zobrazenà a titulcÃch stránek. Umožňuje měřit váš internà vyhledávaÄ. Automaticky sleduje kliky na externà odkazy a soubory ke staženÃ.",
"SiteSearchCategories1": "Toto hlášenà shrnuje kategorie, které návÅ¡tÄ›vnÃci vybrali pÅ™i vyhledávánà na stránkách.",
diff --git a/plugins/Actions/lang/da.json b/plugins/Actions/lang/da.json
index 2b6217806e9f510e0ab114ba55bfc9659c874f9a..f7bb0dd23445d9a4231fee36cb47c885008b8964 100644
--- a/plugins/Actions/lang/da.json
+++ b/plugins/Actions/lang/da.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Gennemsnit baseret på %s hits %s mellem %s og %s",
+ "AvgGenerationTimeTooltip": "Gennemsnit baseret på %1$s hits %2$s mellem %3$s og %4$s",
"ColumnClickedURL": "Klikkede URL",
"ColumnClicks": "Klik",
"ColumnClicksDocumentation": "Antal gange linket blev klikket på.",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "Et udgående link er et link, der fører den besøgende væk fra hjemmesiden (til et andet domæne)",
"OutlinksReportDocumentation": "Rapporten viser en hierarkisk liste over udgående netadresser, der blev klikket på af de besøgende",
"PagesReportDocumentation": "Rapporten indeholder oplysninger om sidens netadresser, der er blevet besøgt. %s tabellen er arrangeret hierarkisk, netadresserne vises i en mappestruktur.",
- "PageTitlesReportDocumentation": "Rapporten indeholder oplysninger om titlerne på de sider, der er blevet besøgt. %s side titel er HTML %s mærket, som de fleste netlæsere viser i vinduetitlen.",
+ "PageTitlesReportDocumentation": "Rapporten indeholder oplysninger om titlerne på de sider, der er blevet besøgt. %1$s side titel er HTML %2$s mærket, som de fleste netlæsere viser i vinduetitlen.",
"PageUrls": "Side URL'er",
"PluginDescription": "Rapporter om sidevisninger og sidetitler. Gør det muligt at måle det interne websted søgemaskine. Sporer automatisk klik på eksterne links og filhentninger.",
"SiteSearchCategories1": "Rapporten viser de kategorier, som de besøgende valgte, da de lavede en søgning på hjemmesiden.",
diff --git a/plugins/Actions/lang/de.json b/plugins/Actions/lang/de.json
index ffefdf14be14fa6f94b90548eaec87f992961e54..52e3720409acd6db1744c2629f332efe6351ebd1 100644
--- a/plugins/Actions/lang/de.json
+++ b/plugins/Actions/lang/de.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Durchschnitt basierend auf %s Aufruf(en) %s zwischen %s und %s",
+ "AvgGenerationTimeTooltip": "Durchschnitt basierend auf %1$s Aufruf(en) %2$s zwischen %3$s und %4$s",
"ColumnClickedURL": "Angeklickte URL",
"ColumnActionURL": "Aktions-URL",
"ColumnClicks": "Klicks",
@@ -38,7 +38,7 @@
"OutlinkDocumentation": "Ein ausgehender Verweis ist ein Link der einen Besucher auf eine andere Website führt (auf eine andere Domain).",
"OutlinksReportDocumentation": "Dieser Bericht zeigt eine hierarchisch angeordnete Liste von ausgehenden Links, die von ihren Besuchern angeklickt wurden.",
"PagesReportDocumentation": "Dieser Bericht enthält Informationen über die URLs der besuchten Seiten. %s Die Tabelle ist hierarchisch strukturiert, die URLs werden als Ordnerstruktur angezeigt.",
- "PageTitlesReportDocumentation": "Dieser Bericht enthält Informationen über die Seitentitel der besuchten Seiten. %s Der Seitentitel ist der HTML %s Tag, der von den meisten Browsern in ihrer Titelleiste angezeigt wird.",
+ "PageTitlesReportDocumentation": "Dieser Bericht enthält Informationen über die Seitentitel der besuchten Seiten. %1$s Der Seitentitel ist der HTML %2$s Tag, der von den meisten Browsern in ihrer Titelleiste angezeigt wird.",
"PageUrls": "Seiten URL",
"PluginDescription": "Berichte über die Seitenansichten und Seitentitel. Lässt Sie die internen Suchmaschinen Ihrer Website erfassen. Trackt Klicks auf externe Links und Dateidownloads automatisch.",
"SiteSearchCategories1": "Dieser Bericht zeigt die Kategorien, welche bei der internen Suche ausgewählt wurden.",
@@ -61,6 +61,7 @@
"WidgetPageUrlsFollowingSearch": "Besuchte Seiten nach einer internen Suche",
"WidgetSearchCategories": "Suchkategorien",
"WidgetSearchKeywords": "Suchbegriffe (interne Suche)",
- "WidgetSearchNoResultKeywords": "Suchbegriffe ohne Ergebnisse"
+ "WidgetSearchNoResultKeywords": "Suchbegriffe ohne Ergebnisse",
+ "ActionType": "Typ der Aktion"
}
}
\ No newline at end of file
diff --git a/plugins/Actions/lang/el.json b/plugins/Actions/lang/el.json
index 5efdf4a061c048b07da92eeb88798db73ce4da0b..e80eb4151aaeb812fe2e2c67ba6e1af20703e4df 100644
--- a/plugins/Actions/lang/el.json
+++ b/plugins/Actions/lang/el.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "ÎœÎσος ÏŒÏος βάσει των %s επισκÎψεων %s Î¼ÎµÏ„Î±Î¾Ï %s και %s",
+ "AvgGenerationTimeTooltip": "ÎœÎσος ÏŒÏος βάσει %1$s επισκÎψεων %2$s Î¼ÎµÏ„Î±Î¾Ï %3$s και %4$s",
"ColumnClickedURL": "URL επιλογής",
"ColumnActionURL": "ΔιεÏθυνση URL ενÎÏγειας",
"ColumnClicks": "Κλικ",
@@ -38,7 +38,7 @@
"OutlinkDocumentation": "Ένας εξωτεÏικός σÏνδεσμος είναι Îνας σÏνδεσμος που οδηγεί τον επισκÎπτη εκτός της ιστοσελίδας (σε άλλη).",
"OutlinksReportDocumentation": "Αυτή η αναφοÏά δείχνει μια ιεÏαÏχημÎνη λίστα με εξωτεÏικοÏÏ‚ συνδÎσμους διευθÏνσεων ιστοσελίδων που πατήθηκαν από τους επισκÎπτες σας.",
"PagesReportDocumentation": "Αυτή η αναφοÏά πεÏιÎχει πληÏοφοÏίες σχετικά με τις επισκεφθείσες διευθÏνσεις σελίδων. %s Ο πίνακας ταξινομείται ιεÏαÏχικά, οι διευθÏνσεις σελίδων εμφανίζονται με δομή φακÎλου.",
- "PageTitlesReportDocumentation": "Αυτή η αναφοÏά πεÏιÎχει πληÏοφοÏίες για τους τίτλους των επισκεφθεισών σελίδων. %s Ο τίτλος σελίδας είναι η ετικÎτα HTML %s που οι πεÏισσότεÏοι φυλλομετÏητÎÏ‚ δείχνουν στον τίτλο του παÏαθÏÏου τους.",
+ "PageTitlesReportDocumentation": "Η αναφοÏά αυτή πεÏιÎχει πληÏοφοÏίες σχετικά με τους τίτλους των σελίδων που επισκÎφθηκαν οι χÏήστες. %1$s Ο τίτλος της σελίδας είναι η σήμανση HTML %2$s που τα πεÏισσότεÏα Ï€ÏογÏάμματα πλοήγησης δείχνουν στον τίτλο του παÏαθÏÏου τους.",
"PageUrls": "ΔιευθÏνσεις σελίδων",
"PluginDescription": "ΑναφÎÏει σχετικά με τις αναγνώσεις σελίδων και τους τίτλους τους. ΕπιτÏÎπει την μÎÏ„Ïηση της εσωτεÏικής μηχανής αναζήτησης του ιστοτόπου σας. Αυτόματα παÏακολουθεί τα κλικ Ï€Ïος εξωτεÏικοÏÏ‚ συνδÎσμους και κατεβάσματα αÏχείων.",
"SiteSearchCategories1": "Αυτή η αναφοÏά δημιουÏγεί λίστα με τις ΚατηγοÏίες που οι επισκÎπτες επÎλεξαν όταν Îκαναν μια Αναζήτηση στην ιστοσελίδα σας.",
diff --git a/plugins/Actions/lang/en.json b/plugins/Actions/lang/en.json
index f176db870d00315684c7a758eaf243916b1eb8a6..f7669812c0adcf51d79bfe521f7d024b08202673 100644
--- a/plugins/Actions/lang/en.json
+++ b/plugins/Actions/lang/en.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Average based on %s hit(s) %s between %s and %s",
+ "AvgGenerationTimeTooltip": "Average based on %1$s hit(s) %2$s between %3$s and %4$s",
"ColumnClickedURL": "Clicked URL",
"ColumnActionURL": "Action URL",
"ColumnClicks": "Clicks",
@@ -38,7 +38,7 @@
"OutlinkDocumentation": "An outlink is a link that leads the visitor away from your website (to another domain).",
"OutlinksReportDocumentation": "This report shows a hierarchical list of outlink URLs that were clicked by your visitors.",
"PagesReportDocumentation": "This report contains information about the page URLs that have been visited. %s The table is organized hierarchically, the URLs are displayed as a folder structure.",
- "PageTitlesReportDocumentation": "This report contains information about the titles of the pages that have been visited. %s The page title is the HTML %s Tag that most browsers show in their window title.",
+ "PageTitlesReportDocumentation": "This report contains information about the titles of the pages that have been visited. %1$s The page title is the HTML %2$s Tag that most browsers show in their window title.",
"PageUrls": "Page URLs",
"PluginDescription": "Reports about the page views and page titles. Lets you measure your internal website's search engine. Automatically tracks clicks on external links and file downloads. ",
"SiteSearchCategories1": "This report lists the Categories that visitors selected when they made a Search on your website.",
diff --git a/plugins/Actions/lang/es.json b/plugins/Actions/lang/es.json
index 39f287079ea839a0a8166f00899c987ad7412e10..739ec1ba1d32fe26052921568cdbf137a28a052d 100644
--- a/plugins/Actions/lang/es.json
+++ b/plugins/Actions/lang/es.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Promedio basado en %s acceso(s) %s entre %s y %s",
+ "AvgGenerationTimeTooltip": "Promedio basado en %1$s acceso(s) %2$s entre %3$s y %4$s",
"ColumnClickedURL": "URL elegida",
"ColumnClicks": "Clics",
"ColumnClicksDocumentation": "El número de veces que se ha hecho clic en este enlace.",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "Un enlace externo es un enlace que lleva a su visitante fuera de su página de internet (a otro dominio).",
"OutlinksReportDocumentation": "Este informe muestra una lista jerárquica de los enlaces externos en los que sus visitantes han hecho clic.",
"PagesReportDocumentation": "Este reporte contiene información sobre las URLs de las páginas que han sido visitadas. %s La tabla está organizada por jerarquÃa, las URLs han sido mostradas como una estructura de carpetas.",
- "PageTitlesReportDocumentation": "Este informe contiene información sobre los tÃtulos de las páginas que han sido visitadas. %s El tÃtulo de la página es la etiqueta HTML %s, que la gran mayorÃa de los navegadores muestran en el tÃtulo de su ventana.",
+ "PageTitlesReportDocumentation": "Este informe contiene información sobre los tÃtulos de las páginas que han sido visitadas. %1$s El tÃtulo de la página es la etiqueta HTML %2$s, que la gran mayorÃa de los navegadores muestran en el tÃtulo de su ventana.",
"PageUrls": "URLs de página",
"PluginDescription": "Informa sobre las vistas y tÃtulos de página. Le permite medir el motor de búsqueda interno de tu sitio de internet. Monitoriza automáticamente los clics de enlaces externos y descargas de archivos.",
"SiteSearchCategories1": "Este informe lista las CategorÃas que los visitantes eligieron cuando realizaron una búsqueda en su sitio de internet.",
diff --git a/plugins/Actions/lang/et.json b/plugins/Actions/lang/et.json
index eedc595652d4fc3fb304b809b5f73981857e82cf..9c1c48cfc6ce664ec8f6f84ffb4fcfc8ba4f4b0e 100644
--- a/plugins/Actions/lang/et.json
+++ b/plugins/Actions/lang/et.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Keskmine, mis baseerub %s laadimisel %s, %s ja %s vahel.",
+ "AvgGenerationTimeTooltip": "Keskmine, mis baseerub %1$s laadimisel %2$s, %3$s ja %4$s vahel.",
"ColumnClickedURL": "Külastatud URL",
"ColumnClicks": "Hiireklikke",
"ColumnClicksDocumentation": "Arv, mitu korda antud linki on klikitud.",
diff --git a/plugins/Actions/lang/fa.json b/plugins/Actions/lang/fa.json
index 2c7a55ad74811fc345e3e734791de6f230cc0dc5..7937515a3de961ad445987b6a77b3575c51bd383 100644
--- a/plugins/Actions/lang/fa.json
+++ b/plugins/Actions/lang/fa.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "میانگین بر اساس %s کلیک %s بین %s و %s",
+ "AvgGenerationTimeTooltip": "میانگین بر اساس %1$s کلیک %2$s بین %3$s و %4$s",
"ColumnClickedURL": "آدرس کلیک شده",
"ColumnClicks": "کلیک ها",
"ColumnClicksDocumentation": "تعداد دÙعاتی Ú©Ù‡ بر روی این لینک کلیک شده است.",
@@ -34,7 +34,7 @@
"OutlinkDocumentation": "لینک یک لینک که منجر بازدید کننده از وب سایت خود را به یکی دیگر از دامنه است.",
"OutlinksReportDocumentation": "این گزارش نشان می دهد یک لیست سلسله مراتبی آدرس از لینک که کلیک بازدید کنندگان شما شد.",
"PagesReportDocumentation": "این گزارش شامل اطلاعاتی درباره URLهای صÙØÙ‡ هایی است Ú©Ù‡ بازدید شده اند. %s جدول به صورت سلسله مراتبی سازماندهی شده است Ùˆ URLها به عنوان پوشه نمایش داده شده اند.",
- "PageTitlesReportDocumentation": "این گزارش شامل اطلاعاتی درباره عنوان صÙØÙ‡ هایی است Ú©Ù‡ بازدید شده اند. %s عنوان صÙØÙ‡ تگ %s HTML است Ú©Ù‡ اغلب مرورگرها در عنوان پنجره هایشان نمایش Ù…ÛŒ دهند.",
+ "PageTitlesReportDocumentation": "این گزارش شامل اطلاعاتی درباره عنوان صÙØÙ‡ هایی است Ú©Ù‡ بازدید شده اند. %1$s عنوان صÙØÙ‡ تگ %2$s HTML است Ú©Ù‡ اغلب مرورگرها در عنوان پنجره هایشان نمایش Ù…ÛŒ دهند.",
"PageUrls": "آدرس صÙØات",
"SiteSearchCategories1": "این گزارش مجموعه هایی را Ùهرست Ù…ÛŒ کند Ú©Ù‡ بازدیدکنندگان هنگام جستجو در سایت شما , آن را انتخاب نموده اند.",
"SiteSearchCategories2": "برای نمونه , وبسایت های تجاری معمولا \"مجموعه\"هایی برای انتخاب دارند Ú©Ù‡ به بازدیدکنندگان اجازه Ù…ÛŒ دهد جستجوهایشان را از تمام Ù…Øصولات به مجموعه ای از Ù…Øصولات Ù…Øدود کنند.",
diff --git a/plugins/Actions/lang/fi.json b/plugins/Actions/lang/fi.json
index 250e73c416df6941768d712fcaafdd72e981f151..cb7a0a31ca08be0d7c8c6f8b16b6d39d9179445a 100644
--- a/plugins/Actions/lang/fi.json
+++ b/plugins/Actions/lang/fi.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Keskiarvo %s osumasta %s %s - %s",
+ "AvgGenerationTimeTooltip": "Keskiarvo %1$s osumasta %2$s %3$s - %4$s",
"ColumnClickedURL": "Klikattu URL",
"ColumnClicks": "Klikkaukset",
"ColumnClicksDocumentation": "Tämän linkin klikkausten määrä.",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "Lähtevä linkki on linkki, joka vie kävijän pois sinun sivultasi (eri verkkotunnukseen).",
"OutlinksReportDocumentation": "Tämä raportti näyttää hierarkisen listan lähtevistä osoitteista, joita kävijät ovat seuranneet.",
"PagesReportDocumentation": "Tämä raportti sisältää tietoa sivuista, joilla on käyty. %s Taulukko on organisoitu hierarkisesti, URL:t näytetään puurakenteena.",
- "PageTitlesReportDocumentation": "Tämä raportti sisältää tietoa käytyjen sivujen otsikoista. %s Sivun otsikko on HTML:n %s-tagi, jonka useimmat selaimet näyttävät ikkunan otsikossa.",
+ "PageTitlesReportDocumentation": "Tämä raportti sisältää tietoa käytyjen sivujen otsikoista. %1$s Sivun otsikko on HTML:n %2$s-tagi, jonka useimmat selaimet näyttävät ikkunan otsikossa.",
"PageUrls": "Sivujen URL:t",
"SiteSearchCategories1": "Tämä raportti listaa kategoriat jotka kävijät valitsivat.",
"SiteSearchCategories2": "Esimerkiksi e-kauppojen sivuilla on tyypillisesti \"Kategoria\"-valitsin, jolla käyttäjät voivat rajoittaa hakutuloksia.",
diff --git a/plugins/Actions/lang/fr.json b/plugins/Actions/lang/fr.json
index 57786864359860a8ce6b12151fa454f6cddec0c7..38fc3bd0712fbfb6aba74f6b09d94a86f027ceac 100644
--- a/plugins/Actions/lang/fr.json
+++ b/plugins/Actions/lang/fr.json
@@ -1,6 +1,5 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Moyenne basée sur %s entrée(s) sur %s entre %s et %s",
"ColumnClickedURL": "URL cliquées",
"ColumnActionURL": "URL d'action",
"ColumnClicks": "Clics",
@@ -38,7 +37,7 @@
"OutlinkDocumentation": "Un lien sortant est un lien qui mène le visiteur en dehors de votre site web (vers un autre domaine).",
"OutlinksReportDocumentation": "Ce rapport affiche une liste hiérarchique de liens sortants sur lesquels ont cliqué vos visiteurs.",
"PagesReportDocumentation": "Ce rapport contient des informations à propos des URLs qui ont été visitées. %s Le tableau est organisé hiérarchiquement, les URLs sont affichées en structure de dossier.",
- "PageTitlesReportDocumentation": "Ce rapport contient des informations à propos des titres des pages qui ont été visitées. %s Le titre de la page est le tag HTML %s que la plupart des navigateurs affichent dans le titre de la fenêtre.",
+ "PageTitlesReportDocumentation": "Ce rapport contient des informations à propos des titres des pages qui ont été visitées. %1$s Le titre de la page est le tag HTML %2$s que la plupart des navigateurs affichent dans le titre de la fenêtre.",
"PageUrls": "URL de la page",
"PluginDescription": "Rapports à propos des vues et titres de pages. Vous permet de suivre l'utilisation du moteur de recherche interne de votre site web. Trace automatiquement les clics sur des liens externes et téléchargements de fichiers.",
"SiteSearchCategories1": "Ce rapport liste les catégories que les visiteurs ont sélectionnées lorsqu'ils ont effectué une recherche sur votre site web.",
diff --git a/plugins/Actions/lang/he.json b/plugins/Actions/lang/he.json
index 4604c2a255ad9adcacfd06b17807cccb0e80de75..3eb3ee982e0156b92c1278d9acb4b9abec7eccc1 100644
--- a/plugins/Actions/lang/he.json
+++ b/plugins/Actions/lang/he.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "ממוצע מבוסס על %s מופע(×™×) %s בין %s ו-%s",
+ "AvgGenerationTimeTooltip": "ממוצע מבוסס על %1$s מופע(×™×) %2$s בין %3$s ו-%4$s",
"ColumnClickedURL": "כתובת ×©× ×œ×—×¦×”",
"ColumnClicks": "לחיצות",
"ColumnClicksDocumentation": "מספר ×”×¤×¢×ž×™× ×©×§×™×©×•×¨ ×–×” × ×œ×—×¥",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "קישור ×™×•×¦× ×”×•× ×§×™×©×•×¨ שמוביל ×ת המשתמש מחוץ ל×תרך (לדומיין ×חר).",
"OutlinksReportDocumentation": "דו״ח ×–×” מציג רשימה היררכית של כתובות ×©× ×œ×—×¦×• על ידי משתמשי ×תרך.",
"PagesReportDocumentation": "דו״ח ×–×” מכיל מידע ×ודות כתובת ×¢×ž×•×“×™× ×©×‘×•×§×¨×•. %s הטבלה מ××•×¨×’× ×ª ב×ופן היררכי, הכתובות מוצגות ×›×ž×‘× ×” תיקיות.",
- "PageTitlesReportDocumentation": "דו״ח ×–×” מכיל מידע ×ודות כותרות ×”×¢×ž×•×“×™× ×©×‘×•×§×¨×•. %s כותרת העמוד ×”×™× ×ª×’×™×ª HTML %s שרוב ×”×“×¤×“×¤× ×™× ×ž×¦×™×’×™× ×‘×›×•×ª×¨×ª החלון שלה×.",
+ "PageTitlesReportDocumentation": "דו״ח ×–×” מכיל מידע ×ודות כותרות ×”×¢×ž×•×“×™× ×©×‘×•×§×¨×•. %1$s כותרת העמוד ×”×™× ×ª×’×™×ª HTML %2$s שרוב ×”×“×¤×“×¤× ×™× ×ž×¦×™×’×™× ×‘×›×•×ª×¨×ª החלון שלה×.",
"PageUrls": "כתובות עמוד",
"SiteSearchCategories1": "דו״ח ×–×” מציג רשימה של קטגוריות ×©×ž×‘×§×¨×™× ×‘×—×¨×• ×›×שר חיפשו ב×תרך.",
"SiteSearchCategories2": "לדוגמה, ×תרי מסחר ×ž×§×•×•× ×™× ×ž×¦×™×’×™× ×‘×“×´×› בחירת ״קטגוריה״ כדי ×©×”×ž×‘×§×¨×™× ×™×•×›×œ×• ×œ×¦×ž×¦× ×ת תוצ×ות החיפוש ×œ×ž×•×¦×¨×™× ×‘×§×˜×’×•×¨×™×” מסויימת.",
diff --git a/plugins/Actions/lang/hi.json b/plugins/Actions/lang/hi.json
index 2b4e8ae53c1ba93e24ec3da780235bb406c392ae..ed3ec18412d11f886bb2a7d0c987a03d4dfd01f5 100644
--- a/plugins/Actions/lang/hi.json
+++ b/plugins/Actions/lang/hi.json
@@ -35,7 +35,7 @@
"OutlinkDocumentation": "आउटलिंक उस लिंक को कहा जाता है जो आपकी वेबसाइट पर आये वà¥à¤¯à¤•à¥à¤¤à¤¿à¤¯à¥‹à¤‚ को किसी अनà¥à¤¯ वेबसाइट पर ले जाता है।",
"OutlinksReportDocumentation": "इस रिपोरà¥à¤Ÿ में अपने आगंतà¥à¤•à¥‹à¤‚ दà¥à¤µà¤¾à¤°à¤¾ कà¥à¤²à¤¿à¤• किया गया है कि बाहर कड़ी यूआरà¤à¤² की à¤à¤• पदानà¥à¤•à¥à¤°à¤®à¤¿à¤¤ सूची दिखाता है.",
"PagesReportDocumentation": "इस रिपोरà¥à¤Ÿ का दौरा किया गया है कि पृषà¥à¤ यूआरà¤à¤² के बारे में जानकारी शामिल हैं. तालिका %s पदानà¥à¤•à¥à¤°à¤® रूप से आयोजित किया जाता है, यूआरà¤à¤² à¤à¤• फ़ोलà¥à¤¡à¤° संरचना के रूप में पà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ कर रहे हैं.",
- "PageTitlesReportDocumentation": "इस रिपोरà¥à¤Ÿ का दौरा किया गया है कि पृषà¥à¤ ों के शीरà¥à¤·à¤• के बारे में जानकारी शामिल हैं. %s पृषà¥à¤ शीरà¥à¤·à¤• सबसे बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤°à¥‹à¤‚ अपने विंडो शीरà¥à¤·à¤• में पता चलता है कि à¤à¤šà¤Ÿà¥€à¤à¤®à¤à¤² %s टैग है.",
+ "PageTitlesReportDocumentation": "इस रिपोरà¥à¤Ÿ का दौरा किया गया है कि पृषà¥à¤ ों के शीरà¥à¤·à¤• के बारे में जानकारी शामिल हैं. %1$s पृषà¥à¤ शीरà¥à¤·à¤• सबसे बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤°à¥‹à¤‚ अपने विंडो शीरà¥à¤·à¤• में पता चलता है कि à¤à¤šà¤Ÿà¥€à¤à¤®à¤à¤² %2$s टैग है.",
"PageUrls": "पृषà¥à¤ ों के यूआरà¤à¤²",
"SiteSearchCategories1": "यह रिपोरà¥à¤Ÿ है कि वे अपनी वेबसाइट पर à¤à¤• खोज कर दिया जब आगंतà¥à¤•à¥‹à¤‚ दà¥à¤µà¤¾à¤°à¤¾ चयनित शà¥à¤°à¥‡à¤£à¤¿à¤¯à¤¾à¤ सूचीबदà¥à¤§ करता है.",
"SiteSearchCategories2": "आगंतà¥à¤•à¥‹à¤‚ को à¤à¤• विशिषà¥à¤Ÿ शà¥à¤°à¥‡à¤£à¥€ में सà¤à¥€ उतà¥à¤ªà¤¾à¤¦à¥‹à¤‚ को उनकी खोजों को सीमित कर सकते हैं इतना है कि उदाहरण के लिà¤, ईकॉमरà¥à¤¸ वेबसाइटों आम तौर पर à¤à¤• \"शà¥à¤°à¥‡à¤£à¥€\" चयनकरà¥à¤¤à¤¾ है.",
diff --git a/plugins/Actions/lang/hu.json b/plugins/Actions/lang/hu.json
index da97381cb10085607f792413ec299c277f53ce04..10bd2d1d9674cf94737d2c73b95daa539bcada77 100644
--- a/plugins/Actions/lang/hu.json
+++ b/plugins/Actions/lang/hu.json
@@ -29,7 +29,7 @@
"ExitPageTitlesReportDocumentation": "Ez a jelentés az adott idÅ‘ alatt felmerült kilépési oldalak cÃmeit és statisztikáit foglalja össze.",
"OneSearch": "1 keresés",
"PagesReportDocumentation": "Ez a jelentés a megtekintett URL-ekről tartalmaz információkat. %s A tábla hierarchigusan van szervezve, az URL-ek mappaként jelennek meg.",
- "PageTitlesReportDocumentation": "Ez a jelentés a megtekintett oldalak cÃmérÅ‘l tartalmaz információkat. %s Az oldal cÃme a %s HTML Tag, amit a legtöbb bönkészÅ‘ az ablak cÃmsorában mutat.",
+ "PageTitlesReportDocumentation": "Ez a jelentés a megtekintett oldalak cÃmérÅ‘l tartalmaz információkat. %1$s Az oldal cÃme a %2$s HTML Tag, amit a legtöbb bönkészÅ‘ az ablak cÃmsorában mutat.",
"PageUrls": "Oldal hivatkozások",
"SiteSearchKeyword": "Kulcsszó (Oldal keresés)",
"SubmenuPagesEntry": "Belépési lapok",
diff --git a/plugins/Actions/lang/id.json b/plugins/Actions/lang/id.json
index 13dd0fdc13f0553179f6c5a7d465f2515d2779f3..9fd65b060cee9c2ae10e7f86ec176f2a0bc19098 100644
--- a/plugins/Actions/lang/id.json
+++ b/plugins/Actions/lang/id.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Rerata berdasar %s kunjungan %s antara %s dan %s",
+ "AvgGenerationTimeTooltip": "Rerata berdasar %1$s kunjungan %2$s antara %3$s dan %4$s",
"ColumnClickedURL": "URL diklik",
"ColumnClicks": "Klik",
"ColumnClicksDocumentation": "Jumlah tautan ini diklik.",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "Tautan keluar merupakan tautan yang mengarahkan keluar pengunjung dari situs Anda (ke ranah lainnya).",
"OutlinksReportDocumentation": "Laporan ini menampilkan laporan secara berurutan tautan keluar URL yang diklik oleh pengunjung Anda.",
"PagesReportDocumentation": "Laporan ini mengandung informasi tentang URL halaman yang dikunjungi. %s Tabel diatur berurutan, URL ditampilkan sebagai struktur map.",
- "PageTitlesReportDocumentation": "Laporan ini mengandung informasi tentang judul halaman yang telah dikunjungi. %s Judul halaman merupakan Etiket %s HTML yang kebanyakan peramban ditampilkan di judul jendela.",
+ "PageTitlesReportDocumentation": "Laporan ini mengandung informasi tentang judul halaman yang telah dikunjungi. %1$s Judul halaman merupakan Etiket %2$s HTML yang kebanyakan peramban ditampilkan di judul jendela.",
"PageUrls": "URL Halaman",
"PluginDescription": "Laporan mengenai tampilan dan judul halaman. Membantu Anda mengukur mesin pencarian internal situs web Anda. Pelacakan klik otomatis dalam tautan eksternal dan berkas unduhan.",
"SiteSearchCategories1": "Lapotan ini mendaftar Kategori dipilih oleh pengunjung ketika membuat Pencarian di situs Anda.",
diff --git a/plugins/Actions/lang/it.json b/plugins/Actions/lang/it.json
index f65519415f413ad6ef637426e9e31d9242a59c1d..46383b7e2edea2b4a1ba925bab93f83178337091 100644
--- a/plugins/Actions/lang/it.json
+++ b/plugins/Actions/lang/it.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Media basata su %s hits %s tra %s e %s",
+ "AvgGenerationTimeTooltip": "Media basata su %1$s hits %2$s tra %3$s e %4$s",
"ColumnClickedURL": "URL Cliccate",
"ColumnActionURL": "URL dell'azione",
"ColumnClicks": "Click",
@@ -38,7 +38,7 @@
"OutlinkDocumentation": "Un link esterno è un link che conduce il visitatore lontano dal tuo sito web (in un altro dominio)",
"OutlinksReportDocumentation": "Questo report mostra un elenco gerarchico di link esterni che sono stati cliccati dai visitatori.",
"PagesReportDocumentation": "Questo report contiene informazioni riguardo gli URL delle pagine che sono state viste. %s La tabella è organizzata gerarchicamente, gli URL vengono visualizzati come una struttura di cartelle.",
- "PageTitlesReportDocumentation": "Questo report contiene informazioni sui titoli delle pagine che sono state visitate. %s Il titolo della pagina è il tag HTML %s che la maggior parte dei browser mostrano nel titolo della loro finestra.",
+ "PageTitlesReportDocumentation": "Questo report contiene informazioni sui titoli delle pagine che sono state visitate. %1$s Il titolo della pagina è il tag HTML %2$s che la maggior parte dei browser mostrano nel titolo della loro finestra.",
"PageUrls": "URL delle pagine",
"PluginDescription": "Riporta le viste e i titoli pagina. Ti consente di misurare il motore di ricerca interno al tuo sito. Traccia in automatico i click sui link esterni e i download dei files.",
"SiteSearchCategories1": "Questo report elenca le Categorie che i visitatori hanno selezionato nel fare una ricerca sul vostro sito.",
diff --git a/plugins/Actions/lang/ja.json b/plugins/Actions/lang/ja.json
index c752f0ece44f24a4ff1fd21c9c5ed77d0449f7da..28463ef0e8e3c4ea458188b6bd003b1e392712ff 100644
--- a/plugins/Actions/lang/ja.json
+++ b/plugins/Actions/lang/ja.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "%s ～ %s ã®é–“ã® %s ã®ãƒ’ット %s ã«åŸºã¥ãå¹³å‡",
+ "AvgGenerationTimeTooltip": "%3$s ～ %4$s ã®é–“ã® %2$s ã®ãƒ’ット %1$s ã«åŸºã¥ãå¹³å‡",
"ColumnClickedURL": "クリックã•ã‚ŒãŸ URL",
"ColumnActionURL": "アクション URL",
"ColumnClicks": "クリック数",
@@ -38,7 +38,7 @@
"OutlinkDocumentation": "外部リンクã¨ã¯ã‚µã‚¤ãƒˆå†…ã‹ã‚‰å¤–部ã®ã‚µã‚¤ãƒˆã¸ï¼ˆä»–ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã¸ï¼‰ã®ãƒªãƒ³ã‚¯ã§ã™ã€‚",
"OutlinksReportDocumentation": "訪å•è€…ãŒã‚¯ãƒªãƒƒã‚¯ã—ãŸå¤–部リンクã®URLã‚’éšŽå±¤æ§‹é€ ã®ãƒªã‚¹ãƒˆã§è¡¨ç¤ºã—ãŸãƒªãƒãƒ¼ãƒˆã§ã™ã€‚",
"PagesReportDocumentation": "ã“ã‚Œã¯è¨ªå•ã•ã‚ŒãŸãƒšãƒ¼ã‚¸URLã«ã¤ã„ã¦ã®ãƒªãƒãƒ¼ãƒˆã§ã™ã€‚%s 表ã¯éšŽå±¤æ§‹é€ ã«ãªã£ã¦ãŠã‚Šã€URLã¯ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ã®éšŽå±¤ã§è¡¨ç¤ºã•ã‚Œã¦ã„ã¾ã™ã€‚",
- "PageTitlesReportDocumentation": "ã“ã‚Œã¯è¨ªå•ã•ã‚ŒãŸãƒšãƒ¼ã‚¸ã‚¿ã‚¤ãƒˆãƒ«ã«ã¤ã„ã¦ã®ãƒªãƒãƒ¼ãƒˆã§ã™ã€‚%s ページタイトルã¯å¤šãã®ãƒ–ラウザã§ã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦ã®ã‚¿ã‚¤ãƒˆãƒ«ã«è¡¨ç¤ºã•ã‚Œã‚‹HTMLã® %s ã‚¿ã‚°ã§ã™ã€‚",
+ "PageTitlesReportDocumentation": "ã“ã‚Œã¯è¨ªå•ã•ã‚ŒãŸãƒšãƒ¼ã‚¸ã‚¿ã‚¤ãƒˆãƒ«ã«ã¤ã„ã¦ã®ãƒªãƒãƒ¼ãƒˆã§ã™ã€‚%1$s ページタイトルã¯å¤šãã®ãƒ–ラウザã§ã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦ã®ã‚¿ã‚¤ãƒˆãƒ«ã«è¡¨ç¤ºã•ã‚Œã‚‹HTMLã® %2$s ã‚¿ã‚°ã§ã™ã€‚",
"PageUrls": "ページURL",
"PluginDescription": "ページ ビューã¨ãƒšãƒ¼ã‚¸ã®ã‚¿ã‚¤ãƒˆãƒ«ã«ã¤ã„ã¦ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã€‚内部ã®ã‚¦ã‚§ãƒ–サイトã®æ¤œç´¢ã‚¨ãƒ³ã‚¸ãƒ³ã‚’測定ã§ãã¾ã™ã€‚自動的ã«å¤–部リンクã¨ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã®ã‚¯ãƒªãƒƒã‚¯ã‚’追跡ã—ã¾ã™ã€‚",
"SiteSearchCategories1": "ã“ã®ãƒ¬ãƒãƒ¼ãƒˆã¯ã€è¨ªå•è€…ãŒã‚µã‚¤ãƒˆã§æ¤œç´¢ã—ãŸæ™‚ã«é¸æŠžã—ãŸã‚«ãƒ†ã‚´ãƒªã®ä¸€è¦§ã§ã™ã€‚",
diff --git a/plugins/Actions/lang/ko.json b/plugins/Actions/lang/ko.json
index 34288ee7745d067fb4c8707c83004a951724bb60..9c56c417656b49c56c7492ce74436f8d2fc77b47 100644
--- a/plugins/Actions/lang/ko.json
+++ b/plugins/Actions/lang/ko.json
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "외부 ë§í¬ëŠ” 사ì´íŠ¸ ë‚´ì—ì„œ 외부 사ì´íŠ¸(다른 ë„ë©”ì¸)ë¡œì˜ ë§í¬ìž…니다.",
"OutlinksReportDocumentation": "ì´ ë³´ê³ ì„œëŠ” 방문ìžê°€ í´ë¦ í•œ 외부 ë§í¬ì˜ URLì„ ê³„ì¸µ 구조 목ë¡ìœ¼ë¡œ 표시합니다.",
"PagesReportDocumentation": "ì´ ë³´ê³ ì„œëŠ” 방문한 페ì´ì§€ URLì— ëŒ€í•œ ì •ë³´ìž…ë‹ˆë‹¤. %s í…Œì´ë¸”ì€ ê³„ì¸µ 구조로 ë˜ì–´ 있으며, URLì€ í´ë” 구조로 표시ë©ë‹ˆë‹¤.",
- "PageTitlesReportDocumentation": "ì´ ë³´ê³ ì„œëŠ” 방문한 페ì´ì§€ ì œëª©ì— ëŒ€í•œ ì •ë³´ìž…ë‹ˆë‹¤. %s 페ì´ì§€ ì œëª©ì€ ëŒ€ë¶€ë¶„ì˜ ë¸Œë¼ìš°ì € 윈ë„ìš°ì˜ ì œëª©ì— í‘œì‹œë˜ëŠ” HTML %s 태그입니다.",
+ "PageTitlesReportDocumentation": "ì´ ë³´ê³ ì„œëŠ” 방문한 페ì´ì§€ ì œëª©ì— ëŒ€í•œ ì •ë³´ìž…ë‹ˆë‹¤. %1$s 페ì´ì§€ ì œëª©ì€ ëŒ€ë¶€ë¶„ì˜ ë¸Œë¼ìš°ì € 윈ë„ìš°ì˜ ì œëª©ì— í‘œì‹œë˜ëŠ” HTML %2$s 태그입니다.",
"PageUrls": "페ì´ì§€ URL",
"PluginDescription": "페ì´ì§€ 뷰와 ì œëª©ì— ëŒ€í•œ ë³´ê³ ì„œ. 내부 웹사ì´íŠ¸ 검색 ì—”ì§„ì„ ì¸¡ì •í• ìˆ˜ 있습니다. 외부 ë§í¬ í´ë¦ ë° íŒŒì¼ ë‹¤ìš´ë¡œë“œì— ëŒ€í•´ì„œë„ ìžë™ìœ¼ë¡œ 추ì 합니다.",
"SiteSearchCategories1": "ì´ ë³´ê³ ì„œëŠ” 웹사ì´íŠ¸ì—ì„œ ê²€ìƒ‰í–ˆì„ ë•Œ 방문ìžê°€ ì„ íƒí•œ ì¹´í…Œê³ ë¦¬ë¥¼ 나열합니다.",
diff --git a/plugins/Actions/lang/lt.json b/plugins/Actions/lang/lt.json
index e6c74dcb0baf0e1a1cbfbcfbc87191a979dc53ab..1514b94402e81f4d6097ec64eab91cc2076392ce 100644
--- a/plugins/Actions/lang/lt.json
+++ b/plugins/Actions/lang/lt.json
@@ -10,6 +10,7 @@
"SubmenuPagesEntry": "Užėjimo puslapiai",
"SubmenuPagesExit": "IÅ¡Ä—jimo puslapiai",
"SubmenuPageTitles": "Puslapių antraštės",
- "WidgetSearchCategories": "Paieškos kategorijos"
+ "WidgetSearchCategories": "Paieškos kategorijos",
+ "ActionType": "Veiksmo tipas"
}
}
\ No newline at end of file
diff --git a/plugins/Actions/lang/nb.json b/plugins/Actions/lang/nb.json
index 80e5c258630d3d01fe2fc0a075ade69c7d9ae250..742ac9ca334e0069ee763e74c3040d0eb6083dae 100644
--- a/plugins/Actions/lang/nb.json
+++ b/plugins/Actions/lang/nb.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Gjennomsnitt basert på %s treff %s mellom %s og %s",
+ "AvgGenerationTimeTooltip": "Gjennomsnitt basert på %1$s treff %2$s mellom %3$s og %4$s",
"ColumnClickedURL": "Klikket URL",
"ColumnActionURL": "Handlings-URL",
"ColumnClicks": "Klikk",
@@ -38,7 +38,7 @@
"OutlinkDocumentation": "En utlenke er en lenke som leder besøkeren bort fra ditt nettsted (til et annet domene).",
"OutlinksReportDocumentation": "Denne rapporten viser en hierarkisk liste av utlenkers URL-er som ble klikket av dine besøkere.",
"PagesReportDocumentation": "Denne rapporten inneholder informasjon om side-URLer som har blitt besøkt. %s Tabellen er organisert hierarkisk, URL-ene vises som en mappestruktur.",
- "PageTitlesReportDocumentation": "Denne rapporten inneholder informasjon om titler på sider som har blitt besøkt. %s Sidetittelen er HTML-taggen %s som de fleste nettlesere viser i vindustittelen.",
+ "PageTitlesReportDocumentation": "Denne rapporten inneholder informasjon om titler på sider som har blitt besøkt. %1$s Sidetittelen er HTML-taggen %2$s som de fleste nettlesere viser i vindustittelen.",
"PageUrls": "Side-URLer",
"PluginDescription": "Rapporter om sidevisninger org sidetitler. Lar deg måle ditt nettsteds interne søkemotor. Sporer klikk på eksterne lenker og nedlastinger automatisk.",
"SiteSearchCategories1": "Denne rapporten viser kategorier som besøkere velger når de søker på ditt nettsted.",
diff --git a/plugins/Actions/lang/nl.json b/plugins/Actions/lang/nl.json
index 4efc21cf6b66bb0c517a34b66bfc026d5c4d67d5..870ab3a19c8289481b5a125ccacc3bdcb3fdccd7 100644
--- a/plugins/Actions/lang/nl.json
+++ b/plugins/Actions/lang/nl.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Gemiddelde gebaseerd op %s hit(s) %s tussen %s en %s",
+ "AvgGenerationTimeTooltip": "Gemiddelde gebaseerd op %1$s hit(s) %2$s tussen %3$s en %4$s",
"ColumnClickedURL": "Aangeklikte URL",
"ColumnClicks": "Kliks",
"ColumnClicksDocumentation": "Aantal keer dat er op deze link geklikt is.",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "Een outlink is een link die de bezoeker leidt uit de buurt van uw website (naar een ander domein).",
"OutlinksReportDocumentation": "Dit rapport geeft een hiërarchische lijst van outlink URL's die zijn aangeklikt door uw bezoekers.",
"PagesReportDocumentation": "Dit rapport bevat informatie over de pagina-URL's die zijn bezocht. %s De tabel is hiërarchisch georganiseerd. De URL's worden weergegeven in een map structuur.",
- "PageTitlesReportDocumentation": "Dit rapport bevat informatie over de titels van de pagina's die zijn bezocht. %s De paginatitel is de HTML %s Tag dat de meeste browsers laten zien in hun window titel.",
+ "PageTitlesReportDocumentation": "Dit rapport bevat informatie over de titels van de pagina's die zijn bezocht. %1$s De paginatitel is de HTML %2$s Tag dat de meeste browsers laten zien in hun window titel.",
"PageUrls": "pagina-URL's",
"PluginDescription": "Rapporteert over pagina weergaven en pagina titels. Het maakt het zoekgedrag op je website inzichtelijk, geeft rapporten weer over outlinks en downloads.",
"SiteSearchCategories1": "Dit rapport toont de categorieën die bezoekers hebben geselecteerd bij het zoeken op uw website.",
diff --git a/plugins/Actions/lang/nn.json b/plugins/Actions/lang/nn.json
index 2d5f2115c4e0c8ef071eef1a304b19ec155b23e8..9af598c6d50cf3e8e7038545c7e1a7db33eebe87 100644
--- a/plugins/Actions/lang/nn.json
+++ b/plugins/Actions/lang/nn.json
@@ -24,7 +24,7 @@
"OutlinkDocumentation": "Ein utpeikar er ein peikar som leier vitjarane dine vekk frå nettsida di (til eit anna domene).",
"OutlinksReportDocumentation": "Denne rapporten viser ei hierarkisk liste av utpeikarar som vitjarane dine klikka på.",
"PagesReportDocumentation": "Denne rapporten inneheld informasjon om side-URLar som er vitja. %s Tabellen er organisert hierarkisk, URLane er vist som ein mappestruktur.",
- "PageTitlesReportDocumentation": "Denne rapporten inneheld informasjon om titlane til sidene som er vitja. %s Sidetittelen er HTML-entiteten %s som dei fleste nettlesarane viser som tittel på vindauget sitt.",
+ "PageTitlesReportDocumentation": "Denne rapporten inneheld informasjon om titlane til sidene som er vitja. %1$s Sidetittelen er HTML-entiteten %2$s som dei fleste nettlesarane viser som tittel på vindauget sitt.",
"PageUrls": "Side-URLar",
"SubmenuPagesEntry": "Inngangssider",
"SubmenuPagesExit": "Utgangssider",
diff --git a/plugins/Actions/lang/pl.json b/plugins/Actions/lang/pl.json
index 47201b927efacd9d18ea4881b234f9af64cb4375..8e325723454de36aa799a97f32a621aae49eb06f 100644
--- a/plugins/Actions/lang/pl.json
+++ b/plugins/Actions/lang/pl.json
@@ -1,9 +1,10 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Średnia podstawa dla %s trafień %s pomiędzy %s i %s",
+ "AvgGenerationTimeTooltip": "Średnia podstawa dla %1$s trafień %2$s pomiędzy %3$s i %4$s",
"ColumnClickedURL": "Kliknięty link URL",
+ "ColumnActionURL": "Adres URL Akcji",
"ColumnClicks": "Kliknięcia",
- "ColumnClicksDocumentation": "Ile razy ten link został kliknięty.",
+ "ColumnClicksDocumentation": "Ilość kliknięć na ten link.",
"ColumnDownloadURL": "Adres URL pobrań",
"ColumnEntryPageTitle": "Tytuł stron z których wchodzono",
"ColumnEntryPageURL": "Adres URL stron z których wchodzono",
@@ -37,7 +38,7 @@
"OutlinkDocumentation": "Link wyjściowy to link który prowadzi odwiedzającego poza twoją stronę (do innej domeny).",
"OutlinksReportDocumentation": "Ten raport pokazuje ustrukturyzowaną listę linków wychodzących które zostały kliknięte przez odwiedzających.",
"PagesReportDocumentation": "Ten raport zawiera informację o URL-ach stron które zostały odwiedzone. %s Tabela jest organizowana w hierarchii, URL-e są wyświetlane z uwzględnieniem struktury katalogów.",
- "PageTitlesReportDocumentation": "Ten raport zawiera informację o tytułach stron które zostały odwiedzone. %s Tytuł stron to %s znacznik HTML które większość przeglądarek wyświetla na belce tytułowej okna.",
+ "PageTitlesReportDocumentation": "Ten raport zawiera informację o tytułach stron które zostały odwiedzone. %1$s Tytuł stron to %2$s znacznik HTML które większość przeglądarek wyświetla na belce tytułowej okna.",
"PageUrls": "Strony URL",
"PluginDescription": "Raporty dotyczące odwiedzin i tytułów stron. Pozwala na analizę działania wewnętrznej wyszukiwarki serwisu. Automatycznie śledzi kliknięcia na linkach zewnętrznych i pobraniach plików.",
"SiteSearchCategories1": "Ten raport wyświetla listę Kategorii które odwiedzający wybrali kiedy używali wyszukiwarki na twojej stronie.",
@@ -59,7 +60,8 @@
"WidgetPageTitlesFollowingSearch": "Tytuły Stron po Wyszukiwaniu Strony",
"WidgetPageUrlsFollowingSearch": "Strony Występujące po Wyszukiwaniu Stron",
"WidgetSearchCategories": "Kategorie wyszukiwań",
- "WidgetSearchKeywords": "SÅ‚owa Kluczowe Wyszukiwarki",
- "WidgetSearchNoResultKeywords": "Słowa Kluczowe bez Wyników"
+ "WidgetSearchKeywords": "SÅ‚owa kluczowe wyszukiwarki",
+ "WidgetSearchNoResultKeywords": "Słowa Kluczowe bez Wyników",
+ "ActionType": "Typ Akcji"
}
}
\ No newline at end of file
diff --git a/plugins/Actions/lang/pt-br.json b/plugins/Actions/lang/pt-br.json
index 533814d0ec9c05241ed99489d03976b29c1d1632..b29445224ab53b697006e98090bffe8b12c70487 100644
--- a/plugins/Actions/lang/pt-br.json
+++ b/plugins/Actions/lang/pt-br.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Média baseada em %s visita(s) %s entre %s e %s",
+ "AvgGenerationTimeTooltip": "Média baseada em %1$s visita(s) %2$s entre %3$s e %4$s",
"ColumnClickedURL": "URL clicado",
"ColumnActionURL": "URL Ação",
"ColumnClicks": "Cliques",
@@ -38,7 +38,7 @@
"OutlinkDocumentation": "Um outlink é um link que leva o visitante para fora do seu website (para outro domÃnio)",
"OutlinksReportDocumentation": "Este relatório mostra uma lista hierárquica de URLs outlinks clicadas pelos seus visitantes",
"PagesReportDocumentation": "Este relatório contém informações sobre URL de páginas as quais foram visitadas. %s A tabela está organizada hierarquicamente, as URLs estão apresentadas como estrutura de pastas",
- "PageTitlesReportDocumentation": "Este relatório contém informações sobre tÃtulos de páginas as quais foram visitadas. %s O tÃtulo da página é um HTML %s Tag a qual é mais visualizada nos tÃtulos do browser.",
+ "PageTitlesReportDocumentation": "Este relatório contém informações sobre tÃtulos de páginas as quais foram visitadas. %1$s O tÃtulo da página é um HTML %2$s Tag a qual é mais visualizada nos tÃtulos do browser.",
"PageUrls": "URLs de Página(s)",
"PluginDescription": "Relatórios sobre visualizações de páginas e tÃtulos de página. Permite que você mensure o sistema de busca interno do seu website. Registra automaticamente cliques em links externos e downloads de arquivos.",
"SiteSearchCategories1": "Este relatório lista as categorias que os visitantes selecionaram, quando eles fizeram uma pesquisa em seu site.",
diff --git a/plugins/Actions/lang/pt.json b/plugins/Actions/lang/pt.json
index 00af2618bcdd9bd62ce3b779b9a0c97676d193c5..5fe9548e2d0fa9a1c51653bc13f4ff5de66fae74 100644
--- a/plugins/Actions/lang/pt.json
+++ b/plugins/Actions/lang/pt.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Média com base em %s hit(s) %s entre %s e %s",
+ "AvgGenerationTimeTooltip": "Média com base em %1$s hit(s) %2$s entre %3$s e %4$s",
"ColumnClickedURL": "Endereço Clicado",
"ColumnClicks": "Cliques",
"ColumnClicksDocumentation": "O número de vezes que o link foi clicado.",
@@ -35,7 +35,7 @@
"OutlinkDocumentation": "Um outlink é um link que leva o visitante para fora do seu website (para outro domÃnio).",
"OutlinksReportDocumentation": "Este relatório mostra uma lista hierárquica de URLs de saÃda que foram clicados pelos visitantes.",
"PagesReportDocumentation": "Este relatório contém informações sobre URLs das páginas que foram visitadas. %s A tabela está organizada hierarquicamente, as URLs são exibidas como uma estrutura de pastas.",
- "PageTitlesReportDocumentation": "Este relatório contém informação relativa aos tÃtulos de páginas que foram visitadas. %s O tÃtulo de página é a Etiqueta HTML %s que a maioria dos navegadores mostram como tÃtulo de janela.",
+ "PageTitlesReportDocumentation": "Este relatório contém informação relativa aos tÃtulos de páginas que foram visitadas. %1$s O tÃtulo de página é a Etiqueta HTML %2$s que a maioria dos navegadores mostram como tÃtulo de janela.",
"PageUrls": "URLs de páginas",
"SiteSearchCategories1": "Este relatório lista as Categorias que os visitantes selecionaram quando realizaram uma Pesquisa na sua página.",
"SiteSearchCategories2": "Por exemplo, os sites de comércio electrónico têm tipicamente uma \"Categoria\" seleccionada de modo que os visitantes podem restringir suas pesquisas a todos os produtos em uma categoria especÃfica.",
diff --git a/plugins/Actions/lang/ro.json b/plugins/Actions/lang/ro.json
index 86e944e9c3cab078a8d88cfbc26fa8bc4f923d66..21ce2c4e9a29ccb6e0fbc538546644d99ab08db9 100644
--- a/plugins/Actions/lang/ro.json
+++ b/plugins/Actions/lang/ro.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Media bazata pe %s hit(uri) %s intre %s si %s",
+ "AvgGenerationTimeTooltip": "Media bazata pe %1$s hit(uri) %2$s intre %3$s si %4$s",
"ColumnClickedURL": "URL-uri accesate",
"ColumnClicks": "Click-uri",
"ColumnClicksDocumentation": "Numărul de ori link-ul a fost click-uit.",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "Un outlink este un link ce trimite vizitatori de pe website-ul tău (către alt domeniu).",
"OutlinksReportDocumentation": "Acest raport arată o listă ierarhică al URL-urilor outlink-urilor ce au fost click-uite de vizitatorii tăi.",
"PagesReportDocumentation": "Acest raport conţine informaţii despre URL-urile paginilor ce au fost vizitate. %s Acest tabel este organizat ierarhic,URL-urile sunt afişate într-o structură tip arbore.",
- "PageTitlesReportDocumentation": "Acest raport conţine informaţii despre titlurile paginilor ce au fost vizitate. %s Titlul paginii este Tag-ul HTML %s afişat de cele mai multe browsere ca nume al ferestrei.",
+ "PageTitlesReportDocumentation": "Acest raport conţine informaţii despre titlurile paginilor ce au fost vizitate. %1$s Titlul paginii este Tag-ul HTML %2$s afişat de cele mai multe browsere ca nume al ferestrei.",
"PageUrls": "URL-uri pagini",
"SiteSearchCategories1": "Acest raport afiseaza Categoriile pe care vizitatorii le-au selectat cand au efectuat o Cautare pe siteul tau.",
"SiteSearchCategories2": "De exemplu, magazinele online de obicei au o optiune de a selecta o anumita \"Categorie\" dintr-o lista, pentru ca vizitatorii sa restrictioneze cautarile pe site doar la produsele aflate intr-o anumita Categorie.",
diff --git a/plugins/Actions/lang/ru.json b/plugins/Actions/lang/ru.json
index 70711381edc6747695bd319bee3ef86c33a1aef2..04b3e49b5e5cc0976c49d155f9702eaddf5b24e5 100644
--- a/plugins/Actions/lang/ru.json
+++ b/plugins/Actions/lang/ru.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Ð’ Ñреднем по %s хит(ов) %s между %s и %s",
+ "AvgGenerationTimeTooltip": "Ð’ Ñреднем по %1$s хит(ов) %2$s между %3$s и %4$s",
"ColumnClickedURL": "URL кликов",
"ColumnClicks": "Клики",
"ColumnClicksDocumentation": "КоличеÑтво кликов по Ñтой ÑÑылке.",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "ИÑходÑÑ‰Ð°Ñ ÑÑылка – ÑÑылка, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑƒÐ²Ð¾Ð´Ð¸Ñ‚ поÑÐµÑ‚Ð¸Ñ‚ÐµÐ»Ñ Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ Ñайта (на другой домен).",
"OutlinksReportDocumentation": "Ðтот отчет показывает иерархичеÑкий ÑпиÑок иÑходÑщих ÑÑылок, на которые пользователь кликнул.",
"PagesReportDocumentation": "Ðтот отчет Ñодержит информацию об адреÑах Ñтраниц, на которых побывали поÑетители вашего Ñайта. %s Таблица организовано иерархично – URL-Ñ‹ отображаютÑÑ Ð¿Ð°Ð¿Ð¾Ñ‡Ð½Ð¾Ð¹ Ñтруктурой.",
- "PageTitlesReportDocumentation": "Ðтот отчет Ñодержит информацию о заголовках поÑещенных Ñтраниц. %s Заголовок Ñтраницы Ñто HTML-тег %s, который браузеры отображают в заголовке окна (вкладки).",
+ "PageTitlesReportDocumentation": "Ðтот отчет Ñодержит информацию о заголовках поÑещенных Ñтраниц. %1$s Заголовок Ñтраницы Ñто HTML-тег %2$s, который браузеры отображают в заголовке окна (вкладки).",
"PageUrls": "URL-Ñ‹ Ñтраниц",
"PluginDescription": "Отчёты о проÑмотрах и заголовках Ñтраниц. ПозволÑÑŽÑ‚ оценить поиÑковый дижок внутреннего Ñайта. ÐвтоматичеÑки отÑлеживает клики по внешним ÑÑылкам и Ñкачиванию файлов.",
"SiteSearchCategories1": "Ðтот отчет показывает ÑпиÑок категорий, которые выбрали поÑетители при поиÑке на вашем Ñайте.",
diff --git a/plugins/Actions/lang/sl.json b/plugins/Actions/lang/sl.json
index 5c852b18ecb661920abf71320b015551a6af0a0c..4ddf33087fdcd49b94936acd9deeabc63ef9b125 100644
--- a/plugins/Actions/lang/sl.json
+++ b/plugins/Actions/lang/sl.json
@@ -31,7 +31,7 @@
"OutlinkDocumentation": "Zunanja povezava je povezava, ki vodi obiskovalca stran od vaše splete strani (na drugo domeno).",
"OutlinksReportDocumentation": "To poroÄilo prikazuje hierarhiÄni seznam URL-jev zunanjih povezav na katere so uporabniki kliknili.",
"PagesReportDocumentation": "To poroÄilo vsebuje informacije o URL-jih strani, ki so bile obiskane. %s Tabela je hierarhiÄno organizirana. URL-ji so prikazani kot struktura mape.",
- "PageTitlesReportDocumentation": "To poroÄilo vsebuje informacije o nazivih strani, ki so bile obiskane. %s Naziv strani je HTML oznaka %s Oznaka, ki jo veÄina brskalnikov prikaže v nazivu okna.",
+ "PageTitlesReportDocumentation": "To poroÄilo vsebuje informacije o nazivih strani, ki so bile obiskane. %1$s Naziv strani je HTML oznaka %2$s Oznaka, ki jo veÄina brskalnikov prikaže v nazivu okna.",
"PageUrls": "URL-ji strani",
"SiteSearchKeyword": "KljuÄna beseda (iskanje po strani)",
"SubmenuPagesEntry": "Vstopne strani",
diff --git a/plugins/Actions/lang/sq.json b/plugins/Actions/lang/sq.json
index c91becf8f076d2679e057d3fbefcb416b83975a9..c02a62e64881814f1e59054e3023eaaa6c08f982 100644
--- a/plugins/Actions/lang/sq.json
+++ b/plugins/Actions/lang/sq.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Mesatare e bazuar në %s klikim(e) %s mes %s dhe %s",
+ "AvgGenerationTimeTooltip": "Mesatare e bazuar në %1$s klikim(e) %2$s mes %3$s dhe %4$s",
"ColumnClickedURL": "URL të klikuara",
"ColumnClicks": "Klikime",
"ColumnClicksDocumentation": "Sa herë është klikuar kjo lidhje.",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "Një lidhje e jashtme është një lidhje që e shpie përdoruesin diku jashtë sajtit tuaj (te një tjetër përkatësi).",
"OutlinksReportDocumentation": "Ky raport shfaq një listë hierarkike URL-sh të jashtme që janë klikuar nga vizitorët tuaj.",
"PagesReportDocumentation": "Ky raport përmban të dhëna rreth URL faqesh që janë vizituar. %s Tabela është e sistemuar në mënyrë hierarkike, URL-të tregohen si strukturë dosjeje.",
- "PageTitlesReportDocumentation": "Ky raport përmban të dhëna rreth titujve të faqeve që janë vizituar. %s Titulli i faqes është Etiketa HTML %s që shfaqin shumica e shfletuesve te titulli i dritares.",
+ "PageTitlesReportDocumentation": "Ky raport përmban të dhëna rreth titujve të faqeve që janë vizituar. %1$s Titulli i faqes është Etiketa HTML %2$s që shfaqin shumica e shfletuesve te titulli i dritares.",
"PageUrls": "URL faqesh",
"PluginDescription": "Raporte rreth parjes së faqeve dhe titujve të tyre. Ju lejon të matni motorin e brendshëm të kërkimeve të sajtit tuaj. Gjurmon vetvetiu klikimet drejt lidhjesh të jashtme dhe shkarkime kartelash.",
"SiteSearchCategories1": "Ky raport paraqet kategoritë që vizitorët kanë përzgjedhur kur bënë një Kërkim te sajti juaj.",
diff --git a/plugins/Actions/lang/sr.json b/plugins/Actions/lang/sr.json
index 15702384c9036107b165897de833bb55550fa006..0a671837ad56b93f87c3d7852ba1435b2df76d65 100644
--- a/plugins/Actions/lang/sr.json
+++ b/plugins/Actions/lang/sr.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Prosek zasnovan na %s pogodaka %s između %s i %s",
+ "AvgGenerationTimeTooltip": "Prosek zasnovan na %1$s pogodaka %2$s između %3$s i %4$s",
"ColumnClickedURL": "Kliknutih linkova",
"ColumnClicks": "Klikovi",
"ColumnClicksDocumentation": "Broj klikova na ovaj link.",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "Odlazni link je link koji posetioca vodi sa Vašeg sajta (ka nekom drugom).",
"OutlinksReportDocumentation": "Ovaj izveštaj pokazuje hijerarhijsku listu odlaznih linkova koje su Vaši posetioci kliknuli.",
"PagesReportDocumentation": "Ovaj izveštaj sadrži informacije o linkovima koji su posećeni. %s Tabela je organizovana hijerarhijski, linkovi su prikazani u vidu foldera.",
- "PageTitlesReportDocumentation": "Ovaj izveÅ¡taj sadrži informacije o naslovima stranica koje su posećene. %s Naslov stranice je HTML %s tag koji većina pregledaÄa prikazuje umesto svog naslova.",
+ "PageTitlesReportDocumentation": "Ovaj izveÅ¡taj sadrži informacije o naslovima stranica koje su posećene. %1$s Naslov stranice je HTML %2$s tag koji većina pregledaÄa prikazuje umesto svog naslova.",
"PageUrls": "Adrese stranica",
"PluginDescription": "IzveÅ¡taj o prikazima i naslovima stranica. Omogućava vam da pratite vaÅ¡ interni pretraživaÄ sajta. Automatski prati klikove na eksterne linkove i preuzimanja fajlova.",
"SiteSearchCategories1": "Ovaj izveštaj prikazuje kategorije koje posetioci biraju kada pretražuju vaš sajt.",
diff --git a/plugins/Actions/lang/sv.json b/plugins/Actions/lang/sv.json
index 793574edc76eb154c6a58c8bd46af2d94e7ec408..116f810bdd038298ed242ed2b9dbd93864ce2f65 100644
--- a/plugins/Actions/lang/sv.json
+++ b/plugins/Actions/lang/sv.json
@@ -1,10 +1,11 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Medel baseras på %s träff(ar) %s mellan %s och %s",
+ "AvgGenerationTimeTooltip": "Medel baseras på %1$s träff(ar) %2$s mellan %3$s och %4$s",
"ColumnClickedURL": "Klickad URL",
+ "ColumnActionURL": "Åtgärds-URL",
"ColumnClicks": "Klick",
"ColumnClicksDocumentation": "Antalet gånger som denna länk klickades på.",
- "ColumnDownloadURL": "Nedladdningens URL",
+ "ColumnDownloadURL": "Nedladdnings-URL",
"ColumnEntryPageTitle": "MÃ¥lsidans titel",
"ColumnEntryPageURL": "MÃ¥lsidans URL",
"ColumnExitPageTitle": "Avvisningssidans titel",
@@ -14,7 +15,7 @@
"ColumnPagesPerSearch": "Sökresultatsidor",
"ColumnPagesPerSearchDocumentation": "Ibland klickar användare som söker på din webbplats på \"nästa\" för att visa flera resultat. Detta är det genomsnittliga antalet sidor med sökresultat som visas för det här nyckelordet.",
"ColumnPageURL": "Sidans URL",
- "ColumnSearchCategory": "Sök kategori",
+ "ColumnSearchCategory": "Sökkategori",
"ColumnSearches": "Sökningar",
"ColumnSearchesDocumentation": "Antalet besök som sökte efter detta nyckelord i din webbplats sökmotor.",
"ColumnSearchExits": "% Sökutgångar",
@@ -37,14 +38,14 @@
"OutlinkDocumentation": "En utlänk är en länk som leder besökaren bort från webbplatsen (till en annan domän).",
"OutlinksReportDocumentation": "Denna rapport visar en hierarkisk lista över utlänkarnas webbadresser som klickades på utav dina besökare.",
"PagesReportDocumentation": "Denna rapport innehåller information om webbadresserna som har besökts. %s Tabellen ordnas hierarkiskt, webbadresserna visas som en mappstruktur.",
- "PageTitlesReportDocumentation": "Denna rapport innehåller information om titlarna på de sidor som har besökts. %s sidans titel är HTML-taggen %s som de flesta webbläsare visar i sina fönster titel.",
- "PageUrls": "Webbadress",
+ "PageTitlesReportDocumentation": "Denna rapport innehåller information om titlarna på de sidor som har besökts. %1$s sidans titel är HTML-taggen %2$s som de flesta webbläsare visar i sina fönster titel.",
+ "PageUrls": "Webbadresser",
"PluginDescription": "Rapporter om sidvisningar och sidtitlar. Låter dig mäta din webbplats sökmotor. Spårar klick på externa länkar och filnedladdningar.",
"SiteSearchCategories1": "Den här rapporten listar kategorierna som besökarna valt när dom gjort en sökning på din webbplats.",
"SiteSearchCategories2": "T.ex. så har e-handelssidor vanligtvis kategorier som gör att besökarna kan begränsa sökningen till produkter i en vald kategori",
"SiteSearchFollowingPagesDoc": "När besökare söker på din webbplats så letar dom efter en speciell sida, innehåll, produkt eller tjänst. Den här rapporten listar de sidor med flest klick efter en intern sökning. Med andra ord, en lista med dom mest sökta sidorna av besökare som redan hittat till din webbplats.",
"SiteSearchIntro": "Att spåra sökningar som besökare gör på webbplatsen är ett väldigt effektivt sätt att lära sig mer om vad dom letar efter. Det kan hjälpa till med nya idéer för innehåll eller nya produkter som potentiella kunder letar efter. Det kan även förbättra den allmänna upplevelsen besökarna får på din webbplats.",
- "SiteSearchKeyword": "Nyckelord(Webbplatssökning)",
+ "SiteSearchKeyword": "Nyckelord (Webbplatssökning)",
"SiteSearchKeywordsDocumentation": "Den här rapporten listar nyckelorden som besökare sökt efter med din interna sökmotor.",
"SiteSearchKeywordsNoResultDocumentation": "Den här rapporten listar nyckelorden som inte gav något resultat. Möjligtvis kan webbplatsens sökmotor förbättras eller så letar besökarna efter innehåll som inte finns (ännu?)",
"SubmenuPagesEntry": "MÃ¥lsidor",
@@ -60,6 +61,7 @@
"WidgetPageUrlsFollowingSearch": "Sidor från en webbplatssökning",
"WidgetSearchCategories": "Sök kategorier",
"WidgetSearchKeywords": "Nyckelord från webbplatssökningar",
- "WidgetSearchNoResultKeywords": "Nyckelord utan resultat"
+ "WidgetSearchNoResultKeywords": "Nyckelord utan resultat",
+ "ActionType": "Åtgärdstyp"
}
}
\ No newline at end of file
diff --git a/plugins/Actions/lang/ta.json b/plugins/Actions/lang/ta.json
index 00425140059e68d0bb97c9aff77f86d2821578d8..f3b59163d802a2e196c1cf3649968c03227df311 100644
--- a/plugins/Actions/lang/ta.json
+++ b/plugins/Actions/lang/ta.json
@@ -1,6 +1,5 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "%s தடவை(களà¯) அடிபà¯à®ªà®Ÿà¯ˆà®¯à®¿à®²à¯ சராசரி %s கà¯à®•à¯à®®à¯ %s கà¯à®•à¯à®®à¯ %s இடையிலà¯",
"ColumnClickedURL": "சொடà¯à®•à¯à®•à®ªà®Ÿà¯à®Ÿ URL",
"ColumnClicks": "சொடà¯à®•à¯à®•à¯à®•à®³à¯",
"ColumnClicksDocumentation": "இநà¯à®¤ இணைபà¯à®ªà¯ சொடà¯à®•à¯à®•à¯à®•à®³à®¿à®©à¯ எணà¯à®£à®¿à®•à¯à®•à¯ˆ",
@@ -37,7 +36,7 @@
"OutlinkDocumentation": "ஒர௠வெளியிணைபà¯à®ªà¯ எனà¯à®ªà®¤à¯ வரà¯à®•à¯ˆà®¯à®¾à®³à®°à¯ˆ உஙà¯à®•à®³à¯ தளதà¯à®¤à¯ˆ விடà¯à®Ÿà¯ (வேற௠ஒர௠ஆடà¯à®ªà¯à®² பேரà¯à®•à¯à®•à¯) அழைதà¯à®¤à¯ செலà¯à®²à¯à®®à¯ பிறிதொர௠இணைய à®®à¯à®•à®µà®°à®¿ ஆகà¯à®®à¯.",
"OutlinksReportDocumentation": "இநà¯à®¤ அறிகà¯à®•à¯ˆ உஙà¯à®•à®³à¯ வரà¯à®•à¯ˆà®¯à®¾à®³à®°à¯à®•à®³à®¾à®²à¯ வெளி இணைபà¯à®ªà¯ à®®à¯à®•à®µà®°à®¿à®•à®³à®¿à®²à¯ மேறà¯à®•à¯Šà®³à¯à®³à®ªà¯à®ªà®Ÿà¯à®Ÿ சொடà¯à®•à¯à®•à®™à¯à®•à®³à¯ˆ படிநிலை à®®à¯à®±à¯ˆ நிலையில௠காடà¯à®Ÿà¯à®•à®¿à®±à®¤à¯.",
"PagesReportDocumentation": "இநà¯à®¤ அறிகà¯à®•à¯ˆ வரà¯à®•à¯ˆ தரபà¯à®ªà®Ÿà¯à®Ÿ பகà¯à®•à®™à¯à®•à®³à®¿à®©à¯ à®®à¯à®•à®µà®°à®¿à®•à®³à¯ˆ காடà¯à®Ÿà¯à®•à®¿à®±à®¤à¯. %s அடà¯à®Ÿà®µà®£à¯ˆ படிமà¯à®±à¯ˆ நிலையில௠ஒழà¯à®™à¯à®•à®¾à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà¯ உளà¯à®³à®¤à¯. à®®à¯à®•à®µà®°à®¿à®•à®³à¯ கோபà¯à®ªà¯ வடிவில௠உளà¯à®³à®©.",
- "PageTitlesReportDocumentation": "இநà¯à®¤ அறிகà¯à®•à¯ˆ நீஙà¯à®•à®³à¯ இதறà¯à®•à¯ à®®à¯à®©à¯à®ªà¯ செனà¯à®±à¯ வநà¯à®¤ பகà¯à®•à®™à¯à®•à®³à¯ˆà®ªà¯ பறà¯à®±à®¿à®¯ தலைபà¯à®ªà¯à®•à®³à¯ˆ உளà¯à®³à®Ÿà®•à¯à®•à®¿à®¯à®¤à¯. %s ஒர௠பகà¯à®•à®¤à¯à®¤à®¿à®©à¯ தலைபà¯à®ªà®¾à®©à®¤à¯ %s அனைதà¯à®¤à¯ உலாவிகளின௠தலைபà¯à®ªà®¾à®• காடà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®®à¯ HTML டேக௠ஆகà¯à®®à¯.",
+ "PageTitlesReportDocumentation": "இநà¯à®¤ அறிகà¯à®•à¯ˆ நீஙà¯à®•à®³à¯ இதறà¯à®•à¯ à®®à¯à®©à¯à®ªà¯ செனà¯à®±à¯ வநà¯à®¤ பகà¯à®•à®™à¯à®•à®³à¯ˆà®ªà¯ பறà¯à®±à®¿à®¯ தலைபà¯à®ªà¯à®•à®³à¯ˆ உளà¯à®³à®Ÿà®•à¯à®•à®¿à®¯à®¤à¯. %1$s ஒர௠பகà¯à®•à®¤à¯à®¤à®¿à®©à¯ தலைபà¯à®ªà®¾à®©à®¤à¯ %2$s அனைதà¯à®¤à¯ உலாவிகளின௠தலைபà¯à®ªà®¾à®• காடà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®®à¯ HTML டேக௠ஆகà¯à®®à¯.",
"PageUrls": "பகà¯à®• URLs",
"SiteSearchCategories1": "இநà¯à®¤ அறிகà¯à®•à¯ˆà®¯à¯ˆ, உஙà¯à®•à®³à¯ வலைதà¯à®¤à®³à®¤à¯à®¤à®¿à®²à¯ ஒர௠தேடல௠செயà¯à®¤ போத௠பாரà¯à®µà¯ˆà®¯à®¾à®³à®°à¯à®•à®³à¯ தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤ வகைகள௠படà¯à®Ÿà®¿à®¯à®²à®¿à®Ÿà¯à®•à®¿à®±à®¤à¯.",
"SiteSearchCategories2": "எடà¯à®¤à¯à®¤à¯à®•à¯à®•à®¾à®Ÿà¯à®Ÿà®¾à®•, மினà¯à®µà®£à®¿à®• வலைதà¯à®¤à®³à®™à¯à®•à®³à®¿à®²à¯ பொதà¯à®µà®¾à®• ஒர௠\"வகை\" தேரà¯à®µà¯ இரà¯à®•à¯à®•à®¿à®±à®¤à¯. இதன௠மூலம௠தேடல௠மà¯à®Ÿà®¿à®µà¯à®•à®³à¯ˆ கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®Ÿ வகையின௠உள௠பாரà¯à®µà¯ˆà®¯à®¾à®²à®°à®¾à®²à¯ மடà¯à®Ÿà¯à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤ à®®à¯à®Ÿà®¿à®¯à¯à®®à¯.",
diff --git a/plugins/Actions/lang/th.json b/plugins/Actions/lang/th.json
index 6af5f8874ba339cbc63274289f13453775d10f39..0887a25b7a386c4bb55bdb22cae08f20a43f5243 100644
--- a/plugins/Actions/lang/th.json
+++ b/plugins/Actions/lang/th.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "ค่าเฉลี่ยขà¸à¸‡à¸ˆà¸³à¸™à¸§à¸™ %s ครั้ง %s ระหว่าง %s à¹à¸¥à¸° %s",
+ "AvgGenerationTimeTooltip": "ค่าเฉลี่ยขà¸à¸‡à¸ˆà¸³à¸™à¸§à¸™ %1$s ครั้ง %2$s ระหว่าง %3$s à¹à¸¥à¸° %4$s",
"ColumnClickedURL": "URL ที่ถูà¸à¸„ลิà¸",
"ColumnClicks": "คลิà¸",
"ColumnClicksDocumentation": "จำนวนครั้งที่ link นี้ถูà¸à¸„ลิà¸",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "Outlink คืà¸à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¹‚ยงที่นำไปสู่​​ผู้เข้าชมà¸à¸¢à¸¹à¹ˆà¸«à¹ˆà¸²à¸‡à¸ˆà¸²à¸à¹€à¸§à¹‡à¸šà¹„ซต์ขà¸à¸‡à¸„ุณ (โดเมนà¸à¸·à¹ˆà¸™)",
"OutlinksReportDocumentation": "รายงานนี้จะà¹à¸ªà¸”งรายà¸à¸²à¸£à¸¥à¸³à¸”ับชั้นขà¸à¸‡à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¹‚ยง URL à¸à¸±à¸•à¹‚นมัติ ที่มีà¸à¸²à¸£à¸„ลิà¸à¹‚ดยผู้เข้าชมขà¸à¸‡à¸„ุณ",
"PagesReportDocumentation": "รายงานนี้ประà¸à¸à¸šà¸”้วยข้à¸à¸¡à¸¹à¸¥à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸š URL ขà¸à¸‡à¸«à¸™à¹‰à¸²à¸—ี่ได้รับà¸à¸²à¸£à¹€à¸‚้าเยี่ยมชม %s ตารางจะถูà¸à¸ˆà¸±à¸”ลำดับชั้น URL ที่จะปราà¸à¸à¹€à¸›à¹‡à¸™à¹‚ครงสร้างโฟลเดà¸à¸£à¹Œ",
- "PageTitlesReportDocumentation": "รายงานนี้ประà¸à¸à¸šà¸”้วยข้à¸à¸¡à¸¹à¸¥à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¸Šà¸·à¹ˆà¸à¹€à¸£à¸·à¹ˆà¸à¸‡à¸‚à¸à¸‡à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸šà¸—ี่ได้รับà¸à¸²à¸£à¹€à¸‚้าเยี่ยมชม %s ชื่à¸à¸«à¸™à¹‰à¸²à¸ˆà¸°à¹€à¸›à¹‡à¸™à¹à¸—็ภ%s HTML เบราว์เซà¸à¸£à¹Œà¸ªà¹ˆà¸§à¸™à¹ƒà¸«à¸à¹ˆà¸ˆà¸°à¹à¸ªà¸”งในชื่à¸à¹€à¸£à¸·à¹ˆà¸à¸‡à¸‚à¸à¸‡à¸«à¸™à¹‰à¸²à¸•à¹ˆà¸²à¸‡à¸‚à¸à¸‡à¸žà¸§à¸à¹€à¸‚า",
+ "PageTitlesReportDocumentation": "รายงานนี้ประà¸à¸à¸šà¸”้วยข้à¸à¸¡à¸¹à¸¥à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¸Šà¸·à¹ˆà¸à¹€à¸£à¸·à¹ˆà¸à¸‡à¸‚à¸à¸‡à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸šà¸—ี่ได้รับà¸à¸²à¸£à¹€à¸‚้าเยี่ยมชม %1$s ชื่à¸à¸«à¸™à¹‰à¸²à¸ˆà¸°à¹€à¸›à¹‡à¸™à¹à¸—็ภ%2$s HTML เบราว์เซà¸à¸£à¹Œà¸ªà¹ˆà¸§à¸™à¹ƒà¸«à¸à¹ˆà¸ˆà¸°à¹à¸ªà¸”งในชื่à¸à¹€à¸£à¸·à¹ˆà¸à¸‡à¸‚à¸à¸‡à¸«à¸™à¹‰à¸²à¸•à¹ˆà¸²à¸‡à¸‚à¸à¸‡à¸žà¸§à¸à¹€à¸‚า",
"PageUrls": "Url ขà¸à¸‡à¹€à¸žà¸ˆ",
"SiteSearchCategories1": "รายงานนี้à¹à¸ªà¸”งรายà¸à¸²à¸£à¸«à¸¡à¸§à¸”หมู่ที่ผู้เข้าชมเลืà¸à¸à¹„ว้ เมื่à¸à¸žà¸§à¸à¹€à¸‚าทำค้นหาบนเว็บไซต์ขà¸à¸‡à¸„ุณ",
"SiteSearchCategories2": "ตัวà¸à¸¢à¹ˆà¸²à¸‡à¹€à¸Šà¹ˆà¸™ เว็บไซต์à¸à¸µà¸„à¸à¸¡à¹€à¸¡à¸´à¸£à¹Œà¸‹à¸¡à¸±à¸à¸ˆà¸°à¸¡à¸µ \"หมวดหมู่\" เพื่à¸à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹€à¸‚้าชมสามารถจำà¸à¸±à¸”à¸à¸²à¸£à¸„้นหาขà¸à¸‡à¸žà¸§à¸à¹€à¸‚าให้à¸à¸±à¸šà¸ªà¸´à¸™à¸„้าทั้งหมดในหมวดหมู่ที่เลืà¸à¸à¹„ว้ได้",
diff --git a/plugins/Actions/lang/tl.json b/plugins/Actions/lang/tl.json
index 0403fd0d6fe2995b5f29c7cbd56c0c65bf849ef2..e4f9fb7f5828ae399a9cad8034a5523a130150c4 100644
--- a/plugins/Actions/lang/tl.json
+++ b/plugins/Actions/lang/tl.json
@@ -1,5 +1,6 @@
{
"Actions": {
+ "AvgGenerationTimeTooltip": "Pamantayan batay sa mga %1$s ng mga hit %2$s sa pagitan ng %3$s at %4$s",
"ColumnClickedURL": "Na-click na URL",
"ColumnClicks": "Mga Click",
"ColumnClicksDocumentation": "Kung ilang beses na na-click ang link na ito.",
@@ -36,7 +37,7 @@
"OutlinkDocumentation": "Ang isang outlink ay isang link na naghahatid sa isang bisita nang palayo mula sa iyong website (sa isa pang domain).",
"OutlinksReportDocumentation": "Ipinapakita ng ulat na ito ang hirerkiya na listahan ng mga outlink URL na na-click ng iyong mga bisita.",
"PagesReportDocumentation": "Ang ulat na ito ay naglalaman ng impormasyon tungkol sa mga URL ng pahina na binisita mo. %s ang talahanayan ay nakaayos ng hierarchically, ang mga URL ay ipinapakita bilang isang istraktura ng folder.",
- "PageTitlesReportDocumentation": "Ang ulat na ito ay naglalaman ng impormasyon tungkol sa mga pamagat ng mga pahina na binisita na. %s Ang pamagat ng pahina ay ang HTML %s Tag na karaniwang pinapakita ng ng karamihan sa mga browser sa kanilang mga window bilang pamagat.",
+ "PageTitlesReportDocumentation": "Ang ulat na ito ay naglalaman ng impormasyon tungkol sa mga pamagat ng mga pahina na binisita na. %1$s Ang pamagat ng pahina ay ang HTML %2$s Tag na karaniwang pinapakita ng ng karamihan sa mga browser sa kanilang mga window bilang pamagat.",
"PageUrls": "Mga URL ng Pahina",
"SiteSearchCategories1": "Inililista ng ulat na ito ang mga kategorya na napili ng mga bisita kapag ginawa nila ang isang Paghahanap sa iyong website.",
"SiteSearchCategories2": "Halimbawa, ang mga Ecommerce website ay karaniwang may tagapili ng \"Kategorya\" upang ang mga bisita ay maaaring malimitahan ang kanilang mga paghahanap sa lahat ng produkto sa isang espesipikong Kategorya.",
diff --git a/plugins/Actions/lang/tr.json b/plugins/Actions/lang/tr.json
index 16c6ef771b38cb53d94cdba4cda60f9134841004..5e1060c57cbbc7b23d98fb217586e570abc66261 100644
--- a/plugins/Actions/lang/tr.json
+++ b/plugins/Actions/lang/tr.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Ortalama %s hit, %s arasında %s \/ %s 'e dayalı",
+ "AvgGenerationTimeTooltip": "Ortalama %1$s hit, %2$s arasında %3$s \/ %4$s 'e dayalı",
"ColumnClickedURL": "Tıklanan Sayfa Adresleri",
"ColumnClicks": "Tıklamalar",
"ColumnClicksDocumentation": "Tıklama sayısı",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "Bu dış bağlantı linki ziyaretçilerinizin sitenizden uzaklaştığı diğer alan adlarını kapsar.",
"OutlinksReportDocumentation": "Bu rapor, ziyaretçilerin tıkladıkları dış linklerin hiyerarşik listesini gösterir.",
"PagesReportDocumentation": "Bu rapor ziyaret edilen sayfa URL'leri hakkında bilgi içerir. %s Tablo hiyerarşik olarak düzenlenmiştir, URL'ler klasör yapısı ile görüntülenmektedir.",
- "PageTitlesReportDocumentation": "Bu rapor ziyaret edilen sayfaların başlıkları ile ilgili bilgi içerir. %s Sayfa başlığı, birçok tarayıcının pencere başlığında gösterdiği HTML %s imidir.",
+ "PageTitlesReportDocumentation": "Bu rapor ziyaret edilen sayfaların başlıkları ile ilgili bilgi içerir. %1$s Sayfa başlığı, birçok tarayıcının pencere başlığında gösterdiği HTML %2$s imidir.",
"PageUrls": "Sayfa Adresleri",
"SiteSearchCategories1": "Bu rapor, ziyaretçilerin sitenizde arama yaptıklarında seçtikleri kategorileri listelemektedir.",
"SiteSearchCategories2": "Örnek olarak, E-Ticaret websitelerinde tipik bir \"Kategori\" seçimi vardır böylece ziyaretçiler aramalarını belirli bir kategori içindeki tüm ürünler ile kısıtlayabilirler.",
diff --git a/plugins/Actions/lang/vi.json b/plugins/Actions/lang/vi.json
index ccdc79e82056436b6ae6f0c54e8d30da855f5d41..d68aeeeed3ddda88e97d0d923ed043c540d28a30 100644
--- a/plugins/Actions/lang/vi.json
+++ b/plugins/Actions/lang/vi.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "Trung bình dựa trên %s lần(s) %s giữa %s và %s",
+ "AvgGenerationTimeTooltip": "Trung bình dựa trên %1$s lần(s) %2$s giữa %3$s và %4$s",
"ColumnClickedURL": "URL đã truy cáºp",
"ColumnClicks": "Clicks",
"ColumnClicksDocumentation": "Số lần Ä‘Æ°á»ng dẫn nà y đã được click",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "Má»™t outlink là má»™t liên kết dẫn ngÆ°á»i truy cáºp từ trang web của bạn (đến tên miá»n khác)",
"OutlinksReportDocumentation": "Báo cáo nà y cho thấy má»™t danh sách phân cấp của outlink URL đã được click bởi khách truy cáºp của bạn",
"PagesReportDocumentation": "Báo cáo nà y chứa thông tin vỠcác URLs của trang đã được xem. %s Bảng nà y được tổ chức dưới dạng cây, Các URL được hiển thị dưới cấu trúc folder.",
- "PageTitlesReportDocumentation": "Báo cáo nà y chứa thông tin vá» tiêu Ä‘á» các trang đã được truy cáºp. %s Tiêu Ä‘á» trang là thẻ HTML %s mà các trình duyệt hiển thị trên thanh tiêu Ä‘á» của cá»a sổ trình duyệt.",
+ "PageTitlesReportDocumentation": "Báo cáo nà y chứa thông tin vá» tiêu Ä‘á» các trang đã được truy cáºp. %1$s Tiêu Ä‘á» trang là thẻ HTML %2$s mà các trình duyệt hiển thị trên thanh tiêu Ä‘á» của cá»a sổ trình duyệt.",
"PageUrls": "ÄÆ°á»ng dẫn trang",
"SiteSearchCategories1": "Báo cáo nà y liệt kê các hạng mục cho ngÆ°á»i truy cáºp lá»±a chá»n khi há» thá»±c hiện má»™t tìm kiếm trên trang web của bạn",
"SiteSearchCategories2": "Và dụ, má»™t trang thÆ°Æ¡ng mại Ä‘iện tá» (e-commerce) thÆ°á»ng có chức năng \"Lá»±a chá»n Phân mục\" để khách truy cáºp giá»›i hạn phạm vi tìm kiếm đối vá»›i các sản phẩm trong má»™t phân mục quy định.",
diff --git a/plugins/Actions/lang/zh-cn.json b/plugins/Actions/lang/zh-cn.json
index 45c925bd1eac00fe5dc2407c4d26eee33310b113..6f067e99b509bc8acb69eb4e44b0f7b73c55989e 100644
--- a/plugins/Actions/lang/zh-cn.json
+++ b/plugins/Actions/lang/zh-cn.json
@@ -1,6 +1,6 @@
{
"Actions": {
- "AvgGenerationTimeTooltip": "å¹³å‡å€¼åŸºäºŽ %s 次访问 %s，介于 %s å’Œ %s 之间",
+ "AvgGenerationTimeTooltip": "å¹³å‡å€¼åŸºäºŽ %1$s 次访问 %2$s，介于 %3$s å’Œ %4$s 之间",
"ColumnClickedURL": "点击的网å€",
"ColumnClicks": "点击次数",
"ColumnClicksDocumentation": "链接被点击的次数",
@@ -37,7 +37,7 @@
"OutlinkDocumentation": "离站链接指导致访客离开您的网站或域å的链接。",
"OutlinksReportDocumentation": "本报表显示访客点击的离站链接网å€çš„的分级列表。",
"PagesReportDocumentation": "本报表显示被访问的网页地å€ã€‚%s è¡¨æ ¼åˆ†çº§å½’ç±»ï¼Œç½‘å€æŒ‰ç…§ç›®å½•ç»“构显示。",
- "PageTitlesReportDocumentation": "本报表显示被访问页é¢çš„æ ‡é¢˜ã€‚%s ç½‘é¡µæ ‡é¢˜ä¸º HTML %s æ ‡ç¾ï¼Œå¤šæ•°æµè§ˆå™¨æ˜¾ç¤ºä¸ºçª—å£çš„æ ‡é¢˜ã€‚",
+ "PageTitlesReportDocumentation": "本报表显示被访问页é¢çš„æ ‡é¢˜ã€‚%1$s ç½‘é¡µæ ‡é¢˜ä¸º HTML %2$s æ ‡ç¾ï¼Œå¤šæ•°æµè§ˆå™¨æ˜¾ç¤ºä¸ºçª—å£çš„æ ‡é¢˜ã€‚",
"PageUrls": "页é¢åœ°å€",
"PluginDescription": "有关页é¢è®¿é—®é‡å’Œé¡µé¢æ ‡é¢˜çš„æŠ¥å‘Šã€‚è®©ä½ è¡¡é‡ä½ 的内部网站的æœç´¢å¼•æ“Žã€‚自动跟踪外部链接和文件下载点击。",
"SiteSearchCategories1": "本报表显示访客使用站内æœç´¢æ—¶é€‰æ‹©çš„分类。",
diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement
index 3b0da5dac2714339e6d8539b8a16c56fa22a8723..3d1160c0980377b140c3ebb987cef4b01ce1b3ac 160000
--- a/plugins/AnonymousPiwikUsageMeasurement
+++ b/plugins/AnonymousPiwikUsageMeasurement
@@ -1 +1 @@
-Subproject commit 3b0da5dac2714339e6d8539b8a16c56fa22a8723
+Subproject commit 3d1160c0980377b140c3ebb987cef4b01ce1b3ac
diff --git a/plugins/Contents/lang/en.json b/plugins/Contents/lang/en.json
index 3873a7b2ac50dad05ee18beee9e88991e7de5b16..78e347eaaadaba87e0d035d5d310d4a57906ce6d 100644
--- a/plugins/Contents/lang/en.json
+++ b/plugins/Contents/lang/en.json
@@ -1,14 +1,14 @@
{
- "Contents":{
+ "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",
- "InteractionRate":"Interaction Rate",
- "ContentName":"Content Name",
- "ContentPiece":"Content Piece",
- "ContentTarget":"Content Target",
- "Contents":"Contents",
+ "Impressions": "Impressions",
+ "Interactions": "Interactions",
+ "Interaction": "Interaction",
+ "InteractionRate": "Interaction Rate",
+ "ContentName": "Content Name",
+ "ContentPiece": "Content Piece",
+ "ContentTarget": "Content Target",
+ "Contents": "Contents",
"InteractionsMetricDocumentation": "The number of times a content block was interacted with (eg, a 'click' on a banner or ad).",
"ImpressionsMetricDocumentation": "The number of times a content block, such as a banner or an ad, was displayed on a page.",
"InteractionRateMetricDocumentation": "The ratio of content impressions to interactions."
diff --git a/plugins/Contents/lang/pl.json b/plugins/Contents/lang/pl.json
index 28af2c1513d43da6cfe29c24863d55fc4c8a212b..06a8e9db97f7d8579d0e6080c1bfe03bde94828b 100644
--- a/plugins/Contents/lang/pl.json
+++ b/plugins/Contents/lang/pl.json
@@ -2,6 +2,6 @@
"Contents": {
"Interactions": "Interakcje",
"ContentName": "Nazwa treści",
- "Contents": "Treści"
+ "Contents": "Treść"
}
}
\ No newline at end of file
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 bed8ee84d615bcb1e57f9d2ffbef59e0d7577c66..38f9ab1424f1d38e09fd59a5c89a2d92d272a0f3 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,8 +14,8 @@
<pageId>1</pageId>
<generationTime>0.33s</generationTime>
- <timeSpent>270</timeSpent>
- <timeSpentPretty>4 min 30s</timeSpentPretty>
+ <timeSpent>271</timeSpent>
+ <timeSpentPretty>4 min 31s</timeSpentPretty>
<icon />
</row>
@@ -117,8 +117,8 @@
<pageId>13</pageId>
<generationTime>0.33s</generationTime>
- <timeSpent>270</timeSpent>
- <timeSpentPretty>4 min 30s</timeSpentPretty>
+ <timeSpent>271</timeSpent>
+ <timeSpentPretty>4 min 31s</timeSpentPretty>
<icon />
</row>
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 bed8ee84d615bcb1e57f9d2ffbef59e0d7577c66..38f9ab1424f1d38e09fd59a5c89a2d92d272a0f3 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,8 +14,8 @@
<pageId>1</pageId>
<generationTime>0.33s</generationTime>
- <timeSpent>270</timeSpent>
- <timeSpentPretty>4 min 30s</timeSpentPretty>
+ <timeSpent>271</timeSpent>
+ <timeSpentPretty>4 min 31s</timeSpentPretty>
<icon />
</row>
@@ -117,8 +117,8 @@
<pageId>13</pageId>
<generationTime>0.33s</generationTime>
- <timeSpent>270</timeSpent>
- <timeSpentPretty>4 min 30s</timeSpentPretty>
+ <timeSpent>271</timeSpent>
+ <timeSpentPretty>4 min 31s</timeSpentPretty>
<icon />
</row>
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 bed8ee84d615bcb1e57f9d2ffbef59e0d7577c66..38f9ab1424f1d38e09fd59a5c89a2d92d272a0f3 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,8 +14,8 @@
<pageId>1</pageId>
<generationTime>0.33s</generationTime>
- <timeSpent>270</timeSpent>
- <timeSpentPretty>4 min 30s</timeSpentPretty>
+ <timeSpent>271</timeSpent>
+ <timeSpentPretty>4 min 31s</timeSpentPretty>
<icon />
</row>
@@ -117,8 +117,8 @@
<pageId>13</pageId>
<generationTime>0.33s</generationTime>
- <timeSpent>270</timeSpent>
- <timeSpentPretty>4 min 30s</timeSpentPretty>
+ <timeSpent>271</timeSpent>
+ <timeSpentPretty>4 min 31s</timeSpentPretty>
<icon />
</row>
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 bed8ee84d615bcb1e57f9d2ffbef59e0d7577c66..38f9ab1424f1d38e09fd59a5c89a2d92d272a0f3 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,8 +14,8 @@
<pageId>1</pageId>
<generationTime>0.33s</generationTime>
- <timeSpent>270</timeSpent>
- <timeSpentPretty>4 min 30s</timeSpentPretty>
+ <timeSpent>271</timeSpent>
+ <timeSpentPretty>4 min 31s</timeSpentPretty>
<icon />
</row>
@@ -117,8 +117,8 @@
<pageId>13</pageId>
<generationTime>0.33s</generationTime>
- <timeSpent>270</timeSpent>
- <timeSpentPretty>4 min 30s</timeSpentPretty>
+ <timeSpent>271</timeSpent>
+ <timeSpentPretty>4 min 31s</timeSpentPretty>
<icon />
</row>
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 bed8ee84d615bcb1e57f9d2ffbef59e0d7577c66..38f9ab1424f1d38e09fd59a5c89a2d92d272a0f3 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,8 +14,8 @@
<pageId>1</pageId>
<generationTime>0.33s</generationTime>
- <timeSpent>270</timeSpent>
- <timeSpentPretty>4 min 30s</timeSpentPretty>
+ <timeSpent>271</timeSpent>
+ <timeSpentPretty>4 min 31s</timeSpentPretty>
<icon />
</row>
@@ -117,8 +117,8 @@
<pageId>13</pageId>
<generationTime>0.33s</generationTime>
- <timeSpent>270</timeSpent>
- <timeSpentPretty>4 min 30s</timeSpentPretty>
+ <timeSpent>271</timeSpent>
+ <timeSpentPretty>4 min 31s</timeSpentPretty>
<icon />
</row>
diff --git a/plugins/CoreAdminHome/CustomLogo.php b/plugins/CoreAdminHome/CustomLogo.php
index 76f328e139289d4b5e7ab838cdbd0fe42becd49c..32fa636dd347d1a01bac6fceecffe98a87179278 100644
--- a/plugins/CoreAdminHome/CustomLogo.php
+++ b/plugins/CoreAdminHome/CustomLogo.php
@@ -196,18 +196,22 @@ class CustomLogo
list($width, $height) = getimagesize($file);
switch ($_FILES[$uploadFieldName]['type']) {
case 'image/jpeg':
- $image = imagecreatefromjpeg($file);
+ $image = @imagecreatefromjpeg($file);
break;
case 'image/png':
- $image = imagecreatefrompng($file);
+ $image = @imagecreatefrompng($file);
break;
case 'image/gif':
- $image = imagecreatefromgif ($file);
+ $image = @imagecreatefromgif ($file);
break;
default:
return false;
}
+ if (!is_resource($image)) {
+ return false;
+ }
+
$targetWidth = round($width * $targetHeight / $height);
$newImage = imagecreatetruecolor($targetWidth, $targetHeight);
diff --git a/plugins/CoreAdminHome/javascripts/generalSettings.js b/plugins/CoreAdminHome/javascripts/generalSettings.js
index f0e5f103aa759c0ba26143737aa641dac5dcd256..e691ce72b9e5bb5702a0363bb27f0635c6123ef7 100644
--- a/plugins/CoreAdminHome/javascripts/generalSettings.js
+++ b/plugins/CoreAdminHome/javascripts/generalSettings.js
@@ -114,6 +114,7 @@ $(document).ready(function () {
$("#logoUploadForm").submit(function (data) {
var submittingForm = $(this);
+ $('.uploaderror').fadeOut();
var frameName = "upload" + (new Date()).getTime();
var uploadFrame = $("<iframe name=\"" + frameName + "\" />");
uploadFrame.css("display", "none");
@@ -124,6 +125,10 @@ $(document).ready(function () {
var frameContent = $(uploadFrame.contents()).find('body').html();
frameContent = $.trim(frameContent);
+ if ('0' === frameContent) {
+ $('.uploaderror').show();
+ }
+
if ('1' === frameContent || '0' === frameContent) {
uploadFrame.remove();
}
diff --git a/plugins/CoreAdminHome/lang/ar.json b/plugins/CoreAdminHome/lang/ar.json
index a447d3d651ba2e2b3bd02ea07c1c328f70a61dfb..7177c24bfa482df94d027b7a328d486ab1f6eef4 100644
--- a/plugins/CoreAdminHome/lang/ar.json
+++ b/plugins/CoreAdminHome/lang/ar.json
@@ -5,7 +5,7 @@
"BrandingSettings": "إعدادات العلامة التجارية",
"ClickHereToOptIn": "انقر هناك للاشتراك.",
"ClickHereToOptOut": "انقر هنا لإلغاء الاشتراك.",
- "CustomLogoFeedbackInfo": "إذا قمت بتخصيص شعار بايويك، Ùقد ترغب أيضاً ÙÙŠ إخÙاء الرابط %s ÙÙŠ القائمة العليا. لإجراء هذا، يمكنك تعطيل الملØÙ‚ البرمجي \"التغذية الراجعة\" ÙÙŠ صÙØØ© %sإدارة الملØقات%s.",
+ "CustomLogoFeedbackInfo": "إذا قمت بتخصيص شعار بايويك، Ùقد ترغب أيضاً ÙÙŠ إخÙاء الرابط %1$s ÙÙŠ القائمة العليا. لإجراء هذا، يمكنك تعطيل الملØÙ‚ البرمجي \"التغذية الراجعة\" ÙÙŠ صÙØØ© %2$sإدارة الملØقات%3$s.",
"CustomLogoHelpText": "يمكنك تخصيص شعار بايويك والذي يتم عرضه ÙÙŠ صÙØØ© المستخدم والتقارير البريدية.",
"EmailServerSettings": "إعدادات ملقم البريد",
"ForBetaTestersOnly": "لمجربي نسخة بيتا Ùقط",
@@ -34,7 +34,7 @@
"OptOutComplete": "اكتمل إلغاء الاشتراك: لن يتم اØتساب زياراتك لهذا الموقع بواسطة أدوات تØليلات ويب الخاصة بنا.",
"OptOutCompleteBis": "لاØظ أنك ÙÙŠ Øالة Ù…Ø³Ø Ø§Ù„ÙƒÙˆÙƒÙŠØ² CoockiesØŒ Ùإنك بذلك تØذ٠الكوكيز الخاصة بإلغاء الاشتراك، أو ÙÙŠ Øالة تغيير جهاز الكمبيوتر أو المتصÙØØŒ ÙستØتاج لإعادة هذا الإجراء مرة أخرى.",
"OptOutExplanation": "Piwik ملتزم بالخصوصية على الإنترنت. Ù„Ù…Ù†Ø Ø²ÙˆØ§Ø±Ùƒ اختيار إلغاء الاشتراك ÙÙŠ تØليلات ويب من PiwikØŒ يمكنك إضاÙØ© كود HTML التالي على Ø£Øد صÙØات موقعك. على سبيل المثال ÙÙŠ صÙØØ© سياسة الخصوصية.",
- "OptOutExplanationBis": "سيقوم هذا الكود بعرض iFrame ÙŠØتوي رابطاً لزوارك لإلغاء اشتراكهم ÙÙŠ Piwik من خلال ضبط كوكيز ÙÙŠ متصÙØهم. %s انقر هنا %s لمشاهدة المØتويات التي سيتم عرضها ÙÙŠ الناÙذة الÙرعية iFrame.",
+ "OptOutExplanationBis": "سيقوم هذا الكود بعرض iFrame ÙŠØتوي رابطاً لزوارك لإلغاء اشتراكهم ÙÙŠ Piwik من خلال ضبط كوكيز ÙÙŠ متصÙØهم. %1$s انقر هنا %2$s لمشاهدة المØتويات التي سيتم عرضها ÙÙŠ الناÙذة الÙرعية iFrame.",
"OptOutForYourVisitors": "إلغاء الاشتراك ÙÙŠ Piwik لزوارك",
"PiwikIsInstalledAt": "بايويك مثبت ÙÙŠ المسار",
"TrackAGoal": "تتبع هدÙ",
diff --git a/plugins/CoreAdminHome/lang/be.json b/plugins/CoreAdminHome/lang/be.json
index c05e785a9ed9b438eeaf1057fb10802feb64efe3..ec13b08ce58f922fac0339d6f96d9bb9d32e391e 100644
--- a/plugins/CoreAdminHome/lang/be.json
+++ b/plugins/CoreAdminHome/lang/be.json
@@ -4,7 +4,7 @@
"BrandingSettings": "БрÑндынг наладкі",
"ClickHereToOptIn": "ÐаціÑніце тут, каб адмÑніць адмову.",
"ClickHereToOptOut": "ÐаціÑніце тут, каб адмовіцца.",
- "CustomLogoFeedbackInfo": "Калі Ð’Ñ‹ наладзілі Ñвой лагатып, магчыма вы будзіце зацікаўлены Ñž Ñхаванні %s ÑпаÑылкі у верхнім меню. Ð”Ð»Ñ Ð³Ñтага, вы можаце адключыць плагін зваротнай ÑувÑзі на Ñтаронцы %sÐ£Ð¿Ñ€Ð°ÑžÐ»ÐµÐ½Ð½Ñ Ð¿Ð»Ð°Ð³Ñ–Ð½Ð°Ð¼Ñ–%s.",
+ "CustomLogoFeedbackInfo": "Калі Ð’Ñ‹ наладзілі Ñвой лагатып, магчыма вы будзіце зацікаўлены Ñž Ñхаванні %1$s ÑпаÑылкі у верхнім меню. Ð”Ð»Ñ Ð³Ñтага, вы можаце адключыць плагін зваротнай ÑувÑзі на Ñтаронцы %2$sÐ£Ð¿Ñ€Ð°ÑžÐ»ÐµÐ½Ð½Ñ Ð¿Ð»Ð°Ð³Ñ–Ð½Ð°Ð¼Ñ–%3$s.",
"CustomLogoHelpText": "Ð’Ñ‹ можаце наладзіць Ñвой лагатып, Ñкі будзе адлюÑтроўвацца Ñž карыÑтацкім інтÑрфейÑе Ñ– Ñž Ñправаздачах, ÑÐºÑ–Ñ Ð°Ñ‚Ñ€Ñ‹Ð¼Ð»Ñ–Ð²Ð°ÑŽÑ†ÑŒ па Ñлектроннай пошце.",
"EmailServerSettings": "Ðаладкі Ñервера Ñлектроннай пошты",
"LogoUpload": "Выбраць лагатып Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÑ–",
@@ -12,7 +12,7 @@
"OptOutComplete": "Ðдмова завершана; вашы наведванні гÑтага вÑб-Ñайта не будуць запіÑаны інÑтрументам Ð’Ñб-Ðналітыкі.",
"OptOutCompleteBis": "Заўважце, што калі вы выдалÑеце cookies, выдалÑеце ÑпецыÑльны cookie Ð´Ð»Ñ Ð°Ð´Ð¼Ð¾Ð²Ñ‹, змÑнÑÑце кампутары або вÑб-браўзÑры, вам Ñ‚Ñ€Ñба выканаць працÑдуру адмовы зноў.",
"OptOutExplanation": "Piwik прыÑвечаны забеÑпÑчÑнню канфідÑнцыÑльнаÑці Ñž ІнтÑрнÑце. Каб прапанаваць Ñваім наведвальнікам адмовіцца ад Piwik Ð’Ñб-Ðналітыкі, вы можаце дадаць наÑтупны код на адной з Ñтаронак вашага Ñайта, напрыклад, на Ñтаронцы Палітыка прыватнаÑці.",
- "OptOutExplanationBis": "ГÑÑ‚Ñ‹ код будзе адлюÑтроўвацца Ñк ÐйфрÑйм, Ñкі будзе змÑшчаць ÑпаÑылку Ð´Ð»Ñ Ð²Ð°ÑˆÑ‹Ñ… наведвальнікаў, каб адмовіцца ад Piwik з дапамогай уÑталÑÐ²Ð°Ð½Ð½Ñ ÑпецыÑльных cookie у браўзÑрах. %s ÐаціÑніце тут %s, каб прагледзець змеÑціва, Ñкое будзе адлюÑтроўвацца Ñž ÐйфрÑйме.",
+ "OptOutExplanationBis": "ГÑÑ‚Ñ‹ код будзе адлюÑтроўвацца Ñк ÐйфрÑйм, Ñкі будзе змÑшчаць ÑпаÑылку Ð´Ð»Ñ Ð²Ð°ÑˆÑ‹Ñ… наведвальнікаў, каб адмовіцца ад Piwik з дапамогай уÑталÑÐ²Ð°Ð½Ð½Ñ ÑпецыÑльных cookie у браўзÑрах. %1$s ÐаціÑніце тут %2$s, каб прагледзець змеÑціва, Ñкое будзе адлюÑтроўвацца Ñž ÐйфрÑйме.",
"OptOutForYourVisitors": "Ðдмова ад Piwik Ð´Ð»Ñ Ð²Ð°ÑˆÑ‹Ñ… наведвальнікаў",
"UseCustomLogo": "ВыкарыÑтаць ўлаÑны лагатып",
"YouAreOptedIn": "У дадзены момант Вы не адмоўлены.",
diff --git a/plugins/CoreAdminHome/lang/bg.json b/plugins/CoreAdminHome/lang/bg.json
index f576dc49acefa8cf0b50669d2e72dfb0bace5a27..f2f8f940210459907e99f092eb55717073da70f2 100644
--- a/plugins/CoreAdminHome/lang/bg.json
+++ b/plugins/CoreAdminHome/lang/bg.json
@@ -5,7 +5,7 @@
"BrandingSettings": "ÐаÑтройки на бранда",
"ClickHereToOptIn": "ÐатиÑнете тук за ÑъглаÑие.",
"ClickHereToOptOut": "ÐатиÑнете тук за отказ.",
- "CustomLogoFeedbackInfo": "Ðко модифицирате Piwik логото, може Ñъщо да пожелаете да Ñкриете %s връзката в главното меню. За да направите това, можете да изключите добавката за обратна връзка в Ñтраницата %sУправление на добавки%s.",
+ "CustomLogoFeedbackInfo": "Ðко модифицирате Piwik логото, може Ñъщо да пожелаете да Ñкриете %1$s връзката в главното меню. За да направите това, можете да изключите добавката за обратна връзка в Ñтраницата %2$sУправление на добавки%3$s.",
"CustomLogoHelpText": "Можете да модифицирате логото на Piwik, което да Ñе показва в интерфейÑа на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð¸ имейлите Ñ Ð¾Ñ‚Ñ‡ÐµÑ‚Ð¸.",
"EmailServerSettings": "ÐаÑтройки Ñървър на е-поща",
"ForBetaTestersOnly": "Само за бета теÑтери",
@@ -19,7 +19,6 @@
"JavaScriptTracking": "JavaScript ПроÑледÑване",
"JSTracking_CampaignKwdParam": "Параметър ключова дума на кампаниÑта",
"JSTracking_CampaignNameParam": "Параметър име на кампаниÑта",
- "JSTracking_CodeNote": "Уверете Ñе, че този код е на вÑÑка една Ñтраница от Ð²Ð°ÑˆÐ¸Ñ Ñайт преди %1$s таг.",
"JSTracking_CustomCampaignQueryParam": "Използвайте произволно име на параметър заÑвка за име и ключ на кампаниÑта",
"JSTracking_CustomCampaignQueryParamDesc": "Забележка: %1$sPiwik автоматично ще заÑече Google Analytics параметрите.%2$s",
"JSTracking_DisableCookies": "Изключване на вÑички проÑледÑващи биÑквитки",
@@ -41,21 +40,21 @@
"JSTrackingIntro5": "Ð’ Ñлучай, че желаете да Ñъбирате повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° поÑещениÑта, молÑ, вижте %1$sPiwik Javascript Tracking документациÑта%2$s, за ÑпиÑък Ñ Ð½Ð°Ð»Ð¸Ñ‡Ð½Ð¸Ñ‚Ðµ функции. Използвайки тези функции може да Ñледите цели, перÑонализирани променливи, поръчки, изоÑтавени колички и други.",
"LogoUpload": "Изберете логото за качване",
"FaviconUpload": "Изберете Favicon за качване",
- "LogoUploadHelp": "МолÑ, качете файла в %s формати Ñ Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»Ð½Ð° виÑочина %s пикÑела.",
+ "LogoUploadHelp": "МолÑ, качете файла в %1$s формати Ñ Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»Ð½Ð° виÑочина %2$s пикÑела.",
"MenuDiagnostic": "ДиагноÑтика",
"MenuGeneralSettings": "ОÑновни наÑтройки",
"MenuManage": "Управление",
"OptOutComplete": "Отказът е приет; вашите поÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð² този уебÑайт нÑма да бъдат запиÑвани от ИнÑтрумента за Уеб анализ.",
"OptOutCompleteBis": "Запомнете, че ако изтриете вашите биÑквитки или ако Ñмените компютъра или уеб браузъра ще е нужно да направите процедурата за отказ отново.",
"OptOutExplanation": "Piwik е ангажиран Ñ Ð¾ÑигурÑването на поверителноÑÑ‚ в Интернет. За да позволите на потребителите Ñи да Ñе откажат от Piwik Web Analytics, можете да добавите нужниÑÑ‚ HTML код в една от вашите уеб Ñтраници, например в раздела ПоверителноÑÑ‚.",
- "OptOutExplanationBis": "Този код ще ви покаже рамка, Ñъдържаща връзка, чрез коÑто вашите поÑетители могат да Ñе откажат от Piwik, като поÑтавÑÑ‚ биÑквитка в техните браузъри. %s ÐатиÑнете тук%s за да видите Ñъдържанието, което ще бъде показано в рамката.",
+ "OptOutExplanationBis": "Този код ще ви покаже рамка, Ñъдържаща връзка, чрез коÑто вашите поÑетители могат да Ñе откажат от Piwik, като поÑтавÑÑ‚ биÑквитка в техните браузъри. %1$s ÐатиÑнете тук%2$s за да видите Ñъдържанието, което ще бъде показано в рамката.",
"OptOutForYourVisitors": "Piwik отказ за вашите поÑетители",
"PiwikIsInstalledAt": "Piwik е инÑталиран на",
- "PluginSettingChangeNotAllowed": "Ðе е позволено да Ñе Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ ÑтойноÑтта за наÑтройка \"%s\" в добавка \"%s\"",
+ "PluginSettingChangeNotAllowed": "Ðе е позволено да Ñе Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ ÑтойноÑтта за наÑтройка \"%1$s\" в добавка \"%2$s\"",
"PluginSettingsIntro": "Тук могат да Ñе променÑÑ‚ наÑтройките за Ñледните добавки от трети Ñтрани:",
- "PluginSettingsValueNotAllowed": "СтойноÑтта за поле \"%s\" за добавка \"%s\" не е позволена",
+ "PluginSettingsValueNotAllowed": "СтойноÑтта за поле \"%1$s\" за добавка \"%2$s\" не е позволена",
"SendPluginUpdateCommunicationHelp": "Ще бъде изпратено Ñъобщение на привилигирован потребител когато е налична нова верÑÐ¸Ñ Ð·Ð° добавка.",
- "StableReleases": "Ðко Piwik е критично важен за вашиÑÑ‚ бизнеÑ, използвайте поÑледната Ñтабилна верÑиÑ. Ðко използвате поÑледна бета и откриете бъг или имате предложение, Ð¼Ð¾Ð»Ñ %sвижте тук%s.",
+ "StableReleases": "Ðко Piwik е критично важен за вашиÑÑ‚ бизнеÑ, използвайте поÑледната Ñтабилна верÑиÑ. Ðко използвате поÑледна бета и откриете бъг или имате предложение, Ð¼Ð¾Ð»Ñ %1$sвижте тук%2$s.",
"TrackAGoal": "ПроÑледÑване на цел",
"TrackingCode": "Код за проÑледÑване",
"TrustedHostConfirm": "Сигурен ли Ñте, че желаете да промените доверен Piwiki хоÑÑ‚ име",
diff --git a/plugins/CoreAdminHome/lang/ca.json b/plugins/CoreAdminHome/lang/ca.json
index bb318f8013e4f20e4439782fb7b199174acf92a9..e1485eea7bbaf03d539bbe0950f01017bbd0c867 100644
--- a/plugins/CoreAdminHome/lang/ca.json
+++ b/plugins/CoreAdminHome/lang/ca.json
@@ -4,7 +4,7 @@
"BrandingSettings": "Preferències del Branding",
"ClickHereToOptIn": "Feu click aquà per apuntar-vos.",
"ClickHereToOptOut": "Feu click aquà per desapuntar-vos.",
- "CustomLogoFeedbackInfo": "Si heu personalitzat el log de Piwik, potser també estareu interesants en amagar %s l'enllaç al menú superior. Per a fer-ho, podeu deshabilitar l'extensió de Feedback a la pà gina %sManage Plugins%s",
+ "CustomLogoFeedbackInfo": "Si heu personalitzat el log de Piwik, potser també estareu interesants en amagar %1$s l'enllaç al menú superior. Per a fer-ho, podeu deshabilitar l'extensió de Feedback a la pà gina %2$sManage Plugins%3$s",
"CustomLogoHelpText": "Podeu personalitzar el logo de Piwik que es mostrarà a l'interfÃcie d'usuari i als informes d'emails.",
"EmailServerSettings": "Configuració del servidor de correu",
"ImageTracking": "Seguiment per imatge",
@@ -20,7 +20,7 @@
"OptOutComplete": "Baixa complerta. Les teves visites en aquest lloc web no es tindrán en compte per l'eina d'anà lisis Web.",
"OptOutCompleteBis": "Teniu en compte que si borreu les cookies, borreu la cookie de baixa o si canvieu d'ordenador o de navegadaor web, haureu de tornar a realitzar el proces de baixa.",
"OptOutExplanation": "El Piwik es dedica a garantir la privacitat a Internet. Per permetres als vostres usuaris la possibilitat de donar-se de baixa del l'análisis web del Piwik, podeu afegir el següent codi HTML a una de les pà giens del vostre lloc web, per exemple a la pà gina de polÃtica de privacitat.",
- "OptOutExplanationBis": "Aquest codi mostrarà un Iframe que conté un enllaç per a que els vostres visitants es puguin donar de baixa del Piwik. Aquest enllaç guarda un cookie al seus navegadors. %s Click here%s per veure el contingut que es mostrarà al Iframe.",
+ "OptOutExplanationBis": "Aquest codi mostrarà un Iframe que conté un enllaç per a que els vostres visitants es puguin donar de baixa del Piwik. Aquest enllaç guarda un cookie al seus navegadors. %1$s Click here%2$s per veure el contingut que es mostrarà al Iframe.",
"OptOutForYourVisitors": "PÃ gina de baixa del Piwik pels vostres visitants",
"PiwikIsInstalledAt": "El Piwik està instal·lat a",
"TrustedHostConfirm": "Esteu segur que voleu canviar el nom nom de la mà quina (hostname) de confiança del Piwik?",
diff --git a/plugins/CoreAdminHome/lang/cs.json b/plugins/CoreAdminHome/lang/cs.json
index 57836e1ade1d94bd897a9d7dd9dddd9cffbcb1b5..23e133f082da809954773a6d1fb52f93262ef655 100644
--- a/plugins/CoreAdminHome/lang/cs.json
+++ b/plugins/CoreAdminHome/lang/cs.json
@@ -7,10 +7,10 @@
"ReleaseChannel": "Kanál vydánÃ",
"ClickHereToOptIn": "KliknÄ›te zde pro pÅ™ihlášenÃ.",
"ClickHereToOptOut": "KliknÄ›te zde pro vylouÄenÃ.",
- "CustomLogoFeedbackInfo": "Pokud pÅ™izpůsobÃte logo Piwiku, možná by vás zajÃmalo, jak skrýt odkaz %s v hornÃm menu, Pokud to chcete provést, zakažte plugin zpÄ›tné vazby na stránce %sSpravovat zásuvné moduly%s.",
- "CustomLogoHelpText": "Můžete pÅ™izpůsobit logo Piwiku, které bude zobrazeno v uživatelském rozhranà a v emailových hlášenÃch.",
- "DevelopmentProcess": "PÅ™estože náš %sproces vývoje%s zahrnuje tisÃce automatizovaných testů, beta testeÅ™i hrajà klÃÄovou roli v naÅ¡Ã politice nevýskytu chyb.",
- "EmailServerSettings": "Nastavenà emailového serveru",
+ "CustomLogoFeedbackInfo": "Pokud pÅ™izpůsobÃte logo Piwiku, možná by vás zajÃmalo, jak skrýt odkaz %1$s v hornÃm menu, Pokud to chcete provést, zakažte plugin zpÄ›tné vazby na stránce %2$sSpravovat zásuvné moduly%3$s.",
+ "CustomLogoHelpText": "Můžete pÅ™izpůsobit logo Piwiku, které bude zobrazeno v uživatelském rozhranà a v e-mailových hlášenÃch.",
+ "DevelopmentProcess": "PÅ™estože náš %1$sproces vývoje%2$s zahrnuje tisÃce automatizovaných testů, beta testeÅ™i hrajà klÃÄovou roli v naÅ¡Ã politice nevýskytu chyb.",
+ "EmailServerSettings": "Nastavenà e-mailového serveru",
"ForBetaTestersOnly": "Pouze pro beta testery",
"ImageTracking": "Sledovánà obrázkem",
"ImageTrackingIntro1": "Pokud má návÅ¡tÄ›vnÃk vypnutý JavaScript nebo nemůže být JavaScript použit, můžete využÃt obrázku k měřenà a sledovánà VaÅ¡Ã návÅ¡tÄ›vnosti.",
@@ -24,7 +24,7 @@
"JavaScriptTracking": "Sledovánà javascriptem",
"JSTracking_CampaignKwdParam": "KlÃÄové slovo kampanÄ›",
"JSTracking_CampaignNameParam": "Název kampaně",
- "JSTracking_CodeNote": "UjistÄ›te se, že je následujÃcà kód na každé stránce pÅ™ed tagem %1$s.",
+ "JSTracking_CodeNoteBeforeClosingHead": "UjistÄ›te se, že je následujÃcà kód na každé stránce vaÅ¡eho webu. DoporuÄujeme ho vložit pÅ™ed uzavÃracà tag %1$s.",
"JSTracking_CustomCampaignQueryParam": "Pro jméno kampanÄ› a klÃÄové slovo použÃt vlastnà parametry dotazu",
"JSTracking_CustomCampaignQueryParamDesc": "Poznámka: %1$sPiwik automaticky detekuje parametry pro Google analitics.%2$s",
"JSTracking_DisableCookies": "Zakázat všechny sledovacà cookies",
@@ -49,9 +49,10 @@
"JSTrackingIntro5": "Pokud chcete ne jen sledovat zobrazenà stránek, podÃvejte se na %1$sdokumentaci javascriptového sledovánÃ%2$s, kde naleznete seznam dostupných funkcÃ. S použitÃm tÄ›chto funkcà můžete sledovat cÃle, vlastnà promÄ›nné, objednávky v e-obchodech, opuÅ¡tÄ›né koÅ¡Ãky a mnoho dalÅ¡Ãho.",
"LogoNotWriteableInstruction": "Pokud chcete mÃsto výcchozÃho loga použÃt vlastnÃ, je nutné, abyste mÄ›li práva k zápisu adresáře %1$s. Piwik potÅ™ebuje práva k zápisu log umÃstÄ›ných v souborech %2$s.",
"FileUploadDisabled": "Nahrávánà souborů je zakázáno v konfiguraci PHP. Pokud chcete nahrát svoje vlastnà logo, nastavte %s v souboru php.ini a restartujte webový server.",
+ "LogoUploadFailed": "Nahraný soubor nemohl být zpracován. Ověřte prosÃm, že má nahraný soubor správný formát.",
"LogoUpload": "Vyberte logo, které chcete nahrát",
"FaviconUpload": "Vyberte favicon, kterou chcete nahrát",
- "LogoUploadHelp": "ProsÃm, nahrajte soubor v jednom z následujÃcÃch formátů: %s, s minimálnà výškou %s pixelů.",
+ "LogoUploadHelp": "ProsÃm, nahrajte soubor v jednom z následujÃcÃch formátů: %1$s, s minimálnà výškou %2$s pixelů.",
"MenuDiagnostic": "Diagnostika",
"MenuGeneralSettings": "Hlavnà nastavenÃ",
"MenuManage": "Správa",
@@ -59,20 +60,20 @@
"OptOutComplete": "VylouÄenà hotovo. VaÅ¡e návÅ¡tÄ›vy nebudou sledovány nástrojem webové analýzy.",
"OptOutCompleteBis": "Poznámka: pokud smažete cookie, odstranÃte vyluÄovacà cookie nebo zmmÄ›nÃte poÄÃtaÄ nebo prohlÞeÄ, budete muset provést proceduru vylouÄenà znovu.",
"OptOutDntFound": "Nejste sledováni, protože váš prohlÞeÄ hlásÃ, že si to nepÅ™ejete. Jedná se o nastavenà prohlÞeÄe, takže se nebudete moci pÅ™ihlásit, dokud nezakážete funkci nesledovat.",
- "OptOutExplanation": "Piwik se zaměřuje na poskytovánà soukromà na internetu. Pokud chcete dát svým návÅ¡tÄ›vnÃkům možnost, aby byli vylouÄeni z webové analýzy Piwikem, můžete na nÄ›jakou stránku (tÅ™eba stránku o soukromÃ) umÃstit následujÃcà HTML kód.",
- "OptOutExplanationBis": "Tento kód zobrazà iframe s odkazem, který nastavà u návÅ¡tÄ›vnÃka vynechávacà cookie. %s KliknÄ›te zde%s pro zobrazenà obsahu iframe.",
+ "OptOutExplanation": "Piwik se zaměřuje na poskytovánà soukromà na internetu. Pokud chcete dát svým návÅ¡tÄ›vnÃkům možnost odhlásit se z webových analýz Piwikem, můžete na nÄ›jakou stránku (tÅ™eba stránku o soukromÃ) umÃstit následujÃcà HTML kód.",
+ "OptOutExplanationBis": "Tento kód zobrazà iframe s odkazem, který nastavà u návÅ¡tÄ›vnÃka vynechávacà cookie. %1$s KliknÄ›te zde%2$s pro zobrazenà obsahu iframe.",
"OptOutForYourVisitors": "Piwik vylouÄenà pro VaÅ¡e návÅ¡tÄ›vnÃky",
"PiwikIsInstalledAt": "Piwik je nainstalován na",
"PersonalPluginSettings": "Osobnà nastavenà zásuvných modulů",
- "PluginSettingChangeNotAllowed": "Nemůžete změnit hodnotu volby %s zásuvného modulu \"%s\"",
- "PluginSettingReadNotAllowed": "Nemůžete ÄÃst hodnotu volby %s zásuvného modulu \"%s\"",
+ "PluginSettingChangeNotAllowed": "Nemůžete změnit hodnotu volby %1$s zásuvného modulu \"%2$s\"",
+ "PluginSettingReadNotAllowed": "Nemůžete ÄÃst hodnotu volby %1$s zásuvného modulu \"%2$s\"",
"PluginSettings": "Nastavenà zásuvného modulu",
"PluginSettingsIntro": "Zde můžete zmÄ›nit nastavenà pro následujÃcà zásuvné moduly tÅ™etÃch stran:",
- "PluginSettingsValueNotAllowed": "Hodnota pro pole \"%s\" zásuvného modulu \"%s\" nenà povolena",
+ "PluginSettingsValueNotAllowed": "Hodnota pro pole \"%1$s\" zásuvného modulu \"%2$s\" nenà povolena",
"PluginSettingsSaveFailed": "Nepodařilo se uložit nastavenà zásuvného modulu",
- "SendPluginUpdateCommunication": "Pokud bude k dispozici aktualizace pluginu, odeslat email.",
- "SendPluginUpdateCommunicationHelp": "Super uživatelům bude odeslán email, pokud bude k dispozici aktualizace zásuvného modulu.",
- "StableReleases": "Piwik je důležitý nástroj pro měřenÃ, doporuÄujeme vždy použÃvat nejnovÄ›jÅ¡Ã vydánÃ. Pokud použÃváte nejnovÄ›jÅ¡Ã beta verzi a naÅ¡li jste chyby, prosÃme o jejich nahlášenà %spÅ™Ãmo zde %s.",
+ "SendPluginUpdateCommunication": "Pokud bude k dispozici aktualizace pluginu, odeslat e-mail.",
+ "SendPluginUpdateCommunicationHelp": "Super-uživatelům bude odeslán e-mail, pokud bude k dispozici aktualizace zásuvného modulu.",
+ "StableReleases": "Piwik je důležitý nástroj pro měřenÃ, doporuÄujeme vždy použÃvat nejnovÄ›jÅ¡Ã vydánÃ. Pokud použÃváte nejnovÄ›jÅ¡Ã beta verzi a naÅ¡li jste chyby, prosÃme o jejich nahlášenà %1$spÅ™Ãmo zde %2$s.",
"LtsReleases": "LTS (verze s dlouhodobou podporou) dostávajà pouze bezpeÄnostnà a jiné opravy chyb.",
"SystemPluginSettings": "Systémová nastavenà zásuvných modulů",
"TrackAGoal": "Sledovat cÃl",
@@ -85,10 +86,10 @@
"WithOptionalRevenue": "s volitelným pÅ™Ãjmem",
"YouAreOptedIn": "AktuálnÄ› nejste vylouÄen.",
"YouAreOptedOut": "AktuálnÄ› jste vylouÄeni.",
- "YouMayOptOut": "Zde se můžete zakázat uloženà cookie s identifikaÄnÃm ÄÃslem pÅ™idÄ›leným vaÅ¡emu poÄÃtaÄi a tÃm zamezit provozovateli této webové stránky shromažÄovat a analyzovat statistické údaje.",
+ "YouMayOptOut": "Zde se můžete zakázat uloženà cookie s identifikaÄnÃm ÄÃslem pÅ™idÄ›leným vaÅ¡emu poÄÃtaÄi a tÃm zamezit provozovateli tohoto webu shromažÄovat a analyzovat statistické údaje.",
"YouMayOptOutBis": "Pokud jste se rozhodli že ne, kliknÄ›te na pÅ™iložený odkaz pro uloženà deaktivaÄnÃho cookie ve svém prohlÞeÄi.",
"OptingYouOut": "VyluÄovánÃ, prosÃm Äekejte...",
"ProtocolNotDetectedCorrectly": "Nynà si prohlÞÃte Piwik zabezpeÄeným SSL spojenÃm za použità HTTPS, ale Piwik na serveru detekoval pouze nezabezpeÄené pÅ™ipojenÃ.",
- "ProtocolNotDetectedCorrectlySolution": "Abyste zajistili, že bude Piwik zÃskávat a poskytovat obsah pÅ™es bezpeÄné HTTPS spojenÃ, můžete upravit váš soubor %s a buÄ nastavit proxy, nebo pÅ™idat řádek %s pod sekci %s. %sDozvÄ›dÄ›t se vÃce%s"
+ "ProtocolNotDetectedCorrectlySolution": "Abyste zajistili, že bude Piwik zÃskávat a poskytovat obsah pÅ™es bezpeÄné HTTPS spojenÃ, můžete upravit váš soubor %1$s a buÄ nastavit proxy, nebo pÅ™idat řádek %2$s pod sekci %3$s. %4$sDozvÄ›dÄ›t se vÃce%5$s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/da.json b/plugins/CoreAdminHome/lang/da.json
index d7ae0759d0861b6ca151e9cec5f604cad5751496..21619f6dc151989138fcc589142c24ba2274b7af 100644
--- a/plugins/CoreAdminHome/lang/da.json
+++ b/plugins/CoreAdminHome/lang/da.json
@@ -5,9 +5,9 @@
"BrandingSettings": "Branding indstillinger",
"ClickHereToOptIn": "Klik her for at vælge.",
"ClickHereToOptOut": "Klik her for at fravælge.",
- "CustomLogoFeedbackInfo": "Hvis du tilpasser Piwik logoet, kan du også være interesseret i at skjule %s linket i topmenuen. For at gøre dette, kan du deaktivere tilbagemeldingsmodulet på %sUdvidelsesmodul administration%s siden.",
+ "CustomLogoFeedbackInfo": "Hvis du tilpasser Piwik logoet, kan du også være interesseret i at skjule %1$s linket i topmenuen. For at gøre dette, kan du deaktivere tilbagemeldingsmodulet på %2$sUdvidelsesmodul administration%3$s siden.",
"CustomLogoHelpText": "Du kan tilpasse Piwik logo, der bliver vist i brugergrænsefladen og e-mail rapporter.",
- "DevelopmentProcess": "Mens vores%s udviklingsproces%s omfatter tusindvis af automatiske tests, spiller betatestere en nøglerolle i at opnå \"ingen fejl politikken\" i Piwik.",
+ "DevelopmentProcess": "Mens vores %1$sudviklingsproces%2$s omfatter tusindvis af automatiske tests, spiller betatestere en nøglerolle i at opnå \"ingen fejl politikken\" i Piwik.",
"EmailServerSettings": "E-mail-server indstillinger",
"ForBetaTestersOnly": "Kun for beta testere",
"ImageTracking": "Sporing vha. et billede",
@@ -22,7 +22,6 @@
"JavaScriptTracking": "Sporing med JavaScript",
"JSTracking_CampaignKwdParam": "Kampagne nøgleord parameter",
"JSTracking_CampaignNameParam": "Kampagnenavn parameter",
- "JSTracking_CodeNote": "Sørg for, at koden er på hver side af hjemmesiden, før %1$s tag.",
"JSTracking_CustomCampaignQueryParam": "Brug brugerdefineret forespørgsel parameternavne for kampagnenavnet & søgeord",
"JSTracking_CustomCampaignQueryParamDesc": "Note: %1$sPiwik registrerer automatisk Google Analytics parametre.%2$s",
"JSTracking_DisableCookies": "Deaktivere alle sporingscookies",
@@ -49,7 +48,7 @@
"FileUploadDisabled": "Overførelse af filer er ikke aktiveret i PHP-konfiguration. For at overføre dit brugerdefinerede logo skal du indstille %s i php.ini og genstarte webserveren.",
"LogoUpload": "Vælg et logo til overførelse",
"FaviconUpload": "Vælg Favicon til overførelse",
- "LogoUploadHelp": "Overfør en fil i %s formater med en højde på mindst %s pixels.",
+ "LogoUploadHelp": "Overfør en fil i %1$s formater med en højde på mindst %2$s pixels.",
"MenuDiagnostic": "Diagnosticering",
"MenuGeneralSettings": "Generelle indstillinger",
"MenuManage": "Administrere",
@@ -58,18 +57,18 @@
"OptOutCompleteBis": "Bemærk, at hvis du sletter dine cookies, sletter opt-out-cookien, eller hvis du skifter computer eller browser, skal du udføre opt-out-proceduren igen.",
"OptOutDntFound": "Sporing er ikke aktiv, fordi din browser har meddelt, at du ikke vil spores. Det er en browser indstilling. For at begynde at sporing igen, skal du deaktivere den såkaldte \"Do Not Track\" indstillingen i dine browserindstillinger.",
"OptOutExplanation": "Piwik er dedikeret til at værne om personlige oplysninger på internettet. For at give dine besøgende valgmulighed for at framelde Piwik Web Analyse, kan du tilføje den følgende HTML-kode på en af dine hjemmesider, f. eks. på en fortrolighedspolitik side.",
- "OptOutExplanationBis": "Koden vil vise en Iframe, der indeholder et link til dine besøgende til at framelde Piwik ved at sætte en opt out-cookie i browseren. %sKlik her%s for at få vist indholdet af iFramen.",
+ "OptOutExplanationBis": "Koden vil vise en Iframe, der indeholder et link til dine besøgende til at framelde Piwik ved at sætte en opt out-cookie i browseren. %1$sKlik her%2$s for at få vist indholdet af iFramen.",
"OptOutForYourVisitors": "Piwik opt-out for dine besøgende",
"PiwikIsInstalledAt": "Piwik er installeret på",
"PersonalPluginSettings": "Personlige indstillinger for udvidelsesmoduler",
- "PluginSettingChangeNotAllowed": "Du må ikke ændre værdien \"%s\" i udvidelse \"%s\"",
- "PluginSettingReadNotAllowed": "Du har ikke tilladelse til at læse værdien af ​​indstillingen \"%s\" i udvidelsen \"%s\"",
+ "PluginSettingChangeNotAllowed": "Du må ikke ændre værdien \"%1$s\" i udvidelse \"%2$s\"",
+ "PluginSettingReadNotAllowed": "Du har ikke tilladelse til at læse værdien af ​​indstillingen \"%1$s\" i udvidelsen \"%2$s\"",
"PluginSettings": "Programudvidelses indstilinger",
"PluginSettingsIntro": "Her kan du ændre indstillingerne for følgende 3. parts udvidelsesmoduler:",
- "PluginSettingsValueNotAllowed": "Værdien for feltet \"%s\" i udvidelsen \"%s\" er ikke tilladt",
+ "PluginSettingsValueNotAllowed": "Værdien for feltet \"%1$s\" i udvidelsen \"%2$s\" er ikke tilladt",
"PluginSettingsSaveFailed": "Kunne ikke gemme udvidelsesmodul indstillinger",
"SendPluginUpdateCommunicationHelp": "En e-mail vil blive sendt til Superbrugere, når der er en ny version tilgængelig for denne programudvidelse.",
- "StableReleases": "Hvis Piwik er en kritisk del af virksomheden, anbefaler vi at man bruger den nyeste stabile udgave. Hvis man bruger den nyeste beta, og finder en fejl eller har et forslag, %sse her%s.",
+ "StableReleases": "Hvis Piwik er en kritisk del af virksomheden, anbefaler vi at man bruger den nyeste stabile udgave. Hvis man bruger den nyeste beta, og finder en fejl eller har et forslag, %1$sse her%2$s.",
"SystemPluginSettings": "Indstillinger for system udvidelsesmoduler",
"TrackAGoal": "Spor et mål",
"TrackingCode": "Sporingskode",
diff --git a/plugins/CoreAdminHome/lang/de.json b/plugins/CoreAdminHome/lang/de.json
index 6c1d6681ac3fc750493691db402e225a26a62666..89bfcdb50c6d3ecbc18fb32aa349875df18c4974 100644
--- a/plugins/CoreAdminHome/lang/de.json
+++ b/plugins/CoreAdminHome/lang/de.json
@@ -7,9 +7,9 @@
"ReleaseChannel": "Release Kanal",
"ClickHereToOptIn": "Klicken Sie hier, um Ihren Besuch wieder erfassen zu lassen.",
"ClickHereToOptOut": "Klicken Sie hier, damit Ihr Besuch nicht mehr erfasst wird.",
- "CustomLogoFeedbackInfo": "Wenn Sie das Piwik-Logo anpassen, ist sicher auch das Verstecken des %s-Links in der Navigation von Interesse. Bitte dazu das Feedback Plugin auf der %sManage Plugins%s Seite deaktivieren.",
+ "CustomLogoFeedbackInfo": "Wenn Sie das Piwik-Logo anpassen, ist sicher auch das Verstecken des %1$s-Links in der Navigation von Interesse. Bitte dazu das Feedback Plugin auf der %2$sPlugins verwalten%3$s Seite deaktivieren.",
"CustomLogoHelpText": "Hier kann das Piwik-Logo angepasst werden, das in der Benutzeroberfläche sowie in E-Mail-Berichten verwendet wird.",
- "DevelopmentProcess": "Auch wenn unser %sEntwicklungsprozess%s tausende an automatisierten Tests beinhaltet, haben Beta-Tester eine Schlüsselrolle um die \"No Bug Policy\" in Piwik zu gewährleisten.",
+ "DevelopmentProcess": "Auch wenn unser %1$sEntwicklungsprozess%2$s tausende an automatisierten Tests beinhaltet, haben Beta-Tester eine Schlüsselrolle um die \"No Bug Policy\" in Piwik zu gewährleisten.",
"EmailServerSettings": "E-Mail-Server-Einstellungen",
"ForBetaTestersOnly": "Nur für Beta-Tester",
"ImageTracking": "Tracking mit Hilfe eines Bildes",
@@ -24,7 +24,6 @@
"JavaScriptTracking": "Tracking mit JavaScript",
"JSTracking_CampaignKwdParam": "Kampagnen Suchbegriff Parameter",
"JSTracking_CampaignNameParam": "Parameter für Kampagnenname",
- "JSTracking_CodeNote": "Stellen Sie sicher, dass sich dieser Code auf jeder Seite Ihrer Website vor dem %1$s Tag befindet.",
"JSTracking_CustomCampaignQueryParam": "Eigene Anfrage-Parameter für Kampagnen Name & Suchbegriff verwenden",
"JSTracking_CustomCampaignQueryParamDesc": "Hinweis: %1$sPiwik erkennt Parameter von Google Analytics automatisch.%2$s",
"JSTracking_DisableCookies": "Alle Tracking Cookies deaktivieren",
@@ -49,9 +48,10 @@
"JSTrackingIntro5": "Sollte Sie mehr als nur Seitenaufrufe aufzeichnen wollen, werfen Sie einen Blick in die %1$sPiwik Javascript Tracking Dokumentation%2$s für eine Liste an verfügbaren Funktionen. Mit der Verwendung dieser Funktionen können Sie Ziele, benutzerdefinierte Variablen, Ecommerce Bestellungen, verlassene Warenkörbe und mehr aufzeichnen.",
"LogoNotWriteableInstruction": "Um Ihr eigenes Logo anstelle des Piwik Logos verwenden zu können werden Schreibrechte auf diesen Ordner benötigt: %1$s Piwik benötigt Schreibzugriff auf Ihre Logos die gespeichert sind in %2$s.",
"FileUploadDisabled": "Das Hochladen von Dateien ist in Ihrer PHP-Konfiguration nicht aktiviert. Um Ihr eigenes Logo hochladen zu können setzen Sie bitte %s in Ihrer php.ini und starten Sie den Webserver neu.",
+ "LogoUploadFailed": "Die hochgeladene Datei konnte nicht verarbeitet werden. Bitte überprüfen Sie ob die Datei ein gültiges Format hat.",
"LogoUpload": "Wählen Sie ein Logo für den Upload",
"FaviconUpload": "Wählen Sie ein Favicon für den Upload aus",
- "LogoUploadHelp": "Bitte laden Sie eine Datei in den Formaten %s mit einer minimalen Höhe von %s Pixeln hoch.",
+ "LogoUploadHelp": "Bitte laden Sie eine Datei in den Formaten %1$s mit einer minimalen Höhe von %2$s Pixeln hoch.",
"MenuDiagnostic": "Diagnose",
"MenuGeneralSettings": "Allgemeine Einstellungen",
"MenuManage": "Verwalten",
@@ -60,19 +60,19 @@
"OptOutCompleteBis": "Bitte beachten Sie, dass auch der Piwik-Deaktivierungs-Cookie dieser Website gelöscht wird, wenn Sie die in Ihrem Browser abgelegten Cookies entfernen. Außerdem müssen Sie, wenn Sie einen anderen Computer oder einen anderen Webbrowser verwenden, die Deaktivierungsprozedur nochmals absolvieren.",
"OptOutDntFound": "Das Tracking ist bei Ihnen derzeit nicht aktiv, denn Ihr Browser hat uns mitgeteilt, dass Sie kein Tracking wünschen. Hierbei handelt es sich um eine Browsereinstellung. Um das Tracking wieder zu aktivieren, müssen Sie die sogenannte \"Do Not Track\"-Einstellung in Ihren Browsereinstellungen deaktivieren.",
"OptOutExplanation": "Piwik ist es wichtig, die Privatsphäre Ihrer Besucher zu wahren. Fügen Sie den folgenden HTML-Code auf einer Seite Ihrer Website (z.B der Datenschutz-Seite) ein, um den Besuchern Ihrer Website die Möglichkeit zu geben, sich gegen eine Erfassung ihres Besuches durch Piwik zu entscheiden.",
- "OptOutExplanationBis": "Dieser Code wird innerhalb eines Iframes angezeigt und enthält einen Link, über den ein Cookie im Browser Ihrer Besucher abgelegt wird, womit die Erfassung durch Piwik deaktiviert wird. %s Klicken Sie hier%s, um eine Vorschau auf den Text zu bekommen, der den Besuchern in dem Iframe angezeigt wird.",
+ "OptOutExplanationBis": "Dieser Code wird innerhalb eines Iframes angezeigt und enthält einen Link, über den ein Cookie im Browser Ihrer Besucher abgelegt wird, womit die Erfassung durch Piwik deaktiviert wird. %1$s Klicken Sie hier%2$s, um eine Vorschau auf den Text zu bekommen, der den Besuchern in dem Iframe angezeigt wird.",
"OptOutForYourVisitors": "Piwik-Deaktivierung für Ihre Besucher",
"PiwikIsInstalledAt": "Piwik ist installiert unter",
"PersonalPluginSettings": "Persönliche Plugin Einstellungen",
- "PluginSettingChangeNotAllowed": "Sie sind nicht berechtigt den Wert für die Einstellung \"%s\" im Plugin \"%s\" zu ändern.",
- "PluginSettingReadNotAllowed": "Sie haben keine Berechtigung den Wert der Einstellung \"%s\" für das Plugin \"%s\" auszulesen.",
+ "PluginSettingChangeNotAllowed": "Sie sind nicht berechtigt den Wert für die Einstellung \"%1$s\" im Plugin \"%2$s\" zu ändern.",
+ "PluginSettingReadNotAllowed": "Sie haben keine Berechtigung den Wert der Einstellung \"%1$s\" für das Plugin \"%2$s\" auszulesen.",
"PluginSettings": "Plugin Einstellungen",
"PluginSettingsIntro": "Hier können Sie die Einstellungen für folgende Drittanbieter Plugins ändern:",
- "PluginSettingsValueNotAllowed": "Der Wert für die Einstellung \"%s\" im Plugin \"%s\" ist nicht erlaubt.",
+ "PluginSettingsValueNotAllowed": "Der Wert für die Einstellung \"%1$s\" im Plugin \"%2$s\" ist nicht erlaubt.",
"PluginSettingsSaveFailed": "Speichern der Plugin-Einstellungen fehlgeschlagen.",
"SendPluginUpdateCommunication": "Sende mir eine E-Mail wenn eine neue Plugin-Aktualisierung zur Verfügung steht",
"SendPluginUpdateCommunicationHelp": "Der Hauptadministrator wird per E-Mail benachrichtigt, sobald eine neue Version eines Plugins zur Verfügung steht.",
- "StableReleases": "Sollte Piwik eine wichtige Komponente Ihres Unternehmens sein, empfehlen wir Ihnen den letzen stabilen Release zu verwenden. Sollten Sie die letze Beta Version verwenden und einen Fehler finden oder einen Vorschlag haben, %slesen Sie bitte hier%s.",
+ "StableReleases": "Sollte Piwik eine wichtige Komponente Ihres Unternehmens sein, empfehlen wir Ihnen den letzen stabilen Release zu verwenden. Sollten Sie die letze Beta Version verwenden und einen Fehler finden oder einen Vorschlag haben, %1$slesen Sie bitte hier%2$s.",
"LtsReleases": "LTS (Long Term Support \/ Langzeit Support) Versionen erhalten nur Sicherheitsupdates und Bug Fixe.",
"SystemPluginSettings": "Globale Plugin Einstellungen",
"TrackAGoal": "Ein Ziel aufzeichnen",
@@ -87,6 +87,7 @@
"YouAreOptedOut": "Ihr Besuch dieser Website wird aktuell von der Piwik Webanalyse nicht erfasst.",
"YouMayOptOut": "Sie können sich hier entscheiden, ob in Ihrem Browser ein eindeutiger Webanalyse-Cookie abgelegt werden darf, um dem Betreiber der Website die Erfassung und Analyse verschiedener statistischer Daten zu ermöglichen.",
"YouMayOptOutBis": "Wenn Sie sich dagegen entscheiden möchten, klicken Sie den folgenden Link, um den Piwik-Deaktivierungs-Cookie in Ihrem Browser abzulegen.",
- "OptingYouOut": "Deaktivierung wird durchgeführt, bitte warten..."
+ "OptingYouOut": "Deaktivierung wird durchgeführt, bitte warten...",
+ "ProtocolNotDetectedCorrectly": "Sie betrachten Piwik momentan über eine sichere SSL-Verbindung (mittels HTTPS), aber Piwik konnte auf dem Server nur eine nicht sichere Verbindung feststellen."
}
}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/el.json b/plugins/CoreAdminHome/lang/el.json
index d75db959fad3a40079b821e2875ff75956c2cebf..f20cd02fb7c32af2644cd0a6be534adbbe8d075a 100644
--- a/plugins/CoreAdminHome/lang/el.json
+++ b/plugins/CoreAdminHome/lang/el.json
@@ -7,9 +7,9 @@
"ReleaseChannel": "Κανάλι εκδόσεων",
"ClickHereToOptIn": "Πατήστε εδώ για να καταγÏάφεστε",
"ClickHereToOptOut": "Πατήστε εδώ για να μην καταγÏάφεστε",
- "CustomLogoFeedbackInfo": "Αν Ï€ÏοσαÏμόσετε το λογότυπο του Piwik, ίσως θÎλετε να αποκÏÏψετε τον σÏνδεσμο %s στο βασικό μενοÏ. Για να το κάνετε αυτό, μποÏείτε να απενεÏγοποιήσετε το Ï€Ïόσθετο Feedback στη σελίδα %sΔιαχείÏισης Î ÏοσθÎτων%s.",
+ "CustomLogoFeedbackInfo": "Αν Ï€ÏοσαÏμόσετε το λογότυπο του Piwik, ίσως θÎλετε να αποκÏÏψετε τον σÏνδεσμο %1$s στο βασικό μενοÏ. Για να το κάνετε αυτό, μποÏείτε να απενεÏγοποιήσετε το Ï€Ïόσθετο Feedback στη σελίδα %2$sΔιαχείÏισης Î ÏοσθÎτων%3$s.",
"CustomLogoHelpText": "ΜποÏείτε να Ï€ÏοσαÏμόσετε το λογότυπο του Piwik που θα εμφανίζεται στο πεÏιβάλλον εÏγασίας του χÏήστη και στις αναφοÏÎÏ‚ αλληλογÏαφίας.",
- "DevelopmentProcess": "ΠαÏόλο που η %sδιαδικασία μας ανάπτυξης%s πεÏιλαμβάνει χιλιάδες αυτοματοποιημÎνων ελÎγχων, οι χÏήστες δοκιμαστÎÏ‚ παίζουν Îνα κÏÏιο Ïόλο στο να πετÏχουμε την \"ΧωÏίς σφάλματα πολιτική\" του Piwik.",
+ "DevelopmentProcess": "ΠαÏόλο που η %1$sδιαδικασία μας ανάπτυξης%2$s πεÏιλαμβάνει χιλιάδες αυτοματοποιημÎνων ελÎγχων, οι χÏήστες δοκιμαστÎÏ‚ παίζουν Îνα κÏÏιο Ïόλο στο να πετÏχουμε την \"ΧωÏίς σφάλματα πολιτική\" του Piwik.",
"EmailServerSettings": "Ρυθμίσεις διακομιστή ηλεκτÏονικής αλληλογÏαφίας",
"ForBetaTestersOnly": "Για χÏήστες δοκιμαστÎÏ‚ μόνο",
"ImageTracking": "ΠαÏακολοÏθηση Εικόνων",
@@ -24,7 +24,7 @@
"JavaScriptTracking": "ΠαÏακολοÏθηση με JavaScript",
"JSTracking_CampaignKwdParam": "ΠαÏάμετÏος ÎšÎ»ÎµÎ¹Î´Î¹Î¿Ï ÎšÎ±Î¼Ï€Î¬Î½Î¹Î±Ï‚",
"JSTracking_CampaignNameParam": "ΠαÏάμετÏος Όνομα Καμπάνιας",
- "JSTracking_CodeNote": "Βεβαιωθείτε ότι ο κώδικας αυτός είναι σε κάθε σελίδα της ιστοσελίδας σας Ï€Ïιν από την ετικÎτα %1$s.",
+ "JSTracking_CodeNoteBeforeClosingHead": "Βεβαιωθείτε ότι ο κώδικας αυτός υπάÏχει σε κάθε σελίδα του ιστοτόπου σας. Î Ïοτείνεται να τον επικολλήσετε Ï€ÏÎ¿Ï„Î¿Ï ÎºÎ»ÎµÎ¯ÏƒÎµÎ¹ η σήμανση %1$s.",
"JSTracking_CustomCampaignQueryParam": "ΧÏήση Ï€ÏοσαÏμοσμÎνων ονομάτων παÏαμÎÏ„Ïων αναζητήσεων για το όνομα της καμπάνιας και τις λÎξεις-κλειδιά",
"JSTracking_CustomCampaignQueryParamDesc": "Σημείωση: %1$sΤο Piwik θα ανιχνεÏσει αυτόματα τις παÏαμÎÏ„Ïους του Google Analytics.%2$s",
"JSTracking_DisableCookies": "ΑπενεÏγοποίηση όλων των cookies παÏακολοÏθησης",
@@ -49,9 +49,10 @@
"JSTrackingIntro5": "Αν θÎλετε να κάνετε πεÏισσότεÏα από να παÏακολουθείτε Ï€ÏοβολÎÏ‚ σελίδων, παÏακαλώ ελÎγξτε το %1$sΤεκμηÏίωση Piwik για ΠαÏακολοÏθηση με Javascript%2$s για να δείτε τη λίστα με τις διαθÎσιμες λειτουÏγίες. ΧÏησιμοποιώντας αυτÎÏ‚ τις λειτουÏγίες, μποÏείτε να παÏακολουθείτε τους στόχους, Ï€ÏοσαÏμοσμÎνες μεταβλητÎÏ‚, παÏαγγελίες ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï ÎµÎ¼Ï€Î¿Ïίου, εγκαταλελειμμÎνα καλάθια αγοÏών και πολλά άλλα.",
"LogoNotWriteableInstruction": "Για να χÏησιμοποιήσετε το δικό σας λογότυπο αντί του Ï€ÏοκαθοÏισμÎνου του Piwik, δώστε δικαίωμα εγγÏαφής σε αυτό τον κατάλογο: %1$s Το Piwik Ï€ÏÎπει να Îχει δικαίωμα εγγÏαφής στα λογότυπά σας που είναι αποθηκευμÎνα στα αÏχεία %2$s.",
"FileUploadDisabled": "Το ανÎβασμα των αÏχείων δεν είναι ενεÏγοποιημÎνο στην παÏαμετÏοποίηση της PHP. Για να ανεβάσετε το δικό σας λογότυπο οÏίστε το %s στο αÏχείο php.ini και κάντε επανεκκίνηση τον διακομιστή Î¹ÏƒÏ„Î¿Ï ÏƒÎ±Ï‚.",
+ "LogoUploadFailed": "Δεν ήταν δυνατή η επεξεÏγασία του αÏχείου που ανεβάσατε. ΠαÏακαλώ ελÎγξτε αν είναι σε σωστή μοÏφή.",
"LogoUpload": "ΕπιλÎξτε Îνα Λογότυπο για αποστολή",
"FaviconUpload": "ΕπιλÎξτε Îνα favicon για ανÎβασμα",
- "LogoUploadHelp": "ΠαÏακαλοÏμε ανεβάστε Îνα αÏχείο σε μοÏφή %s με ελάχιστο Ïψος %s pixel.",
+ "LogoUploadHelp": "ΠαÏακαλώ ανεβάστε Îνα αÏχείο σε %1$s μοÏφή με ελάχιστο Ïψος %2$s pixel.",
"MenuDiagnostic": "Διαγνωστικά",
"MenuGeneralSettings": "ΓενικÎÏ‚ Ïυθμίσεις",
"MenuManage": "ΔιαχείÏιση",
@@ -60,19 +61,19 @@
"OptOutCompleteBis": "Σημειώστε ότι αν εκκαθαÏίσετε τα cookies σας ή διαγÏάψετε το cookie απενεÏγοποιήσης ή αλλάξετε υπολογιστÎÏ‚ ή φυλλομετÏητÎÏ‚ ΙστοÏ, θα χÏειαστεί να επαναλάβετε ξανά την διαδικασία απενεÏγοποιήσης.",
"OptOutDntFound": "Δεν παÏακολουθήστε αυτή τη στιγμή επειδή το Ï€ÏόγÏαμμα πλοήγησής σας δίνει οδηγία να μην είστε υπό παÏακολοÏθηση. Αυτό αποτελεί ÏÏθμιση στο Ï€ÏόγÏαμμα πλοήγησης Îτσι ώστε να μην συμπεÏιλαμβάνεστε στην παÏακολοÏθηση εκτός αν απενεÏγοποιήσετε το χαÏακτηÏιστικό 'Όχι παÏακολοÏθηση'.",
"OptOutExplanation": "Το Piwik είναι αφοσιωμÎνο στην Ï€Ïοστασία του Î¹Î´Î¹Ï‰Ï„Î¹ÎºÎ¿Ï Î±Ï€Î¿ÏÏήτου στο Διαδίκτυο. Για να παÏÎχετε την δυνατότητα απενεÏγοποίησης των στατιστικών Î¹ÏƒÏ„Î¿Ï Ï„Î¿Ï… Piwik στους επισκÎπτες σας, μποÏείτε να Ï€ÏοσθÎσετε τον ακόλουθο κώδικα σε μια από τις ιστοσελίδες σας, για παÏάδειγμα στη σελίδα Î™Î´Î¹Ï‰Ï„Î¹ÎºÎ¿Ï Î‘Ï€Î¿ÏÏήτου.",
- "OptOutExplanationBis": "Αυτός ο κώδικας θα εμφανίσει Îνα πλαίσιο (iframe) που θα πεÏιÎχει Îναν σÏνδεσμο για τους επισκÎπτες σας για να απενεÏγοποιήσουν το Piwik οÏίζοντας Îνα cookie απενεÏγοποίησης στους φυλλομετÏητÎÏ‚ τους. %sΠατήστε εδώ%s για να δείτε τα πεÏιεχόμενα που θα εμφανίζονται στο πλαίσιο.",
+ "OptOutExplanationBis": "Ο κώδικας αυτός θα εμφανίσει Îνα iFrame που θα πεÏιÎχει Îνα σÏνδεσμο ώστε οι επισκÎπτες να μποÏοÏν να επιλÎξουν να μην παÏακολουθοÏνται από το PIwik θÎτοντας Îνα cookie στα Ï€ÏογÏάμματα πλοήγησής τους. %1$sΚάντε κλικ εδώ%2$s για να δείτε το πεÏιεχόμενο που θα εμφανίζεται από το iFrame.",
"OptOutForYourVisitors": "ΑπενεÏγοποίηση του Piwik για τους επισκÎπτες σας",
"PiwikIsInstalledAt": "Το Piwik εγκαταστάθηκε στο",
"PersonalPluginSettings": "Î ÏοσωπικÎÏ‚ Ρυθμίσεις Î Ïόσθετου",
- "PluginSettingChangeNotAllowed": "Δεν επιτÏÎπεται να αλλάξετε την τιμή της ÏÏθμισης \"%s\" στο Ï€Ïόσθετο \"%s\"",
- "PluginSettingReadNotAllowed": "ΑπαγοÏεÏεται να δείτε την τιμή της ÏÏθμισης \"%s\" στο Ï€Ïόσθετο \"%s\"",
+ "PluginSettingChangeNotAllowed": "Δεν επιτÏÎπεται να αλλάξετε την τιμή της ÏÏθμισης \"%1$s\" στο Ï€Ïόσθετο \"%2$s\"",
+ "PluginSettingReadNotAllowed": "Δεν επιτÏÎπεται να δείτε την τιμή της ÏÏθμισης \"%1$s\" στο Ï€Ïόσθετο \"%2$s\"",
"PluginSettings": "Ρυθμίσεις Ï€Ïόσθετου",
"PluginSettingsIntro": "Εδώ μποÏείτε να αλλάξετε τις Ïυθμίσεις των παÏακάτω Ï€Ïόσθετων από Ï„Ïίτους:",
- "PluginSettingsValueNotAllowed": "Η τιμή για το πεδίο \"%s\" στο Ï€Ïόσθετο \"%s\" δεν είναι επιτÏεπτή",
+ "PluginSettingsValueNotAllowed": "Η τιμή για το πεδίο \"%1$s\" στο Ï€Ïόσθετο \"%2$s\" δεν είναι επιτÏεπτή.",
"PluginSettingsSaveFailed": "ΥπήÏξε αποτυχία κατά την αποθήκευση των Ïυθμίσεων των Ï€Ïόσθετων",
"SendPluginUpdateCommunication": "Αποστολή e-mail όταν υπάÏχει διαθÎσιμη ενημÎÏωση για Îνα Ï€Ïόσθετο",
"SendPluginUpdateCommunicationHelp": "Ένα e-mail θα στÎλνεται στους ΥπεÏ-ΧÏήστες όταν θα υπάÏχει διαθÎσιμη νÎα Îκδοση για Îνα Ï€Ïόσθετο.",
- "StableReleases": "Αν το Piwik αποτελεί Îνα κÏίσιμο μÎÏος της επιχείÏησής σας, Ï€Ïοτείνουμε να χÏησιμοποιείτε την τελευταία σταθεÏή Îκδοση. Αν χÏησιμοποιείτε την τελευταία δοκιμαστική Îκδοση και βÏείτε κάποιο σφάλμα ή Îχετε κάποια Ï€Ïόταση, παÏακαλοÏμε %sδείτε εδώ%s.",
+ "StableReleases": "Αν το Piwik αποτελεί Îνα κÏίσιμο κομμάτι της επιχείÏησής σας, συνιστοÏμε να χÏησιμοποιείτε την τελευταία σταθεÏή Îκδοση. Αν χÏησιμοποιείτε την τελευταία δοκιμαστική Îκδοση και βÏείτε Îνα σφάλμα ή Îχετε να κάνετε μια Ï€Ïόταση, παÏακαλώ %1$sδείτε εδώ%2$s.",
"LtsReleases": "Οι Εκδόσεις με ΜακÏά ΥποστήÏιξη (Long Term Support) λαμβάνουν μόνο ενημεÏώσεις ασφαλείας και σφαλμάτων.",
"SystemPluginSettings": "Ρυθμίσεις Συστήματος Î Ïόσθετου",
"TrackAGoal": "ΠαÏακολοÏθηση ενός στόχου",
@@ -89,6 +90,6 @@
"YouMayOptOutBis": "Για να κάνετε αυτή την επιλογή, πατήστε παÏακάτω για να λάβετε Îνα cookie απενεÏγοποιήσης.",
"OptingYouOut": "ΣυμπεÏίληψη εκτός λίστας, παÏακαλώ πεÏιμÎνετε...",
"ProtocolNotDetectedCorrectly": "Αυτή τη στιγμή χÏησιμοποιείτε το Piwik πάνω από ασφαλή σÏνδεση (με χÏήση https), αλλά το Piwik εντοπίζει μόνο μη ασφαλή σÏνδεση στον διακομιστή αυτό.",
- "ProtocolNotDetectedCorrectlySolution": "Για να βεβαιωθείτε ότι το Piwik κάνει αιτήσεις και εξυπηÏετεί το πεÏιεχόμενο πάνω από HTTPS, μποÏείτε να Ï„Ïοποποιήσετε το αÏχείο %s και να παÏαμετÏοποιήσετε τις Ïυθμίσεις του διαμεσολαβητή ή να Ï€ÏοσθÎσετε την %s κάτω από το τμήμα %s. %sΔείτε πεÏισσότεÏα%s"
+ "ProtocolNotDetectedCorrectlySolution": "Για να βεβαιωθείτε ότι το Piwik εξυπηÏετεί και στÎλνει το πεÏιεχόμενό σας με ασφαλή Ï„Ïόπο μÎσω HTTPS, επεξεÏγαστείτε το αÏχείο %1$s και οÏίστε είτε τις Ïυθμίσεις διαμεσολαβητή, ή Ï€ÏοσθÎστε την γÏαμμή %2$s κάτω από το τμήμα %3$s. %4$sΔείτε πεÏισσότεÏα%5$s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/en.json b/plugins/CoreAdminHome/lang/en.json
index 5be7675fb9a6f0a0ccbb696f2761f30eb08e6c33..4a879456613433a2c3227a3bcdd99197dbce3f21 100644
--- a/plugins/CoreAdminHome/lang/en.json
+++ b/plugins/CoreAdminHome/lang/en.json
@@ -7,9 +7,9 @@
"ReleaseChannel": "Release channel",
"ClickHereToOptIn": "Click here to opt in.",
"ClickHereToOptOut": "Click here to opt out.",
- "CustomLogoFeedbackInfo": "If you customize the Piwik logo, you might also be interested to hide the %s link in the top menu. To do so, you can disable the Feedback plugin in the %sManage Plugins%s page.",
+ "CustomLogoFeedbackInfo": "If you customize the Piwik logo, you might also be interested to hide the %1$s link in the top menu. To do so, you can disable the Feedback plugin in the %2$sManage Plugins%3$s page.",
"CustomLogoHelpText": "You can customize the Piwik logo which will be displayed in the user interface and email reports.",
- "DevelopmentProcess": "While our %sdevelopment process%s includes thousands of automated tests, Beta Testers play a key role in achieving the \"No bug policy\" in Piwik.",
+ "DevelopmentProcess": "While our %1$sdevelopment process%2$s includes thousands of automated tests, Beta Testers play a key role in achieving the \"No bug policy\" in Piwik.",
"EmailServerSettings": "Email server settings",
"ForBetaTestersOnly": "For beta testers only",
"ImageTracking": "Image Tracking",
@@ -49,9 +49,10 @@
"JSTrackingIntro5": "If you want to do more than track page views, please check out the %1$sPiwik Javascript Tracking documentation%2$s for the list of available functions. Using these functions you can track goals, custom variables, ecommerce orders, abandoned carts and more.",
"LogoNotWriteableInstruction": "To use your custom logo instead of the default Piwik logo, give write permission to this directory: %1$s Piwik needs write access for your logos stored in the files %2$s.",
"FileUploadDisabled": "Uploading files is not enabled in your PHP configuration. To upload your custom logo please set %s in php.ini and restart your webserver.",
+ "LogoUploadFailed": "The uploaded file couldn't be processed. Please check if the file has a valid format.",
"LogoUpload": "Select a Logo to upload",
"FaviconUpload": "Select a Favicon to upload",
- "LogoUploadHelp": "Please upload a file in %s formats with a minimum height of %s pixels.",
+ "LogoUploadHelp": "Please upload a file in %1$s formats with a minimum height of %2$s pixels.",
"MenuDiagnostic": "Diagnostic",
"MenuGeneralSettings": "General settings",
"MenuManage": "Manage",
@@ -60,19 +61,19 @@
"OptOutCompleteBis": "Note that if you clear your cookies, delete the opt-out cookie, or if you change computers or Web browsers, you will need to perform the opt-out procedure again.",
"OptOutDntFound": "You are not being tracked since your browser is reporting that you do not want to. This is a setting of your browser so you won't be able to opt-in until you disable the 'Do Not Track' feature.",
"OptOutExplanation": "Piwik is dedicated to providing privacy on the Internet. To provide your visitors with the choice of opting-out of Piwik Web Analytics, you can add the following HTML code on one of your website page, for example in a Privacy Policy page.",
- "OptOutExplanationBis": "This code will display an Iframe containing a link for your visitors to opt-out of Piwik by setting an opt-out cookie in their browsers. %s Click here%s to view the content that will be displayed by the iFrame.",
+ "OptOutExplanationBis": "This code will display an Iframe containing a link for your visitors to opt-out of Piwik by setting an opt-out cookie in their browsers. %1$s Click here%2$s to view the content that will be displayed by the iFrame.",
"OptOutForYourVisitors": "Piwik opt-out for your visitors",
"PiwikIsInstalledAt": "Piwik is installed at",
"PersonalPluginSettings": "Personal Plugin Settings",
- "PluginSettingChangeNotAllowed": "You are not allowed to change the value of the setting \"%s\" in plugin \"%s\"",
- "PluginSettingReadNotAllowed": "You are not allowed to read the value of the setting \"%s\" in plugin \"%s\"",
+ "PluginSettingChangeNotAllowed": "You are not allowed to change the value of the setting \"%1$s\" in plugin \"%2$s\"",
+ "PluginSettingReadNotAllowed": "You are not allowed to read the value of the setting \"%1$s\" in plugin \"%2$s\"",
"PluginSettings": "Plugin Settings",
"PluginSettingsIntro": "Here you can change the settings for the following 3rd party plugins:",
- "PluginSettingsValueNotAllowed": "The value for field \"%s\" in plugin \"%s\" is not allowed",
+ "PluginSettingsValueNotAllowed": "The value for field \"%1$s\" in plugin \"%2$s\" is not allowed",
"PluginSettingsSaveFailed": "Failed to save plugin settings",
"SendPluginUpdateCommunication": "Send an email when a plugin update is available",
"SendPluginUpdateCommunicationHelp": "An email will be sent to Super Users when there is a new version available for a plugin.",
- "StableReleases": "If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please %ssee here%s.",
+ "StableReleases": "If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please %1$ssee here%2$s.",
"LtsReleases": "LTS (Long Term Support) versions receive only security and bug fixes.",
"SystemPluginSettings": "System Plugin Settings",
"TrackAGoal": "Track a goal",
@@ -89,6 +90,6 @@
"YouMayOptOutBis": "To make that choice, please click below to receive an opt-out cookie.",
"OptingYouOut": "Opting you out, please wait...",
"ProtocolNotDetectedCorrectly": "You are currently viewing Piwik over a secure SSL connection (using https), but Piwik could only detect a non secure connection on the server. ",
- "ProtocolNotDetectedCorrectlySolution": "To make sure Piwik securely requests and serves your content over HTTPS, you may edit your %s file and either configure your proxy settings, or you may add the line %s below the %s section. %sLearn more%s"
+ "ProtocolNotDetectedCorrectlySolution": "To make sure Piwik securely requests and serves your content over HTTPS, you may edit your %1$s file and either configure your proxy settings, or you may add the line %2$s below the %3$s section. %4$sLearn more%5$s"
}
-}
+}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/es.json b/plugins/CoreAdminHome/lang/es.json
index b1487665975ac8abe552c27b0e19fe136dc5904f..70e8a505db6fa03d9202fc830e795ecdb134ba6e 100644
--- a/plugins/CoreAdminHome/lang/es.json
+++ b/plugins/CoreAdminHome/lang/es.json
@@ -5,9 +5,9 @@
"BrandingSettings": "Configuración del Branding",
"ClickHereToOptIn": "Haga clic aquà para optar.",
"ClickHereToOptOut": "Haga clic aquà para no ser seguido.",
- "CustomLogoFeedbackInfo": "Si personaliza el logo de Piwik, puede que también esté interesado en ocultar el enlace %s en el menú superior. Para hacerlo, puede deshabilitar el complemento Feedback en la página de %sAdministración de complementos%s.",
+ "CustomLogoFeedbackInfo": "Si personaliza el logo de Piwik, puede que también esté interesado en ocultar el enlace %1$s en el menú superior. Para hacerlo, puede deshabilitar el complemento Feedback en la página de %2$sAdministración de complementos%3$s.",
"CustomLogoHelpText": "Puede personalizar el logo de Piwik que será mostrado en la interfaz de usuario y los informes por correo electrónico.",
- "DevelopmentProcess": "Mientras que nuestro %sproceso de desarrollo%s incluye miles de pruebas automatizadas, Beta Testers juegan un papel clave en el logro de la \"polÃtica de no error\" en Piwik.",
+ "DevelopmentProcess": "Mientras que nuestro %1$sproceso de desarrollo%2$s incluye miles de pruebas automatizadas, Beta Testers juegan un papel clave en el logro de la \"polÃtica de no error\" en Piwik.",
"EmailServerSettings": "Configuración del servidor de correo electrónico",
"ForBetaTestersOnly": "Solamente para beta testers",
"ImageTracking": "Seguimiento mediante imagen",
@@ -22,7 +22,6 @@
"JavaScriptTracking": "Seguimiento con JavaScript",
"JSTracking_CampaignKwdParam": "Parámetro palabra clave de la campaña",
"JSTracking_CampaignNameParam": "Parámetro Nombre de la campaña",
- "JSTracking_CodeNote": "Asegúrese que este código se encuentre en cada página de su sitio de internet antes de la etiqueta %1$s.",
"JSTracking_CustomCampaignQueryParam": "Utiliza nombres de parámetros de consulta personalizados para el nombre de la campaña y la palabra clave",
"JSTracking_CustomCampaignQueryParamDesc": "Nota: %1$sPiwik detectará automáticamente los parámetros de Google Analytics.%2$s",
"JSTracking_DisableCookies": "Desactivar todas las cookies de rastreo",
@@ -49,7 +48,7 @@
"FileUploadDisabled": "La carga de archivos no está habilitada en su configuración de PHP. Para cargar su logotipo personalizado, por favor ingrese %s en el php.ini y reinicie su servidor de internet.",
"LogoUpload": "Seleccione un logo para subir",
"FaviconUpload": "Selecciona un Favicon para subir",
- "LogoUploadHelp": "Sube un archivo en formato %s con una altura mÃnima de %s pÃxeles.",
+ "LogoUploadHelp": "Sube un archivo en formato %1$s con una altura mÃnima de %2$s pÃxeles.",
"MenuDiagnostic": "Diagnóstico",
"MenuGeneralSettings": "Configuración general",
"MenuManage": "Administrar",
@@ -58,19 +57,19 @@
"OptOutCompleteBis": "Tenga en cuenta que si elimina sus cookies, elimina la cookie opt-out, o si cambia de ordenador o navegador, deberá llevar a cabo el procedimiento opt-out otra vez.",
"OptOutDntFound": "No está siendo rastreado desde que su navegador está informando que esa es su elección. Esta es una opción de su navegador, asà que no será posible hasta tanto no deshabilite la función 'No rastrear'.",
"OptOutExplanation": "Piwik se dedica a proveer privacidad en Internet. Para proporcionar a sus visitantes la opción de no ser seguidos por Piwik, puede añadir el siguiente código HTML en una de sus páginas en el sitio web, por ejemplo en la página de la PolÃtica de Privacidad.",
- "OptOutExplanationBis": "Este código mostrará un iFrame que contendrá un enlace para que sus visitantes dejen de ser seguidos por Piwik disponiendo una cookie opt-out en sus navegadores. %s Haga clic aquÃ%s para ver el contenido que será mostrado por el iFrame.",
+ "OptOutExplanationBis": "Este código mostrará un iFrame que contendrá un enlace para que sus visitantes dejen de ser seguidos por Piwik disponiendo una cookie opt-out en sus navegadores. %1$s Haga clic aquÃ%2$s para ver el contenido que será mostrado por el iFrame.",
"OptOutForYourVisitors": "Opción de no seguimiento de Piwik para sus visitantes",
"PiwikIsInstalledAt": "Piwik está instalado en",
"PersonalPluginSettings": "Ajustes de complemento personal",
- "PluginSettingChangeNotAllowed": "No tiene permitido cambiar el valor de configuración \"%s\" en el complemento \"%s\"",
- "PluginSettingReadNotAllowed": "No está permitido que lea el valor de la opción \"%s\" en el complemento \"%s\"",
+ "PluginSettingChangeNotAllowed": "No tiene permitido cambiar el valor de configuración \"%1$s\" en el complemento \"%2$s\"",
+ "PluginSettingReadNotAllowed": "No está permitido que lea el valor de la opción \"%1$s\" en el complemento \"%2$s\"",
"PluginSettings": "Ajustes de complemento",
"PluginSettingsIntro": "Aquà puede cambiar la configuración de los siguientes complementos de terceros:",
- "PluginSettingsValueNotAllowed": "El valor del campo \"%s\" del complemento \"%s\" no es permitido",
+ "PluginSettingsValueNotAllowed": "El valor del campo \"%1$s\" del complemento \"%2$s\" no es permitido",
"PluginSettingsSaveFailed": "Error al guardar la configuración del complemento",
"SendPluginUpdateCommunication": "EnvÃe un correo electrónico cuando la actualización del complemento esté disponible",
"SendPluginUpdateCommunicationHelp": "Se enviará un correo electrónico a los Super Usuarios cuando haya disponible una nueva versión de un complemento.",
- "StableReleases": "Si Piwik es una parte crÃtica de su negocio, le recomendamos que utilice la última versión estable. Si usa la última versión beta y encuentra un error o tiene alguna sugerencia, por favor %sver aquÃ%s.",
+ "StableReleases": "Si Piwik es una parte crÃtica de su negocio, le recomendamos que utilice la última versión estable. Si usa la última versión beta y encuentra un error o tiene alguna sugerencia, por favor %1$sver aquÃ%2$s.",
"SystemPluginSettings": "Ajustes de complemento del sistema",
"TrackAGoal": "Seguimiento de un objetivo",
"TrackingCode": "Código de seguimiento",
diff --git a/plugins/CoreAdminHome/lang/fa.json b/plugins/CoreAdminHome/lang/fa.json
index 64b587712bebb6f19e1c03b07e9df1d9d640a365..a43409850fc0ed8c48047954fd2ffae88f233189 100644
--- a/plugins/CoreAdminHome/lang/fa.json
+++ b/plugins/CoreAdminHome/lang/fa.json
@@ -5,7 +5,7 @@
"BrandingSettings": "تنظیمات نام تجاری",
"ClickHereToOptIn": "اینجا را کلیک کنید تا انتخاب شوید.",
"ClickHereToOptOut": "اینجا را کلیک کنید تا انتخاب کردن.",
- "CustomLogoFeedbackInfo": "اگر شما آرم پیویک را سÙارشی کنید , شاید برایتان جالب باشد Ú©Ù‡ لینک %s را در منوی بالایی پنهان کنید.برای این کار شما Ù…ÛŒ توانید اÙزونه ÛŒ بازخورد را در صÙØÙ‡ %sمدیریت اÙزونه ها%s غیرÙعال کنید.",
+ "CustomLogoFeedbackInfo": "اگر شما آرم پیویک را سÙارشی کنید , شاید برایتان جالب باشد Ú©Ù‡ لینک %1$s را در منوی بالایی پنهان کنید.برای این کار شما Ù…ÛŒ توانید اÙزونه ÛŒ بازخورد را در صÙØÙ‡ %2$sمدیریت اÙزونه ها%3$s غیرÙعال کنید.",
"CustomLogoHelpText": "شما Ù…ÛŒ توانید آرم Piwik سÙارشی است Ú©Ù‡ در رابط کاربری Ùˆ گزارش پست الکترونیک نمایش داده خواهد شد.",
"EmailServerSettings": "تنضیمات میل سرور",
"ForBetaTestersOnly": "Ùقط برای استÙاده کنندهای موقطی",
@@ -40,9 +40,10 @@
"OptOutExplanation": "Piwik به ارائه Øریم خصوصی در اینترنت اختصاص داده شده است. به منظور ارائه به بازدید کنندگان خود را با انتخاب از امید بستن به خارج از تجزیه Ùˆ تØلیل وب سایت PiwikØŒ شما Ù…ÛŒ توانید از کد HTML زیر را در یک صÙØÙ‡ وب سایت خود را اضاÙÙ‡ کنید، برای مثال در یک صÙØÙ‡ سیاست ØÙظ Øریم خصوصی است.",
"OptOutForYourVisitors": "Piwik انتخاب کردن را برای بازدید کنندگان خود را",
"PiwikIsInstalledAt": "پیویک در این مسیر نصب شد",
- "PluginSettingChangeNotAllowed": "شما مجاز به تغییر مقدار \"%s\" در پلاگین \"%s\" نیستید.",
+ "PluginSettingChangeNotAllowed": "شما مجاز به تغییر مقدار \"%1$s\" در پلاگین \"%2$s\" نیستید.",
"PluginSettingsIntro": "در اینجا شما می توانید تغییراتی در تنظیمات پلاگین های زیر انجام دهید :",
- "PluginSettingsValueNotAllowed": "مقدار این رشته \"%s\" در پلاگین \"%s\" مورد قبول نیست",
+ "PluginSettingsValueNotAllowed": "مقدار این رشته \"%1$s\" در پلاگین \"%2$s\" مورد قبول نیست",
+ "StableReleases": "اگر پیویک قسمتی ار تجارت شماست , ما به شما پیشنهاد میکنیم از اخرین نسخه نهایی ان استÙاده کنید .اگر شما از نسخه بتا استÙاده میکنید Ùˆ اگر باگ پیدا کردید یا همانند این , لطÙا %1$s اینجا را ببینید %2$s",
"TrackAGoal": "به دنبال یک هدÙ",
"TrackingCode": "کد ردیابی",
"TrustedHostConfirm": "آیا از تغییر نام هاست مورد اعتماد پیویک اطمینان دارید؟",
diff --git a/plugins/CoreAdminHome/lang/fi.json b/plugins/CoreAdminHome/lang/fi.json
index 637e323f70b9c17bbae196231410147fe8ffa553..4a77c87d7ba82024249a8da7d79ec20aee21e8a5 100644
--- a/plugins/CoreAdminHome/lang/fi.json
+++ b/plugins/CoreAdminHome/lang/fi.json
@@ -5,9 +5,9 @@
"BrandingSettings": "Käyttöliittymän muokkaaminen",
"ClickHereToOptIn": "Klikkaa tästä, jos haluat mukaan seurantaan.",
"ClickHereToOptOut": "Klikkaa tästä poistuaksesi seurannasta.",
- "CustomLogoFeedbackInfo": "Jos haluat muokata Piwikin logoa, voit myös piilottaa %s linkin ylävalikosta. Piilottaminen tapahtuu poistamalla Palaute-lisäosa %s Hallitse lisäosia %s -sivulta.",
+ "CustomLogoFeedbackInfo": "Jos haluat muokata Piwikin logoa, voit myös piilottaa %1$s linkin ylävalikosta. Piilottaminen tapahtuu poistamalla Palaute-lisäosa %2$s Hallitse lisäosia %3$s -sivulta.",
"CustomLogoHelpText": "Voit vaihtaa Piwikin logoa, joka näytetään käyttöliittymässä ja sähköpostiraporteissa.",
- "DevelopmentProcess": "%sKehitysprosessimme%s sisältää tuhansia automatisoituja testejä, ja Beta testeillä on avainrooli Piwikin \"Ei bugeja\" -toimintaperiaatteessa.",
+ "DevelopmentProcess": "%1$sKehitysprosessimme%2$s sisältää tuhansia automatisoituja testejä, ja Beta testeillä on avainrooli Piwikin \"Ei bugeja\" -toimintaperiaatteessa.",
"EmailServerSettings": "Sähköpostipalvelimen asetukset",
"ForBetaTestersOnly": "Vain beta-testaajille",
"ImageTracking": "Kuvaseuranta",
@@ -22,7 +22,6 @@
"JavaScriptTracking": "JavaScript seuranta",
"JSTracking_CampaignKwdParam": "Kampanjan avainsanojen parametri",
"JSTracking_CampaignNameParam": "Kampanjan nimen parametri",
- "JSTracking_CodeNote": "Varmista, että tämä koodi löytyy jokaiselta verkkosivusi sivulta ennen %1$s tagia.",
"JSTracking_CustomCampaignQueryParam": "Käytä omia parametrejä kampanjoiden nimille ja avainsanoille",
"JSTracking_CustomCampaignQueryParamDesc": "Huomaa: %1$sPiwik jäljittää automaattisesti Google Analytics parametrejä.%2$s",
"JSTracking_DisableCookies": "Poista kaikki seurantakeksit käytöstä",
@@ -49,7 +48,7 @@
"FileUploadDisabled": "Tiedostojen lähettämistä ei ole sallittu PHP-asetuksissasi. Vaihda %s php.ini:ssä ja käynnistä web-serverisi uudelleen ensin.",
"LogoUpload": "Valitse tallennettava logo",
"FaviconUpload": "Valitse lähetettävä ikoni",
- "LogoUploadHelp": "Lähetä tiedosto formaatissa %s ja %s pikselin vähimmäiskorkeudella.",
+ "LogoUploadHelp": "Lähetä tiedosto formaatissa %1$s ja %2$s pikselin vähimmäiskorkeudella.",
"MenuDiagnostic": "Vianmääritys",
"MenuGeneralSettings": "Yleiset asetukset",
"MenuManage": "Hallinnoi",
@@ -57,15 +56,15 @@
"OptOutComplete": "Olet poistanut itsesi seurannasta; käyntejä tälle sivulle ei seurata.",
"OptOutCompleteBis": "Huomioi, että jos poistat evästeet, poistat tämän sivun asettaman evästeen, vaihdat tietokonetta tai selainta, sinun täytyy suorittaa tämä uudelleen.",
"OptOutExplanation": "Piwik on mukana mahdollistamassa yksityisyyttä internetissä. Jos haluat antaa kävijöillesi mahdollisuuden kieltää seuranta, lisää seuraava HTML-koodi verkkosivullesi, esimerkiksi \"Yksityisyyskäytännöt\"-sivulle.",
- "OptOutExplanationBis": "Tämä koodi näyttää iframen, jossa on linkki Piwikin poistamiseen käytöstä vierailijan selaimesta. Linkin klikkaaminen ei vaikuta muihin käyttäjiin mitenkään. %sKlikkaa tästä%s, jos haluat nähdä, mitä iframessa näytetään.",
+ "OptOutExplanationBis": "Tämä koodi näyttää iframen, jossa on linkki Piwikin poistamiseen käytöstä vierailijan selaimesta. Linkin klikkaaminen ei vaikuta muihin käyttäjiin mitenkään. %1$sKlikkaa tästä%2$s, jos haluat nähdä, mitä iframessa näytetään.",
"OptOutForYourVisitors": "Piwikin poistaminen käytöstä kävijöillesi (opt-out)",
"PiwikIsInstalledAt": "Piwik on asennettu kohteeseen",
- "PluginSettingChangeNotAllowed": "Arvojen muuttaminen \"%s\" liitännäisessä \"%s\" -asetuksissa ei ole sallittua",
- "PluginSettingReadNotAllowed": "Et voi lukea asetusta \"%s\" lisäosasta \"%s\"",
+ "PluginSettingChangeNotAllowed": "Arvojen muuttaminen \"%1$s\" liitännäisessä \"%2$s\" -asetuksissa ei ole sallittua",
+ "PluginSettingReadNotAllowed": "Et voi lukea asetusta \"%1$s\" lisäosasta \"%2$s\"",
"PluginSettingsIntro": "Täällä voit muuttaa kolmannen osapuolen liitännäisten asetuksia:",
- "PluginSettingsValueNotAllowed": "Arvo kentälle \"%s\" liitännäisessä \"%s\" ei ole sallittu",
+ "PluginSettingsValueNotAllowed": "Arvo kentälle \"%1$s\" liitännäisessä \"%2$s\" ei ole sallittu",
"SendPluginUpdateCommunicationHelp": "Pääkäyttäjät saavat sähköpostia kun lisäosasta on saatavilla uusi versio.",
- "StableReleases": "Jos Piwik on tärkeä osa liiketointasi, suosittelemme päivittämistä uusimpaan versioon. Jos käytt uusinta beta-versiota ja löydät bugin tai sinulla on ehdotus, %slue tämä%s.",
+ "StableReleases": "Jos Piwik on tärkeä osa liiketointasi, suosittelemme päivittämistä uusimpaan versioon. Jos käytt uusinta beta-versiota ja löydät bugin tai sinulla on ehdotus, %1$slue tämä%2$s.",
"TrackAGoal": "Seuraa tavoitetta",
"TrackingCode": "Seurantakoodi",
"TrustedHostConfirm": "Haluatko varmasti vaihtaa luotettua Piwikin konenimeä?",
diff --git a/plugins/CoreAdminHome/lang/fr.json b/plugins/CoreAdminHome/lang/fr.json
index c64231fe8108baec34049ef1f54bde2fb201d82a..98bf55ee02c0f157e4a7b16d5e0d76d45710d76c 100644
--- a/plugins/CoreAdminHome/lang/fr.json
+++ b/plugins/CoreAdminHome/lang/fr.json
@@ -7,9 +7,9 @@
"ReleaseChannel": "Canal de sortie",
"ClickHereToOptIn": "Cliquez ici pour inclure votre ordinateur.",
"ClickHereToOptOut": "Cliquez ici pour exclure votre ordinateur.",
- "CustomLogoFeedbackInfo": "Si vous personnalisez le logo Piwik, vous pourriez être aussi intéressé pour cacher le lien %s du menu du haut. Pour ce faire, vous pouvez désactiver le composant de Feedback dans la page du %sGestionnaire de Composants%s.",
+ "CustomLogoFeedbackInfo": "Si vous personnalisez le logo Piwik, vous pouvez être aussi vouloir cacher le lien %1$s du menu du haut. Pour ce faire, vous pouvez désactiver le plugin de Feedback dans la page de %2$sGestionnaire de Plugins%3$s.",
"CustomLogoHelpText": "Vous pouvez personnaliser le logo Piwik qui sera affiché dans l'interface utilisateur et les rapports par courriel.",
- "DevelopmentProcess": "Bien que notre %sprocessus de développement%s inclue des milliers de tests automatisés, les béta testeurs jouent un rôle clef dans la réalisation de la \"politique zéro bugs\" de Piwik.",
+ "DevelopmentProcess": "Bien que notre %1$sprocessus de développement%2$s inclue des milliers de tests automatisés, les béta testeurs jouent un rôle clef dans la réalisation de la \"politique zéro bugs\" de Piwik.",
"EmailServerSettings": "Paramètres du serveur mail",
"ForBetaTestersOnly": "Pour les bêta testeurs uniquement",
"ImageTracking": "Suivi par image",
@@ -24,7 +24,6 @@
"JavaScriptTracking": "Suivi par JavaScript",
"JSTracking_CampaignKwdParam": "Paramètre de la campagne de mot-clé",
"JSTracking_CampaignNameParam": "Paramètre nom de la campagne",
- "JSTracking_CodeNote": "Assurez-vous que ce code est sur toutes les pages de votre site web avant la balise %1$s.",
"JSTracking_CustomCampaignQueryParam": "Utilisez des paramètres de requête personnalisés pour le nom et le mot-clé de la campagne",
"JSTracking_CustomCampaignQueryParamDesc": "Note : %1$sPiwik détectera automatiquement les paramètres de Google Analytics.%2$s",
"JSTracking_DisableCookies": "Désactiver tous les cookies de suivi",
@@ -49,9 +48,10 @@
"JSTrackingIntro5": "Si vous voulez faire plus qu'effectuer le suivi des visites de pages, veuillez consulter %1$sla documentation de suivi par JavaScript%2$s pour connaitre la liste des fonctions disponibles. En utilisant ces fonctions vous pouvez effectuer le suivi des objectifs, variables personnalisées, commandes de e-commerce, chariots\/paniers abandonnés et plus encore.",
"LogoNotWriteableInstruction": "Pour utiliser votre propre logo personnalisé à la place du logo par défaut de Piwik, attribuez des permissions en écriture sur ce répertoire : %1$s Piwik a besoin d'un accès en écriture aux fichiers pour stocker vos logos %2$s.",
"FileUploadDisabled": "Le téléversement de fichiers n'est pas activé dans votre configuration PHP. Pour téléverser un logo personnalisé veuillez définir %s dans php.ini et redémarrer votre serveur web.",
+ "LogoUploadFailed": "Le fichier téléversé n'a pas pu être pris en compte. Veuillez vérifier que le fichier a un format valide.",
"LogoUpload": "Sélectionnez le logo à télécharger",
"FaviconUpload": "Sélectionnez un favicon à télécharger",
- "LogoUploadHelp": "Veuillez télécharge un file dans un des formats suivants %s avec une hauteur minimale de %s pixels.",
+ "LogoUploadHelp": "Veuillez télécharge un file dans un des formats suivants %1$s avec une hauteur minimale de %2$s pixels.",
"MenuDiagnostic": "Diagnostic",
"MenuGeneralSettings": "Paramètres généraux",
"MenuManage": "Gérer",
@@ -60,19 +60,19 @@
"OptOutCompleteBis": "Note: si vous nettoyez vos cookies et supprimez le cookie d'exclusion, ou bien si vous changez d'ordinateur et\/ou de navigateur, il vous faudra de nouveau effectuer la procédure d'exclusion.",
"OptOutDntFound": "Vous n'êtes pas suivi parce que votre navigateur transmet que vous ne voulez pas l'être. Ceci est un paramètre de votre navigateur et vous ne serez pas en mesure de participer avant d'avoir désactivé la fonctionnalité \"ne pas suivre\".",
"OptOutExplanation": "Piwik met un point d'honneur à respecter la vie privée sur Internet. Pour fournir à vos visiteurs le choix de ne pas apparaître dans les analyses de Piwik, vous pouvez ajouter le code HTML suivant sur une des pages de votre site web, par exemple dans la page \"Politique de confidentialité\".",
- "OptOutExplanationBis": "Ce code va afficher un iFrame contenant un lien permettant à vos visiteurs de ne pas être suivi par Piwik en installant un cookie de neutralisation dans leur navigateur. %s Cliquez ici %s pour visualiser le contenu qui sera affiché par l'iFrame.",
+ "OptOutExplanationBis": "Ce code va afficher un iFrame contenant un lien permettant à vos visiteurs de ne pas être suivi par Piwik en installant un cookie de neutralisation dans leur navigateur. %1$s Cliquez ici %2$s pour visualiser le contenu qui sera affiché par l'iFrame.",
"OptOutForYourVisitors": "Exclusion de Piwik pour vos visiteurs",
"PiwikIsInstalledAt": "Piwik est installé à l'adresse",
"PersonalPluginSettings": "Paramètres personnel de plugins",
- "PluginSettingChangeNotAllowed": "Vous n'êtes pas autorisé(e) à modifier la valeur du paramètre \"%s\" du plugin \"%s\"",
- "PluginSettingReadNotAllowed": "Vous n'êtes pas autorisé(e) à voir la valeur du paramètre \"%s\" dans le plugin \"%s\"",
+ "PluginSettingChangeNotAllowed": "Vous n'êtes pas autorisé(e) à modifier la valeur du paramètre \"%1$s\" du plugin \"%2$s\"",
+ "PluginSettingReadNotAllowed": "Vous n'êtes pas autorisé(e) à voir la valeur du paramètre \"%1$s\" dans le plugin \"%2$s\"",
"PluginSettings": "Paramètres du composant",
"PluginSettingsIntro": "Vous pouvez ici modifier les paramètres des composants tierce partie suivants :",
- "PluginSettingsValueNotAllowed": "La valeur pour le champ \"%s\" du composant \"%s\" n'est pas autorisée.",
+ "PluginSettingsValueNotAllowed": "La valeur pour le champ \"%1$s\" du composant \"%2$s\" n'est pas autorisée.",
"PluginSettingsSaveFailed": "Erreur lors de l'enregistrement des paramètres",
"SendPluginUpdateCommunication": "Envoyer un courriel lorsqu'une mise à jour d'un composant est disponible",
"SendPluginUpdateCommunicationHelp": "Un courriel sera envoyé aux super utilisateurs quand une nouvelle version de plugin sera disponible.",
- "StableReleases": "Si Piwik représente une part critique de vos affaires, nous vous recommandons d'utiliser la dernière version stable. Si vous utilisez la dernière version et que vous trouverez un bug ou avez une suggestion, %scliquez ici%s svp.",
+ "StableReleases": "Si Piwik représente une part critique de vos affaires, nous vous recommandons d'utiliser la dernière version stable. Si vous utilisez la dernière version et que vous trouverez un bug ou avez une suggestion, %1$scliquez ici%2$s svp.",
"LtsReleases": "Les versions LTS (Long Term Support) ne reçoivent que des correctifs de sécurité et de bugs.",
"SystemPluginSettings": "Paramètres système de plugins",
"TrackAGoal": "Effectuer le suivi d'un objectif",
@@ -89,6 +89,6 @@
"YouMayOptOutBis": "Pour faire ce choix et installer un cookie d'exclusion, veuillez cliquer ci-dessous.",
"OptingYouOut": "Désinscription en cours, merci de patienter...",
"ProtocolNotDetectedCorrectly": "Vous visualisez actuellement Piwik au travers d'une connection SSL sécurisé (utilisant HTTPS), mais Piwik n'est pas parvenu à détecter une connexion non sécurisée pour le serveur.",
- "ProtocolNotDetectedCorrectlySolution": "Afin de vous assurer que Piwik demande et sever votre contenu de manière sécurisée au travers du protocole HTTPS, vous devriez éditer votre fichier %s et configuration vos paramètres de proxy ou bien vous pouvez ajouter la ligne %s sous la section %s %sEn savoir plus%s"
+ "ProtocolNotDetectedCorrectlySolution": "Afin de vous assurer que Piwik demande et sever votre contenu de manière sécurisée au travers du protocole HTTPS, vous devriez éditer votre fichier %1$s et configuration vos paramètres de proxy ou bien vous pouvez ajouter la ligne %2$s sous la section %3$s %4$sEn savoir plus%5$s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/hi.json b/plugins/CoreAdminHome/lang/hi.json
index dc80a75d4c693f7ac9076e9420a352413ce9ace4..4b5a9e6cc9abc7c417bc747416a31d30f66b49e5 100644
--- a/plugins/CoreAdminHome/lang/hi.json
+++ b/plugins/CoreAdminHome/lang/hi.json
@@ -5,9 +5,9 @@
"BrandingSettings": "बà¥à¤°à¤¾à¤‚डिंग सेटिंगà¥à¤¸",
"ClickHereToOptIn": "इस विकलà¥à¤ª को चà¥à¤¨à¤¨à¥‡ के लिठयहाठकà¥à¤²à¤¿à¤• करें।",
"ClickHereToOptOut": "बाहर निकलना के लिठयहां कà¥à¤²à¤¿à¤• करें.",
- "CustomLogoFeedbackInfo": "आप Piwik पà¥à¤°à¤¤à¥€à¤• चिनà¥â€à¤¹ अनà¥à¤•à¥‚लित करे, तो आप à¤à¥€ शीरà¥à¤· मेनू में लिंक %s को छिपाने के लिठदिलचसà¥à¤ªà¥€ हो सकती है. à¤à¤¸à¤¾ करने के लिà¤, आप पà¥à¤°à¤¬à¤‚धित पà¥à¤²à¤—इनà¥à¤¸ पृषà¥à¤ में %s पà¥à¤°à¤¤à¤¿à¤•à¥à¤°à¤¿à¤¯à¤¾ पà¥à¤²à¤—इन %s निषà¥à¤•à¥à¤°à¤¿à¤¯ कर सकते हैं.",
+ "CustomLogoFeedbackInfo": "आप Piwik पà¥à¤°à¤¤à¥€à¤• चिनà¥â€à¤¹ अनà¥à¤•à¥‚लित करे, तो आप à¤à¥€ शीरà¥à¤· मेनू में लिंक %1$s को छिपाने के लिठदिलचसà¥à¤ªà¥€ हो सकती है. à¤à¤¸à¤¾ करने के लिà¤, आप पà¥à¤°à¤¬à¤‚धित पà¥à¤²à¤—इनà¥à¤¸ पृषà¥à¤ में %2$s पà¥à¤°à¤¤à¤¿à¤•à¥à¤°à¤¿à¤¯à¤¾ पà¥à¤²à¤—इन %3$s निषà¥à¤•à¥à¤°à¤¿à¤¯ कर सकते हैं.",
"CustomLogoHelpText": "आप Piwik पà¥à¤°à¤¤à¥€à¤• चिनà¥â€à¤¹ को अनà¥à¤•à¥‚लित कर सकते हैं जो यूजर इंटरफेस और ईमेल रिपोरà¥à¤Ÿ में पà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ किया जाà¤à¤—ा",
- "DevelopmentProcess": "हमारी %s विकास पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ %s मे हजारों सà¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ परीकà¥à¤·à¤£ शामिल हैं, जबकि बीटा परीकà¥à¤·à¤• Piwik में \"कोई बग नीति\" को पà¥à¤°à¤¾à¤ªà¥à¤¤ करने में à¤à¤• महतà¥à¤µà¤ªà¥‚रà¥à¤£ à¤à¥‚मिका निà¤à¤¾à¤¤à¥‡ हैं.",
+ "DevelopmentProcess": "हमारी %1$s विकास पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ %2$s मे हजारों सà¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ परीकà¥à¤·à¤£ शामिल हैं, जबकि बीटा परीकà¥à¤·à¤• Piwik में \"कोई बग नीति\" को पà¥à¤°à¤¾à¤ªà¥à¤¤ करने में à¤à¤• महतà¥à¤µà¤ªà¥‚रà¥à¤£ à¤à¥‚मिका निà¤à¤¾à¤¤à¥‡ हैं.",
"EmailServerSettings": "ईमेल सरà¥à¤µà¤° की सेटिंगà¥à¤¸",
"ForBetaTestersOnly": "केवल बीटा परीकà¥à¤·à¤•à¥‹à¤‚ के लिà¤",
"ImageTracking": "इमेज टà¥à¤°à¥ˆà¤•à¤¿à¤‚ग",
@@ -20,7 +20,6 @@
"JavaScriptTracking": "जावासà¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿ टà¥à¤°à¥ˆà¤•à¤¿à¤‚ग",
"JSTracking_CampaignKwdParam": "अà¤à¤¿à¤¯à¤¾à¤¨ खोजशबà¥à¤¦ पà¥à¤°à¤¾à¤šà¤²",
"JSTracking_CampaignNameParam": "अà¤à¤¿à¤¯à¤¾à¤¨ का नाम पà¥à¤°à¤¾à¤šà¤²",
- "JSTracking_CodeNote": "इस कोड %1$s टैग से पहले अपनी वेबसाइट के हर पृषà¥à¤ पर है सà¥à¤¨à¤¿à¤¶à¥à¤šà¤¿à¤¤ करें.",
"JSTracking_CustomCampaignQueryParam": "अà¤à¤¿à¤¯à¤¾à¤¨ का नाम और कीवरà¥à¤¡ के लिठकसà¥à¤Ÿà¤® कà¥à¤µà¥‡à¤°à¥€ पà¥à¤°à¤¾à¤šà¤² नाम का पà¥à¤°à¤¯à¥‹à¤— करें",
"JSTracking_CustomCampaignQueryParamDesc": "नोट: %1$s Piwik सà¥à¤µà¤¤à¤ƒ गूगल à¤à¤¨à¤¾à¤²à¤¿à¤Ÿà¤¿à¤•à¥à¤¸ मापदंडों की पहचान करेगा.%2$s",
"JSTracking_EnableDoNotTrack": "गà¥à¤°à¤¾à¤¹à¤• की ओर \"टà¥à¤°à¥ˆà¤• नहीं\" का पता लगाना सकà¥à¤·à¤®",
@@ -48,10 +47,10 @@
"OptOutCompleteBis": "आप अपने कà¥à¤•à¥€ साफ़ करें, अगर कà¥à¤•à¥€ को हटा सकते हैं, या आप कंपà¥à¤¯à¥‚टर या वेब बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤° को बदलते हैं, तो आप फिर से ऑपà¥à¤Ÿ-आउट कारà¥à¤¯à¤µà¤¿à¤§à¤¿ को पूरा करने की आवशà¥à¤¯à¤•à¤¤à¤¾ होगी.",
"OptOutDntFound": "आप अपने बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤° आप नहीं करना चाहते हैं कि रिपोरà¥à¤Ÿ कर रहा है के बाद से नज़र रखी जा रही नहीं कर रहे हैं । आप ' टà¥à¤°à¥ˆà¤• न करें' सà¥à¤µà¤¿à¤§à¤¾ का पà¥à¤°à¤¯à¥‹à¤— नहीं जब तक आप चà¥à¤¨à¤¤à¥‡ में करने में सकà¥à¤·à¤® नहीं होगा, तो यह आपके बà¥à¤°à¤¾à¤‰à¤œà¤° की à¤à¤• सेटिंग है।",
"OptOutExplanation": "Piwik इंटरनेट पर गोपनीयता पà¥à¤°à¤¦à¤¾à¤¨ करने के लिठसमरà¥à¤ªà¤¿à¤¤ है. Piwik वेब विशà¥à¤²à¥‡à¤·à¤¿à¤•à¥€ से बाहर निकलने के विकलà¥à¤ª के साथ अपने आगंतà¥à¤•à¥‹à¤‚ पà¥à¤°à¤¦à¤¾à¤¨ करने के लिà¤, आप अपनी वेबसाइट के पेज में से à¤à¤• पर निमà¥à¤¨à¤²à¤¿à¤–ित HTML कोड जोड़ सकते हैं, à¤à¤• गोपनीयता नीति पेज में उदाहरण के लिà¤.",
- "OptOutExplanationBis": "यह कोड अपने दरà¥à¤¶à¤•à¥‹à¤‚ के लिठà¤à¤• कड़ी यà¥à¤•à¥à¤¤ à¤à¤• iframe को पà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ करेगा अपने बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤° में à¤à¤• कà¥à¤•à¥€ को सेट करके Piwik से लिठऑपà¥à¤Ÿ बाहर जाने के लिठआइफà¥à¤°à¥‡à¤® दà¥à¤µà¤¾à¤°à¤¾ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ की जाने वाली सामगà¥à¤°à¥€ को देखने के लिठ%s यहां कà¥à¤²à¤¿à¤• करें %s.",
+ "OptOutExplanationBis": "यह कोड अपने दरà¥à¤¶à¤•à¥‹à¤‚ के लिठà¤à¤• कड़ी यà¥à¤•à¥à¤¤ à¤à¤• iframe को पà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ करेगा अपने बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤° में à¤à¤• कà¥à¤•à¥€ को सेट करके Piwik से लिठऑपà¥à¤Ÿ बाहर जाने के लिठआइफà¥à¤°à¥‡à¤® दà¥à¤µà¤¾à¤°à¤¾ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ की जाने वाली सामगà¥à¤°à¥€ को देखने के लिठ%1$s यहां कà¥à¤²à¤¿à¤• करें %2$s.",
"OptOutForYourVisitors": "अपने दरà¥à¤¶à¤•à¥‹à¤‚ के लिठPiwik ऑपà¥à¤Ÿ आउट",
"PiwikIsInstalledAt": "Piwik में सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ किया गया है",
- "StableReleases": "Piwik अपने वà¥à¤¯à¤¾à¤ªà¤¾à¤° का à¤à¤• महतà¥à¤µà¤ªà¥‚रà¥à¤£ हिसà¥à¤¸à¤¾ है, तो हम आपको नवीनतम सà¥à¤¥à¤¿à¤° रिलीज उपयोग की सलाह देते हैं. आप नवीनतम बीटा का उपयोग करें और आप à¤à¤• बग मिल या à¤à¤• सलाह देना चाहते हैं, %sयहां देखें%s.",
+ "StableReleases": "Piwik अपने वà¥à¤¯à¤¾à¤ªà¤¾à¤° का à¤à¤• महतà¥à¤µà¤ªà¥‚रà¥à¤£ हिसà¥à¤¸à¤¾ है, तो हम आपको नवीनतम सà¥à¤¥à¤¿à¤° रिलीज उपयोग की सलाह देते हैं. आप नवीनतम बीटा का उपयोग करें और आप à¤à¤• बग मिल या à¤à¤• सलाह देना चाहते हैं, %1$sयहां देखें%2$s.",
"TrackAGoal": "à¤à¤• लकà¥à¤·à¥à¤¯ की खोज",
"TrackingCode": "कोड देखना",
"TrustedHostConfirm": "कà¥à¤¯à¤¾ आप विशà¥à¤µà¤¸à¤¨à¥€à¤¯ Piwik परिचारक नाम बदलना चाहते हैं?",
diff --git a/plugins/CoreAdminHome/lang/hu.json b/plugins/CoreAdminHome/lang/hu.json
index 77e333c9b299442242908526dba2cffe18a64a59..2923d83b6f299f5d96ade9225e07e306b2a367a4 100644
--- a/plugins/CoreAdminHome/lang/hu.json
+++ b/plugins/CoreAdminHome/lang/hu.json
@@ -7,9 +7,9 @@
"ReleaseChannel": "Release csatorna",
"ClickHereToOptIn": "Kattintson ide a bekapcsoláshoz.",
"ClickHereToOptOut": "Kattintson ide a kikapcsoláshoz.",
- "CustomLogoFeedbackInfo": "A Piwik logó konfigurálása esetén érdekes lehet a felsÅ‘ menüben található %s link eltávolÃtása is. Ehhez a %sBÅ‘vÃtmények%s oldalon ki kell kapcsolni a Feedback bÅ‘vÃtményt.",
+ "CustomLogoFeedbackInfo": "A Piwik logó konfigurálása esetén érdekes lehet a felsÅ‘ menüben található %1$s link eltávolÃtása is. Ehhez a %2$sBÅ‘vÃtmények%3$s oldalon ki kell kapcsolni a Feedback bÅ‘vÃtményt.",
"CustomLogoHelpText": "A felhasználói felületen és az e-mail jelentésekben megjelenő Piwik logó testreszabható.",
- "DevelopmentProcess": "Annak ellenére, hogy a %sfejlesztési folyamat%s során több ezer automatizált teszt hajtódik végre, a Beta tesztelők kulcsfontosságú szerepet töltenek be, hogy a \"Nincs hiba irányelv\" tartható legyen.",
+ "DevelopmentProcess": "Annak ellenére, hogy a %1$sfejlesztési folyamat%2$s során több ezer automatizált teszt hajtódik végre, a Beta tesztelők kulcsfontosságú szerepet töltenek be, hogy a \"Nincs hiba irányelv\" tartható legyen.",
"EmailServerSettings": "E-mail szerver beállÃtások",
"ForBetaTestersOnly": "Csak béta tesztelőknek",
"ImageTracking": "Kép Követés",
@@ -23,7 +23,6 @@
"JavaScriptTracking": "JavaScript Követés",
"JSTracking_CampaignKwdParam": "Kampány Kulcsszó paraméter",
"JSTracking_CampaignNameParam": "Kampány Név paraméter",
- "JSTracking_CodeNote": "Győződjön meg róla, hogy a kód minden oldalon szerepel a %1$s tag előtt.",
"JSTracking_CustomCampaignQueryParam": "Saját paraméter nevek használata a kampány név és a kulcsszó mezőkhöz",
"JSTracking_CustomCampaignQueryParamDesc": "Megjegyzés: A %1$sPiwik automatikusan felismeri a Googly Analytics paramétereket.%2$s",
"JSTracking_DisableCookies": "Minden követő süti tiltása",
@@ -50,7 +49,7 @@
"FileUploadDisabled": "A fájlfeltöltés nincs engedélyezve a PHP konfigurációban. Egyedi logó feltöltéséhez be kell állÃtani a php.ini fájlban a következÅ‘t: %s. A webszerver újraindÃtása is szükséges lehet.",
"LogoUpload": "Válasszon egy logót a feltöltéshez",
"FaviconUpload": "Válasszon egy Favicon-t a feltöltéshez",
- "LogoUploadHelp": "A feltöltött fájlnak %s formátumban, minimum %s pixel magasnak kell lennie.",
+ "LogoUploadHelp": "A feltöltött fájlnak %1$s formátumban, minimum %2$s pixel magasnak kell lennie.",
"MenuDiagnostic": "Diagnosztika",
"MenuGeneralSettings": "AlapbeállÃtások",
"MenuManage": "Kezelés",
@@ -59,19 +58,19 @@
"OptOutCompleteBis": "Megjegyzés: abban az esetben, ha a követést tiltó süti törlÅ‘dik, más számÃtógéprÅ‘l vagy böngészÅ‘bÅ‘l látogatja meg a weboldalt, a követést ismét le kell tiltania.",
"OptOutDntFound": "Ön nem lekövethetÅ‘, mert a böngészÅ‘je azt jelzni, hogy ön ezt nem kÃvánta. Ez az állapot nem fog addig változni, amÃg le nem tiltja a 'Do Not Track' funkciót.",
"OptOutExplanation": "A Piwik tiszteletben tartja a magánéletet Internet. Annak érdekében, hogy látogatóinak lehetősége legyen a követés kikapcsolására, helyezze el az alábbi HTML kódot például egy Adatvédelmi Tájékoztató oldalon.",
- "OptOutExplanationBis": "Az alábbi kód egy Iframet tartalmazó link, ahol a látogatók ki tudják kapcsolni a követést. Ehhez a Piwik egy követést letiltő sütit helyez el a böngészőben. %s Kattintson ide%s az iFrame tartalmának megtekintéséhez.",
+ "OptOutExplanationBis": "Az alábbi kód egy Iframet tartalmazó link, ahol a látogatók ki tudják kapcsolni a követést. Ehhez a Piwik egy követést letiltő sütit helyez el a böngészőben. %1$s Kattintson ide%2$s az iFrame tartalmának megtekintéséhez.",
"OptOutForYourVisitors": "Piwik követés letiltása látogatók által",
"PiwikIsInstalledAt": "Piwik telepÃtve itt:",
"PersonalPluginSettings": "Személyes bÅ‘vÃtmény beállÃtások",
- "PluginSettingChangeNotAllowed": "Önnek nincs jogosultsága a(z) \"%s\" beállÃtás módosÃtásához a(z) \"%s\" bÅ‘vÃtményben",
- "PluginSettingReadNotAllowed": "Önnek nincs jogosultséga a(z) \"%s\" beállÃtás megtekintéséhez a(z) \"%s\" bÅ‘vÃtményben",
+ "PluginSettingChangeNotAllowed": "Önnek nincs jogosultsága a(z) \"%1$s\" beállÃtás módosÃtásához a(z) \"%2$s\" bÅ‘vÃtményben",
+ "PluginSettingReadNotAllowed": "Önnek nincs jogosultséga a(z) \"%1$s\" beállÃtás megtekintéséhez a(z) \"%2$s\" bÅ‘vÃtményben",
"PluginSettings": "BÅ‘vÃtmény beállÃtások",
"PluginSettingsIntro": "Itt módosÃthatók a harmadik féltÅ‘l származó bÅ‘vÃtmények beállÃtásai:",
- "PluginSettingsValueNotAllowed": "A(z) \"%s\" mezÅ‘ értéke a(z) \"%s\" bÅ‘vÃtményben érvénytelen",
+ "PluginSettingsValueNotAllowed": "A(z) \"%1$s\" mezÅ‘ értéke a(z) \"%2$s\" bÅ‘vÃtményben érvénytelen",
"PluginSettingsSaveFailed": "A bÅ‘vÃtmény beállÃtások mentése sikertelen",
"SendPluginUpdateCommunication": "Küldjön egy emailt, mikor egy bÅ‘vÃtmény frissÃtés elérhetÅ‘vé válik",
"SendPluginUpdateCommunicationHelp": "Az adminisztrátorok emailben értesülnek ha egy bÅ‘vÃtményhez frissÃtés érhetÅ‘ el.",
- "StableReleases": "Ha a Piwik fontos része a vállalkozásának, javasoljuk, hogy a legfrissebb stabil kiadást használja. Ha a legfrissebb béte kiadást használja és hibát talál vagy javaslata van, kérjük %skattintson ide%s.",
+ "StableReleases": "Ha a Piwik fontos része a vállalkozásának, javasoljuk, hogy a legfrissebb stabil kiadást használja. Ha a legfrissebb béte kiadást használja és hibát talál vagy javaslata van, kérjük %1$skattintson ide%2$s.",
"LtsReleases": "LTS (Hosszútávú támogatás) kiadások csak biztonsági és hibajavÃtási frissÃtéseket kapnak",
"SystemPluginSettings": "Rendszer bÅ‘vÃtmény beállÃtásai",
"TrackAGoal": "Cél követése",
@@ -88,6 +87,6 @@
"YouMayOptOutBis": "Az alábbi kapcsoló segÃtségével engedélyezhetÅ‘ a követÅ‘ süti használata.",
"OptingYouOut": "Kiléptetés alatt, kis türelmet...",
"ProtocolNotDetectedCorrectly": "Jelenleg biztonságos SSL kapcsolat van ön és a Piwik között (https használatával), de a Piwik csak nem biztonságos kapcsolatot tudott észlelni.",
- "ProtocolNotDetectedCorrectlySolution": "Hogy biztos minden kérés és kiszolgálás HTTPS-en keresztül biztonságosan történjen, szerkeszteni kell a %s fájlt és ellenÅ‘rizni a proxy beállÃtásokat vagy hozzá kell adni a %s sort, lentebb a %s szekcióban. %sTovábbi információk%s"
+ "ProtocolNotDetectedCorrectlySolution": "Hogy biztos minden kérés és kiszolgálás HTTPS-en keresztül biztonságosan történjen, szerkeszteni kell a %1$s fájlt és ellenÅ‘rizni a proxy beállÃtásokat vagy hozzá kell adni a %2$s sort, lentebb a %3$s szekcióban. %4$sTovábbi információk%5$s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/id.json b/plugins/CoreAdminHome/lang/id.json
index dc5c55e7375822be85c55080a314fe98b5a63d07..5406543bcd659b26ca9d086380f5522d122eaca3 100644
--- a/plugins/CoreAdminHome/lang/id.json
+++ b/plugins/CoreAdminHome/lang/id.json
@@ -4,9 +4,9 @@
"BrandingSettings": "Pengaturan merek",
"ClickHereToOptIn": "Klik di sini agar terekam.",
"ClickHereToOptOut": "Klik di sini agar tak-terekam.",
- "CustomLogoFeedbackInfo": "Jika Anda menyesuaikan logo Piwik, Anda mungkin juga tertarik untuk menyembunyikan tautan %s di menu atas. Untuk melakukannya, Anda mematikan pengaya Umpan Balik di halaman %s Pengelolaan Pengaya%s.",
+ "CustomLogoFeedbackInfo": "Jika Anda menyesuaikan logo Piwik, Anda mungkin juga tertarik untuk menyembunyikan tautan %1$s di menu atas. Untuk melakukannya, Anda mematikan pengaya Umpan Balik di halaman %2$s Pengelolaan Pengaya%3$s.",
"CustomLogoHelpText": "Anda dapat Anda dapat menyesuaikan logo Piwik yang akan ditampilkan dalam antarmuka pengguna dan laporan surel.",
- "DevelopmentProcess": "Ketika %sproses pengembangan%s kami menyertakan ribuan pemeriksaan otomatis, Pemeriksa Betta menjalankan peran kunci dalam pengarsipan \"Kebijakan Tanpa Kutu\" di Piwik.",
+ "DevelopmentProcess": "Ketika %1$sproses pengembangan%2$s kami menyertakan ribuan pemeriksaan otomatis, Pemeriksa Betta menjalankan peran kunci dalam pengarsipan \"Kebijakan Tanpa Kutu\" di Piwik.",
"EmailServerSettings": "Pengaturan peladen Surel",
"ForBetaTestersOnly": "Hanya untuk pemeriksa beta saja",
"ImageTracking": "Pelacakan Gambar",
@@ -21,7 +21,6 @@
"JavaScriptTracking": "Pelacakan JavaScript",
"JSTracking_CampaignKwdParam": "Parameter Kata Kunci Kampanye",
"JSTracking_CampaignNameParam": "Parameter Nama Kampanye",
- "JSTracking_CodeNote": "Pastikan bahwa kode ini berada dalam setiap halaman Anda sebelum etiket %1$s.",
"JSTracking_CustomCampaignQueryParam": "Gunakan nama parameter kueri kustom untuk untuk nama kampanye dan kata kunci",
"JSTracking_CustomCampaignQueryParamDesc": "Catatan: %1$sPiwik akan secara otomastis mendeteksi parameter Google Analytics.%2$s",
"JSTracking_EnableDoNotTrack": "Mengaktifkan pendeteksian Jangan-Lacak sisi klien",
@@ -43,17 +42,17 @@
"JSTrackingIntro4": "Bila Anda tidak ingin menggunakan JavaScript untuk melacak pengunjung, %1$sbuat sebuah gambar pelacakan di tautan berikut%2$s.",
"JSTrackingIntro5": "Bila Anda berkeinginan lebih dari melacak tampilan halaman, harap periksa %1$sDokumentas Pelacakan Javascript Piwik%2$s untuk daftar fungsi yang tersedia. Gunakan funsi tersebut untuk melacak tujuan Anda, variabel kustom, pemesanan niaga-e, keranjang dibuang, dan lebih.",
"LogoUpload": "Pilih Logo untuk diunggah",
- "LogoUploadHelp": "Harap mengunggah berkas dalam bentuk %s dengan tinggi minimal %s pixel.",
+ "LogoUploadHelp": "Harap mengunggah berkas dalam bentuk %1$s dengan tinggi minimal %2$s pixel.",
"MenuDiagnostic": "Diagnosis",
"MenuGeneralSettings": "Pengaturan Umum",
"MenuManage": "Kelola",
"OptOutComplete": "Jangan-Lacak selesai. Bila Anda mengunjungi situs ini, Anda tidak akan terekam oleh perangkat Analisis Ramatraya.",
"OptOutCompleteBis": "Perhatikan bahwa jika Anda menghapus kuki Anda, menghapus kuki Jangan-Lacak, atau jika Anda mengganti komputer atau peramban ramatraya, Anda perlu melakukan prosedur Jangan-Lacak lagi.",
"OptOutExplanation": "Piwik berdedikasi untuk menyediakan privasi Internet. Agar pengunjung Anda memiliki pilihan untuk tidak terekam oleh Analisis Ramatraya Piwik, Anda dapat menambahkan kode HTML di salah satu halaman situs Anda, misalnya di halaman Kebijakan Privasi.",
- "OptOutExplanationBis": "Kode ini akan menampilkan bingkai pendam yang mengandung tautan untuk pengunjung agar Piwik tidak merekam dengan mengatur kuki Jangan-Lacak di peramban pengunjung. %sKlik di sini%s untuk melihat isi yang ditampilkan oleh bingkai pendam.",
+ "OptOutExplanationBis": "Kode ini akan menampilkan bingkai pendam yang mengandung tautan untuk pengunjung agar Piwik tidak merekam dengan mengatur kuki Jangan-Lacak di peramban pengunjung. %1$sKlik di sini%2$s untuk melihat isi yang ditampilkan oleh bingkai pendam.",
"OptOutForYourVisitors": "Piwik Jangan-Lacakan untuk Pengunjung",
"PiwikIsInstalledAt": "Piwik terpasang di",
- "StableReleases": "Bila Piwik merupakan hal yang penting dalam usaha Anda, kami menyarankan Anda menggunakan rilis stabil terkini. \tBila Anda menggunakan beta terkini dan Anda menemukan sebuah kutu atau sebuah sarah, harap %slihat di sini%s.",
+ "StableReleases": "Bila Piwik merupakan hal yang penting dalam usaha Anda, kami menyarankan Anda menggunakan rilis stabil terkini. \tBila Anda menggunakan beta terkini dan Anda menemukan sebuah kutu atau sebuah sarah, harap %1$slihat di sini%2$s.",
"TrackAGoal": "Lacak sebuah Tujuan",
"TrackingCode": "Kode Palacakan",
"TrustedHostConfirm": "Apakah Anda yakin mengubah nama inang terpercaya Piwik?",
diff --git a/plugins/CoreAdminHome/lang/it.json b/plugins/CoreAdminHome/lang/it.json
index 8b508a2c2331c47a83520b1d7de9d5288206c907..3db3978f6966c3db7a8619d8267369c46b38e598 100644
--- a/plugins/CoreAdminHome/lang/it.json
+++ b/plugins/CoreAdminHome/lang/it.json
@@ -7,9 +7,9 @@
"ReleaseChannel": "Canale release",
"ClickHereToOptIn": "Clicca qui per accettare (opt-in).",
"ClickHereToOptOut": "Clicca qui per rifiutare (opt-out).",
- "CustomLogoFeedbackInfo": "Se si personalizza il logo Piwik, si potrebbe anche essere interessati a nascondere il link %s nel menu in alto. A tale scopo, è possibile disattivare il plugin Feedback nella pagina %sGestione Plugin%s.",
+ "CustomLogoFeedbackInfo": "Se si personalizza il logo Piwik, si potrebbe anche essere interessati a nascondere il link %1$s nel menu in alto. A tale scopo, è possibile disattivare il plugin Feedback nella pagina %2$sGestione Plugin%3$s.",
"CustomLogoHelpText": "È possibile personalizzare il logo Piwik che verrà visualizzato nell'interfaccia utente e nei reports e-mail.",
- "DevelopmentProcess": "Poichè il nostro %sprocesso di sviluppo%s include migliaia di test automatizzati, i Beta Tester giocano un ruolo chiave nel raggiungimento in Piwik della \"Politica no bug\".",
+ "DevelopmentProcess": "Poichè il nostro %1$sprocesso di sviluppo%2$s include migliaia di test automatizzati, i Beta Tester giocano un ruolo chiave nel raggiungimento in Piwik della \"Politica no bug\".",
"EmailServerSettings": "Impostazioni server e-mail",
"ForBetaTestersOnly": "Solo per beta tester",
"ImageTracking": "Tracking Immagini",
@@ -24,7 +24,7 @@
"JavaScriptTracking": "Tracciamento JavaScript",
"JSTracking_CampaignKwdParam": "Parametro Keyword Campagna",
"JSTracking_CampaignNameParam": "Parametro Nome Campagna",
- "JSTracking_CodeNote": "Assicurati che questo codice si trovi in ognuna delle pagine del tuo sito prima del tag %1$s.",
+ "JSTracking_CodeNoteBeforeClosingHead": "Assicurati che questo codice sia presente su ogni pagina del tuo sito. Ti raccomandiamo di incollarlo subito prima del tag %1$s di chiusura.",
"JSTracking_CustomCampaignQueryParam": "Utilizza i nomi dei parametri di query personalizzati per il nome della campagna e parola chiave",
"JSTracking_CustomCampaignQueryParamDesc": "Nota: %1$sPiwik rivelerà automaticamente i parametri di Google Analytics.%2$s",
"JSTracking_DisableCookies": "Disabilita tutti i cookies di tracking",
@@ -49,9 +49,10 @@
"JSTrackingIntro5": "Se volete fare altro oltre che tracciare le viste pagina, preghiamo di controllare la %1$sDocumentazione Piwik Javascript Tracking%2$s per l'elenco delle funzioni disponibili. Utilizzando queste funzioni potrete tracciare obiettivi, variabili personalizzate, ordini ecommerce, carrelli abbandonati e altro.",
"LogoNotWriteableInstruction": "Per utilizzare il tuo logo personalizzato al posto del logo di Piwik, da' i permessi di scrittura a questa directory: %1$s Piwik necessita dell'accesso in scrittura per i tuoi loghi conservati nei files %2$s.",
"FileUploadDisabled": "Il caricamento dei files non è abilitato nella configurazione del tuo PHP. Per caricare il tuo logo personalizzato devi impostare %s nel php.ini e riavviare il server.",
+ "LogoUploadFailed": "E' stato impossibile leggere il file caricato. Assicurati che il file abbia un formato valido.",
"LogoUpload": "Seleziona un logo da caricare",
"FaviconUpload": "Seleziona una Favicon da caricare",
- "LogoUploadHelp": "Carica un file nei formati %s con un'altezza minima di %s pixels",
+ "LogoUploadHelp": "Caricate un file nei formati %1$s con un'altezza minima di %2$s pixels",
"MenuDiagnostic": "Diagnostica",
"MenuGeneralSettings": "Impostazioni generali",
"MenuManage": "Gestione",
@@ -60,19 +61,19 @@
"OptOutCompleteBis": "Nota che se cancelli i tuoi cookie, cancelli anche il cookie di opt-out, e se cambi computer o browser web, devi fare la procedura di opt-out nuovamente.",
"OptOutDntFound": "Non vieni tracciato poiché il tuo browser comunica che non lo desideri. Questa è un'impostazione del tuo browser, dunque non potrai effettuare l'opt-in finchè non disabiliti la funzionalità \"Non Tracciare\".",
"OptOutExplanation": "Piwik è impegnato ad assicurare la riservatezza su Internet. Per dare ai tuoi ospiti la possibilità di escludersi dalle Statistiche Web Piwik, è possibile aggiungere il seguente codice HTML in una pagina del tuo sito web, ad esempio in una pagina sulla privacy.",
- "OptOutExplanationBis": "Questo codice serve per mostrare un iFrame contenente un link che permetterà ai tuoi visitatori per escludersi da Piwik impostando un cookie opt-out nei loro browser. %sClicca qui%s per vedere il contenuto che sarà mostrato nell'iFrame.",
+ "OptOutExplanationBis": "Questo codice serve per mostrare un iFrame contenente un link per i tuoi visitatori per opt-out per le impostazioni di Piwik, tramite un opt-out cookie nei loro browser. %1$s Clicca qui%2$s per vedere il contenuto che sarà mostrato nell'iFrame.",
"OptOutForYourVisitors": "Piwik opt-out per i tuoi visitatori",
"PiwikIsInstalledAt": "Piwik è installato su",
"PersonalPluginSettings": "Impostazioni Personali Plugin",
- "PluginSettingChangeNotAllowed": "Non sei abilitato a cambiare il valore dell'impostazione \"%s\" nel plugin \"%s\"",
- "PluginSettingReadNotAllowed": "Non sei abilitato a leggere il valore dell'impostazione \"%s\" nel plugin \"%s\"",
+ "PluginSettingChangeNotAllowed": "Non sei abilitato a cambiare il valore dell'impostazione \"%1$s\" nel plugin \"%2$s\"",
+ "PluginSettingReadNotAllowed": "Non sei abilitato a leggere il valore dell'impostazione \"%1$s\" nel plugin \"%2$s\"",
"PluginSettings": "Impostazioni plugin",
"PluginSettingsIntro": "Qui puoi cambiare le impostazioni dei seguenti plugin di terze parti:",
- "PluginSettingsValueNotAllowed": "Il valore del campo \"%s\" nel plugin \"%s\" non è consentito",
+ "PluginSettingsValueNotAllowed": "Il valore del campo \"%1$s\" nel plugin \"%2$s\" non è consentito",
"PluginSettingsSaveFailed": "Salvataggio delle impostazioni del plugin fallito",
"SendPluginUpdateCommunication": "Manda un'email quando è disponibile l'aggiornamento di un plugin",
"SendPluginUpdateCommunicationHelp": "Verrà inviata una email ai Super User quando è disponibile una nuova versione di un plugin.",
- "StableReleases": "Se Piwik rappresenta una parte fondamentale nella tua attività , ti raccomandiamo di utilizzare l'ultima versione stabile. Se utilizzi l'ultima versione beta e riscontri un bug o hai dei suggerimenti, per favore %sguarda qui%s.",
+ "StableReleases": "Se Piwik rappresenta una parte fondamentale nella vostra attività , vi raccomandiamo di utilizzare l'ultima versione stabile. Se utilizzate l'ultima versione beta e riscontrate un bug o avete dei suggerimenti, per favore %1$sguardate qui%2$s.",
"LtsReleases": "Le versioni LTS (Supporto a Lungo termine) riceveranno assistenza solo per le correzioni dei bug e della sicurezza.",
"SystemPluginSettings": "Impostazioni di Sistema del Plugin",
"TrackAGoal": "Traccia un obiettivo",
@@ -89,6 +90,6 @@
"YouMayOptOutBis": "Per fare questa scelta, clicca qui di seguito per ricevere un cookie di opt-out.",
"OptingYouOut": "Sto acquisendo la tua rinuncia, attendi...",
"ProtocolNotDetectedCorrectly": "Al momento stai guardando Piwik tramite una connessione sicura SSL (uso di https) ma Piwik ha potuto rilevare sul server solo una connessione non protetta.",
- "ProtocolNotDetectedCorrectlySolution": "Per assicurarti che Piwik richieda e offra con sicurezza il tuo contenuto tramite HTTPS, puoi modificare il file %s e configurare le impostazioni del proxy, o puoi aggiungere la riga %s sotto la sezione %s. %sLeggi di più%s"
+ "ProtocolNotDetectedCorrectlySolution": "Per assicurarti che Piwik richieda e offra con sicurezza il tuo contenuto tramite HTTPS, puoi modificare il file %1$s e configurare le impostazioni del proxy, o puoi aggiungere la riga %2$s sotto la sezione %3$s. %4$sLeggi di più%5$s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/ja.json b/plugins/CoreAdminHome/lang/ja.json
index a40ab8e3b8e5d4b9d4cf739141c78bc3bcc65275..6793b30dc4b910e3df1fb3862abe808c7a9ed61a 100644
--- a/plugins/CoreAdminHome/lang/ja.json
+++ b/plugins/CoreAdminHome/lang/ja.json
@@ -7,9 +7,9 @@
"ReleaseChannel": "リリース ãƒãƒ£ãƒãƒ«",
"ClickHereToOptIn": "クリックã—ã¦ã‚ªãƒ—トイン。",
"ClickHereToOptOut": "クリックã—ã¦ã‚ªãƒ—トアウト。",
- "CustomLogoFeedbackInfo": "Piwikã®ãƒã‚´ã‚’カスタマイズã™ã‚‹å ´åˆã€ãƒˆãƒƒãƒ—メニュー㮠%s ã®ãƒªãƒ³ã‚¯ã‚‚éš ã—ãŸã„ã¨æ€ã†ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。ãã‚Œã«ã¯ %sプラグインã®ç®¡ç†%s ã®ãƒšãƒ¼ã‚¸ã§ãƒ•ã‚£ãƒ¼ãƒ‰ãƒãƒƒã‚¯ãƒ—ラグインを無効ã«ã—ã¾ã™ã€‚",
+ "CustomLogoFeedbackInfo": "Piwikã®ãƒã‚´ã‚’カスタマイズã™ã‚‹å ´åˆã€ãƒˆãƒƒãƒ—メニュー㮠%1$s ã®ãƒªãƒ³ã‚¯ã‚‚éš ã—ãŸã„ã¨æ€ã†ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。ãã‚Œã«ã¯ %2$sプラグインã®ç®¡ç†%3$s ã®ãƒšãƒ¼ã‚¸ã§ãƒ•ã‚£ãƒ¼ãƒ‰ãƒãƒƒã‚¯ãƒ—ラグインを無効ã«ã—ã¾ã™ã€‚",
"CustomLogoHelpText": "Piwikã®ãƒã‚´ã‚’カスタマイズã—ã¦ã€ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ç”»é¢ã¨Eメールリãƒãƒ¼ãƒˆã«è¡¨ç¤ºã§ãã¾ã™ã€‚",
- "DevelopmentProcess": "ç§ãŸã¡ã®%s開発プãƒã‚»ã‚¹%sã¯è‡ªå‹•åŒ–ã•ã‚ŒãŸæ•°åƒã®ãƒ†ã‚¹ãƒˆã‚’å«ã‚“ã§ã„ã¾ã™ãŒã€ãƒ™ãƒ¼ã‚¿ãƒ†ã‚¹ã‚¿ãƒ¼ã¯Piwikã®\"No bug policy\"é”æˆã®ãŸã‚ã®é‡è¦ãªå½¹å‰²ã‚’æžœãŸã—ã¦ã„ã¾ã™ã€‚",
+ "DevelopmentProcess": "ç§ãŸã¡ã®%1$s開発プãƒã‚»ã‚¹%2$sã¯è‡ªå‹•åŒ–ã•ã‚ŒãŸæ•°åƒã®ãƒ†ã‚¹ãƒˆã‚’å«ã‚“ã§ã„ã¾ã™ãŒã€ãƒ™ãƒ¼ã‚¿ãƒ†ã‚¹ã‚¿ãƒ¼ã¯Piwikã®\"No bug policy\"é”æˆã®ãŸã‚ã®é‡è¦ãªå½¹å‰²ã‚’æžœãŸã—ã¦ã„ã¾ã™ã€‚",
"EmailServerSettings": "メールサーãƒã®è¨å®š",
"ForBetaTestersOnly": "ベータテスターã®ã¿",
"ImageTracking": "ç”»åƒã«ã‚ˆã‚‹ãƒˆãƒ©ãƒƒã‚ング",
@@ -24,7 +24,6 @@
"JavaScriptTracking": "JavaScriptトラッã‚ング",
"JSTracking_CampaignKwdParam": "ã‚ャンペーン用ã‚ーワードã®ãƒ‘ラメーター",
"JSTracking_CampaignNameParam": "ã‚ャンペーンåã®ãƒ‘ラメーター",
- "JSTracking_CodeNote": "ã‚ãªãŸã®ã‚¦ã‚§ãƒ–サイトã®ã™ã¹ã¦ã®ãƒšãƒ¼ã‚¸ã®%1$s ã‚¿ã‚°ã®å‰ã«ã€ã“ã®ã‚³ãƒ¼ãƒ‰ãŒã‚ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。",
"JSTracking_CustomCampaignQueryParam": "ã‚ャンペーンåã¨ã‚ーワード用ã®ã‚«ã‚¹ã‚¿ãƒ クエリパラメータåを使用",
"JSTracking_CustomCampaignQueryParamDesc": "注： %1$sPiwikã¯è‡ªå‹•çš„ã«Google Analyticsã®ãƒ‘ラメータを検出ã—ã¾ã™ã€‚%2$s",
"JSTracking_DisableCookies": "ã™ã¹ã¦ã®ãƒˆãƒ©ãƒƒã‚ングクッã‚ーを無効ã«ã™ã‚‹",
@@ -51,7 +50,7 @@
"FileUploadDisabled": "PHP ã®è¨å®šã§ã€ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ãŒæœ‰åŠ¹ã«ãªã£ã¦ã„ã¾ã›ã‚“。カスタムãƒã‚´ã‚’アップãƒãƒ¼ãƒ‰ã™ã‚‹ã«ã¯ã€ php.ini 㧠%s ã‚’è¨å®šã—〠Web サーãƒã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„。",
"LogoUpload": "アップãƒãƒ¼ãƒ‰ã™ã‚‹ãƒã‚´ã‚’é¸æŠž",
"FaviconUpload": "アップãƒãƒ¼ãƒ‰ã™ã‚‹ãƒ•ã‚¡ãƒ“コンをé¸æŠž",
- "LogoUploadHelp": "%s ピクセル以上ã®é«˜ã•ã§ %s å½¢å¼ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’アップãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„",
+ "LogoUploadHelp": "%1$s ピクセル以上ã®é«˜ã•ã§ %2$s å½¢å¼ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’アップãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„",
"MenuDiagnostic": "診æ–",
"MenuGeneralSettings": "全般ã®è¨å®š",
"MenuManage": "管ç†",
@@ -60,19 +59,19 @@
"OptOutCompleteBis": "Cookie をクリアã—ã¦ã‚ªãƒ—トアウト Cookie を削除ã—ãŸã‚Šã€ã‚³ãƒ³ãƒ”ュータやブラウザを変更ã—ãŸå ´åˆã¯ã€ã‚ªãƒ—トアウト手続ãã‚’å†åº¦å®Ÿè¡Œã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。",
"OptOutDntFound": "ユーザーã«ã‚ˆã‚Šã€ã“ã®ãƒ–ラウザã§ã¯ãƒˆãƒ©ãƒƒã‚ングã—ãªã„è¨å®šã«ãªã£ã¦ãŠã‚Šã¾ã™ã€‚ã“ã‚Œã¯ãƒ–ラウザã®è¨å®šã«ã‚ˆã‚‹ã‚‚ã®ã§ã€'Do Not Track' 機能を無効ã«ã™ã‚‹ã¾ã§ã‚ªãƒ—トインã§ãã¾ã›ã‚“。",
"OptOutExplanation": "Piwik ã¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆä¸Šã®ãƒ—ライãƒã‚·ãƒ¼ã®æä¾›ã«å°‚念ã—ã¦ã„ã¾ã™ã€‚ ビジター㫠Piwik ウェブ解æžã®ã‚ªãƒ—トアウトã®é¸æŠžã‚’æä¾›ã™ã‚‹ãŸã‚ã«ã€ã‚¦ã‚§ãƒ–サイトã®1ページ（プライãƒã‚·ãƒ¼ãƒãƒªã‚·ãƒ¼ã®ãƒšãƒ¼ã‚¸ç‰ï¼‰ã«æ¬¡ã® HTML ã‚³ãƒ¼ãƒ‰ã‚’è¿½åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚",
- "OptOutExplanationBis": "HTML コードã¯ã€ãƒ“ジターã®ãƒ–ラウザã«ã‚ªãƒ—トアウト Cookie ã‚’è¨å®šã™ã‚‹ã€Piwik オプトアウトリンクをå«ã‚€ iFrame を表示ã—ã¾ã™ã€‚ iFrame ã§è¡¨ç¤ºã•ã‚Œã‚‹å†…容を表示ã™ã‚‹ã«ã¯ã€%sã“ã“をクリック%sã—ã¾ã™ã€‚",
+ "OptOutExplanationBis": "HTML コードã¯ã€ãƒ“ジターã®ãƒ–ラウザã«ã‚ªãƒ—トアウト Cookie ã‚’è¨å®šã™ã‚‹ã€Piwik オプトアウトリンクをå«ã‚€ iFrame を表示ã—ã¾ã™ã€‚ iFrame ã§è¡¨ç¤ºã•ã‚Œã‚‹å†…容を表示ã™ã‚‹ã«ã¯ã€%1$sã“ã“をクリック%2$sã—ã¾ã™ã€‚",
"OptOutForYourVisitors": "ビジター㮠Piwik オプトアウト",
"PiwikIsInstalledAt": "PiwikãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã®ã¯",
"PersonalPluginSettings": "パーソナルプラグインã®è¨å®š",
- "PluginSettingChangeNotAllowed": "\"%s\" プラグイン㧠\"%s\" è¨å®šã•ã‚Œã¦ã„る値変更ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。",
- "PluginSettingReadNotAllowed": "\"%s\" プラグイン㧠\"%s\" è¨å®šã•ã‚Œã¦ã„る値ã®èªã¿å–ã‚Šã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。",
+ "PluginSettingChangeNotAllowed": "\"%1$s\" プラグイン㧠\"%2$s\" è¨å®šã•ã‚Œã¦ã„る値変更ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。",
+ "PluginSettingReadNotAllowed": "\"%1$s\" プラグイン㧠\"%2$s\" è¨å®šã•ã‚Œã¦ã„る値ã®èªã¿å–ã‚Šã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。",
"PluginSettings": "プラグインè¨å®š",
"PluginSettingsIntro": "ã“ã“ã§ã¯ã€æ¬¡ã®ã‚µãƒ¼ãƒ‰ãƒ‘ーティã®ãƒ—ラグインã®è¨å®šå¤‰æ›´ãŒã§ãã¾ã™",
- "PluginSettingsValueNotAllowed": "\"%s\" プラグイン㮠\"%s\" フィールドã®å€¤ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。",
+ "PluginSettingsValueNotAllowed": "\"%1$s\" プラグイン㮠\"%2$s\" フィールドã®å€¤ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。",
"PluginSettingsSaveFailed": "プラグインã®è¨å®šã‚’ä¿å˜ã§ãã¾ã›ã‚“ã§ã—ãŸ",
"SendPluginUpdateCommunication": "プラグインã®æ›´æ–°ãŒåˆ©ç”¨å¯èƒ½ãªã¨ãã«ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ã¾ã™ã€‚",
"SendPluginUpdateCommunicationHelp": "使用å¯èƒ½ãªæ–°ã—ã„プラグインã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚ã‚‹å ´åˆã€ç®¡ç†è€…ユーザーã¸ãƒ¡ãƒ¼ãƒ«ãŒé€šçŸ¥ã•ã‚Œã¾ã™ã€‚",
- "StableReleases": "PiwikãŒãƒ“ジãƒã‚¹ã®é‡è¦ãªä¸€éƒ¨ã§ã‚ã‚‹å ´åˆã€æœ€æ–°ã®å®‰å®šç‰ˆã‚’使用ã™ã‚‹ã“ã¨ã‚’推奨ã—ã¾ã™ã€‚ã¾ãŸã€æœ€æ–°ã®ãƒ™ãƒ¼ã‚¿ç‰ˆã‚’使用ã—ã€ãƒã‚°ã‚’見ã¤ã‘ãŸã‚Šã€æ案ãŒã‚ã‚Œã°ã€%sã“ã¡ã‚‰ã‚’ã”覧ãã ã•ã„%s。",
+ "StableReleases": "PiwikãŒãƒ“ジãƒã‚¹ã®é‡è¦ãªä¸€éƒ¨ã§ã‚ã‚‹å ´åˆã€æœ€æ–°ã®å®‰å®šç‰ˆã‚’使用ã™ã‚‹ã“ã¨ã‚’推奨ã—ã¾ã™ã€‚ã¾ãŸã€æœ€æ–°ã®ãƒ™ãƒ¼ã‚¿ç‰ˆã‚’使用ã—ã€ãƒã‚°ã‚’見ã¤ã‘ãŸã‚Šã€æ案ãŒã‚ã‚Œã°ã€%1$sã“ã¡ã‚‰ã‚’ã”覧ãã ã•ã„%2$s。",
"LtsReleases": "LTS (長期サãƒãƒ¼ãƒˆ) ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ã€ã‚»ã‚ュリティã¨ãƒã‚°ä¿®æ£ã®ã¿å—ä¿¡ã—ã¾ã™ã€‚",
"SystemPluginSettings": "システムプラグインè¨å®š",
"TrackAGoal": "目標ã®è¿½è·¡",
diff --git a/plugins/CoreAdminHome/lang/ko.json b/plugins/CoreAdminHome/lang/ko.json
index d51f4e43be5934d2ce60b84cc34b4d26898a5721..0e7d79e8bcbf46f382bb191e9f71506d2744b647 100644
--- a/plugins/CoreAdminHome/lang/ko.json
+++ b/plugins/CoreAdminHome/lang/ko.json
@@ -1,24 +1,26 @@
{
"CoreAdminHome": {
+ "AddNewTrustedHost": "새 ì‹ ë¢°í• ìˆ˜ 있는 호스트 추가",
"Administration": "관리",
"ArchivingSettings": "ì•„ì¹´ì´ë¸Œ ì„¤ì •",
"BrandingSettings": "브랜딩 ì„¤ì •",
"ReleaseChannel": "릴리즈 채ë„",
"ClickHereToOptIn": "í´ë¦í•˜ì—¬ 허용합니다.",
"ClickHereToOptOut": "í´ë¦í•˜ì—¬ 차단합니다.",
- "CustomLogoFeedbackInfo": "Piwik ë¡œê³ ë¥¼ 변경하거나 ìƒë‹¨ ë©”ë‰´ì˜ %s ë§í¬ë„ 숨길 수 있습니다. %s í”ŒëŸ¬ê·¸ì¸ ê´€ë¦¬ %s 페ì´ì§€ì—ì„œ 피드백 플러그ì¸ì„ 비활성화세요.",
+ "CustomLogoFeedbackInfo": "Piwik ë¡œê³ ë¥¼ 변경하거나 ìƒë‹¨ ë©”ë‰´ì˜ %1$s ë§í¬ë„ 숨길 수 있습니다. %2$s í”ŒëŸ¬ê·¸ì¸ ê´€ë¦¬ %3$s 페ì´ì§€ì—ì„œ 피드백 플러그ì¸ì„ 비활성화세요.",
"CustomLogoHelpText": "Piwik ë¡œê³ ë¥¼ 사용ìžì •ì˜í•˜ì—¬ ì‚¬ìš©ìž ì¸í„°íŽ˜ì´ìŠ¤ 화면과 ì´ë©”ì¼ ë³´ê³ ì„œë¥¼ ë³¼ 수 있습니다.",
- "DevelopmentProcess": "Piwikì˜ %s개발 ê³¼ì •%sì•ˆì— ìˆ˜ë§Žì€ ìžë™ 검사를 수행하지만, Piwikì˜ \"무버그 ì •ì±…\"ì„ ë§Œì¡±ì‹œí‚¤ê¸° 위해 ë² íƒ€ 테스터가 ìƒë‹¹ížˆ 중요합니다.",
+ "DevelopmentProcess": "Piwikì˜ %1$s개발 ê³¼ì •%2$sì•ˆì— ìˆ˜ë§Žì€ ìžë™ 검사를 수행하지만, Piwikì˜ \\\"무버그 ì •ì±…\\\"ì„ ë§Œì¡±ì‹œí‚¤ê¸° 위해 ë² íƒ€ 테스터가 ìƒë‹¹ížˆ 중요합니다.",
"EmailServerSettings": "ë©”ì¼ ì„œë²„ ì„¤ì •",
"ForBetaTestersOnly": "ë² íƒ€ 테스터 ì „ìš©",
"ImageTracking": "ì´ë¯¸ì§€ 추ì ",
+ "ImageTrackingIntro1": "만약 방문ìžê°€ ìžë°”스í¬ë¦½íŠ¸ë¥¼ ë¹„í™œì„±í™”í•˜ì˜€ì„ ê²½ìš°ì´ê±°ë‚˜ ìžë°”스í¬ë¦½íŠ¸ë¥¼ 사용하지 못하는 경우, ì´ë¯¸ì§€ 추ì ë§í¬ë¥¼ ì´ìš©í•´ì„œ 방문ìžë¥¼ 추ì í• ìˆ˜ 있습니다.",
"ImageTrackingLink": "ì´ë¯¸ì§€ 추ì ë§í¬",
"ImportingServerLogs": "서버 로그 ê°€ì ¸ì˜¤ê¸°",
"JavaScriptTracking": "ìžë°”스í¬ë¦½íŠ¸ 추ì ",
"JSTracking_CampaignKwdParam": "ìº íŽ˜ì¸ í‚¤ì›Œë“œ 파ë¼ë©”í„°",
"JSTracking_CampaignNameParam": "ìº íŽ˜ì¸ ì´ë¦„ 파ë¼ë©”í„°",
- "JSTracking_CodeNote": "아래 코드는 ë‹¹ì‹ ì˜ ì›¹ì‚¬ì´íŠ¸ì—ì„œ ëª¨ë“ íŽ˜ì´ì§€ì˜ %1$s 태그 바로 ì•žì— ìœ„ì¹˜í•´ì•¼ 합니다.",
"JSTracking_CustomCampaignQueryParamDesc": "중요: %1$s Piwik는 ìžë™ìœ¼ë¡œ 구글 ë¶„ì„ íŒŒë¼ë©”터를 ê°ì§€í•©ë‹ˆë‹¤.%2$s",
+ "JSTracking_DisableCookies": "ëª¨ë“ ì¶”ì ì¿ í‚¤ 비활성화",
"JSTracking_EnableDoNotTrack": "í´ë¼ì´ì–¸íŠ¸ì—ì„œ DoNotTrack íƒì§€ 활성화",
"JSTrackingIntro3": "ëŒ€ë¶€ë¶„ì˜ ì›¹ì‚¬ì´íŠ¸, 블로그, CMS 등ì—ì„œ 쉽게 ì‚¬ìš©í• ìˆ˜ 있ë„ë¡ í”ŒëŸ¬ê·¸ì¸ í˜•íƒœë¡œ ì œê³µë˜ê³ 있습니다. (%1$sPiwik 통합 í”ŒëŸ¬ê·¸ì¸ ë¦¬ìŠ¤íŠ¸%2$s 보기) 만약 플러그ì¸ì´ ì œê³µë˜ì§€ 않는다면, 웹사ì´íŠ¸ í…œí”Œë¦¿ì„ ê³ ì³ \"footer\" 파ì¼ì— 해당 코드를 넣어 í•´ê²°í• ìˆ˜ 있습니다.",
"JSTrackingIntro5": "만약 페ì´ì§€ ë·°ì— ëŒ€í•œ 것 ì´ìƒì„ ì›í• 경우, %1$sPiwik ìžë°”스í¬ë¦½íŠ¸ 트래킹 문서%2$s ë‚´ 여러 가능한 함수 리스트를 ì°¸ê³ í•˜ì„¸ìš”. ì´ í•¨ìˆ˜ë“¤ì„ í†µí•´ 목표나 맞춤 변수, ìƒê±°ëž˜ 주문 ë° ë‹´ê²¨ì ¸ìžˆê¸°ë§Œ í•œ 카트 ë“±ì„ ì¶”ì í• ìˆ˜ 있습니다.",
@@ -31,7 +33,7 @@
"OptOutComplete": "차단 완료; ë‹¹ì‹ ì˜ ë°©ë¬¸í•œ ì´ ì›¹ì‚¬ì´íŠ¸ëŠ” ì´ì œ 웹 ë¶„ì„ ë„êµ¬ì— ê¸°ë¡ë˜ì§€ 않습니다.",
"OptOutCompleteBis": "Cookie를 ì‚ì œí•˜ì—¬ 차단 Cookie를 ì‚ì œí•˜ê±°ë‚˜ 컴퓨터 ë˜ëŠ” 브ë¼ìš°ì €ë¥¼ 변경 í•œ 경우는 차단 ì ˆì°¨ë¥¼ 다시 수행해야 한다는 ì ìœ ì˜í•˜ì„¸ìš”.",
"OptOutExplanation": "Piwikì€ ì¸í„°ë„·ì—ì„œ ê°œì¸ ì •ë³´ ì œê³µì— ìµœì„ ì„ ë‹¤í•˜ê³ ìžˆìŠµë‹ˆë‹¤. 방문ìžì— Piwik 웹 분ì„ì˜ ì°¨ë‹¨ ì˜µì…˜ì„ ì œê³µí•˜ê¸° 위해 웹 사ì´íŠ¸ì˜ 1페ì´ì§€ (ê°œì¸ ì •ë³´ 보호 ì •ì±… 페ì´ì§€ 등)ì— ë‹¤ìŒ HTML 코드를 추가 í• ìˆ˜ 있습니다.",
- "OptOutExplanationBis": "HTML 코드는 방문ìžì˜ 브ë¼ìš°ì €ì— 차단 Cookie를 ì„¤ì •í•˜ëŠ” Piwik 차단 ë§í¬ë¥¼ ​​í¬í•¨ iFrameì„ í‘œì‹œí•©ë‹ˆë‹¤. iFrameì—ì„œ 표시ë˜ëŠ” ë‚´ìš©ì„ í‘œì‹œí•˜ë ¤ë©´ %s여기를 í´ë¦%s합니다.",
+ "OptOutExplanationBis": "HTML 코드는 방문ìžì˜ 브ë¼ìš°ì €ì— 차단 Cookie를 ì„¤ì •í•˜ëŠ” Piwik 차단 ë§í¬ë¥¼ ​​í¬í•¨ iFrameì„ í‘œì‹œí•©ë‹ˆë‹¤. iFrameì—ì„œ 표시ë˜ëŠ” ë‚´ìš©ì„ í‘œì‹œí•˜ë ¤ë©´ %1$s여기를 í´ë¦%2$s합니다.",
"OptOutForYourVisitors": "방문ìžì˜ Piwik 차단",
"PiwikIsInstalledAt": "Piwikê°€ 설치ë˜ì–´ 있습니다",
"PersonalPluginSettings": "ë‚˜ë§Œì˜ í”ŒëŸ¬ê·¸ì¸ ì„¤ì •",
@@ -40,7 +42,7 @@
"PluginSettingsSaveFailed": "í”ŒëŸ¬ê·¸ì¸ ì„¤ì • ì €ìž¥ 실패",
"SendPluginUpdateCommunication": "í”ŒëŸ¬ê·¸ì¸ ì—…ë°ì´íŠ¸ê°€ ê°€ëŠ¥í• ë•Œ ì´ë©”ì¼ ì•Œë¦¼",
"SendPluginUpdateCommunicationHelp": "플러그ì¸ì˜ 새로운 ë²„ì „ì´ ë‚˜íƒ€ë‚ ê²½ìš° ìˆ˜í¼ ìœ ì €ì—게 ë©”ì¼ë¡œ ì•Œë ¤ì§‘ë‹ˆë‹¤.",
- "StableReleases": "만약 Piwikê°€ ë‹¹ì‹ ì˜ ë¹„ì§€ë‹ˆìŠ¤ì— ìƒë‹¹ížˆ 중요한 요소ë¼ë©´ 최근 ì•ˆì • ë²„ì „ì„ ì‚¬ìš©í•˜ì‹œëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤. 만약 최근 ë² íƒ€ ë²„ì „ì„ ì‚¬ìš© 중 버그를 찾으셨거나 ì œì•ˆí•˜ì‹¤ 사í•ì´ 있으시다면, %s여기를 ë´ì£¼ì„¸ìš”%s.",
+ "StableReleases": "\"만약 Piwikê°€ ë‹¹ì‹ ì˜ ë¹„ì§€ë‹ˆìŠ¤ì— ìƒë‹¹ížˆ 중요한 요소ë¼ë©´ 최근 ì•ˆì • ë²„ì „ì„ ì‚¬ìš©í•˜ì‹œëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤. 만약 최근 ë² íƒ€ ë²„ì „ì„ ì‚¬ìš© 중 버그를 찾으셨거나 ì œì•ˆí•˜ì‹¤ 사í•ì´ 있으시다면, %1$s여기를 ë´ì£¼ì„¸ìš”%2$s.",
"LtsReleases": "LTS (Long Term Support, 오랜 기간ë™ì•ˆ 지ì›ë¨) ë²„ì „ì€ ë³´ì•ˆ ë° ë²„ê·¸ 해결만 받습니다.",
"SystemPluginSettings": "시스템 í”ŒëŸ¬ê·¸ì¸ ì„¤ì •",
"TrackAGoal": "목표 추ì ",
diff --git a/plugins/CoreAdminHome/lang/lt.json b/plugins/CoreAdminHome/lang/lt.json
index 3c5e61a8cd092f06bf711bfe244ef5f3d4f27c29..07cb019f5ab64d929d13d410cc3bd94ca80dc5f9 100644
--- a/plugins/CoreAdminHome/lang/lt.json
+++ b/plugins/CoreAdminHome/lang/lt.json
@@ -3,7 +3,9 @@
"Administration": "Administravimas",
"ArchivingSettings": "Archyvavimo nustatymai",
"EmailServerSettings": "El. pašto serverio nustatymai",
+ "ForBetaTestersOnly": "Tik beta testuotojams",
"MenuGeneralSettings": "Pagrindiniai nustatymai",
+ "PluginSettings": "Papildinio nustatymai",
"PluginSettingsSaveFailed": "Nepavyko įrašyti papildinio nustatymų"
}
}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/nb.json b/plugins/CoreAdminHome/lang/nb.json
index 7e394aca3f99bfe1495886e640335a90d7c70374..8c89e22b1408bc5e5f47ddf2e7e230ed0a481e23 100644
--- a/plugins/CoreAdminHome/lang/nb.json
+++ b/plugins/CoreAdminHome/lang/nb.json
@@ -7,9 +7,9 @@
"ReleaseChannel": "Versjonskanal",
"ClickHereToOptIn": "Trykk her for å delta.",
"ClickHereToOptOut": "Trykk her for å ikke delta.",
- "CustomLogoFeedbackInfo": "Hvis du tilpasser Piwik-logoen vil du kanskje også skjule %s-lenken i toppmenyen. For å gjøre det må du deaktivere Feedback-utvidelsen i %sAdministrasjon av utvidelser%s-siden.",
+ "CustomLogoFeedbackInfo": "Hvis du tilpasser Piwik-logoen vil du kanskje også skjule %1$s-lenken i toppmenyen. For å gjøre det må du deaktivere Feedback-utvidelsen i %2$sAdministrasjon av utvidelser%3$s-siden.",
"CustomLogoHelpText": "Du kan tilpasse Piwik-logoen som vises i brukergrensesnittet og i e-postrapporter.",
- "DevelopmentProcess": "Selv om vår %sutviklingsprosess%s inkluderer tusener av automatiske testser, spiller betatestere en viktig rolle for å at vi skal kunne etterleve vårt mål om å ikke ha noen feil.",
+ "DevelopmentProcess": "Selv om vår %1$sutviklingsprosess%2$s inkluderer tusener av automatiske testser, spiller betatestere en viktig rolle for å at vi skal kunne etterleve vårt mål om å ikke ha noen feil.",
"EmailServerSettings": "Innstillinger for e-posttjener",
"ForBetaTestersOnly": "Kun for beta-testere",
"ImageTracking": "Bildesporing",
@@ -24,7 +24,7 @@
"JavaScriptTracking": "JavaScript-sporing",
"JSTracking_CampaignKwdParam": "Nøkkelordparameter for kampanje",
"JSTracking_CampaignNameParam": "Navneparameter for kampanje",
- "JSTracking_CodeNote": "Forsikre deg om at koden brukes på alle sider på ditt nettsted før %1$s-taggen.",
+ "JSTracking_CodeNoteBeforeClosingHead": "Forsikre deg om at denne koden er på alle sider på nettstedet. Vi anbefaler å lime den inn rett før den lukkende %1$s-taggen.",
"JSTracking_CustomCampaignQueryParam": "Bruk tilpassede spørreparameternavn for kampanjens navn og nøkkelord",
"JSTracking_CustomCampaignQueryParamDesc": "Merk: %1$sPiwik vil automatisk oppdage Google Analytics-parametere.%2$s",
"JSTracking_DisableCookies": "Deaktiver alle sporingskapsler (cookies)",
@@ -41,7 +41,7 @@
"JSTracking_PageCustomVars": "Spor en tilpasset variabel for hver sidevisning",
"JSTracking_PageCustomVarsDesc": "For eksempel, med variabelnavnet «Kategori» og verdien «Rapporter».",
"JSTracking_VisitorCustomVars": "Spor tilpassede variabler for denne besøkeren",
- "JSTracking_VisitorCustomVarsDesc": "Dor eksempel, med variabelnavnet «Type» og verdien «Kunde».",
+ "JSTracking_VisitorCustomVarsDesc": "For eksempel, med variabelnavnet «Type» og verdien «Kunde».",
"JSTrackingIntro1": "Du kan spore besøkere til ditt nettsted på flere ulike måter. Den anbefalte måten å gjøre det er via JavaScript. For å bruke denne metoden må du forsikre deg om at alle nettsider på ditt nettsted har en JavaScript-kode, som du kan generere her.",
"JSTrackingIntro2": "Når du har JavaScript-sporingskoden for ditt nettsted, kopier og lim den inn på alle nettsteder som du vil spore med Piwik.",
"JSTrackingIntro3": "For de fleste nettsteder, blogger, CMS-er og liknende kan du bruke allerede eksisterende utvidelser for å gjøre den tekniske jobben for deg. (Se vår %1$sliste med utvidelser som integrerer Piwik%2$s.) Hvis det ikke eksisterer noen utvidelser kan du redigere ditt nettsteds maler og legge til koden i «footer»-filen.",
@@ -49,9 +49,10 @@
"JSTrackingIntro5": "Hvis du vil gjøre mer enn å spore sidevisninger, vennligst sjekk ut %1$sPiwik JavaScript Tracking documentation%2$s for en liste med tilgjengelige funksjoner. Ved å bruke disse funksjonene kan du spore mål, tilpassede variabler, e-handelsordre, forlatte handlevogner og mer.",
"LogoNotWriteableInstruction": "For å bruke din egen logo istedenfor Piwik-logoen, gi skriverettigheter til denne mappen: %1$s Piwik trenger skrivetilgang for dine logoer som er lagret i filene %2$s.",
"FileUploadDisabled": "Opplasting avfiler er ikke aktivert i din PHP-konfigurasjon. For å laste opp din egen logo, vennligst sett %s i php.ini og restart din webserver.",
+ "LogoUploadFailed": "Den opplastede filen kunne ikke prosesseres. Vennligst sjekk at den har et gyldig format.",
"LogoUpload": "Velg en logo å laste opp",
"FaviconUpload": "Velg et favicon å laste opp",
- "LogoUploadHelp": "Vennligst last opp en fil i %s-formatet med en minimumshøyde på %s piksler.",
+ "LogoUploadHelp": "Vennligst last opp en fil i %1$s-formatet med en minimumshøyde på %2$s piksler.",
"MenuDiagnostic": "Diagnostikk",
"MenuGeneralSettings": "Generelle innstillinger",
"MenuManage": "Administrer",
@@ -60,19 +61,19 @@
"OptOutCompleteBis": "Merk at hvis du sletter dine datakapsler (cookies), sletter denne opt-out-kapselen, eller hvis du endrer datamaskin eller nettleser, er du nødt til å gjennomføre denne prosedyren igjen.",
"OptOutDntFound": "Du spores ikke siden din nettleser rapporterer at du ikke vil det. Dette er en innstilling i din nettleser, så du vil ikke være i stand til å delta før du deaktiverer «Ikke spor meg»-funksjonen.",
"OptOutExplanation": "Piwik er dedikert til å gi personvern på Internett. For å gi dine besøkere valget om å ikke bli sporet, kan du legge til følgende HTML-kode på en av nettstedssider, for eksempel på personvern-siden.",
- "OptOutExplanationBis": "Denne koden vil vise en iframe med en lenke for dine besøkere slik at de kan velge å ikke bli sporet av Piwik ved å sette en opt-out-cookie i sine nettlesere. %s Klikk her%s for å vise innholdet som vil vises i iframen.",
+ "OptOutExplanationBis": "Denne koden vil vise en iframe med en lenke for dine besøkere slik at de kan velge å ikke bli sporet av Piwik ved å sette en opt-out-cookie i sine nettlesere. %1$s Klikk her%2$s for å vise innholdet som vil vises i iframen.",
"OptOutForYourVisitors": "Piwik opt-out for dine besøkende",
"PiwikIsInstalledAt": "Piwik er installert på",
"PersonalPluginSettings": "Personlige innstillinger for utvidelser",
- "PluginSettingChangeNotAllowed": "Du har ikke tillatelse til å endre verdien på innstillingen «%s» i utvidelsen «%s»",
- "PluginSettingReadNotAllowed": "Du har ikke tillatelse til å lese verdien av innstillingen «%s» i utvidelsen «%s»",
+ "PluginSettingChangeNotAllowed": "Du har ikke tillatelse til å endre verdien på innstillingen «%1$s» i utvidelsen «%2$s»",
+ "PluginSettingReadNotAllowed": "Du har ikke tillatelse til å lese verdien av innstillingen «%1$s» i utvidelsen «%2$s»",
"PluginSettings": "Innstillinger for utvidelser",
"PluginSettingsIntro": "Her kan du endre innstillinger for følgende 3. parts utvidelser:",
- "PluginSettingsValueNotAllowed": "Verdien for feltet «%s» i utvidelsen «%s» er ikke tillatt",
+ "PluginSettingsValueNotAllowed": "Verdien for feltet «%1$s» i utvidelsen «%2$s» er ikke tillatt",
"PluginSettingsSaveFailed": "Klarte ikke å lagre innstillinger for utvidelser",
"SendPluginUpdateCommunication": "Send en e-post når en oppdatering for en utvidelse er tilgjengelig",
"SendPluginUpdateCommunicationHelp": "En e-post vil bli sendt til superbrukere når det er en ny versjon tilgjengelig for en utvidelse.",
- "StableReleases": "Hvis Piwik er en kritisk del av din forretning anbefaler vi at du bruker den nyeste stabile versjonen. Hvis du bruker den nyeste betaen og du finner en feil eller har et forbedringsforslag, vennligst %sse her%s.",
+ "StableReleases": "Hvis Piwik er en kritisk del av din forretning anbefaler vi at du bruker den nyeste stabile versjonen. Hvis du bruker den nyeste betaen og du finner en feil eller har et forbedringsforslag, vennligst %1$sse her%2$s.",
"LtsReleases": "LTS(Long Term Support – langsiktig støtte)-versjoner får kun sikkerhets- og feilrettinger.",
"SystemPluginSettings": "Systeminnstillinger for utvidelser",
"TrackAGoal": "Spor et mål",
@@ -89,6 +90,6 @@
"YouMayOptOutBis": "Hvis du ønsker at din aktivitet ikke lagres, klikk under for å motta en blank informasjonskapsel, så vil du unngå å bli registrert.",
"OptingYouOut": "Forhindrer at du registreres, vennligst vent...",
"ProtocolNotDetectedCorrectly": "Du ser nå Piwik på en sikker SSL-tilkobling (med HTTPS), men Piwik kan kun se en ikke-sikker tilkobling til serveren.",
- "ProtocolNotDetectedCorrectlySolution": "For å forsikre deg om at Piwik mottar sikre spørringer og leverer innhold over HTTPS, kan du redigere din %s-fil og enten konfigurere dine proxy-innstillinger, eller du kan legge inn linjen %s under seksjonen %s. %sLær mer%s"
+ "ProtocolNotDetectedCorrectlySolution": "For å forsikre deg om at Piwik mottar sikre spørringer og leverer innhold over HTTPS, kan du redigere din %1$s-fil og enten konfigurere dine proxy-innstillinger, eller du kan legge inn linjen %2$s under seksjonen %3$s. %4$sLær mer%5$s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/nl.json b/plugins/CoreAdminHome/lang/nl.json
index 5135a3cba9c3116958dca2b9a48a83a70f3db08b..5814095c64abaee11c2563b7e074584c5ed76a5d 100644
--- a/plugins/CoreAdminHome/lang/nl.json
+++ b/plugins/CoreAdminHome/lang/nl.json
@@ -6,9 +6,9 @@
"BrandingSettings": "Logo instellingen",
"ClickHereToOptIn": "Klik hier om u aan te melden.",
"ClickHereToOptOut": "Klik hier om u af te melden.",
- "CustomLogoFeedbackInfo": "Als u het Piwik logo bijwerkt, heeft u wellicht ook interesse om de %s link te verbergen in het menu bovenaan. Om dit te doen, kunt u de feedback plugin uitschakelen in de pagina van de %sManage Plugins%s.",
+ "CustomLogoFeedbackInfo": "Als u het Piwik logo bijwerkt, heeft u wellicht ook interesse om de %1$s link te verbergen in het menu bovenaan. Om dit te doen, kunt u de feedback plugin uitschakelen in de pagina van de %2$sManage Plugins%3$s.",
"CustomLogoHelpText": "U kunt het Piwik logo aanpassen dat wordt weergegeven in de gebruikersinterface en in de e-mail rapportages.",
- "DevelopmentProcess": "Hoewel ons %s ontwikkel process %s duizenden automatisch tests omvat, spelen Beta testers een belangrijke rol in het \"No bug beleid\" in Piwik.",
+ "DevelopmentProcess": "Hoewel ons %1$s ontwikkel process %2$s duizenden automatisch tests omvat, spelen Beta testers een belangrijke rol in het \"No bug beleid\" in Piwik.",
"EmailServerSettings": "E-mail server instellingen",
"ForBetaTestersOnly": "Alleen voor beta testers",
"ImageTracking": "Afbeelding tracking",
@@ -23,7 +23,6 @@
"JavaScriptTracking": "JavaScript Tracking",
"JSTracking_CampaignKwdParam": "Campagne sleutelwoord parameter",
"JSTracking_CampaignNameParam": "Campagna naam parameter",
- "JSTracking_CodeNote": "Zorg dat deze code is geplaatst voor de %1$s tag op elke pagina op uw website.",
"JSTracking_CustomCampaignQueryParam": "Gebruik aangepaste query parameter namen voor de campagne naam & sleutelwoorden",
"JSTracking_CustomCampaignQueryParamDesc": "Opmerking: %1$s Piwik detecteert automatisch Google Analytics parameters.%2$s",
"JSTracking_DisableCookies": "Schakel alle tracking cookies uit",
@@ -50,7 +49,7 @@
"FileUploadDisabled": "Het uploaden van documenten is niet geactiveerd in je PHP configuratie. Om een aangepast logo up te loaden pas %s aan in php.ini en herstart de webserver.",
"LogoUpload": "Selecteer een logo om te uploaden",
"FaviconUpload": "Selecteer een favicon om up te loaden",
- "LogoUploadHelp": "Upload een bestand in %s formaten met een minimum hoogte van %s pixels.",
+ "LogoUploadHelp": "Upload een bestand in %1$s formaten met een minimum hoogte van %2$s pixels.",
"MenuDiagnostic": "Diagnose",
"MenuGeneralSettings": "Algemene instellingen",
"MenuManage": "Beheer",
@@ -59,19 +58,19 @@
"OptOutCompleteBis": "Als u uw cookies verwijderd, de opt-out cookie verwijderd of wisselt van computer of webbrowser, dan zult u deze opt-out procedure opnieuw moeten uitvoeren.",
"OptOutDntFound": "Je bezoek wordt niet gemeten omdat je browser aangeeft dat je dat niet wil. Dit is een instelling van je browser, dus je kunt geen gebruik maken van opt-in, totdat je de 'Volg mij Niet' functie uitschakelt.",
"OptOutExplanation": "Piwik is ingericht om de privacy op internet te respecteren. U kunt uw bezoekers de keuze opting-out van Piwik Web Analytics aanbieden. Daartoe kunt u de volgende HTML-code toevoegen aan één van uw webpagina's, bijvoorbeeld op een pagina met de Privacy Policy.",
- "OptOutExplanationBis": "Deze code zal een I-frame tonen met daarin een link naar de opt-out van Piwik door een opt-out cookie te plaatsen in hun browser. %s Klik hier%s om de tekst te bekijken die in het I-frame getoond zal worden.",
+ "OptOutExplanationBis": "Deze code zal een I-frame tonen met daarin een link naar de opt-out van Piwik door een opt-out cookie te plaatsen in hun browser. %1$s Klik hier%2$s om de tekst te bekijken die in het I-frame getoond zal worden.",
"OptOutForYourVisitors": "Piwik opt-out voor uw bezoekers",
"PiwikIsInstalledAt": "Piwik is geïnstalleerd in",
"PersonalPluginSettings": "Persoonlijke Plugin Instellingen",
- "PluginSettingChangeNotAllowed": "U bent niet gemachtigd om de waarde aan te passen van de instelling \"%s\" in plugin \"%s\"",
- "PluginSettingReadNotAllowed": "Je hebt geen toestemming voor het uitlezen van de instelling \"%s\" uit de plugin \"%s\"",
+ "PluginSettingChangeNotAllowed": "U bent niet gemachtigd om de waarde aan te passen van de instelling \"%1$s\" in plugin \"%2$s\"",
+ "PluginSettingReadNotAllowed": "Je hebt geen toestemming voor het uitlezen van de instelling \"%1$s\" uit de plugin \"%2$s\"",
"PluginSettings": "Plugin Instellingen",
"PluginSettingsIntro": "Hier kunt u instellingen aanpassen voor de volgende plugins van derden:",
- "PluginSettingsValueNotAllowed": "De waarde voor veld \"%s\" in plugin \"%s\" is niet toegestaan",
+ "PluginSettingsValueNotAllowed": "De waarde voor veld \"%1$s\" in plugin \"%2$s\" is niet toegestaan",
"PluginSettingsSaveFailed": "Opslaan van plugin instellingen niet gelukt",
"SendPluginUpdateCommunication": "Stuur een email wanneer een plugin update beschikbaar is.",
"SendPluginUpdateCommunicationHelp": "Een email wordt verstuurd naar de Super User wanneer er een nieuwe versie voor de plugin is.",
- "StableReleases": "Indien Piwik een essentieel onderdeel is van uw zaak, dan raaden wij aan om de laatste stabiele versie te draaien. Indien je de laatste beta gebruikt en je ontdekt bugs of hebt een suggestie, %skijk dan hier%s.",
+ "StableReleases": "Indien Piwik een essentieel onderdeel is van uw zaak, dan raaden wij aan om de laatste stabiele versie te draaien. Indien je de laatste beta gebruikt en je ontdekt bugs of hebt een suggestie, %1$skijk dan hier%2$s.",
"SystemPluginSettings": "Systeem Plugin Instellingen",
"TrackAGoal": "Hou een doel bij.",
"TrackingCode": "Tracking code.",
diff --git a/plugins/CoreAdminHome/lang/nn.json b/plugins/CoreAdminHome/lang/nn.json
index ef834b813310baf06124c8c481b6b1d4ac81a206..2004edfcd053c2318a23a8883e26e9b2d6d699e3 100644
--- a/plugins/CoreAdminHome/lang/nn.json
+++ b/plugins/CoreAdminHome/lang/nn.json
@@ -11,7 +11,7 @@
"OptOutComplete": "Avmelding fullførd. Vitjingane dine til denne nettsida vil ikkje loggførast av nettstatistikkverktøyet.",
"OptOutCompleteBis": "Dersom du slettar infokapslane dine eller byter datamaskin eller nettlesar, må du avmelda deg på nytt.",
"OptOutExplanation": "Piwik er oppteken av personvern på Internett.For å gje vitjarane dine valet om å slå av Piwik Nettstatistikk, kan du leggja til følgjande HTML-kode på ei av sidene dine, til dømes ei side med retningsliner for personvern.",
- "OptOutExplanationBis": "Denne koden vil visa ei flytande råme med ein peikar som vitjarane dine kan klikka på for å melda seg av med ein infokapsel i nettlesaren deira. %s Klikk her%s for å sjå innhaldet som visast i den flytande råma.",
+ "OptOutExplanationBis": "Denne koden vil visa ei flytande råme med ein peikar som vitjarane dine kan klikka på for å melda seg av med ein infokapsel i nettlesaren deira. %1$s Klikk her%2$s for å sjå innhaldet som visast i den flytande råma.",
"OptOutForYourVisitors": "Avmelding av Piwik for vitjarar",
"UseCustomLogo": "Bruk ein tilpassa logo",
"YouAreOptedIn": "Du er påmeldt.",
diff --git a/plugins/CoreAdminHome/lang/pl.json b/plugins/CoreAdminHome/lang/pl.json
index 00b2e7b1f0d7bd95294fc3b519374cb17742479b..06e87d64ddf2c8b850e8beb83ede4814112f4784 100644
--- a/plugins/CoreAdminHome/lang/pl.json
+++ b/plugins/CoreAdminHome/lang/pl.json
@@ -5,9 +5,9 @@
"BrandingSettings": "Ustawienia logo",
"ClickHereToOptIn": "Kliknij tutaj by włączyć analizę.",
"ClickHereToOptOut": "Kliknij tutaj by wyłączyć analizę.",
- "CustomLogoFeedbackInfo": "Jeśli dostosujesz logo Piwik, może będziesz także chciał ukryć %s odnośnik w górnym menu. Aby to zrobić możesz wyłączyć plugin Feedback na stronie %sManage Plugins%s.",
+ "CustomLogoFeedbackInfo": "Jeśli dostosujesz logo Piwik, może będziesz także chciał ukryć %1$s odnośnik w górnym menu. Aby to zrobić możesz wyłączyć plugin Feedback na stronie %2$sManage Plugins%3$s.",
"CustomLogoHelpText": "Można dostosować logo Piwik, które będą wyświetlane w interfejsie użytkownika i w raportach e-mail.",
- "DevelopmentProcess": "Podczas gdy %sproces rozwoju%s składa się z tysięcy testów automatycznych, Beta Testerzy odgrywają kluczową rolę w osiągnięciu \"polityki braku błędów\" w Piwik'u.",
+ "DevelopmentProcess": "Podczas gdy %1$sproces rozwoju%2$s składa się z tysięcy testów automatycznych, Beta Testerzy odgrywają kluczową rolę w osiągnięciu \"polityki braku błędów\" w Piwik'u.",
"EmailServerSettings": "Konfiguracja serwera poczty",
"ForBetaTestersOnly": "Tylko dla beta testerów",
"ImageTracking": "Obrazek ÅšledziÄ…cy",
@@ -22,7 +22,6 @@
"JavaScriptTracking": "Åšledzenie JavaScriptowe",
"JSTracking_CampaignKwdParam": "Parametr SÅ‚owa Kluczowego Kampanii",
"JSTracking_CampaignNameParam": "Nazwa parametru Kampanii",
- "JSTracking_CodeNote": "Upewnij się, że ten kod jest na każdej podstronie Twojej strony przed tagiem %1$s.",
"JSTracking_CustomCampaignQueryParam": "Użyto niestandardowych nazw parametrów dla zapytanie do nazwy kampanii i hasła",
"JSTracking_CustomCampaignQueryParamDesc": "Ważne: %1$sPiwik automatycznie wykryje parametry Google Analystics..%2$s",
"JSTracking_DisableCookies": "Wyłącz wszystkie pliki cookie",
@@ -49,7 +48,7 @@
"FileUploadDisabled": "Przesyłanie plików nie jest włączone w konfiguracji PHP. Aby przesłać własne logo należy ustawić %s w pliku php.ini i ponownie uruchomić serwer WWW.",
"LogoUpload": "Wybierz logo",
"FaviconUpload": "Wybierz Favikonę do wysłania",
- "LogoUploadHelp": "Prześlij plik w formatach %s i o minimalnej wysokości %s pikseli.",
+ "LogoUploadHelp": "Prześlij plik w formatach %1$s i o minimalnej wysokości %2$s pikseli.",
"MenuDiagnostic": "Diagnostyka",
"MenuGeneralSettings": "Konfiguracja ogólna",
"MenuManage": "ZarzÄ…dzaj",
@@ -57,15 +56,15 @@
"OptOutComplete": "Pełna dezaktywacja. Nie będziesz odnotowywany przez narzędzie statystyk i analityki.",
"OptOutCompleteBis": "Prosimy zauważyć, że jeśli usuniesz swoje pliki ciasteczek cookies, zostaną skasowane ciasteczka wyłączające śledzenie, lub jeśli zmienisz komputer czy przeglądarkę, będziesz musiał powtórzyć procedurę wyłączenia analizy statystycznej raz jeszcze.",
"OptOutExplanation": "Statystyki Piwik są zaprojektowane by nie naruszać prywatności w internecie. By zapewnić odwiedzającym możliwość wyboru rezygnacji ze śledzenia przez statystyki Piwik, możesz dodać następującą informację w kodzie HTML na jednej ze swoich stron, na przykład na stronie Polityka prywatności.",
- "OptOutExplanationBis": "Ten kod wyświetli ramkę Iframe zawierającą link dla odwiedzających do wyłączenia śledzenia przez ustawienie ciasteczka cookie dla ich przeglądarek. %s Kliknij tutaj%s, by zapoznać się z treścią wyświetlaną przez ramkę iFrame.",
+ "OptOutExplanationBis": "Ten kod wyświetli ramkę Iframe zawierającą link dla odwiedzających do wyłączenia śledzenia przez ustawienie ciasteczka cookie dla ich przeglądarek. %1$s Kliknij tutaj%2$s, by zapoznać się z treścią wyświetlaną przez ramkę iFrame.",
"OptOutForYourVisitors": "Wyłączenie działania Piwik dla twoich odwiedzających",
"PiwikIsInstalledAt": "Piwik jest zainstalowany w",
- "PluginSettingChangeNotAllowed": "Nie masz uprawnień do zmiany wartości parametru\"%s\" w pluginie \"%s\"",
- "PluginSettingReadNotAllowed": "Nie masz uprawnień do odczytu wartości ustawienia \"%s\" w pluginie \"%s\"",
+ "PluginSettingChangeNotAllowed": "Nie masz uprawnień do zmiany wartości parametru\"%1$s\" w pluginie \"%2$s\"",
+ "PluginSettingReadNotAllowed": "Nie masz uprawnień do odczytu wartości ustawienia \"%1$s\" w pluginie \"%2$s\"",
"PluginSettingsIntro": "Możesz tu zmienić ustawienia dla następujących pluginów innych autorów:",
- "PluginSettingsValueNotAllowed": "Wartość dla pola \"%s\" w pluginie \"%s\" jest niedozwolona",
+ "PluginSettingsValueNotAllowed": "Wartość dla pola \"%1$s\" w pluginie \"%2$s\" jest niedozwolona",
"SendPluginUpdateCommunicationHelp": "Email zostanie wysłany do Super Użytkowników gdy pojawi się nowa wersja pluginu.",
- "StableReleases": "Jeśli Piwik jest ważną częścią firmy , zalecamy użycie najnowszej stabilnej wersji. Jeśli używasz najnowszej wersji beta i znajdziesz błąd lub masz sugestię , prosimy %szobacz tutaj%s .",
+ "StableReleases": "Jeśli Piwik jest ważną częścią firmy , zalecamy użycie najnowszej stabilnej wersji. Jeśli używasz najnowszej wersji beta i znajdziesz błąd lub masz sugestię , prosimy %1$szobacz tutaj%2$s.",
"TrackAGoal": "Śledź cel",
"TrackingCode": "Kod śledzenia",
"TrustedHostConfirm": "Czy na pewno chcesz zmienić zaufaną nazwę hosta Piwik?",
diff --git a/plugins/CoreAdminHome/lang/pt-br.json b/plugins/CoreAdminHome/lang/pt-br.json
index 5547265a7c6090a82b324e3de14541687bee07ef..c28980c099c688bf70e158094a1e8c418ebbfb1c 100644
--- a/plugins/CoreAdminHome/lang/pt-br.json
+++ b/plugins/CoreAdminHome/lang/pt-br.json
@@ -7,9 +7,9 @@
"ReleaseChannel": "Canal de liberação",
"ClickHereToOptIn": "Clique aqui para aceitar",
"ClickHereToOptOut": "Clique aqui para optar por sair.",
- "CustomLogoFeedbackInfo": "Se você personalizar o logotipo Piwik, você também pode estar interessado em esconder o link %s no menu superior. Para fazer isso, você pode desabilitar o plug-in Comentários na %spágina de Plugins%s.",
+ "CustomLogoFeedbackInfo": "Se você personalizar o logotipo Piwik, você também pode estar interessado em esconder a ligação %1$s no menu superior. Para fazer isso, você pode desabilitar o plug-in Comentários na página de Plugins %2$sManage%3$s.",
"CustomLogoHelpText": "Você pode personalizar o logo que o Piwik exibe na interface do sistema e nos relatórios enviados por e-mail.",
- "DevelopmentProcess": "Enquanto o nosso %sprocesso de desenvolvimento%s inclui milhares de testes automatizados, Os Beta Testers desempenham um papel fundamental na realização da polÃtica de \"Nenhum bug\" no Piwik.",
+ "DevelopmentProcess": "Enquanto o nosso %1$sprocesso de desenvolvimento%2$s inclui milhares de testes automatizados, Os Beta Testers desempenham um papel fundamental na realização da polÃtica de \"Nenhum bug\" no Piwik.",
"EmailServerSettings": "Configurações do servidor de e-mail",
"ForBetaTestersOnly": "Somente para testadores beta",
"ImageTracking": "Rastreamento por imagem",
@@ -24,7 +24,7 @@
"JavaScriptTracking": "Rastreamento de JavaScript",
"JSTracking_CampaignKwdParam": "Parâmetro de Palavra-Chave da campanha",
"JSTracking_CampaignNameParam": "Parâmetro Nome da Campanha",
- "JSTracking_CodeNote": "Certifique-se de que este código estará em todas as páginas do seu website antes da tag %1$s.",
+ "JSTracking_CodeNoteBeforeClosingHead": "Certifique-se de que este código está em cada página do seu site. Recomendamos colá-lo imediatamente antes de fechar a tag %1$s .",
"JSTracking_CustomCampaignQueryParam": "Utilizar nomes de parâmetros de consultas personalizados para o nome da campanha e a palavra-chave.",
"JSTracking_CustomCampaignQueryParamDesc": "Nota: %1$sPiwik irá detectar automaticamente os parâmetros do Google Analytics.%2$s",
"JSTracking_DisableCookies": "Desabilitar todos os cookies de rastreamento",
@@ -49,9 +49,10 @@
"JSTrackingIntro5": "Se você deseja mais do que apenas monitorar exibições de página, porfavor verifique a %1$sdocumentação do rastreamento por javascript do Piwik%2$s para uma lista de funcões disponÃveis. Usando essas funções você pode acompanhar objetivos, variáveis ​​personalizadas, ordens de comércio eletrônico, compras abandonadas e muito mais.",
"LogoNotWriteableInstruction": "Para usar um logotipo cutomizado ao invés do logo padrão Piwiki, dê permissão de escrita para esse diretório: %1$s Piwiki precisa de acesso de escrita para seus logotipos armazenados no arquivo %2$s.",
"FileUploadDisabled": "O carregamento de arquivos não está habilitado na sua configuração do PHP. Para carregar uma logomarca customizada defina %s no php.ini e reinicie seu servidor web.",
+ "LogoUploadFailed": "O arquivo enviado não pôde ser processado. Por favor, verifique se o arquivo tem um formato válido.",
"LogoUpload": "Selecione um logotipo para carregar",
"FaviconUpload": "Selecione um Favicon para carregar",
- "LogoUploadHelp": "Por favor carregue um arquivo nos formatos %s com uma altura mÃnima de %s pixels.",
+ "LogoUploadHelp": "Por favor faça o upload de um arquivo nos formatos %1$s com uma altura mÃnima de %2$s pixels.",
"MenuDiagnostic": "Diagnostico",
"MenuGeneralSettings": "Configurações Gerais",
"MenuManage": "Gerenciar",
@@ -60,19 +61,19 @@
"OptOutCompleteBis": "Note que se você limpar os cookies, excluir o cookie de opt-out, ou se mudar de computador ou navegadores da Web, você vai precisar realizar o procedimento opt-out novamente.",
"OptOutDntFound": "Você não está sendo monitorado desde que o seu navegador está informando que você não quer isso. Essa é uma configuração do seu navegador portanto você não será capaz de aceitar ser rastreado até que você desative o recurso \"Do Not Track\".",
"OptOutExplanation": "Piwik é dedicado a fornecer a privacidade na Internet. Para fornecer a seus visitantes a escolha de opting-out de Piwik Web Analytics, você pode adicionar o seguinte código HTML em uma página do seu site, por exemplo, em uma página de PolÃtica de Privacidade.",
- "OptOutExplanationBis": "Este código irá exibir um iframe contendo um link para os seus visitantes optarem por definir um cookie em seus navegadores para não utilizar o Piwik. %sClique aqui%s para visualizar o conteúdo que será exibido pelo iFrame.",
+ "OptOutExplanationBis": "Este código irá exibir um iframe contendo um link para os seus visitantes optarem por definir um cookie em seus navegadores para não utilizar o Piwik. %1$sClique aqui%2$s para visualizar o conteúdo que será exibido pelo iFrame.",
"OptOutForYourVisitors": "Piwik opt-out para os seus visitantes",
"PiwikIsInstalledAt": "Piwik esta instalado no",
"PersonalPluginSettings": "Configurações pessoais do plugin",
- "PluginSettingChangeNotAllowed": "Você não tem permissão para alterar o valor da configuração \"%s\" no plug-in \"%s\"",
- "PluginSettingReadNotAllowed": "Você não tem permissão para ler o valor da configuração \"%s\" no plug-in \"%s\"",
+ "PluginSettingChangeNotAllowed": "Você não tem permissão para alterar o valor da configuração \"%1$s\" no plug-in \"%2$s\"",
+ "PluginSettingReadNotAllowed": "Você não tem permissão para ler o valor da configuração \"%1$s\" no plug-in \"%2$s\"",
"PluginSettings": "Configurações do plugin",
"PluginSettingsIntro": "Aqui você pode alterar as configurações dos seguintes plugins de terceiros:",
- "PluginSettingsValueNotAllowed": "O valor para o campo \"%s\" no plug-in \"%s\" não é permitido",
+ "PluginSettingsValueNotAllowed": "O valor para o campo \"%1$s\" no plugin \"%2$s\" inão é permitido",
"PluginSettingsSaveFailed": "Falhou ao salvar as configurações do plugin",
"SendPluginUpdateCommunication": "Envie um e-mail quando uma atualização de plugin estiver disponÃvel",
"SendPluginUpdateCommunicationHelp": "Um e-mail será enviado para os Super Usuários quando houver uma nova versão disponÃvel para um plugin.",
- "StableReleases": "Se Piwik é uma parte crÃtica do seu negócio, recomendamos que você use a última versão estável. Se você usar a versão beta mais recente e você encontrar um erro ou tem uma sugestão, por favor, %sveja aqui%s.",
+ "StableReleases": "Se o Piwik é uma parte crÃtica do seu negócio, recomendamos que você use a última versão estável. Se você usar a versão beta mais recente e encontrar uma falha ou tiver alguma sugestão, por favor, %1$sveja aqui%2$s.",
"LtsReleases": "Versões LTS (Long Term Support - Suporte de Longo Prazo) recebe apenas correções de bugs e segurança.",
"SystemPluginSettings": "Configurações de Plugin do Sistema",
"TrackAGoal": "Monitorar uma meta",
@@ -89,6 +90,6 @@
"YouMayOptOutBis": "Para fazer essa escolha, clique abaixo para receber um cookie de opt-out.",
"OptingYouOut": "Optando por sair, por favor aguarde ...",
"ProtocolNotDetectedCorrectly": "Você está visualizando o Piwik atualmente através de uma conexão SSL segura (utilizando https), mas o Piwik só pode detectar uma conexão não segura no servidor.",
- "ProtocolNotDetectedCorrectlySolution": "Para certificar-se que o Piwik solicita e serve o seu conteúdo de forma segura através de HTTPS, você pode editar seu arquivo %s e configurar as configurações de proxy; ou, você pode adicionar a linha %s abaixo da seção %s. %sSaiba mais%s"
+ "ProtocolNotDetectedCorrectlySolution": "Para certificar-se que o Piwik solicita e serve o seu conteúdo de forma segura através de HTTPS, você pode editar o seu %1$s arquivo, assim como configurar o proxy, ou você pode adicionar a linha %2$s abaixo da %3$s seção. %4$sSaiba mais%5$s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/pt.json b/plugins/CoreAdminHome/lang/pt.json
index b20f612246ad3e44d3e302392443b91b233daf78..cecdc2c9428d3db543e92dd213aa13bcbe4c3c86 100644
--- a/plugins/CoreAdminHome/lang/pt.json
+++ b/plugins/CoreAdminHome/lang/pt.json
@@ -14,7 +14,6 @@
"InvalidPluginsWarning": "Os seguintes plugins não são compatÃveis com %1$s e não puderam ser carregados: %2$s.",
"JavaScriptTracking": "Monitorização por JavaScript",
"JSTracking_CampaignKwdParam": "Parâmetro da Palavra Chave da Campanha",
- "JSTracking_CodeNote": "Certifique-se que este código se encontra em todas as páginas do seu sÃtio de internet antes da etiqueta %1$s.",
"JSTracking_DisableCookies": "Desabilitar todos os cookies de rastreio.",
"JSTracking_EnableDoNotTrack": "Ativar deteção NãoSeguir do lado do cliente",
"JSTracking_MergeSubdomains": "Seguir visitantes através todos os subdomÃnios de",
@@ -32,16 +31,16 @@
"OptOutComplete": "Opt-out completo; as suas visitas a este site não serão gravadas pela ferramenta de Web Analytics.",
"OptOutCompleteBis": "Note que se você apagar os cookies, apagar o cookie de opt-out, ou se você mudar de computador ou navegadores Web, vai precisar de realizar o procedimento de opt-out novamente.",
"OptOutExplanation": "O Piwik é dedicado a fornecer privacidade na Internet. Para apresentar aos seus visitantes a escolha de opting-out da Web Analytics Piwik, você pode adicionar o seguinte código HTML em uma das páginas do seu site, por exemplo, numa página de PolÃtica de Privacidade.",
- "OptOutExplanationBis": "Este código irá exibir um iFrame contendo um link para que seus visitantes possam fazer opt-out do Piwik definindo um cookie de opt-out nos navegadores do utilizador. %s Clique aqui%s para ver o conteúdo que será exibido pelo iFrame.",
+ "OptOutExplanationBis": "Este código irá exibir um iFrame contendo um link para que seus visitantes possam fazer opt-out do Piwik definindo um cookie de opt-out nos navegadores do utilizador. %1$s Clique aqui%2$s para ver o conteúdo que será exibido pelo iFrame.",
"OptOutForYourVisitors": "opt-out do Piwik para os seus visitantes",
"PiwikIsInstalledAt": "Piwik encontra-se instalado em",
- "PluginSettingChangeNotAllowed": "Não lhe é permitido alterar o valor da definição \"%s\" no plugin \"%s\"",
- "PluginSettingReadNotAllowed": "Não lhe é permitido ler o valor da definição \"%s\" no plugin \"%s\"",
+ "PluginSettingChangeNotAllowed": "Não lhe é permitido alterar o valor da definição \"%1$s\" no plugin \"%2$s\"",
+ "PluginSettingReadNotAllowed": "Não lhe é permitido ler o valor da definição \"%1$s\" no plugin \"%2$s\"",
"PluginSettingsIntro": "Aqui pode alterar as definições dos seguintes plugins de terceiros:",
- "PluginSettingsValueNotAllowed": "O valor para o campo \"%s\" no plugin \"%s\" não é permitido",
+ "PluginSettingsValueNotAllowed": "O valor para o campo \"%1$s\" no plugin \"%2$s\" não é permitido",
"SendPluginUpdateCommunication": "Enviar um email quando uma actualização ao plugin estiver disponÃvel",
"SendPluginUpdateCommunicationHelp": "Será enviado um email para os Super Utilizadores quando existir uma nova versão disponÃvel para um plugin.",
- "StableReleases": "Se o Piwik é uma parte crÃtica do seu negócio, recomendamos que utilize a versão estável mais recente. Se você usa a mais recente versão beta e julga que encontrou um erro ou possui uma sugestão, por favor %sveja aqui%s.",
+ "StableReleases": "Se o Piwik é uma parte crÃtica do seu negócio, recomendamos que utilize a versão estável mais recente. Se você usa a mais recente versão beta e julga que encontrou um erro ou possui uma sugestão, por favor %1$sveja aqui%2$s.",
"TrackAGoal": "Monitorize um objectivo",
"TrackingCode": "Código de monitorização",
"UpdateSettings": "Actualizar definições",
diff --git a/plugins/CoreAdminHome/lang/ro.json b/plugins/CoreAdminHome/lang/ro.json
index cf44b37e515aeda6cb93b3dec643b9dfb084cb86..a31494c3f030e95859fdb519c8e12cf77dbce3cb 100644
--- a/plugins/CoreAdminHome/lang/ro.json
+++ b/plugins/CoreAdminHome/lang/ro.json
@@ -5,9 +5,9 @@
"BrandingSettings": "Setări branding",
"ClickHereToOptIn": "Apasa aici pentru a te abona.",
"ClickHereToOptOut": "Apasa aici pentru a te dezabona.",
- "CustomLogoFeedbackInfo": "Daca customizezi logo-ul Piwik, ai putea fi interesat sa ascunzi linkul %s in meniul de sus. Pentru a face asta, poti dezactiva pluginul Feedback pe pagina %sManage Plugins%s.",
+ "CustomLogoFeedbackInfo": "Daca customizezi logo-ul Piwik, ai putea fi interesat sa ascunzi linkul %1$s in meniul de sus. Pentru a face asta, poti dezactiva pluginul Feedback pe pagina %2$sManage Plugins%3$s.",
"CustomLogoHelpText": "Poţi personaliza logoul Piwik care va fi afişat în interfaţa de utilizator şi în rapoartele email.",
- "DevelopmentProcess": "In timp ce %sprocesul de dezvoltare%s include mii de teste automate, Testerii Beta au un rol esential in a-si insusi \"No bug policy\" in Piwik.",
+ "DevelopmentProcess": "In timp ce %1$sprocesul de dezvoltare%2$s include mii de teste automate, Testerii Beta au un rol esential in a-si insusi \"No bug policy\" in Piwik.",
"EmailServerSettings": "Setările serverului email",
"ForBetaTestersOnly": "Numai pentru beta-testeri",
"ImageTracking": "Urmărire prin imagine",
@@ -22,7 +22,6 @@
"JavaScriptTracking": "Urmărire prin JavaScript",
"JSTracking_CampaignKwdParam": "Parametru Campanie Cuvânt Cheie",
"JSTracking_CampaignNameParam": "Parametrul Nume Campanie (Campaign Name)",
- "JSTracking_CodeNote": "Asigura-te ca acest cod este pe fiecare pagina a siteului tau inainte de tagul %1$s.",
"JSTracking_CustomCampaignQueryParam": "Foloseste nume customizate pentru parametrii de cautare, pentru numele campaniei & cuvant.",
"JSTracking_CustomCampaignQueryParamDesc": "Notă: %1$sPiwik va detecta automat parametrii Google Analytics.%2$s",
"JSTracking_EnableDoNotTrack": "Activeaza detectia DoNotTrack pentru vizitatori (client side).",
@@ -46,22 +45,22 @@
"LogoNotWriteableInstruction": "Pentru a folosi logo-ul tau custom in loc de logo-ul default Piwik, trebuie sa pui permisiuni de scriere pe acest director. %1$s Piwik are nevoie de drept de scriere pentru logo-urile tale salvate in fisiere %2$s.",
"LogoUpload": "Alege logo-ul pentru încărcare",
"FaviconUpload": "Alege un favicon pentru a fi încărcat",
- "LogoUploadHelp": "Te rugam sa incarci un fisier cu formaturile %s, cu o inaltime minima de %s pixeli.",
+ "LogoUploadHelp": "Te rugam sa incarci un fisier cu formaturile %1$s, cu o inaltime minima de %2$s pixeli.",
"MenuDiagnostic": "Diagnosticare",
"MenuGeneralSettings": "Setări generale",
"MenuManage": "Administrare",
"OptOutComplete": "Dezabonare completa; vizitele tale pe acest site nu vor fi contorizate de tool-ul de Web Analytics.",
"OptOutCompleteBis": "Aminteste-ti ca daca dai clear la cookie-uri, stergi cookie-ul de dezabonare sau daca schimbi calculatoarele sau browserele web, tot vei fi nevoit sa te dezabonezi iarasi.",
"OptOutExplanation": "Piwik este dedicat sa furnizeze intimitate\/privacy pe Internet. Pentru a lasa vizitatorilor tai optiunea de dezabonare de la Piwik Web Analytics, poti adauga urmatorul cod HTML pe una dintre paginile siteului tau, de exemplu pe pagina de Privacy Policy.",
- "OptOutExplanationBis": "Acest cod va afisa un Iframe ce va contine un link pentru ca vizitatorii tai sa se poata dezabona de la Piwik setand un cookie de dezabonare in browserele lor. %s Click aici%s pentru a vedea continutul care va fi afisat de iFrame.",
+ "OptOutExplanationBis": "Acest cod va afisa un Iframe ce va contine un link pentru ca vizitatorii tai sa se poata dezabona de la Piwik setand un cookie de dezabonare in browserele lor. %1$s Click aici%2$s pentru a vedea continutul care va fi afisat de iFrame.",
"OptOutForYourVisitors": "Dezabonare Piwik pentru vizitatorii tai",
"PiwikIsInstalledAt": "Piwik este instalat în",
- "PluginSettingChangeNotAllowed": "Nu iti este permis sa schimbi valoarea setarii \"%s\" in plugin \"%s\"",
- "PluginSettingReadNotAllowed": "Nu se poate citi valoare setării \"%s\" din modulul \"%s\"",
+ "PluginSettingChangeNotAllowed": "Nu iti este permis sa schimbi valoarea setarii \"%1$s\" in plugin \"%2$s\"",
+ "PluginSettingReadNotAllowed": "Nu se poate citi valoare setării \"%1$s\" din modulul \"%2$s\"",
"PluginSettingsIntro": "Aici poti schimba setarile pentru urmatoarele pluginuri terte (3rd party):",
- "PluginSettingsValueNotAllowed": "Valoarea pentru campul \"%s\" in plugin \"%s\" nu este permisa",
+ "PluginSettingsValueNotAllowed": "Valoarea pentru campul \"%1$s\" in plugin \"%2$s\" nu este permisa",
"SendPluginUpdateCommunicationHelp": "Va fi trimis un email catre Super Users cand va fi o noua versiune disponibila pentru un plugin.",
- "StableReleases": "Daca Piwik este un aspect foarte important al afacerii tale, noi recomandam sa folosesti ultima versiune stabila. Daca folosesti ultima versiune beta si gasesti un bug sau ai o sugestie, te rugam %suita-te aici%s.",
+ "StableReleases": "Daca Piwik este un aspect foarte important al afacerii tale, noi recomandam sa folosesti ultima versiune stabila. Daca folosesti ultima versiune beta si gasesti un bug sau ai o sugestie, te rugam %1$suita-te aici%2$s.",
"TrackAGoal": "Urmăreşte o ţintă",
"TrackingCode": "Codul de urmărire",
"TrustedHostConfirm": "Eşti sigur că doreşti să schimbi numele hostului de încredere Piwik_",
diff --git a/plugins/CoreAdminHome/lang/ru.json b/plugins/CoreAdminHome/lang/ru.json
index 83aaa6059adfa7f031a534cd9dd6348d95020bbd..92b61015dc20d4de7d38e6e5a518e42d3a602b85 100644
--- a/plugins/CoreAdminHome/lang/ru.json
+++ b/plugins/CoreAdminHome/lang/ru.json
@@ -5,9 +5,9 @@
"BrandingSettings": "ÐаÑтройки логотипа",
"ClickHereToOptIn": "Кликните, чтобы вы учитывалиÑÑŒ в аналитике.",
"ClickHereToOptOut": "Кликните, чтобы отказатьÑÑ Ð¾Ñ‚ учета Ð²Ð°Ñ Ð² аналитике.",
- "CustomLogoFeedbackInfo": "ЕÑли вы иÑпользуйете Ñвой логотип, вам, возможно, также понадобитÑÑ Ñкрыть ÑÑылку %s в верхнем меню. Ð”Ð»Ñ Ñтого проÑто отключите плагин Feedback (Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð°Ñ ÑвÑзь) на Ñтранице %sУправление плагинами%s.",
+ "CustomLogoFeedbackInfo": "ЕÑли вы иÑпользуйете Ñвой логотип, вам, возможно, также понадобитÑÑ Ñкрыть ÑÑылку %1$s в верхнем меню. Ð”Ð»Ñ Ñтого проÑто отключите плагин Feedback (Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð°Ñ ÑвÑзь) на Ñтранице %2$sУправление плагинами%3$s.",
"CustomLogoHelpText": "Ð’Ñ‹ можете добавить Ñвой логотип, который будет отображатьÑÑ Ð¾Ñ‚Ñ‡ÐµÑ‚Ð°Ñ….",
- "DevelopmentProcess": "Ð’ то Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº наш %sпроцеÑÑ Ñ€Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸%s включает в ÑÐµÐ±Ñ Ñ‚Ñ‹ÑÑчи автоматизированных теÑтов, бета-теÑтеры играют ключевую роль в доÑтижении \"No bug policy\" в Piwik.",
+ "DevelopmentProcess": "Ð’ то Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº наш %1$sпроцеÑÑ Ñ€Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸%2$s включает в ÑÐµÐ±Ñ Ñ‚Ñ‹ÑÑчи автоматизированных теÑтов, бета-теÑтеры играют ключевую роль в доÑтижении \"No bug policy\" в Piwik.",
"EmailServerSettings": "ÐаÑтройки Ñервера Ñлектронной почты",
"ForBetaTestersOnly": "Только Ð´Ð»Ñ Ð±ÐµÑ‚Ð°-теÑтеров",
"ImageTracking": "ОтÑлеживание через изображение",
@@ -20,7 +20,6 @@
"InvalidPluginsWarning": "Следующие плагины не ÑовмеÑтимы Ñ %1$s и не могут быть загружены: %2$s.",
"InvalidPluginsYouCanUninstall": "Ð’Ñ‹ можете обновить или удалить Ñти плагины на Ñтранице %1$sÐ£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð°Ð¼Ð¸%2$s.",
"JavaScriptTracking": "JavaScript-отÑлеживание",
- "JSTracking_CodeNote": "УдоÑтоверьтеÑÑŒ, что Ñтот код ÑодержитÑÑ Ð½Ð° каждой Ñтранице вашего Ñайта перед тегом %1$s.",
"JSTracking_CustomCampaignQueryParam": "ИÑпользовать пользовательÑкие имена параметров в запроÑе Ð´Ð»Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ ÐºÐ°Ð¼Ð¿Ð°Ð½Ð¸Ð¸ и ключевого Ñлова",
"JSTracking_CustomCampaignQueryParamDesc": "Примечание: %1$sPiwik автоматичеÑки определит параметры Google Analytics.%2$s",
"JSTracking_DisableCookies": "Отключить вÑе отÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ cookies",
@@ -47,7 +46,7 @@
"FileUploadDisabled": "Загрузка файлов не включена в вашей конфигурации PHP. Ð”Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ другого логотипа выÑтавите %s в php.ini и перезапуÑтите веб-Ñервер.",
"LogoUpload": "Выберите лого Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸",
"FaviconUpload": "Выбрать Favicon Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸",
- "LogoUploadHelp": "ПожалуйÑта, закачивайте файлы в %s форматах, минимальное ограничение по выÑоте – %s пикÑелей.",
+ "LogoUploadHelp": "ПожалуйÑта, закачивайте файлы в %1$s форматах, минимальное ограничение по выÑоте – %2$s пикÑелей.",
"MenuDiagnostic": "ДиагноÑтика",
"MenuGeneralSettings": "ОÑновные наÑтройки",
"MenuManage": "Управление",
@@ -55,19 +54,19 @@
"OptOutComplete": "ИÑключение из политики конфиденциальноÑти завершено; ваши поÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð½Ð° данный Ñайт не будут учитыватьÑÑ ÑиÑтемой веб аналитики. Мы уважаем ваш выбор.",
"OptOutCompleteBis": "Заметьте, что еÑли вы очиÑтите cookies браузера, то, Ñкорее вÑего, удалитÑÑ Ð¸ иÑключительный cookie, или еÑли вы поменÑете компьютер или браузер, то необходимо будет пройти процедуру иÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñнова.",
"OptOutExplanation": "Piwik – за Ñохранение личных данных в Ñети. ПоÑтому Ð´Ð°Ð½Ð½Ð°Ñ ÑиÑтема может предложить вашим пользователÑм выбор иÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð· политики конфиденциальноÑти (отказ от дальнейшего Ñбора ÑтатиÑтики о пользователе). Ð’Ñ‹ можете вÑтавить Ñледующий HTML-код на одну из ваших Ñтраниц Ñайта, например на Ñтраницу о гарантиÑÑ… конфиденциальноÑти.",
- "OptOutExplanationBis": "Ðтот код будет отображатьÑÑ Ð² iFrame, Ñодержащем ÑÑылку Ð´Ð»Ñ Ð¿Ð¾ÑÐµÑ‚Ð¸Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ°Ð·Ð° о Ñборе данных о нем. Данные отказа хранÑÑ‚ÑÑ Ð½Ð° Ñтороне поÑетителÑ, в его cookies браузера. %s Ðажмите здеÑÑŒ%s Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра Ñодержимого iFrame.",
+ "OptOutExplanationBis": "Тег покаже \"iframe\", в Ñкому міÑтитиметьÑÑ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… відвідувачів, клацнувши на Ñке, вони зможуть відмовитиÑÑ Ð²Ñ–Ð´ потраплÑÐ½Ð½Ñ Ð² веб-аналітику через Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾Ð³Ð¾ файлу cookie. %1$s Клацніть тут%2$s, щоб переглÑнути вміÑÑ‚ що буде показано в \"iframe\".",
"OptOutForYourVisitors": "ИÑключение из политики конфиденциальноÑти Piwik Ð´Ð»Ñ Ð¿Ð¾Ñетителей",
"PiwikIsInstalledAt": "Piwik уÑтановлен в",
"PersonalPluginSettings": "ПерÑональные наÑтройки плагинов",
- "PluginSettingChangeNotAllowed": "Вам не разрешено менÑÑ‚ÑŒ значение \"%s\" Ð´Ð»Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° \"%s\"",
- "PluginSettingReadNotAllowed": "Вам не разрешено читать значение \"%s\" плагина \"%s\"",
+ "PluginSettingChangeNotAllowed": "Вам не разрешено менÑÑ‚ÑŒ значение \"%1$s\" Ð´Ð»Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° \"%2$s\"",
+ "PluginSettingReadNotAllowed": "Вам не разрешено читать значение \"%1$s\" плагина \"%2$s\"",
"PluginSettings": "ÐаÑтройки плагинов",
"PluginSettingsIntro": "ЗдеÑÑŒ вы можете изменить наÑтройки Ð´Ð»Ñ Ñледующих плагинов:",
- "PluginSettingsValueNotAllowed": "Значение Ð´Ð»Ñ Ð¿Ð¾Ð»Ñ \"%s\" в плагине \"%s\" не разрешено",
+ "PluginSettingsValueNotAllowed": "Значение Ð´Ð»Ñ Ð¿Ð¾Ð»Ñ \"%1$s\" в плагине \"%2$s\" не разрешено",
"PluginSettingsSaveFailed": "Ошибка при Ñохранении наÑтроек плагина",
"SendPluginUpdateCommunication": "Отправить email Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸ÐµÐ¼, когда Ð´Ð»Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° будет доÑтупна Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑиÑ",
"SendPluginUpdateCommunicationHelp": "ПиÑьмо будет отправлено Ñуперпользователю когда будет доÑтупна Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð°.",
- "StableReleases": "ЕÑли Piwik ÑвлÑетÑÑ Ð²Ð°Ð¶Ð½Ð¾Ð¹ чаÑтью вашего бизнеÑа, мы рекомендуем иÑпользовать поÑледнюю Ñтабильную верÑию. ЕÑли вы иÑпользуете поÑледнюю бета верÑию, и вы нашли ошибку или еÑÑ‚ÑŒ предложение, пожалуйÑта, %sперейдите по ÑÑылке%s.",
+ "StableReleases": "ЕÑли Piwik ÑвлÑетÑÑ Ð²Ð°Ð¶Ð½Ð¾Ð¹ чаÑтью вашего бизнеÑа, мы рекомендуем иÑпользовать поÑледнюю Ñтабильную верÑию. ЕÑли вы иÑпользуете поÑледнюю бета верÑию, и вы нашли ошибку или еÑÑ‚ÑŒ предложение, пожалуйÑта, %1$sперейдите по ÑÑылке%2$s.",
"SystemPluginSettings": "СиÑтемные наÑтройки плагинов",
"TrackAGoal": "ОтÑлеживать цель",
"TrackingCode": "Код отÑлеживаниÑ",
diff --git a/plugins/CoreAdminHome/lang/sl.json b/plugins/CoreAdminHome/lang/sl.json
index 70a67db34c1e2d8e78797006906b67507da507dd..d86427544021afe8f99afedb55a5e2ae11f75f2e 100644
--- a/plugins/CoreAdminHome/lang/sl.json
+++ b/plugins/CoreAdminHome/lang/sl.json
@@ -6,9 +6,9 @@
"BrandingSettings": "Nastavitve znamke",
"ClickHereToOptIn": "Kliknite tukaj za prijavo",
"ClickHereToOptOut": "Kliknite tukaj, Äe se želite odjaviti",
- "CustomLogoFeedbackInfo": "ÄŒe želite prilagoditi Piwik logo, bi morda želeli tudi skriti povezavo %s v vrhnjem meniju. To lahko storite tako, da onemogoÄite vtiÄnik Feedback na strani %sUpravljanje vtiÄnikov%s.",
+ "CustomLogoFeedbackInfo": "ÄŒe želite prilagoditi Piwik logo, bi morda želeli tudi skriti povezavo %1$s v vrhnjem meniju. To lahko storite tako, da onemogoÄite vtiÄnik Feedback na strani %2$sUpravljanje vtiÄnikov%3$s.",
"CustomLogoHelpText": "Piwik-ov logo lahko prilagodite po vaÅ¡ih željah. Spremembe bodo vidne tako v uporabniÅ¡kem vmesniku, kot v email poroÄilih.",
- "DevelopmentProcess": "ÄŒeprav naÅ¡ %srazvojni proces%s vkljuÄuje na tisoÄe avtomatiziranih testov, imajo Beta testerji kljuÄno vlogo pri zagotavljanju \"No bug\" politike Piwika.",
+ "DevelopmentProcess": "ÄŒeprav naÅ¡ %1$srazvojni proces%2$s vkljuÄuje na tisoÄe avtomatiziranih testov, imajo Beta testerji kljuÄno vlogo pri zagotavljanju \"No bug\" politike Piwika.",
"EmailServerSettings": "Nastavitev strežnika za email",
"ForBetaTestersOnly": "Samo za Beta testerje",
"ImageTracking": "Sledenje s pomoÄjo slike",
diff --git a/plugins/CoreAdminHome/lang/sq.json b/plugins/CoreAdminHome/lang/sq.json
index 2e5f3bae8af8fa83be25fe28e0ede43c060c9ff7..33bf6ac6511997200a0a5a25ea1368c7a4ac50f1 100644
--- a/plugins/CoreAdminHome/lang/sq.json
+++ b/plugins/CoreAdminHome/lang/sq.json
@@ -4,7 +4,7 @@
"BrandingSettings": "Rregullime marke",
"ClickHereToOptIn": "Klikoni këtu për të kryer \"opt in\"",
"ClickHereToOptOut": "Klikoni këtu për të kryer \"opt out\"",
- "CustomLogoFeedbackInfo": "Nëse e përshtatni logon e Piwik-ut, mund t’ju interesonte edhe fshehja lidhjes %s te menuja në krye. Për ta bërë këtë, mund të çaktivizoni shtojcën e Përshtypjeve te faqja e %sAdministrimit të Shtojcëve%s.",
+ "CustomLogoFeedbackInfo": "Nëse e përshtatni logon e Piwik-ut, mund t’ju interesonte edhe fshehja lidhjes %1$s te menuja në krye. Për ta bërë këtë, mund të çaktivizoni shtojcën e Përshtypjeve te faqja e %2$sAdministrimit të Shtojcëve%3$s.",
"CustomLogoHelpText": "Logon e Piwik-ut, që do të shfaqet në ndërfaqen e përdoruesit dhe raportet email.",
"EmailServerSettings": "Rregullime shërbyesi email",
"LogoUpload": "Përzgjidhni një Logo për ta ngarkuar",
@@ -14,7 +14,7 @@
"OptOutComplete": "\"Opt-out\" u plotësua; vizitat tuaja në këtë \"site\" web nuk do të regjistrohen nga mjeti Analiza Web.",
"OptOutCompleteBis": "Mbani parasysh që nëse i hiqni \"cookie\"-t tuaja, fshini \"cookie\"-in për \"opt-out\", ose ndërroni kompjuter apo shfletues Web, do t'ju duhet të kryeni sërish procedurën për \"opt-out\".",
"OptOutExplanation": "Piwik-u është i përkushtuar ndaj mundësimit të vetësisë në Internet. Për t'u dhënë mundësinë e zgjedhjes së \"opt-out\" te Analizat Web Piwik, mund të shtoni kodin HTML vijues te një nga faqet e site-it tuaj web, për shembull te faqja e Rregullave të Vetësisë.",
- "OptOutExplanationBis": "Ky kod do të shfaqë një Iframe që përmban një lidhje me të cilën vizitorët të mund të zgjedhin \"opt-out\" për Piwik-un, duke depozituar një \"opt-out cookie\" në shfletuesin e tyre. %s Klikoni këtu%s që të shihni lëndën që do të shfaqet nga iFrame-i.",
+ "OptOutExplanationBis": "Ky kod do të shfaqë një Iframe që përmban një lidhje me të cilën vizitorët të mund të zgjedhin \"opt-out\" për Piwik-un, duke depozituar një \"opt-out cookie\" në shfletuesin e tyre. %1$s Klikoni këtu%2$s që të shihni lëndën që do të shfaqet nga iFrame-i.",
"OptOutForYourVisitors": "\"Opt-out\" i Piwik-ut për vizitorët tuaj",
"PiwikIsInstalledAt": "Piwik-u është instaluar te",
"TrustedHostConfirm": "Jeni i sigurt se doni të ndryshoni emërstrehën e besuar të Piwik-ut?",
diff --git a/plugins/CoreAdminHome/lang/sr.json b/plugins/CoreAdminHome/lang/sr.json
index e2a8cccc0fa854c8cb04a79266c59ad6d93c1987..f5707fff06204d6c629962ba6a21d4c0417d8c67 100644
--- a/plugins/CoreAdminHome/lang/sr.json
+++ b/plugins/CoreAdminHome/lang/sr.json
@@ -6,9 +6,9 @@
"BrandingSettings": "Podešavanje brendiranja",
"ClickHereToOptIn": "Kliknite za ukljuÄenje.",
"ClickHereToOptOut": "Kliknite za izuzeće.",
- "CustomLogoFeedbackInfo": "Ako podesite Piwik logo, možda biste bili zainteresovani da sakrijete %s link iz glavnog menija. Da to uradite, možete iskljuÄiti Feedback plugin iz %sOrganizuj Plugin-ove%s.",
+ "CustomLogoFeedbackInfo": "Ako podesite Piwik logo, možda biste bili zainteresovani da sakrijete %1$s link iz glavnog menija. Da to uradite, možete iskljuÄiti Feedback plugin iz %2$sOrganizuj Plugin-ove%3$s.",
"CustomLogoHelpText": "Možete podesiti Piwik logo koji će biti prikazan u korisniÄkom interfejsu i E-Mail izveÅ¡tajima.",
- "DevelopmentProcess": "Iako se naÅ¡ %srazvojni proces%s zasniva na preko hiljadu automatskih testova, beta testeri igraju kljuÄnu ulogu u postizanju \"Politike bez bagova\"",
+ "DevelopmentProcess": "Iako se naÅ¡ %1$srazvojni proces%2$s zasniva na preko hiljadu automatskih testova, beta testeri igraju kljuÄnu ulogu u postizanju \"Politike bez bagova\"",
"EmailServerSettings": "Podešavanje servera za elektronsku poštu",
"ForBetaTestersOnly": "Samo za beta testere",
"ImageTracking": "Praćenje pomoću slike",
@@ -23,7 +23,6 @@
"JavaScriptTracking": "Praćenje pomoću JavaScript-a",
"JSTracking_CampaignKwdParam": "Parametar kljuÄne reÄi kampanje",
"JSTracking_CampaignNameParam": "Parametar naziva kampanje",
- "JSTracking_CodeNote": "Proverite da li se ovaj kod nalazi na svakoj stranici vašeg sajta pre %1$s taga.",
"JSTracking_CustomCampaignQueryParam": "Korišćenje korisniÄki definisanih parametara za nazive i kljuÄne reÄi kampanje",
"JSTracking_CustomCampaignQueryParamDesc": "%1$sPiwik će automatski prepoznati Google Analytics parametre.%2$s",
"JSTracking_DisableCookies": "IskljuÄi sve kolaÄiće koji služe za praćenje",
@@ -50,7 +49,7 @@
"FileUploadDisabled": "Otpremanje datoteka nije omogućeno u podešavanjima za vaš PHP. Da biste otpremili sopstveni logotip, molimo vas da postavite %s u php.ini i restartujete veb server.",
"LogoUpload": "Izaberite logo za kaÄenje",
"FaviconUpload": "Izaberite ikonicu koju želite da postavite",
- "LogoUploadHelp": "Molimo vas da postavite datoteku u %s formatima minimalne visine %s piksela.",
+ "LogoUploadHelp": "Molimo vas da postavite datoteku u %1$s formatima minimalne visine %2$s piksela.",
"MenuDiagnostic": "Dijagnostika",
"MenuGeneralSettings": "Osnovna podešavanja",
"MenuManage": "Upravljanje",
@@ -59,19 +58,19 @@
"OptOutCompleteBis": "Imajte na umu da ako obriÅ¡ete kolaÄiće ili promenite raÄunar ili brauzer, da ćete morati ponovo da proÄ‘ete kroz ovu proceduru.",
"OptOutDntFound": "VaÅ¡e akcije se ne beleže poÅ¡to vaÅ¡ brauzer kaže da vi to ne želite. U pitanju je podeÅ¡avanje u vaÅ¡em brauzeru tako da nećete moći da se prijavite sve dok ne iskljuÄite 'Nemoj da me pratiÅ¡' opciju.",
"OptOutExplanation": "Piwik poštuje privatnost na Internetu. Kako biste omogućili vašim posetiocima da budu izuzeti iz Piwik analize, dodajte sledeći HTML kod na neku od stranica vaše sajta, na primer u polisu privatnosti",
- "OptOutExplanationBis": "Ovaj tag će prikazati iframe element koji sadrži link za vaÅ¡e posetioce koji žele da budu izuzeti iz Piwik analize tako Å¡to će imati specijalan opt-out kolaÄić u svom brauzeru. %s Kliknite ovde%s kako biste videli sadržaj iframe elementa.",
+ "OptOutExplanationBis": "Ovaj tag će prikazati iframe element koji sadrži link za vaÅ¡e posetioce koji žele da budu izuzeti iz Piwik analize tako Å¡to će imati specijalan opt-out kolaÄić u svom brauzeru. %1$s Kliknite ovde%2$s kako biste videli sadržaj iframe elementa.",
"OptOutForYourVisitors": "Piwik opt-out za vaše posetioce",
"PiwikIsInstalledAt": "Piwik je instaliran",
"PersonalPluginSettings": "LiÄna podeÅ¡avanja dodataka",
- "PluginSettingChangeNotAllowed": "Nije vam dozvoljeno da promenite vrednost podešavanja \"%s\" u dodatku \"%s\"",
- "PluginSettingReadNotAllowed": "Nije vam dozvoljeno da vidite vrednost podešavanja \"%s\" u dodatku \"%s\"",
+ "PluginSettingChangeNotAllowed": "Nije vam dozvoljeno da promenite vrednost podešavanja \"%1$s\" u dodatku \"%2$s\"",
+ "PluginSettingReadNotAllowed": "Nije vam dozvoljeno da vidite vrednost podešavanja \"%1$s\" u dodatku \"%2$s\"",
"PluginSettings": "Podešavanja dodataka",
"PluginSettingsIntro": "Ovde možete promeniti podešavanja sledećih dodataka:",
- "PluginSettingsValueNotAllowed": "Vrednost za polje \"%s\" u dodatku \"%s\" nije dozvoljena",
+ "PluginSettingsValueNotAllowed": "Vrednost za polje \"%1$s\" u dodatku \"%2$s\" nije dozvoljena",
"PluginSettingsSaveFailed": "Greška prilikom snimanja podešavanja dodataka",
"SendPluginUpdateCommunication": "Pošalji mejl svaki put kada se pojavi nova verzija dodatka",
"SendPluginUpdateCommunicationHelp": "Mejl će biti poslat superkorisnicima kad god se pojavi nova verzija ovog dodatka.",
- "StableReleases": "Ukoliko Piwik Äini kritiÄan deo vaÅ¡eg poslovanja, preporuÄujemo vam da koristite poslednju stabilnu verziju. Ukoliko koristite poslednju beta verziju i naÄ‘ete bag ili imate predlog, molimo vas %spogledajte ovde%s.",
+ "StableReleases": "Ukoliko Piwik Äini kritiÄan deo vaÅ¡eg poslovanja, preporuÄujemo vam da koristite poslednju stabilnu verziju. Ukoliko koristite poslednju beta verziju i naÄ‘ete bag ili imate predlog, molimo vas %1$spogledajte ovde%2$s.",
"SystemPluginSettings": "Sistemska podešavanja dodataka",
"TrackAGoal": "Praćenje cilja",
"TrackingCode": "Kod za praćenje",
diff --git a/plugins/CoreAdminHome/lang/sv.json b/plugins/CoreAdminHome/lang/sv.json
index 7057a10bc12865cefb68d8f5353a1c6c50f763ac..e00f68b9a4fb2d79a09301914681d2d0fdbe4397 100644
--- a/plugins/CoreAdminHome/lang/sv.json
+++ b/plugins/CoreAdminHome/lang/sv.json
@@ -1,13 +1,14 @@
{
"CoreAdminHome": {
+ "AddNewTrustedHost": "Lägg till en ny betrodd värd",
"Administration": "Administration",
"ArchivingSettings": "Inställningar för arkivering",
"BrandingSettings": "Varumärkesinställningar",
"ClickHereToOptIn": "Klicka här för att gå med.",
"ClickHereToOptOut": "Klicka här för att gå ur.",
- "CustomLogoFeedbackInfo": "Om du anpassar Piwik's logotyp, kanske du också är intresserad av att dölja %s länken i toppmenyn. För att göra detta kan du inaktivera pluginen Feedback på sidan %sHantera Plugins%s.",
+ "CustomLogoFeedbackInfo": "Om du anpassar Piwik's logotyp, kanske du också är intresserad av att dölja %1$s länken i toppmenyn. För att göra detta kan du inaktivera pluginen Feedback på sidan %2$sHantera Plugins%3$s.",
"CustomLogoHelpText": "Du kan anpassa Piwik's logotyp som kommer att visas i användargränssnittet och i e-postrapporter.",
- "DevelopmentProcess": "VÃ¥r %sutvecklingsprocess%s inkluderar tusentals automatiserade test, och Beta test spelar en nyckelroll i Piwiks policy mot buggar.",
+ "DevelopmentProcess": "VÃ¥r %1$sutvecklingsprocess%2$s inkluderar tusentals automatiserade test, och Beta test spelar en nyckelroll i Piwiks policy mot buggar.",
"EmailServerSettings": "E-postinställningar (server)",
"ForBetaTestersOnly": "Endast för betatestare",
"ImageTracking": "Bildspårning",
@@ -22,7 +23,7 @@
"JavaScriptTracking": "Spårning med JavaScript",
"JSTracking_CampaignKwdParam": "Parameter för nyckelorden i kampanjen",
"JSTracking_CampaignNameParam": "villkor för kampanjnamn",
- "JSTracking_CodeNote": "Se till att denna kod finns på varje sida av din hemsida före %1$s taggen.",
+ "JSTracking_CodeNoteBeforeClosingHead": "Säkerställ att denna kod finns på varje sida på din webbplats. Vi rekommenderar att klistra in koden alldeles innan den stängande %1$s-taggen.",
"JSTracking_CustomCampaignQueryParam": "Använd den egna förfrågan för parameterns namn för kampanjnamn och nyckelord",
"JSTracking_CustomCampaignQueryParamDesc": "Observera: %1$sPiwik kommer automatiskt upptäcka parametrar för Google Analytics. %2$s",
"JSTracking_DisableCookies": "Inaktivera spårnings cookies",
@@ -49,7 +50,7 @@
"FileUploadDisabled": "Uppladdning av filer är inte aktiverat i din PHP-konfiguration. För att ladda upp din egen logo, sätt %s i php.ini och starta om din webbläsare.",
"LogoUpload": "Välj en logotyp att ladda upp",
"FaviconUpload": "Välj en Favicon att ladda upp",
- "LogoUploadHelp": "Ladda upp en fil i %s format med en minsta höjd på %s pixlar.",
+ "LogoUploadHelp": "Ladda upp en fil i %1$s format med en minsta höjd på %2$s pixlar.",
"MenuDiagnostic": "Diagnostik",
"MenuGeneralSettings": "Allmänna inställningar",
"MenuManage": "Hantera",
@@ -58,19 +59,20 @@
"OptOutCompleteBis": "Observera att om du rensar cookies, tar bort cookien för exkludering eller om du byter dator eller webbläsare måste du utföra exkluderingen igen.",
"OptOutDntFound": "Du spåras inte eftersom din webbläsare rapporterar att du inte vill det. Detta är en inställning i webbläsaren så du kan inte delta för än du avaktiverat 'Do Not Track'.",
"OptOutExplanation": "Piwik är dedikerat till att erbjuda personlig integritet på Internet. För att ge dina besökare möjligheten att välja om de ska exkluderas från Piwiks webbanalys, kan du lägga till följande HTML-kod på någon av din webbplats sidor, t.ex. på en sida om sekretesspolicy.",
- "OptOutExplanationBis": "Denna kod kommer att visas i en iFrame som innehåller en länk så att dina besökare kan välja bort Piwik genom att sätta en cookie i sina webbläsare. %s Klicka här för%s att visa innehållet som kommer att visas i iFrame'n.",
+ "OptOutExplanationBis": "Denna kod kommer att visas i en iFrame som innehåller en länk så att dina besökare kan välja bort Piwik genom att sätta en cookie i sina webbläsare. %1$s Klicka här för%2$s att visa innehållet som kommer att visas i iFrame'n.",
"OptOutForYourVisitors": "Exkludera spårning för dina besökare",
"PiwikIsInstalledAt": "Piwik är installerat på",
"PersonalPluginSettings": "Personliga plugininställningar",
- "PluginSettingChangeNotAllowed": "Det är inte tillåtet att ändra värdet i inställningar för \"%s\" i plugin \"\"%s\"",
- "PluginSettingReadNotAllowed": "Du har inte rättighet att läsa värdet för inställningen \"%s\" i tillägget \"%s\"",
+ "PluginSettingChangeNotAllowed": "Det är inte tillåtet att ändra värdet i inställningar för \"%1$s\" i plugin \"\"%2$s\"",
+ "PluginSettingReadNotAllowed": "Du har inte rättighet att läsa värdet för inställningen \"%1$s\" i tillägget \"%2$s\"",
"PluginSettings": "Inställningar för plugin",
"PluginSettingsIntro": "Här kan du ändra inställningarna för tredje parts plugin:",
- "PluginSettingsValueNotAllowed": "Värdet för det här området \"%s\" i Plugin \"%s\" är inte tillåtet",
+ "PluginSettingsValueNotAllowed": "Värdet för det här området \"%1$s\" i Plugin \"%2$s\" är inte tillåtet",
"PluginSettingsSaveFailed": "Misslyckades att spara plugin-inställningar",
"SendPluginUpdateCommunication": "Skicka e-post när pluginuppdateringar finns tillgängliga",
"SendPluginUpdateCommunicationHelp": "Ett e-postmeddelande kommer att skickas till Administratörerna när det finns en ny uppdatering för ett tillägg",
- "StableReleases": "Om Piwik är en viktig del av dina affärer, rekommenderar vi dig att använda den senaste versionen. Om du använder den senaste beta versionen och hittar en bugg eller har ett förslag, var vänlig att gå in %shär%s.",
+ "StableReleases": "Om Piwik är en viktig del av dina affärer, rekommenderar vi dig att använda den senaste versionen. Om du använder den senaste beta versionen och hittar en bugg eller har ett förslag, var vänlig att gå in %1$shär%2$s.",
+ "LtsReleases": "LTS-versioner (långtidstöd) får endast säkerhet- och buggfixar.",
"SystemPluginSettings": "Plugininställningar",
"TrackAGoal": "Monitorera ett mål",
"TrackingCode": "Spårningskod",
@@ -84,6 +86,7 @@
"YouAreOptedOut": "Du är just nu exkluderad.",
"YouMayOptOut": "Du kan välja att inte ha ett unikt identifieringsnummer i en cookie tilldelad till din dator för att undvika analys av uppgifter som samlats in på denna webbplats.",
"YouMayOptOutBis": "För att göra det valet, vänligen klicka nedan för att lagra en cookie för exkludering.",
- "OptingYouOut": "Undantar dig, vänligen vänta..."
+ "OptingYouOut": "Undantar dig, vänligen vänta...",
+ "ProtocolNotDetectedCorrectly": "Du använder just nu Piwik över en säker SSL-anslutning (via HTTPS), men Piwik kan bara upptäcka en osäker anslutning på servern."
}
}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/lang/ta.json b/plugins/CoreAdminHome/lang/ta.json
index 134eb093130b81620d9fa6d4353bdb3863f2776f..613a8d72d00fd01de53e8b19fc6a40ac04705425 100644
--- a/plugins/CoreAdminHome/lang/ta.json
+++ b/plugins/CoreAdminHome/lang/ta.json
@@ -14,7 +14,6 @@
"JavaScriptTracking": "ஜாவா ஸà¯à®•à®¿à®°à®¿à®ªà¯à®Ÿà¯ கணà¯à®•à®¾à®£à®¿à®ªà¯à®ªà¯",
"JSTracking_CampaignKwdParam": "பிரசà¯à®šà®¾à®°à®¤à¯à®¤à®¿à®©à¯ திறவà¯à®šà¯à®šà¯†à®¾à®²à¯ காரணி",
"JSTracking_CampaignNameParam": "பிரசà¯à®šà®¾à®°à®ªà¯ பெயர௠அளவà¯à®°à¯",
- "JSTracking_CodeNote": "இநà¯à®¤ கà¯à®±à®¿à®¯à¯€à®Ÿà¯à®•à®³à¯ உஙà¯à®•à®³à¯ தளதà¯à®¤à®¿à®©à¯ ஒவà¯à®µà¯Šà®°à¯ பகà¯à®•à®¤à¯à®¤à®¿à®²à¯à®®à¯ %1$s ஒடà¯à®Ÿà¯à®•à¯à®•à¯ à®®à¯à®©à¯ இரà¯à®ªà¯à®ªà®¤à¯ˆ உறà¯à®¤à®¿ செயà¯à®¯à¯à®™à¯à®•.",
"JSTracking_CustomCampaignQueryParam": "பிரசà¯à®šà®¾à®°à®ªà¯ பெயர௠மறà¯à®±à¯à®®à¯ à®®à¯à®•à¯à®•à®¿à®¯à¯ˆà®šà¯Šà®²à¯à®²à¯à®•à¯à®•à¯, தனிபயன௠கேளà¯à®µà®¿ அளவà¯à®°à¯ பெயரà¯à®•à®³à¯ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•.",
"JSTracking_CustomCampaignQueryParamDesc": "கà¯à®±à®¿à®ªà¯à®ªà¯: %1$sPiwik தனà¯à®©à®¿à®¯à®•à¯à®•à®®à®¾à®• Google Analytics அளவà¯à®°à¯à®•à¯à®•à®³à¯ˆ கணà¯à®Ÿà¯à®•à¯Šà®³à¯à®³à¯à®®à¯.%2$s",
"JSTracking_EnableDoNotTrack": "வாடிகà¯à®•à¯ˆà®¯à®¾à®³à®°à¯ பகà¯à®• DoNotTrack கணà¯à®Ÿà®±à®¿à®¤à®²à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤",
diff --git a/plugins/CoreAdminHome/lang/th.json b/plugins/CoreAdminHome/lang/th.json
index 570631d1e5d5dadb1f777199c12a338a83c8696c..101d044d4a6a5da6b3537244f3ee01e180b3aa6a 100644
--- a/plugins/CoreAdminHome/lang/th.json
+++ b/plugins/CoreAdminHome/lang/th.json
@@ -8,7 +8,7 @@
"OptOutComplete": "เลืà¸à¸à¸—ี่จะไม่ครบถ้วนเมื่à¸à¸„ุณเยี่ยมชมเว็บไซต์นี้จะไม่ถูà¸à¸šà¸±à¸™à¸—ึà¸à¹‚ดยเครื่à¸à¸‡à¸¡à¸·à¸à¸§à¸´à¹€à¸„ราะห์เว็บ",
"OptOutCompleteBis": "โปรดทราบว่า หาà¸à¸„ุณลบคุà¸à¸à¸µà¹‰à¸‚à¸à¸‡à¸„ุณให้ลบคุà¸à¸à¸µà¹‰à¹„ม่เข้าร่วมหรืà¸à¸–้าคุณเปลี่ยนเครื่à¸à¸‡à¸„à¸à¸¡à¸žà¸´à¸§à¹€à¸•à¸à¸£à¹Œà¸«à¸£à¸·à¸à¹€à¸§à¹‡à¸šà¹€à¸šà¸£à¸²à¹€à¸‹à¸à¸£à¹Œà¸„ุณ จะต้à¸à¸‡à¸”ำเนินà¸à¸²à¸£à¸‚ั้นตà¸à¸™à¸à¸²à¸£à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹€à¸¥à¸·à¸à¸à¸à¸µà¸à¸„รั้ง",
"OptOutExplanation": "Piwik มีความมุ่งมั่นที่จะให้ความเป็นส่วนตัวบนà¸à¸´à¸™à¹€à¸—à¸à¸£à¹Œà¹€à¸™à¹‡à¸• เพื่à¸à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹€à¸‚้าชมให้à¸à¸±à¸šà¸—างเลืà¸à¸à¸‚à¸à¸‡à¸à¸²à¸£à¹€à¸¥à¸·à¸à¸à¸à¸à¸à¸‚à¸à¸‡ Piwik วิเคราะห์เว็บคุณสามารถเพิ่มรหัส HTML ต่à¸à¹„ปนี้บนหน้าหนึ่งขà¸à¸‡à¹€à¸§à¹‡à¸šà¹„ซต์ขà¸à¸‡à¸„ุณ ตัวà¸à¸¢à¹ˆà¸²à¸‡à¹€à¸Šà¹ˆà¸™ ในหน้านโยบายความเป็นส่วนตัว",
- "OptOutExplanationBis": "รหัสนี้จะà¹à¸ªà¸”ง Iframe ที่มีลิงค์สำหรับผู้เข้าชมขà¸à¸‡à¸„ุณเพื่à¸à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹€à¸¥à¸·à¸à¸ Piwik โดยà¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าคุà¸à¸à¸µà¹‰à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹€à¸¥à¸·à¸à¸à¹ƒà¸™à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œ %s คลิà¸à¸—ี่นี่ %s เพื่à¸à¸”ูเนื้à¸à¸«à¸²à¸—ี่จะà¹à¸ªà¸”งโดย iFrame",
+ "OptOutExplanationBis": "รหัสนี้จะà¹à¸ªà¸”ง Iframe ที่มีลิงค์สำหรับผู้เข้าชมขà¸à¸‡à¸„ุณเพื่à¸à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹€à¸¥à¸·à¸à¸ Piwik โดยà¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าคุà¸à¸à¸µà¹‰à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹€à¸¥à¸·à¸à¸à¹ƒà¸™à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œ %1$s คลิà¸à¸—ี่นี่ %2$s เพื่à¸à¸”ูเนื้à¸à¸«à¸²à¸—ี่จะà¹à¸ªà¸”งโดย iFrame",
"OptOutForYourVisitors": "Piwik ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹€à¸¥à¸·à¸à¸à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¹€à¸‚้าชมขà¸à¸‡à¸„ุณ",
"TrustedHostSettings": "ชื่à¸à¹‚ฮสต์ Piwik ที่เชื่à¸à¸–ืà¸à¹„ด้",
"UseCustomLogo": "ใช้รูปโลโà¸à¹‰à¸—ี่à¸à¸³à¸«à¸™à¸”เà¸à¸‡",
diff --git a/plugins/CoreAdminHome/lang/tl.json b/plugins/CoreAdminHome/lang/tl.json
index 1c1ffc9436957848ea3c8a09d741ccb9ba13b53a..826f66be4694946ab5b0d74bd618f35622dc1784 100644
--- a/plugins/CoreAdminHome/lang/tl.json
+++ b/plugins/CoreAdminHome/lang/tl.json
@@ -5,9 +5,9 @@
"BrandingSettings": "Mga setting ng branding",
"ClickHereToOptIn": "I-click ito upang mag-opt in.",
"ClickHereToOptOut": "I-click ito upang mag-opt out.",
- "CustomLogoFeedbackInfo": "Kung pinasadya mo ang logo ng Piwik, maaaring interesado ka rin upang itago ang %s na link sa itaas ng menu. Upang gawin ito, maaari mong i-disable ang Feedback plugin sa %s Manage Plugin %s na pahina.",
+ "CustomLogoFeedbackInfo": "Kung pinasadya mo ang logo ng Piwik, maaaring interesado ka rin upang itago ang %1$s na link sa itaas ng menu. Upang gawin ito, maaari mong i-disable ang Feedback plugin sa %2$s Manage Plugin %3$s na pahina.",
"CustomLogoHelpText": "Maaari mong i-customize ang Piwik logo na ipapakita sa user interface at mga report sa email.",
- "DevelopmentProcess": "Habang ang aming %s proseso ng development %s ay nakapaloob ang libu-libong automated tests, ang mga Beta Tester ay may pangunahing papel sa archiving ng \"No bug policy\" sa Piwik.",
+ "DevelopmentProcess": "Habang ang aming %1$s proseso ng development %2$s ay nakapaloob ang libu-libong automated tests, ang mga Beta Tester ay may pangunahing papel sa archiving ng \"No bug policy\" sa Piwik.",
"EmailServerSettings": "Mga setting sa email server",
"ForBetaTestersOnly": "Pagsusubaybay ng Imahe",
"ImageTracking": "Pagsubaybay ng Imahe",
@@ -21,7 +21,6 @@
"JavaScriptTracking": "Pagsubaybay ng JavaScript",
"JSTracking_CampaignKwdParam": "Keyword na Parametero ng Kampanya",
"JSTracking_CampaignNameParam": "Pangalang Parametero ng Kampanya",
- "JSTracking_CodeNote": "Siguraduhin na ang code na ito ay nasa bawat pahina ng iyong website bago ang %1$s na tag.",
"JSTracking_CustomCampaignQueryParam": "Gamitin ang custom query na parametro ng mga pangalan para sa pangalan ng kampanya at keyword",
"JSTracking_CustomCampaignQueryParamDesc": "Tandaan: Awtomatikong makikita ng %1$sPiwik ang mga parametro ng Google Analytics. %2$s",
"JSTracking_DisableCookies": "I-disable ang lahat ng mga cookies na sumusubaybay.",
@@ -47,7 +46,7 @@
"LogoNotWriteableInstruction": "Upang gamitin ang iyong pasadyang logo sa halip na ang default na Piwik logo, bigyan ng pahintulot na magsulat sa direktoryong ito: %1$s kailangan ng Piwik ng write access para sa iyong mga logo na naka-imbak sa mga file ng %2$s.",
"LogoUpload": "Piliin ang Logo na i-upload",
"FaviconUpload": "Pumili ng Favicon upang i-upload",
- "LogoUploadHelp": "Mangyaring mag-upload ng isang file sa format na %s na may pinakamababang taas na %s na pixel.",
+ "LogoUploadHelp": "Mangyaring mag-upload ng isang file sa format na %1$s na may pinakamababang taas na %2$s na pixel.",
"MenuDiagnostic": "Dyagnostiko",
"MenuGeneralSettings": "Pangkalahatang mga setting",
"MenuManage": "Pamahalaan",
@@ -55,15 +54,15 @@
"OptOutComplete": "Ang pag-opt-out ay kumpleto na; ang iyong mga pagbisita sa website na ito ay hindi maitatala sa Web Analytics na tool.",
"OptOutCompleteBis": "Tandaan na kung tinanggal mo ang iyong cookies, burahin ang opt-out cookie, o kapag nagbago ka ng computer o Web browser, kailangan mong isagawang muli ang opt-out cookie",
"OptOutExplanation": "Ang Piwik ay nakatuon sa pagbibigay ng privacy sa Internet. Upang bigyan ang iyong bisita ng pagpipilian na pag-opt-out ng Piwik Web Analytics, maaari mong idagdag ang sumusunod na HTML code sa isa sa iyong mga pahina ng website, halimbawa sa isang pahina ng Privacy Policy.",
- "OptOutExplanationBis": "Ang code na ito ay magpapakita ng isang Iframe na naglalaman ng isang link para makapag-opt-out ang iyong mga bisita sa Piwik sa pamamagitan ng pagtatakda ng isang opt-out na cookie sa kanilang mga browser. %s I-click dito%s upang tingnan ang nilalaman na ipapakita sa iFrame.",
+ "OptOutExplanationBis": "Ang code na ito ay magpapakita ng isang Iframe na naglalaman ng isang link para makapag-opt-out ang iyong mga bisita sa Piwik sa pamamagitan ng pagtatakda ng isang opt-out na cookie sa kanilang mga browser. %1$s I-click dito%2$s upang tingnan ang nilalaman na ipapakita sa iFrame.",
"OptOutForYourVisitors": "Piwik opt-out para sa iyong mga bisita",
"PiwikIsInstalledAt": "Ang Piwik ay naka-install sa",
- "PluginSettingChangeNotAllowed": "Hindi ka pinapahintulutang baguhin ang halaga ng setting \"%s\" sa plugin \"%s\"",
- "PluginSettingReadNotAllowed": "Hindi ka pinapahintulutang basahin ang halaga ng setting \"%s\" sa plugin \"%s\"",
+ "PluginSettingChangeNotAllowed": "Hindi ka pinapahintulutang baguhin ang halaga ng setting \"%1$s\" sa plugin \"%2$s\"",
+ "PluginSettingReadNotAllowed": "Hindi ka pinapahintulutang basahin ang halaga ng setting \"%1$s\" sa plugin \"%2$s\"",
"PluginSettingsIntro": "Dito maaaring baguhin ang mga setting para sa mga sumusunod na 3rd party na mga plugin:",
- "PluginSettingsValueNotAllowed": "Ang halaga para sa field \"%s\" sa plugin na \"%s\" ay hindi pinapahintulutan.",
+ "PluginSettingsValueNotAllowed": "Ang halaga para sa field \"%1$s\" sa plugin na \"%2$s\" ay hindi pinapahintulutan.",
"SendPluginUpdateCommunicationHelp": "Isang email ang ipapadala sa mga Super User kapag may bagong bersyon na maaaring magamit para sa isang plugin.",
- "StableReleases": "Kung ang Piwik ay isang kritikal na bahagi ng iyong negosyo, inirerekomenda namin na gamitin mo ang pinakabagong matatag na release. Kung gagamitin mo ang pinakabagong beta at nakakita ka ng bug o mayroong suhestiyon, mangyaring %s tingnan dito %s.",
+ "StableReleases": "Kung ang Piwik ay isang kritikal na bahagi ng iyong negosyo, inirerekomenda namin na gamitin mo ang pinakabagong matatag na release. Kung gagamitin mo ang pinakabagong beta at nakakita ka ng bug o mayroong suhestiyon, mangyaring %1$s tingnan dito %2$s.",
"TrackAGoal": "Subaybayan ang isang gol",
"TrackingCode": "Tracking Code",
"TrustedHostConfirm": "Sigurado ka ba na gusto mong baguhin ang pinagkakatiwalaang Piwik na hostname?",
diff --git a/plugins/CoreAdminHome/lang/tr.json b/plugins/CoreAdminHome/lang/tr.json
index 8a412db6af3957bcb772648b30f6d578de75eb6a..69657dffcce77b13af02dc850787a6eff285c4d9 100644
--- a/plugins/CoreAdminHome/lang/tr.json
+++ b/plugins/CoreAdminHome/lang/tr.json
@@ -5,9 +5,9 @@
"BrandingSettings": "Marka ayarları",
"ClickHereToOptIn": "İzin vermek için tıklayınız.",
"ClickHereToOptOut": "İzni iptal etmek için tıklayınız.",
- "CustomLogoFeedbackInfo": "Eğer Piwik logosunu değiştirdiyseniz, üst menüden %s bağlantısını da kaldırmak isteyebilirsiniz. Bunun için, %sManage Plugins%s sayfasından Geribildirim ( Feedback ) eklentisini iptal edebilirsiniz.",
+ "CustomLogoFeedbackInfo": "Eğer Piwik logosunu değiştirdiyseniz, üst menüden %1$s bağlantısını da kaldırmak isteyebilirsiniz. Bunun için, %2$sManage Plugins%3$s sayfasından Geribildirim ( Feedback ) eklentisini iptal edebilirsiniz.",
"CustomLogoHelpText": "E-posta raporlarında ve kullanıcı arayüzünde kullanılacak olan Piwik logosunu değiştirebilirsiniz.",
- "DevelopmentProcess": "%sdevelopment process%s sırasında binlerce otomasyon testleri Piwik'te beta testerleriniz hatasız kullanım politikası yürütebilir",
+ "DevelopmentProcess": "%1$sdevelopment process%2$s sırasında binlerce otomasyon testleri Piwik'te beta testerleriniz hatasız kullanım politikası yürütebilir",
"EmailServerSettings": "E-Posta sunucusu ayarları",
"ForBetaTestersOnly": "Yalnızca beta test edenler için",
"ImageTracking": "Resimle Ä°zleme",
@@ -20,7 +20,6 @@
"JavaScriptTracking": "Javascript Ä°zleme Kodu",
"JSTracking_CampaignKwdParam": "Kampanya Anahtar Kelime Parametreleri",
"JSTracking_CampaignNameParam": "Kampanya Parametresi",
- "JSTracking_CodeNote": "Bu kodun web sitenizin her sayfasında %1$s den önce eklendiğine emin olun.",
"JSTracking_CustomCampaignQueryParam": "Kampanya adı ve anahtar kelime için özel sorgu parametresi kullanın",
"JSTracking_CustomCampaignQueryParamDesc": "Not: %1$sPiwik otomatik olarak Google Analytics parametreleri algılar. %2$s",
"JSTracking_DisableCookies": "Tüm takip cookilerini devredışı bırak",
@@ -38,9 +37,10 @@
"JSTrackingIntro2": "Piwik ile izlemek istediğiniz sitenin tüm sayfalarına Javascript izleme kodunu yapıştırmanız gerekmektedir.",
"JSTrackingIntro4": "Eğer Javascript izleme kodu kullanmak istemiyorsanız aşağıdaki%2$s linke tıklayarak izleme resmi oluşturabilirsiniz%1$s.",
"JSTrackingIntro5": "Eğer daha fazla sayfa görüntülenme sayısını takip etmek istiyorsanız, lütfen %1$sPiwik javascript izleme dökümantasyonunda %2$s listelenen uygun fonksiyonlara göz gezdirin. Bu fonksiyonları kullanarak hedefleri, özel değerleri, e-ticaret siparişlerini, terkedilen sepetler ve daha fazlasını takip edebilirsiniz.",
+ "FileUploadDisabled": "Dosya yükleme PHP yapılandırmada aktif değil. Özel logo yüklemek için lütfen %s php.ini yapılandırma ayarlarını yapın ve sunucunuzu yeniden başlatın.",
"LogoUpload": "Yüklemek için logo seçiniz",
"FaviconUpload": "Yüklemek için Favicon seçin",
- "LogoUploadHelp": "Lütfen %s formatlarında ve minimum %s piksel yüksekliğinde bir dosya yükleyin.",
+ "LogoUploadHelp": "Lütfen %1$s formatlarında ve minimum %2$s piksel yüksekliğinde bir dosya yükleyin.",
"MenuDiagnostic": "tehÅŸis",
"MenuGeneralSettings": "Genel Ayarlar",
"MenuManage": "yönetmek",
@@ -49,12 +49,12 @@
"OptOutExplanation": "Bu yazılım kendini internette gizlilik sağlamaya adamıştır. Ekteki html kodunu sitenize ekleyerek ziyaretçilerinize izlenmeme (opsiyonel olarak) seçeneği sunabilirsiniz. Örnek olarak bunu Gizlilik Politikanız sayfasında sunabilirsiniz.",
"OptOutForYourVisitors": "ziyaretciniz için Piwiki devre dışı bırakmak",
"PiwikIsInstalledAt": "Piwikde yüklenir",
- "PluginSettingChangeNotAllowed": "Bu ayarların \"%s\" değerlerini değiştirmek için \"%s\" eklentisinde gerekli izniniz yok.",
+ "PluginSettingChangeNotAllowed": "Bu ayarların \"%1$s\" değerlerini değiştirmek için \"%2$s\" eklentisinde gerekli izniniz yok.",
"PluginSettings": "Eklenti Ayarları",
"PluginSettingsIntro": "Buradan aşağıdaki 3. parti eklentiler için ayarları değiştirebilirsiniz:",
"PluginSettingsSaveFailed": "Eklenti ayarları kaydedilemedi",
"SendPluginUpdateCommunication": "Eklenti güncellemesi olduğunda e-posta gönder",
- "StableReleases": "Eğer Piwik işiniz için kritik bir parçaysa, son ve stabil olan versiyonu kullanmanızı öneririz. Eğer en son güncel betayı kullanıyorsanız ve bir hata bulur ya da öneriniz olursa, lütfen şuraya%s bakın%s.",
+ "StableReleases": "Eğer Piwik işiniz için kritik bir parçaysa, son ve stabil olan versiyonu kullanmanızı öneririz. Eğer en son güncel betayı kullanıyorsanız ve bir hata bulur ya da öneriniz olursa, lütfen şuraya%1$s bakın%2$s.",
"SystemPluginSettings": "Sistem Eklenti Ayarları",
"TrackAGoal": "Bir hedef izleme",
"TrackingCode": "Ä°zleme Kodu",
diff --git a/plugins/CoreAdminHome/lang/uk.json b/plugins/CoreAdminHome/lang/uk.json
index 940b3d54383a78c9806076562fcf0e0d4f7d874d..63711249da212b123dbda9fbe100ba9a532f5a2a 100644
--- a/plugins/CoreAdminHome/lang/uk.json
+++ b/plugins/CoreAdminHome/lang/uk.json
@@ -6,7 +6,7 @@
"OptOutComplete": "Відмову прийнÑто; ваші заходи на цей Ñайт не буде запиÑано в базу даних веб-аналітики.",
"OptOutCompleteBis": "Зверніть увагу, що при очищенні вÑÑ–Ñ… файлів cookie, видаленні конкретного файлу cookie чи зміни веб-переглÑдача необхідно буде знову пройти процедуру відмови.",
"OptOutExplanation": "Piwik турбуєтьÑÑ Ð¿Ñ€Ð¾ конфіденціальніÑÑ‚ÑŒ в Інтернеті. Щоб надати вашим відвідувачам можливіÑÑ‚ÑŒ відмовитиÑÑ Ð²Ñ–Ð´ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ð¼Ð°Ñ†Ñ–Ñ— про них до бази даних веб-аналітики Piwik, додайте наÑтупний HTML код на одну з ваших Ñторінок - Ð´Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»Ð°Ð´Ñƒ на Ñторінку \"Політика конфіденційноÑÑ‚Ñ–\".",
- "OptOutExplanationBis": "Тег покаже \"iframe\", в Ñкому міÑтитиметьÑÑ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… відвідувачів, клацнувши на Ñке, вони зможуть відмовитиÑÑ Ð²Ñ–Ð´ потраплÑÐ½Ð½Ñ Ð² веб-аналітику через Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾Ð³Ð¾ файлу cookie. %s Клацніть тут%s, щоб переглÑнути вміÑÑ‚ що буде показано в \"iframe\".",
+ "OptOutExplanationBis": "Тег покаже \"iframe\", в Ñкому міÑтитиметьÑÑ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… відвідувачів, клацнувши на Ñке, вони зможуть відмовитиÑÑ Ð²Ñ–Ð´ потраплÑÐ½Ð½Ñ Ð² веб-аналітику через Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾Ð³Ð¾ файлу cookie. %1$s Клацніть тут%2$s, щоб переглÑнути вміÑÑ‚ що буде показано в \"iframe\".",
"OptOutForYourVisitors": "Відмова від Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð² аналітику Ð´Ð»Ñ Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ñ‡Ñ–Ð².",
"YouAreOptedIn": "Ðаразі ÑтатиÑтика запиÑуєтьÑÑ Ð² базу даних",
"YouAreOptedOut": "Ðаразі ÑтатиÑтика не запиÑуєтьÑÑ Ð² базу даних",
diff --git a/plugins/CoreAdminHome/lang/vi.json b/plugins/CoreAdminHome/lang/vi.json
index ff85b80d9e6c94660f6be979210498f7a0516bce..f3b13f92fd15d288e50289e9261da1851333213c 100644
--- a/plugins/CoreAdminHome/lang/vi.json
+++ b/plugins/CoreAdminHome/lang/vi.json
@@ -5,9 +5,9 @@
"BrandingSettings": "Thiết láºp Branding",
"ClickHereToOptIn": "Click và o đây để lá»±a chá»n và o",
"ClickHereToOptOut": "Click và o đây để lá»±a chá»n thoát ra",
- "CustomLogoFeedbackInfo": "Nếu bạn tuỳ chỉnh các biểu tượng Piwik, bạn cÅ©ng có thể quan tâm đến việc ẩn liên kết %s trong top menu. Äể là m nhÆ° váºy, bạn có thể vô hiệu hóa các plugin Thông tin phản hồi trong trang %s Plugins Quản lý %s.",
+ "CustomLogoFeedbackInfo": "Nếu bạn tuỳ chỉnh các biểu tượng Piwik, bạn cÅ©ng có thể quan tâm đến việc ẩn liên kết %1$s trong top menu. Äể là m nhÆ° váºy, bạn có thể vô hiệu hóa các plugin Thông tin phản hồi trong trang %2$s Plugins Quản lý %3$s.",
"CustomLogoHelpText": "Bạn có thể tùy chỉnh các biểu tượng Piwik sẽ được hiển thị trong giao diện ngÆ°á»i dùng và thÆ° Ä‘iện tá» báo cáo.",
- "DevelopmentProcess": "Trong khi %s giai Ä‘oạn phát triển %s của chúng ta chứa hà ng ngà n phép kiểm thá» tá»± Ä‘á»™ng, những ngÆ°á»i thá»±c hiện kiểm thá» Beta đóng má»™t vai trò quan trá»ng trong việc thá»±c hiện \"No bug policy\" trong Piwik.",
+ "DevelopmentProcess": "Trong khi %1$s giai Ä‘oạn phát triển %2$s của chúng ta chứa hà ng ngà n phép kiểm thá» tá»± Ä‘á»™ng, những ngÆ°á»i thá»±c hiện kiểm thá» Beta đóng má»™t vai trò quan trá»ng trong việc thá»±c hiện \"No bug policy\" trong Piwik.",
"EmailServerSettings": "Cấu hình email server",
"ForBetaTestersOnly": "Chỉ áp dụng cho thỠnghiệm bản beta",
"ImageTracking": "Theo dõi bằng hình ảnh",
@@ -22,7 +22,6 @@
"JavaScriptTracking": "Theo dõi JavaScript",
"JSTracking_CampaignKwdParam": "Chiến dịch từ khóa",
"JSTracking_CampaignNameParam": "tên chiến dịch",
- "JSTracking_CodeNote": "Chắc chắn rằng mã nà y trên mỗi trang của trang web của bạn trước khi %1$s tag",
"JSTracking_CustomCampaignQueryParam": "SỠdụng tên truy vấn tùy chỉnh cho các tên và từ khóa chiến dịch",
"JSTracking_CustomCampaignQueryParamDesc": "Lưu ý:.%1$s Piwik sẽ tự động phát hiện các thông số Google Analytics. %2$s",
"JSTracking_EnableDoNotTrack": "Cho phép máy khách phát hiện DoNotTrack",
@@ -44,20 +43,20 @@
"JSTrackingIntro4": "Nếu bạn không muốn sá» dụng JavaScript để theo dõi khách truy cáºp, %1$s tạo ra má»™t liên kết theo dõi hình ảnh dÆ°á»›i đây %2$s.",
"JSTrackingIntro5": "Nếu bạn muốn thá»±c hiện các tác vụ khác theo dõi page view, vui lòng tham khảo %1$sTà i liệu Piwik Javascript Tracking%2$s để xem danh sách những chức năng được cung cấp. Sá» dụng những chức năng nà y, bạn có thể theo dõi goals, thông số thiết láºp, Ä‘Æ¡n hà ng thÆ°Æ¡ng mại Ä‘iện tá», giá» hà ng bị từ chối và nhiá»u hÆ¡n thế nữa.",
"LogoUpload": "Chá»n má»™t logo để tải lên",
- "LogoUploadHelp": "Xin vui lòng tải lên file dÆ°á»›i định dạng %s vá»›i chiá»u cao tối thiểu là %s pixels",
+ "LogoUploadHelp": "Xin vui lòng tải lên file dÆ°á»›i định dạng %1$s vá»›i chiá»u cao tối thiểu là %2$s pixels",
"MenuDiagnostic": "chẩn đoán",
"MenuGeneralSettings": "cà i đặt chung",
"MenuManage": "Quản lý",
"OptOutComplete": "Việc không tham gia hoà n tất; Việc thăm trang web nà y của bạn sẽ không được ghi lại bởi các công cụ Web Analytics.",
"OptOutCompleteBis": "Ghi nhá»› rằng nếu bạn xóa cookies hoặc xóa cookie opt-out (quảng cáo, spam), hay nếu bạn tùy chỉnh máy tÃnh hoặc trình duyệt của bạn, bạn sẽ phải tiến hà nh các thao tác opt-out (chặn spam, quảng cáo) lại má»™t lần nữa.",
"OptOutExplanation": "Piwik được sá» dụng để cung cấp quyá»n riêng tÆ° trên Internet. Äể cung cấp cho những khách ghé thăm trang web của bạn các lá»±a chá»n chặn Piwik Web Analytics, bạn có thể thêm và o mã HTML sau trên trang web của bạn, và dụ tùy chỉnh trong trang Quyá»n Riêng tÆ°.",
- "OptOutExplanationBis": "Äoạn mã nà y sẽ hiển thị má»™t Iframe chứa Ä‘Æ°á»ng dẫn cho ngÆ°á»i ghé thăm trang web của bạn chặn Piwik bằng cách thiết láºp má»™t cookie opt-out trong trình duyệt của há». %sNhấn và o đây%s để xem ná»™i dung sẽ được hiển thị bởi iFrame.",
+ "OptOutExplanationBis": "Äoạn mã nà y sẽ hiển thị má»™t Iframe chứa Ä‘Æ°á»ng dẫn cho ngÆ°á»i ghé thăm trang web của bạn chặn Piwik bằng cách thiết láºp má»™t cookie opt-out trong trình duyệt của há». %1$sNhấn và o đây%2$s để xem ná»™i dung sẽ được hiển thị bởi iFrame.",
"OptOutForYourVisitors": "Piwik không tham gia truy cáºp của bạn",
"PiwikIsInstalledAt": "Piwik được cà i đặt tại",
- "PluginSettingChangeNotAllowed": "Bạn không được phép thay đổi giá trị của các thiết láºp \"%s\" trong plugin \"%s\"",
+ "PluginSettingChangeNotAllowed": "Bạn không được phép thay đổi giá trị của các thiết láºp \"%1$s\" trong plugin \"%2$s\"",
"PluginSettingsIntro": "Ở đây bạn có thể thay đổi các thiết láºp cho các plugin của bên thứ 3 nhÆ° sau:",
- "PluginSettingsValueNotAllowed": "Giá trị của trÆ°á»ng \"%s\" trong plugin \"%s\" không được chấp nháºn",
- "StableReleases": "Nếu Piwik là má»™t phần quan trá»ng của công việc của bạn, chúng tôi khuyên bạn nên sá» dụng phiên bản ổn định má»›i nhất. Nếu bạn sá» dụng phiên bản beta má»›i nhất và bạn tìm thấy má»™t lá»—i hoặc có má»™t Ä‘á» nghị, xin vui lòng %s xem tại đây %s.",
+ "PluginSettingsValueNotAllowed": "Giá trị của trÆ°á»ng \"%1$s\" trong plugin \"%2$s\" không được chấp nháºn",
+ "StableReleases": "Nếu Piwik là má»™t phần quan trá»ng của công việc của bạn, chúng tôi khuyên bạn nên sá» dụng phiên bản ổn định má»›i nhất. Nếu bạn sá» dụng phiên bản beta má»›i nhất và bạn tìm thấy má»™t lá»—i hoặc có má»™t Ä‘á» nghị, xin vui lòng %1$s xem tại đây %2$s.",
"TrackAGoal": "Theo dõi một mục tiêu",
"TrackingCode": "Mã theo dõi",
"TrustedHostConfirm": "Bạn có chắc rằng bạn muốn thay đổi tên máy chủ Piwik đáng tin cáºy không?",
diff --git a/plugins/CoreAdminHome/lang/zh-cn.json b/plugins/CoreAdminHome/lang/zh-cn.json
index a7b7f7cdf833fc5c0790a4885963479ea6ceba21..4f776e7267b0ca8efb8447979753a451ca7c4eb0 100644
--- a/plugins/CoreAdminHome/lang/zh-cn.json
+++ b/plugins/CoreAdminHome/lang/zh-cn.json
@@ -5,9 +5,9 @@
"BrandingSettings": "å›¾æ ‡è®¾ç½®",
"ClickHereToOptIn": "ç‚¹è¿™é‡Œä¸»åŠ¨åŠ å…¥ã€‚",
"ClickHereToOptOut": "点这里主动退出。",
- "CustomLogoFeedbackInfo": "如果您定制 Piwik å›¾æ ‡ï¼Œå¯èƒ½æƒ³åœ¨é¡¶éƒ¨èœå•éšè— %s 链接，在 %s管ç†æ’件%s 页é¢ç¦ç”¨ Feedback æ’件。",
+ "CustomLogoFeedbackInfo": "如果您定制 Piwik å›¾æ ‡ï¼Œå¯èƒ½æƒ³åœ¨é¡¶éƒ¨èœå•éšè— %1$s 链接，在 %2$s管ç†æ’件%3$s 页é¢ç¦ç”¨ Feedback æ’件。",
"CustomLogoHelpText": "您å¯ä»¥å®šåˆ¶ Piwik å›¾æ ‡ï¼Œæ˜¾ç¤ºåœ¨ç”¨æˆ·ç•Œé¢å’ŒæŠ¥è¡¨é‚®ä»¶ä¸Šã€‚",
- "DevelopmentProcess": "虽然在%så¼€å‘过程%sä¸å·²è¿›è¡Œè¿‡æˆåƒä¸Šä¸‡æ¬¡çš„自动测试，Beta 版本测试ä»ç„¶æ˜¯å®žçŽ° Piwik \"æ— é”™ç†å¿µ\"的很é‡è¦çš„一部分。",
+ "DevelopmentProcess": "虽然在%1$så¼€å‘过程%2$sä¸å·²è¿›è¡Œè¿‡æˆåƒä¸Šä¸‡æ¬¡çš„自动测试，Beta 版本测试ä»ç„¶æ˜¯å®žçŽ° Piwik \"æ— é”™ç†å¿µ\"的很é‡è¦çš„一部分。",
"EmailServerSettings": "邮件æœåŠ¡å™¨è®¾ç½®",
"ForBetaTestersOnly": "仅供测试",
"ImageTracking": "图片跟踪",
@@ -22,7 +22,6 @@
"JavaScriptTracking": "JavaScript 跟踪",
"JSTracking_CampaignKwdParam": "广告关键è¯å‚æ•°",
"JSTracking_CampaignNameParam": "广告å称å‚æ•°",
- "JSTracking_CodeNote": "确认这段代ç 在网站所有页é¢çš„ %1$s æ ‡ç¾ä¹‹å‰ã€‚",
"JSTracking_CustomCampaignQueryParam": "广告å称和关键è¯ä½¿ç”¨è‡ªå®šä¹‰æœç´¢å‚æ•°å",
"JSTracking_CustomCampaignQueryParamDesc": "æ示: %1$sPiwik 会自动检测 Google 分æžå‚数。%2$s",
"JSTracking_EnableDoNotTrack": "å¯ç”¨è®¿å®¢ DoNotTrack 检测",
@@ -45,22 +44,22 @@
"JSTrackingIntro5": "如果除了统计访问次数，请在 %1$sPiwik Javascript 跟踪文档%2$s ä¸æŸ¥çœ‹æ›´å¤šçš„功能列表。通过这些功能，您å¯ä»¥è·Ÿè¸ªç›®æ ‡ã€è‡ªå®šä¹‰å˜é‡ã€è®¢å•ã€ä¸¢å¼ƒçš„è´ç‰©è½¦ç‰ã€‚",
"LogoUpload": "é€‰æ‹©ä¸€ä¸ªå›¾æ ‡ä¸Šä¼ ",
"FaviconUpload": "é€‰æ‹©ä¸Šä¼ å›¾æ ‡",
- "LogoUploadHelp": "è¯·ä¸Šä¼ %s æ ¼å¼çš„文件，最å°é«˜åº¦ %s 点。",
+ "LogoUploadHelp": "è¯·ä¸Šä¼ %1$s æ ¼å¼çš„文件，最å°é«˜åº¦ %2$s 点。",
"MenuDiagnostic": "检测",
"MenuGeneralSettings": "一般设置",
"MenuManage": "管ç†",
"OptOutComplete": "主动退出 æˆåŠŸ; 网站分æžå·¥å…·å°†ä¸ä¼šç»Ÿè®¡æ‚¨å¯¹è¿™ä¸ªç½‘站的访问。",
"OptOutCompleteBis": "如果您清空了cookiesã€åˆ 除了主动退出cookieã€æˆ–者更æ¢äº†ç”µè„‘或者æµè§ˆå™¨ï¼Œæ‚¨éœ€è¦é‡æ–°æ‰§è¡Œä¸»åŠ¨é€€å‡ºçš„æ“作。",
"OptOutExplanation": "Piwik 致力于 Internet éšç§ä¿æŠ¤ã€‚为了给访客æ供主动退出 Piwik 网页分æžçš„选项, 您å¯ä»¥åœ¨ä¸€ä¸ªç½‘é¡µä¸Šæ·»åŠ ä¸‹é¢çš„HTML代ç , 例如在éšç§ä¿æŠ¤é¡µé¢ã€‚",
- "OptOutExplanationBis": "本代ç 将显示一个包å«é“¾æŽ¥çš„ Iframe，供访客在æµè§ˆå™¨ä¸è®¾ç½®ä¸»åŠ¨é€€å‡ºçš„ cookie æ¥é€€å‡º Piwik 的统计。%s 点这里%s 查看将在 iFrame 里显示的内容。",
+ "OptOutExplanationBis": "本代ç 将显示一个包å«é“¾æŽ¥çš„ Iframe，供访客在æµè§ˆå™¨ä¸è®¾ç½®ä¸»åŠ¨é€€å‡ºçš„ cookie æ¥é€€å‡º Piwik 的统计。%1$s 点这里%2$s 查看将在 iFrame 里显示的内容。",
"OptOutForYourVisitors": "访客主动退出 Piwik",
"PiwikIsInstalledAt": "Piwik 安装在",
- "PluginSettingChangeNotAllowed": "ä¸å…许更改æ’件＂%s＂ä¸é…置＂%s＂的值",
+ "PluginSettingChangeNotAllowed": "ä¸å…许更改æ’件＂%1$s＂ä¸é…置＂%2$s＂的值",
"PluginSettingsIntro": "è¿™é‡Œï¼Œä½ å¯ä»¥æ›´æ”¹ä¸‹åˆ—第三方æ’件的é…置：",
- "PluginSettingsValueNotAllowed": "æ’件\"%s\"ä¸çš„域\"%s\"的值是ä¸è¢«å…许的",
+ "PluginSettingsValueNotAllowed": "æ’件\"%1$s\"ä¸çš„域\"%2$s\"的值是ä¸è¢«å…许的",
"PluginSettingsSaveFailed": "ä¿å˜æ’件设置失败",
"SendPluginUpdateCommunicationHelp": "æ’件有新版本时将会给超级管ç†å‘˜å‘é€é‚®ä»¶",
- "StableReleases": "如果Piwik对您的业务很é‡è¦ï¼Œæˆ‘们建议您使用最新的稳定版。如果使用最新测试版，å‘现了问题或有建议，请%s看这里%s。",
+ "StableReleases": "如果Piwik对您的业务很é‡è¦ï¼Œæˆ‘们建议您使用最新的稳定版。如果使用最新测试版，å‘现了问题或有建议，请%1$s看这里%2$s。",
"SystemPluginSettings": "系统æ’件设置",
"TrackAGoal": "è·Ÿè¸ªç›®æ ‡",
"TrackingCode": "跟踪代ç ",
diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
index c3cd7c95008e69f8508b466312b63b7bc8ef76b4..e70d537472ebe2277abe996997cbcd2d1fa1a52c 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.twig
+++ b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -204,6 +204,9 @@
<input type="hidden" name="token_auth" value="{{ token_auth }}"/>
{% if logosWriteable %}
+ <div class="alert alert-warning uploaderror" style="display:none;">
+ {{ 'CoreAdminHome_LogoUploadFailed'|translate }}
+ </div>
<div class="form-group">
<label for="customLogo">{{ 'CoreAdminHome_LogoUpload'|translate }}</label>
<div class="form-help">{{ 'CoreAdminHome_LogoUploadHelp'|translate("JPG / PNG / GIF", 110) }}</div>
diff --git a/plugins/CoreConsole/Commands/CoreArchiver.php b/plugins/CoreConsole/Commands/CoreArchiver.php
index 7f1eb6107d2f590124c3d3bf37f2eb818c84075a..32f1ba1116b96a76f7212bf0aff4b0f7106ff563 100644
--- a/plugins/CoreConsole/Commands/CoreArchiver.php
+++ b/plugins/CoreConsole/Commands/CoreArchiver.php
@@ -41,6 +41,7 @@ class CoreArchiver extends ConsoleCommand
$archiver->forceTimeoutPeriod = $input->getOption("force-timeout-for-periods");
$archiver->shouldArchiveAllPeriodsSince = $input->getOption("force-all-periods");
$archiver->restrictToDateRange = $input->getOption("force-date-range");
+ $archiver->phpCliConfigurationOptions = $input->getOption("php-cli-options");
$restrictToPeriods = $input->getOption("force-periods");
$restrictToPeriods = explode(',', $restrictToPeriods);
@@ -116,5 +117,6 @@ class CoreArchiver extends ConsoleCommand
$command->addOption('accept-invalid-ssl-certificate', null, InputOption::VALUE_NONE,
"It is _NOT_ recommended to use this argument. Instead, you should use a valid SSL certificate!\nIt can be "
. "useful if you specified --url=https://... or if you are using Piwik with force_ssl=1");
+ $command->addOption('php-cli-options', null, InputOption::VALUE_OPTIONAL, 'Forwards the PHP configuration options to the PHP CLI command. For example "-d memory_limit=8G". Note: These options are only applied if the archiver actually uses CLI and not HTTP.', $default = '');
}
}
diff --git a/plugins/CoreConsole/Commands/GeneratePlugin.php b/plugins/CoreConsole/Commands/GeneratePlugin.php
index bf83889305e793d3be703a210b3900d044dda4e2..45fa111d87ab852105f93ffeffcef2687f7a250e 100644
--- a/plugins/CoreConsole/Commands/GeneratePlugin.php
+++ b/plugins/CoreConsole/Commands/GeneratePlugin.php
@@ -126,6 +126,10 @@ class GeneratePlugin extends GeneratePluginBase
throw new \RuntimeException('You have to enter a plugin name');
}
+ if(strlen($pluginName) > 40) {
+ throw new \RuntimeException('Your plugin name cannot be longer than 40 characters');
+ }
+
if (!Plugin\Manager::getInstance()->isValidPluginName($pluginName)) {
throw new \RuntimeException(sprintf('The plugin name %s is not valid. The name must start with a letter and is only allowed to contain numbers and letters.', $pluginName));
}
diff --git a/plugins/CoreConsole/Commands/GenerateWidget.php b/plugins/CoreConsole/Commands/GenerateWidget.php
index 05f92bd4af538d37d7fad50f778ead00f93a10ac..c04c30cd55fe2ae7a7af742043c0f8de7501c546 100644
--- a/plugins/CoreConsole/Commands/GenerateWidget.php
+++ b/plugins/CoreConsole/Commands/GenerateWidget.php
@@ -49,7 +49,7 @@ class GenerateWidget extends GeneratePluginBase
$replace = array('ExamplePlugin' => $pluginName,
'MyExampleWidget' => $widgetClass,
'Example Widget Name' => $this->makeTranslationIfPossible($pluginName, $widgetName),
- 'Example Widgets' => $category);
+ 'About Piwik' => $category);
$whitelistFiles = array('/Widgets', '/Widgets/MyExampleWidget.php');
$this->copyTemplateToPlugin($exampleFolder, $pluginName, $replace, $whitelistFiles);
diff --git a/plugins/CoreHome/Columns/VisitLastActionTime.php b/plugins/CoreHome/Columns/VisitLastActionTime.php
index 15e6ea88674346a686f056bce41f79a0c545228f..4ba0761c2a5fb3c90e6adf995583a1bc5d4f7aef 100644
--- a/plugins/CoreHome/Columns/VisitLastActionTime.php
+++ b/plugins/CoreHome/Columns/VisitLastActionTime.php
@@ -51,6 +51,10 @@ class VisitLastActionTime extends VisitDimension
*/
public function onExistingVisit(Request $request, Visitor $visitor, $action)
{
+ if ($request->getParam('ping') == 1) {
+ return false;
+ }
+
return $this->onNewVisit($request, $visitor, $action);
}
}
\ No newline at end of file
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index c1f88e035c1de5751ba940cf561888e8bfb9a3a9..9e6afdb107c47085a693d53509a89743bd3e859a 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -306,6 +306,8 @@ class CoreHome extends \Piwik\Plugin
$translationKeys[] = 'CoreHome_Segments';
$translationKeys[] = 'CoreHome_MenuEntries';
$translationKeys[] = 'SitesManager_Sites';
+ $translationKeys[] = 'CoreHome_MainNavigation';
$translationKeys[] = 'CoreHome_ChangeCurrentWebsite';
+ $translationKeys[] = 'General_CreatedByUser';
}
}
diff --git a/plugins/CoreHome/Menu.php b/plugins/CoreHome/Menu.php
index c9331e4470a8f81d79734a35df85d5c3f5a1caba..700921783394e6909b2079c00d4b8ef1713983d7 100644
--- a/plugins/CoreHome/Menu.php
+++ b/plugins/CoreHome/Menu.php
@@ -35,7 +35,7 @@ class Menu extends \Piwik\Plugin\Menu
if (Piwik::isUserIsAnonymous()) {
if (Plugin\Manager::getInstance()->isPluginActivated('ScheduledReports')) {
- $menu->addItem($login, null, array('module' => 'ScheduledReports', 'action' => 'index'), 970, Piwik::translate('ScheduledReports_PersonalEmailReports'));
+ $menu->addItem($login, null, array('module' => 'ScheduledReports', 'action' => 'index'), 970, Piwik::translate('UsersManager_PersonalSettings'));
} else {
$menu->addItem($login, null, array('module' => 'API', 'action' => 'listAllAPI'), 970, Piwik::translate('API_ReportingApiReference'));
}
diff --git a/plugins/CoreHome/Widgets/GetDonateForm.php b/plugins/CoreHome/Widgets/GetDonateForm.php
index 093fe8c3a25b0cbef71755bebe309337ba4d5af4..081afd9c03aad7f0f96dc46b54338f96db449086 100644
--- a/plugins/CoreHome/Widgets/GetDonateForm.php
+++ b/plugins/CoreHome/Widgets/GetDonateForm.php
@@ -29,7 +29,7 @@ class GetDonateForm extends Widget
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('Example Widgets');
+ $config->setCategoryId('About Piwik');
$config->setName('CoreHome_SupportPiwik');
$config->setOrder(5);
}
diff --git a/plugins/CoreHome/Widgets/GetPromoVideo.php b/plugins/CoreHome/Widgets/GetPromoVideo.php
index 49636b5e0e57c8d3ca258503b5feb0f36739227f..5ceef91f84e75e738d7a9494d5f639209b3a8989 100644
--- a/plugins/CoreHome/Widgets/GetPromoVideo.php
+++ b/plugins/CoreHome/Widgets/GetPromoVideo.php
@@ -27,7 +27,7 @@ class GetPromoVideo extends Widget
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('Example Widgets');
+ $config->setCategoryId('About Piwik');
$config->setName('Installation_Welcome');
$config->setOrder(10);
}
diff --git a/plugins/CoreHome/angularjs/common/directives/autocomplete-matched.js b/plugins/CoreHome/angularjs/common/directives/autocomplete-matched.js
index 537925358918c2b3d72dd6e846f06810f842cd1a..d90620053feccaefe817bb4402b2b623c720800b 100644
--- a/plugins/CoreHome/angularjs/common/directives/autocomplete-matched.js
+++ b/plugins/CoreHome/angularjs/common/directives/autocomplete-matched.js
@@ -37,7 +37,7 @@
return;
}
- var content = element.text();
+ var content = piwik.helper.htmlEntities(element.text());
var startTerm = content.toLowerCase().indexOf(searchTerm.toLowerCase());
if (-1 !== startTerm) {
diff --git a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html
index 9bbdc8f8f46fb881217bfe52a01faad74043bd3e..f1a6779c87b894a08185c20e8427876ee9002c47 100644
--- a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html
+++ b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html
@@ -1,9 +1,9 @@
<div class="enrichedHeadline"
ng-mouseenter="view.showIcons=true" ng-mouseleave="view.showIcons=false">
- <div ng-show="!editUrl" class="title" ng-transclude></div>
+ <div ng-show="!editUrl" class="title" ng-transclude tabindex="6"></div>
<a ng-show="editUrl" class="title" href="{{ editUrl }}"
title="{{ 'CoreHome_ClickToEditX'|translate:featureName }}"
- ng-transclude></a>
+ ng-transclude ></a>
<span ng-show="view.showIcons">
<a ng-if="helpUrl && !inlineHelp"
diff --git a/plugins/CoreHome/angularjs/quick-access/quick-access.controller.js b/plugins/CoreHome/angularjs/quick-access/quick-access.controller.js
index 9e1fefba82c4960b7c532597922e67efb78446ab..c78628036b4c10c263b191ca83190ba6b0132217 100644
--- a/plugins/CoreHome/angularjs/quick-access/quick-access.controller.js
+++ b/plugins/CoreHome/angularjs/quick-access/quick-access.controller.js
@@ -16,6 +16,10 @@
this.sitesModel = siteSelectorModel;
this.onKeypress = function (event) {
+ var areSearchResultsDisplayed = $scope.search && $scope.search.term && $scope.view && $scope.view.searchActive;
+ var isTabKey = 9 == event.which
+ var isEscKey = 27 == event.which
+
if (38 == event.which) {
$scope.highlightPreviousItem();
event.preventDefault();
@@ -24,6 +28,10 @@
event.preventDefault();
} else if (13 == event.which) {
$scope.clickQuickAccessMenuItem();
+ } else if (isTabKey && areSearchResultsDisplayed) {
+ $scope.deactivateSearch();
+ } else if (isEscKey && areSearchResultsDisplayed) {
+ $scope.deactivateSearch();
}
};
diff --git a/plugins/CoreHome/angularjs/quick-access/quick-access.directive.html b/plugins/CoreHome/angularjs/quick-access/quick-access.directive.html
index 1e76f4fe7d16ff058d0f72f603939555db3d076d..18d4eee2520f29cf304a376fffaac4543f847937 100644
--- a/plugins/CoreHome/angularjs/quick-access/quick-access.directive.html
+++ b/plugins/CoreHome/angularjs/quick-access/quick-access.directive.html
@@ -1,13 +1,15 @@
-<div class="quick-access" title="{{ quickAccessTitle }}"
+<div class="quick-access"
ng-class="{active: view.searchActive, expanded: view.searchActive}"
piwik-focus-anywhere-but-here="view.searchActive = false;">
<span class="icon-search" ng-hide="search.term || view.searchActive"
ng-mouseenter="view.searchActive=true"></span>
- <input ng-keydown="quickAccess.onKeypress($event)"
+ <input class="s"
+ title="{{ quickAccessTitle }}"
+ ng-keydown="quickAccess.onKeypress($event)"
ng-change="view.searchActive=true;quickAccess.searchMenu(search.term)"
ng-focus="view.searchActive=true"
ng-model="search.term" piwik-focus-if="view.searchActive"
- type="text"/>
+ type="text" tabindex="2"/>
<ul ng-hide="!search.term || !view.searchActive || (quickAccess.numMenuItems > 0) || (quickAccess.sitesModel.sites | length)">
<li class="no-result">{{ 'General_SearchNoResults' | translate }}</li>
</ul>
@@ -33,4 +35,4 @@
ng-click="quickAccess.selectSite(site.idsite)"
ng-repeat="site in quickAccess.sitesModel.sites"><a ng-bind-html="site.name"></a></li>
</ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/plugins/CoreHome/angularjs/quick-access/quick-access.directive.js b/plugins/CoreHome/angularjs/quick-access/quick-access.directive.js
index 35df1d2ef0e03c43577ba31342cd07a4ec07975c..e57d1b01b0b8f0bd9f86f7bd0b8bf5bc55fdfe1e 100644
--- a/plugins/CoreHome/angularjs/quick-access/quick-access.directive.js
+++ b/plugins/CoreHome/angularjs/quick-access/quick-access.directive.js
@@ -279,4 +279,4 @@
}
};
}
-})();
\ No newline at end of file
+})();
diff --git a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.directive.html b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.directive.html
index 93371a03bf007bf9c8878111b2a03506d9607989..0e32b23d7fb1abe0a386a9efd37ccf3e00b51469 100644
--- a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.directive.html
+++ b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.directive.html
@@ -1,9 +1,9 @@
-<ul class="navbar"role="menu">
+<ul class="navbar" role="menu" aria-label="{{ 'CoreHome_MainNavigation'|translate }}">
<li ng-repeat="category in menuModel.menu"
class="menuTab"
role="menuitem"
ng-class="{'active': category.active}">
- <a class="item"
+ <a class="item" tabindex="5"
href=""
ng-click="loadCategory(category)">
<span class="menu-icon {{ category.icon ? category.icon : 'icon-arrow-right' }}"></span>{{ category.name }}
@@ -16,7 +16,7 @@
role="menuitem"
ng-class="{'active': subcategory.active}">
<div ng-if="subcategory.isGroup" piwik-menudropdown show-search="true" menu-title="{{ subcategory.name|escape }}">
- <a class="item"
+ <a class="item" tabindex="5"
ng-repeat="subcat in subcategory.subcategories"
title="{{ subcat.tooltip }}"
ng-class="{'active': subcat.active}"
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html
index e4e46a676aabd1070a1acaabd5a65f09d283701d..f9f135d143797737bd739283d23675d6fb2db66b 100644
--- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html
+++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html
@@ -7,7 +7,7 @@
class="custom_select_all">
<a href="{{ getUrlAllSites() }}"
piwik-ignore-click
- ng-bind-html="allSitesText"></a>
+ ng-bind-html="allSitesText" tabindex="4"></a>
</div>
</script>
@@ -16,9 +16,9 @@
<a ng-click="view.showSitesList=!view.showSitesList; view.showSitesList && !model.isLoading && model.loadInitialSites();"
piwik-onenter="view.showSitesList=!view.showSitesList; view.showSitesList && !model.isLoading && model.loadInitialSites();"
href="javascript:void(0)"
- title="{{ 'CoreHome_ChangeCurrentWebsite'|translate:((selectedSite.name ||Â model.firstSiteName)|htmldecode) }}"
+ title="{{ 'CoreHome_ChangeCurrentWebsite'|translate:((selectedSite.name || model.firstSiteName)|htmldecode) }}"
ng-class="{'loading': model.isLoading}"
- class="title">
+ class="title" tabindex="4">
<span class="icon icon-arrow-bottom"
ng-class="{'iconHidden': model.isLoading, 'collapsed': !view.showSitesList}"></span>
<span>{{ 'General_Website'| translate }}:
@@ -37,8 +37,8 @@
ng-hide="!showSelectedSite && activeSiteId==site.idsite">
<a piwik-ignore-click href="{{ getUrlForSiteId(site.idsite) }}"
piwik-autocomplete-matched="view.searchTerm"
- title="{{Â site.name|htmldecode }}"
- ng-bind-html="site.name"></a>
+ title="{{ site.name|htmldecode }}"
+ ng-bind-html="site.name" tabindex="4"></a>
</li>
</ul>
<ul ng-show="!model.sites.length && view.searchTerm" class="ui-autocomplete ui-front ui-menu ui-widget ui-widget-content ui-corner-all siteSelect">
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
index 1614ceb4cdb9b42c99e2c33e2c43fb30a839cc9a..b6e4c3d676abc19a2aaf9d25b0cc1cfe198bc4d7 100644
--- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
+++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
@@ -94,7 +94,7 @@
.siteSelector .custom_select_ul_list li a:hover,
.siteSelector .custom_select_all a:hover {
- background: #ebeae6;
+ background: @color-silver-l95;
}
.siteSelector .custom_select_all a {
diff --git a/plugins/CoreHome/javascripts/corehome.js b/plugins/CoreHome/javascripts/corehome.js
index 4526c9ec7102584935d2078b061d29b94c35c499..e215efb799dcbacee1d47262a16b2d75bd4ec6fe 100755
--- a/plugins/CoreHome/javascripts/corehome.js
+++ b/plugins/CoreHome/javascripts/corehome.js
@@ -186,5 +186,16 @@
ajaxRequest.send(false);
});
});
+
+
+
}(jQuery));
+
+$( document ).ready(function() {
+ $('.accessibility-skip-to-content').click(function(e){
+ $('a[name="main"]').attr('tabindex', -1).focus();
+ $(window).scrollTo($('a[name="main"]'));
+ });
+
+});
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index 2ec3fb16d8b755da220cba28a6c70d3ecd3286ef..885603c0e77ebb90906835b474d953ce7f587183 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -1241,14 +1241,18 @@ $.extend(DataTable.prototype, UIControl.prototype, {
};
};
- var getText = function (text, addDefault) {
- text = _pk_translate(text);
- if (text.indexOf('%s') > 0) {
- text = text.replace('%s', '<br /><span class="action">» ');
+ var getText = function (text, addDefault, replacement) {
+ if (/(%(.\$)?s+)/g.test(_pk_translate(text))) {
+ var values = ['<br /><span class="action">» '];
+ if(replacement) {
+ values.push(replacement);
+ }
+ text = _pk_translate(text, values);
if (addDefault) text += ' (' + _pk_translate('CoreHome_Default') + ')';
text += '</span>';
+ return text;
}
- return text;
+ return _pk_translate(text);
};
var setText = function (el, paramName, textA, textB) {
@@ -1312,7 +1316,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
$(this).html(getText('CoreHome_UndoPivotBySubtable', true));
iconHighlighted = true;
} else {
- var optionLabelText = getText('CoreHome_PivotBySubtable').replace('%s', self.props.pivot_dimension_name);
+ var optionLabelText = getText('CoreHome_PivotBySubtable', false, self.props.pivot_dimension_name);
$(this).html(optionLabelText);
}
})
diff --git a/plugins/CoreHome/javascripts/top_controls.js b/plugins/CoreHome/javascripts/top_controls.js
index c94bcc128b44c130971293fb7468332ea6af48ed..96d37ffb00783a4bb886f5ad1f975ff44a62bc69 100644
--- a/plugins/CoreHome/javascripts/top_controls.js
+++ b/plugins/CoreHome/javascripts/top_controls.js
@@ -63,4 +63,51 @@ function initTopControls() {
}
}
}
+}
+
+//Keyboard controls for Top Controls Calendar through tab and enter.
+$( document ).ready(function() {
+ $('.periodSelector').keydown(function(e){
+ toggleCalendar(e);
+ })
+
+ blockPropegation();
+
+ $('.periodSelector .form-radio').keydown(function(e){
+ e.stopPropagation();
+ if(e.which==13){
+ selectPeriodRadioButton($(this));
+ }
+ })
+});
+
+function toggleCalendar(e){
+ var calendarOpen = $('.periodSelector').hasClass('expanded');
+
+ $('.periodSelector .ui-datepicker-month').attr('tabindex','4');
+ $('.periodSelector td a').attr('tabindex','4');
+ $('.periodSelector .ui-datepicker-year').attr('tabindex','4');
+ $('.periodSelector .form-radio').attr('tabindex','4');
+
+ if(e.which==13){
+ if(calendarOpen){
+ $('.periodSelector').removeClass('expanded');
+ }else{
+ $('.periodSelector').addClass('expanded');
+ }
+ }
+}
+
+function selectPeriodRadioButton(button){
+ $('.periodSelector .form-radio').removeClass('checked');
+ button.addClass('checked');
+ button.find('input').click();
+
+ blockPropegation();
+}
+
+function blockPropegation(){
+ $('.ui-datepicker-month, .ui-datepicker-year, .periodSelector td a').keydown(function(e){
+ e.stopPropagation();
+ })
}
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/ar.json b/plugins/CoreHome/lang/ar.json
index c2b944c6494988dc0b666ad215e02929d4be5e12..8cf85b39d0630b5ca001a499bf96ed79b8458ec3 100644
--- a/plugins/CoreHome/lang/ar.json
+++ b/plugins/CoreHome/lang/ar.json
@@ -24,10 +24,11 @@
"InjectedHostSuperUserWarning": "قد تكون إعدادات بايويك غير مضبوطة بشكل صØÙŠØ (مثلاً، أن يكون قد تم نقله إلى ملقم جديد مؤخراً). يمكنك إما %1$sالنقر هنا وإضاÙØ© مضيÙ%2$s ØµØ§Ù„Ø Ø¬Ø¯ÙŠØ¯ (إذا كنت تثق به)%3$sØŒ أو %4$sانقر هنا لزيارة %5$s بايويك بأمان%6$s.",
"InjectedHostWarningIntro": "أنت الآن تصل إلى Piwik من %1$s ، إلا أن Piwik قد تم إعداده للعمل على هذا العنوان : %2$s .",
"JavascriptDisabled": "يجب تÙعيل برمجيات جاÙا ÙÙŠ سبيل استخدام Piwik ÙÙŠ الوضع القياسي.<br\/> ومع ذلك، يبدو أن برمجيات جاÙا إما معطلة أو غير مدعمة ÙÙŠ متصÙØ ÙˆÙŠØ¨ الخاص بك.<br\/>لاستخدام العرض القياسي، قم بتÙعيل JavaScript من خلال تغيير إعدادات متصÙØك، ثم %1$sØاول مرة أخرى%2$s.<br\/>",
+ "MainNavigation": "التصÙØ Ø§Ù„Ø±Ø¦ÙŠØ³",
"MakeADifference": "اصنع Ùرقاً: %1$sتبرع الآن%2$s لتمويل بايويك 2.0!",
"MakeOneTimeDonation": "بديلاً عن ذلك، قم بالتبرع مرة واØدة",
"Menu": "القائمة",
- "NoPrivilegesAskPiwikAdmin": "لقد سجلت الدخول بصÙتك '%s' ولكن يبدو أنه لا توجد أي صلاØيات لك ÙÙŠ Piwik. %s اسأل مدير Piwik (انقر لمراسلته)%s gلمنØÙƒ صلاØيات \"المشاهدة\" لموقع ما.",
+ "NoPrivilegesAskPiwikAdmin": "لقد سجلت الدخول بصÙتك '%1$s' ولكن يبدو أنه لا توجد أي صلاØيات لك ÙÙŠ Piwik. %2$s اسأل مدير Piwik (انقر لمراسلته)%3$s gلمنØÙƒ صلاØيات \"المشاهدة\" لموقع ما.",
"OnlyForSuperUserAccess": "عنصر الواجهة هذا ÙŠÙعرَض للمستخدمين من Ùئة المستخدم الÙائق Ùقط.",
"PageOf": "%1$s من %2$s",
"PeriodRange": "نطاق",
@@ -46,6 +47,13 @@
"ViewAllPiwikVideoTutorials": "مشاهدة كاÙØ© دروس بايويك الÙيديوية",
"WebAnalyticsReports": "تقارير تØليلات ويب",
"YouAreUsingTheLatestVersion": "أنت الآن تستخدم اØدث إصدار من Piwik!",
- "ClickRowToExpandOrContract": "إضغط هذا الص٠لتوسيع أو طيّ الجدول الÙرعي."
+ "ClickRowToExpandOrContract": "إضغط هذا الص٠لتوسيع أو طيّ الجدول الÙرعي.",
+ "UndoPivotBySubtable": "Øصل تمركÙز لهذا التقرير %s تراجع عن التمركز",
+ "PivotBySubtable": "هذا التقرير ليس متمركزاً %1$s ، إجعله متمركزاً على %2$s",
+ "QuickAccessTitle": "إبØØ« عن %s . استخدم Ù…ÙØ§ØªÙŠØ Ø§Ù„Ø£Ø³Ù‡Ù… لتصÙØ Ù†ØªØ§Ø¦Ø¬ البØØ«. اختصار: إضغط 'f' للبØØ«.",
+ "MenuEntries": "بنود (مدخلات) القائمة",
+ "Segments": "Ùئات",
+ "AdblockIsMaybeUsed": "ÙÙŠ Øال استخدامك Ù„Øاجب إعلانات ØŒ Ùضلاً عطّله عن هذا الموقع لتضمن عمل بيويك دون مشاكل.",
+ "ChangeCurrentWebsite": "إختر موقع وب، الموقع المختار Øالياً : %s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/be.json b/plugins/CoreHome/lang/be.json
index 98d1a4ce0b8d45d632177c75f8acade0dd9e7ce7..051d521cbe46e1bda3329a7a7fef65bccfacc8b6 100644
--- a/plugins/CoreHome/lang/be.json
+++ b/plugins/CoreHome/lang/be.json
@@ -2,7 +2,7 @@
"CoreHome": {
"CategoryNoData": "ÐÑма дадзеных у гÑтай катÑгорыі. ПаÑпрабуйце \"Ўключыць уÑе паказчыкі\".",
"JavascriptDisabled": "Java-Ñкрыпт павінен быць уключаны, каб выкарыÑтоўваць Piwik Ñž звычайны Ñ€Ñжыме праглÑду.<br \/>Ðднак, здаецца, што Java-Ñкрыпт адключаны або не падтрымліваецца браўзÑрам.<br \/>Каб выкарыÑтоўваць Ñтандартны выглÑд, уключыце JavaScript, змÑніўшы наладкі браўзÑра , затым %1$sпаÑпрабуйце зноў%2$s.<br \/>",
- "NoPrivilegesAskPiwikAdmin": "Ð’Ñ‹ ўвайшлі Ñк '%s', але здаецца, што у Ð²Ð°Ñ Ð½Ñма патрÑбнага дазволу у Piwik. %s Спытайце Ñвайго Piwik адмініÑтратара (націÑнуць, каб паÑлаць паведамленне)%s, каб падаць вам дазвол Ð´Ð»Ñ Ð¿Ñ€Ð°Ð³Ð»Ñду вÑб-Ñайту.",
+ "NoPrivilegesAskPiwikAdmin": "Ð’Ñ‹ ўвайшлі Ñк '%1$s', але здаецца, што у Ð²Ð°Ñ Ð½Ñма патрÑбнага дазволу у Piwik. %2$s Спытайце Ñвайго Piwik адмініÑтратара (націÑнуць, каб паÑлаць паведамленне)%3$s, каб падаць вам дазвол Ð´Ð»Ñ Ð¿Ñ€Ð°Ð³Ð»Ñду вÑб-Ñайту.",
"PageOf": "%1$s з %2$s",
"ShowJSCode": "Паказаць Java-код Ð´Ð»Ñ ÑžÑтаўкі",
"ThereIsNoDataForThisReport": "ÐÑма дадзеных Ð´Ð»Ñ Ð³Ñтай Ñправаздачы.",
diff --git a/plugins/CoreHome/lang/bg.json b/plugins/CoreHome/lang/bg.json
index e4afb1a111ab68e6eecf399112c760a1e97fe66d..c68267fab1de9cf43ba58ba5080990db593e1b06 100644
--- a/plugins/CoreHome/lang/bg.json
+++ b/plugins/CoreHome/lang/bg.json
@@ -26,7 +26,7 @@
"MakeADifference": "Открийте разликата: %1$sДарете%2$s за фонд Piwik 2.0!",
"MakeOneTimeDonation": "Ðаправете еднократно дарение",
"Menu": "Меню",
- "NoPrivilegesAskPiwikAdmin": "Вие Ñе логнахте в като '%s' но изглежда че нÑмате разрешение от Piwik. %s Попитайте ВашиÑÑ‚ Piwik админиÑтратор (клик на email)%s да Ви даде \"поглед\" доÑтъп до Ñайта.",
+ "NoPrivilegesAskPiwikAdmin": "Вие Ñе логнахте в като '%1$s' но изглежда че нÑмате разрешение от Piwik. %2$s Попитайте ВашиÑÑ‚ Piwik админиÑтратор (клик на email)%3$s да Ви даде \"поглед\" доÑтъп до Ñайта.",
"PageOf": "%1$s от %2$s",
"PeriodRange": "Период",
"ReportGeneratedOn": "Доклада е генериран за %s",
diff --git a/plugins/CoreHome/lang/ca.json b/plugins/CoreHome/lang/ca.json
index e62e5c8e4de4ce55e94b2751388b9d1bdbb45e5f..9aab453c1e3c1dff15b386f5224ee4c3ffd2c0eb 100644
--- a/plugins/CoreHome/lang/ca.json
+++ b/plugins/CoreHome/lang/ca.json
@@ -16,7 +16,7 @@
"InjectedHostWarningIntro": "Esteu accedint al Piwik desde %1$s, però el Piwik està configurat per escoltar a l'adreça: %2$s.",
"JavascriptDisabled": "S'ha de tenir el Javascript activat per vistualitzar la vista està ndar del Piwik.<br\/> No obstant això, sembla que el Javascript esta deshabilitat or no està suportat pel vostre navegador<br\/> Per utilitzar la vista està ndarc, activeu el Javascript canviant les opcions del navegador i %1$storneu-ho a probar%2$s.<br \/>",
"MakeADifference": "Contribuieu a les millores: %1$sDonar ara%2$s per col·laborar amb Piwik 2.0!",
- "NoPrivilegesAskPiwikAdmin": "Esteu identificat com a '%s' però sembla que no teniu cap permÃs establert al Piwik. %s Pregunteu al vostre administrador de Piwik (feu click per enviar un email)%s que us dongui access per veure un lloc web.",
+ "NoPrivilegesAskPiwikAdmin": "Esteu identificat com a '%1$s' però sembla que no teniu cap permÃs establert al Piwik. %2$s Pregunteu al vostre administrador de Piwik (feu click per enviar un email)%3$s que us dongui access per veure un lloc web.",
"PageOf": "%1$s de %2$s",
"PeriodRange": "Rang",
"ReportGeneratedOn": "Informe generat el %s",
diff --git a/plugins/CoreHome/lang/cs.json b/plugins/CoreHome/lang/cs.json
index aba489871a67dc9db6cabdb1ca287e87e282b563..7bb0c2602bd84ceb7906f40d47221e5f79f214f2 100644
--- a/plugins/CoreHome/lang/cs.json
+++ b/plugins/CoreHome/lang/cs.json
@@ -20,15 +20,16 @@
"IncludeRowsWithLowPopulation": "Řádky s nÃzkou populacà jsou skryty %s Zobrazit vÅ¡echny řádky",
"InjectedHostEmailBody": "Ahoj. Dnes jsem se snažil dostat do \\Piwiku a dostal jsem varovánà o neznámém ménu hostitele.",
"InjectedHostEmailSubject": "K piwiku bylo přistupováno s neznámým jménem hostitele %s",
- "InjectedHostNonSuperUserWarning": "%1$sKliknÄ›te zde pro bezpeÄný pÅ™Ãstup k Piwiku%2$s a odstranÄ›nà tohoto varovánÃ. Pokud chcete upozornit administrátora na tento problém, %3$skliknÄ›te zde pro odeslánà emailu%4$s.",
+ "InjectedHostNonSuperUserWarning": "%1$sKliknÄ›te zde pro bezpeÄný pÅ™Ãstup k Piwiku%2$s a odstranÄ›nà tohoto varovánÃ. Pokud chcete upozornit administrátora na tento problém, (%3$skliknÄ›te zde pro odeslánà e-mailu%4$s).",
"InjectedHostSuperUserWarning": "Piwik může být Å¡patnÄ› nakonfigurován, napÅ™Ãklad pokud byl pÅ™esunut na nový server nebo URL. Můžete %1$skliknout zde a pÅ™idat %2$s jako platné jméno hostitele Piwiku (pokud mu důvěřujete)%3$s, nebo %4$s kliknÄ›te zde%5$s pro bezpeÄný pÅ™Ãstup k Piwiku%6$s.",
"InjectedHostWarningIntro": "Nynà pÅ™istupujete k Piwiku z %1$s, ale byl nakonfigurován, aby naslouchal na následujÃcà adrese: %2$s.",
"JavascriptDisabled": "MusÃte mÃt zapnutý JavaScript, jinak Piwik nezobrazÃte.<br \/> Nebo jen nenà Váš prohlÞeÄ mezi podporovanými.<br \/>Pro běžné zobrazenà zapnÄ›te JavaScript ve svém prohlÞeÄi, poté %1$szkuste znovu%2$s.<br \/>",
+ "MainNavigation": "Hlavnà navigace",
"MakeADifference": "Udělej změnu: %1$sPřispěj na vývoj%2$s nové verze Piwik 2.0",
"MakeOneTimeDonation": "Provést jednorázový dar.",
"Menu": "Menu",
- "NoPrivilegesAskPiwikAdmin": "Jste pÅ™ihlášen jako '%s' ale zdá se, že nemáte v Piwiku žádná práva. %s Zeptejte se VaÅ¡eho Piwik administrátora (klikem na email)%s aby Vám dal 'view' pÅ™Ãstup na stránku.",
- "OnlyForSuperUserAccess": "Tento widget je zobrazován pouze uživatelům se super uživatelským pÅ™Ãstupem.",
+ "NoPrivilegesAskPiwikAdmin": "Jste pÅ™ihlášen jako '%1$s' ale zdá se, že nemáte v Piwiku žádná práva. %2$s Zeptejte se VaÅ¡eho Piwik administrátora (klikem na email)%3$s aby Vám dal 'view' pÅ™Ãstup na stránku.",
+ "OnlyForSuperUserAccess": "Tento widget je zobrazován pouze uživatelům se super-uživatelským pÅ™Ãstupem.",
"PageOf": "%1$s z %2$s",
"PeriodRange": "Rozsah",
"ReportGeneratedOn": "Hlášenà vygenerované %s",
@@ -48,11 +49,11 @@
"YouAreUsingTheLatestVersion": "PoužÃváte nejnovÄ›jÅ¡Ã verzi Piwiku.",
"ClickRowToExpandOrContract": "Klikněte na tento řádek pro rozbalenà nebo zbalenà podtabulky.",
"UndoPivotBySubtable": "Toto hlášenà bylo zaměřeno %s Vrátit zpět",
- "PivotBySubtable": "Toto hlášenà nenà zaměřené %s Zaměřit na %s",
- "QuickAccessTitle": "NajÃt zástupce %s: Pro hledánà stisknÄ›te 'f'.",
+ "PivotBySubtable": "Toto hlášenà nenà zaměřené %1$s Zaměřit na %2$s",
+ "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",
"AdblockIsMaybeUsed": "Pokud použÃváte blokovaÄ reklam, zakažte ho pro tyto stránky, aby Piwik správnÄ› fungoval.",
- "ChangeCurrentWebsite": "Vybrat webovou stránku, aktuálně vybraná stránka: %s"
+ "ChangeCurrentWebsite": "Vyberte web, aktuálně vybraný web: %s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/da.json b/plugins/CoreHome/lang/da.json
index 88a490b1d02fe5d31e6de2d307e863599d0f9ebf..7c65699d1052bc4f6647096a1664fcce37831e94 100644
--- a/plugins/CoreHome/lang/da.json
+++ b/plugins/CoreHome/lang/da.json
@@ -27,7 +27,7 @@
"MakeADifference": "Gør en forskel: %1$sGiv et bidrag nu%2$s og støt Piwik 2.0!",
"MakeOneTimeDonation": "Foretag engangsdonation, i stedet.",
"Menu": "Menu",
- "NoPrivilegesAskPiwikAdmin": "Du er logget på som '%s' men det ser ikke ud som du har adgang til Piwik. %s Spørg Piwik administratoren (klik for at sende e-mail)%s for at give dig 'se' adgang til et websted.",
+ "NoPrivilegesAskPiwikAdmin": "Du er logget på som '%1$s' men det ser ikke ud som du har adgang til Piwik. %2$s Spørg Piwik administratoren (klik for at sende e-mail)%3$s for at give dig 'se' adgang til et websted.",
"OnlyForSuperUserAccess": "Modulet vises kun til brugere, der har superbruger adgang.",
"PageOf": "%1$s af %2$s",
"PeriodRange": "Interval",
@@ -48,6 +48,6 @@
"YouAreUsingTheLatestVersion": "Du bruger den seneste version af Piwik!",
"ClickRowToExpandOrContract": "Klik på rækken for at udvide eller sammentrække undertabelen.",
"UndoPivotBySubtable": "Rapporten er blevet pivoteret %s Fortryd pivot.",
- "PivotBySubtable": "Rapporten er ikke pivoteret %s Pivoter med %s."
+ "PivotBySubtable": "Rapporten er ikke pivoteret %1$s Pivoter med %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/de.json b/plugins/CoreHome/lang/de.json
index a80015d88d42272a45125c0b5f09063f19162b93..8b6b841b840491efe57799a5269d9d3c80e0848f 100644
--- a/plugins/CoreHome/lang/de.json
+++ b/plugins/CoreHome/lang/de.json
@@ -24,10 +24,11 @@
"InjectedHostSuperUserWarning": "Piwik könnte falsch konfiguriert sein (zum Beispiel wenn Piwik vor kurzem auf einen neuen Server oder eine neue URL umgezogen ist). Sie können entweder %1$shier klicken und %2$s als gültigen Hostnamen hinzufügen (wenn Sie ihm vertrauen)%3$s, oder %4$shier klicken um Piwik unter %5$s sicher zu betreten%6$s",
"InjectedHostWarningIntro": "Sie betreten Piwik aktuell von %1$s, allerdings wurde Piwik so konfiguriert, dass es unter dieser Adresse läuft: %2$s.",
"JavascriptDisabled": "JavaScript muss aktiviert sein, um die Standardansicht von Piwik zu benutzen.<br\/>Es scheint jedoch so, als wäre JavaScript bei Ihnen deaktiviert bzw. würde nicht von Ihrem Browser unterstützt.<br \/>Um die Standardansicht zu benutzen, aktivieren Sie JavaScript in Ihren Browseroptionen und %1$sversuchen Sie es erneut%2$s.<br \/>",
+ "MainNavigation": "Hauptnavigation",
"MakeADifference": "Machen Sie den Unterschied: %1$sSpenden Sie jetzt%2$s und unterstützen Sie so Piwik 2.0!",
"MakeOneTimeDonation": "Stattdessen einmalig spenden.",
"Menu": "Menü",
- "NoPrivilegesAskPiwikAdmin": "Sie sind angemeldet als '%s', aber es wurden keine Berechtigungen für diesen Benutzer in Piwik gesetzt. %s Bitte fragen Sie Ihren Piwik Administrator (klicken für E-Mail)%s um Zugriff auf die Website zu erhalten.",
+ "NoPrivilegesAskPiwikAdmin": "Sie sind angemeldet als '%1$s', aber es wurden keine Berechtigungen für diesen Benutzer in Piwik gesetzt. %2$s Bitte fragen Sie Ihren Piwik Administrator (klicken für E-Mail)%3$s um Zugriff auf die Webseite zu erhalten.",
"OnlyForSuperUserAccess": "Dieses Widget wird nur Benutzern mit Hauptadministrator-Berechtigung angezeigt.",
"PageOf": "%1$s von %2$s",
"PeriodRange": "Zeitspanne",
@@ -48,8 +49,8 @@
"YouAreUsingTheLatestVersion": "Sie verwenden die aktuelle Version von Piwik!",
"ClickRowToExpandOrContract": "Klicken Sie auf diese Zeile um die Untertabelle anzuzeigen oder zu verbergen.",
"UndoPivotBySubtable": "Pivot erstellt für diesen Bericht %s Pivot rückgängig machen",
- "PivotBySubtable": "Kein Pivot erstellt für diesen Bericht %s Pivot erstellen mit %s",
- "QuickAccessTitle": "Suche nach %s. Tastenkürzel: Drücken Sie 'f' um zu suchen.",
+ "PivotBySubtable": "Kein Pivot erstellt für diesen Bericht %1$s Pivot erstellen mit %2$s",
+ "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",
"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.",
diff --git a/plugins/CoreHome/lang/el.json b/plugins/CoreHome/lang/el.json
index ed3ae34bb24a09f3f7cfc9377d975a40bbced79d..955ccf536d7280a9240625701530b67218d8fe8a 100644
--- a/plugins/CoreHome/lang/el.json
+++ b/plugins/CoreHome/lang/el.json
@@ -24,10 +24,11 @@
"InjectedHostSuperUserWarning": "Το Piwik μποÏεί να είναι λάθος ÏυθμισμÎνο (για παÏάδειγμα, αν το Piwik Ï€Ïόσφατα μεταφÎÏθηκε σε Îνα νÎο εξυπηÏετητή ή URL). ΜποÏείτε είτε %1$sνα κάνετε κλικ εδώ και να Ï€ÏοσθÎσετε %2$s ως ÎγκυÏο όνομα εξυπηÏετητή του Piwik (αν τον εμπιστεÏεστε)%3$s ή %4$sνα κάνετε κλικ εδώ και πηγαίνετε στο %5$s για να Îχουν Ï€Ïόσβαση με ασφάλεια Piwik%6$s.",
"InjectedHostWarningIntro": "Θα Îχετε Ï€Ïόσβαση Ï„ÏŽÏα στο Piwik από το %1$s, αλλά το Piwik Îχει Ïυθμιστεί να Ï„ÏÎχει σε αυτή τη διεÏθυνση: %2$s.",
"JavascriptDisabled": "Η JavaScript Ï€ÏÎπει να ενεÏγοποιηθεί για να χÏησιμοποιήσετε το Piwik στη βασική του μοÏφή.<br \/>Ωστόσο, φαίνεται ότι η JavaScript είναι είτε απενεÏγοποιημÎνη ή δεν υποστηÏίζεται από τον φυλλομετÏητή σας.<br \/>Για τη χÏήση της βασικής μοÏφής, ενεÏγοποιήστε τη JavaScript αλλάζοντας της Ïυθμίσεις του φυλλομετÏητή σας και %1$sδοκιμάστε ξανά%2$s.<br \/>",
+ "MainNavigation": "ΚεντÏική πλοήγηση",
"MakeADifference": "Κάντε τη διαφοÏά: %1$sΔωÏίστε Ï„ÏŽÏα%2$s για τη χÏηματοδότηση του Piwik 2.0!",
"MakeOneTimeDonation": "Εναλλακτικά, κάντε μια εφάπαξ δωÏεά.",
"Menu": "ΜενοÏ",
- "NoPrivilegesAskPiwikAdmin": "Έχετε συνδεθεί ως «%s» αλλά φαίνεται να μην Îχετε οÏισμÎνα δικαιώματα στο Piwik. %s Ρωτήστε τον διαχειÏιστή του Piwik (πατήστε για να στείλετε ηλεκτÏονική επιστολή)%s για να σας δώσει δικαιώματα Ï€Ïοβολή για μια ιστοσελίδα.",
+ "NoPrivilegesAskPiwikAdmin": "Έχετε κάνει είσοδο ως '%1$s', αλλά φαίνεται ότι δεν σας Îχει δοθεί κάποιο δικαίωμα από το Piwik. %2$s Ζητήστε από το διαχειÏιστή του Piwik σας (κλικ για αποστολή e-mail)%3$s να σας δώσει δικαίωμα 'ανάγνωσης' στον ιστοτόπο.",
"OnlyForSuperUserAccess": "Το γÏαφικό συστατικό εμφανίζεται μόνο σε χÏήστες με δικαίωμα ΥπεÏ-ΧÏήστη.",
"PageOf": "%1$s από %2$s",
"PeriodRange": "ΕÏÏος",
@@ -48,8 +49,8 @@
"YouAreUsingTheLatestVersion": "ΧÏησιμοποιείτε την τελευταία Îκδοση του Piwik!",
"ClickRowToExpandOrContract": "Πατήστε στη γÏαμμή για να επεκταθεί ή να κÏυφτεί ο υποπίνακας.",
"UndoPivotBySubtable": "Η αναφοÏά θεμελιώθηκε %s ΑναίÏεση της θεμελίωσης",
- "PivotBySubtable": "Η αναφοÏά αυτή δεν είναι θεμελιωμÎνη %s Îα θεμελιωθεί από %s",
- "QuickAccessTitle": "Αναζήτηση για το %s. ΠλήκτÏο συντόμευσης: Πατήστε 'f' για αναζήτηση.",
+ "PivotBySubtable": "Η αναφοÏά αυτή δεν στηÏίζεται %1$s Pivot από %2$s",
+ "QuickAccessTitle": "Αναζήτηση για %s. ΧÏησιμοποιήστε τα βελάκια για να πλοηγηθείτε Î¼ÎµÏ„Î±Î¾Ï Ï„Ï‰Î½ αποτελεσμάτων αναζήτησης. Συντόμευση πληκτÏολογίου: πατήστε 'f' για αναζήτηση.",
"MenuEntries": "ΚαταχωÏήσεις μενοÏ",
"Segments": "Τμήματα",
"AdblockIsMaybeUsed": "Σε πεÏίπτωση που χÏησιμοποιείτε κάποια Ï€ÏόγÏαμμα που μπλοκάÏει τις διαφημίσεις, παÏακαλοÏμε απενεÏγοποιήστε το για αυτόν τον ιστοτόπο για να είστε σίγουÏοι ότι το Piwik δουλεÏει σωστά.",
diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json
index 75566a08f2ad68f1a0f3bc5a941eeb1fc1229380..cbc03002824e77936cce20f8ac57ae91e79b9403 100644
--- a/plugins/CoreHome/lang/en.json
+++ b/plugins/CoreHome/lang/en.json
@@ -24,10 +24,11 @@
"InjectedHostSuperUserWarning": "Piwik may be misconfigured (for example, if Piwik was recently moved to a new server or URL). You can either %1$sclick here and add %2$s as the valid Piwik hostname (if you trust it)%3$s, or %4$sclick here and go to %5$s to access Piwik safely%6$s.",
"InjectedHostWarningIntro": "You are now accessing Piwik from %1$s, but Piwik has been configured to run at this address: %2$s.",
"JavascriptDisabled": "JavaScript must be enabled in order for you to use Piwik in standard view.<br \/>However, it seems JavaScript is either disabled or not supported by your browser.<br \/>To use standard view, enable JavaScript by changing your browser options, then %1$stry again%2$s.<br \/>",
+ "MainNavigation": "Main navigation",
"MakeADifference": "Make a difference: %1$sDonate now%2$s to fund Piwik 2.0!",
"MakeOneTimeDonation": "Make a one time donation, instead.",
"Menu": "Menu",
- "NoPrivilegesAskPiwikAdmin": "You are logged in as '%s' but it seems you don't have any permission set in Piwik. %s Ask your Piwik administrator (click to email)%s to give you 'view' access to a website.",
+ "NoPrivilegesAskPiwikAdmin": "You are logged in as '%1$s' but it seems you don't have any permission set in Piwik. %2$s Ask your Piwik administrator (click to email)%3$s to give you 'view' access to a website.",
"OnlyForSuperUserAccess": "This widget is only displayed to users having Super User access.",
"PageOf": "%1$s of %2$s",
"PeriodRange": "Range",
@@ -48,9 +49,9 @@
"YouAreUsingTheLatestVersion": "You are using the latest version of Piwik!",
"ClickRowToExpandOrContract": "Click this row to expand or contract the subtable.",
"UndoPivotBySubtable": "This report has been pivoted %s Undo pivot",
- "PivotBySubtable": "This report is not pivoted %s Pivot by %s",
"NoSuchPage": "This page does not exist",
- "QuickAccessTitle": "Search for %s. Shortcut: Press 'f' to search.",
+ "PivotBySubtable": "This report is not pivoted %1$s Pivot by %2$s",
+ "QuickAccessTitle": "Search for %s. Use the arrow keys to navigate through search results. Shortcut: Press 'f' to search.",
"MenuEntries": "Menu entries",
"Segments": "Segments",
"AdblockIsMaybeUsed": "In case you are using an ad blocker, please disable it for this site to make sure Piwik works without any issues.",
diff --git a/plugins/CoreHome/lang/es.json b/plugins/CoreHome/lang/es.json
index 37ae02a651dc32d83b5a25b439a39d482ea9c903..189f1b485cfb8b82018b75331570bdd231c784d0 100644
--- a/plugins/CoreHome/lang/es.json
+++ b/plugins/CoreHome/lang/es.json
@@ -27,7 +27,7 @@
"MakeADifference": "Marque la diferencia: %1$sDone ahora%2$s para financiar Piwik 2.0!",
"MakeOneTimeDonation": "Entonces, haga una sola donación",
"Menu": "Menú",
- "NoPrivilegesAskPiwikAdmin": "Ha iniciado sesión como '%s', pero parece que no posee ningún permiso configurado en Piwik. %s Consulta al administrador de su Piwik (clic para enviar correo electrónico)%s para que le otorgue acceso para 'ver' en el sitio de internet.",
+ "NoPrivilegesAskPiwikAdmin": "Ha iniciado sesión como '%1$s', pero parece que no posee ningún permiso configurado en Piwik. %2$s Consulta al administrador de su Piwik (clic para enviar correo electrónico)%3$s para que le otorgue acceso para 'ver' en el sitio de internet.",
"OnlyForSuperUserAccess": "Este reproductor sólo se muestra a los usuarios con acceso Super User.",
"PageOf": "%1$s de %2$s",
"PeriodRange": "Rango",
@@ -48,6 +48,6 @@
"YouAreUsingTheLatestVersion": "¡Está utilizando la última versión de Piwik!",
"ClickRowToExpandOrContract": "Clic en esta fila para expandir o contraer la subtabla.",
"UndoPivotBySubtable": "Este informe ha sido girado %s Deshacer giro",
- "PivotBySubtable": "Este informe no es girado %s Giro por %s"
+ "PivotBySubtable": "Este informe no es girado %1$s Giro por %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/fa.json b/plugins/CoreHome/lang/fa.json
index 26f701e2c2a8a9fed1240702b918176eb27f38e9..b6e80d44f71af1773e7f106e92f7b0b9dcb6cf7c 100644
--- a/plugins/CoreHome/lang/fa.json
+++ b/plugins/CoreHome/lang/fa.json
@@ -16,7 +16,7 @@
"InjectedHostEmailSubject": "دسترسی به پیویک توسط یک میزبان ناشناخته انجام شده است: %s",
"MakeADifference": "یک تÙاوت ایجاد کنید: %1$sبه پیویک هدیه بدهید%2$s تا در پیویک 2.0 سرمایه گذاری کنیم!",
"MakeOneTimeDonation": "یک بار کمک مالی انجام دهید.",
- "NoPrivilegesAskPiwikAdmin": "شما به عنوان %s وارد شده اید , اما به نظر می رسد که شما اجازه دسترسی به هیچ بخشی از پیویک را ندارید. %s از مدیریت پیویک تان بخواهید (برای ارسال ایمیل کلیک کنید)%s تا به شما دسترسی \"مشاهده\" یک وبسایت را بدهد.",
+ "NoPrivilegesAskPiwikAdmin": "شما به عنوان %1$s وارد شده اید , اما به نظر می رسد که شما اجازه دسترسی به هیچ بخشی از پیویک را ندارید. %2$s از مدیریت پیویک تان بخواهید (برای ارسال ایمیل کلیک کنید)%3$s تا به شما دسترسی \"مشاهده\" یک وبسایت را بدهد.",
"OnlyForSuperUserAccess": "این ویجت Ùقط برای کاربران با دسترسی ابرکاربر قابل مشاهده است.",
"PageOf": "%1$s از %2$s",
"PeriodRange": "بازه",
diff --git a/plugins/CoreHome/lang/fi.json b/plugins/CoreHome/lang/fi.json
index 396119d87ea6e246e829096f6f7920b8a40699de..382429907e20f4e5cce9f1826f1ec66c0d639f37 100644
--- a/plugins/CoreHome/lang/fi.json
+++ b/plugins/CoreHome/lang/fi.json
@@ -25,7 +25,7 @@
"JavascriptDisabled": "JavaScriptin täytyy olla käytössä normaalinäkymässä.<br \/>JavaScript ei ole päällä tai ei ole tuettu selaimessasi.<br \/>Ota JavaScript käyttöön selaimesi asetuksista ja %1$syritä uudelleen%2$s.<br\/>",
"MakeADifference": "Ole mukana vaikuttamassa: %1$sTee lahjoitus%2$s Piwik 2.0 version rahoittamiseksi!",
"MakeOneTimeDonation": "Lahjoita kertasumma.",
- "NoPrivilegesAskPiwikAdmin": "Olet kirjautuneena sisään käyttäjänä '%s', mutta sinulla ei ole mitään oikeuksia Piwikissä. %sPyydä Piwikin ylläpitäjää (klikkaa avataksesi sähköpostin)%s antamaan katseluoikeudet verkkosivuun.",
+ "NoPrivilegesAskPiwikAdmin": "Olet kirjautuneena sisään käyttäjänä '%1$s', mutta sinulla ei ole mitään oikeuksia Piwikissä. %2$sPyydä Piwikin ylläpitäjää (klikkaa avataksesi sähköpostin)%3$s antamaan katseluoikeudet verkkosivuun.",
"OnlyForSuperUserAccess": "Tämä widget näkyy ainoastaan käyttäjille, joilla on Superkäyttäjän oikeudet.",
"PageOf": "%1$s of %2$s",
"PeriodRange": "Alue",
@@ -45,6 +45,6 @@
"YouAreUsingTheLatestVersion": "Käytössäsi on uusin versio Piwikistä!",
"ClickRowToExpandOrContract": "Klikkaa tätä riviä avataksesi tai sulkeaksesi alataulukon.",
"UndoPivotBySubtable": "Tämä raportti on käännetty %s:llä. Kumoa kääntö",
- "PivotBySubtable": "Tämä raportti ei ole käännetty %s:n mukaan. Käännetty %s:llä."
+ "PivotBySubtable": "Tämä raportti ei ole käännetty %1$s:n mukaan. Käännetty %2$s:llä."
}
}
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/fr.json b/plugins/CoreHome/lang/fr.json
index 95d1b7ba2f4dfed7b0280e461c1163e3ce21262f..ff41959551b8d9693f46409c46eccbeca0d7cf4b 100644
--- a/plugins/CoreHome/lang/fr.json
+++ b/plugins/CoreHome/lang/fr.json
@@ -24,10 +24,11 @@
"InjectedHostSuperUserWarning": "Piwik est probablement mal configuré (par exemple, si Piwik a récemment été déplacé vers un nouveau serveur ou une nouvelle URL). Vous pouvez ou %1$scliquer ici et l'ajouter %2$s en tant que nom d'hôte Piwik valide (si vous lui faites confiance)%3$s, ou %4$s cliquer ici et accéder %5$s à Piwik de manière sécurisée%6$s.",
"InjectedHostWarningIntro": "Vous accédez maintenant à Piwik depuis %1$s, mais Piwik a été configuré pour s'exécuter à cette adresse : %2$s.",
"JavascriptDisabled": "JavaScript doit être activé pour que vous puissiez utiliser Piwik de manière basique.<br \/>Cependant, il semble que JasvaScript ne soit pas supporté ou soit désactivé sur votre navigateur.<br \/>Pour utiliser l'interface basique, activez JavaScript en modifiant les options de votre navigateur, ensuite %1$sessayez encore%2$s.<br \/>",
+ "MainNavigation": "Navigation principale",
"MakeADifference": "Faites une différence : %1$sDonnez Maintenant%2$s pour financer Piwik 2.0!",
"MakeOneTimeDonation": "Faire un don unique à la place.",
"Menu": "Menu",
- "NoPrivilegesAskPiwikAdmin": "Vous êtes connecté en tant que '%s' mais il semble que nous n'ayez aucune permission définie dans Piwik. %s Demandez à votre administrateur (cliquez pour envoyer un e-mail)%s de vous donner l'accès 'Consultation' à un site web.",
+ "NoPrivilegesAskPiwikAdmin": "Vous êtes connecté en tant que '%1$s' mais il semble que nous n'ayez aucune permission définie dans Piwik. %2$s Demandez à votre administrateur (cliquez pour envoyer un e-mail)%3$s de vous donner l'accès 'Consultation' à un site web.",
"OnlyForSuperUserAccess": "Ce widget est uniquement affiché aux utilisateurs possédant un accès de type super utilisateur.",
"PageOf": "%1$s de %2$s",
"PeriodRange": "Etendue",
@@ -48,8 +49,7 @@
"YouAreUsingTheLatestVersion": "Vous utilisez la dernière version de Piwik!",
"ClickRowToExpandOrContract": "Cliquez sur cette rangée pour afficher ou masquer le sous-tableau",
"UndoPivotBySubtable": "Ce rapport a été pivoté %s Annuler le pivot",
- "PivotBySubtable": "Ce rapport n'a pas été pivoté %s Pivoter par %s",
- "QuickAccessTitle": "Recherchez %s. Raccourci : pressez \"f\" pour rechercher.",
+ "PivotBySubtable": "Ce rapport n'a pas été pivoté %1$s Pivoter par %2$s",
"MenuEntries": "Entrées de menu",
"Segments": "Segments",
"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.",
diff --git a/plugins/CoreHome/lang/hi.json b/plugins/CoreHome/lang/hi.json
index 719ccb4c607e016e2531765f9cde893c4a560481..62b280843eeada3056f7f3333d58373da6cd78ec 100644
--- a/plugins/CoreHome/lang/hi.json
+++ b/plugins/CoreHome/lang/hi.json
@@ -26,7 +26,7 @@
"JavascriptDisabled": "आप मानक दृशà¥à¤¯ में Piwik का उपयोग करने के लिठजावासà¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿ कà¥à¤°à¤® में सकà¥à¤·à¤® होना चाहिà¤. <br \/> हालांकि, à¤à¤¸à¤¾ लगता है कि या तो जावासà¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿ आपके बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤° से अकà¥à¤·à¤® या समरà¥à¤¥à¤¿à¤¤ नहीं है.<br \/>मानक दृशà¥à¤¯ का उपयोग करने के लिà¤, अपने बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤° के विकलà¥à¤ª बदलकर JavaScript सकà¥à¤·à¤® करें, तब %1$s फिर कोशिश करें %2$s. <br\/>",
"MakeADifference": "à¤à¤• फरà¥à¤•: निधि Piwik 2.0 के लिठ%1$sअà¤à¥€ दान करे%2$s!",
"MakeOneTimeDonation": "इसके बजाय, à¤à¤• समय दान करें.",
- "NoPrivilegesAskPiwikAdmin": "आप '%s' के रूप में लॉग इन किया है, लेकिन यह आपको Piwik में निरà¥à¤§à¤¾à¤°à¤¿à¤¤ कोई à¤à¥€ अनà¥à¤®à¤¤à¤¿ नहीं है लगता है. à¤à¤• वेबसाइट पर 'दृशà¥à¤¯' पहà¥à¤‚च देने के लिठआपके %sPiwik वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤• (ईमेल के लिठकà¥à¤²à¤¿à¤• करें)%s से पूछो.",
+ "NoPrivilegesAskPiwikAdmin": "आप '%1$s' के रूप में लॉग इन किया है, लेकिन यह आपको Piwik में निरà¥à¤§à¤¾à¤°à¤¿à¤¤ कोई à¤à¥€ अनà¥à¤®à¤¤à¤¿ नहीं है लगता है. à¤à¤• वेबसाइट पर 'दृशà¥à¤¯' पहà¥à¤‚च देने के लिठआपके %2$sPiwik वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤• (ईमेल के लिठकà¥à¤²à¤¿à¤• करें)%3$s से पूछो.",
"PageOf": "%1$s का %2$s",
"PeriodRange": "सीमा",
"ReportGeneratedOn": "%s पर उतà¥à¤ªà¤¨à¥à¤¨ रिपोरà¥à¤Ÿ",
diff --git a/plugins/CoreHome/lang/hu.json b/plugins/CoreHome/lang/hu.json
index 921823e414761c4e50780cc610c221a7e00ea178..26a7004854e13ed7659f1abe0d823b29719fd49d 100644
--- a/plugins/CoreHome/lang/hu.json
+++ b/plugins/CoreHome/lang/hu.json
@@ -2,7 +2,7 @@
"CoreHome": {
"CategoryNoData": "Nincs adat ebben a kategóriában. Próbáld meg a \"Tartalmazza a teljes populációt\" opciót.",
"JavascriptDisabled": "A normál nézet megtekintéséhez JavaScript szükséges.<br \/>Úgy tűnik azonban, hogy a JavaScript vagy nem engedélyezett, vagy pedig nem támogatott a böngésződben.<br \/>A normál nézet eléréséhez engedélyezd a JavaScriptet böngésződben, majd %1$stöltsd be az oldalt újra!%2$s.<br \/>",
- "NoPrivilegesAskPiwikAdmin": "'%s' felhasználóként léptél be, de úgy tűnik, hogy nem rendelkezel semmilyen jogosultsággal. %s Kérd meg a Piwik adminisztrátorod (kattints ide egy email Ãrásához)%s, hogy adjon számodra 'megtekintési' jogosultságot a webhelyhez.",
+ "NoPrivilegesAskPiwikAdmin": "'%1$s' felhasználóként léptél be, de úgy tűnik, hogy nem rendelkezel semmilyen jogosultsággal. %2$s Kérd meg a Piwik adminisztrátorod (kattints ide egy email Ãrásához)%3$s, hogy adjon számodra 'megtekintési' jogosultságot a webhelyhez.",
"PageOf": "%1$s — %2$s",
"ShowJSCode": "Mutasd a JavaScript kódot a beillesztéshez",
"ThereIsNoDataForThisReport": "Nincs adat ehhez a jelentéshez.",
diff --git a/plugins/CoreHome/lang/id.json b/plugins/CoreHome/lang/id.json
index 8de1d7e590736e074b926bf9b2d3c1661124dd12..78b2c4476028564fbd518c477e927304f5cfd923 100644
--- a/plugins/CoreHome/lang/id.json
+++ b/plugins/CoreHome/lang/id.json
@@ -24,7 +24,7 @@
"JavascriptDisabled": "JavaScript harus diaktifkan untuk melihat Piwik di tampilan standar. <br \/>Namun, tampaknya JavaScript dimatikan atau tidak didukung oleh peramban Anda. <br \/>Untuk menggunakan tampilan standar, aktifkan JavaScript dengan mengubah pengaturab peramban Anda, lalu %1$scoba lagi%2$s. <br \/>",
"MakeADifference": "Buat perbedaan: %1$sMenyumbang sekarang%2$s untuk mendanai Piwik 2.0!",
"MakeOneTimeDonation": "Buat satu kali sumbangan saja.",
- "NoPrivilegesAskPiwikAdmin": "Anda masuk sebagai '%s' tetapi sepertinya Anda tidak memiliki izin apapun di Piwik. %s Tanyakan kepada pengelola Piwik Anda (klik untuk kirim surel)%s untuk memberikan akses 'Lihat' ke situs.",
+ "NoPrivilegesAskPiwikAdmin": "Anda masuk sebagai '%1$s' tetapi sepertinya Anda tidak memiliki izin apapun di Piwik. %2$s Tanyakan kepada pengelola Piwik Anda (klik untuk kirim surel)%3$s untuk memberikan akses 'Lihat' ke situs.",
"PageOf": "%1$s dari %2$s",
"PeriodRange": "Rentang",
"ReportGeneratedOn": "Laporan dibuat dalam %s",
diff --git a/plugins/CoreHome/lang/it.json b/plugins/CoreHome/lang/it.json
index 37c9c5fc1ab7932011f5f81f70f010562ddcb4d4..913208c21ea1f113e477f932ea3510629f535689 100644
--- a/plugins/CoreHome/lang/it.json
+++ b/plugins/CoreHome/lang/it.json
@@ -24,10 +24,11 @@
"InjectedHostSuperUserWarning": "Piwik può essere configurato in modo errato (ad esempio, se Piwik è stato recentemente spostato in un nuovo server o URL). È possibile %1$sFare clic qui e aggiungere %2$s come hostname valido per Piwik (se ti fidi di esso)%3$s, o %4$sFare clic qui e andare a %5$s per accedere in modo sicuro a Piwik%6$s.",
"InjectedHostWarningIntro": "Stai accedendo a Piwik da %1$s ma Piwik è stato configuraato per girare a questo indirizzo: %2$s.",
"JavascriptDisabled": "JavaScript deve essere abilitato per poter utilizzare Piwik in visualizzazione standard.<br \/>Tuttavia, sembra che JavaScript sia disabilitato o non supportato dal tuo browser.<br \/> Per utilizzare la visualizzazione standard, attiva JavaScript modificando le opzioni del browser, quindi %1$sprova ancora%2$s.<br \/>",
+ "MainNavigation": "Navigazione principale",
"MakeADifference": "Fa' la differenza: %1$sDona adesso%2$s per finanziare Piwik 2.0!",
"MakeOneTimeDonation": "Fa' una donazione unica.",
"Menu": "Menu",
- "NoPrivilegesAskPiwikAdmin": "Sei loggato come '%s', ma a quanto pare non hai alcuna autorizzazione in Piwik. %s Contatta l'amministratore di Piwik (clicca per e-mail)%s per consentire la visualizzazione di un sito web.",
+ "NoPrivilegesAskPiwikAdmin": "Sei stato registrato come '%1$s', ma a quanto pare non si dispone di alcuna autorizzazione in Piwik. %2$s Contattare l'amministratore Piwik (clicca per e-mail) %3$s per consentire la visualizzazione di un sito web.",
"OnlyForSuperUserAccess": "Questo widget è visualizzato solo dagli utenti che hanno un accesso Super User.",
"PageOf": "%1$s di %2$s",
"PeriodRange": "Intervallo",
@@ -48,8 +49,8 @@
"YouAreUsingTheLatestVersion": "Stai utilizzando l'ultima versione di Piwik!",
"ClickRowToExpandOrContract": "Clicca su questa riga per espandere o restringere la sotto-tabella.",
"UndoPivotBySubtable": "Questo report è stato imperniato al Pivot %s Undo",
- "PivotBySubtable": "Questo report non è imperniato al Pivot %s da %s",
- "QuickAccessTitle": "Cerca %s. Shortcut: Premi 'f' per la ricerca.",
+ "PivotBySubtable": "Questo report non è imperniato al Pivot %1$s da %2$s",
+ "QuickAccessTitle": "Ricerca per %s. Utilizza i tasti freccia per navigare tra i risultati di ricerca. Scorciatoia: premi 'f' per cercare.",
"MenuEntries": "Ingressi da menù",
"Segments": "Segmenti",
"AdblockIsMaybeUsed": "Se stai utilizzando un plugin di blocco della pubblicità , disabilitalo per questo sito, per essere sicuro che Piwik lavori senza problemi.",
diff --git a/plugins/CoreHome/lang/ja.json b/plugins/CoreHome/lang/ja.json
index d328182c53945b25c5c5b6a80114a677a925d262..83d636991ea32caf9e2e059f58e2a1089e8f8407 100644
--- a/plugins/CoreHome/lang/ja.json
+++ b/plugins/CoreHome/lang/ja.json
@@ -27,7 +27,7 @@
"MakeADifference": "ãœã²ã€æ–°ã—ã„変化を生ã¿å‡ºã—ã¦ãã ã•ã„ : Piwik 2.0 基金㫠%1$sDonate now%2$s !",
"MakeOneTimeDonation": "代ã‚ã‚Šã«å¯„与をã™ã‚‹",
"Menu": "メニュー",
- "NoPrivilegesAskPiwikAdmin": "'%s'ã¨ã—ã¦ãƒã‚°ã‚¤ãƒ³ã—ã¦ã„ã¾ã™ãŒã€æ¨©é™ãŒè¨å®šã•ã‚Œã¦ã„ãªã„よã†ã§ã™ã€‚ %s Piwikã®ç®¡ç†è€…(クリックã—ã¦Eメール)%s ã«'表示'ã®æ¨©é™ã‚’与ãˆã¦ã‚‚らã£ã¦ãã ã•ã„。",
+ "NoPrivilegesAskPiwikAdmin": "'%1$s'ã¨ã—ã¦ãƒã‚°ã‚¤ãƒ³ã—ã¦ã„ã¾ã™ãŒã€æ¨©é™ãŒè¨å®šã•ã‚Œã¦ã„ãªã„よã†ã§ã™ã€‚ %2$s Piwikã®ç®¡ç†è€…(クリックã—ã¦Eメール)%3$s ã«'表示'ã®æ¨©é™ã‚’与ãˆã¦ã‚‚らã£ã¦ãã ã•ã„。",
"OnlyForSuperUserAccess": "ã“ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã¯ã€ã‚¹ãƒ¼ãƒ‘ーユーザã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ã‚’æŒã¤ãƒ¦ãƒ¼ã‚¶ã«ã®ã¿è¡¨ç¤ºã•ã‚Œã¾ã™",
"PageOf": "%1$s \/ %2$s",
"PeriodRange": "期間",
@@ -48,8 +48,7 @@
"YouAreUsingTheLatestVersion": "Piwik ã®æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’使用ã—ã¦ã„ã¾ã™ ï¼",
"ClickRowToExpandOrContract": "サブテーブルを拡大ã¾ãŸã¯ç¸®å°ã™ã‚‹ã«ã¯ã€ã“ã®åˆ—をクリックã—ã¦ãã ã•ã„。",
"UndoPivotBySubtable": "ã“ã®ãƒ¬ãƒãƒ¼ãƒˆã¯ã€%s å…ƒã«æˆ»ã™ãƒ”ボットを旋回ã—ã¾ã—ãŸã€‚",
- "PivotBySubtable": "ã“ã®ãƒ¬ãƒãƒ¼ãƒˆã¯ã€%s ㌠%s ピボット を旋回ã—ã¦ã„ã¾ã›ã‚“。",
- "QuickAccessTitle": "%s を検索。ショートカット: ' f' ã‚ーを押ã—ã¦æ¤œç´¢ã—ã¾ã™ã€‚",
+ "PivotBySubtable": "ã“ã®ãƒ¬ãƒãƒ¼ãƒˆã¯ã€%1$s ㌠%2$s ピボット を旋回ã—ã¦ã„ã¾ã›ã‚“。",
"MenuEntries": "メニュー エントリー",
"Segments": "セグメント",
"AdblockIsMaybeUsed": "広告ブãƒãƒƒã‚«ãƒ¼ã‚’使用ã—ã¦ã„ã‚‹å ´åˆã«ã¯ã€Piwik ãŒå•é¡Œãªã動作ã™ã‚‹ã“ã¨ã‚’確èªã™ã‚‹ãŸã‚ã«ã€ã“ã®ã‚µã‚¤ãƒˆã§ãれを無効ã«ã—ã¦ãã ã•ã„。",
diff --git a/plugins/CoreHome/lang/ko.json b/plugins/CoreHome/lang/ko.json
index aee10161d2d3aebd3ba04f1c3765d20bbfc0ddaa..53f815c4ccbe7b7be11a864dda6910cc98efcc01 100644
--- a/plugins/CoreHome/lang/ko.json
+++ b/plugins/CoreHome/lang/ko.json
@@ -27,7 +27,7 @@
"MakeADifference": "개발 지ì›: Piwik 2.0ì— %1$s기부해 주세요%2$s!",
"MakeOneTimeDonation": "ë˜ëŠ”, í•œ 번만 기부합니다.",
"Menu": "메뉴",
- "NoPrivilegesAskPiwikAdmin": "'%s'ë¡œ 로그ì¸ë˜ì—ˆì§€ë§Œ ê¶Œí•œì´ ì„¤ì •ë˜ì–´ 있지 않습니다. %s Piwik 관리ìž(í´ë¦ ì´ë©”ì¼) %sì— '보기'ê¶Œí•œì„ ë¶€ì—¬ 받으세요.",
+ "NoPrivilegesAskPiwikAdmin": "'%1$s'ë¡œ 로그ì¸ë˜ì—ˆì§€ë§Œ ê¶Œí•œì´ ì„¤ì •ë˜ì–´ 있지 않습니다. %2$s Piwik 관리ìž(í´ë¦ ì´ë©”ì¼) %3$sì— '보기'ê¶Œí•œì„ ë¶€ì—¬ 받으세요.",
"OnlyForSuperUserAccess": "해당 ìœ„ì ¯ì€ ìœ ì €ê°€ ìˆ˜í¼ ìœ ì €ì¼ ê²½ìš°ì—만 나타납니다.",
"PageOf": "%1$s \/ %2$s",
"PeriodRange": "기간",
@@ -47,7 +47,8 @@
"WebAnalyticsReports": "웹 ë¶„ì„ ë³´ê³ ì„œ",
"YouAreUsingTheLatestVersion": "Piwik ìµœì‹ ë²„ì „ì„ ì‚¬ìš©í•˜ê³ ìžˆìŠµë‹ˆë‹¤!",
"ClickRowToExpandOrContract": "하위 í…Œì´ë¸”ì˜ í–‰ì„ í™•ìž¥í•˜ê±°ë‚˜ 축소하기 위해 í´ë¦í•˜ì„¸ìš”.",
- "QuickAccessTitle": "%s 검색하기. 단축키: ê²€ìƒ‰ì„ í•˜ë ¤ë©´ 'f'를 누르세요.",
+ "UndoPivotBySubtable": "ì´ ë³´ê³ ì„œëŠ” %s Undo pivotì— ì˜í•´ ê²°ì •ë˜ì—ˆìŠµë‹ˆë‹¤.",
+ "PivotBySubtable": "ì´ ë³´ê³ ì„œëŠ” %1$s Pivotì´ %2$sì— ì˜í•´ ê²°ì •ë˜ì§€ 않았습니다.",
"MenuEntries": "메뉴",
"Segments": "세그멘트",
"AdblockIsMaybeUsed": "Piwikê°€ ë¬¸ì œ ì—†ì´ ë™ìž‘하기 위해서 ê´‘ê³ ì°¨ë‹¨ê¸°ëŠ¥ì´ ìžˆëŠ” 플러그ì¸ì„ 꺼주시길 ë°”ëžë‹ˆë‹¤.",
diff --git a/plugins/CoreHome/lang/lt.json b/plugins/CoreHome/lang/lt.json
index 907f1bf17816bf4bacc7eb20c2359785d224e941..daa7ec170136fba981fd292aa4bd7416a8a1d719 100644
--- a/plugins/CoreHome/lang/lt.json
+++ b/plugins/CoreHome/lang/lt.json
@@ -1,7 +1,9 @@
{
"CoreHome": {
"CategoryNoData": "Šioje kategorijoje duomenų nėra. Pabandykite \"Įtraukti visą populiaciją\"",
+ "CheckForUpdates": "Tikrinti ar yra atnaujinimų",
"JavascriptDisabled": "JavaScript turi bÅ«ti įjungta, kad bÅ«tų galima naudoti standartinÄ™ Piwik iÅ¡vaizdÄ….<br \/>TaÄiau panaÅ¡u, kad JavaScript yra arba iÅ¡jungta, arba nepalaikoma JÅ«sų narÅ¡yklÄ—s.<br \/>NorÄ—dami matyti standartinÄ™ iÅ¡vaizdÄ…, įjunkite JavaScript keisdami savo narÅ¡yklÄ—s nustatymus, tada %1$sbandykite dar kartÄ…%2$s.<br \/>",
+ "Menu": "Meniu",
"PageOf": "%1$s iš %2$s",
"SharePiwikShort": "Piwik! Nemokama\/laisva saityno analitika. Būkite savo duomenų savininkais.",
"ShowJSCode": "Parodyti JavaScript kodą įvedimui",
diff --git a/plugins/CoreHome/lang/lv.json b/plugins/CoreHome/lang/lv.json
index bc41f75746750122f3d7be9827eb472126f0b311..d9f56e9eef43fa746d8ca9fe55e1d6db211f99b9 100644
--- a/plugins/CoreHome/lang/lv.json
+++ b/plugins/CoreHome/lang/lv.json
@@ -2,7 +2,7 @@
"CoreHome": {
"CategoryNoData": "Nav datu Å¡ajÄ kategorijÄ. MÄ“Ä£iniet izvÄ“lÄ“ties \"Iekļaut visu apmeklÄ“jumu\".",
"JavascriptDisabled": "Lai lietotu Piwik tÄ standartskatÄ, ir jÄieslÄ“dz JavaScript.<br \/>TomÄ“r izskatÄs, ka JavaScript atbalsts ir izslÄ“gts vai arÄ« to neatbalsts JÅ«su pÄrlÅ«ks.<br \/>Lai lietotu standartskatu, ieslÄ“dziet JavaScript atbalstu pÄrlÅ«ka iestatÄ«jumos, tad %1$smÄ“Ä£iniet atkÄrtoti%2$s.<br \/>",
- "NoPrivilegesAskPiwikAdmin": "JÅ«s esat ienÄkuÅ¡i kÄ '%s', bet izskatÄs, ka Jums nav iestatÄ«tas vajadzÄ«gÄs Piwik atļaujas. %s Pieprasiet savam Piwik administratoram (klikÅ¡Ä·iniet, lai nosÅ«tÄ«tu e-pastu)%s Jums pieslÄ“gt vietnes apskates atļauju.",
+ "NoPrivilegesAskPiwikAdmin": "JÅ«s esat ienÄkuÅ¡i kÄ '%1$s', bet izskatÄs, ka Jums nav iestatÄ«tas vajadzÄ«gÄs Piwik atļaujas. %2$s Pieprasiet savam Piwik administratoram (klikÅ¡Ä·iniet, lai nosÅ«tÄ«tu e-pastu)%3$s Jums pieslÄ“gt vietnes apskates atļauju.",
"PageOf": "%1$s no %2$s",
"ShowJSCode": "RÄdÄ«t ievietoÅ¡anai paredzÄ“to JavaScript kodu",
"ThereIsNoDataForThisReport": "Nav šajai atskaitei vajadzīgo datu.",
diff --git a/plugins/CoreHome/lang/nb.json b/plugins/CoreHome/lang/nb.json
index 18676eed7bd3b405e27dd11fe2450a2287995710..e8d177486dccbca2269273a55e3793e5a859dab5 100644
--- a/plugins/CoreHome/lang/nb.json
+++ b/plugins/CoreHome/lang/nb.json
@@ -24,10 +24,11 @@
"InjectedHostSuperUserWarning": "Piwik kan være feilkonfigurert (for eksempel hvis Piwik nylig var flyttet til en ny tjener eller ny URL). Du kan enten %1$sklikke her og legge til %2$s som et gyldig Piwik-vertsnavn (hvis du stoler på det)%3$s eller %4$sklikk her og gå til %5$s for sikker tilgang til Piwik%6$s.",
"InjectedHostWarningIntro": "Du har tilgang til Piwik fra %1$s, men Piwik er konfigurert til å kjøre på adressen: %2$s",
"JavascriptDisabled": "JavaScript må være aktivert for at du skal kunne bruke Piwik i standardvisning.<br \/>Det ser ut til at JavaScript enten er deaktivert eller ikke støttet av din nettleser.<br \/>For å bruke standardvisning, må du aktivere JavaScript i nettleserinnstillingene og deretter %1$sprøve igjen%2$s.<br \/>",
+ "MainNavigation": "Hovednavigasjon",
"MakeADifference": "Gjør en forskjell: %1$sDoner nå%2$s for å finansiere Piwik 2.0!",
"MakeOneTimeDonation": "Bidra med en engangsdonasjon i stedet.",
"Menu": "Meny",
- "NoPrivilegesAskPiwikAdmin": "Du er logget inn som «%s», men det ser ut til at du ikke har noen rettigheter satt i Piwik. %s Be din Piwik-administrator (klikk for å sende e-post)%s å gi deg «vis»-tilgang til et nettsted.",
+ "NoPrivilegesAskPiwikAdmin": "Du er logget inn som «%1$s», men det ser ut til at du ikke har noen rettigheter satt i Piwik. %2$s Be din Piwik-administrator (klikk for å sende e-post)%3$s å gi deg «vis»-tilgang til et nettsted.",
"OnlyForSuperUserAccess": "Denne widgeten vises kun til brukere som har superbruker-tilgang.",
"PageOf": "%1$s av %2$s",
"PeriodRange": "Periode",
@@ -48,8 +49,8 @@
"YouAreUsingTheLatestVersion": "Du bruker den nyeste versjonen av Piwik!",
"ClickRowToExpandOrContract": "Klikk denne raden for utvide eller slå sammen undertabellen.",
"UndoPivotBySubtable": "Denne rapporten er pivotert %s Angre pivot",
- "PivotBySubtable": "Denne rapporten er ikke pivotert %s Pivot etter %s",
- "QuickAccessTitle": "Søk etter %s. Snarvei: Trykk «f» for å søke.",
+ "PivotBySubtable": "Denne rapporten er ikke pivotert %1$s Pivot etter %2$s",
+ "QuickAccessTitle": "Søk etter %s. Bruk piltastene for å navigere i søkeresultatene. Snarvei: trykk «f» for å søke.",
"MenuEntries": "Menyvalg",
"Segments": "Segmenter",
"AdblockIsMaybeUsed": "Hvis du bruker en ad-blocker, vennligst deaktiver den for dette nettstedet for å forsikre deg om at Piwik fungerer som det skal.",
diff --git a/plugins/CoreHome/lang/nl.json b/plugins/CoreHome/lang/nl.json
index 56ac3bee35b97ecea738de00ab08778fe59683d3..a82520ae65e171c6268e669a458c626d5fd7935e 100644
--- a/plugins/CoreHome/lang/nl.json
+++ b/plugins/CoreHome/lang/nl.json
@@ -27,7 +27,7 @@
"MakeADifference": "Maak een verschil: %1$sDoneer nu%2$s om Piwik 2.0 te steunen!",
"MakeOneTimeDonation": "Doe een eennmalige donatie in de plaats.",
"Menu": "Menu",
- "NoPrivilegesAskPiwikAdmin": "U bent aangemeld as '%s'. Maar het lijkt er op dat u geen rechten hebt op Piwik te bezoeken. %sVraag aan uw webmaster (klik hier voor e-mail)%s of hij u de juiste rechten wilt geven om de statistieken te bekijken.",
+ "NoPrivilegesAskPiwikAdmin": "U bent aangemeld as '%1$s'. Maar het lijkt er op dat u geen rechten hebt op Piwik te bezoeken. %2$sVraag aan uw webmaster (klik hier voor e-mail)%3$s of hij u de juiste rechten wilt geven om de statistieken te bekijken.",
"OnlyForSuperUserAccess": "Deze widget wordt alleen getoond aan superusers.",
"PageOf": "%1$s of %2$s",
"PeriodRange": "Datumbereik",
@@ -48,6 +48,6 @@
"YouAreUsingTheLatestVersion": "Je gebruikt de laatste versie van Piwik!",
"ClickRowToExpandOrContract": "Klik deze regel om de tabel te openen of te sluiten.",
"UndoPivotBySubtable": "Dit rapport wordt als een draaitabel getoond, %s schakel de draaitabel uit.",
- "PivotBySubtable": "Dit rapport wordt niet als een draaitabel getoond, %s maak een draaitabel op basis van %s"
+ "PivotBySubtable": "Dit rapport wordt niet als een draaitabel getoond, %1$s maak een draaitabel op basis van %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/nn.json b/plugins/CoreHome/lang/nn.json
index 4e532bea24495e509f591dd6ffab7d9973010e92..d52bec6fd8051ba2ba1a520d2d14174ab5b6f16a 100644
--- a/plugins/CoreHome/lang/nn.json
+++ b/plugins/CoreHome/lang/nn.json
@@ -9,7 +9,7 @@
"FlattenDataTable": "Rapporten er hierarkisk %s Gjer den flat",
"IncludeRowsWithLowPopulation": "Rader med låg populasjon er skjult %s Vis alle rader",
"JavascriptDisabled": "JavaScript må vera slegen på for å kunne bruka Piwik i standardvisning.<br \/>Det ser ut til at JavaScript er slegen av eller ikkje støtta i nettlesaren din.<br \/>For å bruka standardvisninga, slå på JavaScript i nettlesaren din, og %1$sprøv igjen%2$s.<br \/>",
- "NoPrivilegesAskPiwikAdmin": "Du er innlogga som '%s' men det ser ikkje ut til at du har vidare tilgang til Piwik. %s Spør Piwik-administratoren (klikk for å senda e-post)%s om å gje deg 'vis'-tilgang til ei nettside.",
+ "NoPrivilegesAskPiwikAdmin": "Du er innlogga som '%1$s' men det ser ikkje ut til at du har vidare tilgang til Piwik. %2$s Spør Piwik-administratoren (klikk for å senda e-post)%3$s om å gje deg 'vis'-tilgang til ei nettside.",
"PageOf": "%1$s av %2$s",
"PeriodRange": "Periode",
"ReportGeneratedOn": "Rapport generert den %s",
diff --git a/plugins/CoreHome/lang/pl.json b/plugins/CoreHome/lang/pl.json
index e33b906c2c6f92e5fef018d54e2320cd03ca2472..ac7fbac176e40f299eec15d0012c024043016a68 100644
--- a/plugins/CoreHome/lang/pl.json
+++ b/plugins/CoreHome/lang/pl.json
@@ -24,7 +24,7 @@
"JavascriptDisabled": "Aby użyć standardowego widoku Piwik, wymagane jest zezwolenie do działanie skryptów Java.<br \/>Wydaje się jednak, że tutaj JavaScript nie działa lub jest niepoprawnie wspierany przez twoją przeglądarkę.<br \/>By użyć standardowego widoku, włącz działanie JavaScript w opcjach swojej przeglądarki, i wtedy %1$sspróbuj ponownie%2$s.<br \/>",
"MakeOneTimeDonation": "Zamiast, przekaż jednorazową dotację.",
"Menu": "Menu",
- "NoPrivilegesAskPiwikAdmin": "Jesteś zalogowany jako '%s' ale wygląda na to, że nie masz nadanych żadnych uprawnień w Piwik'u. %s Poproś swojego administratora Piwik'a (kliknij aby wysłąć email)%s aby nadał Ci uprawnienia 'przeglądania' strony.",
+ "NoPrivilegesAskPiwikAdmin": "Jesteś zalogowany jako '%1$s' ale wygląda na to, że nie masz nadanych żadnych uprawnień w Piwik'u. %2$s Poproś swojego administratora Piwik'a (kliknij aby wysłąć email)%3$s aby nadał Ci uprawnienia 'przeglądania' strony.",
"OnlyForSuperUserAccess": "Ten widżet widzą tylko użytkownych z prawami dostępu Super User.",
"PageOf": "%1$s z %2$s",
"PeriodRange": "Zakres",
diff --git a/plugins/CoreHome/lang/pt-br.json b/plugins/CoreHome/lang/pt-br.json
index b7522980e0e08c380abc4eb52f97611fa732b54f..b2215af4dda35e8ef802e26e9c456ad6b64284e6 100644
--- a/plugins/CoreHome/lang/pt-br.json
+++ b/plugins/CoreHome/lang/pt-br.json
@@ -24,10 +24,11 @@
"InjectedHostSuperUserWarning": "Piwik pode estar mal configurado (por exemplo, se Piwik foi recentemente movido para um novo servidor ou URL). Você pode tanto %1$sClicar aqui e adicionar%2$s como um Piwik hostname válido (se você confiar nele)%3$s, ou %4$sClique aqui para %5$s para acessar com segurança Piwik%6$s.",
"InjectedHostWarningIntro": "Você está agora acessando Piwik de %1$s, mas Piwik foi configurado para ser executado neste endereço: %2$s.",
"JavascriptDisabled": "JavaScript deve ser habilitado para que você possa usar o Piwik como visualização padrão. <br\/>Contudo, parece que JavaScript ou está desabilidado ou não é suportado pelo seu navegador. <br\/>Para usar a visualização padrão, habilite o JavaScript mudando as opções do seu navegador, então %1$stente novamente%2$s.<br\/>",
+ "MainNavigation": "Navegação principal",
"MakeADifference": "Faça a diferença:%1$sDoe agora%2$s para o fundo Piwik 2.0!",
"MakeOneTimeDonation": "Em vez disso, faça uma doação.",
"Menu": "Menu",
- "NoPrivilegesAskPiwikAdmin": "Você está logado como '%s', mas parece que você não tem nenhuma permissão definida no Piwik. %s Pergunte ao seu administrador Piwik (clique para e-mail) %s para lhe dar acesso de 'visão' para um site.",
+ "NoPrivilegesAskPiwikAdmin": "Você está logado como '%1$s', mas parece que você não tem nenhuma permissão definida no Piwik. %2$s Pergunte ao seu administrador Piwik (clique para e-mail) %3$s para lhe dar acesso de 'visão' para um site.",
"OnlyForSuperUserAccess": "Este widget só é exibido para os usuários com privilégios de Super Usuário.",
"PageOf": "%1$s de %2$s",
"PeriodRange": "Alcance",
@@ -48,8 +49,8 @@
"YouAreUsingTheLatestVersion": "Você está usando a última versão do Piwik!",
"ClickRowToExpandOrContract": "Clique nesta linha para expandir ou contrair a subtabela.",
"UndoPivotBySubtable": "Este relatório foi articulado %s desfazer articulação",
- "PivotBySubtable": "Este relatório não foi articulado %s Articular por %s",
- "QuickAccessTitle": "Buscar por %s. Atalho: Tecle 'f' para buscar.",
+ "PivotBySubtable": "Este relatório não foi articulado %1$s Articular por %2$s",
+ "QuickAccessTitle": "Buscar por %s. Use as setas do teclado para navegar pelos resultados da pesquisa. Atalho: Pressione 'f' para pesquisar.",
"MenuEntries": "Itens do menu",
"Segments": "Segmentos",
"AdblockIsMaybeUsed": "Caso você esteja usando um bloqueador de anúncios, por favor desative-o para este site, pois assim poderá certificar-se de que o Piwik funciona sem qualquer problema.",
diff --git a/plugins/CoreHome/lang/ro.json b/plugins/CoreHome/lang/ro.json
index 5b74280ceba0a332f4e0bf3d7e1cab53ebc01126..bc8707c59095d945ce0cf0aba993d7536c6baacc 100644
--- a/plugins/CoreHome/lang/ro.json
+++ b/plugins/CoreHome/lang/ro.json
@@ -25,7 +25,7 @@
"JavascriptDisabled": "Trebuie sa aveti JavaScript activat pentru a putea utiliza Piwik in modul de vizualizare standard.<br \/> Se pare ca JavaScript ori nu este activat, ori nu este suportat de browserul dvs.<br \/> Pentru a utiliza modul de vizualizare standard, activati JavaScript modificand optiunile browserului dvs, apoi %1$sincercati din nou%2$s.<br \/>",
"MakeADifference": "Fa o diferenta: %1$sDoneaza acum%2$s pentru a sponsoriza Piwik 2.0!",
"MakeOneTimeDonation": "În schimb, donează o dată (fără subscriere).",
- "NoPrivilegesAskPiwikAdmin": "Sunteti logat ca '%s' dar se pare ca nu aveti nici o permisiune setata in Piwik. %s Solicitati administratorului dvs al Piwik (click pentru email)%s sa va permita accesul tip 'vizualizare' pentru un site.",
+ "NoPrivilegesAskPiwikAdmin": "Sunteti logat ca '%1$s' dar se pare ca nu aveti nici o permisiune setata in Piwik. %2$s Solicitati administratorului dvs al Piwik (click pentru email)%3$s sa va permita accesul tip 'vizualizare' pentru un site.",
"OnlyForSuperUserAccess": "Acest widget este afișat numai pentru utilizatorii care au acces la Super utilizator.",
"PageOf": "%1$s din %2$s",
"PeriodRange": "Perioadă",
diff --git a/plugins/CoreHome/lang/ru.json b/plugins/CoreHome/lang/ru.json
index 6103a78217cc4bb4036b083e12172197fef11362..4b7d9f0549f2eadb5b0d1abeaa51debc2fa16e50 100644
--- a/plugins/CoreHome/lang/ru.json
+++ b/plugins/CoreHome/lang/ru.json
@@ -27,7 +27,7 @@
"MakeADifference": "ВнеÑите Ñвой вклад: %1$sПожертвуйте ÑейчаÑ%2$s Ð´Ð»Ñ Ñ„Ð¸Ð½Ð°Ð½ÑÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Piwik 2.0!",
"MakeOneTimeDonation": "Сделать только пожертвование (без подпиÑки).",
"Menu": "Меню",
- "NoPrivilegesAskPiwikAdmin": "Ð’Ñ‹ авторизованы как '%s', но, кажетÑÑ, Ð´Ð»Ñ Ð²Ð°Ñ Ð½Ðµ уÑтановлены права в Piwik. %s ПопроÑите вашего админиÑтратора (кликните, чтобы напиÑать пиÑьмо)%s дать вам доÑтуп на \"проÑмотр\" к ÑтатиÑтике Ñайта.",
+ "NoPrivilegesAskPiwikAdmin": "Ð’Ñ‹ авторизованы как '%1$s', но, кажетÑÑ, Ð´Ð»Ñ Ð²Ð°Ñ Ð½Ðµ уÑтановлены права в Piwik. %2$s ПопроÑите вашего админиÑтратора (кликните, чтобы напиÑать пиÑьмо)%3$s дать вам доÑтуп на \"проÑмотр\" к ÑтатиÑтике Ñайта.",
"OnlyForSuperUserAccess": "Ðтот виджет отображаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ у ÑуперпользователÑ.",
"PageOf": "%1$s из %2$s",
"PeriodRange": "Период",
diff --git a/plugins/CoreHome/lang/sk.json b/plugins/CoreHome/lang/sk.json
index 4958269f473a32f65814547cb914ca9c5c3213b0..784221d7286290c0e31d90efbba4aad39e240222 100644
--- a/plugins/CoreHome/lang/sk.json
+++ b/plugins/CoreHome/lang/sk.json
@@ -27,7 +27,7 @@
"MakeADifference": "Urobte rozdiel: %1$sTeraz prispejte finanÄne%2$s podporiÅ¥ Piwik 2.0!",
"MakeOneTimeDonation": "Jednorázovo finanÄne podporiÅ¥.",
"Menu": "Menu",
- "NoPrivilegesAskPiwikAdmin": "Ste prihlásený ako '%s' ale vyzerá to tak , že nemáte žiadne povolenie do Piwiku. %s Spýtajte sa Vášho Piwik administrátora (Kliknite pre email)%s aby Vám dal 'prezeracÃ' prÃstup na webstránku.",
+ "NoPrivilegesAskPiwikAdmin": "Ste prihlásený ako '%1$s' ale vyzerá to tak , že nemáte žiadne povolenie do Piwiku. %2$s Spýtajte sa Vášho Piwik administrátora (Kliknite pre email)%3$s aby Vám dal 'prezeracÃ' prÃstup na webstránku.",
"OnlyForSuperUserAccess": "Táto miniaplikácia je zobrazená iba užÃvateľom ktorý majú prÃstup ako Super-užÃvatelia.",
"PageOf": "%1$s z %2$s",
"PeriodRange": "Rozsah",
@@ -48,6 +48,6 @@
"YouAreUsingTheLatestVersion": "PoužÃvate najnovÅ¡iu verziu Piwiku!",
"ClickRowToExpandOrContract": "Kliknite na tento riadok pre rozvinutie alebo zbalenie podtabuľky.",
"UndoPivotBySubtable": "Tento report bol pivotovaný %s Naspäť pivot",
- "PivotBySubtable": "Tento report nebol pivotovaný %s Pivotovať podľa %s"
+ "PivotBySubtable": "Tento report nebol pivotovaný %1$s Pivotovať podľa %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/sl.json b/plugins/CoreHome/lang/sl.json
index 3b257a7d70ff6deac1639abe00cf1f2f38637e2a..3c353cb8a3f07193a5ae1e940b0e23ae4c1940bb 100644
--- a/plugins/CoreHome/lang/sl.json
+++ b/plugins/CoreHome/lang/sl.json
@@ -3,7 +3,7 @@
"CategoryNoData": "V tej kategoriji ni podatkov. Poizkusite \"VkljuÄiti celotno populacijo\".",
"CheckForUpdates": "Preveri za posodobitve",
"Default": "privzeto",
- "NoPrivilegesAskPiwikAdmin": "Vpisani ste kot '%s', vendar v Piwik-u nimate nastavljenih nobenih pooblastil. %s Poprosite vaÅ¡ega Piwik administratorja (klik za email)%s naj vam da pooblastila za ogled doloÄene(ih) strani.",
+ "NoPrivilegesAskPiwikAdmin": "Vpisani ste kot '%1$s', vendar v Piwik-u nimate nastavljenih nobenih pooblastil. %2$s Poprosite vaÅ¡ega Piwik administratorja (klik za email)%3$s naj vam da pooblastila za ogled doloÄene(ih) strani.",
"PageOf": "%1$s od %2$s",
"PeriodRange": "Razpon",
"ReportGeneratedOn": "PoroÄilo ustvarjano na %s",
diff --git a/plugins/CoreHome/lang/sq.json b/plugins/CoreHome/lang/sq.json
index a4bee7a8fb8fd828680c98e5d90f6e2b911ebd3f..05a0379a62cb3206207261561c7ce1e395108300 100644
--- a/plugins/CoreHome/lang/sq.json
+++ b/plugins/CoreHome/lang/sq.json
@@ -4,7 +4,7 @@
"CheckForUpdates": "Kontrollo për përditësime",
"DataForThisReportHasBeenPurged": "Të dhënat e këtij raporti janë më të vjetra se %s muaj dhe u pastruan.",
"JavascriptDisabled": "Që të mund të përdorni Piwik-un në parjen standarde duhet të aktivizohet JavaScript-i.<br \/>Por ja që duket se ose JavaScript-i është i çaktivizuar, ose nuk mbulohet nga shfletuesi juaj.<br \/>Që të përdorni parjen standarde, aktivizoni JavaScript-in duke ndryshuar mundësitë përkatëse te shfletuesi juaj, mandej %1$sriprovoni%2$s.<br \/>",
- "NoPrivilegesAskPiwikAdmin": "Jeni i futur si '%s' por duket se nuk keni leje të rregulluara për ju në Piwik. %s Kërkojini administratorit tuaj te Piwik (klikoni që t’i dërgoni email)%s që t’ju japë të drejta 'parjesh' te një site web.",
+ "NoPrivilegesAskPiwikAdmin": "Jeni i futur si '%1$s' por duket se nuk keni leje të rregulluara për ju në Piwik. %2$s Kërkojini administratorit tuaj te Piwik (klikoni që t’i dërgoni email)%3$s që t’ju japë të drejta 'parjesh' te një site web.",
"PageOf": "%1$s nga %2$s",
"ShowJSCode": "Shfaqe kodin JavaScript që duhet futur",
"ThereIsNoDataForThisReport": "Nuk ka të dhëna për këtë raport.",
diff --git a/plugins/CoreHome/lang/sr.json b/plugins/CoreHome/lang/sr.json
index 532d2e9122cf65ac6cb0777bd4ebdf7ea7b5e33b..100389f22bb807b6a5b1e02b16073c9a1c0c830a 100644
--- a/plugins/CoreHome/lang/sr.json
+++ b/plugins/CoreHome/lang/sr.json
@@ -27,7 +27,7 @@
"MakeADifference": "Budi drugaÄiji: %1$sDoniraj%2$s za Piwik 2.0!",
"MakeOneTimeDonation": "Možete izvršiti i jednokratnu donaciju.",
"Menu": "Meni",
- "NoPrivilegesAskPiwikAdmin": "Prijavljeni ste kao '%s' ali izgleda da nemate postavljena nikakva ovlašćenja. %s Tražite od Piwik administratora (kliknite za poruku)%s da vam dozvoli 'prikaz' na sajtu.",
+ "NoPrivilegesAskPiwikAdmin": "Prijavljeni ste kao '%1$s' ali izgleda da nemate postavljena nikakva ovlašćenja. %2$s Tražite od Piwik administratora (kliknite za poruku)%3$s da vam dozvoli 'prikaz' na sajtu.",
"OnlyForSuperUserAccess": "Ovaj vidžet se prikazuje samo superkorisnicima.",
"PageOf": "%1$s od %2$s",
"PeriodRange": "Period",
@@ -48,6 +48,6 @@
"YouAreUsingTheLatestVersion": "Koristite poslednju verziju Piwik-a",
"ClickRowToExpandOrContract": "Kliknite ovaj red kako biste proširili ili skupili tabelu.",
"UndoPivotBySubtable": "Ovaj izveštaj je pivotiran %s Otkaži pivot",
- "PivotBySubtable": "Ovaj izveštaj nije pivotiran %s Pivotiraj sa %s"
+ "PivotBySubtable": "Ovaj izveštaj nije pivotiran %1$s Pivotiraj sa %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/sv.json b/plugins/CoreHome/lang/sv.json
index 08ccaa996a2469a8fed586ef985f984d3de62b34..e8390e8122099a4ec39a43de1409bdd849220472 100644
--- a/plugins/CoreHome/lang/sv.json
+++ b/plugins/CoreHome/lang/sv.json
@@ -27,7 +27,7 @@
"MakeADifference": "Gör skillnad: %1$sDonera nu%2$s för att finansiera Piwik 2.0!",
"MakeOneTimeDonation": "Donera en engångssumma istället.",
"Menu": "Meny",
- "NoPrivilegesAskPiwikAdmin": "Du är inloggad som '%s' men det verkar som om du inte har några rättigheter satta i Piwik. %s Fråga din Piwik administratör (klicka för att e-posta)%s för att få läsrättighet till en webbplats.",
+ "NoPrivilegesAskPiwikAdmin": "Du är inloggad som '%1$s' men det verkar som om du inte har några rättigheter satta i Piwik. %2$s Fråga din Piwik administratör (klicka för att e-posta)%3$s för att få läsrättighet till en webbplats.",
"OnlyForSuperUserAccess": "Den här widgeten visas bara för användare som har Superanvändare access.",
"PageOf": "%1$s av %2$s",
"PeriodRange": "Intervall",
@@ -48,6 +48,7 @@
"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",
- "PivotBySubtable": "Denna rapport är inte pivoterad %s Pivotera med %s"
+ "PivotBySubtable": "Denna rapport är inte pivoterad %1$s Pivotera med %2$s",
+ "Segments": "Segment"
}
}
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/ta.json b/plugins/CoreHome/lang/ta.json
index 2d7e1ebe951be22721553fd690562937b94dadc2..b0f89a192c699f6b02c91b3b294c05081d67e8d7 100644
--- a/plugins/CoreHome/lang/ta.json
+++ b/plugins/CoreHome/lang/ta.json
@@ -11,7 +11,7 @@
"InjectedHostWarningIntro": "நீஙà¯à®•à®³à¯ இபà¯à®ªà¯‹à®¤à¯ பிவிகà¯à®•à¯ˆ %1$s -ல௠இரà¯à®¨à¯à®¤à¯ இயகà¯à®•à¯à®•à®¿à®±à¯€à®°à¯à®•à®³à¯, ஆனால௠பிவிகà¯à®•à®¾à®©à®¤à¯ %2$s -à®®à¯à®•à®µà®°à®¿à®¯à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ இயஙà¯à®• கடà¯à®Ÿà®®à¯ˆà®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯.",
"MakeADifference": "மாறà¯à®±à¯à®• : %1$s இபà¯à®ªà¯‹à®¤à¯ அனà¯à®ªà®³à®¿à®•à¯à®• %2$s Piwik 2.0 இன௠வளரà¯à®šà¯à®šà®¿à®•à¯à®•à¯!",
"MakeOneTimeDonation": "இலà¯à®²à¯ˆà®¯à¯‡à®²à¯ à®’à®°à¯à®®à¯à®±à¯ˆ மடà¯à®Ÿà¯à®®à¯ நனà¯à®•à¯Šà®Ÿà¯ˆ செலà¯à®¤à¯à®¤à¯à®™à¯à®•à®³à¯.",
- "NoPrivilegesAskPiwikAdmin": "நீஙà¯à®•à®³à¯ '%s' -ஆக உளà¯à®¨à¯à®´à¯ˆà®¨à¯à®¤à¯à®³à¯à®³à¯€à®°à¯à®•à®³à¯, ஆனால௠உஙà¯à®•à®³à¯à®•à¯à®•à¯ பாரà¯à®µà¯ˆ அனà¯à®®à®¤à®¿ வழஙà¯à®•à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ. %s உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ பிவிக௠நிரà¯à®µà®¾à®•à®¿à®¯à®¿à®Ÿà®®à¯ (மினà¯à®©à®žà¯à®šà®²à¯ அனà¯à®ªà¯à®ª)%s வலைதளதà¯à®¤à¯ˆà®ªà¯ \"பாரà¯à®µà¯ˆà®¯à®¿à®Ÿ\" அனà¯à®®à®¤à®¿ கேளà¯à®™à¯à®•à®³à¯.",
+ "NoPrivilegesAskPiwikAdmin": "நீஙà¯à®•à®³à¯ '%1$s' -ஆக உளà¯à®¨à¯à®´à¯ˆà®¨à¯à®¤à¯à®³à¯à®³à¯€à®°à¯à®•à®³à¯, ஆனால௠உஙà¯à®•à®³à¯à®•à¯à®•à¯ பாரà¯à®µà¯ˆ அனà¯à®®à®¤à®¿ வழஙà¯à®•à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ. %2$s உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ பிவிக௠நிரà¯à®µà®¾à®•à®¿à®¯à®¿à®Ÿà®®à¯ (மினà¯à®©à®žà¯à®šà®²à¯ அனà¯à®ªà¯à®ª)%3$s வலைதளதà¯à®¤à¯ˆà®ªà¯ \"பாரà¯à®µà¯ˆà®¯à®¿à®Ÿ\" அனà¯à®®à®¤à®¿ கேளà¯à®™à¯à®•à®³à¯.",
"PageOf": "%2$s ல௠%1$s",
"PeriodRange": "வீசà¯à®šà¯",
"ReportGeneratedOn": "அறிகà¯à®•à¯ˆ %s அனà¯à®±à¯ உரà¯à®µà®¾à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯",
diff --git a/plugins/CoreHome/lang/tl.json b/plugins/CoreHome/lang/tl.json
index 326713074a38192535f826f159645d599c3c4733..ce6c22a538bcf2008e643b5ea7daff2a915fe4b8 100644
--- a/plugins/CoreHome/lang/tl.json
+++ b/plugins/CoreHome/lang/tl.json
@@ -25,7 +25,7 @@
"JavascriptDisabled": "Dapat mong i-enable ang Javascrip upang iyong magamit ang Piwik sa standard view. <br\/> tila ang JavaScript ay disabled o hindi suportado ng iyong browser. <br\/> Upang magamit ang standard view, paganahin ang JavaScript sa pamamagitan ng pagbabago ng iyong mga pagpipilian sa browser, pagkatapos ay %1$s subukang muli %2$s. <br\/>",
"MakeADifference": "Gumawa ng isang pagkakaiba: %1$sMagbigay ng donasyon ngayon%2$s upang pondohan ang Piwik 2.0!",
"MakeOneTimeDonation": "Ang widget na ito ay ipinapakita lamang sa mga user na may Super User na access.",
- "NoPrivilegesAskPiwikAdmin": "Ikaw ay naka-log-in bilang '%s' ngunit mukhang wala kang anumang pahintulot na naka-set sa Piwik. %s Tanungin ang iyong Piwik administrator (i-click upang i-email) %s upang bigyan ka ng 'view' access sa website.",
+ "NoPrivilegesAskPiwikAdmin": "Ikaw ay naka-log-in bilang '%1$s' ngunit mukhang wala kang anumang pahintulot na naka-set sa Piwik. %2$s Tanungin ang iyong Piwik administrator (i-click upang i-email) %3$s upang bigyan ka ng 'view' access sa website.",
"OnlyForSuperUserAccess": "Ang widget na ito ay ipanapakita lamang sa mga user na mayroong Super User access",
"PageOf": "%1$s ng %2$s",
"PeriodRange": "Pagitan",
@@ -45,6 +45,6 @@
"YouAreUsingTheLatestVersion": "Ginagamit mo ang pinaka bagong bersyon ng Piwik",
"ClickRowToExpandOrContract": "I-click ang hanay na ito, upang palawakin o ikontrata ang subtable",
"UndoPivotBySubtable": "Ang ulat na ito ay napaikot %s I-undo ang pagpaikot",
- "PivotBySubtable": "Ang ulat na ito ay hindi umiikot %s Paikutin ng %s"
+ "PivotBySubtable": "Ang ulat na ito ay hindi umiikot %1$s Paikutin ng %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/vi.json b/plugins/CoreHome/lang/vi.json
index bbdc13daf2a83b75e9b0c971ceb02b8df8d8b6a4..73056da87b3d27c32619c9d242f072b7214a523b 100644
--- a/plugins/CoreHome/lang/vi.json
+++ b/plugins/CoreHome/lang/vi.json
@@ -25,7 +25,7 @@
"JavascriptDisabled": "JavaScript phải được cho phép trong trÆ°á»ng hợp bạn sá» dụng Piwik vá»›i hiển thị tiêu chuẩn. <br \/>Tuy nhiên, có thể là JavaScript đã bị chặn hoặc trình duyệt của bạn không há»— trợ.<br \/> Äể sá» dụng hiển thị tiêu chuẩn, vui lòng báºt JavaScript bằng cách thay đổi tùy biến trình duyệt của bạn, sau đó %1$sthá» lại%2$s.<br \/>",
"MakeADifference": "Hãy tạo sá»± khác biệt: %1$s Äóng góp ngay bây giá» %2$s cho quỹ Piwik 2.0!",
"MakeOneTimeDonation": "Hãy đóng góp",
- "NoPrivilegesAskPiwikAdmin": "Bạn được đăng nháºp nhÆ° '%s' nhÆ°ng dÆ°á»ng nhÆ° bạn không được phép thiết láºp trong Piwik. %s Yêu cầu quản trị Piwik của bạn (bấm và o để email) %s để cung cấp cho bạn 'xem' truy cáºp đến má»™t website.",
+ "NoPrivilegesAskPiwikAdmin": "Bạn được đăng nháºp nhÆ° '%1$s' nhÆ°ng dÆ°á»ng nhÆ° bạn không được phép thiết láºp trong Piwik. %2$s Yêu cầu quản trị Piwik của bạn (bấm và o để email) %3$s để cung cấp cho bạn 'xem' truy cáºp đến má»™t website.",
"PageOf": "%1$s của %2$s",
"PeriodRange": "Phạm vi",
"ReportGeneratedOn": "Báo cáo được tạo và o %s",
diff --git a/plugins/CoreHome/lang/zh-cn.json b/plugins/CoreHome/lang/zh-cn.json
index 56272067df728540d57b9b3210babe5bdccbd354..de8270c5b652b1985864124294516c6da678c2a5 100644
--- a/plugins/CoreHome/lang/zh-cn.json
+++ b/plugins/CoreHome/lang/zh-cn.json
@@ -27,7 +27,7 @@
"MakeADifference": "现在就%1$sæ款%2$sç»™ Piwik 2.0 !",
"MakeOneTimeDonation": "一次性æ款",
"Menu": "èœå•",
- "NoPrivilegesAskPiwikAdmin": "您当å‰ç™»å½•ç”¨æˆ·æ˜¯ '%s' 但是没有 Piwik æƒé™ã€‚%s è”ç³» Piwik 管ç†å‘˜ (点击å‘é€é‚®ä»¶)%s 获得 '查看' æƒé™ã€‚",
+ "NoPrivilegesAskPiwikAdmin": "您当å‰ç™»å½•ç”¨æˆ·æ˜¯ '%1$s' 但是没有 Piwik æƒé™ã€‚%2$s è”ç³» Piwik 管ç†å‘˜ (点击å‘é€é‚®ä»¶)%3$s 获得 '查看' æƒé™ã€‚",
"OnlyForSuperUserAccess": "这个å°å·¥å…·åªå¯¹è¶…级用户开放。",
"PageOf": "%1$s，总共 %2$s",
"PeriodRange": "时间段",
@@ -48,6 +48,6 @@
"YouAreUsingTheLatestVersion": "您æ£åœ¨ä½¿ç”¨æœ€æ–°ç‰ˆçš„ Piwikï¼",
"ClickRowToExpandOrContract": "点击这行å¯ä»¥æ‰©å±•æˆ–压缩å°å·¥ä½œå°ã€‚",
"UndoPivotBySubtable": "这个报表被 pivot 了 %s 撤销 Pivot",
- "PivotBySubtable": "这个报表尚未 pivot %s 以 %s 的身份 pivot"
+ "PivotBySubtable": "这个报表尚未 pivot %1$s 以 %2$s 的身份 pivot"
}
}
\ No newline at end of file
diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
index 4b5f8321b2e6e73feedb93b7cb7e57f00e68a00a..861e628f33978a88331283a912d897016db9d8a1 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
@@ -292,7 +292,7 @@ div.dataTable, div.dataTable > .dataTableWrapper {
margin-bottom: -1px;
margin-left: auto;
margin-right: auto;
- background-color: @theme-color-background-base;
+ background-color: @theme-color-widget-background;
border: 1px solid @theme-color-background-tinyContrast;
height: 9px;
width: 70px;
@@ -336,7 +336,7 @@ div.dataTable, div.dataTable > .dataTableWrapper {
margin-top: 0px;
margin-left: auto;
margin-right: auto;
- background-color: @theme-color-background-base;
+ background-color: @theme-color-widget-background;
border: 1px solid @theme-color-background-tinyContrast;
-webkit-border-top-left-radius: 10px;
-webkit-border-top-right-radius: 10px;
diff --git a/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less b/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less
index cab249f9eaad1170f4ab16259b9d7274633c63e2..44a6ea12437cc54f1788f1e2477a24d9f04f28c8 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less
@@ -58,7 +58,7 @@
}
.limitSelection > ul > li:hover {
- background-color: #EBEAE6;
+ background-color: @color-silver-l95;
}
.limitSelection span {
diff --git a/plugins/CoreHome/stylesheets/dataTable/_tableConfiguration.less b/plugins/CoreHome/stylesheets/dataTable/_tableConfiguration.less
index a6200d6e8ed6ffc41a65ed586a98aba70ccb9aaf..f63e2eb5738f57394007438b5e95f33434b7b16c 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_tableConfiguration.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_tableConfiguration.less
@@ -74,7 +74,7 @@ a.tableConfigurationIcon.highlighted {
}
.tableConfiguration div.configItem:hover {
- background-color: #EBEAE6;
+ background-color: @color-silver-l95;
}
.tableConfiguration div.configItem span.action {
diff --git a/plugins/CoreHome/stylesheets/layout.less b/plugins/CoreHome/stylesheets/layout.less
index a398657c7c203dce2b86575aecf43e1181ee60f6..03ef1c295909edb5ede224ec074aa1c47b79a399 100644
--- a/plugins/CoreHome/stylesheets/layout.less
+++ b/plugins/CoreHome/stylesheets/layout.less
@@ -1,3 +1,4 @@
+
#header {
padding: 0 15px;
background-color: @theme-color-background-base;
@@ -167,7 +168,7 @@
float: none;
display: inline-block;
}
-
+
.isPiwikDemo {
margin-top: 8px;
}
@@ -266,6 +267,7 @@
&.active {
> .menuDropdown,
> .item {
+ color: @theme-color-menu-contrast-textSelected;
background-color: @theme-color-background-base;
decoration: none;
}
diff --git a/plugins/CoreHome/templates/_dataTableHead.twig b/plugins/CoreHome/templates/_dataTableHead.twig
index 161de44b2396d41b446412307511837050685baf..27ec83dd2988532d690722095fee1bddd1994142 100644
--- a/plugins/CoreHome/templates/_dataTableHead.twig
+++ b/plugins/CoreHome/templates/_dataTableHead.twig
@@ -6,12 +6,12 @@
<div class="columnDocumentation">
<div class="columnDocumentationTitle">
<span class="icon-help"></span>
- {{ properties.translations[column]|default(column)|raw }}
+ {{ properties.translations[column]|default(column)|rawSafeDecoded }}
</div>
{{ properties.metrics_documentation[column]|raw }}
</div>
{% endif %}
- <div id="thDIV" class="thDIV">{{ properties.translations[column]|default(column)|raw }}</div>
+ <div id="thDIV" class="thDIV">{{ properties.translations[column]|default(column)|rawSafeDecoded }}</div>
</th>
{% endfor %}
</tr>
diff --git a/plugins/CoreHome/templates/_logo.twig b/plugins/CoreHome/templates/_logo.twig
index ad28f5b68eaf028ec6dabd8863398b36cf280ab4..633985a20d888d1633c8bf3aa17d98c59d77ca7b 100644
--- a/plugins/CoreHome/templates/_logo.twig
+++ b/plugins/CoreHome/templates/_logo.twig
@@ -1,7 +1,7 @@
<span id="logo">
- <a href="index.php" title="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik # {{ 'General_OpenSourceWebAnalytics'|translate }}">
+ <a href="index.php" tabindex="-1" title="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik # {{ 'General_OpenSourceWebAnalytics'|translate }}">
{% if hasSVGLogo %}
- <img src='{{ logoSVG }}' alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" class="ie-hide {% if not isCustomLogo %}default-piwik-logo{% endif %}" />
+ <img src='{{ logoSVG }}' tabindex="3" alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" class="ie-hide {% if not isCustomLogo %}default-piwik-logo{% endif %}" />
<!--[if lt IE 9]>
{% endif %}
<img src='{{ logoHeader }}' alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" />
diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig
index 94321a033f8d40ffbebce26715636ddc34790d58..673c2ba1c8fb55228e07e89dfffbf70030ee7c76 100644
--- a/plugins/CoreHome/templates/_menu.twig
+++ b/plugins/CoreHome/templates/_menu.twig
@@ -3,7 +3,7 @@
<div id="search" ng-cloak>
<div piwik-quick-access class="borderedControl"></div>
</div>
- <ul class="navbar" role="menu">
+ <ul class="navbar" aria-label="{{ 'CoreHome_MainNavigation'|translate|e('html_attr') }}" role="menu">
{% for level1,level2 in menu %}
{% set hasSubmenuItem = false %}
@@ -16,7 +16,7 @@
{% if hasSubmenuItem %}
<li class="menuTab" role="menuitem">
- <a class="item">
+ <a class="item" tabindex="5">
<span class="menu-icon {{ level2._icon|default('icon-arrow-right') }}"></span>{{ level1|translate }}
<span class="hidden">
{{ 'CoreHome_Menu'|translate }}
@@ -28,8 +28,8 @@
<li {% if urlParameters._url.module is defined and urlParameters._url.module == currentModule and urlParameters._url.action is defined and urlParameters._url.action == currentAction %}class="active"{% endif %}
role="menuitem"
>
- <a class="item"
- title="{{ urlParameters._tooltip|default(name)|translate|e('html_attr') }}"
+ <a class="item" tabindex="5"
+ title="{{ urlParameters._tooltip|default('')|translate|e('html_attr') }}"
href="index.php?{{ urlParameters._url|urlRewriteWithParameters|slice(1) }}">
{{ name|translate }}
</a>
diff --git a/plugins/CoreHome/templates/_periodSelect.twig b/plugins/CoreHome/templates/_periodSelect.twig
index 67b30183d3484b431661403a005554dd269f9ba9..4528109f5f9bb8ba237b5e8d43267a2a39e8166b 100644
--- a/plugins/CoreHome/templates/_periodSelect.twig
+++ b/plugins/CoreHome/templates/_periodSelect.twig
@@ -1,5 +1,5 @@
<div id="periodString" piwik-expand-on-click class="piwikTopControl piwikSelector borderedControl periodSelector">
- <a id="date" class="title" title="{{ 'General_ChooseDate'|translate|e('html_attr') }}">
+ <a id="date" class="title" title="{{ 'General_ChooseDate'|translate(prettyDateLong|default(''))|e('html_attr') }}" tabindex="4">
<span class="icon icon-calendar"></span>
{{ prettyDate }}
</a>
@@ -9,12 +9,12 @@
</div>
<div class="period-range" style="display:none;">
<div id="calendarRangeFrom">
- <h6>{{ 'General_DateRangeFrom'|translate }}<input tabindex="1" type="text" id="inputCalendarFrom" name="inputCalendarFrom"/></h6>
+ <h6>{{ 'General_DateRangeFrom'|translate }}<input tabindex="4" type="text" id="inputCalendarFrom" name="inputCalendarFrom"/></h6>
<div id="calendarFrom"></div>
</div>
<div id="calendarRangeTo">
- <h6>{{ 'General_DateRangeTo'|translate }}<input tabindex="2" type="text" id="inputCalendarTo" name="inputCalendarTo"/></h6>
+ <h6>{{ 'General_DateRangeTo'|translate }}<input tabindex="4" type="text" id="inputCalendarTo" name="inputCalendarTo"/></h6>
<div id="calendarTo"></div>
</div>
@@ -28,7 +28,7 @@
<br/>
{% endfor %}
</span>
- <input tabindex="3" type="submit" value="{{ 'General_Apply'|translate }}" id="calendarApply" class="btn"/>
+ <input tabindex="4" type="submit" value="{{ 'General_Apply'|translate }}" id="calendarApply" class="btn"/>
{% import 'ajaxMacros.twig' as ajax %}
{{ ajax.loadingDiv('ajaxLoadingCalendar') }}
</div>
diff --git a/plugins/CoreHome/templates/_topBar.twig b/plugins/CoreHome/templates/_topBar.twig
index c1158f46bba4268c77b745d4f7c0387f7bda8649..bc5261b70ffed6f7f612217dd666950b5da1c9bc 100644
--- a/plugins/CoreHome/templates/_topBar.twig
+++ b/plugins/CoreHome/templates/_topBar.twig
@@ -16,7 +16,7 @@
<a {% if menu._tooltip is defined %}title="{{ menu._tooltip }}"{% endif %}
class="topBarElem {% if (menu._url.module == currentModule and (menu._url.action is empty or menu._url.action == currentAction)) %}active{% endif %}"
id="topmenu-{{ menu._url.module|lower }}"
- href="index.php{{ menu._url|urlRewriteWithParameters }}">{{ _self.menuItemLabel(label, menu._icon) }}</a>
+ href="index.php{{ menu._url|urlRewriteWithParameters }}" tabindex="3">{{ _self.menuItemLabel(label, menu._icon) }}</a>
{% endif %}
{% endmacro %}
diff --git a/plugins/CoreHome/templates/_topScreen.twig b/plugins/CoreHome/templates/_topScreen.twig
index 805619814c4fce55ee26a0650399410c2f4e9d4d..f0ba5fc147f17ee3e2f0cefb8d37c5781ca5b991 100644
--- a/plugins/CoreHome/templates/_topScreen.twig
+++ b/plugins/CoreHome/templates/_topScreen.twig
@@ -1,5 +1,5 @@
<div id="header" class="container-fluid">
- <a href="#main" tabindex="0" class="accessibility-skip-to-content">{{'CoreHome_SkipToContent'|translate}}</a>
+ <a href="#main" tabindex="1" class="accessibility-skip-to-content">{{'CoreHome_SkipToContent'|translate}}</a>
<div id="topRightBar" class="navbar row">
<div class="navbar-header col-md-3">
<span class="toggle-second-menu icon-menu-hamburger"></span>
diff --git a/plugins/CoreHome/templates/getDefaultIndexView.twig b/plugins/CoreHome/templates/getDefaultIndexView.twig
index d685977971c6ccedbdba30b91f755c1bec54bc69..97fae5e996bac1653d4d47e7e71ee4ee057d7949 100644
--- a/plugins/CoreHome/templates/getDefaultIndexView.twig
+++ b/plugins/CoreHome/templates/getDefaultIndexView.twig
@@ -10,7 +10,7 @@
{% endblock %}
{% block content %}
- {{ ajax.requestErrorDiv(emailSuperUser|default('')) }}
+ {{ ajax.requestErrorDiv(emailSuperUser|default(''), arePiwikProAdsEnabled) }}
{{ ajax.loadingDiv() }}
<div id="content" class="home">
diff --git a/plugins/CorePluginsAdmin/lang/ar.json b/plugins/CorePluginsAdmin/lang/ar.json
index a1c147086e3f1cd5a2c239cb2b072e1376c39e5e..332305ceff38ebbc8e49b7d97149a19d9fe5cb21 100644
--- a/plugins/CorePluginsAdmin/lang/ar.json
+++ b/plugins/CorePluginsAdmin/lang/ar.json
@@ -31,7 +31,7 @@
"PluginHomepage": "صÙØØ© التطبيقات الرئيسية",
"PluginKeywords": "كلمات دلالية",
"PluginsManagement": "إدارة التطبيقات",
- "PluginUpdateAvailable": "أنت تستخدم الإصدار %s %sويوجد إصدار جديد متاØ",
+ "PluginUpdateAvailable": "أنت تستخدم الإصدار %1$s %2$sويوجد إصدار جديد متاØ",
"PluginWebsite": "الموقع الإلكتروني للإضاÙØ©",
"Screenshots": "صور العرض",
"SortByAlpha": "الÙا",
diff --git a/plugins/CorePluginsAdmin/lang/bg.json b/plugins/CorePluginsAdmin/lang/bg.json
index e20eb05270c4310e7a43b0fabcbfbb1170825929..f3e24c034f029ef7e9e6254c6c5dae96f567c08e 100644
--- a/plugins/CorePluginsAdmin/lang/bg.json
+++ b/plugins/CorePluginsAdmin/lang/bg.json
@@ -16,14 +16,14 @@
"BeCarefulUsingThemes": "Бъдете внимателни Ñ Ñ‚Ð°Ð¿ÐµÑ‚Ð¸Ñ‚Ðµ, които не Ñа Ñъздадени от екипа на Piwik: те не Ñа проверени.",
"ByXDevelopers": "от %s разработчици",
"Changelog": "СпиÑък Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ",
- "ChangeSettingsPossible": "ПромÑна на %sнаÑтройките%s за тази добавка.",
+ "ChangeSettingsPossible": "ПромÑна на %1$sнаÑтройките%2$s за тази добавка.",
"CorePluginTooltip": "ОÑновните добавки нÑмат верÑиÑ, тъй като Ñе разпроÑтранÑват Ñ Piwik.",
"Deactivate": "Деактивирай",
"Developer": "Разработчик",
"DoMoreContactPiwikAdmins": "За да Ñе инÑталира нова добавка или нова тема, Ñ‚Ñ€Ñбва да Ñе Ñвържете Ñ Ð²Ð°ÑˆÐ¸Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратор, който Ð¾Ñ‚Ð³Ð¾Ð²Ð°Ñ€Ñ Ð·Ð° Piwik.",
"EmailToEnquireUpdatedVersion": "МолÑ, пишете до %1$s и изиÑкайте актуална верÑÐ¸Ñ Ð½Ð° %2$s.",
"FeaturedPlugin": "Препоръчана добавка",
- "GetEarlyAccessForPaidPlugins": "Забележка: вÑички от наличните добавки Ñа безплатни за използване; в бъдеще ще има платена ÑÐµÐºÑ†Ð¸Ñ Ð² магазина за Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ (%sÑвържете Ñе Ñ Ð½Ð°Ñ%s за предварителен доÑтъп).",
+ "GetEarlyAccessForPaidPlugins": "Забележка: вÑички от наличните добавки Ñа безплатни за използване; в бъдеще ще има платена ÑÐµÐºÑ†Ð¸Ñ Ð² магазина за Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ (%1$sÑвържете Ñе Ñ Ð½Ð°Ñ%2$s за предварителен доÑтъп).",
"History": "ИÑториÑ",
"Inactive": "Ðеактивна",
"InfoPluginUpdateIsRecommended": "Обновете вашите добавки, за да Ñе възползвате от най-новите подобрениÑ.",
@@ -57,7 +57,7 @@
"PluginNotWorkingAlternative": "Ðко Ñте използвали тази добавка, може би ще намерите по-нова верÑÐ¸Ñ Ð² магазина за приложениÑ. Ð’ Ñлучай, че нÑма по-нова верÑиÑ, може би ще желаете да деинÑталирате добавката.",
"PluginRequirement": "%1$s изиÑква %2$s.",
"PluginsManagement": "Управление на добавките",
- "PluginUpdateAvailable": "Използва Ñе верÑÐ¸Ñ %s и е налична нова верÑÐ¸Ñ %s.",
+ "PluginUpdateAvailable": "Използва Ñе верÑÐ¸Ñ %1$s и е налична нова верÑÐ¸Ñ %2$s.",
"PluginVersionInfo": "%1$s от %2$s",
"PluginWebsite": "Сайт за добавки",
"Screenshots": "Екранни Ñнимки",
diff --git a/plugins/CorePluginsAdmin/lang/cs.json b/plugins/CorePluginsAdmin/lang/cs.json
index 8ae77b996fc35dfe3b9780a92382afa88fe78d10..438d601d9e6a43d42bc83f3dc309528a65847e9a 100644
--- a/plugins/CorePluginsAdmin/lang/cs.json
+++ b/plugins/CorePluginsAdmin/lang/cs.json
@@ -17,16 +17,16 @@
"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 %snastavenÃ%s.",
+ "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 %szásuvných modulů nebo témat vzhledu%s.",
+ "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.",
- "EmailToEnquireUpdatedVersion": "Napište email %1$s a požádejte o novějšà verzi %2$s.",
+ "EmailToEnquireUpdatedVersion": "Napište e-mail %1$s a požádejte o novějšà verzi %2$s.",
"FeaturedPlugin": "DoporuÄovaný zásuvný modul",
- "ChangeLookByManageThemes": "Vzhled Piwiku můžete změnit %sve správě motivů%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. %sKontaktujte nás%s pro vÄasný pÅ™Ãstup.",
+ "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",
"InfoPluginUpdateIsRecommended": "Aktualizujte vaÅ¡e zásuvné moduly nynÃ, abyste mohli využÃt vÅ¡echna vylepÅ¡enÃ.",
@@ -66,7 +66,7 @@
"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 %s, ale je dostupná novÄ›jÅ¡Ã verze %s.",
+ "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",
@@ -90,7 +90,7 @@
"TeaserExtendPiwikByPlugin": "Rozšiřte Piwik instalacà nového zásuvného modulu",
"TeaserExtendPiwikByTheme": "Užijte si jiný vzhled po instalaci nové šablony",
"TeaserExtendPiwikByUpload": "RozÅ¡iÅ™te Piwik nahránÃm zip souboru",
- "InstallingNewPluginViaMarketplaceOrUpload": "Můžete zásuvný modul nainstalovat automaticky z obchodu, %snebo ho nahrát%s ve formátu .zip.",
+ "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Ã.",
diff --git a/plugins/CorePluginsAdmin/lang/da.json b/plugins/CorePluginsAdmin/lang/da.json
index 1d0fab34f7ab2bcb62bf32cca66506752d140c62..7dbeeb966cf3cab4ff8eb6a3390a2642f98bf847 100644
--- a/plugins/CorePluginsAdmin/lang/da.json
+++ b/plugins/CorePluginsAdmin/lang/da.json
@@ -16,16 +16,16 @@
"BeCarefulUsingThemes": "Temaer, der ikke er forfattet af Piwik holdet skal anvendes med forsigtighed: vi har ikke kontrolleret dem.",
"ByXDevelopers": "af %s udviklere",
"Changelog": "Ændringslog",
- "ChangeSettingsPossible": "Du kan ændre %sindstillinger%s for denne programudvidelse",
+ "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 %sudvikle udvidelser eller temaer%s.",
+ "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.",
"EmailToEnquireUpdatedVersion": "Send e-mail til %1$s og forespørg om en opdateret version af %2$s.",
"FeaturedPlugin": "Udvalgte programudvidelser",
- "ChangeLookByManageThemes": "Skift udseendet på Piwik med %sAdministration af temaer%s.",
- "GetEarlyAccessForPaidPlugins": "Bemærk: alle programudvidelser er tilgængelige gratis på nuværende tidspunkt; i fremtiden vil vi sætte betalte programudvidelser på markedspladsen (%skontakt os%s for tidlig adgang).",
+ "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.",
@@ -60,7 +60,7 @@
"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 %s en ny version %s er tilgængelig.",
+ "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",
@@ -84,7 +84,7 @@
"TeaserExtendPiwikByPlugin": "Udvid Piwik ved at installere en ny programudvidelse",
"TeaserExtendPiwikByTheme": "Ændre udseendet ved at installere et nyt tema",
"TeaserExtendPiwikByUpload": "Udvid Piwik ved at overføre en ZIP-fil",
- "InstallingNewPluginViaMarketplaceOrUpload": "De kan automatisk installere udvidelser fra markedspladsen eller %soverføre en udvidelse%s i .zip format.",
+ "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.",
diff --git a/plugins/CorePluginsAdmin/lang/de.json b/plugins/CorePluginsAdmin/lang/de.json
index d8b68512b5cd7346bcd8a2d7ab07957a2e3e7717..45975713721aebafe12bf02f42012ce0a96906bd 100644
--- a/plugins/CorePluginsAdmin/lang/de.json
+++ b/plugins/CorePluginsAdmin/lang/de.json
@@ -17,16 +17,16 @@
"ByXDevelopers": "von %s Entwicklern",
"CannotInstall": "Installation nicht möglich (Hilfe)",
"Changelog": "Änderungsprotokoll",
- "ChangeSettingsPossible": "Sie können die %sEinstellungen%s für dieses Plugin ändern.",
+ "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 %sPlugins oder Themes entwickeln%s.",
+ "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.",
"EmailToEnquireUpdatedVersion": "Bitte schreiben Sie eine E-Mail and %1$s und fragen Sie nach einer aktualisierten Version von %2$s.",
"FeaturedPlugin": "Top-Plugin",
- "ChangeLookByManageThemes": "Sie können das Erscheinungsbild von Piwik mit dem Einsatz von %sThemes%s ändern.",
- "GetEarlyAccessForPaidPlugins": "Hinweis: Derzeit sind alle Plugins kostenlos erhältlich; In Zukunft werden wir auch bezahlte Plugins im Marketplace aktivieren (%sKontaktieren Sie uns%s für vorzeitigen Zugriff).",
+ "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",
"InfoPluginUpdateIsRecommended": "Aktualisieren Sie Ihre Plugins jetzt, um von den neuesten Verbesserungen zu profitieren.",
@@ -66,7 +66,7 @@
"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 %s und eine neue Version %s is verfügbar.",
+ "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",
@@ -90,7 +90,7 @@
"TeaserExtendPiwikByPlugin": "Erweitern Sie Piwik durch die Installation von Plugins",
"TeaserExtendPiwikByTheme": "Wechseln Sie das Erscheinungsbild durch die Installation eines neuen Themes",
"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 %shochladen%s.",
+ "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.",
diff --git a/plugins/CorePluginsAdmin/lang/el.json b/plugins/CorePluginsAdmin/lang/el.json
index 6de0af46c95742c8a7aa28a9c4766c51f3957fc1..206e78c19d2a870c9a35d93e11a291eee03e385a 100644
--- a/plugins/CorePluginsAdmin/lang/el.json
+++ b/plugins/CorePluginsAdmin/lang/el.json
@@ -17,16 +17,16 @@
"ByXDevelopers": "από %s Ï€ÏογÏαμματιστÎÏ‚",
"CannotInstall": "Δεν είναι δυνατή η εγκατάσταση (βοήθεια)",
"Changelog": "ΑÏχείο αλλαγών",
- "ChangeSettingsPossible": "ΜποÏείτε να αλλάξετε τις %sÏυθμίσεις%s για αυτό το Ï€Ïόσθετο.",
+ "ChangeSettingsPossible": "ΜποÏείτε να αλλάξετε τις %1$sÏυθμίσεις%2$s για το Ï€Ïόσθετο αυτό.",
"CorePluginTooltip": "Τα Ï€Ïόσθετα του πυÏήνα δεν Îχουν Îκδοση από τη στιγμή που διανÎμονται μαζί με το Piwik.",
"Deactivate": "ΑπενεÏγοποίηση",
"Developer": "Î ÏογÏαμματιστής",
- "DevelopersLearnHowToDevelopPlugins": "Î ÏογÏαμματιστÎÏ‚: Μάθετε πώς μποÏείτε να επεκτείνετε και να Ï€ÏοσαÏμόζετε το Piwik με την %sανάπτυξη Ï€Ïόσθετων ή θεμάτων%s.",
+ "DevelopersLearnHowToDevelopPlugins": "Î ÏογÏαμματιστÎÏ‚: Μάθετε πώς να επεκτείνετε και να Ï€ÏοσαÏμόζετε το Piwik %1$sδημιουÏγώντας Ï€Ïόσθετα ή θÎματα%2$s.",
"DoMoreContactPiwikAdmins": "Για να εγκαταστήσετε Îνα νÎο Ï€Ïόσθετο ή θÎμα, ελάτε σε επαφή με τους διαχειÏιστÎÏ‚ του Piwik.",
"EmailToEnquireUpdatedVersion": "ΠαÏακαλοÏμε στείλτε email στο %1$s και ζητήστε ενημÎÏωση της Îκδοσης για το %2$s.",
"FeaturedPlugin": "Î Ïοβαλλόμενο Ï€Ïόσθετο",
- "ChangeLookByManageThemes": "ΜποÏείτε να αλλάξετε την εμφάνιση του Piwik από τη %sΔιαχείÏιση Θεμάτων%s.",
- "GetEarlyAccessForPaidPlugins": "Σημείωση: όλα τα Ï€Ïόσθετα διατίθενται δωÏεάν αυτή τη στιγμή, στο μÎλλον θα ενεÏγοποιήσουμε τα Επί ΠληÏωμή Î Ïόσθετα στην ΑγοÏά (%sΕλάτε σε επικοινωνία μαζί μας%s για νωÏίτεÏη Ï€Ïόσβαση).",
+ "ChangeLookByManageThemes": "ΜποÏείτε να αλλάξετε την εμφάνιση του Piwik από τη %1$sΔιαχείÏιση Θεμάτων%2$s.",
+ "GetEarlyAccessForPaidPlugins": "Σημείωση: Όλα τα Ï€Ïόσθετα είναι διαθÎσιμα δωÏεάν αυτή τη στιγμή. Στο μÎλλον θα ενεÏγοποιήσουμε τα Î Ïόσθετα επί ΠληÏωμή στην ΑγοÏά (%1$sεπικοινωνήστε μαζί μας%2$s για νωÏίτεÏη Ï€Ïόσβαση).",
"History": "ΙστοÏικό",
"Inactive": "ΑνενεÏγό",
"InfoPluginUpdateIsRecommended": "ΕνημεÏώστε τα Ï€Ïόσθετά σας για να κεÏδίσετε από τις τελευταίες βελτιώσεις.",
@@ -66,7 +66,7 @@
"PluginNotWorkingAlternative": "Αν χÏησιμοποιείτε αυτό το Ï€Ïόσθετο, ενδÎχεται να βÏείτε νεότεÏη Îκδοση στην ΑγοÏά. Αν όχι, μποÏείτε να το απεγκαταστήσετε.",
"PluginRequirement": "Το %1$s απαιτεί το %2$s.",
"PluginsManagement": "ΔιαχείÏιση Ï€ÏοσθÎτων",
- "PluginUpdateAvailable": "ΧÏησιμοποιείτε την Îκδοση %s και υπάÏχει διαθÎσιμη η Îκδοση %s.",
+ "PluginUpdateAvailable": "ΧÏησιμοποιείτε την Îκδοση %1$s και υπάÏχει νεότεÏη Îκδοση %2$s.",
"PluginVersionInfo": "%1$s από %2$s",
"PluginWebsite": "Ιστοτόπος Ï€Ïόσθετου",
"Screenshots": "ΠαÏαδείγματα οθονών",
@@ -90,7 +90,7 @@
"TeaserExtendPiwikByPlugin": "Επεκτείνετε το Piwik εγκαθιστώντας Îνα νÎο Ï€Ïόσθετο",
"TeaserExtendPiwikByTheme": "ΑπολαÏστε μια άλλη όψη & αίσθηση εγκαθιστώντας Îνα νÎο θÎμα",
"TeaserExtendPiwikByUpload": "Επεκτείνετε το Piwik ανεβάζοντας Îνα αÏχείο ZIP",
- "InstallingNewPluginViaMarketplaceOrUpload": "ΜποÏείτε να εγκαταστήσετε αυτόματα Ï€Ïόσθετα από την ΑγοÏά ή %sνα ανεβάσετε Îνα Ï€Ïόσθετο%s σε μοÏφή αÏχείου .zip.",
+ "InstallingNewPluginViaMarketplaceOrUpload": "ΜποÏείτε να εγκαθιστάτε αυτόματα Ï€Ïόσθετα από την ΑγοÏά ή %1$sνα ανεβάσετε Îνα Ï€Ïόσθετο%2$s σε μοÏφή .zip.",
"Theme": "Θεματική παÏαλλαγή",
"Themes": "ΘεματικÎÏ‚ παÏαλλαγÎÏ‚",
"ThemesDescription": "Οι θεματικÎÏ‚ παÏαλλαγÎÏ‚ αλλάζουν την εμφάνιση διεπαφής χÏήστη του Piwik και παÏÎχουν μια τελείως νÎα οπτική εμπειÏία Ï€ÏοκειμÎνου να απολαμβάνετε τις αναφοÏÎÏ‚ σας.",
diff --git a/plugins/CorePluginsAdmin/lang/en.json b/plugins/CorePluginsAdmin/lang/en.json
index 4fbcc0128142cd2ddb92db8dd8c7a9bba67f2206..d3b5a1d6856d0f92503653914900a7be3634b123 100644
--- a/plugins/CorePluginsAdmin/lang/en.json
+++ b/plugins/CorePluginsAdmin/lang/en.json
@@ -17,16 +17,16 @@
"ByXDevelopers": "by %s developers",
"CannotInstall": "Cannot install (help)",
"Changelog": "Changelog",
- "ChangeSettingsPossible": "You can change %ssettings%s for this plugin.",
+ "ChangeSettingsPossible": "You can change %1$ssettings%2$s for this plugin.",
"CorePluginTooltip": "Core plugins have no version since they are distributed with Piwik.",
"Deactivate": "Deactivate",
"Developer": "Developer",
- "DevelopersLearnHowToDevelopPlugins": "Developers: Learn how you can extend and customize Piwik by %sdeveloping plugins or themes%s.",
+ "DevelopersLearnHowToDevelopPlugins": "Developers: Learn how you can extend and customize Piwik by %1$sdeveloping plugins or themes%2$s.",
"DoMoreContactPiwikAdmins": "To install a new plugin or a new theme, please get in touch with your Piwik admins.",
"EmailToEnquireUpdatedVersion": "Please email %1$s and enquire an updated version of %2$s.",
"FeaturedPlugin": "Featured plugin",
- "ChangeLookByManageThemes": "You can change the appearance of Piwik by %sManaging Themes%s.",
- "GetEarlyAccessForPaidPlugins": "Note: all plugins are available for free at present; in the future we will enable Paid Plugins in the Marketplace (%scontact us%s for early access).",
+ "ChangeLookByManageThemes": "You can change the appearance of Piwik by %1$sManaging Themes%2$s.",
+ "GetEarlyAccessForPaidPlugins": "Note: all plugins are available for free at present; in the future we will enable Paid Plugins in the Marketplace (%1$scontact us%2$s for early access).",
"History": "History",
"Inactive": "Inactive",
"InfoPluginUpdateIsRecommended": "Update your plugins now to benefit from the latest improvements.",
@@ -66,7 +66,7 @@
"PluginNotWorkingAlternative": "If you've been using this plugin, maybe you can find a more recent version in the Marketplace. If not, you may want to uninstall it.",
"PluginRequirement": "%1$s requires %2$s.",
"PluginsManagement": "Manage Plugins",
- "PluginUpdateAvailable": "You are using version %s and a new version %s is available.",
+ "PluginUpdateAvailable": "You are using version %1$s and a new version %2$s is available.",
"PluginVersionInfo": "%1$s from %2$s",
"PluginWebsite": "Plugin Website",
"Screenshots": "Screenshots",
@@ -90,7 +90,7 @@
"TeaserExtendPiwikByPlugin": "Extend Piwik by installing a new plugin",
"TeaserExtendPiwikByTheme": "Enjoy another look & feel by installing a new theme",
"TeaserExtendPiwikByUpload": "Extend Piwik by uploading a ZIP file",
- "InstallingNewPluginViaMarketplaceOrUpload": "You may automatically install plugins from the Marketplace or %supload a plugin%s in .zip format.",
+ "InstallingNewPluginViaMarketplaceOrUpload": "You may automatically install plugins from the Marketplace or %1$supload a plugin%2$s in .zip format.",
"Theme": "Theme",
"Themes": "Themes",
"ThemesDescription": "Themes can change the appearance of Piwik user interface, and provide a completely new visual experience to enjoy your analytics reports.",
diff --git a/plugins/CorePluginsAdmin/lang/es.json b/plugins/CorePluginsAdmin/lang/es.json
index f304969d324f3cfe6e4d3e176831a2930a6fe4b9..b0407c02ae5049438312d66385377dee10e95bb3 100644
--- a/plugins/CorePluginsAdmin/lang/es.json
+++ b/plugins/CorePluginsAdmin/lang/es.json
@@ -17,16 +17,16 @@
"ByXDevelopers": "por %s desarrolladores",
"CannotInstall": "No se puede instalar (ayuda)",
"Changelog": "Registro de cambios",
- "ChangeSettingsPossible": "Puede cambiar la %sconfiguración%s de este complemento.",
+ "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 %sdesarrollando complementos o temas%s.",
+ "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.",
"EmailToEnquireUpdatedVersion": "Por favor envÃe un correo electrónico a %1$s para solicitar mayor información sobre una versión actualizada de %2$s.",
"FeaturedPlugin": "Complemento destacado",
- "ChangeLookByManageThemes": "Puede cambiar la apariencia de Piwik %sgestionando temas%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 (%scontáctenos %s para tener acceso de un modo temprano).",
+ "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",
"InfoPluginUpdateIsRecommended": "Actualice sus complementos y aproveche de los últimos mejoramientos.",
@@ -62,7 +62,7 @@
"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 %s y hay una nueva versión %s disponible.",
+ "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",
@@ -86,7 +86,7 @@
"TeaserExtendPiwikByPlugin": "AmplÃe Piwik instalando un nuevo complemento",
"TeaserExtendPiwikByTheme": "Disfrute de otra apariencia instalando un nuevo tema",
"TeaserExtendPiwikByUpload": "AmplÃe Piwik cargando un archivo ZIP",
- "InstallingNewPluginViaMarketplaceOrUpload": "Puede automáticamente instalar complementos desde el Mercado o %scargar un complemento%s in formato .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.",
diff --git a/plugins/CorePluginsAdmin/lang/fa.json b/plugins/CorePluginsAdmin/lang/fa.json
index a4b8920f878151e117f5e5a0118b3c0d67553776..d59c73100dbb314a87abc605a92f58d44affcb34 100644
--- a/plugins/CorePluginsAdmin/lang/fa.json
+++ b/plugins/CorePluginsAdmin/lang/fa.json
@@ -16,7 +16,7 @@
"BeCarefulUsingThemes": "زمینه هایی Ú©Ù‡ توسط Piwik تهیه نشده اند قابل اعتماد نبوده Ùˆ باید با اØتیاط استÙاده گردند : ما آنها را Ú†Ú© نمی کنیم.",
"ByXDevelopers": "توسط %s برنامه نویس",
"Changelog": "لاگ تغییرات",
- "ChangeSettingsPossible": "شما می توانید %ssettings%s را برای این پلاگین تغییر دهید.",
+ "ChangeSettingsPossible": "شما می توانید %1$ssettings%2$s را برای این پلاگین تغییر دهید.",
"CorePluginTooltip": "پلاگین های هسته با برنامه توزیع شده اند",
"Deactivate": "غیر Ùعال کردن",
"Developer": "توسعه دهنده ها",
diff --git a/plugins/CorePluginsAdmin/lang/fi.json b/plugins/CorePluginsAdmin/lang/fi.json
index cd7bc9a4468140c35b498cbc101232cbe250df82..b3dd018dd21af8aa2e70baed2cb477371dbe3a8a 100644
--- a/plugins/CorePluginsAdmin/lang/fi.json
+++ b/plugins/CorePluginsAdmin/lang/fi.json
@@ -16,13 +16,13 @@
"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 %sasetuksia%s",
+ "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 (%sota yhteyttä%s saadaksesi aikainen pääsy).",
+ "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.",
@@ -56,7 +56,7 @@
"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 %s ja uusi versio %s on saatavilla.",
+ "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",
diff --git a/plugins/CorePluginsAdmin/lang/fr.json b/plugins/CorePluginsAdmin/lang/fr.json
index b77d4977193eef4ff355c0c97d5f1cf205019181..8dbc4ca761c4d83c31630fac5e9b7bdf9bfe4799 100644
--- a/plugins/CorePluginsAdmin/lang/fr.json
+++ b/plugins/CorePluginsAdmin/lang/fr.json
@@ -17,16 +17,16 @@
"ByXDevelopers": "par %s développeurs",
"CannotInstall": "Impossible d'installer (aide)",
"Changelog": "Historique des changements",
- "ChangeSettingsPossible": "Vous pouvez modifier les %sparamètres%s de ce composant.",
+ "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 %sdévelopant des composants ou themes%s.",
+ "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.",
"EmailToEnquireUpdatedVersion": "Veuillez envoyer un e-mail à %1$s et renseighner une version mise à jour de %2$s.",
"FeaturedPlugin": "Composant mis en avant",
- "ChangeLookByManageThemes": "Vous pouvez changer l'apparence de Piwik en %sgérant les thèmes%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é (%scontactez-nous%s pour bénéficier d'un accès en avance)",
+ "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",
"InfoPluginUpdateIsRecommended": "Mettez à jour vos composants pour bénéficier des dernières améliorations.",
@@ -66,7 +66,7 @@
"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 %s et une nouvelle version %s est disponible.",
+ "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",
@@ -90,7 +90,7 @@
"TeaserExtendPiwikByPlugin": "Etendre Piwik en installant un nouveau composant additionnel",
"TeaserExtendPiwikByTheme": "Profitez d'une nouvelle charte graphique en installant un nouveau thème",
"TeaserExtendPiwikByUpload": "Etendre Piwik en téléchargeant un fichier ZIP",
- "InstallingNewPluginViaMarketplaceOrUpload": "Vous pouvez installer automatiquement un plugin à partir du Marketplace ou %supload a plugin%s au format .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.",
diff --git a/plugins/CorePluginsAdmin/lang/it.json b/plugins/CorePluginsAdmin/lang/it.json
index 940cab2c178cc61f6edf5e916437789367869ba9..1a30966cc4eb55bd405755390bba04ecf3e77292 100644
--- a/plugins/CorePluginsAdmin/lang/it.json
+++ b/plugins/CorePluginsAdmin/lang/it.json
@@ -17,16 +17,16 @@
"ByXDevelopers": "da %s sviluppatori",
"CannotInstall": "Installazione impossibile (aiuto)",
"Changelog": "Changelog",
- "ChangeSettingsPossible": "Puoi cambiare le %simpostazioni%s per questo plugin.",
+ "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": "Sviluppatori: Impara come ampliare e personalizzare Piwik %ssviluppando plugins e temi%s.",
+ "DevelopersLearnHowToDevelopPlugins": "Sviluppatori: Impara 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.",
"EmailToEnquireUpdatedVersion": "Manda un'email a %1$s per informarti su una versione aggiornata di %2$s.",
"FeaturedPlugin": "Plugin rappresentativo",
- "ChangeLookByManageThemes": "Puoi cambiare l'aspetto di Piwik tramite %sGestione Temi%s.",
- "GetEarlyAccessForPaidPlugins": "Nota: al momento tutti i plugin sono disponibili gratuitamente; in futuro abiliteremo sul Marketplace la sezione Plugin a Pagamento (%scontattaci%s per accedere anticipatamente).",
+ "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",
"InfoPluginUpdateIsRecommended": "Aggiorna i tuoi plugin per beneficiare dei nuovi miglioramenti.",
@@ -66,7 +66,7 @@
"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 %s ed è disponibile la nuova versione %s.",
+ "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",
@@ -90,7 +90,7 @@
"TeaserExtendPiwikByPlugin": "Amplia Piwik installando un nuovo plugin",
"TeaserExtendPiwikByTheme": "Goditi un altro look installando un nuovo tema",
"TeaserExtendPiwikByUpload": "Estendi Piwik caricando un file ZIP",
- "InstallingNewPluginViaMarketplaceOrUpload": "Puoi installare automaticamente dei plugins dal Market o %scaricare un plugin%s in formato .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.",
diff --git a/plugins/CorePluginsAdmin/lang/ja.json b/plugins/CorePluginsAdmin/lang/ja.json
index 708b4a6560ca4852936d8807b13d283f7bf6cbc9..ace3833bf201e75e292ff640800d2de66e036ae3 100644
--- a/plugins/CorePluginsAdmin/lang/ja.json
+++ b/plugins/CorePluginsAdmin/lang/ja.json
@@ -17,16 +17,16 @@
"ByXDevelopers": "%s ã®é–‹ç™ºè€…",
"CannotInstall": "インストールã§ãã¾ã›ã‚“ ( ヘルプ )",
"Changelog": "変更履æ´",
- "ChangeSettingsPossible": "ã“ã®ãƒ—ラグインã®ãŸã‚ã«ã€ %ssettings%s を変更ã§ãã¾ã™ã€‚",
+ "ChangeSettingsPossible": "ã“ã®ãƒ—ラグインã®ãŸã‚ã«ã€ %1$ssettings%2$s を変更ã§ãã¾ã™ã€‚",
"CorePluginTooltip": "コアプラグインã¯ã€ Piwik ã¨ä¸€ç·’ã«é…布ã•ã‚Œã¦ã„ã‚‹ãŸã‚ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ã‚ã‚Šã¾ã›ã‚“",
"Deactivate": "無効化",
"Developer": "開発者",
- "DevelopersLearnHowToDevelopPlugins": "デベãƒãƒƒãƒ‘ー：%s テーマやプラグイン %s を開発ã™ã‚‹ã“ã¨ã§Piwikã‚’æ‹¡å¼µã€ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºã™ã‚‹æ–¹æ³•ã‚’å¦ã³ã¾ã™ã€‚",
+ "DevelopersLearnHowToDevelopPlugins": "デベãƒãƒƒãƒ‘ー：%1$s テーマやプラグイン %2$s を開発ã™ã‚‹ã“ã¨ã§Piwikã‚’æ‹¡å¼µã€ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºã™ã‚‹æ–¹æ³•ã‚’å¦ã³ã¾ã™ã€‚",
"DoMoreContactPiwikAdmins": "æ–°ã—ã„プラグインやテーマをインストールã™ã‚‹ã«ã¯ã€ Piwik ã®ç®¡ç†è€…ã«é€£çµ¡ã‚’ã—ã¦ãã ã•ã„",
"EmailToEnquireUpdatedVersion": "%1$s をメールã§é€ä»˜ã®ä¸Šã€%2$s ã®æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ãŠå•ã„åˆã‚ã›ãã ã•ã„。",
"FeaturedPlugin": "注目ã®ãƒ—ラグイン",
- "ChangeLookByManageThemes": "%s テーマã®ç®¡ç† %sã«ã‚ˆã£ã¦ Piwik ã®å¤–観を変更ã§ãã¾ã™ã€‚",
- "GetEarlyAccessForPaidPlugins": "注 : ç¾åœ¨ã€å…¨ã¦ã®ãƒ—ラグインã¯ç„¡æ–™ã§åˆ©ç”¨ã§ãã¾ã™ã€‚今後マーケットプレイスã§ã¯æœ‰æ–™ãƒ—ラグインãŒæœ‰åŠ¹ã«ãªã‚Šã¾ã™ã€‚ (有料プラグインã«ã¤ã„ã¦ã€èª°ã‚ˆã‚Šã‚‚æ—©ã知りãŸã„æ–¹ã¯ã€%s ã“ã¡ã‚‰ %s )",
+ "ChangeLookByManageThemes": "%1$s テーマã®ç®¡ç† %2$sã«ã‚ˆã£ã¦ Piwik ã®å¤–観を変更ã§ãã¾ã™ã€‚",
+ "GetEarlyAccessForPaidPlugins": "注 : ç¾åœ¨ã€å…¨ã¦ã®ãƒ—ラグインã¯ç„¡æ–™ã§åˆ©ç”¨ã§ãã¾ã™ã€‚今後マーケットプレイスã§ã¯æœ‰æ–™ãƒ—ラグインãŒæœ‰åŠ¹ã«ãªã‚Šã¾ã™ã€‚ (有料プラグインã«ã¤ã„ã¦ã€èª°ã‚ˆã‚Šã‚‚æ—©ã知りãŸã„æ–¹ã¯ã€%1$s ã“ã¡ã‚‰ %2$s )",
"History": "å±¥æ´",
"Inactive": "無効",
"InfoPluginUpdateIsRecommended": "最新ã®æ”¹è‰¯ã«ã‚ˆã‚‹æ©æµã‚’å—ã‘ã‚‹ã«ã¯ã€ä»Šã™ãプラグインをアップデートã—ã¦ãã ã•ã„。",
@@ -66,7 +66,7 @@
"PluginNotWorkingAlternative": "ã“ã®ãƒ—ラグインを以å‰ã‹ã‚‰ä½¿ç”¨ã—ã¦ã„ã‚‹å ´åˆã€ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイス上ã§ã€ã‚ˆã‚Šæœ€æ–°ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’見ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚使用ã—ã¦ã„ãªã„å ´åˆã€ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚",
"PluginRequirement": "%1$s requires %2$s.",
"PluginsManagement": "プラグインã®ç®¡ç†",
- "PluginUpdateAvailable": "ã‚ãªãŸã¯ç¾åœ¨ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s を使用ã—ã¦ã„ã¾ã™ã€‚æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ãŒåˆ©ç”¨å¯èƒ½ã§ã™ã€‚",
+ "PluginUpdateAvailable": "ã‚ãªãŸã¯ç¾åœ¨ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1$s を使用ã—ã¦ã„ã¾ã™ã€‚æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %2$s ãŒåˆ©ç”¨å¯èƒ½ã§ã™ã€‚",
"PluginVersionInfo": "%2$s ã‹ã‚‰ã® %1$s",
"PluginWebsite": "プラグインã®ã‚¦ã‚§ãƒ–サイト",
"Screenshots": "スクリーンショット",
@@ -90,7 +90,7 @@
"TeaserExtendPiwikByPlugin": "æ–°ã—ã„プラグインをインストールã—㦠Piwik ã‚’æ‹¡å¼µ",
"TeaserExtendPiwikByTheme": "æ–°ã—ã„テーマをインストールã—ã¦åˆ¥ã®å¤–観ã¨æ“作感をãŠæ¥½ã—ã¿ãã ã•ã„",
"TeaserExtendPiwikByUpload": "ZIP ファイルをアップãƒãƒ¼ãƒ‰ã—㦠Piwik ã‚’æ‹¡å¼µ",
- "InstallingNewPluginViaMarketplaceOrUpload": "自動的ã«ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイスã‹ã‚‰ãƒ—ラグインをインストールã¾ãŸã¯.zipå½¢å¼ã®ãƒ—ラグイン %s ã‚’ %s アップãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚",
+ "InstallingNewPluginViaMarketplaceOrUpload": "自動的ã«ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイスã‹ã‚‰ãƒ—ラグインをインストールã¾ãŸã¯.zipå½¢å¼ã®ãƒ—ラグイン %1$s ã‚’ %2$s アップãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚",
"Theme": "テーマ",
"Themes": "テーマ",
"ThemesDescription": "テーマ㯠Piwik ユーザインターフェイスã®å¤–観を変更ã™ã‚‹ã ã‘ã§ãªãã€è§£æžãƒ¬ãƒãƒ¼ãƒˆã‚’楽ã—む新ã—ã„ビジュアルを備ãˆã¦ã„ã¾ã™",
diff --git a/plugins/CorePluginsAdmin/lang/ko.json b/plugins/CorePluginsAdmin/lang/ko.json
index 406ec44c78ce1de35b1162035c9e0f198cbff55d..c604615601e310872caafd03568f577ea55e4dd4 100644
--- a/plugins/CorePluginsAdmin/lang/ko.json
+++ b/plugins/CorePluginsAdmin/lang/ko.json
@@ -18,7 +18,7 @@
"Deactivate": "비활성화",
"Developer": "개발ìž",
"DoMoreContactPiwikAdmins": "새로운 플러그ì¸ì´ë‚˜ 테마를 설치하기 위해서, Piwik 관리ìžì—게 ì—°ë½í•´ì£¼ì„¸ìš”.",
- "GetEarlyAccessForPaidPlugins": "ì°¸ê³ ì‚¬í•: ëª¨ë“ í”ŒëŸ¬ê·¸ì¸ì€ 현재 무료로 ì‚¬ìš©í• ìˆ˜ 있습니다. 향후 ìœ ë£Œ ë§ˆì¼“í”Œë ˆì´ìŠ¤ë¥¼ ì œê³µí• ì˜ˆì •ìž…ë‹ˆë‹¤ (ìžì„¸í•œ 사í•ì€ %sì—°ë½ ì£¼ì‹œê¸¸%s ë°”ëžë‹ˆë‹¤.).",
+ "GetEarlyAccessForPaidPlugins": "ì°¸ê³ ì‚¬í•: ëª¨ë“ í”ŒëŸ¬ê·¸ì¸ì€ 현재 무료로 ì‚¬ìš©í• ìˆ˜ 있습니다. 향후 ìœ ë£Œ ë§ˆì¼“í”Œë ˆì´ìŠ¤ë¥¼ ì œê³µí• ì˜ˆì •ìž…ë‹ˆë‹¤ (ìžì„¸í•œ 사í•ì€ %1$sì—°ë½ ì£¼ì‹œê¸¸%2$s ë°”ëžë‹ˆë‹¤.).",
"Inactive": "비활성",
"InstallNewPlugins": "새로운 í”ŒëŸ¬ê·¸ì¸ ì„¤ì¹˜",
"InstallNewThemes": "새로운 테마 설치",
diff --git a/plugins/CorePluginsAdmin/lang/lt.json b/plugins/CorePluginsAdmin/lang/lt.json
index acc5f2fcdde5487618d184f9a000eb546bebf221..5af99565dd41bbd5370b3a729472e69c3005bd3f 100644
--- a/plugins/CorePluginsAdmin/lang/lt.json
+++ b/plugins/CorePluginsAdmin/lang/lt.json
@@ -1,18 +1,32 @@
{
"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/nb.json b/plugins/CorePluginsAdmin/lang/nb.json
index 73c5446a7ec1949714b193cba5165db42417715c..0444d1efa659a3ea2251e6f376b5f4579caf3c93 100644
--- a/plugins/CorePluginsAdmin/lang/nb.json
+++ b/plugins/CorePluginsAdmin/lang/nb.json
@@ -8,46 +8,79 @@
"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 %sinnstillingene%s for denne utvidelsen.",
+ "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.",
+ "EmailToEnquireUpdatedVersion": "Vennligst send e-post til %1$s og si at det finnes en oppdatert versjon av %2$s.",
+ "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",
+ "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",
+ "LastCommitTime": "(siste bidrag %s)",
"LastUpdated": "Sist oppdatert",
+ "LicenseHomepage": "Lisensside",
+ "LikeThisPlugin": "Liker du denne utvidelsen?",
+ "ConsiderDonating": "Vurder å donere",
+ "CommunityContributedPlugin": "Dette er en utvidelse som er utviklet av samfunnet, tilgjengelig gratis for deg.",
+ "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",
+ "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",
+ "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",
@@ -57,9 +90,12 @@
"TeaserExtendPiwikByPlugin": "Utvid Piwik ved å installere en ny utvidelse",
"TeaserExtendPiwikByTheme": "Nyt et annet design ved å installere et nytt tema",
"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",
diff --git a/plugins/CorePluginsAdmin/lang/nl.json b/plugins/CorePluginsAdmin/lang/nl.json
index 338e12493cd42b829e102ecf5aac27c0eb723e80..e5a2b2885d6e3a1352656a22e028d6d97b2aa64f 100644
--- a/plugins/CorePluginsAdmin/lang/nl.json
+++ b/plugins/CorePluginsAdmin/lang/nl.json
@@ -17,16 +17,16 @@
"ByXDevelopers": "door %s ontwikkelaars",
"CannotInstall": "Kan niet worden geïnstalleerd (help)",
"Changelog": "Wijzigingen",
- "ChangeSettingsPossible": "Je kunt %sinstellingen%s aanpassen voor deze plugin.",
+ "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 %sontwikkelen van plugins en thema's%s.",
+ "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.",
"EmailToEnquireUpdatedVersion": "Mail naar %1$s en vraag naar een actuele versie van %2$s.",
"FeaturedPlugin": "Aanbevolen plugin",
- "ChangeLookByManageThemes": "Je kan het uitelijk van Piwik wijzigen %sThema's%s",
- "GetEarlyAccessForPaidPlugins": "Opmerking: op het moment zijn alle plugins gratis beschikbaar; in de toekomst activeren we Betaalde Plugins in de Marktplaats (%sneem contact op%s om eerder toegang te krijgen).",
+ "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.",
@@ -65,7 +65,7 @@
"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 %s en een nieuwe versie %s is beschikbaar.",
+ "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",
@@ -89,7 +89,7 @@
"TeaserExtendPiwikByPlugin": "Breidt Piwik uit door een nieuwe plugin te installeren",
"TeaserExtendPiwikByTheme": "Geniet van een andere weergave door het installeren van een nieuw thema.",
"TeaserExtendPiwikByUpload": "Breidt Piwik uit door een ZIP bestand te uploaden",
- "InstallingNewPluginViaMarketplaceOrUpload": "Je kunt automatisch plugins installeren van de Martkplaats, of een %splugin uploaden%s in een .zip bestand.",
+ "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",
diff --git a/plugins/CorePluginsAdmin/lang/pl.json b/plugins/CorePluginsAdmin/lang/pl.json
index 9a33e1731c99b0250554ea6eee00f254affcecfb..510e5bf484e22ece27d30188677513b3e0413c42 100644
--- a/plugins/CorePluginsAdmin/lang/pl.json
+++ b/plugins/CorePluginsAdmin/lang/pl.json
@@ -16,14 +16,14 @@
"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ć %sustawienia%s dla tego plugin'u.",
+ "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.",
"EmailToEnquireUpdatedVersion": "Proszę napiac do %1$s i zapytać o zaktualizowanie wersji %2$s.",
"FeaturedPlugin": "Wyróżniony plugin",
- "GetEarlyAccessForPaidPlugins": "Uwaga: wszystkie pluginy są obecnie dostępne za darmo; w przyszłości uruchomimy w Sklepie Płatne Pluginy (%sskontaktuj się%s dla wczesnego dostępu).",
+ "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ń.",
@@ -57,7 +57,7 @@
"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 %s, nowa wersja %s jest dostępna.",
+ "PluginUpdateAvailable": "Używasz wersji %1$s, nowa wersja %2$s jest dostępna.",
"PluginVersionInfo": "%1$s z %2$s",
"PluginWebsite": "Strona WWW",
"Screenshots": "Screenshoty",
diff --git a/plugins/CorePluginsAdmin/lang/pt-br.json b/plugins/CorePluginsAdmin/lang/pt-br.json
index 479cc31bb8202daf32fd99e83cdb18c692a1c678..70d48fc1ff736478244284bf1f2b07ef1d4b7bde 100644
--- a/plugins/CorePluginsAdmin/lang/pt-br.json
+++ b/plugins/CorePluginsAdmin/lang/pt-br.json
@@ -17,16 +17,16 @@
"ByXDevelopers": "por %s desenvolvedores",
"CannotInstall": "Não consegue instalar (ajuda)",
"Changelog": "Changelog",
- "ChangeSettingsPossible": "Você pode alterar as %sconfigurações%s para este plugin.",
+ "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: Saiba como você pode estender e personalizar Piwik usando os plugins %sdeveloping ou themes%s.",
+ "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.",
"EmailToEnquireUpdatedVersion": "Por favor enviar e-mail %1$s e inquirir uma versão atualizada do %2$s.",
"FeaturedPlugin": "Plugin destaque",
- "ChangeLookByManageThemes": "Você pode alterar a aparência do Piwik por %sManaging Themes%s.",
- "GetEarlyAccessForPaidPlugins": "Nota: Atualmente todos os plugins estão disponÃveis gratuitamente; no futuro Plugins pagos serão permitidos no Marketplace (%sentre em contato conosco%s para acesso antecipado).",
+ "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",
"InfoPluginUpdateIsRecommended": "Atualize seus plugins agora para se beneficiar das últimas melhorias.",
@@ -66,7 +66,7 @@
"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 %s e uma nova versão %s está disponÃvel.",
+ "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",
@@ -90,7 +90,7 @@
"TeaserExtendPiwikByPlugin": "Estenda Piwik instalando um novo plugin",
"TeaserExtendPiwikByTheme": "Aproveite um outro look & feel instalando um novo tema",
"TeaserExtendPiwikByUpload": "Estenda o Piwik carregando um arquivo ZIP",
- "InstallingNewPluginViaMarketplaceOrUpload": "Você pode instalar automaticamente plugins do mercado ou %scarregar um plugin%s em formato .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.",
diff --git a/plugins/CorePluginsAdmin/lang/ro.json b/plugins/CorePluginsAdmin/lang/ro.json
index 136c5e89ed0c1fd2b619716149514e0aa369c145..d9ff7f63d99bbcda81acda64bac1a8823b6b0bb0 100644
--- a/plugins/CorePluginsAdmin/lang/ro.json
+++ b/plugins/CorePluginsAdmin/lang/ro.json
@@ -16,14 +16,14 @@
"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 %ssetarile%s pentru acest plugin.",
+ "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.",
"EmailToEnquireUpdatedVersion": "Va rugam sa trimiteti email %1$s si intrebati de o versiune mai noua a %2$s.",
"FeaturedPlugin": "Plugin promovat",
- "GetEarlyAccessForPaidPlugins": "Nota: toate pluginurile sunt disponibile gratuit in acest moment; pe viitor activa sectiunea Pluginuri cu Plata in Marketplace (%scontacteaza-ne%s pentru a putea accesa mai devreme).",
+ "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.",
@@ -57,7 +57,7 @@
"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 %s iar o versiune noua %s este disponibila.",
+ "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",
diff --git a/plugins/CorePluginsAdmin/lang/ru.json b/plugins/CorePluginsAdmin/lang/ru.json
index d9ba736893a04711f9bf5daaed4c8699c23d7a57..0aa82140b274cf85c1cbd17809fe4e8f735ff643 100644
--- a/plugins/CorePluginsAdmin/lang/ru.json
+++ b/plugins/CorePluginsAdmin/lang/ru.json
@@ -15,14 +15,14 @@
"BeCarefulUsingPlugins": "Плагины, которые разработаны не командой Piwik должны иÑпользоватьÑÑ Ñ Ð¾ÑторожноÑтью: мы не проÑматриваем их.",
"BeCarefulUsingThemes": "Темы, которые разработаны не командой Piwik должны иÑпользоватьÑÑ Ñ Ð¾ÑторожноÑтью: мы не проÑматриваем их.",
"Changelog": "ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹",
- "ChangeSettingsPossible": "Ð’Ñ‹ можете %sизменить наÑтройки%s Ð´Ð»Ñ Ñтого плагина.",
+ "ChangeSettingsPossible": "Ð’Ñ‹ можете %1$sизменить наÑтройки%2$s Ð´Ð»Ñ Ñтого плагина.",
"CorePluginTooltip": "ОÑновные плагины не имеют верÑию, так как они раÑпроÑтранÑÑŽÑ‚ÑÑ Ñ Piwik.",
"Deactivate": "Деактивировать",
"Developer": "Разработчик",
"DoMoreContactPiwikAdmins": "Ð”Ð»Ñ ÑƒÑтановки нового плагина или новой темы, пожалуйÑта ÑвÑжитеÑÑŒ Ñ Ð²Ð°ÑˆÐ¸Ð¼ Piwik-админиÑтратором",
"FeaturedPlugin": "Ðабирающий популÑрноÑÑ‚ÑŒ плагин",
- "ChangeLookByManageThemes": "Вы можете изменить внешний вид Piwik: %sВыбор Темы%s.",
- "GetEarlyAccessForPaidPlugins": "Примечание: в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð²Ñе плагины доÑтупны беÑплатно, в будущем мы включим платные плагины на Marketplace (%sÑвÑжитеÑÑŒ Ñ Ð½Ð°Ð¼Ð¸%s Ð´Ð»Ñ Ñ€Ð°Ð½Ð½ÐµÐ³Ð¾ доÑтупа).",
+ "ChangeLookByManageThemes": "Вы можете изменить внешний вид Piwik: %1$sВыбор Темы%2$s.",
+ "GetEarlyAccessForPaidPlugins": "Примечание: в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð²Ñе плагины доÑтупны беÑплатно, в будущем мы включим платные плагины на Marketplace (%1$sÑвÑжитеÑÑŒ Ñ Ð½Ð°Ð¼Ð¸%2$s Ð´Ð»Ñ Ñ€Ð°Ð½Ð½ÐµÐ³Ð¾ доÑтупа).",
"History": "ИÑториÑ",
"Inactive": "Ðеактивный",
"InfoPluginUpdateIsRecommended": "Обновите плагины что бы воÑпользоватьÑÑ Ð¿Ð¾Ñледними улучшениÑми.",
@@ -55,7 +55,7 @@
"PluginNotWorkingAlternative": "ЕÑли вы иÑпользуете Ñтот плагин, может быть, вы Ñможете найти более новые верÑии в Marketplace. ЕÑли нет — можете удалить его.",
"PluginRequirement": "%1$s требуетÑÑ %2$s.",
"PluginsManagement": "Управление плагинами",
- "PluginUpdateAvailable": "Ð’Ñ‹ иÑпользуете верÑию %s поÑледнÑÑ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð°Ñ %s",
+ "PluginUpdateAvailable": "Ð’Ñ‹ иÑпользуете верÑию %1$s поÑледнÑÑ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð°Ñ %2$s",
"PluginVersionInfo": "%1$s – %2$s",
"PluginWebsite": "Сайт плагина",
"Screenshots": "Скриншоты",
@@ -79,7 +79,7 @@
"TeaserExtendPiwikByPlugin": "Улучшение Piwik уÑтановкой нового плагина",
"TeaserExtendPiwikByTheme": "ÐаÑладитеÑÑŒ другим внешним видом уÑтановив новую тему",
"TeaserExtendPiwikByUpload": "Улучшение Piwik закачкой ZIP файла",
- "InstallingNewPluginViaMarketplaceOrUpload": "Ð’Ñ‹ автоматичеÑки можете уÑтановить плагины из Marketplace или %sзагрузить плагин%s в формате zip.",
+ "InstallingNewPluginViaMarketplaceOrUpload": "Ð’Ñ‹ автоматичеÑки можете уÑтановить плагины из Marketplace или %1$sзагрузить плагин%2$s в формате zip.",
"Theme": "Тема",
"Themes": "Темы",
"ThemesDescription": "Темы могут изменить внешний вид Piwik пользовательÑкого интерфейÑа, а также обеÑпечить Ñовершенно новое визуальное воÑприÑтие, чтобы наÑлаждатьÑÑ Ð¾Ñ‚Ñ‡ÐµÑ‚Ð°Ð¼Ð¸ аналитики.",
diff --git a/plugins/CorePluginsAdmin/lang/sk.json b/plugins/CorePluginsAdmin/lang/sk.json
index 2460c5c1bcdf142050acb4eb40977f7fff43d570..069cbec0935b83b1edf12c20dd68b039641634f0 100644
--- a/plugins/CorePluginsAdmin/lang/sk.json
+++ b/plugins/CorePluginsAdmin/lang/sk.json
@@ -17,16 +17,16 @@
"ByXDevelopers": "%s vývojárov",
"CannotInstall": "Nedá sa nainštalovať (nápoveda)",
"Changelog": "protokol zmien",
- "ChangeSettingsPossible": "Môžete zmeniť %s nastavenia %s pre tento plugin.",
+ "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 %s vývojarskými pluginmi alebo %s motÃvmi.",
+ "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.",
"EmailToEnquireUpdatedVersion": "ProsÃm mejlujte %1$s a informujte sa o aktualizovanej verzii %2$s.",
"FeaturedPlugin": "Hlavný plugin",
- "ChangeLookByManageThemes": "Výzor Piwiku môžete zmeniÅ¥ %s spravovanÃm motÃvov%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 (%s kontaktujte nás %s pre rýchly prÃstup).",
+ "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Ã.",
@@ -62,7 +62,7 @@
"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 %s a nová verzia %s je dostupná.",
+ "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",
@@ -86,7 +86,7 @@
"TeaserExtendPiwikByPlugin": "RozÅ¡ÃriÅ¥ Piwik inÅ¡talovanÃm nového pluginu",
"TeaserExtendPiwikByTheme": "VychutnaÅ¥ si iný pohľad & pocit nainÅ¡talovanÃm nového motÃvu",
"TeaserExtendPiwikByUpload": "RozÅ¡ÃriÅ¥ Piwik nahratÃm ZIP súboru",
- "InstallingNewPluginViaMarketplaceOrUpload": "Môžete automaticky nainštalovať plugin z trhu alebo %s nahrať plugin%s v .zip formáte.",
+ "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.",
diff --git a/plugins/CorePluginsAdmin/lang/sr.json b/plugins/CorePluginsAdmin/lang/sr.json
index 472bc60e1ffae66dd6f3b2f7a4ba541f9e82dfa9..a88994f2b826df0c6e2802a5fc083486e5dd99a3 100644
--- a/plugins/CorePluginsAdmin/lang/sr.json
+++ b/plugins/CorePluginsAdmin/lang/sr.json
@@ -17,16 +17,16 @@
"ByXDevelopers": "%s razvojnom timu",
"CannotInstall": "Ne mogu da instaliram (pomoć)",
"Changelog": "Dnevnik promena",
- "ChangeSettingsPossible": "Možete izmeniti %spodešavanja%s za ovaj dodatak.",
+ "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 %spravljenjem dodataka i tema%s.",
+ "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.",
"EmailToEnquireUpdatedVersion": "Molimo vas da pošaljete mejl na %1$s i da zatražite novu verziju %2$s.",
"FeaturedPlugin": "Istaknuti dodatak",
- "ChangeLookByManageThemes": "Možete izmeniti izgled Piwik-a %supravljanjem temama%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 (%skontaktirajte na%s za rani pristup).",
+ "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",
"InfoPluginUpdateIsRecommended": "Ažurirajte dodatke kako biste iskoristili najnovija poboljšanja.",
@@ -66,7 +66,7 @@
"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 %s a novija verzija %s je na raspolaganju.",
+ "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",
@@ -90,7 +90,7 @@
"TeaserExtendPiwikByPlugin": "Proširite Piwik instaliranjem novog dodatka",
"TeaserExtendPiwikByTheme": "Uživajte u novom izgledu instaliranjem nove teme",
"TeaserExtendPiwikByUpload": "Proširite Piwik postavljanjem ZIP datoteke",
- "InstallingNewPluginViaMarketplaceOrUpload": "Možete automatski instalirati dodatak sa Marketa ili ga možete %saploudovati%s u ZIP formatu.",
+ "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.",
diff --git a/plugins/CorePluginsAdmin/lang/sv.json b/plugins/CorePluginsAdmin/lang/sv.json
index c7a76cee9a55e5ba449d1cea6b7b2f8b691348a4..1f50caf404949cef20f6d0cb31de6f54c8506d85 100644
--- a/plugins/CorePluginsAdmin/lang/sv.json
+++ b/plugins/CorePluginsAdmin/lang/sv.json
@@ -16,16 +16,17 @@
"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": "Logg över förändring",
- "ChangeSettingsPossible": "Du kan ändra %sinställningar%s för det här pluginet.",
+ "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.",
"EmailToEnquireUpdatedVersion": "Skicka ett mejl till %1$s och meddela om en uppdaterad version av %2$s.",
"FeaturedPlugin": "Utvalda plugin",
- "ChangeLookByManageThemes": "Du kan ändra utseendet på Piwik genom %sHantera teman%s.",
- "GetEarlyAccessForPaidPlugins": "Observera: Just nu är alla plugin gratis; framöver kommer det finnas Plugin som kostar i butiken. (%skontakta oss%s för tidig tillgång)",
+ "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.",
@@ -61,10 +62,10 @@
"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 %s och en ny version %s finns tillgänglig.",
+ "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ärmbump",
+ "Screenshots": "Skärmdumpar",
"SortByAlpha": "alfa",
"SortByNewest": "nyaste",
"SortByPopular": "populär",
@@ -85,7 +86,7 @@
"TeaserExtendPiwikByPlugin": "FÃ¥ ut mer av din Piwik genom att installera ett nytt plugin",
"TeaserExtendPiwikByTheme": "Njut av en annan design och känsla genom att installera ett nytt tema",
"TeaserExtendPiwikByUpload": "Utöka Piwik genom att ladda upp en ZIP fil",
- "InstallingNewPluginViaMarketplaceOrUpload": "Du kan automatiskt installera plugin från Butiken eller %sladda upp en plugin%s i .zip format.",
+ "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.",
diff --git a/plugins/CorePluginsAdmin/lang/tl.json b/plugins/CorePluginsAdmin/lang/tl.json
index dc6390afa6f01418aa64e527c89ae6c954329410..25f61146f5b636b0b19b419d9e22e627ca101708 100644
--- a/plugins/CorePluginsAdmin/lang/tl.json
+++ b/plugins/CorePluginsAdmin/lang/tl.json
@@ -16,14 +16,14 @@
"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 %s setting %s para sa plugin na ito.",
+ "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",
"EmailToEnquireUpdatedVersion": "Paki-email ang %1$s at magtanong ng bagong na bersyon ng %2$s.",
"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 (%s makipag-ugnayan sa amin %s para sa maagang pag-access).",
+ "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.",
@@ -57,7 +57,7 @@
"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 %s at ang pinaka bagong bersyon %s ay available.",
+ "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",
diff --git a/plugins/CorePluginsAdmin/lang/tr.json b/plugins/CorePluginsAdmin/lang/tr.json
index 4ddf16b9e9bcea1314d24338770d0978725ccfd7..228325a807f681934960de5cdef47c71f8a1b89f 100644
--- a/plugins/CorePluginsAdmin/lang/tr.json
+++ b/plugins/CorePluginsAdmin/lang/tr.json
@@ -42,7 +42,7 @@
"PluginHomepage": "Eklenti Sayfası",
"PluginKeywords": "Anahtar Kelimeler",
"PluginsManagement": "Eklenti Yönetimi",
- "PluginUpdateAvailable": "Şuanda %s versiyonunu kullanıyorsunuz ve yeni %s versiyon mevcut.",
+ "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",
diff --git a/plugins/CorePluginsAdmin/lang/vi.json b/plugins/CorePluginsAdmin/lang/vi.json
index a2c19bafe8e3855cad704ef3c47fa580060e0721..8d131dd15c641f4003867d2db26907082807a0a4 100644
--- a/plugins/CorePluginsAdmin/lang/vi.json
+++ b/plugins/CorePluginsAdmin/lang/vi.json
@@ -18,7 +18,7 @@
"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 ((%sliên hệ%s để được sá» dụng sá»›m).",
+ "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.",
diff --git a/plugins/CoreUpdater/ReleaseChannel.php b/plugins/CoreUpdater/ReleaseChannel.php
index cb1ea5c9dfec71ed17a5f9c4a18dae78dcacd136..c7da77889fad4981d18f3d2acfd3803e61b7051a 100644
--- a/plugins/CoreUpdater/ReleaseChannel.php
+++ b/plugins/CoreUpdater/ReleaseChannel.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\CoreUpdater;
use Piwik\Common;
use Piwik\Config;
+use Piwik\Db;
use Piwik\Http;
use Piwik\Plugins\SitesManager\API;
use Piwik\Url;
@@ -23,6 +24,7 @@ abstract class ReleaseChannel extends BaseReleaseChannel
$parameters = array(
'piwik_version' => Version::VERSION,
'php_version' => PHP_VERSION,
+ 'mysql_version' => Db::get()->getServerVersion(),
'release_channel' => $this->getId(),
'url' => Url::getCurrentUrlWithoutQueryString(),
'trigger' => Common::getRequestVar('module', '', 'string'),
diff --git a/plugins/CoreUpdater/Test/Integration/ReleaseChannelTest.php b/plugins/CoreUpdater/Test/Integration/ReleaseChannelTest.php
index 3f1f4248b4019aab96fc6e8ce148803c440fb33a..5d480ed18eeb1dcf9675cbb2b4bf4c9070e1a2d1 100644
--- a/plugins/CoreUpdater/Test/Integration/ReleaseChannelTest.php
+++ b/plugins/CoreUpdater/Test/Integration/ReleaseChannelTest.php
@@ -9,6 +9,7 @@
namespace Piwik\Plugins\CoreUpdater\Test\ReleaseChannel;
use Piwik\Config;
+use Piwik\Db;
use Piwik\Plugins\CoreUpdater\ReleaseChannel;
use Piwik\UpdateCheck;
use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
@@ -56,11 +57,12 @@ class ReleaseChannelTest extends IntegrationTestCase
{
$version = Version::VERSION;
$phpVersion = urlencode(PHP_VERSION);
+ $mysqlVersion = Db::get()->getServerVersion();
$url = urlencode(Url::getCurrentUrlWithoutQueryString());
$urlToCheck = $this->channel->getUrlToCheckForLatestAvailableVersion();
- $this->assertStringStartsWith("http://api.piwik.org/1.0/getLatestVersion/?piwik_version=$version&php_version=$phpVersion&release_channel=my_channel&url=$url&trigger=&timezone=", $urlToCheck);
+ $this->assertStringStartsWith("http://api.piwik.org/1.0/getLatestVersion/?piwik_version=$version&php_version=$phpVersion&mysql_version=$mysqlVersion&release_channel=my_channel&url=$url&trigger=&timezone=", $urlToCheck);
}
}
diff --git a/plugins/CoreUpdater/lang/cs.json b/plugins/CoreUpdater/lang/cs.json
index d77907655a66892d442ddfee47fb978585404cbf..e8558c4db1a9766a1b5ff35643e939e5991b066d 100644
--- a/plugins/CoreUpdater/lang/cs.json
+++ b/plugins/CoreUpdater/lang/cs.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Zkontrolujte %1$s Piwik FAQ %2$s , kde jsou vysvÄ›tleny nejÄastÄ›jÅ¡Ã chybi pÅ™i aktualizaci. %3$s Požádejte svéo systémového administrátora - může vám pomoci s chybou, která je nejÄastÄ›ji způsobena nastavenÃm serveru MySQL.",
"HelpMessageIntroductionWhenError": "NÞe je hlavnà chybová hláška. Pomůže vám zjistit pÅ™ÃÄinu, ale pokud budete potÅ™ebovat dalÅ¡Ã pomoc:",
"HelpMessageIntroductionWhenWarning": "Aktualizace probÄ›hla v pořádku, ale byly zaznamenány problémy. ProsÃm pÅ™eÄtÄ›te si jejich popis výše. Pro dalÅ¡Ã pomoc:",
- "HighTrafficPiwikServerEnableMaintenance": "Pokud provozujete Piwik server s velkým provozem, doporuÄujeme %sna chvÃli zakázat sledovánà návÅ¡tÄ›vnÃků a pÅ™epnout uživatelské rozhranà do režimu údržby%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Pokud provozujete Piwik server s velkým provozem, doporuÄujeme %1$sna chvÃli zakázat sledovánà návÅ¡tÄ›vnÃků a pÅ™epnout uživatelské rozhranà do režimu údržby%2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Poznámka: Některé zásuvné moduly nejsou kompatibilnàs Piwikem %s. Budou zakázány při aktualizaci:",
"InstallingTheLatestVersion": "Instaluji poslednà verzi",
"LatestBetaRelease": "Poslednà beta vydánÃ",
diff --git a/plugins/CoreUpdater/lang/da.json b/plugins/CoreUpdater/lang/da.json
index 5f81e928bdeb0e3a2014780bd21fa4805289288b..cb351c649db62f516953a022dd0316c886c91255 100644
--- a/plugins/CoreUpdater/lang/da.json
+++ b/plugins/CoreUpdater/lang/da.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "se %1$s Piwik FAQ %2$s som forklarer de mest almindelige fejl om opdateringer. %3$s Spørg systemadministratoren - vedkommende kan måske hjælpe med fejlen som sandsynligvis skyldes server eller MySQL-opsætning.",
"HelpMessageIntroductionWhenError": "Ovenstående vises fejlmeddelelsen. Den bør hjælpe med at forklare årsagen, men hvis der behøves mere hjælp:",
"HelpMessageIntroductionWhenWarning": "Opdateringen er fuldført, men det var nogle småproblemer under processen. Læs detaljerne ovenfor. For yderligere hjælp:",
- "HighTrafficPiwikServerEnableMaintenance": "Hvis du administrerer en Piwik server med høj trafik, anbefaler vi at du %s midlertidigt deaktivere sporing af besøgende og sætte Piwik brugergrænseflade i vedligeholdelsestilstand%s",
+ "HighTrafficPiwikServerEnableMaintenance": "Hvis du administrerer en Piwik server med høj trafik, anbefaler vi at du %1$s midlertidigt deaktivere sporing af besøgende og sætte Piwik brugergrænseflade i vedligeholdelsestilstand%2$s",
"IncompatbilePluginsWillBeDisabledInfo": "Bemærk: Nogle udvidelsesmoduler er ikke kompatible med Piwik %s. De vil blive deaktiveret, når du opgraderer:",
"InstallingTheLatestVersion": "Installerer den seneste version",
"MajorUpdateWarning1": "Dette er en stor opdatering! Den vil tage længere tid end normalt.",
diff --git a/plugins/CoreUpdater/lang/de.json b/plugins/CoreUpdater/lang/de.json
index 77b4cc9b8a3953201870b7bced2de1cc24609c32..c4397dd0e558f788251610c66ddefd2e42f096f9 100644
--- a/plugins/CoreUpdater/lang/de.json
+++ b/plugins/CoreUpdater/lang/de.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Lesen Sie die %1$sPiwik-FAQ%2$s. Dort werden die meisten Fehler, die während einer Aktualisierung auftreten können, erklärt. %3$sFragen Sie Ihren Systemadministrator - dieser kann Ihnen mit diesem Fehler helfen, da er am wahrscheinlichsten mit Ihrem Server oder dem MySQL-Server zusammenhängt.",
"HelpMessageIntroductionWhenError": "Dies ist die Kernfehlermeldung. Sie sollte helfen, die Ursache zu erklären, aber wenn Sie weitere Hilfe benötigen, bitte:",
"HelpMessageIntroductionWhenWarning": "Die Aktualisierung konnte erfolgreich abgeschlossen werden, obwohl es währenddessen zu Problemen kam. Für nähere Details lesen Sie bitte die Beschreibung. Für weitere Hilfe:",
- "HighTrafficPiwikServerEnableMaintenance": "Wenn Sie eine Website mit hohem Verkehrsaufkommen verwalten, empfehlen wir, das %sBesuchertracking vorübergehend zu deaktivieren und die Benutzeroberfläche in den Wartungsmodus zu versetzen%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Wenn Sie eine Website mit hohem Verkehrsaufkommen verwalten, empfehlen wir, das %1$sBesuchertracking vorübergehend zu deaktivieren und die Benutzeroberfläche in den Wartungsmodus zu versetzen%2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Hinweis: Einige Plugins sind nicht kompatibel mit Piwik %s. Diese werden beim Upgrade deaktiviert:",
"InstallingTheLatestVersion": "Die neueste Version wird installiert",
"LatestBetaRelease": "Das aktuelle beta Release",
diff --git a/plugins/CoreUpdater/lang/el.json b/plugins/CoreUpdater/lang/el.json
index acd2046583af56f1f12e87f09d41ac35b0fd6215..ce9c30004100e0066f0f1fbd38c7003696dc891c 100644
--- a/plugins/CoreUpdater/lang/el.json
+++ b/plugins/CoreUpdater/lang/el.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "ΕλÎγξτε τις %1$s Piwik FAQ %2$s για συνήθη σφάλματα κατά τη διαδικασία της αναβάθμισης. %3$s Ρωτήστε τον διαχειÏιστή του συστήματος και ζητήστε βοήθεια με το σφάλμα το οποίο κατά πάσα πιθανότητα είναι συναφή με τον διακομιστή και την MySQL.",
"HelpMessageIntroductionWhenError": "Το παÏαπάνω είναι το μήνυμα λάθους του πυÏήνα. Λογικά Ï€ÏÎπει να βοηθάει την επεξήγηση της αιτίας, αλλά αν θÎλετε πεÏισσότεÏες πληÏοφοÏίες:",
"HelpMessageIntroductionWhenWarning": "Η αναβάθμιση ολοκληÏώθηκε με επιτυχία, αλλά υπήÏξαν κάποια θÎματα κατά τη διάÏκεια. ΠαÏακαλώ διαβάστε τις παÏαπάνω πεÏιγÏαφÎÏ‚ για τις λεπτομÎÏειες. Για πεÏισσότεÏη βοήθεια:",
- "HighTrafficPiwikServerEnableMaintenance": "Αν διαχειÏίζεστε Îνα Piwik διακομιστή με υψηλή κίνηση, Ï€Ïοτείνουμε να %sαπενεÏγοποιήσετε Ï€ÏοσωÏινά την παÏακολοÏθηση ΕπισκÎπτη και να βάλετε τη Διεπαφή ΧÏήστη του Piwik σε κατάσταση συντήÏησης%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Αν διαχειÏίζεστε Îνα Piwik διακομιστή με υψηλή κίνηση, Ï€Ïοτείνουμε να %1$sαπενεÏγοποιήσετε Ï€ÏοσωÏινά την παÏακολοÏθηση ΕπισκÎπτη και να βάλετε τη Διεπαφή ΧÏήστη του Piwik σε κατάσταση συντήÏησης%2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Σημείωση: οÏισμÎνα Ï€Ïόσθετα δεν είναι συμβατά με το Piwik %s. Θα απενεÏγοποιηθοÏν όταν αναβαθμίσετε:",
"InstallingTheLatestVersion": "Εγκατάσταση της τελευταίας Îκδοσης",
"LatestBetaRelease": "Τελευταία δοκιμαστική Îκδοση",
diff --git a/plugins/CoreUpdater/lang/en.json b/plugins/CoreUpdater/lang/en.json
index cb3f8a1c6a76ad32ecb4755ce04ad6788a58c55c..518631531077a20375b01fae1a855f0eca6046cf 100644
--- a/plugins/CoreUpdater/lang/en.json
+++ b/plugins/CoreUpdater/lang/en.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Check the %1$s Piwik FAQ %2$s which explains most common errors during update. %3$s Ask your system administrator - they may be able to help you with the error which is most likely related to your server or MySQL setup.",
"HelpMessageIntroductionWhenError": "The above is the core error message. It should help explain the cause, but if you require further help please:",
"HelpMessageIntroductionWhenWarning": "The update completed successfuly, however there were issues during the process. Please read the above descriptions for details. For further help:",
- "HighTrafficPiwikServerEnableMaintenance": "If you manage a high traffic Piwik server, we recommend to %smomentarily disable visitor Tracking and put the Piwik User Interface in maintenance mode%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "If you manage a high traffic Piwik server, we recommend to %1$smomentarily disable visitor Tracking and put the Piwik User Interface in maintenance mode%2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Note: some plugins are not compatible with Piwik %s. They will be disabled when you upgrade:",
"InstallingTheLatestVersion": "Installing the latest version",
"LatestBetaRelease": "Latest beta release",
diff --git a/plugins/CoreUpdater/lang/es.json b/plugins/CoreUpdater/lang/es.json
index 4c51b0d042472270cf2332c578664c6ecf1fb3b1..d3b9111aa32b8fa8abd0bc3d122da60757ac4f16 100644
--- a/plugins/CoreUpdater/lang/es.json
+++ b/plugins/CoreUpdater/lang/es.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Comprueba la %1$s Piwik FAQ %2$s que explica los errores más comunes durante la actualización. %3$s Pregúntele a su administrador del sistema - que puede ser capaz de ayudarle con el error, que es más probable que sea en relación a su servidor o la configuración de MySQL.",
"HelpMessageIntroductionWhenError": "Lo anterior es un mensaje de error principal. DeberÃa ayudarle a explicar la causa, pero si necesita más ayuda, por favor:",
"HelpMessageIntroductionWhenWarning": "Actualización completada con éxito, sin embargo hubo problemas durante el proceso. Por favor, lea las descripciones anteriores para obtener más detalles. Para obtener más ayuda:",
- "HighTrafficPiwikServerEnableMaintenance": "Si administra un servidor de Piwik con tráfico elevado, le recomendamos %sdesactivar momentáneamente el seguimento de los visitantes y disponer la interfaz de usuario de Piwik en modo mantenimiento%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Si administra un servidor de Piwik con tráfico elevado, le recomendamos %1$sdesactivar momentáneamente el seguimento de los visitantes y disponer la interfaz de usuario de Piwik en modo mantenimiento%2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Nota: algunos complementos no son compatibles con Piwik %s. Serán desactivados cuando actualice:",
"InstallingTheLatestVersion": "Instalando la última versión",
"MajorUpdateWarning1": "¡Esta es una actualización importante! Tardará más de lo usual.",
diff --git a/plugins/CoreUpdater/lang/et.json b/plugins/CoreUpdater/lang/et.json
index 15b9c5dfc1d13c213454702901da4bcdc177712b..09c9b037ef25b0b189aeef02141cb391e0296e99 100644
--- a/plugins/CoreUpdater/lang/et.json
+++ b/plugins/CoreUpdater/lang/et.json
@@ -10,7 +10,7 @@
"ExceptionArchiveEmpty": "Tühi arhiiv.",
"HelpMessageContent": "Vaata %1$s Piwik KKK %2$s milles selgitadakse tavapäraste probleemide põhjuseid ja lahendusi. %3$s Kui sa ei leia lahendust, siis küsi oma süsteemi administraatoritelt abi- nad võivad aidata juhul, kui need vead on seotud serveri või MySQL seadetega.",
"HelpMessageIntroductionWhenWarning": "Uuendamine edukalt lõpetatud, siiski esines protsessis vigu. Palun tutvu ülal vigade kirjeldustega. Saamaks rohkem abi:",
- "HighTrafficPiwikServerEnableMaintenance": "Kui sa haldad suure liiklusega Piwiku serverit, soovitame korraks %slülitada Piwiku kasutajaliides hooldusrežiimi ja katkestada külastuste kohta info kogumine%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Kui sa haldad suure liiklusega Piwiku serverit, soovitame korraks %1$slülitada Piwiku kasutajaliides hooldusrežiimi ja katkestada külastuste kohta info kogumine%2$s.",
"InstallingTheLatestVersion": "Paigaldan uusimat versiooni",
"MajorUpdateWarning1": "Tegemist on suure uuendusega! See võtab tavapärasest kauem aega.",
"MajorUpdateWarning2": "Järgnev info on eriti oluline suure külastatavusega paigaldustele.",
diff --git a/plugins/CoreUpdater/lang/fi.json b/plugins/CoreUpdater/lang/fi.json
index 7d84b1554cfc64871be254fa152a211ac5d121c3..87b362e1e2abaae09aa91b82b2bcc9bbcfdb091a 100644
--- a/plugins/CoreUpdater/lang/fi.json
+++ b/plugins/CoreUpdater/lang/fi.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Tarkista %1$s Piwikin FAQ:sta%2$s yleisimmät virheet. %3$s Kysy järjestelmän ylläpitäjältä - he voivat auttaa virheissä, jotka johtuvat luultavasti palvelimesta tai tietokannasta.",
"HelpMessageIntroductionWhenError": "Alla on ytimen virheviesti: Sen pitäisi auttaa virheen etsimisessä, mutta jos tarvitset lisää apua:",
"HelpMessageIntroductionWhenWarning": "Päivitys valmistui onnistuneesti, mutta prosessin aikana tapahtui virheitä. Ole hyvä ja lue alla olevat kuvaukset. Lisää apua:",
- "HighTrafficPiwikServerEnableMaintenance": "Jos Piwik-palvelimellasi on suuria määriä liikennettä, suosittelemme %spoistamaan käyttäjäseurannan hetkellisesti käytöstä ja laittamaan Piwikin käyttäjäliittymän huoltotilaan%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Jos Piwik-palvelimellasi on suuria määriä liikennettä, suosittelemme %1$spoistamaan käyttäjäseurannan hetkellisesti käytöstä ja laittamaan Piwikin käyttäjäliittymän huoltotilaan%2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Huom. Osa lisäosista ei ole yhteensopivia Piwikin kanssa: %s. Nämä poistetaan käytöstä kun päivität:",
"InstallingTheLatestVersion": "Asennetaan uusinta versiota",
"MajorUpdateWarning1": "Tämä on iso päivitys! Päivityksessä kestää kauemmin kuin normaalisti.",
diff --git a/plugins/CoreUpdater/lang/fr.json b/plugins/CoreUpdater/lang/fr.json
index 4a4e84f9830b6eaed35936310a0068311874e2b6..51996305d8e6f7f8a02464e608ec3461c95d4684 100644
--- a/plugins/CoreUpdater/lang/fr.json
+++ b/plugins/CoreUpdater/lang/fr.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Allez voir la %1$s FAQ Piwik %2$s qui explique les erreurs courantes lors de la mise à jour. %3$s Demandez à votre administrateur système - il pourra être à même avec cette erreur qui est très probablement liée à la configuration de votre serveur MySQL.",
"HelpMessageIntroductionWhenError": "Ci-dessus est le message d'erreur du noyau. Cela devrait expliquer la cause, mais si vous nécessitez davantage d'aide merci de :",
"HelpMessageIntroductionWhenWarning": "La mise à jour a été complétée avec succès. Cependant, des problèmes sont survenus. Lisez la description ci-dessus pour plus de détails. Pour davantage d'aide :",
- "HighTrafficPiwikServerEnableMaintenance": "Si vous gérez un serveur Piwik à haut traffic, nous recommandons de %sdésactiver momentanément le suivi des visiteurs et de mettre l'interface utilisateur de Piwik en mode de maintenance%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Si vous gérez un serveur Piwik à haut traffic, nous recommandons de %1$sdésactiver momentanément le suivi des visiteurs et de mettre l'interface utilisateur de Piwik en mode de maintenance%2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Note : certains plugins ne sont pas compatbles avec Piwik %s. Ils seront désactivés lorsque vous mettrez à jour :",
"InstallingTheLatestVersion": "Installation de la dernière version",
"LatestBetaRelease": "Dernière version beta",
diff --git a/plugins/CoreUpdater/lang/it.json b/plugins/CoreUpdater/lang/it.json
index 89e23f6e1ead2dced0909b92a1d364d394bf2e6c..0695373153c72528d70aab7dbea39e5bd0e82fcd 100644
--- a/plugins/CoreUpdater/lang/it.json
+++ b/plugins/CoreUpdater/lang/it.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Controlla le %1$sFAQ di Piwik %2$s, ti spiegheranno gli errori più comuni durante l'aggiornamento. %3$sChiedi all'amministratore di sistema circa gli errori che ti sembrano relativi alla configurazione di MySQL o al server, piuttosto che a Piwik.",
"HelpMessageIntroductionWhenError": "Il messaggio qui sopra ti spiega l'errore verificatosi durante l'aggiornamento. Ti spiega cosa l'ha causato, ma se vuoi ulteriore aiuto:",
"HelpMessageIntroductionWhenWarning": "L'aggiornamento è stato completato con successo, tuttavia si sono verificati dei piccoli problemi. Puoi leggerne qui sopra una breve descrizione. Per maggiori informazioni:",
- "HighTrafficPiwikServerEnableMaintenance": "Se gestisci un server di Piwik ad alto traffico, raccomandiamo di %sdisabilitare temporaneamente il Tracciamento dei visitatori e di mettere l'Interfaccia Utente di Piwik in modalità manutenzione%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Se gestisci un server di Piwik ad alto traffico, raccomandiamo di %1$sdisabilitare temporaneamente il Tracciamento dei visitatori e di mettere l'Interfaccia Utente di Piwik in modalità manutenzione%2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Nota: alcuni plugins non sono compatibili con Piwik %s. Dopo l'aggiornamento verranno disabilitati.",
"InstallingTheLatestVersion": "Sto installando l'ultima versione",
"LatestBetaRelease": "Ultima release beta",
diff --git a/plugins/CoreUpdater/lang/ja.json b/plugins/CoreUpdater/lang/ja.json
index 25e1fb5caf81cf2a31770f6f6bfd2ebdeb039e8b..5b9e6c99f796374f6bf2d1bcd7edbc866cc5d06e 100644
--- a/plugins/CoreUpdater/lang/ja.json
+++ b/plugins/CoreUpdater/lang/ja.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "アップグレードã®é–“ã€æœ€ã‚‚一般的ãªã‚¨ãƒ©ãƒ¼ã‚’説明ã—ã¦ã„ã‚‹ %1$s Piwik FAQ %2$sã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ãã ã•ã„。%3$s システム管ç†è€…ã«ãŠå°‹ããã ã•ã„ ï¼ å½¼ã‚‰ã¯ãŸã„ã¦ã„ã®å ´åˆã€ã‚µãƒ¼ãƒã‚„ MySQL ã®ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã«é–¢ä¿‚ã™ã‚‹ã‚¨ãƒ©ãƒ¼ã«ã¤ã„ã¦ã€ã‚ãªãŸã®æ‰‹åŠ©ã‘ãŒã§ãã‚‹ã§ã—ょã†ã€‚",
"HelpMessageIntroductionWhenError": "上記ã¯ã‚³ã‚¢ã®ã‚¨ãƒ©ãƒ¼ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã§ã™ã€‚ åŽŸå› ã®èª¬æ˜Žã«å½¹ç«‹ã¤ã¯ãšã§ã™ãŒã€ã•ã‚‰ãªã‚‹ãƒ˜ãƒ«ãƒ—ãŒå¿…è¦ã§ã‚ã‚Œã°ã“ã¡ã‚‰ã‚’ã©ã†ãžï¼š",
"HelpMessageIntroductionWhenWarning": "アップグレードã¯æ£å¸¸ã«å®Œäº†ã—ã¾ã—ãŸãŒã€å‡¦ç†ä¸ã«å•é¡ŒãŒã‚ã‚Šã¾ã—ãŸã€‚ 詳細ã¯ä¸Šè¨˜ã®èª¬æ˜Žã‚’ãŠèªã¿ãã ã•ã„。 ã•ã‚‰ãªã‚‹ãƒ˜ãƒ«ãƒ—：",
- "HighTrafficPiwikServerEnableMaintenance": "高トラフィック㮠Piwik サーãƒãƒ¼ã‚’管ç†ã™ã‚‹å ´åˆã€ %smomentarily disable visitor Tracking and put the Piwik User Interface in maintenance mode%s ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚",
+ "HighTrafficPiwikServerEnableMaintenance": "高トラフィック㮠Piwik サーãƒãƒ¼ã‚’管ç†ã™ã‚‹å ´åˆã€ %1$smomentarily disable visitor Tracking and put the Piwik User Interface in maintenance mode%2$s ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚",
"IncompatbilePluginsWillBeDisabledInfo": "注 : 一部ã®ãƒ—ラグインã¯ã€Piwik %s ã«äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“。アップグレード時ã«ã€ã“れらã®ãƒ—ラグインã¯ç„¡åŠ¹ã«ãªã‚Šã¾ã™ã€‚",
"InstallingTheLatestVersion": "最新ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’インストールä¸",
"LatestBetaRelease": "最新ã®ãƒ™ãƒ¼ã‚¿ç‰ˆ リリース",
diff --git a/plugins/CoreUpdater/lang/lt.json b/plugins/CoreUpdater/lang/lt.json
index 21eb9b5effcb28aaa58a14750cab7da62877b8d0..fea60afcad6bd861618aa422e47782ac3b2bd4e2 100644
--- a/plugins/CoreUpdater/lang/lt.json
+++ b/plugins/CoreUpdater/lang/lt.json
@@ -3,6 +3,7 @@
"ClickHereToViewSqlQueries": "Spauskite Äia SQL užklausų, kurias reikia įvykdyti, sÄ…raÅ¡ui gauti.",
"CriticalErrorDuringTheUpgradeProcess": "KritinÄ— klaida atnaujinimo metu:",
"DatabaseUpgradeRequired": "Reikalingas duombazÄ—s atnaujinimas",
+ "DisablingIncompatiblePlugins": "IÅ¡jungiami nesuderinami papildiniai: %s",
"DownloadingUpdateFromX": "AtsisiunÄiamas atnaujinimas iÅ¡ %s",
"DownloadX": "Atsisiųsti %s",
"EmptyDatabaseError": "DuombazÄ— %s yra tuÅ¡Äia. Privalote paredaguoti arba paÅ¡alinti savo Piwik konfigÅ«racijos failÄ….",
@@ -20,9 +21,13 @@
"HelpMessageContent": "PeržiÅ«rÄ—kite %1$s Piwik DUK, %2$s kur paaiÅ¡kinamos dažniausiai pasitaikanÄios naujinimo problemos. %3$s JÅ«sų sistemos administratorius gali padÄ—ti iÅ¡sprÄ™sti daugumÄ… jų, kadangi jos dažniausiai susijusios su serverio arba MySQL nustatymais.",
"HelpMessageIntroductionWhenError": "AukÅ¡Äiau nurodytas klaidos apraÅ¡ymas. Jei reikia daugiau pagalbos:",
"HelpMessageIntroductionWhenWarning": "Piwik atnaujinta, taÄiau su iÅ¡lygomis. PraÅ¡ome perskaityti aukÅ¡Äiau pateikiamÄ… apraÅ¡ymÄ…. Jei reikia daugiau pagalbos:",
+ "IncompatbilePluginsWillBeDisabledInfo": "Pastaba: kai kurie papildiniai yra nesuderinami su Piwik %s. Kai atsinaujinsite, jie bus išjungti:",
"InstallingTheLatestVersion": "Įdiegiama naujausia versija",
+ "MajorUpdateWarning1": "Tai yra didesnis atnaujinimas! Jis užtruks ilgiau nei įprasta.",
"NoteForLargePiwikInstances": "Svarbi pastaba apie didelius Piwik diegimus",
"NoteItIsExpectedThatQueriesFail": "Pastaba: jei rankiniu bÅ«du įvykdysite Å¡ias užklausas, gali bÅ«ti, jog kai kurios iÅ¡ jų praneÅ¡ apie klaidas ir nebus įvykdytos. PaprasÄiausias ignoruokite klaidas ir vykdykite sekanÄias užklausas esanÄias sÄ…raÅ¡e.",
+ "NotificationClickToUpdatePlugins": "SpustelÄ—kite Äia, kad atnaujintumÄ—te savo papildinius dabar:",
+ "NotificationSubjectAvailablePluginUpdate": "Jūsų Piwik papildiniams yra atnaujinimų",
"PiwikHasBeenSuccessfullyUpgraded": "Piwik sÄ—kmingai atnaujinta!",
"PiwikUpdatedSuccessfully": "Piwik sÄ—kmingai atnaujinta!",
"PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik duombazė bus atnaujinta iš %1$s į %2$s versiją.",
@@ -36,6 +41,7 @@
"UpdateHasBeenCancelledExplanation": "Piwik automatinis atnaujinimas atšauktas. Jei negalite ištaisyti nurodytos klaidos, rekomenduojame atnaujinti Piwik rankiniu būdu. %1$s Peržiūrėkite %2$sNaujinimo dokumentaciją%3$s prieš pradedant!",
"UpdateTitle": "Naujinimas",
"UpdateSuccessTitle": "Piwik sÄ—kmingai atnaujinta!",
+ "UpdateErrorTitle": "Atnaujinimo klaida",
"UpgradeComplete": "Naujinimas baigtas!",
"UpgradePiwik": "Naujinti Piwik",
"VerifyingUnpackedFiles": "Tikrinami išskleisti failai",
diff --git a/plugins/CoreUpdater/lang/nb.json b/plugins/CoreUpdater/lang/nb.json
index 7a65b4e3d5e8e8001fc16234ff1ab738904ea433..e47c271de637325a90f318cdc8853c44c884d52f 100644
--- a/plugins/CoreUpdater/lang/nb.json
+++ b/plugins/CoreUpdater/lang/nb.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Sjekk %1$s Piwik FAQ-en %2$s som prøver å forklare de mest vanlige feilene under oppdatering. %3$s Spør din systemadministrator – vedkommende kan kanskje hjelpe deg med feilen som antakelig har sammenheng med din tjener eller MySQL-installasjon.",
"HelpMessageIntroductionWhenError": "Over vises feilmeldingen. Den bør hjelpe deg med å forklare årsaken, men hvis du trenger mer hjelp, vennligst:",
"HelpMessageIntroductionWhenWarning": "Oppdateringen er fullført, men det var noen småproblemer under prossessen. Les beskrivelsene over for mer informasjon. For videre hjelp:",
- "HighTrafficPiwikServerEnableMaintenance": "Hvis du administrerer en Piwik-tjener for et nettsted med høy trafikk, anbefaler vi at du %smidlertidig slår av sporing av besøkende og setter Piwik-brukergrensesnittet i vedlikeholdsmodus%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Hvis du administrerer en Piwik-tjener for et nettsted med høy trafikk, anbefaler vi at du %1$smidlertidig slår av sporing av besøkende og setter Piwik-brukergrensesnittet i vedlikeholdsmodus%2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Merk: Noen tillegg er ikke kompatible med Piwik %s. De blir deaktivert når du oppgraderer:",
"InstallingTheLatestVersion": "Installerer siste versjon.",
"LatestBetaRelease": "Siste beta-versjon",
diff --git a/plugins/CoreUpdater/lang/nl.json b/plugins/CoreUpdater/lang/nl.json
index b6dd947769d5e1c3a01dacabdcc294d252b76f80..0113f6ff6058fd18aa8d824e76b55b87ab8f0bdc 100644
--- a/plugins/CoreUpdater/lang/nl.json
+++ b/plugins/CoreUpdater/lang/nl.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Controleer de %1$s Piwik FAQ %2$s waarin de meest voorkomende upgrade foutmeldingen worden uitgelegd. %3$s Vraag uw systeem beheerder - deze kan u wellicht helpen met deze fout die waarschijnlijk gerelateerd is aan de configuratie van uw webserver of MySQL-database.",
"HelpMessageIntroductionWhenError": "Hierboven staat de foutmelding. Hierin zou de oorzaak naar voren moeten komen, mocht u desondanks nog vragen hebben:",
"HelpMessageIntroductionWhenWarning": "De upgrade is voltooid, maar met fouten tijdens het proces. Lees de omschrijvingen hierboven voor meer informatie. Voor verdere hulp:",
- "HighTrafficPiwikServerEnableMaintenance": "Als je een Piwik server met veel verkeer beheert, raden we je aan om %smetingen tijdelijk uit te schakelen en de Piwik omgeving in onderhouds modus te zetten%s",
+ "HighTrafficPiwikServerEnableMaintenance": "Als je een Piwik server met veel verkeer beheert, raden we je aan om %1$smetingen tijdelijk uit te schakelen en de Piwik omgeving in onderhouds modus te zetten%2$s",
"IncompatbilePluginsWillBeDisabledInfo": "Let op: sommige plugins zijn niet compitable met Piwik %s. Deze worden uitgeschakeld bij een upgrade.",
"InstallingTheLatestVersion": "Bezig om de laatste versie te installeren",
"MajorUpdateWarning1": "Dit is een ingrijpende update! Het zal langer dan normaal duren.",
diff --git a/plugins/CoreUpdater/lang/pl.json b/plugins/CoreUpdater/lang/pl.json
index dad0d3a8db14c58c007700ffe707e3966d0f595f..27de847fe6a8de7f3b2c3a9be0896395f848a78e 100644
--- a/plugins/CoreUpdater/lang/pl.json
+++ b/plugins/CoreUpdater/lang/pl.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Sprawdź w %1$s Piwik FAQ %2$s, które wyjaśni najczęściej spotykane błędy występujące w trakcie aktualizacji. %3$s Poproś o pomoc, lub ewentualnie zadaj pytanie skierowane do helpdesku serwera - tam specjaliści mogą na prawdę pomóc w pokonywaniu błędów najczęściej spotykanych na serwerze lub przy konfiguracji MySQL.",
"HelpMessageIntroductionWhenError": "Powyżej znajduje się główny komunikat o błędzie. To powinno pomóc ustalić przyczynę problemu, ale jeżeli problem wymaga dodatkowej pomocy:",
"HelpMessageIntroductionWhenWarning": "Aktualizacja zakończona sukcesem, jednakże nie obyło się bez problemów podczas tego procesu. Proszę zaposnać się z powyższym opisem by poznać szczegóły. Więcej pomocy możesz uzyskać:",
- "HighTrafficPiwikServerEnableMaintenance": "Jeśli zarządzasz serwerem Piwik o dużym ruchu, zalecamy %stymczasowo wyłączyć śledzenie odwiedzających i przełączyć Interfejs Użytkownika Piwik w tryb konserwacji%s",
+ "HighTrafficPiwikServerEnableMaintenance": "Jeśli zarządzasz serwerem Piwik o dużym ruchu, zalecamy %1$stymczasowo wyłączyć śledzenie odwiedzających i przełączyć Interfejs Użytkownika Piwik w tryb konserwacji%2$s",
"IncompatbilePluginsWillBeDisabledInfo": "Uwaga: niektóre wtyczki nie są zgodne z Piwik %s. Będą wyłączone podczas aktualizacji:",
"InstallingTheLatestVersion": "Instalowanie najnowszej wersji",
"MajorUpdateWarning1": "To jest znacząca aktualizacja i potrwa dłużej niż zwykle.",
diff --git a/plugins/CoreUpdater/lang/pt-br.json b/plugins/CoreUpdater/lang/pt-br.json
index c8152439f1d9a898974683fedccbe8ffcb146c57..80ba61911f2368d7bd8ef647c2eb54aa357d88b7 100644
--- a/plugins/CoreUpdater/lang/pt-br.json
+++ b/plugins/CoreUpdater/lang/pt-br.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Verifique o %1$s Piwik FAQ %2$s que explica os erros mais comuns durante a atualização. %3$s Pergunte ao seu administrador do sistema - Ele pode ser capaz de lhe ajudar com o erro que muito provavelmente é relacionado com o seu servidor ou o setup do MySQL.",
"HelpMessageIntroductionWhenError": "Acima está a mensagem de erro principal. Ela deve ajudar a explicar a causa, mas se você precisar de mais ajuda por favor:",
"HelpMessageIntroductionWhenWarning": "A atualização se completou com sucesso, contudo houve alguns problemas durante o processo. Por favor leia a descrição acima para os detalhes. Para mais ajuda:",
- "HighTrafficPiwikServerEnableMaintenance": "Se você gerencia um servidor Piwik com alto tráfego, recomendamos %sdesativar momentaneamente o Rastreamento de visitantes e colocar a interface de usuário do servidor Piwik no modo de manutenção%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Se você gerencia um servidor Piwik com alto tráfego, recomendamos %1$sdesativar momentaneamente o Rastreamento de visitantes e colocar a interface de usuário do servidor Piwik no modo de manutenção%2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Nota: alguns plugins não são compatÃveis com Piwik %s. Eles serão desativados quando você atualizar:",
"InstallingTheLatestVersion": "Instalando a versão mais recente",
"LatestBetaRelease": "Último lançamento beta",
diff --git a/plugins/CoreUpdater/lang/ro.json b/plugins/CoreUpdater/lang/ro.json
index 2827e2c50411ab8f15e12f7b5d547764b63f2633..06297f05b49cc6dd8d4e81c6b7eb202c145d3386 100644
--- a/plugins/CoreUpdater/lang/ro.json
+++ b/plugins/CoreUpdater/lang/ro.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Verifică %1$s Piwik FAQ %2$s ce explică cele mai comune errori privind actualizarea. %3$s Intreabă administratorul de sistem - dacă te poate ajuta să rezolvi erorile ce ţin de server sau de setările MySQL.",
"HelpMessageIntroductionWhenError": "Eroare de core . Consulta documentatia de ajutor:",
"HelpMessageIntroductionWhenWarning": "Actualizarea s-a efectuat cu succes, oricum mai sunt cateva lucruri ce sunt necesare pentru a finaliza procesul . Citeste descrierea pentru detalii. Pentru ajutor:",
- "HighTrafficPiwikServerEnableMaintenance": "Daca administrezi un server Piwik cu trafic mare, noi recomandam ca %spentru moment sa dezactivezi Contorizarea vizitatorilor si sa pui Interfata de Utilizare Piwik in modul de mentenanta%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Daca administrezi un server Piwik cu trafic mare, noi recomandam ca %1$spentru moment sa dezactivezi Contorizarea vizitatorilor si sa pui Interfata de Utilizare Piwik in modul de mentenanta%2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Observatie: anumite pluginuri nu sunt compatibile cu Piwik %s. Acestea vor fi deactivate cand veti face upgrade:",
"InstallingTheLatestVersion": "Se instalează ultima versiune",
"MajorUpdateWarning1": "Este o actualizare majoră! Va dura mai mult decât de obicei.",
diff --git a/plugins/CoreUpdater/lang/sk.json b/plugins/CoreUpdater/lang/sk.json
index dca0ba5e74c5a3600f11f700a40d7c6ca45134aa..92cd5fc6086d1713ecdd08614de95b33e958826c 100644
--- a/plugins/CoreUpdater/lang/sk.json
+++ b/plugins/CoreUpdater/lang/sk.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Pozrite si %1$s Piwik FAQ %2$s, kde sú vysvetlené najÄastejÅ¡ie problémy poÄas aktualizácie. %3$s Požiadajte svojho systémového administrátora - mal by Vám vedieÅ¥ pomôcÅ¥ s chybami, ktoré sa s najväÄÅ¡ou pravdepodobnosÅ¥ou týkajú Vášho servera alebo nastavenia MySQL.",
"HelpMessageIntroductionWhenError": "VyÅ¡Å¡ie je uvedená hlavná chybová správa, ktorá by mala vysvetliÅ¥ problém. Ak potrebujete ÄalÅ¡iu pomoc, tak prosÃm:",
"HelpMessageIntroductionWhenWarning": "Aktualizácia je úspeÅ¡ne ukonÄená, vyskytli sa vÅ¡ak problémy. PreÄÃtajte si nasledovné detaily. ÄŽalÅ¡iu pomoc nájdete na:",
- "HighTrafficPiwikServerEnableMaintenance": "Ak natrafÃte na zahltený Piwik server, odporúÄame %s doÄasne vypnúť sledovanie návÅ¡tevnÃkov a prepnúť Piwik-užÃvateľské rozhranie do módu údržby %s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Ak natrafÃte na zahltený Piwik server, odporúÄame %1$s doÄasne vypnúť sledovanie návÅ¡tevnÃkov a prepnúť Piwik-užÃvateľské rozhranie do módu údržby %2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Pozn.: niektoré pluginy nie sú kompatibilné s Piwik %s. Budú vypnuté ak aktualizujete:",
"InstallingTheLatestVersion": "Inštalácia poslednej verzie",
"MajorUpdateWarning1": "Toto je veľká aktualizácia! Bude to trvaÅ¥ dlhÅ¡ie ako zvyÄajne.",
diff --git a/plugins/CoreUpdater/lang/sr.json b/plugins/CoreUpdater/lang/sr.json
index e11d89d2145429ede899eba3cab86904e03434f4..5f18c9813a6eb8214de0dbc94c2fe4d6c80b83ce 100644
--- a/plugins/CoreUpdater/lang/sr.json
+++ b/plugins/CoreUpdater/lang/sr.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "Pogledajte %1$s Piwik pitanja i odgovore %2$s koja objaÅ¡njavaju najÄešće greÅ¡ke prilikom nadogradnje. %3$s Kontaktirajte vaÅ¡eg sistemskog administratora - možda je u mogućnosti da vam pomogne oko greÅ¡aka koje su najverovatnije u domenu podeÅ¡avanja servera ili MySQL-a.",
"HelpMessageIntroductionWhenError": "Ovo gore je sama srž poruke o greÅ¡ci. Ona bi trebalo da objasni uzrok a u sluÄaju da vam je potrebna dalja pomoć:",
"HelpMessageIntroductionWhenWarning": "Proces nadogradnje je uspeÅ¡no okonÄan, meÄ‘utim, imamo i spornih momenata nastalih tokom procesa. Molimo vas da proÄitate njihove opise zarad detalja. U sluÄaju da vam je potrebna dalja pomoć:",
- "HighTrafficPiwikServerEnableMaintenance": "Ukoliko koristite Piwik na serveru sa velikim saobraćajem, preporuÄujemo da %sodmah iskljuÄite praćenje posetilaca i prebacite Piwik interfejs u mod održavanja%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Ukoliko koristite Piwik na serveru sa velikim saobraćajem, preporuÄujemo da %1$sodmah iskljuÄite praćenje posetilaca i prebacite Piwik interfejs u mod održavanja%2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Neko dodaci nisu kompatibilni sa Piwik %s. Oni će biti deaktivirani nakon nadogradnje:",
"InstallingTheLatestVersion": "Instaliranje poslednje verzije",
"MajorUpdateWarning1": "Ovo je bitna nadogradnja! Trajaće duže nego inaÄe.",
diff --git a/plugins/CoreUpdater/lang/sv.json b/plugins/CoreUpdater/lang/sv.json
index 67af94bc9399623601da9880189300b5fe78e99b..466ff0182b64f657d0aba03f57a5c8633c5a94d3 100644
--- a/plugins/CoreUpdater/lang/sv.json
+++ b/plugins/CoreUpdater/lang/sv.json
@@ -22,9 +22,14 @@
"HelpMessageContent": "Kolla i %1$s Piwik FAQ %2$s vilken förklarar de vanligaste fel vid uppdateringar. %3$s Fråga din systemadministratör - de kanske kan hjälpa dig med det fel som är mest sannolikt relaterat till din server eller MySQL installation.",
"HelpMessageIntroductionWhenError": "Ovanstående är huvudsakliga felmeddelandet. Det bör bidra till att förklara orsaken, men om du behöver mer hjälp vänligen:",
"HelpMessageIntroductionWhenWarning": "Uppdateringen slutfördes framgångsrikt, men det fanns dock problem under processen. Vänligen läs ovanstående beskrivningar för detaljer. För ytterligare hjälp:",
- "HighTrafficPiwikServerEnableMaintenance": "Om du hanterar en Piwik server med mycket trafik rekommenderar vi att du tillfälligt %sinaktiverar spårning av besökare och sätter Piwik's användargränssnitt i underhållsläge%s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Om du hanterar en Piwik server med mycket trafik rekommenderar vi att du tillfälligt %1$sinaktiverar spårning av besökare och sätter Piwik's användargränssnitt i underhållsläge%2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Obs: vissa tillägg är inte kompatibla med Piwik %s. De kommer att inaktiveras när du uppgraderar:",
"InstallingTheLatestVersion": "Installerar den senaste versionen",
+ "LatestBetaRelease": "Senaste betaversion",
+ "LatestStableRelease": "Senaste stabila versionen",
+ "Latest2XStableRelease": "Senaste stabila 2.X",
+ "Latest2XBetaRelease": "Senaste beta 2.X",
+ "LtsSupportVersion": "Version med långtidsstöd",
"MajorUpdateWarning1": "Det här är en stor uppdatering! Den kommer att ta längre tid än vanligt.",
"MajorUpdateWarning2": "Följande råd är extra viktiga för stora installationer.",
"NoteForLargePiwikInstances": "Viktig notering för stora Piwik-installationer",
@@ -55,6 +60,8 @@
"CloudHosting": "Molntjänst",
"Updating": "Uppdateringar",
"UpdateUsingHttpsFailed": "Nedladdning ac den senaste versionen av Piwik över HTTPS fungerade inte på grund av följande fel:",
+ "UsingHttps": "använd den säkra HTTPS-anslutningen (rekommenderas)",
+ "UsingHttp": "använd den osäkra HTTP-anslutningen",
"UpgradeComplete": "Uppgradering färdig!",
"UpgradePiwik": "Uppgradera Piwik",
"VerifyingUnpackedFiles": "Kontrollerar uppackage filer",
diff --git a/plugins/CoreUpdater/lang/tl.json b/plugins/CoreUpdater/lang/tl.json
index 17e7ae9e36cdeb039edd606b4dc69d8729104bd2..3ce76138d7ef084fcd948fa818f047c742fcb428 100644
--- a/plugins/CoreUpdater/lang/tl.json
+++ b/plugins/CoreUpdater/lang/tl.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "e-check ang %1$s Piwik FAQ %2$s na nagpapaliwanag ng mga pinakapangkaraniwang error habang nag-uupdate. %3$s Magtanong sa inyong system administrator - maaari ka nilang tulungan sa mga error kung saan ito ay may ugnay sa iyong server O MySQL setup.",
"HelpMessageIntroductionWhenError": "Sa itaas ay ang core error message. Ito ay tumutulong upang ipaliwanag ang mga dahilan ng error ngunit kung kailangan mo ng karagdagang tulong mangyaring:",
"HelpMessageIntroductionWhenWarning": "Kumplete na ang pag-uupdate gayunpaman meron mga issues habang ito ay sinasagawa. Mangyaring basahin ang mga nasataas para sa mga detalye. Para sa mga karagdatang tulong:",
- "HighTrafficPiwikServerEnableMaintenance": "Kung ikaw ay may pinamamahalaang Piwik server na may mataas na traffic aming nirerekomenda na %s panandaliang alisin ang visitor Tracking at ilagay ang Piwik User Interface sa maintenance mode %s.",
+ "HighTrafficPiwikServerEnableMaintenance": "Kung ikaw ay may pinamamahalaang Piwik server na may mataas na traffic aming nirerekomenda na %1$s panandaliang alisin ang visitor Tracking at ilagay ang Piwik User Interface sa maintenance mode %2$s.",
"IncompatbilePluginsWillBeDisabledInfo": "Tandaan: ang ilang mga plugin ay hindi tugma sa Piwik %s. Ang mga ito ay hindi pinagana kapag nag-upgrade ka:",
"InstallingTheLatestVersion": "Ini-install ang pinakabagong bersyon",
"MajorUpdateWarning1": "Ito ay isang mahalagang update! Ito ay mas matagal kaysa sa karaniwan.",
diff --git a/plugins/CoreUpdater/lang/zh-tw.json b/plugins/CoreUpdater/lang/zh-tw.json
index 531d9a0c4c7d0396fb308a4b8077b346030e6bf7..82de574c8151470c64ccef123934bfb9abc16637 100644
--- a/plugins/CoreUpdater/lang/zh-tw.json
+++ b/plugins/CoreUpdater/lang/zh-tw.json
@@ -22,7 +22,7 @@
"HelpMessageContent": "請檢查 %1$s Piwik FAQ %2$s，其ä¸å·²æœ‰æ›´æ–°éŽç¨‹ä¸æ‰€ç™¼ç”Ÿçš„常見錯誤之解決辦法。%3$s è©¢å•ä½ 的系統管ç†å“¡ - 他們應該å¯ä»¥å”åŠ©ä½ è§£æ±ºå¤§éƒ¨åˆ†é—œæ–¼ä¼ºæœå™¨æˆ– MySQL è¨å®šçš„å•é¡Œã€‚",
"HelpMessageIntroductionWhenError": "ä»¥ä¸Šæ˜¯æ ¸å¿ƒéŒ¯èª¤è¨Šæ¯ã€‚å®ƒæ‡‰è©²æœ‰åŠ©æ–¼è§£é‡‹åŽŸå› ï¼Œä½†å¦‚æžœä½ éœ€è¦é€²ä¸€æ¥çš„說明請至：",
"HelpMessageIntroductionWhenWarning": "æ¤æ¬¡æ›´æ–°æˆåŠŸå®Œæˆï¼Œä½†åœ¨éŽç¨‹ä¸æœ‰ç™¼ç”Ÿä¸€äº›å•é¡Œã€‚請閱讀以上說明的詳細內容。如需更進一æ¥çš„說明：",
- "HighTrafficPiwikServerEnableMaintenance": "å¦‚æžœä½ ç®¡ç†ä¸€å€‹é«˜æµé‡çš„Piwik伺æœå™¨ï¼Œæˆ‘們建è°%s暫時ç¦ç”¨è¨ªå®¢è¿½è¸ªåŠŸèƒ½ï¼Œä¸¦æŠŠPiwik用戶界é¢è¨å®šç‚ºç¶é‹æ¨¡å¼%s。",
+ "HighTrafficPiwikServerEnableMaintenance": "å¦‚æžœä½ ç®¡ç†ä¸€å€‹é«˜æµé‡çš„Piwik伺æœå™¨ï¼Œæˆ‘們建è°%1$s暫時ç¦ç”¨è¨ªå®¢è¿½è¸ªåŠŸèƒ½ï¼Œä¸¦æŠŠPiwik用戶界é¢è¨å®šç‚ºç¶é‹æ¨¡å¼%2$s。",
"IncompatbilePluginsWillBeDisabledInfo": "注æ„：有些æ’件並ä¸å…¼å®¹åœ¨Piwik %sï¼Œå®ƒå€‘å°‡æœƒç•¶ä½ å‡ç´šå¾Œè¢«ç¦ç”¨ã€‚",
"InstallingTheLatestVersion": "æ£åœ¨å®‰è£æœ€æ–°ç‰ˆæœ¬ä¸",
"MajorUpdateWarning1": "這是一個é‡å¤§æ›´æ–°ï¼é€™å°‡éœ€è¦æ¯”平常更長的時間。",
diff --git a/plugins/CoreVisualizations/Visualizations/Cloud.php b/plugins/CoreVisualizations/Visualizations/Cloud.php
index d5a317da25f52df0a0cce2e72d562fe9dec0fb2a..502411e74ce8cbd1f795f2b32c2b092137c3f6ad 100644
--- a/plugins/CoreVisualizations/Visualizations/Cloud.php
+++ b/plugins/CoreVisualizations/Visualizations/Cloud.php
@@ -174,6 +174,8 @@ class Cloud extends Visualization
*/
private function truncateWordIfNeeded($word)
{
+ $word = Common::unsanitizeInputValue($word);
+
if (Common::mb_strlen($word) > $this->truncatingLimit) {
return Common::mb_substr($word, 0, $this->truncatingLimit - 3) . '...';
}
diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_tagCloud.twig b/plugins/CoreVisualizations/templates/_dataTableViz_tagCloud.twig
index d7f328b923d0ccd44f4fc30ee1d7ef3ab3efdd61..d1085287f428ab9466f40de578547462940b422c 100644
--- a/plugins/CoreVisualizations/templates/_dataTableViz_tagCloud.twig
+++ b/plugins/CoreVisualizations/templates/_dataTableViz_tagCloud.twig
@@ -1,7 +1,7 @@
{% set cloudColumn = properties.columns_to_display[1] %}
<div class="tagCloud">
{% for word,value in cloudValues %}
- <span title="{{ value.word }} ({{ value.value }} {{ properties.translations[cloudColumn]|default(cloudColumn) }})" class="word size{{ value.size }}
+ <span title="{{ value.word|rawSafeDecoded }} ({{ value.value }} {{ properties.translations[cloudColumn]|default(cloudColumn) }})" class="word size{{ value.size }}
{# we strike tags with 0 hits #}
{% if value.value == 0 %}valueIsZero{% endif %}">
{% if labelMetadata[value.word].url is not sameas(false) %}
@@ -10,7 +10,7 @@
{% if labelMetadata[value.word].logo is not sameas(false) %}
<img src="{{ labelMetadata[value.word].logo }}" width="{{ value.logoWidth }}" />
{% else %}
- {{ value.wordTruncated }}
+ {{ value.wordTruncated|rawSafeDecoded }}
{% endif %}
{% if labelMetadata[value.word].url is not sameas(false) %}</a>{% endif %}
</span>
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
index 1262e24e29fc2e725d064c77af2592c3e5216a52..3f71ea0d6880f4a1cbdc531342760f72136e26d2 160000
--- a/plugins/CustomAlerts
+++ b/plugins/CustomAlerts
@@ -1 +1 @@
-Subproject commit 1262e24e29fc2e725d064c77af2592c3e5216a52
+Subproject commit 3f71ea0d6880f4a1cbdc531342760f72136e26d2
diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions
index 4d35b0241557f7bb76c47e0f4c425aae17a5e344..a9c2872b3e268ab3cbd4f6af0ae4547e466bafed 160000
--- a/plugins/CustomDimensions
+++ b/plugins/CustomDimensions
@@ -1 +1 @@
-Subproject commit 4d35b0241557f7bb76c47e0f4c425aae17a5e344
+Subproject commit a9c2872b3e268ab3cbd4f6af0ae4547e466bafed
diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php
index 39aa9e6bb735e25196c78d24dccb4c6ab03ae321..5c5fcdf8b6c1c6e9ae4018aa94bfdfe716073703 100644
--- a/plugins/CustomVariables/Archiver.php
+++ b/plugins/CustomVariables/Archiver.php
@@ -245,6 +245,19 @@ class Archiver extends \Piwik\Plugin\Archiver
}
}
+ /**
+ * Delete Visit, Unique Visitor and Users metric from 'page' scope custom variables.
+ *
+ * - Custom variables of 'visit' scope: it is expected that these ones have the "visit" column set.
+ * - Custom variables of 'page' scope: we cannot process "Visits" count for these.
+ * Why?
+ * "Actions" column is processed with a SELECT count(*).
+ * A same visit can set the same custom variable of 'page' scope multiple times.
+ * We cannot sum the values of count(*) as it would be incorrect.
+ * The way we could process "Visits" Metric for 'page' scope variable is to issue a count(Distinct *) or so,
+ * but it is no implemented yet (this would likely be very slow for high traffic sites).
+ *
+ */
protected function removeVisitsMetricsFromActionsAggregate()
{
$dataArray = & $this->dataArray->getDataArray();
diff --git a/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php b/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php
index 7ff8889d65e975d2cce135806fa2128c54068b97..2f2fd7e396f3d35a7be4d90da436aa52a579bf2f 100644
--- a/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php
+++ b/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php
@@ -55,7 +55,7 @@ class SetNumberOfCustomVariables extends ConsoleCommand
$this->printChanges($scope, $numVarsToSet, $output);
}
- if (!$this->confirmChange($output)) {
+ if ($input->isInteractive() && !$this->confirmChange($output)) {
return;
}
diff --git a/plugins/CustomVariables/Reports/GetCustomVariables.php b/plugins/CustomVariables/Reports/GetCustomVariables.php
index c6b28b6562ddec2470d98bf365650e3b08fbf226..b460c8b8360feadd64eb6ed36bbf65fa021264e6 100644
--- a/plugins/CustomVariables/Reports/GetCustomVariables.php
+++ b/plugins/CustomVariables/Reports/GetCustomVariables.php
@@ -8,6 +8,7 @@
*/
namespace Piwik\Plugins\CustomVariables\Reports;
+use Piwik\DataTable;
use Piwik\Piwik;
use Piwik\Plugin\ViewDataTable;
use Piwik\Plugins\CustomVariables\Columns\CustomVariableName;
@@ -34,5 +35,41 @@ class GetCustomVariables extends Base
$view->config->addTranslation('label', Piwik::translate('CustomVariables_ColumnCustomVariableName'));
$view->requestConfig->filter_sort_column = 'nb_actions';
$view->requestConfig->filter_sort_order = 'desc';
+
+ $that = $this;
+ $view->config->filters[] = function (DataTable $table) use ($view, $that) {
+ if($that->isReportContainsUnsetVisitsColumns($table)) {
+ $message = $that->getFooterMessageExplanationMissingMetrics();
+ $view->config->show_footer_message = $message;
+ }
+ };
+ }
+
+ /**
+ * @return array
+ */
+ public function getFooterMessageExplanationMissingMetrics()
+ {
+ $metrics = sprintf("'%s', '%s' %s '%s'",
+ Piwik::translate('General_ColumnNbVisits'),
+ Piwik::translate('General_ColumnNbUniqVisitors'),
+ Piwik::translate('General_And'),
+ Piwik::translate('General_ColumnNbUsers')
+ );
+ $messageStart = Piwik::translate('CustomVariables_MetricsAreOnlyAvailableForVisitScope', array($metrics, "'visit'"));
+
+ $messageEnd = Piwik::translate('CustomVariables_MetricsNotAvailableForPageScope', array("'page'", '\'-\''));
+
+ return $messageStart . ' ' . $messageEnd;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isReportContainsUnsetVisitsColumns(DataTable $report)
+ {
+ $visits = $report->getColumn('nb_visits');
+ $isVisitsMetricsSometimesUnset = in_array(false, $visits);
+ return $isVisitsMetricsSometimesUnset;
}
}
diff --git a/plugins/CustomVariables/lang/be.json b/plugins/CustomVariables/lang/be.json
index d2d4b2eab467bd3ea7c5e203d7316356a3abe5af..3f0b23b437d26588921323c4d57b6976736a6f49 100644
--- a/plugins/CustomVariables/lang/be.json
+++ b/plugins/CustomVariables/lang/be.json
@@ -3,6 +3,6 @@
"ColumnCustomVariableName": "Ðазва карыÑтацкай зменнай",
"ColumnCustomVariableValue": "ЗначÑнне карыÑтацкай зменнай",
"CustomVariables": "КарыÑÑ‚Ð°Ñ†ÐºÑ–Ñ Ð·Ð¼ÐµÐ½Ð½Ñ‹Ñ",
- "CustomVariablesReportDocumentation": "Справаздача змÑшчае інфармацыю аб вашых КарыÑтацкіх зменных. ÐаціÑніце на Ñ–Ð¼Ñ Ð·Ð¼ÐµÐ½Ð½Ð°Ð¹, каб убачыць размеркаванне каштоўнаÑцÑÑž. %s Ð”Ð°Ð´Ð°Ñ‚ÐºÐ¾Ð²Ñ‹Ñ Ð·Ð²ÐµÑткі аб карыÑтацкіх зменных чытайце Ñž %sÐ”Ð°ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ‹Ñ Ð°Ð± карыÑтацкіх зменных на piwik.org%s."
+ "CustomVariablesReportDocumentation": "Справаздача змÑшчае інфармацыю аб вашых КарыÑтацкіх зменных. ÐаціÑніце на Ñ–Ð¼Ñ Ð·Ð¼ÐµÐ½Ð½Ð°Ð¹, каб убачыць размеркаванне каштоўнаÑцÑÑž. %1$s Ð”Ð°Ð´Ð°Ñ‚ÐºÐ¾Ð²Ñ‹Ñ Ð·Ð²ÐµÑткі аб карыÑтацкіх зменных чытайце Ñž %2$sÐ”Ð°ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ‹Ñ Ð°Ð± карыÑтацкіх зменных на piwik.org%3$s."
}
}
\ No newline at end of file
diff --git a/plugins/CustomVariables/lang/bg.json b/plugins/CustomVariables/lang/bg.json
index 8444ff47e0a48369227cb04a98654eb557818d95..936cfc3fce61cb0bd22854ddb7f10f4e4424b191 100644
--- a/plugins/CustomVariables/lang/bg.json
+++ b/plugins/CustomVariables/lang/bg.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Име на променлива",
"ColumnCustomVariableValue": "Съдържание на променлива",
"CustomVariables": "Променливи",
- "CustomVariablesReportDocumentation": "Този отчет Ñъдържа Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° вашите ПерÑонални променливи. Кликнете върху името на променлива, за да видите разпределението на ÑтойноÑтите. %s За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñтно ПерÑоналните Променливи в общ план, прочетете ДокументациÑта за %sПерÑонални промеливи на Piwik.org%s",
+ "CustomVariablesReportDocumentation": "Този отчет Ñъдържа Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° вашите ПерÑонални променливи. Кликнете върху името на променлива, за да видите разпределението на ÑтойноÑтите. %1$s За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñтно ПерÑоналните Променливи в общ план, прочетете ДокументациÑта за %2$sПерÑонални промеливи на Piwik.org%3$s",
"ScopePage": "Разгледай Ñтраница",
"ScopeVisit": "Разгледай поÑещение"
}
diff --git a/plugins/CustomVariables/lang/ca.json b/plugins/CustomVariables/lang/ca.json
index 5578794062c3cac518a18bbc9cb857bb7f9930b9..afd7aeb20e7238eb5a5f1d76d1891f9b11245496 100644
--- a/plugins/CustomVariables/lang/ca.json
+++ b/plugins/CustomVariables/lang/ca.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Nom de la variable personalitzada",
"ColumnCustomVariableValue": "Valor de la variable personalitzada",
"CustomVariables": "Variables personalitzades",
- "CustomVariablesReportDocumentation": "Aquest informe conté informació sobre les variables personaltizades. Feu click al nom d'una variable per veure la distribució dels valors. %s Per més informació sobre les variables personalitzades, podeu llegir la %sdocumentació sobre variables peronalitzades a piwik.org%s",
+ "CustomVariablesReportDocumentation": "Aquest informe conté informació sobre les variables personaltizades. Feu click al nom d'una variable per veure la distribució dels valors. %1$s Per més informació sobre les variables personalitzades, podeu llegir la %2$sdocumentació sobre variables peronalitzades a piwik.org%3$s",
"ScopePage": "à mbit de la pà gina",
"ScopeVisit": "Ã mbit de la visita"
}
diff --git a/plugins/CustomVariables/lang/cs.json b/plugins/CustomVariables/lang/cs.json
index 98a5db6ea637834df2218982a9d84274b165f77a..db4ead7de2b598b32d3bcb9b068ea3ac00156e3b 100644
--- a/plugins/CustomVariables/lang/cs.json
+++ b/plugins/CustomVariables/lang/cs.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Název vlastnà proměnné",
"ColumnCustomVariableValue": "Hodnota vlastnà proměnné",
"CustomVariables": "Vlastnà proměnné",
- "CustomVariablesReportDocumentation": "Toto hlášenà obsahuje informace o vaÅ¡ich vlastnÃch promÄ›nných. KliknÄ›te na promÄ›nnou pro zobrazenà distribuce hodnot. %s Pro vÃce informacà si pÅ™eÄtÄ›te %sdokumentaci o vlastnÃch promÄ›nných na piwik.org%s",
+ "CustomVariablesReportDocumentation": "Toto hlášenà obsahuje informace o vaÅ¡ich vlastnÃch promÄ›nných. KliknÄ›te na promÄ›nnou pro zobrazenà distribuce hodnot. %1$s Pro vÃce informacà si pÅ™eÄtÄ›te %2$sdokumentaci o vlastnÃch promÄ›nných na piwik.org%3$s",
"PluginDescription": "Vlastnà promÄ›nné jsou páry (jméno, hodnota), které můžete nastavit návÅ¡tÄ›vnÃkovi, nebo libovolné akci, pomocà javascriptového API. Piwik potom ohlásÃ, kolik návÅ¡tÄ›v, stránek, konverzà bylo pro každé z tÄ›chto jmen a hodnot. ProhlédnÄ›te si detailnÄ› tyto promÄ›nné pro každého uživatele a akci v záznamu návÅ¡tÄ›vnÃků.<br \/>Vyžadováno, pokud chcete použÃt <a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\">analýzu E-obchodu<\/a>!",
"ScopePage": "rozsah stránky",
"ScopeVisit": "rozsah návštěvy",
@@ -13,10 +13,12 @@
"Usages": "VyužitÃ",
"Unused": "Nevyužito",
"CreateNewSlot": "Navýšit poÄet dostupných slotů vlastnÃch promÄ›nných",
- "UsageDetails": "%s návštěv a %s akcà od vytvořenà této webové stránky.",
+ "UsageDetails": "%1$s návštěv a %2$s akcà od založenà tohoto webu.",
"CreatingCustomVariableTakesTime": "VytvoÅ™enà nové vlastnà promÄ›nné hodnoty může trvat déle v závislosti na velikosti vaÅ¡Ã databáze. Proto je toto možné provést pouze pomocà pÅ™Ãkazu spuÅ¡tÄ›nému v pÅ™Ãkazové řádce.",
"CurrentAvailableCustomVariables": "AktuálnÄ› můžete použÃt až %s vlastnÃch promÄ›nných na stránku.",
"ToCreateCustomVarExecute": "Pro vytvoÅ™enà nového slotu pro vlastnà promÄ›nnou spusÅ¥te následujÃcà pÅ™Ãkaz ve své instalaci Piwik:",
- "SlotsReportIsGeneratedOverTime": "Data pro tento report budou dostupná pozdÄ›ji. Než budou data vidÄ›t, může to den nebo dva trvat a poté nÄ›kolik týdnů než bude report vypovÃdajÃcÃ."
+ "SlotsReportIsGeneratedOverTime": "Data pro toto hlášenà budou dostupná pozdÄ›ji. Než budou data vidÄ›t, může to den nebo dva trvat a poté nÄ›kolik týdnů než bude hlášenà plnÄ› vypovÃdajÃcÃ.",
+ "MetricsAreOnlyAvailableForVisitScope": "Poznámka: Metriky %1$s jsou k dispozici pro vlastnà proměnné pouze v rozsahu %2$s.",
+ "MetricsNotAvailableForPageScope": "Pro vlastnà proměnné v rozsahu %1$s je hodnota sloupce s těmito metrikami %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/CustomVariables/lang/da.json b/plugins/CustomVariables/lang/da.json
index 1766c9511747f0924cb25f75933b8a5d851a1f3e..cf635d03300e28382909e179e5cd218dabdc6e03 100644
--- a/plugins/CustomVariables/lang/da.json
+++ b/plugins/CustomVariables/lang/da.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Brugerdefineret variabelnavn",
"ColumnCustomVariableValue": "Brugerdefineret variabelværdi",
"CustomVariables": "Brugerdefinerede variabler",
- "CustomVariablesReportDocumentation": "Rapporten indeholder oplysninger om brugerdefinerede variabler. Klik på et variabelnavn se fordeling af værdier. %s Yderligere oplysninger om brugerdefinerede variabler generelt, læs %sBrugerdefinerede variabel dokumentation på piwik.org%s",
+ "CustomVariablesReportDocumentation": "Rapporten indeholder oplysninger om brugerdefinerede variabler. Klik på et variabelnavn se fordeling af værdier. %1$s Yderligere oplysninger om brugerdefinerede variabler generelt, læs %2$sBrugerdefinerede variabel dokumentation på piwik.org%3$s",
"ScopePage": "virkefelt side",
"ScopeVisit": "virkefelt besøg"
}
diff --git a/plugins/CustomVariables/lang/de.json b/plugins/CustomVariables/lang/de.json
index c60483ec21f99c3ae934b04aa97e11bdf7e566a6..98f2bef3af4ca22c7b7e1dec639db505c5e5c925 100644
--- a/plugins/CustomVariables/lang/de.json
+++ b/plugins/CustomVariables/lang/de.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Name der benutzerdefinierten Variable",
"ColumnCustomVariableValue": "Wert der benutzerdefinierten Variable",
"CustomVariables": "Benutzerdefinierte Variablen",
- "CustomVariablesReportDocumentation": "Dieser Bericht enthält Informationen über Ihre benutzerdefinierten Variablen. Klicken Sie auf einen Variablennamen, um die Verteilung der Werte zu sehen. %s Für mehr Informationen über benutzerdefinierte Variablen, lesen Sie die %sDokumentation auf piwik.org%s",
+ "CustomVariablesReportDocumentation": "Dieser Bericht enthält Informationen über Ihre benutzerdefinierten Variablen. Klicken Sie auf einen Variablennamen, um die Verteilung der Werte zu sehen. %1$s Für mehr Informationen über benutzerdefinierte Variablen, lesen Sie die %2$sDokumentation auf piwik.org%3$s",
"PluginDescription": "Benutzerdefinierte Variablen sind (Namen-, Wert-) Paare, welche Sie mit Hilfe der Javascript API auf Besucher oder deren Aktionen festlegen können. Piwik wird Sie dann über die Menge an Besuchen, Seiten, Konversionen für jede der benutzerdefinierten Variablen und Werte informieren. Die detaillierten benutzerdefinierten Variablen für jeden Benutzer und Aktionen im Besucher-Log einsehbar.<br \/>Benötigt um das Feature <a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\">Ecommerce Analyse<\/a>nutzen zu können.",
"ScopePage": "Anwendungsbereich Seite",
"ScopeVisit": "Anwendungsbereich Besuch",
@@ -13,7 +13,7 @@
"Usages": "Verwendungen",
"Unused": "Unbenutzt",
"CreateNewSlot": "Die Anzahl verfügbarer benutzerdefinierter Variablen erhöhen",
- "UsageDetails": "%s Besuche und %s Aktionen seit der Erstellung dieser Webseite.",
+ "UsageDetails": "%1$s Besuche und %2$s Aktionen seit der Erstellung dieser Website.",
"CreatingCustomVariableTakesTime": "Neue benutzerdefinierte Variablen zu erstellen kann viel Zeit beanspruchen, abhängig von der Grösse Ihrer Datenbank. Deshalb ist dieser Vorgang nur über Kommandozeilen verfügbar.",
"CurrentAvailableCustomVariables": "Aktuell können Sie bis zu %s benutzerdefinierte Variablen pro Seite einsetzen.",
"ToCreateCustomVarExecute": "Um eine neue benutzerdefinierte Variable zu erstellen, führen Sie in Ihrer Piwik Installation folgende Befehle aus:",
diff --git a/plugins/CustomVariables/lang/el.json b/plugins/CustomVariables/lang/el.json
index 25b790a4f9d69a30a8161ed74cc100eb3e42f7cc..78076e9cf16222c93957dec63876ec2e7449f6f3 100644
--- a/plugins/CustomVariables/lang/el.json
+++ b/plugins/CustomVariables/lang/el.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Ονομασία Î ÏοσαÏμοσμÎνης Μεταβλητής",
"ColumnCustomVariableValue": "Τιμή Î ÏοσαÏμοσμÎνης Μεταβλητής",
"CustomVariables": "Î ÏοσαÏμοσμÎνες ΜεταβλητÎÏ‚",
- "CustomVariablesReportDocumentation": "Αυτή η αναφοÏά πεÏιÎχει πληÏοφοÏίες για τις Î ÏοσαÏμοσμÎνες ΜεταβλητÎÏ‚. Πατήστε σε Îνα όνομα μεταβλητής για να δείτε την κατανομή των τιμών. %s Για πεÏισσότεÏες πληÏοφοÏίες για τις Î ÏοσαÏμοσμÎνες ΜεταβλητÎÏ‚ γενικά, διαβάστε την %sτεκμηÏίωση Î ÏοσαÏμοσμÎνων Μεταβλητών στο piwik.org%s.",
+ "CustomVariablesReportDocumentation": "Η αναφοÏά αυτή πεÏιÎχει πληÏοφοÏίες σχετικά με τις Î ÏοσαÏμοσμÎνες ΜεταβλητÎÏ‚. Κάντε κλικ σε μια μεταβλητή για να δείτε την διασποÏά των τιμών. %1$s Για πεÏισσότεÏες πληÏοφοÏίες σχετικά με τις Î ÏοσαÏμοσμÎνες ΜεταβλητÎÏ‚ γενικότεÏα, διαβάστε την %2$sσχετική τεκμηÏίωση στο piwik.org%3$s",
"PluginDescription": "Οι Î ÏοσαÏμοσμÎνες ΜεταβλητÎÏ‚ (όνομα, τιμή) είναι ζεÏγη που δίνετε με χÏήση του Javascript API σε επισκÎπτες ή οποιαδήποτε ενÎÏγειά τους. Το Piwik τότε θα αναφÎÏει τις επισκÎψεις, σελίδες, μετατÏοπÎÏ‚ για κάθε μία από τις Ï€ÏοσαÏμοσμÎνες αυτÎÏ‚ μεταβλητÎÏ‚. Δείτε τις λεπτομεÏείς Î ÏοσαÏμοσμÎνες ΜεταβλητÎÏ‚ για κάθε χÏήστη και ενÎÏγεια στο ΗμεÏολόγιο Επισκεπτών.<br \/>Απαιτείται για τη χÏήση του χαÏακτηÏÎ¹ÏƒÏ„Î¹ÎºÎ¿Ï <a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\">Αναλυτικά Ηλ. ΕμποÏίου<\/a>!",
"ScopePage": "σελίδα σκοποÏ",
"ScopeVisit": "επίσκεψη σκοποÏ",
@@ -13,10 +13,12 @@
"Usages": "ΧÏήσεις",
"Unused": "Δεν χÏησιμοποιοÏνται",
"CreateNewSlot": "Αυξήστε τον αÏιθμό των σχισμών Î ÏοσαÏμοσμÎνων Μεταβλητών",
- "UsageDetails": "%s επισκÎψεις και %s ενÎÏγειες από την δημιουÏγία του ιστοτόπου.",
+ "UsageDetails": "%1$s επισκÎψεις και %2$s ενÎÏγειες από την στιγμή δημιουÏγίας του ιστοτόπου.",
"CreatingCustomVariableTakesTime": "Η δημιουÏγία σχισμής Ï€ÏοσαÏμοσμÎνης μεταβλητής μποÏεί να διαÏκÎσει αÏκετή ÏŽÏα ανάλογα με το μÎγεθος της βάσης. Οπότε, αυτό είναι Ï€ÏÎπει να γίνεται από εντολή που χÏειάζεται να εκτελεστεί από την γÏαμμή εντολών.",
"CurrentAvailableCustomVariables": "Αυτή τη στιγμή μποÏείτε να χÏησιμοποιήσετε %s Î ÏοσαÏμοσμÎνες ΜεταβλητÎÏ‚ ανά ιστοτόπο.",
"ToCreateCustomVarExecute": "Για να δημιουÏγήσετε μια σχισμή Ï€ÏοσαÏμοσμÎνης μεταβλητής Ï€ÏÎπει να εκτελÎσετε την παÏακάτω εντολή για την εγκατάσταση του PIwik σας:",
- "SlotsReportIsGeneratedOverTime": "Τα δεδομÎνα για αυτή την αναφοÏά θα συμπληÏώνονται με το Ï€ÎÏασμα του χÏόνου. ΜποÏεί να χÏειαστοÏν μία ή δÏο μÎÏες για να δείτε δεδομÎνα και μεÏικÎÏ‚ εβδομάδες μÎχÏι η αναφοÏά να είναι ακÏιβής."
+ "SlotsReportIsGeneratedOverTime": "Τα δεδομÎνα για αυτή την αναφοÏά θα συμπληÏώνονται με το Ï€ÎÏασμα του χÏόνου. ΜποÏεί να χÏειαστοÏν μία ή δÏο μÎÏες για να δείτε δεδομÎνα και μεÏικÎÏ‚ εβδομάδες μÎχÏι η αναφοÏά να είναι ακÏιβής.",
+ "MetricsAreOnlyAvailableForVisitScope": "Σημείωση: %1$s μετÏικÎÏ‚ είναι διαθÎσιμες για τις Î ÏοσαÏμοσμÎνες ΜεταβλητÎÏ‚ εμβÎλειας %2$s μόνο.",
+ "MetricsNotAvailableForPageScope": "Για Î ÏοσαÏμοσμÎνες ΜεταβλητÎÏ‚ εμβÎλειας %1$s, η τιμή στήλης για τις μετÏικÎÏ‚ αυτÎÏ‚ είναι %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/CustomVariables/lang/en.json b/plugins/CustomVariables/lang/en.json
index 45052df4d9e1c5e8e20686bbb731dd6c2ad90846..e065886759497068f06bea90fd9b634a2ac0554e 100644
--- a/plugins/CustomVariables/lang/en.json
+++ b/plugins/CustomVariables/lang/en.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Custom Variable name",
"ColumnCustomVariableValue": "Custom Variable value",
"CustomVariables": "Custom Variables",
- "CustomVariablesReportDocumentation": "This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. %s For more information about Custom Variables in general, read the %sCustom Variables documentation on piwik.org%s",
+ "CustomVariablesReportDocumentation": "This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. %1$s For more information about Custom Variables in general, read the %2$sCustom Variables documentation on piwik.org%3$s",
"PluginDescription": "Custom Variables are (name, value) pairs that you can assign using the Javascript API to visitors or any of their action. Piwik will then report how many visits, pages, conversions for each of these custom names and values. View the detailed Custom Variables for each user and action in the Visitor Log.<br />Required to use <a href=\"http://piwik.org/docs/ecommerce-analytics/\">Ecommerce Analytics</a> feature!",
"ScopePage": "scope page",
"ScopeVisit": "scope visit",
@@ -13,10 +13,12 @@
"Usages": "Usages",
"Unused": "Unused",
"CreateNewSlot": "Increase the number of available Custom Variables slots",
- "UsageDetails": "%s visits and %s actions since creation of this website.",
+ "UsageDetails": "%1$s visits and %2$s actions since creation of this website.",
"CreatingCustomVariableTakesTime": "Creating a new custom variable slot can take a long time depending on the size of your database. Therefore it is only possible to do this via a command which needs to be executed on the command line.",
"CurrentAvailableCustomVariables": "Currently you can use up to %s Custom Variables per site.",
"ToCreateCustomVarExecute": "To create a new custom variable slot execute the following command within your Piwik installation: ",
- "SlotsReportIsGeneratedOverTime": "Data for this report will be populated over time. It may take a day or two to see any data and a few weeks until the report is fully accurate."
+ "SlotsReportIsGeneratedOverTime": "Data for this report will be populated over time. It may take a day or two to see any data and a few weeks until the report is fully accurate.",
+ "MetricsAreOnlyAvailableForVisitScope": "Note: %1$s metrics are available for Custom Variables of scope %2$s only.",
+ "MetricsNotAvailableForPageScope": "For Custom Variables of scope %1$s, the column value for these metrics is %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/CustomVariables/lang/es.json b/plugins/CustomVariables/lang/es.json
index d84d2928f83987256a54ccc4fed9c7b852a1dc37..012d4797a6a96f22448b95ec4ebdd96f67a651fa 100644
--- a/plugins/CustomVariables/lang/es.json
+++ b/plugins/CustomVariables/lang/es.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Nombre de la Variable Personalizada",
"ColumnCustomVariableValue": "Valor de la Variable Personalizada",
"CustomVariables": "Variables Personalizadas",
- "CustomVariablesReportDocumentation": "Este informe contiene información sobre sus Variables Personalizadas. Haga clic en el nombre de una variable para ver la distribución de los valores. %s Para más información sobre las Variables Personalizadas en general, lea la %sdocumentación de Variables Personalizadas en piwik.org%s",
+ "CustomVariablesReportDocumentation": "Este informe contiene información sobre sus Variables Personalizadas. Haga clic en el nombre de una variable para ver la distribución de los valores. %1$s Para más información sobre las Variables Personalizadas en general, lea la %2$sdocumentación de Variables Personalizadas en piwik.org%3$s",
"PluginDescription": "Variables Personalizadas (nombre, valor) son pares que se pueden asignar mediante la API de Javascript a los visitantes o cualquiera de sus acciones. Piwik luego informará el número de visitas, páginas, las conversiones para cada uno de estos nombres y valores personalizados. Vea las variables personalizadas detalladas para cada usuario y su acción en el registro de visitantes. <br \/> Requerida para utilizar la función de <a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\"> Ecommerce Analytics <\/a>!",
"ScopePage": "ámbito de la página",
"ScopeVisit": "alcance de la visita"
diff --git a/plugins/CustomVariables/lang/fi.json b/plugins/CustomVariables/lang/fi.json
index 24559aca12942386ab4d6ed97b764aa3d96c00bc..51c8ee0f1f75bfece3d86b146542df2aa23718b4 100644
--- a/plugins/CustomVariables/lang/fi.json
+++ b/plugins/CustomVariables/lang/fi.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Kustomoidun muuttujan nimi",
"ColumnCustomVariableValue": "Kustomoidun muuttujan arvo",
"CustomVariables": "Kustomoidut muuttujat",
- "CustomVariablesReportDocumentation": "Tämä raportti sisältää tietoa kustomoiduista muuttujastasi. Voit tarkastella eri arvojen määrää klikkaamalla muuttujan nimeä. %s Saat lisätietoa kustomoiduista muuttujista %sCustom Variables%s-sivulta piwik.orgista (englanninkielinen)",
+ "CustomVariablesReportDocumentation": "Tämä raportti sisältää tietoa kustomoiduista muuttujastasi. Voit tarkastella eri arvojen määrää klikkaamalla muuttujan nimeä. %1$s Saat lisätietoa kustomoiduista muuttujista %2$sCustom Variables%3$s-sivulta piwik.orgista (englanninkielinen)",
"ScopePage": "alueena sivu",
"ScopeVisit": "alueena käynti"
}
diff --git a/plugins/CustomVariables/lang/fr.json b/plugins/CustomVariables/lang/fr.json
index 25113643f056667e6fc8c0d93346fc5af38cf4f6..04febeefd67d3a1e95983da6b80683042b20ecb2 100644
--- a/plugins/CustomVariables/lang/fr.json
+++ b/plugins/CustomVariables/lang/fr.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Nom de la variable personnalisée",
"ColumnCustomVariableValue": "Valeur de la variable personnalisée",
"CustomVariables": "Variables personnalisées",
- "CustomVariablesReportDocumentation": "Ce rapport contient des informations à propos de vos Variables Personnalisées. Cliquez sur un nom de variable pour voir la répartition de la valeur. %s Pour plus d'informations à propos des variables personnalisées en général, lisez la %s documentation sur les variables personnalisées sur piwik.org%s",
+ "CustomVariablesReportDocumentation": "Ce rapport contient des informations à propos de vos Variables Personnalisées. Cliquez sur un nom de variable pour voir la répartition de la valeur. %1$s Pour plus d'informations à propos des variables personnalisées en général, lisez la %2$s documentation sur les variables personnalisées sur piwik.org%3$s",
"PluginDescription": "Les variables personnalisées sont des paires (nom, valeur) que vous pouvez assigner en utilisant l'API Javascript aux visiteurs ou n'importe quelle de leur action. Piwik rapportera ensuite le nombre de visites, pages, conversions pour chacune de ces noms et valeurs personnalisés. Voir les variables personnalisées détaillées pour chaque utilisateur et action dans le journal visiteur. <br \/>Nécessite d'utiliser la fonctionnalité <a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\">Ecommerce Analytics<\/a> !",
"ScopePage": "Étendue page",
"ScopeVisit": "Étendue visite",
@@ -13,10 +13,11 @@
"Usages": "Usages",
"Unused": "Inutilisé",
"CreateNewSlot": "Augmenter le nombre d'emplacement de variables personnalisées disponibles",
- "UsageDetails": "%s visites et %s actions depuis la création de ce site web.",
+ "UsageDetails": "%1$s visites et %2$s actions depuis la création de ce site web.",
"CreatingCustomVariableTakesTime": "La création de nouveaux emplacement de variable personnalisée peut prendre du temps dépendamment de la taille de votre base de données. De ce fait il est possible d'effectuer cela uniquement via une commande qui doit être exécutée dans la console.",
"CurrentAvailableCustomVariables": "Pour l'instant vous pouvez utiliser jusqu'à %s Variables personnalisées par site.",
"ToCreateCustomVarExecute": "Pour créer un nouvel emplacement de variable personnalisée exécutez la commande suivante dans votre installation de Piwik :",
- "SlotsReportIsGeneratedOverTime": "Les données pour ce rapport vont être peuplées avec le temps. Il se peut que cela prenne un jour ou deux pour voir des informations et quelques semaines avant que le rapport ne soit précis."
+ "SlotsReportIsGeneratedOverTime": "Les données pour ce rapport vont être peuplées avec le temps. Il se peut que cela prenne un jour ou deux pour voir des informations et quelques semaines avant que le rapport ne soit précis.",
+ "MetricsNotAvailableForPageScope": "Pour les variables personnalisées de la portée %1$s, la valeur de colonne pour ces métriques est %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/CustomVariables/lang/hi.json b/plugins/CustomVariables/lang/hi.json
index 22d7393ded0c066809068755b0db552fc79c7fb7..182185263c3d41424b13d14dddddf38dab82b51c 100644
--- a/plugins/CustomVariables/lang/hi.json
+++ b/plugins/CustomVariables/lang/hi.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "विशेष चर नाम",
"ColumnCustomVariableValue": "विशेष चर मूलà¥à¤¯",
"CustomVariables": "विशेष चर",
- "CustomVariablesReportDocumentation": "यह रिपोरà¥à¤Ÿ आपके कसà¥à¤Ÿà¤® चर के बारे में जानकारी शामिल हैं. मूलà¥à¤¯à¥‹à¤‚ के वितरण को देखने के लिठà¤à¤• चर के नाम पर कà¥à¤²à¤¿à¤• करें. %sसामानà¥à¤¯ रूप में %sकसà¥à¤Ÿà¤® चर के बारे में अधिक जानकारी के लिà¤, piwik.org %s पर कसà¥à¤Ÿà¤® चर दसà¥à¤¤à¤¾à¤µà¥‡à¤œà¤¼ पढ़ें",
+ "CustomVariablesReportDocumentation": "यह रिपोरà¥à¤Ÿ आपके कसà¥à¤Ÿà¤® चर के बारे में जानकारी शामिल हैं. मूलà¥à¤¯à¥‹à¤‚ के वितरण को देखने के लिठà¤à¤• चर के नाम पर कà¥à¤²à¤¿à¤• करें. %1$sसामानà¥à¤¯ रूप में %2$sकसà¥à¤Ÿà¤® चर के बारे में अधिक जानकारी के लिà¤, piwik.org %3$s पर कसà¥à¤Ÿà¤® चर दसà¥à¤¤à¤¾à¤µà¥‡à¤œà¤¼ पढ़ें",
"ScopePage": "पà¥à¤°à¤¸à¤¾à¤° पृषà¥à¤ ",
"ScopeVisit": "पà¥à¤°à¤¸à¤¾à¤° यातà¥à¤°à¤¾"
}
diff --git a/plugins/CustomVariables/lang/id.json b/plugins/CustomVariables/lang/id.json
index 321529a42c6d8d61d01ffcd09a8df17d5f948cb5..545429db06c69f938c8fd25a9a68d68e4dfff8c2 100644
--- a/plugins/CustomVariables/lang/id.json
+++ b/plugins/CustomVariables/lang/id.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Nama Variabel Kustom",
"ColumnCustomVariableValue": "Nilai Variabel Kustom",
"CustomVariables": "Variabel Kustom",
- "CustomVariablesReportDocumentation": "Laporan ini mengandung informasi tentang Variabel Kustom Anda. Klik di nama variabel untuk melihat distribusi nilai. %s Informasi lebih lengkap tentang Vabiabel Kustom, baca %sdokumentasi Vabiabel Kustom di piwik.org%s",
+ "CustomVariablesReportDocumentation": "Laporan ini mengandung informasi tentang Variabel Kustom Anda. Klik di nama variabel untuk melihat distribusi nilai. %1$s Informasi lebih lengkap tentang Vabiabel Kustom, baca %2$sdokumentasi Vabiabel Kustom di piwik.org%3$s",
"ScopePage": "cakupan halaman",
"ScopeVisit": "cakupan kunjungan"
}
diff --git a/plugins/CustomVariables/lang/it.json b/plugins/CustomVariables/lang/it.json
index ec7b07a778fd4d66cb5c2cbd463eff9a33bff73c..c23021e8a6d3ca7c749f422e230aedf79953314c 100644
--- a/plugins/CustomVariables/lang/it.json
+++ b/plugins/CustomVariables/lang/it.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Nome Variabile Personalizzata",
"ColumnCustomVariableValue": "Valore Variabile Personalizzata",
"CustomVariables": "Variabile Personalizzata",
- "CustomVariablesReportDocumentation": "Questo report contiene le informazioni sulle variabili personalizzate. Clicca su un nome di variabile per visualizzarne la distribuzione dei valori. %s Per ulteriori informazioni sulle variabili personalizzate in generale, leggere la %sDocumentazione Variabili Personalizzatesu piwik.org %s",
+ "CustomVariablesReportDocumentation": "Questo report contiene le informazioni sulle variabili personalizzate. Clicca su un nome di variabile per visualizzarne la distribuzione dei valori. %1$s Per ulteriori informazioni sulle variabili personalizzate in generale, leggere la %2$sDocumentazione Variabili Personalizzatesu piwik.org %3$s",
"PluginDescription": "Le variabili personalizzate sono coppie (nome, valore) che puoi assegnare ai visitatori o a una qualunque loro azione tramite API Javascript. Poi Piwik riporterà le visite, le pagine e le conversioni per questi nomi e valori. Guarda nel dettaglio le Variabili Personalizzate per ciascun utente nel Log Visitatori.<br>Necessario per utilizzare la funzione <a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\">Statistiche Ecommerce<\/a>",
"ScopePage": "ambito pagina",
"ScopeVisit": "ambito visita",
@@ -13,7 +13,7 @@
"Usages": "Usi",
"Unused": "Inutilizzate",
"CreateNewSlot": "Aumenta il numero degli slot di variabili personali disponibili",
- "UsageDetails": "%s visite e %s azioni dalla creazione di questo sito web.",
+ "UsageDetails": "%1$s visite e %2$s azioni dalla creazione di questo sito web.",
"CreatingCustomVariableTakesTime": "La creazione di un nuovo slot di variabili personali può richiedere un tempo lungo che dipende dalla dimensione del tuo database. Pertanto è possibile fare ciò solo tramite un comando che deve essere eseguito da riga di comando.",
"CurrentAvailableCustomVariables": "Attualmente puoi utilizzare fino a %s variabili personali per sito.",
"ToCreateCustomVarExecute": "Per creare un nuovo slot di variabili personali esegui il comando seguente nella tua installazione di Piwik.",
diff --git a/plugins/CustomVariables/lang/ko.json b/plugins/CustomVariables/lang/ko.json
index 894e4e53ea53630487cbc137e870f933c9b0a620..d0fb3c829ce0910ef5d2d09d13b1a2f65744db43 100644
--- a/plugins/CustomVariables/lang/ko.json
+++ b/plugins/CustomVariables/lang/ko.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "맞춤 변수 ì´ë¦„",
"ColumnCustomVariableValue": "맞춤 변수 값",
"CustomVariables": "맞춤 변수",
- "CustomVariablesReportDocumentation": "ì´ ë³´ê³ ì„œëŠ” 맞춤 ë³€ìˆ˜ì— ëŒ€í•œ ì •ë³´ë¥¼ í¬í•¨í•©ë‹ˆë‹¤. 변수 ì´ë¦„ì„ í´ë¦í•˜ì—¬ ê°’ì˜ ë¶„í¬ë¥¼ 확ì¸í• 수 있습니다. %s 맞춤 ë³€ìˆ˜ì— ëŒ€í•œ ìžì„¸í•œ ë‚´ìš©ì€ %spiwik.orgì˜ ë§žì¶¤ 변수 설명서%s를 참조하세요.",
+ "CustomVariablesReportDocumentation": "ì´ ë³´ê³ ì„œëŠ” 맞춤 ë³€ìˆ˜ì— ëŒ€í•œ ì •ë³´ë¥¼ í¬í•¨í•©ë‹ˆë‹¤. 변수 ì´ë¦„ì„ í´ë¦í•˜ì—¬ ê°’ì˜ ë¶„í¬ë¥¼ 확ì¸í• 수 있습니다. %1$s 맞춤 ë³€ìˆ˜ì— ëŒ€í•œ ìžì„¸í•œ ë‚´ìš©ì€ %2$spiwik.orgì˜ ë§žì¶¤ 변수 설명서%3$s를 참조하세요.",
"ScopePage": "페ì´ì§€ 범위",
"ScopeVisit": "방문 범위"
}
diff --git a/plugins/CustomVariables/lang/nb.json b/plugins/CustomVariables/lang/nb.json
index 7fe6f0850daf6f4376bae7a96b932c8a8fdfb4f1..3ba6325f3606a1030bf6c18dc460948ec656a28e 100644
--- a/plugins/CustomVariables/lang/nb.json
+++ b/plugins/CustomVariables/lang/nb.json
@@ -1,5 +1,6 @@
{
"CustomVariables": {
- "CustomVariables": "Egendefinerte variabler"
+ "CustomVariables": "Egendefinerte variabler",
+ "Unused": "Ubrukt"
}
}
\ No newline at end of file
diff --git a/plugins/CustomVariables/lang/nl.json b/plugins/CustomVariables/lang/nl.json
index 6dc3c511ce099b6d0fbfb85d0dac38b39dbd7d6c..4ba6ced08eb9f8a90d0e5fddfc55f9f0dd00462f 100644
--- a/plugins/CustomVariables/lang/nl.json
+++ b/plugins/CustomVariables/lang/nl.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Aangepaste variabelenaam",
"ColumnCustomVariableValue": "Aangepaste variabele waarde",
"CustomVariables": "Aangepaste variabelen",
- "CustomVariablesReportDocumentation": "Dit rapport bevat informatie over uw aangepaste variabelen. Klik op de naam van een variabele om de verdeling van de waarden te zien. %s voor meer informatie over aangepaste variabelen in het algemeen, lees de %sCustom variabelen documentatie over piwik.org%s",
+ "CustomVariablesReportDocumentation": "Dit rapport bevat informatie over uw aangepaste variabelen. Klik op de naam van een variabele om de verdeling van de waarden te zien. %1$s voor meer informatie over aangepaste variabelen in het algemeen, lees de %2$sCustom variabelen documentatie over piwik.org%3$s",
"PluginDescription": "Aangepaste variabelen zijn (naam, waarde) paren dat je kunt toewijzen via de Javascript API aan bezoekers of aan één van hun acties. Piwik zal dan het aantal bezoeken, pagina's, conversies voor elk van deze aangepaste namen en waarden rapporteren. Bekijk de gedetailleerde Aangepaste variabelen voor elke gebruik en actie in het Bezoekerslogboek. <br\/>Het is vereist gebruik te maken van de<a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\">Ecommerce Analyses<\/a> functie!",
"ScopePage": "omvang pagina",
"ScopeVisit": "omvang bezoek"
diff --git a/plugins/CustomVariables/lang/pl.json b/plugins/CustomVariables/lang/pl.json
index 90c5daab592bd90472536775be290414abcff063..ca5fdfad377d0e1717926ba6390b192627774d9a 100644
--- a/plugins/CustomVariables/lang/pl.json
+++ b/plugins/CustomVariables/lang/pl.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Nazwa zmiennej niestandardowej",
"ColumnCustomVariableValue": "Wartość zmiennej niestandardowej",
"CustomVariables": "Zmienne niestandardowe",
- "CustomVariablesReportDocumentation": "Raport ten zawiera informacje na temat niestandardowych zmiennych. Kliknij na nazwę zmiennej, aby zobaczyć rozkład wartości. %sAby uzyskać więcej informacji na temat niestandardowych zmiennych, przeczytaj dokumentację Zmienne %sCustom na piwik.org%s",
+ "CustomVariablesReportDocumentation": "Raport ten zawiera informacje na temat niestandardowych zmiennych. Kliknij na nazwę zmiennej, aby zobaczyć rozkład wartości. %1$sAby uzyskać więcej informacji na temat niestandardowych zmiennych, przeczytaj dokumentację Zmienne %2$sCustom na piwik.org%3$s",
"ScopePage": "strona zakresu",
"ScopeVisit": "zakres wizyt"
}
diff --git a/plugins/CustomVariables/lang/pt-br.json b/plugins/CustomVariables/lang/pt-br.json
index 9f46739d4ada4c84eaf9d9aa9df5873432f56488..c0cf403f4e003940041bbb28fd3c497aec806304 100644
--- a/plugins/CustomVariables/lang/pt-br.json
+++ b/plugins/CustomVariables/lang/pt-br.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Nome da Variável Personalizada",
"ColumnCustomVariableValue": "Valor de variável personalizado",
"CustomVariables": "Variáveis personalizadas",
- "CustomVariablesReportDocumentation": "Este relatório contém informações sobre as suas variáveis ​​personalizadas. Clique em um nome de variável para ver a distribuição dos valores. %s para mais informações sobre variáveis ​​personalizadas em geral, leia a documentação %sCustom Variáveis ​​em piwik.org%s",
+ "CustomVariablesReportDocumentation": "Este relatório contém informações sobre as suas variáveis ​​personalizadas. Clique em um nome de variável para ver a distribuição dos valores. %1$s para mais informações sobre variáveis ​​personalizadas em geral, leia a documentação %2$sCustom Variáveis ​​em piwik.org%3$s",
"PluginDescription": "Variáveis Personalizadas são pares (nome, valor) que você pode atribuir utilizando a API Javascript para visitantes ou qualquer ações deles. Então, Piwik reporta o número de visitas, páginas e conversões para cada um desses nomes e valores personalizados. Veja as Variáveis Personalizadas detalhadas para cada usuário e ação no Registro de Visitantes.<br \/> É necessário utilizar a função <a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\">Ecommerce Analytics<\/a>!",
"ScopePage": "página escopo",
"ScopeVisit": "visita escopo",
@@ -13,10 +13,12 @@
"Usages": "Utilizações",
"Unused": "Não utilizado",
"CreateNewSlot": "Aumentar o número de compartimentos de Variáveis ​​Personalizadas disponÃveis",
- "UsageDetails": "%s visitas e %s ações desde a criação deste website.",
+ "UsageDetails": "%1$s visitas e %2$s ações desde a criação deste website.",
"CreatingCustomVariableTakesTime": "Criar um novo compartimento de variável personalizada pode levar um longo tempo, dependendo do tamanho do seu banco de dados. Por isso, só é possÃvel fazer isso através de um comando que deve ser executado na linha de comando.",
"CurrentAvailableCustomVariables": "Atualmente você pode usar até %s Variáveis Personalizadas por site.",
"ToCreateCustomVarExecute": "Para criar um novo compartimento de variável personalizada execute o seguinte comando dentro da sua instalação Piwik:",
- "SlotsReportIsGeneratedOverTime": "Os dados para este relatório serão preenchidos ao longo do tempo. Pode demorar um dia ou dois para ver todos os dados e algumas semanas até que o relatório seja totalmente preciso."
+ "SlotsReportIsGeneratedOverTime": "Os dados para este relatório serão preenchidos ao longo do tempo. Pode demorar um dia ou dois para ver todos os dados e algumas semanas até que o relatório seja totalmente preciso.",
+ "MetricsAreOnlyAvailableForVisitScope": "Nota: %1$s métricas estão disponÃveis apenas para as Variáveis ​​Personalizadas de alcance %2$s.",
+ "MetricsNotAvailableForPageScope": "Para as Variáveis ​​Personalizadas de alcance %1$s, o valor da coluna para essas métricas é %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/CustomVariables/lang/pt.json b/plugins/CustomVariables/lang/pt.json
index ec40f902c9691947aab3a883c143399da5812955..6c25ad38759d58078642f4f9b21416b24f6eb5c6 100644
--- a/plugins/CustomVariables/lang/pt.json
+++ b/plugins/CustomVariables/lang/pt.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Nome da variável ​​personalizada",
"ColumnCustomVariableValue": "Valor da variável ​​personalizada",
"CustomVariables": "Variáveis ​​personalizadas",
- "CustomVariablesReportDocumentation": "Este relatório contém informações sobre as variáveis ​​personalizadas. Clique no nome de uma variável para ver a distribuição dos valores. %s Para mais informações sobre variáveis ​​personalizadas em geral, deve ler a %sdocumentação sobre Variáveis Personalizadas em piwik.org %s",
+ "CustomVariablesReportDocumentation": "Este relatório contém informações sobre as variáveis ​​personalizadas. Clique no nome de uma variável para ver a distribuição dos valores. %1$s Para mais informações sobre variáveis ​​personalizadas em geral, deve ler a %2$sdocumentação sobre Variáveis Personalizadas em piwik.org %3$s",
"ScopePage": "Âmbito da página",
"ScopeVisit": "Âmbito da visita"
}
diff --git a/plugins/CustomVariables/lang/ro.json b/plugins/CustomVariables/lang/ro.json
index 8394ffd6c801d370e0255c27bdd4a7d9445a18ce..54b4291c9b091a0580db6f429960172d323c558c 100644
--- a/plugins/CustomVariables/lang/ro.json
+++ b/plugins/CustomVariables/lang/ro.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Denumirea variabilei personalizate",
"ColumnCustomVariableValue": "Valoarea variabilei personalizate",
"CustomVariables": "Variabile personalizate",
- "CustomVariablesReportDocumentation": "Acest raport conține informații despre Variabilele Personalizate. Faceți clic pe un nume de variabilă pentru a vedea distribuția valorilor. %s Pentru mai multe informații despre variabile personalizate, în general, citiți %sdocumentatia Variabilelor Personalizate piwik.org%s",
+ "CustomVariablesReportDocumentation": "Acest raport conține informații despre Variabilele Personalizate. Faceți clic pe un nume de variabilă pentru a vedea distribuția valorilor. %1$s Pentru mai multe informații despre variabile personalizate, în general, citiți %2$sdocumentatia Variabilelor Personalizate piwik.org%3$s",
"ScopePage": "scop pagină",
"ScopeVisit": "scop vizită"
}
diff --git a/plugins/CustomVariables/lang/ru.json b/plugins/CustomVariables/lang/ru.json
index bc30aea1a05aafaff890d218e0a0f7c5f0c51251..c448538e4b90a8d61f808970ee8412d457371f94 100644
--- a/plugins/CustomVariables/lang/ru.json
+++ b/plugins/CustomVariables/lang/ru.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑкой переменной",
"ColumnCustomVariableValue": "Значение пользовательÑкой переменной",
"CustomVariables": "ПользовательÑкие переменные",
- "CustomVariablesReportDocumentation": "Ðтот отчет отображает информацию по вашим ПользовательÑким Переменным. Кликните по переменной, чтобы увидеть раÑпределение значений. %s Ð”Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆÐµÐ¹ информации о Пользов. Переменных в общих чертах ознакомьтеÑÑŒ Ñ %sдокументацией по Пользов. переменных на Ñайте Piwik%s",
+ "CustomVariablesReportDocumentation": "Ðтот отчет отображает информацию по вашим ПользовательÑким Переменным. Кликните по переменной, чтобы увидеть раÑпределение значений. %1$s Ð”Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆÐµÐ¹ информации о Пользов. Переменных в общих чертах ознакомьтеÑÑŒ Ñ %2$sдокументацией по Пользов. переменных на Ñайте Piwik%3$s",
"ScopePage": "scope page",
"ScopeVisit": "scope visit"
}
diff --git a/plugins/CustomVariables/lang/sq.json b/plugins/CustomVariables/lang/sq.json
index 0f7c09eb34966eeb8f1925034befbedf5d4f6c60..fb18850ba0fb55b4a88c2818524e87fa9f16976f 100644
--- a/plugins/CustomVariables/lang/sq.json
+++ b/plugins/CustomVariables/lang/sq.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Emër Ndryshoreje të Personalizueshme",
"ColumnCustomVariableValue": "Vlerë Ndryshoreje të Personalizueshme",
"CustomVariables": "Ndryshore të Personalizueshme",
- "CustomVariablesReportDocumentation": "Ky raport përmban të dhëna rreth Ndryshoreve tuaja të Personalizuara. Klikoni mbi një emër ndryshoreje që të shihni shpërndarjen e vlerave. %s Për më tepër të dhëna rreth Ndryshoresh të Personalizuara në përgjithësi, lexoni %sdokumentimin e Ndryshoreve të Personalizuara te piwik.org%s",
+ "CustomVariablesReportDocumentation": "Ky raport përmban të dhëna rreth Ndryshoreve tuaja të Personalizuara. Klikoni mbi një emër ndryshoreje që të shihni shpërndarjen e vlerave. %1$s Për më tepër të dhëna rreth Ndryshoresh të Personalizuara në përgjithësi, lexoni %2$sdokumentimin e Ndryshoreve të Personalizuara te piwik.org%3$s",
"PluginDescription": "Ndryshoret e Personalizueshme janë çifte (emër, vlerë) që mund t’ua vini në përshoqërim vizitorëve tuaj apo çfarëdo veprimi prej tyre, duke përdorur API-n për Javascript-in. Piwik-u mandej do të raportojë sa vizita, faqe, shndërrime ka për secilin prej këtyre emrave dhe vlerave të personalizuara. Ndryshoret e Personalizueshme në hollësi për çdo përdorues dhe veprim i gjeni te Regjistri i Vizitorëve.<br \/>E domosdoshme për përdorim të veçorisë <a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\">Analiza E-tregti<\/a>!",
"ScopePage": "faqe me qëllim",
"ScopeVisit": "vizitë me qëllim"
diff --git a/plugins/CustomVariables/lang/sr.json b/plugins/CustomVariables/lang/sr.json
index b740d6b41cc3f827b3d56de9fad8f77afbf855e2..37ba3f7eb00079e6af3dd71af9a53989666a9b82 100644
--- a/plugins/CustomVariables/lang/sr.json
+++ b/plugins/CustomVariables/lang/sr.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Ime dodatnog parametra",
"ColumnCustomVariableValue": "Vrednost dodatnog parametra",
"CustomVariables": "Dodatni parametri",
- "CustomVariablesReportDocumentation": "Ovaj izveštaj sadrži informacije o dodatnim parametrima. Kliknite na ime parametra kako biste videli distribuciju vrednosti. %s Za više informacija o dodatnim parametrima pogledajte %sCustom Variables na piwik.org%s",
+ "CustomVariablesReportDocumentation": "Ovaj izveštaj sadrži informacije o dodatnim parametrima. Kliknite na ime parametra kako biste videli distribuciju vrednosti. %1$s Za više informacija o dodatnim parametrima pogledajte %2$sCustom Variables na piwik.org%3$s",
"PluginDescription": "Dodatni parametri su uređeni parovi (naziv, vrednost) koje možete pomoću JavaScript API-ja da dodelite posetiocima ili bilo kojoj njihovoj akciji. Piwik će onda beležiti koliko ima poseta, stranica i konverzija za svaki od tih parova. Detalje možete videti u logu posetilaca. <br \/>Neophodno za <a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\">E-commerce analitike<\/a>!",
"ScopePage": "oblast strana",
"ScopeVisit": "oblast poseta"
diff --git a/plugins/CustomVariables/lang/sv.json b/plugins/CustomVariables/lang/sv.json
index 2fc2e7dd6f080f00c50241b7f6845b65a96322b2..11f438e096d05577798d45fc3dd89b0577669ec0 100644
--- a/plugins/CustomVariables/lang/sv.json
+++ b/plugins/CustomVariables/lang/sv.json
@@ -3,8 +3,11 @@
"ColumnCustomVariableName": "Anpassat variabelnamn",
"ColumnCustomVariableValue": "Anpassat variabelvärde",
"CustomVariables": "Anpassade variabler",
- "CustomVariablesReportDocumentation": "Denna rapport innehåller information om din anpassade variabler. Klicka på ett variabelnamn för att se fördelningen av värdena. %s För mer information om anpassade variabler i allmänhet, läs %sdokumentationen om anpassade variabler på piwik.org%s",
+ "CustomVariablesReportDocumentation": "Denna rapport innehåller information om din anpassade variabler. Klicka på ett variabelnamn för att se fördelningen av värdena. %1$s För mer information om anpassade variabler i allmänhet, läs %2$sdokumentationen om anpassade variabler på piwik.org%3$s",
"ScopePage": "omfattning sida",
- "ScopeVisit": "omfattning besök"
+ "ScopeVisit": "omfattning besök",
+ "Index": "Index",
+ "Usages": "Användningar",
+ "Unused": "Oanvänd"
}
}
\ No newline at end of file
diff --git a/plugins/CustomVariables/lang/tl.json b/plugins/CustomVariables/lang/tl.json
index f5ecff66e7937c42d3939a3e453e1131153a9afa..1a18687540edb7a3cb99715c58c1c8884d359e12 100644
--- a/plugins/CustomVariables/lang/tl.json
+++ b/plugins/CustomVariables/lang/tl.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Pangalan ng Custom na Variable",
"ColumnCustomVariableValue": "Halaga ng Custom na Variable",
"CustomVariables": "Mga Custom na Variable",
- "CustomVariablesReportDocumentation": "Ang ulat na ito ay naglalaman ng mga impormasyon tunkol sa iyong mga Custom Variable. E-click ang pangalan ng variable upang makita ang pagkakabahagi ng mga laman nito. %s Upang makita ang pangkalahatang impormasyon tungkol sa Custom Variables basahin ang %sCustom Variables documentation sa piwi.org%s.",
+ "CustomVariablesReportDocumentation": "Ang ulat na ito ay naglalaman ng mga impormasyon tunkol sa iyong mga Custom Variable. E-click ang pangalan ng variable upang makita ang pagkakabahagi ng mga laman nito. %1$s Upang makita ang pangkalahatang impormasyon tungkol sa Custom Variables basahin ang %2$sCustom Variables documentation sa piwi.org%3$s.",
"ScopePage": "saklaw na pahina",
"ScopeVisit": "Saklaw ng pagbisita"
}
diff --git a/plugins/CustomVariables/lang/vi.json b/plugins/CustomVariables/lang/vi.json
index 29b5f4685a4d65dcc68c13bfab7faa595a282bdb..8dec993981feb8c1e394a373913794aefa77040e 100644
--- a/plugins/CustomVariables/lang/vi.json
+++ b/plugins/CustomVariables/lang/vi.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "Tên biến tùy chá»n",
"ColumnCustomVariableValue": "Giá trị của biến tùy chá»n",
"CustomVariables": "Các biến tùy chá»n",
- "CustomVariablesReportDocumentation": "Báo cáo nà y chứa thông tin vá» các biến tùy chỉnh. Vui lòng chá»n tên biến để xem phân bố của các giá trị. %s Äể tìm hiểu thêm thông tin chung vá» các biến tùy chỉnh, Ä‘á»c %s Tà i liệu hÆ°á»›ng dẫn vá» biến tùy chỉnh trên piwik.org %s",
+ "CustomVariablesReportDocumentation": "Báo cáo nà y chứa thông tin vá» các biến tùy chỉnh. Vui lòng chá»n tên biến để xem phân bố của các giá trị. %1$s Äể tìm hiểu thêm thông tin chung vá» các biến tùy chỉnh, Ä‘á»c %2$s Tà i liệu hÆ°á»›ng dẫn vá» biến tùy chỉnh trên piwik.org %3$s",
"ScopePage": "Trang phạm vi",
"ScopeVisit": "sự viếng thăm trong phạm vi nà o đó"
}
diff --git a/plugins/CustomVariables/lang/zh-cn.json b/plugins/CustomVariables/lang/zh-cn.json
index 7dca8365ac2763ac1170e7e00ff18c513fd69e3c..a98cc725a702bb6235fc43e058fe1271db23694c 100644
--- a/plugins/CustomVariables/lang/zh-cn.json
+++ b/plugins/CustomVariables/lang/zh-cn.json
@@ -3,7 +3,7 @@
"ColumnCustomVariableName": "自定义å˜é‡å称",
"ColumnCustomVariableValue": "自定义å˜é‡å€¼",
"CustomVariables": "自定义å˜é‡",
- "CustomVariablesReportDocumentation": "本报表包å«æ‚¨çš„自定义å˜é‡çš„资料，点击å˜é‡å查看数æ®ã€‚%s 关于自定义å˜é‡çš„详情，请阅读 %spiwik.org 上的自定义å˜é‡æ–‡æ¡£%s",
+ "CustomVariablesReportDocumentation": "本报表包å«æ‚¨çš„自定义å˜é‡çš„资料，点击å˜é‡å查看数æ®ã€‚%1$s 关于自定义å˜é‡çš„详情，请阅读 %2$spiwik.org 上的自定义å˜é‡æ–‡æ¡£%3$s",
"ScopePage": "访问页é¢",
"ScopeVisit": "访问范围"
}
diff --git a/plugins/DBStats/lang/cs.json b/plugins/DBStats/lang/cs.json
index 57074b7cdd97b846d1feb5a636522cf19dad427a..c3247d786ff7c2a232dfa3c6f3cb70139b65d43d 100644
--- a/plugins/DBStats/lang/cs.json
+++ b/plugins/DBStats/lang/cs.json
@@ -10,7 +10,7 @@
"MetricDataByYear": "Tabulky měřenà za rok",
"MetricTables": "Tabulky měřenÃ",
"OtherTables": "Ostatnà tabulky",
- "PluginDescription": "Poskytuje detailnà hlášenà o využità Mysql databáze. Dostupné pro super uživatele pod diagnostikou.",
+ "PluginDescription": "Poskytuje detailnà hlášenà o využità Mysql databáze. Dostupné pro super-uživatele pod diagnostikou.",
"ReportDataByYear": "Hlášenà tabulek za rok",
"ReportTables": "Tabulky hlášenÃ",
"RowCount": "PoÄet řádků",
diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php
index 5eee375988b6eaff4821bc44322c6b9a0f7301dc..44814f680013aca78b92d26825383ac050a5a1b9 100644
--- a/plugins/Dashboard/Dashboard.php
+++ b/plugins/Dashboard/Dashboard.php
@@ -9,10 +9,12 @@
namespace Piwik\Plugins\Dashboard;
use Piwik\Common;
+use Piwik\Container\StaticContainer;
use Piwik\Db;
use Piwik\Piwik;
use Piwik\Category\Subcategory;
use Piwik\Widget\WidgetConfig;
+use Piwik\Plugin;
/**
*/
@@ -132,11 +134,19 @@ class Dashboard extends \Piwik\Plugin
$defaultLayout = $this->getLayoutForUser('', 1);
if (empty($defaultLayout)) {
+ $topWidget = '';
+
+ $advertising = StaticContainer::get('Piwik\PiwikPro\Advertising');
+ if ($advertising->arePiwikProAdsEnabled() && Plugin\Manager::getInstance()->isPluginActivated('PiwikPro')) {
+ $topWidget .= '{"uniqueId":"widgetPiwikPropromoPiwikPro",'
+ . '"parameters":{"module":"PiwikPro","action":"promoPiwikPro"}},';
+ }
+
if (Piwik::hasUserSuperUserAccess()) {
- $topWidget = '{"uniqueId":"widgetCoreHomegetDonateForm",'
+ $topWidget .= '{"uniqueId":"widgetCoreHomegetDonateForm",'
. '"parameters":{"module":"CoreHome","action":"getDonateForm"}},';
} else {
- $topWidget = '{"uniqueId":"widgetCoreHomegetPromoVideo",'
+ $topWidget .= '{"uniqueId":"widgetCoreHomegetPromoVideo",'
. '"parameters":{"module":"CoreHome","action":"getPromoVideo"}},';
}
diff --git a/plugins/Dashboard/lang/ar.json b/plugins/Dashboard/lang/ar.json
index f4537a9f500aa0eba1ff5b5e448c649ac0999d15..6796ea5776db62c745c5dc16197c84ba81af2e4e 100644
--- a/plugins/Dashboard/lang/ar.json
+++ b/plugins/Dashboard/lang/ar.json
@@ -21,6 +21,7 @@
"PluginDescription": "لوØØ© معلومات تØليلات الويب الخاصة بك. خصّص لوØØ© معلوماتك بإضاÙØ© عناصر واجهة جديدة وسØبها وإسقاطها أينما شئت ØŒ بإمكانك أيضاً تغيير تخطيط أعمدة لوØØ© المعلومات. يمكن لكل مستخدم إدارة لوØØ© معلومات يخصصها كما يشاء.",
"RemoveDashboard": "إزالة اللوØØ©",
"RemoveDashboardConfirm": "هل أنت متأكد من رغبتك Øذ٠لوØØ© المعلومات \"%s\" ØŸ",
+ "RemoveDefaultDashboardNotPossible": "لايمكن Øذ٠لوØØ© المعلومات الاÙتراضية",
"RenameDashboard": "إعادة تسمية اللوØØ©",
"ResetDashboard": "أعد ضبط لوØØ© المعلومات",
"ResetDashboardConfirm": "هل ترغب Øقاً ÙÙŠ تنضيد تخطيط اللوØØ© الرئيسية ومجموعة التطبيقات المعروضة Ùيها إلى الاÙتراضية؟",
diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less
index b45398379c23d2dde397c57ee0ff6c76cc36cf69..20a5fbac92ae2b9160f2301fb87a9f31285b3e60 100644
--- a/plugins/Dashboard/stylesheets/dashboard.less
+++ b/plugins/Dashboard/stylesheets/dashboard.less
@@ -112,9 +112,19 @@
font-size: 10pt;
}
+.widgetLoadingError {
+ .alert.alert-danger {
+ border: 0;
+ }
+}
+
.widgetLoadingError, .dimensionLoadingError {
color: @theme-color-brand;
text-align: left;
+ a {
+ color: @theme-color-brand;
+ text-decoration: underline;
+ }
}
#closeMenuIcon {
@@ -257,7 +267,7 @@
ul.widgetpreview-widgetlist,
ul.widgetpreview-categorylist {
- color: #5d5342;
+ color: @theme-color-text-light;
list-style: none;
font-size: 11px;
line-height: 20px;
@@ -318,7 +328,7 @@ div.widgetpreview-preview {
font-weight: normal;
padding-top: 10px;
margin-left: 10px;
- color: #5D5342;
+ color: @theme-color-text-light;
list-style: none;
font-size: 11px;
line-height: 20px;
diff --git a/plugins/Dashboard/stylesheets/widget.less b/plugins/Dashboard/stylesheets/widget.less
index 09357f7784c8695a5b633fe63c951be84bf8964f..c6743eb5592d64e4749ce92a3f38da21b1053bfe 100644
--- a/plugins/Dashboard/stylesheets/widget.less
+++ b/plugins/Dashboard/stylesheets/widget.less
@@ -1,7 +1,7 @@
.widget {
.font-default(13px, 18px);
- background: @theme-color-background-base;
- border: 1px solid @color-silver-l85;
+ background: @theme-color-widget-background;
+ border: 1px solid @theme-color-widget-border;
box-shadow: 0 1px 1px rgba(204,204,204,.5);
overflow: hidden;
z-index: 1;
@@ -54,6 +54,7 @@
padding-left: 50px;
right: 8px;
display: none;
+ color: @theme-color-widget-title-text;
background: -moz-linear-gradient(left, rgba(255,255,255,0) 0%, @theme-color-widget-title-background 45px);
background: -webkit-linear-gradient(left,rgba(255,255,255,0) 0%, @theme-color-widget-title-background 45px);
background: linear-gradient(to right, rgba(255,255,255,0) 0%, @theme-color-widget-title-background 45px);
@@ -115,3 +116,15 @@
display:none;
}
}
+
+.widget table.dataTable tr td {
+ background-color: @theme-color-widget-background;
+}
+
+.dataTable table.dataTable tr td {
+ background-color: @theme-color-widget-background;
+}
+
+.bar-graph-colors[data-name=grid-background] {
+ color: @theme-color-widget-background !important;
+}
diff --git a/plugins/Dashboard/templates/_dashboardSettings.twig b/plugins/Dashboard/templates/_dashboardSettings.twig
index b82e9137430d09556673948d19f012f314ef5df6..db21def8198799765d25a604da041aa1310a47da 100644
--- a/plugins/Dashboard/templates/_dashboardSettings.twig
+++ b/plugins/Dashboard/templates/_dashboardSettings.twig
@@ -1,4 +1,4 @@
-<a class="title" title="{{ 'Dashboard_ManageDashboard'|translate|e('html_attr') }}"><span class="icon icon-arrow-bottom"></span>{{ 'Dashboard_Dashboard'|translate }} </a>
+<a class="title" title="{{ 'Dashboard_ManageDashboard'|translate|e('html_attr') }}" tabindex="4"><span class="icon icon-arrow-bottom"></span>{{ 'Dashboard_Dashboard'|translate }} </a>
<ul class="dropdown submenu">
<li>
<div class="addWidget">{{ 'Dashboard_AddAWidget'|translate }}</div>
diff --git a/plugins/DevicePlugins/lang/ar.json b/plugins/DevicePlugins/lang/ar.json
index c0e62aa58f9a09a021d241ad5ca7bfe45dde02b7..0c29b16f22deaad2e089e94893b3769302ce10fc 100644
--- a/plugins/DevicePlugins/lang/ar.json
+++ b/plugins/DevicePlugins/lang/ar.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "ملاØظة: اكتشا٠الإضاÙات البرمجية لا تعمل ÙÙŠ متصÙØ Ø¥Ù†ØªØ±Ù†Øª إكسبلورر. هذه الخاصية ترتكز للمتصÙØات من العائلات الأخرى غير إنترنت إكسبلورر.",
"WidgetPlugins": "قائمة الإضاÙات"
}
}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/be.json b/plugins/DevicePlugins/lang/be.json
index 82f75389a6417ac63aaa39c7f24daa1e95d5db45..40743428a0c840b913a149f3a8a9bcb61603165b 100644
--- a/plugins/DevicePlugins/lang/be.json
+++ b/plugins/DevicePlugins/lang/be.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "Заўважце: Плагіны не вызначаюцца Ñž Internet Explorer. ГÑта Ñправаздача заÑнавана на не-IE браўзарах.",
"WidgetPlugins": "Ð¡Ð¿Ñ–Ñ Ð¿Ð»Ð°Ð³Ñ–Ð½Ð°Ñž",
"WidgetPluginsDocumentation": "ГÑÑ‚Ð°Ñ Ñправаздача паказвае, ÑÐºÑ–Ñ Ð¿Ð»Ð°Ð³Ñ–Ð½Ñ‹ были ўключаны Ñž браўзÑраў Вашых наведвальнікаў. ГÑÑ‚Ð°Ñ Ñ–Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ Ð¼Ð¾Ð¶Ð° мець важнае значÑнне Ð´Ð»Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñƒ правільнага ÑпоÑабу даÑтаўкі кантÑнту."
}
diff --git a/plugins/DevicePlugins/lang/bg.json b/plugins/DevicePlugins/lang/bg.json
index 12e47992f6eb86962bdd05e2189a5b857ffab9c6..934f1ce85e5103592d6b02c19ba9632d001c34d5 100644
--- a/plugins/DevicePlugins/lang/bg.json
+++ b/plugins/DevicePlugins/lang/bg.json
@@ -2,7 +2,6 @@
"DevicePlugins": {
"BrowserWithNoPluginsEnabled": "%1$s без активни добавки",
"BrowserWithPluginsEnabled": "%1$s Ñ Ð´Ð¾Ð±Ð°Ð²ÐºÐ¸ %2$s активиран",
- "PluginDetectionDoesNotWorkInIE": "Забележка: ЗаÑичането на добавки не работи при Internet Explorer. Този доклад е базиран Ñамо на браузъри, различни от IE.",
"WidgetPlugins": "Добавки",
"WidgetPluginsDocumentation": "Този отчет показва каква добавка на браузъра Ñа използвали вашите поÑетители. Тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶Ðµ да е важна, за да изберете Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð½Ð¸Ñ Ð½Ð°Ñ‡Ð¸Ð½ за доÑтавÑне на вашето Ñъдържание."
}
diff --git a/plugins/DevicePlugins/lang/ca.json b/plugins/DevicePlugins/lang/ca.json
index c0ae89b0f57bf37da489577d95fb386d9a9e4096..b097c67e18c9aaaf02c0513d37155a26fa1d5a09 100644
--- a/plugins/DevicePlugins/lang/ca.json
+++ b/plugins/DevicePlugins/lang/ca.json
@@ -3,7 +3,6 @@
"BrowserWithNoPluginsEnabled": "%1$s sense connectors activats",
"BrowserWithPluginsEnabled": "%1$s amb els connectors %2$s activats",
"PluginDescription": "Mostra la llista de connectors que suporten els navegadors dels visitants",
- "PluginDetectionDoesNotWorkInIE": "Nota: La detecció de connectors no funciona amb Internet Explorer. L'informe es basa nomes amb navegadors diferents de l'Internet Explorer",
"WidgetPlugins": "Llistat de connectors",
"WidgetPluginsDocumentation": "Aquest informe mostra quins connectors tenen els vostres visitants activades. Aquesta informació pot ser important per determinar la forma correcta de mostrar el contingut."
}
diff --git a/plugins/DevicePlugins/lang/cs.json b/plugins/DevicePlugins/lang/cs.json
index 3854a6916a3522cc8ba75b84495d93b32a2cf057..abc954d6dcacb1aaa5b9d88713363be9d3cc5629 100644
--- a/plugins/DevicePlugins/lang/cs.json
+++ b/plugins/DevicePlugins/lang/cs.json
@@ -3,7 +3,7 @@
"BrowserWithNoPluginsEnabled": "%1$s bez povolených zásuvných modulů",
"BrowserWithPluginsEnabled": "%1$s s povolenými zásuvnými moduly %2$s",
"PluginDescription": "Hlásà podporované zásuvné moduly v prohlÞeÄÃch návÅ¡tÄ›vnÃků.",
- "PluginDetectionDoesNotWorkInIE": "Poznámka: Detekce zásuvných modulů nepracuje v prohlÞeÄi Interet Explorer. Toto hlášenà je založeno pouze na jiných prohlÞeÄÃch",
+ "PluginDetectionDoesNotWorkInIE": "Poznámka: Detekce zásuvných modulů nepracuje v prohlÞeÄi Interet Explorer pÅ™ed verzà 11. Toto hlášenà je založeno na datech z ostatnÃch prohlÞeÄů a novÄ›jÅ¡Ãch verzÃch IE.",
"WidgetPlugins": "Seznam zásuvných modulů",
"WidgetPluginsDocumentation": "Toto hlášenà zobrazuje zásuvné moduly, které mÄ›li vaÅ¡i návÅ¡tÄ›vnÃci povoleny. Tato informace může být důležitá pÅ™i rozhodovánà o tom, jakým způsobem prezentovat obsah."
}
diff --git a/plugins/DevicePlugins/lang/da.json b/plugins/DevicePlugins/lang/da.json
index 0b095678c6d15b273696196dda2c6a9e59c57ce5..0291ba6e2c1ef9ae0cbbb861b0b0471bb68838e0 100644
--- a/plugins/DevicePlugins/lang/da.json
+++ b/plugins/DevicePlugins/lang/da.json
@@ -3,7 +3,6 @@
"BrowserWithNoPluginsEnabled": "%1$s med ingen aktiverede udvidelsesmoduler",
"BrowserWithPluginsEnabled": "%1$s med udvidelsesmoduler %2$s aktiveret",
"PluginDescription": "Viseren liste over udvidelser, der understøttes i besøgendes browsere.",
- "PluginDetectionDoesNotWorkInIE": "Note: Udvidelsesmodul detektering virker ikke i Internet Explorer. Rapport viser kun ikke-IE browsere.",
"WidgetPlugins": "Udvidelsesmoduler",
"WidgetPluginsDocumentation": "Rapporten viser, hvilke browserudvidelser de besøgende havde aktiveret. Oplysningerne kan være vigtigt for at vælge den rigtige måde at levere indholdet på."
}
diff --git a/plugins/DevicePlugins/lang/de.json b/plugins/DevicePlugins/lang/de.json
index 3623dfb6dffc2a6df32486815c4d1f2bed8d475c..944175944743f588d723fed2bba5264dfdc1f5c3 100644
--- a/plugins/DevicePlugins/lang/de.json
+++ b/plugins/DevicePlugins/lang/de.json
@@ -3,7 +3,7 @@
"BrowserWithNoPluginsEnabled": "%1$s mit keinen aktivierten Plugins",
"BrowserWithPluginsEnabled": "%1$s mit den Plugins %2$s aktiviert",
"PluginDescription": "Zeigt die Liste der Plugins an, welche in den Browsern der Benutzer unterstützt werden.",
- "PluginDetectionDoesNotWorkInIE": "Hinweis: Die Erkennung von Plugins funktioniert nicht im Internet Explorer. Diese Statistik beruht nur auf Nicht-IE Browsern.",
+ "PluginDetectionDoesNotWorkInIE": "Hinweis: Die Erkennung von Plugins funktioniert nicht im Internet Explorer vor Version 11. Diese Statistik beruht nur auf Nicht-IE Browsern sowie neueren Version des IE.",
"WidgetPlugins": "Browser-Plugins",
"WidgetPluginsDocumentation": "Dieser Bericht zeigt Ihnen, welche Plugins Ihre Besucher in Ihren Browser aktiviert haben. Diese Informationen kann Ihnen dabei helfen, die beste Art zu finden, Ihre Inhalte auszuliefern."
}
diff --git a/plugins/DevicePlugins/lang/el.json b/plugins/DevicePlugins/lang/el.json
index a9ae56efbabafbb05548e2278eb6e499e1583b7c..21d73c97165bdecedfec8b656ed1477a304620cc 100644
--- a/plugins/DevicePlugins/lang/el.json
+++ b/plugins/DevicePlugins/lang/el.json
@@ -3,7 +3,7 @@
"BrowserWithNoPluginsEnabled": "%1$s με ανενεÏγά Ï€Ïόσθετα",
"BrowserWithPluginsEnabled": "%1$s με %2$s Ï€Ïόσθετα ενεÏγά",
"PluginDescription": "ΑναφÎÏει τη λίστα με τα Ï€Ïόσθετα που υποστηÏίζουν τα Ï€ÏογÏάμματα πλοήγησης των επισκεπτών.",
- "PluginDetectionDoesNotWorkInIE": "Σημείωση: η ανίχνευση Î ÏοσθÎτων δεν λειτουÏγεί στον Internet Explorer. Αυτή η αναφοÏά βασίζεται μόνο σε μη IE φυλλομετÏητÎÏ‚.",
+ "PluginDetectionDoesNotWorkInIE": "Σημείωση: Ο εντοπισμός Ï€ÏοσθÎτων δεν λειτουÏγεί σε Ï€ÏογενÎστεÏη Îκδοση της 11 του Internet Explorer. Η αναφοÏά αυτή βασίζεται μόνο σε Ï€ÏογÏάμματα πλοήγησης που δεν είναι ο IE και σε νεότεÏες εκδόσεις του IE.",
"WidgetPlugins": "Λίστα Ï€ÏοσθÎτων",
"WidgetPluginsDocumentation": "Αυτή η αναφοÏά δείχνει ποια Ï€Ïόσθετα φυλλομετÏητή Îχουν ενεÏγά οι επισκÎπτες σας. Αυτή η πληÏοφοÏία ίσως είναι σημαντική για την επιλογή του πιο ÏƒÏ‰ÏƒÏ„Î¿Ï Ï„Ïόπου απόδοσης του πεÏιεχομÎνου σας."
}
diff --git a/plugins/DevicePlugins/lang/es.json b/plugins/DevicePlugins/lang/es.json
index 657c20aacde3bd222d5c283a7e0a249a1ab1cd57..115de91a27ffc34c8a24fea5b359d1c2a41c94e2 100644
--- a/plugins/DevicePlugins/lang/es.json
+++ b/plugins/DevicePlugins/lang/es.json
@@ -3,7 +3,6 @@
"BrowserWithNoPluginsEnabled": "%1$s sin complementos habilitados",
"BrowserWithPluginsEnabled": "%1$s con los complementos %2$s habilitados",
"PluginDescription": "Informa la lista de complementos que están admitidos en los navegadores de internet de los visitantes.",
- "PluginDetectionDoesNotWorkInIE": "Nota: la detección de complementos no funciona con Internet Explorer. Este reporte solo funciona con navegadores no-IE.",
"WidgetPlugins": "Lista de Complementos",
"WidgetPluginsDocumentation": "Este informe muestra que extensiones del navegador sus visitantes han habilitado. Esta información puede ser importante sea para elegir el método eficiente de enviar su contenido."
}
diff --git a/plugins/DevicePlugins/lang/et.json b/plugins/DevicePlugins/lang/et.json
index b6cd3a837954cff30a500ba1eccfb4152756eef8..9f58c3c208c90c37e30c153ff2d72c1353fd0ed6 100644
--- a/plugins/DevicePlugins/lang/et.json
+++ b/plugins/DevicePlugins/lang/et.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "Märge: Lisatarkvara tuvastamine ei tööta Internet Exploreriga külastajatel. See raport kuvab andmeid mitte-IE veebisirvikute kohta.",
"WidgetPlugins": "Sirviku lisatarkvarad"
}
}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/fa.json b/plugins/DevicePlugins/lang/fa.json
index ea9edd5c4ce504dd1ea3498f3f2df02a3b620775..358132510f3395cb3ce83044006f4efcc59b3cc2 100644
--- a/plugins/DevicePlugins/lang/fa.json
+++ b/plugins/DevicePlugins/lang/fa.json
@@ -1,7 +1,6 @@
{
"DevicePlugins": {
"BrowserWithNoPluginsEnabled": "%1$s با هیچ پلاگین را Ùعال کنید",
- "PluginDetectionDoesNotWorkInIE": "توجه: تشخیص پلاگین در مرورگر اینترنت اکسپلورر کار نمی کند. این گزارش تنها بر روی مرورگرهای غیر اینترنت اکسپلورر است.",
"WidgetPlugins": "لیست اÙزونه ها",
"WidgetPluginsDocumentation": "این گزارش نشان Ù…ÛŒ دهد Ú©Ù‡ پلاگین مرورگر بازدید کننده خود را Ùعال کرده بود. این اطلاعات ممکن است مهم برای انتخاب راه درست برای ارائه Ù…Øتوای خود را."
}
diff --git a/plugins/DevicePlugins/lang/fi.json b/plugins/DevicePlugins/lang/fi.json
index 529fc48f676bc4f61b2c47dc92816e6918fb44f2..8011625ef1a42e32ea635a3f29170e4455833dad 100644
--- a/plugins/DevicePlugins/lang/fi.json
+++ b/plugins/DevicePlugins/lang/fi.json
@@ -2,7 +2,6 @@
"DevicePlugins": {
"BrowserWithNoPluginsEnabled": "%1$s ilman liitännäisiä aktivoitu",
"BrowserWithPluginsEnabled": "%1$s liitännäisillä %2$s on aktivoitu",
- "PluginDetectionDoesNotWorkInIE": "Huom: lisäosien tunnistus ei toimi Internet Explorerissa. Tämä raportti perustuu vain ei-IE-selaimiin.",
"WidgetPlugins": "Lista lisäosista",
"WidgetPluginsDocumentation": "Tämä raportti näyttää, mitä selainlisäosia vierailijoillasi oli käytössä. Tästä tiedosta voi olla hyötyä, kun joudut valitsemaan, miten tietoa esitetään ja välitetään vierailijoille."
}
diff --git a/plugins/DevicePlugins/lang/fr.json b/plugins/DevicePlugins/lang/fr.json
index 31262f7e9d5db6d8c31ecb579b4828cea6fb2f4d..1faa74e338539415c3edcbc618178258fd8bdc43 100644
--- a/plugins/DevicePlugins/lang/fr.json
+++ b/plugins/DevicePlugins/lang/fr.json
@@ -3,7 +3,6 @@
"BrowserWithNoPluginsEnabled": "%1$s avec aucun plugin activé",
"BrowserWithPluginsEnabled": "%1$s avec les plugins %2$s activés",
"PluginDescription": "Rapporte la liste des composants supportés par les navigateurs des visiteurs.",
- "PluginDetectionDoesNotWorkInIE": "Note : La détection des plugins ne fonctionne pas avec Internet Explorer. Ce rapport est basé sur les autres navigateurs.",
"WidgetPlugins": "Liste de Plugins",
"WidgetPluginsDocumentation": "Ce rapport montre quels plugins du navigateur vos visiteurs ont activés. Cette information peut être importante pour choisir le bon moyen de délivrer le contenu."
}
diff --git a/plugins/DevicePlugins/lang/hi.json b/plugins/DevicePlugins/lang/hi.json
index d9d586601a46b4a81d1ce6c5c30673a7090f198d..b5c036438e27d31b8a14f92541d0375481235e7e 100644
--- a/plugins/DevicePlugins/lang/hi.json
+++ b/plugins/DevicePlugins/lang/hi.json
@@ -3,7 +3,6 @@
"BrowserWithNoPluginsEnabled": "%1$s के साथ पà¥à¤²à¤—इन सकà¥à¤°à¤¿à¤¯ नहीं",
"BrowserWithPluginsEnabled": "पà¥à¤²à¤—िन %2$s से %1$s सकà¥à¤·à¤®",
"PluginDescription": "आगंतà¥à¤•à¥‹à¤‚ बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤°à¥‹à¤‚ में समरà¥à¤¥à¤¨ कर रहे हैं कि पà¥à¤²à¤— इन की सूची रिपोरà¥à¤Ÿà¥‡à¤‚।",
- "PluginDetectionDoesNotWorkInIE": "नोट: पà¥à¤²à¤—इनà¥à¤¸ का पता लगाने इंटरनेट à¤à¤•à¥à¤¸à¤ªà¥à¤²à¥‹à¤°à¤° में काम नहीं करता है. यह रिपोरà¥à¤Ÿ केवल गैर आईई बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤°à¥‹à¤‚ पर आधारित है.",
"WidgetPlugins": "बà¥à¤°à¤¾à¤‰à¤œà¤¼à¤° पà¥à¤²à¤—इनà¥à¤¸"
}
}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/hu.json b/plugins/DevicePlugins/lang/hu.json
index e68a307f112fae224897b790ece4707bf3580619..fb8acbcfc6422190bc689a8b2b93ac891a429d8a 100644
--- a/plugins/DevicePlugins/lang/hu.json
+++ b/plugins/DevicePlugins/lang/hu.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "A böngészÅ‘k bÅ‘vÃtményeinek detektálása nem működik az Internet Exlporernél, Ãgy ez a jelentés csak a nem Internet Explorert használó látogatók adatait jelenÃti meg.",
"WidgetPlugins": "BÅ‘vÃtmények listája"
}
}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/id.json b/plugins/DevicePlugins/lang/id.json
index 4aad881c581822f3d0630dc4ce8e195dd02d87f9..d84a9026710e55040b27c03961ad538d28d94f2e 100644
--- a/plugins/DevicePlugins/lang/id.json
+++ b/plugins/DevicePlugins/lang/id.json
@@ -2,7 +2,6 @@
"DevicePlugins": {
"BrowserWithNoPluginsEnabled": "%1$s dengan tanpa pengaya diaktifkan",
"BrowserWithPluginsEnabled": "%1$s dengan %2$s pengaya diaktifkan",
- "PluginDetectionDoesNotWorkInIE": "Catatan: Pendeteksian pengaya tidak bekerja di Internet Explorer. Laporan ini hanya berdasarkan pada peramban bukan-IE.",
"WidgetPlugins": "Daftar Pengaya",
"WidgetPluginsDocumentation": "Laporan ini menunjukkan pengaya peramban yang diaktifkan oleh pengunjung. Informasi yang tersedia kemungkinan penting untuk memilih cara terbaik untuk menyampaikan konten Anda."
}
diff --git a/plugins/DevicePlugins/lang/it.json b/plugins/DevicePlugins/lang/it.json
index 6cc5b75c2717dcb955f72e64700d3d5047ba871e..d4cd19ae4a88947349c1ab49fa3453daaca112b1 100644
--- a/plugins/DevicePlugins/lang/it.json
+++ b/plugins/DevicePlugins/lang/it.json
@@ -3,7 +3,7 @@
"BrowserWithNoPluginsEnabled": "%1$s con nessun plugin abilitato",
"BrowserWithPluginsEnabled": "%1$s con plugin %2$s abilitati",
"PluginDescription": "Restituisce l'elenco dei plugin supportati dal browser dei visitatori.",
- "PluginDetectionDoesNotWorkInIE": "N.B.: Questo plugin non funziona su Internet Explorer. Questo report è basato solamente sugli utenti di altri browser.",
+ "PluginDetectionDoesNotWorkInIE": "Nota: L'individuazione dei plugin non funziona con versioni di Internet Explorer precedenti alla 11. Questo report è basato solamente su browser diversi da IE e con versioni recenti di IE.",
"WidgetPlugins": "Plugin Browser",
"WidgetPluginsDocumentation": "Questo report mostra quali plugin del browser i visitatori avevano abilitato. Questa informazione potrebbe essere importante per la scelta del giusto modo di inviare i tuoi contenuti."
}
diff --git a/plugins/DevicePlugins/lang/ja.json b/plugins/DevicePlugins/lang/ja.json
index 2f3623a5e0078ae4c0b28821386b807779ca8161..20dd03c4ecaa5ca072d98fcc730316293b03a3ed 100644
--- a/plugins/DevicePlugins/lang/ja.json
+++ b/plugins/DevicePlugins/lang/ja.json
@@ -3,7 +3,6 @@
"BrowserWithNoPluginsEnabled": "%1$s ã®ãƒ—ラグインãŒæœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“",
"BrowserWithPluginsEnabled": "%1$s ã®ãƒ—ラグイン %2$s ã¯æœ‰åŠ¹",
"PluginDescription": "ビジターã®ãƒ–ラウザã§ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„るプラグインã®ä¸€è¦§ã‚’å ±å‘Šã—ã¾ã™ã€‚",
- "PluginDetectionDoesNotWorkInIE": "注æ„： Internet Explorer ã§ã¯ãƒ—ラグインã®æ¤œå‡ºãŒå‹•ä½œã—ã¾ã›ã‚“。 ã“ã®ãƒªãƒãƒ¼ãƒˆã¯ã€éž IE ブラウザã®ã¿ã«åŸºã¥ãã¾ã™ã€‚",
"WidgetPlugins": "プラグイン一覧",
"WidgetPluginsDocumentation": "ビジターãŒåˆ©ç”¨ã—ã¦ã„るブラウザã®ãƒ—ラグインã«ã¤ã„ã¦ã®ãƒªãƒãƒ¼ãƒˆã§ã™ã€‚コンテンツã®æœ€é©ãªè¡¨ç¤ºæ–¹æ³•ã‚’é¸æŠžã™ã‚‹ãŸã‚ã«é‡è¦ãªæƒ…å ±ã§ã™ã€‚"
}
diff --git a/plugins/DevicePlugins/lang/ko.json b/plugins/DevicePlugins/lang/ko.json
index 35c64c31877c0b939d69cf5d359f73a58c5029e6..84dfe3cec5adf8cf51cf11903e2d4e52a76fe4a5 100644
--- a/plugins/DevicePlugins/lang/ko.json
+++ b/plugins/DevicePlugins/lang/ko.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "ì°¸ê³ : Internet Explorerì—서는 í”ŒëŸ¬ê·¸ì¸ ê²€ìƒ‰ì´ ìž‘ë™í•˜ì§€ 않습니다. ì´ ë³´ê³ ì„œëŠ” IE 브ë¼ìš°ì €ê°€ ì•„ë‹Œê²ƒì— ê¸°ë°˜í•©ë‹ˆë‹¤.",
"WidgetPlugins": "í”ŒëŸ¬ê·¸ì¸ ëª©ë¡",
"WidgetPluginsDocumentation": "방문ìžê°€ 사용하는 브ë¼ìš°ì €ì˜ 플러그ì¸ì— 대한 ë³´ê³ ì„œìž…ë‹ˆë‹¤. 컨í…ì¸ ì— ëŒ€í•œ 최ì ì˜ í‘œì‹œ ë°©ë²•ì„ ì„ íƒí•˜ëŠ” ë° ì¤‘ìš”í•œ ì •ë³´ìž…ë‹ˆë‹¤."
}
diff --git a/plugins/DevicePlugins/lang/lt.json b/plugins/DevicePlugins/lang/lt.json
index 3a239c80ac078ac03103bf04b7c7b5efd3cb98bd..d7327339b35d7baae04ec25ec5227e531f6e11d0 100644
--- a/plugins/DevicePlugins/lang/lt.json
+++ b/plugins/DevicePlugins/lang/lt.json
@@ -1,7 +1,6 @@
{
"DevicePlugins": {
"PluginDescription": "Praneša lankytojų naršyklėse palaikomų papildinių sąrašą.",
- "PluginDetectionDoesNotWorkInIE": "Pastaba: papildinio aptikimas neveikia Internet Explorer naršyklėje. Ši ataskaita bus sugeneruota tik kitose naršyklėse.",
"WidgetPlugins": "Papildinių sąrašas",
"WidgetPluginsDocumentation": "Ši ataskaita parodo kuriuos naršyklės papildinius jūsų lankytojai buvo įjungę. Ši informacija gali būti svarbi, pasirenkant teisingą savo turinio pristatymo būdą."
}
diff --git a/plugins/DevicePlugins/lang/lv.json b/plugins/DevicePlugins/lang/lv.json
index c09ee9a33fd7808e385aacd31f141a1c2b0b8b8e..0a398150207ef1b2ee9f9892c8df4a1b074170f2 100644
--- a/plugins/DevicePlugins/lang/lv.json
+++ b/plugins/DevicePlugins/lang/lv.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "PiezÄ«me: spraudņu noteikÅ¡ana nedarbojas Internet Explorer pÄrlÅ«kÄ. Å Ä« atskaite ir bÄzÄ“ta tikai uz ne-IE pÄrlÅ«kiem.",
"WidgetPlugins": "Spraudņu saraksts",
"WidgetPluginsDocumentation": "Å ajÄ atskaitÄ“ ir redzami pÄrlÅ«ku spraudņi, kuri bija ieslÄ“gti apmeklÄ“tÄju pÄrlÅ«kos. Å Ä« informÄcija ir svarÄ«ga, lai izvÄ“lÄ“tos vislabÄko veidu kÄ piegÄdÄt saturu apmeklÄ“tÄjiem."
}
diff --git a/plugins/DevicePlugins/lang/nb.json b/plugins/DevicePlugins/lang/nb.json
index efddb7fda561163b14c01722136813a49e25c4f6..4a383adae4862bdc170755ed5f3c8b296034744f 100644
--- a/plugins/DevicePlugins/lang/nb.json
+++ b/plugins/DevicePlugins/lang/nb.json
@@ -3,7 +3,7 @@
"BrowserWithNoPluginsEnabled": "%1$s uten noen aktiverte utvidelser",
"BrowserWithPluginsEnabled": "%1$s med utvidelsene %2$s aktivert",
"PluginDescription": "Rapporter med lister av utvidelser som er støttet i besøkeres nettlesere.",
- "PluginDetectionDoesNotWorkInIE": "Merk: Utvidelsesdeteksjon fungerer ikke i Internet Explorer. Denne rapporten er kun basert på ikke-IE-nettlesere.",
+ "PluginDetectionDoesNotWorkInIE": "Merk. Utvidelsesgjenkjenning fungerer ikke i Internet Explorer før versjon 11. Denne rapporten baserer seg kun på ikke-IE-nettlesere og nyere versjoner av IE.",
"WidgetPlugins": "Liste over utvidelser",
"WidgetPluginsDocumentation": "Denne rapporten viser hvilke utvidelser som dine besøkere har aktivert. Denne informasjonen kan være nyttig for velge riktig måte å presentere ditt innhold."
}
diff --git a/plugins/DevicePlugins/lang/nl.json b/plugins/DevicePlugins/lang/nl.json
index 00fbe08ab7b6d61de7c7f0d2125a6fd4cc3a75b7..3fa489c81359969be5f50a4f6a353295247855a8 100644
--- a/plugins/DevicePlugins/lang/nl.json
+++ b/plugins/DevicePlugins/lang/nl.json
@@ -3,7 +3,6 @@
"BrowserWithNoPluginsEnabled": "%1$s zonder plugins ingeschakeld",
"BrowserWithPluginsEnabled": "%1$s met plugins %2$s ingeschakeld",
"PluginDescription": "Toont de lijst met plugins die ondersteund worden door de browsers van bezoekers.",
- "PluginDetectionDoesNotWorkInIE": "Opmerking: plugin detectie werkt niet in Internet Explorer. Het rapport is alleen gebaseerd op andere browsers dan IE",
"WidgetPlugins": "Geïnstalleerde plugins",
"WidgetPluginsDocumentation": "Dit rapport laat zien welke browserplugins uw bezoekers haden geïnstalleerd. Deze informatie kan van belang zijn voor het kiezen van de juiste manier om uw content aan te bieden."
}
diff --git a/plugins/DevicePlugins/lang/nn.json b/plugins/DevicePlugins/lang/nn.json
index 29ffb15b3fcd61fae4bd61e4eeee7d4930863734..d63c975d5f305f9b2abeb3a3853edad6b52e68f4 100644
--- a/plugins/DevicePlugins/lang/nn.json
+++ b/plugins/DevicePlugins/lang/nn.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "Merk: Registrering av innstikk virkar ikkje i Internet Explorer. Denne rapporten er berre basert på andre nettlesarar enn IE.",
"WidgetPlugins": "Liste over innstikk"
}
}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/pl.json b/plugins/DevicePlugins/lang/pl.json
index 1efe58f73b764fe072f3aaa0dfc1faf95bfda9ec..4eba8d69096e1db79cc4edc4e7ff62d30122e257 100644
--- a/plugins/DevicePlugins/lang/pl.json
+++ b/plugins/DevicePlugins/lang/pl.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "Uwaga: wykrywanie wtyczek nie działa w przypadku Internet Explorera. Raport ten pokaże tylko wyniki w oparciu o badanie innych przeglądarek, nie opartych na silniku IE.",
"WidgetPlugins": "Lista wtyczek"
}
}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/pt-br.json b/plugins/DevicePlugins/lang/pt-br.json
index 7e813b2ea802b29c346edd31f095104fc47b729f..7268b700a5b75eb239cd83192e61744c3d720b94 100644
--- a/plugins/DevicePlugins/lang/pt-br.json
+++ b/plugins/DevicePlugins/lang/pt-br.json
@@ -3,7 +3,7 @@
"BrowserWithNoPluginsEnabled": "%1$s sem plugins ativados",
"BrowserWithPluginsEnabled": "%1$s com os plugins %2$s ativados",
"PluginDescription": "Informa a lista de plugins que são suportados nos navegadores dos Visitantes.",
- "PluginDetectionDoesNotWorkInIE": "Nota: a detecção de plugins não funciona no Internet Explorer. Esse relatório é baseado apenas em navegadores não IE.",
+ "PluginDetectionDoesNotWorkInIE": "Nota: A detecção de plugins não funciona no Internet Explorer anterior ao 11. Este relatório se baseia apenas em navegadores não-IE e versões mais recentes do IE.",
"WidgetPlugins": "Lista de Plugins",
"WidgetPluginsDocumentation": "Este relatório mostra quais plugins de navegador seus visitantes tinham ativado. Esta informação pode ser importante para escolher o caminho certo para levar o seu conteúdo."
}
diff --git a/plugins/DevicePlugins/lang/pt.json b/plugins/DevicePlugins/lang/pt.json
index 9c6ee983ae3a6301b1047ea910d7bca4a55f9f81..187807a0f1bd774b0426f128c946e11e7dd3d1e2 100644
--- a/plugins/DevicePlugins/lang/pt.json
+++ b/plugins/DevicePlugins/lang/pt.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "Nota: Detecção de plugins não funciona no Internet Explorer. Este relatório só se baseia em navegadores não-IE.",
"WidgetPlugins": "Lista de Plugins",
"WidgetPluginsDocumentation": "Este relatório mostra quais os plugin que o navegador dos seus visitantes tinham. Esta informação pode ser importante para a escolha do caminho certo para distribuir o seu conteúdo."
}
diff --git a/plugins/DevicePlugins/lang/ro.json b/plugins/DevicePlugins/lang/ro.json
index d8c8b21387fa80fc7ae85bd56cc9d9c2c9bd93d6..3239749de940b9c3addf19364f390b908e85eb71 100644
--- a/plugins/DevicePlugins/lang/ro.json
+++ b/plugins/DevicePlugins/lang/ro.json
@@ -2,7 +2,6 @@
"DevicePlugins": {
"BrowserWithNoPluginsEnabled": "%1$s fără plugin-uri activate",
"BrowserWithPluginsEnabled": "%1$s cu plugin-uri %2$s activate",
- "PluginDetectionDoesNotWorkInIE": "Notă: de detectare a plugin-uri nu funcționează în Internet Explorer. Acest raport se bazează doar pe browsere non-IE.",
"WidgetPlugins": "Lista pluginurilor",
"WidgetPluginsDocumentation": "Acest raport arată ce plugin-uri de browser-ul au activat vizitatorii. Aceste informație ar putea fi importanta pentru a alege modul corect de a livra conținut."
}
diff --git a/plugins/DevicePlugins/lang/ru.json b/plugins/DevicePlugins/lang/ru.json
index 9b13987951ff9197df8eaa89d0c605ff040ae885..b1ae42931307ef7ea7065a2f0b817c5ef9f4d8bd 100644
--- a/plugins/DevicePlugins/lang/ru.json
+++ b/plugins/DevicePlugins/lang/ru.json
@@ -2,7 +2,6 @@
"DevicePlugins": {
"BrowserWithNoPluginsEnabled": "%1$s без активированных плагинов",
"PluginDescription": "Сообщает ÑпиÑок плагинов, доÑтупных в браузерах поÑетителей.",
- "PluginDetectionDoesNotWorkInIE": "Учтите: Определение плагинов не работает в Internet Explorer. Ðтот отчет Ñодержит информацию о не-IE браузерах.",
"WidgetPlugins": "СпиÑок плагинов",
"WidgetPluginsDocumentation": "Ðтот отчет показываетÑÑ ÐºÐ°ÐºÐ¸Ðµ плагины поÑетители иÑпользуют в Ñвоих браузерах. Ðта Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть важна Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы поÑетители Ñмогли видеть ваш контент должным образом."
}
diff --git a/plugins/DevicePlugins/lang/sk.json b/plugins/DevicePlugins/lang/sk.json
index 8ef5c5a6931b51ede9cebc1e27f0717a497d6dc5..842b3ce1b3a0f4fb67004017f6145839c00141d8 100644
--- a/plugins/DevicePlugins/lang/sk.json
+++ b/plugins/DevicePlugins/lang/sk.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "Poznámka: Plugin detekcia nefunguje v Internet Exploreri. Táto správa je založená len na non-IE prehliadaÄov.",
"WidgetPlugins": "Zoznam modulov"
}
}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/sq.json b/plugins/DevicePlugins/lang/sq.json
index 1c9ca0ebad022728b4a46aa926a897d2813b2f4d..7550b4b423d1aad6d52b59f232ff3779a96dcee7 100644
--- a/plugins/DevicePlugins/lang/sq.json
+++ b/plugins/DevicePlugins/lang/sq.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "Shënim: Zbulimi i shtojcave nuk funksionon nën Internet Explorer. Ky raport mund të kihet vetëm nën shfletuesa jo-IE.",
"WidgetPlugins": "Listë e Shtojcave",
"WidgetPluginsDocumentation": "Ky raport tregon se cilat shtojca shfletuesi kanë të aktivizuara vizitorët tuaj. Ky informacion mund të jetë i vlefshëm për zgjedhjen e mënyrës më të përshtatshme për ofrimin e lëndës suaj."
}
diff --git a/plugins/DevicePlugins/lang/sr.json b/plugins/DevicePlugins/lang/sr.json
index 4e86c9f826af7350ca0b1e5bbe14db5158e96578..bcb380332336f457770c3cd3f0c09ce6e726c270 100644
--- a/plugins/DevicePlugins/lang/sr.json
+++ b/plugins/DevicePlugins/lang/sr.json
@@ -3,7 +3,6 @@
"BrowserWithNoPluginsEnabled": "%1$s sa iskljuÄenim dodacima",
"BrowserWithPluginsEnabled": "%1$s sa ukljuÄenim dodacima %2$s",
"PluginDescription": "Prikazuje spisak dodataka koji su podržani u brauzerima posetilaca.",
- "PluginDetectionDoesNotWorkInIE": "Pažnja: detekcija dodataka ne radi kod Internet Explorera. Ovaj izveštaj se odnosi samo na brauzere koji nisu Internet Exlorer",
"WidgetPlugins": "Lista dodataka",
"WidgetPluginsDocumentation": "Ovaj izveÅ¡taj prikazuje koje dodatke za brauzere vaÅ¡i posetioci imaju ukljuÄene. Ova informacija može biti od znaÄaja prilikom odabira pravog naÄina prikaza sadržaja na vaÅ¡em sajtu."
}
diff --git a/plugins/DevicePlugins/lang/sv.json b/plugins/DevicePlugins/lang/sv.json
index 4a1fa27e9997851e91542ec5e5ed6c2d127f6a59..b5b98eced940c64d3ea6108dfaac4e03d9b1b417 100644
--- a/plugins/DevicePlugins/lang/sv.json
+++ b/plugins/DevicePlugins/lang/sv.json
@@ -3,7 +3,6 @@
"BrowserWithNoPluginsEnabled": "%1$s med inga plugins är aktiverad",
"BrowserWithPluginsEnabled": "%1$s med plugins %2$s är aktiverad",
"PluginDescription": "Visar en lista av plugins som stöds i besökarnas webbläsare.",
- "PluginDetectionDoesNotWorkInIE": "Notering: Plugins upptäckt fungerar inte i Internet Explorer. Denna rapport är endast baserad på icke-IE webbläsare.",
"WidgetPlugins": "Lista över plugins",
"WidgetPluginsDocumentation": "Denna rapport visar vilka plugins i webbläsaren som besökarna hade aktiverat. Denna information kan vara viktig för att välja rätt sätt att leverera ditt innehåll."
}
diff --git a/plugins/DevicePlugins/lang/th.json b/plugins/DevicePlugins/lang/th.json
index 664c466eb320721bd2651d8b6dee1be2c3ffb4e6..7fede0c31bf7dbbed42c540d786fe10bed43e354 100644
--- a/plugins/DevicePlugins/lang/th.json
+++ b/plugins/DevicePlugins/lang/th.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "หมายเหตุ: ตรวจสà¸à¸šà¸›à¸¥à¸±à¹Šà¸à¸à¸´à¸™à¹„ม่ทำงานใน Internet Explorer รายงานนี้จะà¸à¸´à¸‡à¸•à¸²à¸¡à¹€à¸‰à¸žà¸²à¸°à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œà¸—ี่ไม่ใช่ IE",
"WidgetPlugins": "รายà¸à¸²à¸£à¸›à¸¥à¸±à¹‰à¸à¸à¸´à¸™"
}
}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/tl.json b/plugins/DevicePlugins/lang/tl.json
index c0ce59acc15f2e809abc484b6a4632dd155a7bdb..2e8675dfc04ba54d39df73ab530413a87203ce51 100644
--- a/plugins/DevicePlugins/lang/tl.json
+++ b/plugins/DevicePlugins/lang/tl.json
@@ -2,7 +2,6 @@
"DevicePlugins": {
"BrowserWithNoPluginsEnabled": "%1$s na may plugins na hindi pinapagana",
"BrowserWithPluginsEnabled": "%1$s na may mga plugin %2$s na naka-enable",
- "PluginDetectionDoesNotWorkInIE": "Tandaan: Ang pagtingin ng Plugin ay hindi gumagana sa Internet Explorer. Ang ulat na ito ay batay lamang sa mga browser na hindi-IE.",
"WidgetPlugins": "Browser Plugins",
"WidgetPluginsDocumentation": "Ang ulat na ito ay ipinapakita kung anong browser plugis ang gumagana sa iyong bisita. Ang impormasyon na ito may maaring mahalaga sa pagpili kung paanu ihahatid ang nilalaman nito."
}
diff --git a/plugins/DevicePlugins/lang/tr.json b/plugins/DevicePlugins/lang/tr.json
index 94ce8e428eb80515af3d3e038e4c1b4e1f1ee1fc..9a4de058ba63e9dfe2cd01c95873c6301949e35d 100644
--- a/plugins/DevicePlugins/lang/tr.json
+++ b/plugins/DevicePlugins/lang/tr.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "Not: Hedeflenen eklenti Internet Explorer çalışmamaktadir. Bu not\/rapor sadece IE içindir.",
"WidgetPlugins": "Eklenti Listesi"
}
}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/uk.json b/plugins/DevicePlugins/lang/uk.json
index 142c1f2e63c0bd87e1c600d19772e8347c88c0ec..1f2acce1e5ac065cafdbd7b81552ebc66e1e4347 100644
--- a/plugins/DevicePlugins/lang/uk.json
+++ b/plugins/DevicePlugins/lang/uk.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "Примітка: Ð’Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð»Ð°Ð³Ñ–Ð½Ñ–Ð² не працює в Internet Explorer. Цей звіт базуєтьÑÑ Ð»Ð¸ÑˆÐµ на не-IE веб-оглÑдачах.",
"WidgetPlugins": "СпиÑок плагінів"
}
}
\ No newline at end of file
diff --git a/plugins/DevicePlugins/lang/vi.json b/plugins/DevicePlugins/lang/vi.json
index 03098daac0816cf71aa1c60cf08cd241d003c3ac..f10a11300539eaad9754b45290f8667ced8ed5d6 100644
--- a/plugins/DevicePlugins/lang/vi.json
+++ b/plugins/DevicePlugins/lang/vi.json
@@ -2,7 +2,6 @@
"DevicePlugins": {
"BrowserWithNoPluginsEnabled": "%1$s không có plugin nà o được kÃch hoạt",
"BrowserWithPluginsEnabled": "%1$s vá»›i plugin %2$s đã kÃch hoạt",
- "PluginDetectionDoesNotWorkInIE": "Chú ý: Các Plugin phát hiện không là m việc trên Internet Explorer. Báo cáo nà y chỉ dựa trên trình duyệt không phải IE.",
"WidgetPlugins": "Các Plugin trình duyệt",
"WidgetPluginsDocumentation": "Báo cáo nà y cho thấy các plugin trình duyệt mà khách truy cáºp của bạn đã kÃch hoạt. Thông tin nà y có thể là quan trá»ng cho việc lá»±a chá»n cách đúng để cung cấp ná»™i dung của bạn."
}
diff --git a/plugins/DevicePlugins/lang/zh-cn.json b/plugins/DevicePlugins/lang/zh-cn.json
index 94e33f24690a03d3e54b55c15889514475a195a3..8d5c0a323447bbce4464d59302b6b64be5b8eeb8 100644
--- a/plugins/DevicePlugins/lang/zh-cn.json
+++ b/plugins/DevicePlugins/lang/zh-cn.json
@@ -2,7 +2,6 @@
"DevicePlugins": {
"BrowserWithNoPluginsEnabled": "%1$s 没有å¯ç”¨æ’件",
"BrowserWithPluginsEnabled": "%1$s å¯ç”¨æ’件%2$s",
- "PluginDetectionDoesNotWorkInIE": "注æ„: æ’ä»¶æ£€æŸ¥æ— æ³•åœ¨ Internet Explorer 上è¿è¡Œã€‚这个报表仅æä¾›éž IE æµè§ˆå™¨ã€‚",
"WidgetPlugins": "æµè§ˆå™¨æ’件清å•",
"WidgetPluginsDocumentation": "本报表显示访客使用的æµè§ˆå™¨æ’件，这å¯èƒ½å¯¹å¦‚何å‘布您的内容很é‡è¦ã€‚"
}
diff --git a/plugins/DevicePlugins/lang/zh-tw.json b/plugins/DevicePlugins/lang/zh-tw.json
index 3525eebf4795c821acb28762f6d0d0a83acf96c8..cf32c00f5859b17e084b424f3a8f23a5e6225bcf 100644
--- a/plugins/DevicePlugins/lang/zh-tw.json
+++ b/plugins/DevicePlugins/lang/zh-tw.json
@@ -1,6 +1,5 @@
{
"DevicePlugins": {
- "PluginDetectionDoesNotWorkInIE": "注æ„：外掛åµæ¸¬ç„¡æ³•åœ¨ Internet Explorer 上é‹ä½œã€‚é€™å€‹å ±å‘Šåƒ…æä¾›éž IE ç€è¦½å™¨ã€‚",
"WidgetPlugins": "ç€è¦½å™¨å¤–掛清單"
}
}
\ No newline at end of file
diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php
index b6e484f9242a19ea8c8cd2dcd37bfa27c6f74ec1..69b3f80cdbdf0f38c4a6949e51b211ddb844bd02 100644
--- a/plugins/DevicesDetection/API.php
+++ b/plugins/DevicesDetection/API.php
@@ -96,6 +96,7 @@ class API extends \Piwik\Plugin\API
$dataTable = $this->getDataTable('DevicesDetection_brands', $idSite, $period, $date, $segment);
$dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getDeviceBrandLabel'));
$dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrandLogo'));
+ $dataTable->filter('AddSegmentByLabel', array('deviceBrand'));
return $dataTable;
}
diff --git a/plugins/DevicesDetection/Columns/DeviceBrand.php b/plugins/DevicesDetection/Columns/DeviceBrand.php
index d5b06617ece457693f49ece14d2020567bedb610..f21d1ed15ee989a70ec6f0ec139d36894f4f2de5 100644
--- a/plugins/DevicesDetection/Columns/DeviceBrand.php
+++ b/plugins/DevicesDetection/Columns/DeviceBrand.php
@@ -8,7 +8,9 @@
*/
namespace Piwik\Plugins\DevicesDetection\Columns;
+use DeviceDetector\Parser\Device\DeviceParserAbstract;
use Piwik\Piwik;
+use Piwik\Plugins\DevicesDetection\Segment;
use Piwik\Tracker\Request;
use Piwik\Tracker\Visitor;
use Piwik\Tracker\Action;
@@ -23,6 +25,28 @@ class DeviceBrand extends Base
return Piwik::translate('DevicesDetection_DeviceBrand');
}
+ protected function configureSegments()
+ {
+ $brands = DeviceParserAbstract::$deviceBrands;
+ $brandList = implode(", ", $brands);
+
+ $segment = new Segment();
+ $segment->setSegment('deviceBrand');
+ $segment->setName('DevicesDetection_DeviceBrand');
+ $segment->setAcceptedValues($brandList);
+ $segment->setSqlFilter(function ($brand) use ($brandList, $brands) {
+ if ($brand == Piwik::translate('General_Unknown')) {
+ return '';
+ }
+ $index = array_search(trim(urldecode($brand)), $brands);
+ if ($index === false) {
+ throw new \Exception("deviceBrand segment must be one of: $brandList");
+ }
+ return $index;
+ });
+ $this->addSegment($segment);
+ }
+
/**
* @param Request $request
* @param Visitor $visitor
diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php
index 2142c90487684a2734cc24d39c9e96e2e460e822..0feafaebcae4d30791db5a0eceb8275346f8d5cf 100644
--- a/plugins/DevicesDetection/functions.php
+++ b/plugins/DevicesDetection/functions.php
@@ -127,7 +127,7 @@ function getDeviceTypeLabel($label)
'desktop' => 'General_Desktop',
'smartphone' => 'DevicesDetection_Smartphone',
'tablet' => 'DevicesDetection_Tablet',
- 'phablet' => 'DevicesDetection_Phablet',
+ 'phablet' => 'DevicesDetection_Phablet',
'feature phone' => 'DevicesDetection_FeaturePhone',
'console' => 'DevicesDetection_Console',
'tv' => 'DevicesDetection_TV',
diff --git a/plugins/DevicesDetection/lang/lt.json b/plugins/DevicesDetection/lang/lt.json
index 26e803b3cd2eb1d6645473cb7aa28c1ae518b43b..7670af68478bb6f2fcb10374cef3b2857a05fd0b 100644
--- a/plugins/DevicesDetection/lang/lt.json
+++ b/plugins/DevicesDetection/lang/lt.json
@@ -1,6 +1,7 @@
{
"DevicesDetection": {
"BrowserEngine": "Naršyklė",
+ "BrowserEngines": "Naršyklių moduliai",
"BrowserFamily": "Naršyklių šeimos",
"Browsers": "Naršyklės",
"BrowserVersion": "Naršyklės versija",
diff --git a/plugins/Diagnostics/ConfigReader.php b/plugins/Diagnostics/ConfigReader.php
new file mode 100644
index 0000000000000000000000000000000000000000..22f95fc6eb5c75709b969be47c5c659c0a44a755
--- /dev/null
+++ b/plugins/Diagnostics/ConfigReader.php
@@ -0,0 +1,193 @@
+<?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\Diagnostics;
+
+use Piwik\Development;
+use Piwik\Ini\IniReader;
+use Piwik\Application\Kernel\GlobalSettingsProvider;
+use Piwik\Settings as PiwikSettings;
+use Piwik\Plugin\Settings as PluginSettings;
+
+/**
+ * A diagnostic report contains all the results of all the diagnostics.
+ */
+class ConfigReader
+{
+ /**
+ * @var GlobalSettingsProvider
+ */
+ private $settings;
+
+ /**
+ * @var IniReader
+ */
+ private $iniReader;
+
+ public function __construct(GlobalSettingsProvider $settings, IniReader $iniReader)
+ {
+ $this->settings = $settings;
+ $this->iniReader = $iniReader;
+ }
+
+ public function getConfigValuesFromFiles()
+ {
+ $ini = $this->settings->getIniFileChain();
+ $descriptions = $this->iniReader->readComments($this->settings->getPathGlobal());
+
+ $copy = array();
+ foreach ($ini->getAll() as $category => $values) {
+ if ($this->shouldSkipCategory($category)) {
+ continue;
+ }
+
+ $local = $this->getFromLocalConfig($category);
+ if (empty($local)) {
+ $local = array();
+ }
+
+ $global = $this->getFromGlobalConfig($category);
+ if (empty($global)) {
+ $global = array();
+ }
+
+ $copy[$category] = array();
+ foreach ($values as $key => $value) {
+
+ $newValue = $value;
+ if ($this->isKeyAPassword($key)) {
+ $newValue = $this->getMaskedPassword();
+ }
+
+ $defaultValue = null;
+ if (array_key_exists($key, $global)) {
+ $defaultValue = $global[$key];
+ }
+
+ $description = '';
+ if (!empty($descriptions[$category][$key])) {
+ $description = trim($descriptions[$category][$key]);
+ }
+
+ $copy[$category][$key] = array(
+ 'value' => $newValue,
+ 'description' => $description,
+ 'isCustomValue' => array_key_exists($key, $local),
+ 'defaultValue' => $defaultValue,
+ );
+ }
+ }
+
+ return $copy;
+ }
+
+ private function shouldSkipCategory($category)
+ {
+ $category = strtolower($category);
+ if ($category === 'database') {
+ return true;
+ }
+
+ $developmentOnlySections = array('database_tests', 'tests', 'debugtests');
+
+ return !Development::isEnabled() && in_array($category, $developmentOnlySections);
+ }
+
+ public function getFromGlobalConfig($name)
+ {
+ return $this->settings->getIniFileChain()->getFrom($this->settings->getPathGlobal(), $name);
+ }
+
+ public function getFromLocalConfig($name)
+ {
+ return $this->settings->getIniFileChain()->getFrom($this->settings->getPathLocal(), $name);
+ }
+
+ private function getMaskedPassword()
+ {
+ return '******';
+ }
+
+ private function isKeyAPassword($key)
+ {
+ $key = strtolower($key);
+ $passwordFields = array(
+ 'password', 'secret', 'apikey', 'privatekey', 'admin_pass'
+ );
+ foreach ($passwordFields as $value) {
+ if (strpos($key, $value) !== false) {
+ return true;
+ }
+ }
+
+ if ($key === 'salt') {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Adds config values that can be used to overwrite a plugin system setting and adds a description + default value
+ * for already existing configured config values that overwrite a plugin system setting.
+ *
+ * @param array $configValues
+ * @param \Piwik\Plugin\Settings[] $pluginSettings
+ * @return array
+ */
+ public function addConfigValuesFromPluginSettings($configValues, $pluginSettings)
+ {
+ foreach ($pluginSettings as $pluginSetting) {
+ $pluginName = $pluginSetting->getPluginName();
+
+ if (empty($pluginName)) {
+ continue;
+ }
+
+ $configs[$pluginName] = array();
+
+ foreach ($pluginSetting->getSettings() as $setting) {
+ if ($setting instanceof PiwikSettings\SystemSetting && $setting->isReadableByCurrentUser()) {
+ $name = $setting->getName();
+
+ $description = '';
+ if (!empty($setting->description)) {
+ $description .= $setting->description . ' ';
+ }
+
+ if (!empty($setting->inlineHelp)) {
+ $description .= $setting->inlineHelp;
+ }
+
+ if (isset($configValues[$pluginName][$name])) {
+ $configValues[$pluginName][$name]['defaultValue'] = $setting->defaultValue;
+ $configValues[$pluginName][$name]['description'] = trim($description);
+
+ if ($setting->uiControlType === PluginSettings::CONTROL_PASSWORD) {
+ $value = $configValues[$pluginName][$name]['value'];
+ $configValues[$pluginName][$name]['value'] = $this->getMaskedPassword();
+ }
+ } else {
+ $defaultValue = $setting->getValue();
+ $configValues[$pluginName][$name] = array(
+ 'value' => null,
+ 'description' => trim($description),
+ 'isCustomValue' => false,
+ 'defaultValue' => $defaultValue
+ );
+ }
+ }
+ }
+
+ if (empty($configValues[$pluginName])) {
+ unset($configValues[$pluginName]);
+ }
+ }
+
+ return $configValues;
+ }
+}
diff --git a/plugins/Diagnostics/Controller.php b/plugins/Diagnostics/Controller.php
new file mode 100644
index 0000000000000000000000000000000000000000..7d2341a1958eb4b0f3d5455ed13856b2b22822aa
--- /dev/null
+++ b/plugins/Diagnostics/Controller.php
@@ -0,0 +1,66 @@
+<?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\Diagnostics;
+
+use Piwik\Config;
+use Piwik\Piwik;
+use Piwik\View;
+use Piwik\Settings;
+
+class Controller extends \Piwik\Plugin\ControllerAdmin
+{
+ /**
+ * @var ConfigReader
+ */
+ private $configReader;
+
+ public function __construct(ConfigReader $configReader)
+ {
+ $this->configReader = $configReader;
+ parent::__construct();
+ }
+
+ public function configfile()
+ {
+ Piwik::checkUserHasSuperUserAccess();
+
+ $allSettings = Settings\Manager::getAllPluginSettings();
+
+ $configValues = $this->configReader->getConfigValuesFromFiles();
+ $configValues = $this->configReader->addConfigValuesFromPluginSettings($configValues, $allSettings);
+ $configValues = $this->sortConfigValues($configValues);
+
+ return $this->renderTemplate('configfile', array(
+ 'allConfigValues' => $configValues
+ ));
+ }
+
+ private function sortConfigValues($configValues)
+ {
+ // we sort by sections alphabetically
+ uksort($configValues, function ($section1, $section2) {
+ return strcasecmp($section1, $section2);
+ });
+
+ foreach ($configValues as $category => &$settings) {
+ // we sort keys alphabetically but list the ones that are changed first
+ uksort($settings, function ($setting1, $setting2) use ($settings) {
+ if ($settings[$setting1]['isCustomValue'] && !$settings[$setting2]['isCustomValue']) {
+ return -1;
+ } elseif (!$settings[$setting1]['isCustomValue'] && $settings[$setting2]['isCustomValue']) {
+ return 1;
+ }
+ return strcasecmp($setting1, $setting2);
+ });
+ }
+
+ return $configValues;
+ }
+
+}
diff --git a/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php b/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php
index 2c69111ebbc1875e6635468ab73b1ae11fef7433..0d06ceef04fe6f2d532c2461db0ae6d78d341ae1 100644
--- a/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php
+++ b/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php
@@ -50,7 +50,8 @@ class LoadDataInfileCheck implements Diagnostic
array($testOptionNames[0], '1'),
array($testOptionNames[1], '2'),
),
- $throwException = true
+ $throwException = true,
+ $charset = 'latin1'
);
} catch (\Exception $ex) {
$errorMessage = str_replace("\n", "<br/>", $ex->getMessage());
diff --git a/plugins/Diagnostics/Diagnostic/RecommendedExtensionsCheck.php b/plugins/Diagnostics/Diagnostic/RecommendedExtensionsCheck.php
index b61ef4cbac4e7de0e23ac18a4b31afe842a7db43..a3c0a2c93357fbb8017ff89f6438de93cbf29385 100644
--- a/plugins/Diagnostics/Diagnostic/RecommendedExtensionsCheck.php
+++ b/plugins/Diagnostics/Diagnostic/RecommendedExtensionsCheck.php
@@ -31,9 +31,12 @@ class RecommendedExtensionsCheck implements Diagnostic
$result = new DiagnosticResult($label);
$loadedExtensions = @get_loaded_extensions();
+ $loadedExtensions = array_map(function ($extension) {
+ return strtolower($extension);
+ }, $loadedExtensions);
foreach ($this->getRecommendedExtensions() as $extension) {
- if (! in_array($extension, $loadedExtensions)) {
+ if (! in_array(strtolower($extension), $loadedExtensions)) {
$status = DiagnosticResult::STATUS_WARNING;
$comment = $extension . '<br/>' . $this->getHelpMessage($extension);
} else {
diff --git a/plugins/Diagnostics/Diagnostics.php b/plugins/Diagnostics/Diagnostics.php
index f69d1f45d128a5bc0eb829b5c38e62c84cb41e1f..9760be5b057c53dec6efd95701ba41d55730e863 100644
--- a/plugins/Diagnostics/Diagnostics.php
+++ b/plugins/Diagnostics/Diagnostics.php
@@ -12,4 +12,19 @@ use Piwik\Plugin;
class Diagnostics extends Plugin
{
+ /**
+ * @see Piwik\Plugin::registerEvents
+ */
+ public function registerEvents()
+ {
+ return array(
+ 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
+ );
+ }
+
+ public function getStylesheetFiles(&$stylesheets)
+ {
+ $stylesheets[] = "plugins/Diagnostics/stylesheets/configfile.less";
+ }
+
}
diff --git a/plugins/Diagnostics/Menu.php b/plugins/Diagnostics/Menu.php
new file mode 100644
index 0000000000000000000000000000000000000000..52c28699b5078930f60d957273b1af031d026b7f
--- /dev/null
+++ b/plugins/Diagnostics/Menu.php
@@ -0,0 +1,28 @@
+<?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\Diagnostics;
+
+use Piwik\Menu\MenuAdmin;
+use Piwik\Piwik;
+
+/**
+ * This class allows you to add, remove or rename menu items.
+ * To configure a menu (such as Admin Menu, Reporting Menu, User Menu...) simply call the corresponding methods as
+ * described in the API-Reference http://developer.piwik.org/api-reference/Piwik/Menu/MenuAbstract
+ */
+class Menu extends \Piwik\Plugin\Menu
+{
+ public function configureAdminMenu(MenuAdmin $menu)
+ {
+ if (Piwik::hasUserSuperUserAccess()) {
+ $menu->addDiagnosticItem('Diagnostics_ConfigFileTitle', $this->urlForAction('configfile'), $orderId = 30);
+ }
+ }
+
+}
diff --git a/plugins/Diagnostics/Test/Integration/ConfigReaderTest.php b/plugins/Diagnostics/Test/Integration/ConfigReaderTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..bb05cb61e7bc2e4b980f51dca7d22d0b64d6c27c
--- /dev/null
+++ b/plugins/Diagnostics/Test/Integration/ConfigReaderTest.php
@@ -0,0 +1,261 @@
+<?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\Diagnostics\Test\Integration\Commands;
+
+use Piwik\Application\Kernel\GlobalSettingsProvider;
+use Piwik\Ini\IniReader;
+use Piwik\Plugins\Diagnostics\ConfigReader;
+use Piwik\Plugins\ExampleSettingsPlugin\Settings;
+use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+
+/**
+ * TODO: This could be a unit test if we could inject the ArchiveTableDao in the command
+ * @group Diagnostics
+ * @group Plugins
+ */
+class ConfigReaderTest extends IntegrationTestCase
+{
+ /**
+ * @var ConfigReader
+ */
+ private $configReader;
+
+ public function setUp()
+ {
+ $settings = new GlobalSettingsProvider($this->configPath('global.ini.php'), $this->configPath('config.ini.php'), $this->configPath('common.config.ini.php'));
+ $this->configReader = new ConfigReader($settings, new IniReader());
+ }
+
+ public function test_getConfigValuesFromFiles()
+ {
+ $fileConfig = $this->configReader->getConfigValuesFromFiles();
+
+ $expected = array (
+ 'Category' =>
+ array (
+ 'key1' =>
+ array (
+ 'value' => 'value_overwritten',
+ 'description' => '',
+ 'isCustomValue' => true,
+ 'defaultValue' => 'value1',
+ ),
+ 'key2' =>
+ array (
+ 'value' => 'valueCommon',
+ 'description' => '',
+ 'isCustomValue' => false,
+ 'defaultValue' => 'value2',
+ ),
+ 'key3' =>
+ array (
+ 'value' => '${@piwik(crash))}',
+ 'description' => '',
+ 'isCustomValue' => false,
+ 'defaultValue' => NULL,
+ ),
+ ),
+ 'CategoryOnlyInGlobalFile' =>
+ array (
+ 'key3' =>
+ array (
+ 'value' => 'value3',
+ 'description' => 'test comment',
+ 'isCustomValue' => false,
+ 'defaultValue' => 'value3',
+ ),
+ 'key4' =>
+ array (
+ 'value' => 'value4',
+ 'description' => 'test comment 4',
+ 'isCustomValue' => false,
+ 'defaultValue' => 'value4',
+ ),
+ ),
+ 'TestArray' =>
+ array (
+ 'installed' =>
+ array (
+ 'value' =>
+ array (
+ 0 => 'plugin"1',
+ 1 => 'plugin2',
+ 2 => 'plugin3',
+ ),
+ 'description' => 'test comment 2
+with multiple lines',
+ 'isCustomValue' => true,
+ 'defaultValue' =>
+ array (
+ 0 => 'plugin1',
+ 1 => 'plugin4',
+ ),
+ ),
+ ),
+ 'TestArrayOnlyInGlobalFile' =>
+ array (
+ 'my_array' =>
+ array (
+ 'value' =>
+ array (
+ 0 => 'value1',
+ 1 => 'value2',
+ ),
+ 'description' => '',
+ 'isCustomValue' => false,
+ 'defaultValue' =>
+ array (
+ 0 => 'value1',
+ 1 => 'value2',
+ ),
+ ),
+ ),
+ 'GeneralSection' =>
+ array (
+ 'password' =>
+ array (
+ 'value' => '******',
+ 'description' => '',
+ 'isCustomValue' => true,
+ 'defaultValue' => NULL,
+ ),
+ 'login' =>
+ array (
+ 'value' => 'tes"t',
+ 'description' => '',
+ 'isCustomValue' => true,
+ 'defaultValue' => NULL,
+ ),
+ ),
+ 'TestOnlyInCommon' =>
+ array (
+ 'value' =>
+ array (
+ 'value' => 'commonValue',
+ 'description' => '',
+ 'isCustomValue' => false,
+ 'defaultValue' => NULL,
+ ),
+ ),
+ 'Tracker' =>
+ array (
+ 'commonConfigTracker' =>
+ array (
+ 'value' => 'commonConfigTrackerValue',
+ 'description' => '',
+ 'isCustomValue' => false,
+ 'defaultValue' => NULL,
+ ),
+ ),
+ );
+ $this->assertEquals($expected, $fileConfig);
+ }
+
+ public function test_addConfigValuesFromPluginSettings()
+ {
+ $settings = new Settings();
+
+ $configValues = $this->configReader->addConfigValuesFromPluginSettings(array(), array($settings));
+
+ $expected = array (
+ 'ExampleSettingsPlugin' =>
+ array (
+ 'metric' =>
+ array (
+ 'value' => NULL,
+ 'description' => 'Choose the metric that should be displayed in the browser tab',
+ 'isCustomValue' => false,
+ 'defaultValue' => 'nb_visits',
+ ),
+ 'browsers' =>
+ array (
+ 'value' => NULL,
+ 'description' => 'The value will be only displayed in the following browsers',
+ 'isCustomValue' => false,
+ 'defaultValue' =>
+ array (
+ 0 => 'firefox',
+ 1 => 'chromium',
+ 2 => 'safari',
+ ),
+ ),
+ 'description' =>
+ array (
+ 'value' => NULL,
+ 'description' => 'This description will be displayed next to the value',
+ 'isCustomValue' => false,
+ 'defaultValue' => 'This is the value:
+Another line',
+ ),
+ 'password' =>
+ array (
+ 'value' => NULL,
+ 'description' => 'Password for the 3rd API where we fetch the value',
+ 'isCustomValue' => false,
+ 'defaultValue' => NULL,
+ ),
+ ),
+ );
+ $this->assertEquals($expected, $configValues);
+ }
+
+ public function test_addConfigValuesFromPluginSettings_shouldAddDescriptionAndDefaultValueForExistingConfigValues()
+ {
+ $settings = new Settings();
+
+ $existing = array(
+ 'ExampleSettingsPlugin' =>
+ array (
+ 'metric' =>
+ array (
+ 'value' => NULL,
+ 'description' => '',
+ 'isCustomValue' => false,
+ 'defaultValue' => null,
+ ),
+ )
+ );
+
+ $configValues = $this->configReader->addConfigValuesFromPluginSettings($existing, array($settings));
+
+ $this->assertSame('Choose the metric that should be displayed in the browser tab', $configValues['ExampleSettingsPlugin']['metric']['description']);
+ $this->assertSame('nb_visits', $configValues['ExampleSettingsPlugin']['metric']['defaultValue']);
+ }
+
+ public function test_addConfigValuesFromPluginSettings_shouldMaskValueIfTypeIsPassword()
+ {
+ $settings = new Settings();
+ $settings->metric->uiControlType = Settings::CONTROL_PASSWORD;
+
+ $existing = array(
+ 'ExampleSettingsPlugin' =>
+ array (
+ 'metric' =>
+ array (
+ 'value' => 'test',
+ 'description' => '',
+ 'isCustomValue' => false,
+ 'defaultValue' => null,
+ ),
+ )
+ );
+
+ $configValues = $this->configReader->addConfigValuesFromPluginSettings($existing, array($settings));
+
+ $this->assertSame('******', $configValues['ExampleSettingsPlugin']['metric']['value']);
+ }
+
+ private function configPath($file)
+ {
+ return PIWIK_INCLUDE_PATH . '/tests/resources/Config/' . $file;
+ }
+}
+
+AnalyzeArchiveTableTest::$fixture = new OneVisitorTwoVisits();
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/ar.json b/plugins/Diagnostics/lang/ar.json
new file mode 100644
index 0000000000000000000000000000000000000000..08b255b67abf26ddce797303cd27344f974d9d70
--- /dev/null
+++ b/plugins/Diagnostics/lang/ar.json
@@ -0,0 +1,7 @@
+{
+ "Diagnostics": {
+ "ConfigFileTitle": "مل٠الضبط",
+ "HideUnchanged": "يمكنك %1$s إخÙاء كل القيم التي لم تتغير %2$s إذا كنت ترغب مشاهدة القيم المتغيرة Ùقط .",
+ "Sections": "الأقسام"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/cs.json b/plugins/Diagnostics/lang/cs.json
new file mode 100644
index 0000000000000000000000000000000000000000..8a4f5e31788b2de3825c10a8ca3799b05dcadfa6
--- /dev/null
+++ b/plugins/Diagnostics/lang/cs.json
@@ -0,0 +1,8 @@
+{
+ "Diagnostics": {
+ "ConfigFileTitle": "KonfiguraÄnà soubor",
+ "ConfigFileIntroduction": "Zde vidÃte konfiguraci pro Piwik. Pokud Piwik běžà v prostÅ™edà s vyvažovánÃm zátěže, můžou se zobrazovaná data liÅ¡it podle toho, ze kterého serveru jsou natažena. Řádky se zmÄ›nÄ›nou barvou pozadà znaÄà zmÄ›nÄ›né konfiguraÄnà hodnoty, které jsou specifikovány napÅ™Ãklad v %1$s souboru.",
+ "HideUnchanged": "Pokud chcete vidět pouze změněné hodnoty, můžete %1$snezměněné hodnoty skrýt%2$s.",
+ "Sections": "Sekce"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/de.json b/plugins/Diagnostics/lang/de.json
new file mode 100644
index 0000000000000000000000000000000000000000..b40af46d52b0b73a5eeea24f97cc22ba56c26388
--- /dev/null
+++ b/plugins/Diagnostics/lang/de.json
@@ -0,0 +1,8 @@
+{
+ "Diagnostics": {
+ "ConfigFileTitle": "Konfigurationsdatei",
+ "ConfigFileIntroduction": "Hier können Sie die Piwik Konfiguration einsehen. Sollten Sie Piwik auf lastverteilten Systemen einsetzen könnte diese Seite unterschiedlich sein, abhängig vom Server auf dem die Seite geladen wurde. Zeilen mit einer anderen Hintergrundfarbe sind geänderte Konfigurationswerte, die beispielsweise in der Datei %1$s definiert wurden.",
+ "HideUnchanged": "Falls Sie nur die geänderten Werte einsehen möchten können Sie %1$salle unveränderten Werte ausblenden%2$s.",
+ "Sections": "Sektionen"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/el.json b/plugins/Diagnostics/lang/el.json
new file mode 100644
index 0000000000000000000000000000000000000000..8f92d3f1a82ecdd967a82cab92886a5ac862e2ce
--- /dev/null
+++ b/plugins/Diagnostics/lang/el.json
@@ -0,0 +1,8 @@
+{
+ "Diagnostics": {
+ "ConfigFileTitle": "ΑÏχείο Ïυθμίσεων",
+ "ConfigFileIntroduction": "Εδώ μποÏείτε να δείτε τις Ïυθμίσεις του Piwik. Αν εκτελείτε το Piwik σε πεÏιβάλλον με διαμοιÏασμό φόÏτου, η σελίδα μποÏεί να είναι διαφοÏετική, ανάλογα από ποιο διακομιστή Îχει φοÏτωθεί. Οι γÏαμμÎÏ‚ με διαφοÏετικό χÏώμα υποβάθÏου είναι οι τιμÎÏ‚ Ïυθμίσεων που άλλαξαν για παÏάδειγμα στο αÏχείο Ïυθμίσεων %1$s.",
+ "HideUnchanged": "Αν επιθυμείτε να δείτε μόνο τις τιμÎÏ‚ που άλλαξαν, μποÏείτε να %1$sαποκÏÏψετε τις τιμÎÏ‚ που παÏÎμειναν ίδιες%2$s.",
+ "Sections": "Τμήματα"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/en.json b/plugins/Diagnostics/lang/en.json
new file mode 100644
index 0000000000000000000000000000000000000000..1f63118bb4c77ef7e2f41a4092d06a5ce264a51c
--- /dev/null
+++ b/plugins/Diagnostics/lang/en.json
@@ -0,0 +1,8 @@
+{
+ "Diagnostics": {
+ "ConfigFileTitle": "Config file",
+ "ConfigFileIntroduction": "Here you can view the Piwik configuration. If you are running Piwik in a load balanced environment the page might be different depending from which server this page is loaded. Rows with a different background color are changed config values that are specified for example in the %1$s file.",
+ "HideUnchanged": "If you want to see only changed values you can %1$shide all unchanged values%2$s.",
+ "Sections": "Sections"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/fr.json b/plugins/Diagnostics/lang/fr.json
new file mode 100644
index 0000000000000000000000000000000000000000..ffd3cffae6d8c6b9f7196ce2a53d9e1502832f25
--- /dev/null
+++ b/plugins/Diagnostics/lang/fr.json
@@ -0,0 +1,6 @@
+{
+ "Diagnostics": {
+ "ConfigFileTitle": "Fichier de configuration",
+ "Sections": "Sections"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/it.json b/plugins/Diagnostics/lang/it.json
new file mode 100644
index 0000000000000000000000000000000000000000..72a21afc43b87db67ee51474707cfa327bdf7055
--- /dev/null
+++ b/plugins/Diagnostics/lang/it.json
@@ -0,0 +1,7 @@
+{
+ "Diagnostics": {
+ "ConfigFileTitle": "File di configurazione",
+ "HideUnchanged": "Se vuoi vedere soltanto i valori cambiati, puoi %1$snascondere tutti quelli che non sono cambiati%2$s.",
+ "Sections": "Sezioni"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/pt-br.json b/plugins/Diagnostics/lang/pt-br.json
new file mode 100644
index 0000000000000000000000000000000000000000..c563a60e3f26711f0fafa0c01c2d2f49d067fc10
--- /dev/null
+++ b/plugins/Diagnostics/lang/pt-br.json
@@ -0,0 +1,8 @@
+{
+ "Diagnostics": {
+ "ConfigFileTitle": "Arquivo de configuração",
+ "ConfigFileIntroduction": "Aqui você pode ver a configuração do Piwik. Se você estiver executando Piwik em um ambiente de balanceamento de carga a página pode ser diferente, dependendo de qual servidor esta página é carregada. Linhas com uma cor de fundo diferente são alterados os valores de configuração que são especificadas por exemplo, no arquivo %1$s.",
+ "HideUnchanged": "Se você quiser ver apenas valores alterados você pode %1$socultar todos os valores inalterados%2$s.",
+ "Sections": "Seções"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Diagnostics/lang/sv.json b/plugins/Diagnostics/lang/sv.json
new file mode 100644
index 0000000000000000000000000000000000000000..25fe2ba0c6dfe93c6262822817e979899ea9da67
--- /dev/null
+++ b/plugins/Diagnostics/lang/sv.json
@@ -0,0 +1,5 @@
+{
+ "Diagnostics": {
+ "ConfigFileTitle": "Konfigurationsfil"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Diagnostics/plugin.json b/plugins/Diagnostics/plugin.json
index da53096d70316d8aa9958e9672c43afaecc98d4a..9f6d9023a250676c27ed9781355dc05752074bd8 100644
--- a/plugins/Diagnostics/plugin.json
+++ b/plugins/Diagnostics/plugin.json
@@ -1,3 +1,3 @@
{
- "description": "Performs diagnostics to check that Piwik is installed and runs correctly."
+ "description": "Performs diagnostics to check that Piwik is installed and runs correctly."
}
\ No newline at end of file
diff --git a/plugins/Diagnostics/stylesheets/configfile.less b/plugins/Diagnostics/stylesheets/configfile.less
new file mode 100644
index 0000000000000000000000000000000000000000..f399ce3596408ea55892fa55687cc63a935ceea9
--- /dev/null
+++ b/plugins/Diagnostics/stylesheets/configfile.less
@@ -0,0 +1,22 @@
+.diagnostics.configfile {
+ .custom-value {
+ background-color: @theme-color-background-tinyContrast;
+ }
+
+ .defaultValue {
+ font-style: italic;
+ }
+
+ td.name {
+ max-width: 330px;
+ word-wrap: break-word;
+ width: 25%;
+ }
+
+ td.value {
+ word-wrap: break-word;
+ max-width: 400px;
+ width: 25%;
+ }
+
+}
diff --git a/plugins/Diagnostics/templates/configfile.twig b/plugins/Diagnostics/templates/configfile.twig
new file mode 100644
index 0000000000000000000000000000000000000000..46113b51daa63cde7adfefc0cbdf2751f08c9617
--- /dev/null
+++ b/plugins/Diagnostics/templates/configfile.twig
@@ -0,0 +1,55 @@
+{% extends 'admin.twig' %}
+
+{% macro humanReadableValue(value) %}
+ {% if value is false %}
+ false
+ {% elseif value is true %}
+ true
+ {% elseif value is null %}
+ {% elseif value is emptyString %}
+ ''
+ {% else %}
+ {{ value|join(', ') }}
+ {% endif %}
+{% endmacro %}
+
+{% block content %}
+ <h2 piwik-enriched-headline>{{ 'Diagnostics_ConfigFileTitle'|translate }}</h2>
+ <p>
+ {{ 'Diagnostics_ConfigFileIntroduction'|translate('<code>"config/config.ini.php"</code>')|raw }}
+ {{ 'Diagnostics_HideUnchanged'|translate('<a ng-click="hideGlobalConfigValues=!hideGlobalConfigValues">', '</a>')|raw }}
+
+ <h3>{{ 'Diagnostics_Sections'|translate }}</h3>
+ {% for category, values in allConfigValues %}
+ <a href="#{{ category|e('html_attr') }}">{{ category }}</a><br />
+ {% endfor %}
+ </p>
+
+ <table class="simple-table diagnostics configfile">
+ <tbody>
+ {% for category, configValues in allConfigValues %}
+ <tr><td colspan="3"><a name="{{ category|e('html_attr') }}"></a><h3>{{ category }}</h3></td></tr>
+
+ {% for key, configEntry in configValues %}
+ <tr {% if configEntry.isCustomValue %}class="custom-value"{% else %}ng-hide="hideGlobalConfigValues"{% endif %}>
+ <td class="name">{{ key }}{% if configEntry.value is iterable %}[]{% endif %}</td>
+ <td class="value">
+ {{ _self.humanReadableValue(configEntry.value) }}
+ </td>
+ <td class="description">
+ {{ configEntry.description }}
+
+ {% if (configEntry.isCustomValue or configEntry.value is null) and configEntry.defaultValue is not null %}
+ {% if configEntry.description %}<br />{% endif %}
+
+ {{ 'General_Default'|translate }}:
+ <span class="defaultValue">{{ _self.humanReadableValue(configEntry.defaultValue) }}<span>
+ {% endif %}
+ </td>
+ </tr>
+ {% endfor %}
+ {% endfor %}
+ </tbody>
+ </table>
+
+{% endblock %}
\ No newline at end of file
diff --git a/plugins/Events/lang/cs.json b/plugins/Events/lang/cs.json
index d919e1c04c0abeeb048444fa63ff49163cc5786b..be215271089366140352e4391ba94402d911cd99 100644
--- a/plugins/Events/lang/cs.json
+++ b/plugins/Events/lang/cs.json
@@ -15,7 +15,7 @@
"EventsWithValue": "Události s hodnotou",
"EventsWithValueDocumentation": "PoÄet událostà s nastavenou hodnotou",
"EventValue": "Hodnota události",
- "EventValueTooltip": "Celková hodnota události je souÄet %s hodnot událostà %s mezi minimem %s a maximem %s.",
+ "EventValueTooltip": "Celková hodnota události je souÄet %1$s hodnot událostà %2$s mezi minimem %3$s a maximem %4$s.",
"MaxValue": "Maximálnà hodnota",
"MaxValueDocumentation": "Maximálnà hodnota pro tuto událost",
"MinValue": "Minimálnà hodnota",
diff --git a/plugins/Events/lang/da.json b/plugins/Events/lang/da.json
index db8849014f0b78b1b13b55116c989b20a859bdb1..6ba733e87caa2cdeefeaffde93467e0ad012989b 100644
--- a/plugins/Events/lang/da.json
+++ b/plugins/Events/lang/da.json
@@ -14,7 +14,7 @@
"EventsWithValue": "Hændelser med en værdi",
"EventsWithValueDocumentation": "Antal hændelser, hvor en hændelseværdi blev fastsat",
"EventValue": "Hændelsesværdi",
- "EventValueTooltip": "Samlet hændelsesværdi er summen af ​​%s hændelsesværdier %s mellem mindst %s og maksimalt %s.",
+ "EventValueTooltip": "Samlet hændelsesværdi er summen af ​​%1$s hændelsesværdier %2$s mellem mindst %3$s og maksimalt %4$s.",
"MaxValue": "Max værdi",
"MaxValueDocumentation": "Den maksimale værdi for hændelsen",
"MinValue": "Min værdi",
diff --git a/plugins/Events/lang/de.json b/plugins/Events/lang/de.json
index 33ddf79414b76a5e60e3ed9902b496f1b26aad40..00c1c9849a64f1cdca90cb310577d49b1b31d81c 100644
--- a/plugins/Events/lang/de.json
+++ b/plugins/Events/lang/de.json
@@ -15,7 +15,7 @@
"EventsWithValue": "Ereignisse mit einem Wert",
"EventsWithValueDocumentation": "Anzahl der Ereignisse bei denen ein Ereigniswert gesetzt war",
"EventValue": "Ereigniswert",
- "EventValueTooltip": "Der Gesamtereigniswert ist die Summe von %s Ereigniswerten %s zwischen dem Minimum von %s und dem Maximum von %s.",
+ "EventValueTooltip": "Der Gesamtereigniswert ist die Summe von %1$s Ereigniswerten %2$s zwischen dem Minimum von %3$s und dem Maximum von %4$s.",
"MaxValue": "Maximaler Wert",
"MaxValueDocumentation": "Maximaler Wert für dieses Ereignis",
"MinValue": "Minimaler Wert",
diff --git a/plugins/Events/lang/el.json b/plugins/Events/lang/el.json
index 5547feed170b5a3691827d115b7f343b3f79aef0..4a7197d3c9f0562c074c5a9c2fae916a05a607c4 100644
--- a/plugins/Events/lang/el.json
+++ b/plugins/Events/lang/el.json
@@ -15,7 +15,7 @@
"EventsWithValue": "Γεγονότα με τιμή",
"EventsWithValueDocumentation": "ΑÏιθμός γεγονότων στα οποία Îχει οÏιστεί μια τιμή",
"EventValue": "Τιμή Συμβάντος",
- "EventValueTooltip": "Η συνολική αξία συμβάντος είναι το άθÏοισμα %s τιμών συμβάντων %s Î¼ÎµÏ„Î±Î¾Ï ÎµÎ»Î¬Ï‡Î¹ÏƒÏ„Î¿Ï… %s και μÎγιστου %s.",
+ "EventValueTooltip": "Η συνολική τιμή Συμβάντος είναι το άθÏοισμα από %1$s τιμÎÏ‚ γεγονότων %2$s Î¼ÎµÏ„Î±Î¾Ï Î¼Î¹Î±Ï‚ ελάχιστης τιμής %3$s και μιας μÎγιστης %4$s.",
"MaxValue": "ÎœÎγιστη τιμή",
"MaxValueDocumentation": "ÎœÎγιστη τιμή για το συμβάν",
"MinValue": "Ελάχιστη τιμή",
diff --git a/plugins/Events/lang/en.json b/plugins/Events/lang/en.json
index 0981e4b690a83f0466ad9be1af1415094daa18f5..89f9642d1ff3b168030934068eb6b4145c337025 100644
--- a/plugins/Events/lang/en.json
+++ b/plugins/Events/lang/en.json
@@ -15,7 +15,7 @@
"EventsWithValue": "Events with a value",
"EventsWithValueDocumentation": "Number of events where an Event value was set",
"EventValue": "Event Value",
- "EventValueTooltip": "Total Event value is the sum of %s events values %s between minimum of %s and maximum of %s.",
+ "EventValueTooltip": "Total Event value is the sum of %1$s events values %2$s between minimum of %3$s and maximum of %4$s.",
"MaxValue": "Maximum value",
"MaxValueDocumentation": "The maximum value for this event",
"MinValue": "Minimum value",
diff --git a/plugins/Events/lang/es.json b/plugins/Events/lang/es.json
index 59de90c961fb88877ba633f157241e723402f78c..b602256a4e33470641437062c3050e524fde84e5 100644
--- a/plugins/Events/lang/es.json
+++ b/plugins/Events/lang/es.json
@@ -15,7 +15,7 @@
"EventsWithValue": "Eventos con un valor",
"EventsWithValueDocumentation": "Numero de eventos en los que se estableció un valor",
"EventValue": "Valor del evento",
- "EventValueTooltip": "El valor total del evento se compone de la suma de %s los valores de los eventos %s entre un mÃnimo de %s y un máximo de %s.",
+ "EventValueTooltip": "El valor total del evento se compone de la suma de %1$s los valores de los eventos %2$s entre un mÃnimo de %3$s y un máximo de %4$s.",
"MaxValue": "Valor máximo",
"MaxValueDocumentation": "El valor máximo de este evento",
"MinValue": "Valor mÃnimo",
diff --git a/plugins/Events/lang/fr.json b/plugins/Events/lang/fr.json
index ba1ed55637d935e786d37449927d489ff99cfc59..fe4ddfb443d16f5fb59c66fbe8131c790d2add76 100644
--- a/plugins/Events/lang/fr.json
+++ b/plugins/Events/lang/fr.json
@@ -15,7 +15,7 @@
"EventsWithValue": "Evènements avec une valeur",
"EventsWithValueDocumentation": "Nombre d'évènements qui ont une valeur de définie",
"EventValue": "Valeur d'évènement",
- "EventValueTooltip": "La valeur totale de l'évènement est la somme des %s valeurs d'évènements %s entre un minimum de %s et un maximum de %s.",
+ "EventValueTooltip": "La valeur totale de l'évènement est la somme des %1$s valeurs d'évènements %2$s entre un minimum de %3$s et un maximum de %4$s.",
"MaxValue": "Valeur maximum",
"MaxValueDocumentation": "Valeur maximale pour cet évènement",
"MinValue": "Valeur minimum",
diff --git a/plugins/Events/lang/it.json b/plugins/Events/lang/it.json
index 465cebb176cf751c791d605799df93351843bb46..da44c8b0b3d09453174b6e1adc59660200c39d5f 100644
--- a/plugins/Events/lang/it.json
+++ b/plugins/Events/lang/it.json
@@ -15,7 +15,7 @@
"EventsWithValue": "Eventi con un valore",
"EventsWithValueDocumentation": "Numero di eventi dove è stato impostato un valore Evento",
"EventValue": "Valore Evento",
- "EventValueTooltip": "Il valore totale Evento è la somma dei %s valori eventi %s tra un minimo di %s e un massimo di %s.",
+ "EventValueTooltip": "Il valore totale Evento è la somma dei %1$s valori eventi %2$s tra un minimo di %3$s e un massimo di %4$s.",
"MaxValue": "Valore massimo",
"MaxValueDocumentation": "Valore massimo per questo evento",
"MinValue": "Valore minimo",
diff --git a/plugins/Events/lang/ja.json b/plugins/Events/lang/ja.json
index 10051096aadbb9711401ce0e6bb75290fac46f10..fe7ccda48ab325db6ab1273df5c808266e76e7c2 100644
--- a/plugins/Events/lang/ja.json
+++ b/plugins/Events/lang/ja.json
@@ -15,7 +15,7 @@
"EventsWithValue": "値をæŒã¤ã‚¤ãƒ™ãƒ³ãƒˆ",
"EventsWithValueDocumentation": "イベントã®å€¤ãŒè¨å®šã•ã‚ŒãŸã‚¤ãƒ™ãƒ³ãƒˆæ•°",
"EventValue": "イベントã®å€¤",
- "EventValueTooltip": "ç·ã‚¤ãƒ™ãƒ³ãƒˆå€¤ã¯ %s 件ã®ã‚¤ãƒ™ãƒ³ãƒˆå€¤ã®åˆè¨ˆã§ã™ã€‚ %s 最å°å€¤ã¯ %s ã€æœ€å¤§å€¤ã¯ %s ã§ã™ 。",
+ "EventValueTooltip": "ç·ã‚¤ãƒ™ãƒ³ãƒˆå€¤ã¯ %1$s 件ã®ã‚¤ãƒ™ãƒ³ãƒˆå€¤ã®åˆè¨ˆã§ã™ã€‚ %2$s 最å°å€¤ã¯ %3$s ã€æœ€å¤§å€¤ã¯ %4$s ã§ã™ 。",
"MaxValue": "最大値",
"MaxValueDocumentation": "ã“ã®ã‚¤ãƒ™ãƒ³ãƒˆã®æœ€å¤§å€¤",
"MinValue": "最å°å€¤",
diff --git a/plugins/Events/lang/nb.json b/plugins/Events/lang/nb.json
index debcc1761ce8a0166fcc00c1e7709bb4ac5135d6..cd72216d88e0157924383e61c3248a26b755ce6c 100644
--- a/plugins/Events/lang/nb.json
+++ b/plugins/Events/lang/nb.json
@@ -1,15 +1,32 @@
{
"Events": {
+ "PluginDescription": "Spor hendelser og få rapporter om dine brukeres aktiviteter.",
"AvgEventValue": "Gjennomsnittlig hendelseverdi er: %s",
"AvgValue": "Gjennomsnittlig verdi",
+ "AvgValueDocumentation": "Gjennomsnittet av alle verdier for denne hendelsen",
"Event": "Hendelse",
+ "EventAction": "Hendelseshandling",
+ "EventActions": "Hendelseshandlinger",
+ "EventCategories": "Hendelseskategorier",
"EventCategory": "Hendelsekategori",
+ "EventName": "Hendelsesnavn",
+ "EventNames": "Hendelsesnavn",
"Events": "Hendelser",
+ "EventsWithValue": "Hendelser med en verdi",
+ "EventsWithValueDocumentation": "Antall hendelser der en hendelsesverdi er satt",
+ "EventValue": "Hendelsesverdi",
+ "EventValueTooltip": "Total hendelsesverdi er summen av alle %1$s hendelsesverdier %2$s mellom minimumsverdi %3$s og maksimumsverdi %4$s.",
"MaxValue": "Maksimumsverdi",
- "MinValue": "Minimum verdi",
+ "MaxValueDocumentation": "Maksimumsverdien for denne hendelsen",
+ "MinValue": "Minimumsverdi",
+ "MinValueDocumentation": "Minimumsverdien for denne hendelsen",
+ "SecondaryDimension": "Sekundær dimensjon er %s.",
"SwitchToSecondaryDimension": "Bytt til %s",
"TopEvents": "Topphendelser",
+ "TotalEvents": "Totalt antall hendelser",
+ "TotalEventsDocumentation": "Totalt antall hendelser",
"TotalValue": "Totalverdi",
+ "TotalValueDocumentation": "Summen av alle hendelsesverdier",
"ViewEvents": "Vis hendelser"
}
}
\ No newline at end of file
diff --git a/plugins/Events/lang/nl.json b/plugins/Events/lang/nl.json
index 81fa40e547d44cee6661ae89664daa0788c98a2e..01095280786c5a48b0c0bd3d0e76f663e75799a7 100644
--- a/plugins/Events/lang/nl.json
+++ b/plugins/Events/lang/nl.json
@@ -15,7 +15,7 @@
"EventsWithValue": "Gebeurtenissen met een waarde",
"EventsWithValueDocumentation": "Aantal events waar een Event waarde is bepaald",
"EventValue": "Gebeurtenis Waarde",
- "EventValueTooltip": "Totale gebeurtenis waarde is de som van %s gebeurtenis waarden %s tussen minima van %s en maxima van %s.",
+ "EventValueTooltip": "Totale gebeurtenis waarde is de som van %1$s gebeurtenis waarden %2$s tussen minima van %3$s en maxima van %4$s.",
"MaxValue": "Maximale waarde",
"MaxValueDocumentation": "De maximale waarde voor deze gebeurtenis",
"MinValue": "Minimale waarde",
diff --git a/plugins/Events/lang/pt-br.json b/plugins/Events/lang/pt-br.json
index ccc155cae5884dcad93e705bf5fa22e5b90dec03..f311ca34cf8f5e53dc740a5277cf064fda30abb1 100644
--- a/plugins/Events/lang/pt-br.json
+++ b/plugins/Events/lang/pt-br.json
@@ -15,7 +15,7 @@
"EventsWithValue": "Eventos com um valor",
"EventsWithValueDocumentation": "Número de eventos onde foi configurado um valor Event",
"EventValue": "Valor do Evento",
- "EventValueTooltip": "O valor total de Evento é a soma de %s valores de eventos %s entre o mÃnimo de %s e o máximo de %s.",
+ "EventValueTooltip": "O valor total de Evento é a soma de %1$s valores de eventos %2$s entre o mÃnimo de %3$s e o máximo de %4$s.",
"MaxValue": "Valor máximo",
"MaxValueDocumentation": "O valor máximo para este evento",
"MinValue": "Valor mÃnimo",
diff --git a/plugins/Events/lang/ro.json b/plugins/Events/lang/ro.json
index c50fd8c44660a63cf0e46c2f4eedcbe5a5eba1c2..3d26bb67d4ae8688c948f37765155bcfff88613e 100644
--- a/plugins/Events/lang/ro.json
+++ b/plugins/Events/lang/ro.json
@@ -14,7 +14,7 @@
"EventsWithValue": "Evenimente cu valoare",
"EventsWithValueDocumentation": "Numărul de evenimente în care a fost stabilit o valoare Eveniment",
"EventValue": "Valoarea Evenimentului",
- "EventValueTooltip": "Valoarea totală Eveniment este suma de %s valoare evenimente %s între minim %s și maxim de %s.",
+ "EventValueTooltip": "Valoarea totală Eveniment este suma de %1$s valoare evenimente %2$s între minim %3$s și maxim de %4$s.",
"MaxValue": "Valoarea maxima",
"MaxValueDocumentation": "Valoarea maxima pentru acest eveniment",
"MinValue": "Valoarea minima",
diff --git a/plugins/Events/lang/ru.json b/plugins/Events/lang/ru.json
index 62ab5e6ce15ffa1f0805d5459216e28511528369..242b414fa2acc107d4a2a03b9c8d1f76915660bb 100644
--- a/plugins/Events/lang/ru.json
+++ b/plugins/Events/lang/ru.json
@@ -14,6 +14,7 @@
"EventsWithValue": "Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ñ Ñо значением",
"EventsWithValueDocumentation": "КоличеÑтво Ñобытий, где было уÑтановлено значение Ð´Ð»Ñ Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ñ",
"EventValue": "Значение ÑобытиÑ",
+ "EventValueTooltip": "Общие Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñобытий равны Ñумме %1$s значениÑм (Ñобытий) %2$s между минимумом %3$s и макÑимум %4$s.",
"MaxValue": "МакÑимальное значение",
"MaxValueDocumentation": "МакÑимальное Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñтого ÑобытиÑ",
"MinValue": "Минимальное значение",
diff --git a/plugins/Events/lang/sk.json b/plugins/Events/lang/sk.json
index a45b722eb4b27b2865e77a6af2835ebd9e8bd2d6..cf80e73e9502ff9cc7a270c7a1b559ae6c7aad99 100644
--- a/plugins/Events/lang/sk.json
+++ b/plugins/Events/lang/sk.json
@@ -5,7 +5,7 @@
"Events": "Udalosti",
"EventsWithValue": "Udalosti s hodnotou",
"EventsWithValueDocumentation": "PoÄet udalostÃ, kde bola nastavená hodnota Udalosti",
- "EventValueTooltip": "Hodnota Udalostà celom je suma %s hodnôt udalostà %s medzi minimom %s a maximom %s.",
+ "EventValueTooltip": "Hodnota Udalostà celom je suma %1$s hodnôt udalostà %2$s medzi minimom %3$s a maximom %4$s.",
"TopEvents": "Top Udalosti",
"TotalEvents": "Udalosti celkom",
"TotalEventsDocumentation": "Celkový poÄet udalostÃ",
diff --git a/plugins/Events/lang/sr.json b/plugins/Events/lang/sr.json
index bbf1a1477922ff08f96a8e6a1dd281677c4c52a2..82ca990cfb12dbada030f4d4d686470e2387bca5 100644
--- a/plugins/Events/lang/sr.json
+++ b/plugins/Events/lang/sr.json
@@ -15,7 +15,7 @@
"EventsWithValue": "Događaji sa vrednošću",
"EventsWithValueDocumentation": "Broj događaja u kojima je vrednost postavljena",
"EventValue": "Vrednost događaja",
- "EventValueTooltip": "Ukupna vrednost događaja je suma %s događaja sa vrednošću %s između minimum od %s i maksimum od %s",
+ "EventValueTooltip": "Ukupna vrednost događaja je suma %1$s događaja sa vrednošću %2$s između minimum od %3$s i maksimum od %4$s",
"MaxValue": "Maksimalna vrednost",
"MaxValueDocumentation": "Maksimalna vrednost za ovaj događaj",
"MinValue": "Minimalna vrednost",
diff --git a/plugins/Events/lang/sv.json b/plugins/Events/lang/sv.json
index 351e2b445de87713a070922621665d70909b0ca0..e99f426681e364bde85b714007f178983099a4ff 100644
--- a/plugins/Events/lang/sv.json
+++ b/plugins/Events/lang/sv.json
@@ -15,7 +15,7 @@
"EventsWithValue": "Händelser med ett värde",
"EventsWithValueDocumentation": "Antal händelser där en händelses värde fastställdes",
"EventValue": "Händelse Värde",
- "EventValueTooltip": "Totalt händelsevärde är summan av %shändelsevärden%s mellan minst %s och högst %s.",
+ "EventValueTooltip": "Totalt händelsevärde är summan av %1$shändelsevärden%2$s mellan minst %3$s och högst %4$s.",
"MaxValue": "Högsta värde",
"MaxValueDocumentation": "Det maximala värdet för denna händelse",
"MinValue": "Minsta värde",
diff --git a/plugins/Events/lang/tl.json b/plugins/Events/lang/tl.json
index 9d5e90c97ec9f81b37421f6882beef53cbaea912..9d003e86c01f93825022859e1b9310945b73e74e 100644
--- a/plugins/Events/lang/tl.json
+++ b/plugins/Events/lang/tl.json
@@ -14,7 +14,7 @@
"EventsWithValue": "Mga event na may value",
"EventsWithValueDocumentation": "Bilang ng pangyayari kung saan ang halaga ng Event ay itinakda",
"EventValue": "Event Value",
- "EventValueTooltip": "Ang total event value ay resulta ng %s events values %s sa pagitan ng minimum %s at maximum ng %s.",
+ "EventValueTooltip": "Ang total event value ay resulta ng %1$s events values %2$s sa pagitan ng minimum %3$s at maximum ng %4$s.",
"MaxValue": "Maximum na halaga",
"MaxValueDocumentation": "Ang maximum na halaga para sa kaganapang ito.",
"MinValue": "Minimum na halaga",
diff --git a/plugins/ExamplePlugin/Widgets/MyExampleWidget.php b/plugins/ExamplePlugin/Widgets/MyExampleWidget.php
index 687ee6df67325cb946ac9cc2543cc5bf04a0607b..3434a3aac95e4859d2145e040f81f2ee734f97c5 100644
--- a/plugins/ExamplePlugin/Widgets/MyExampleWidget.php
+++ b/plugins/ExamplePlugin/Widgets/MyExampleWidget.php
@@ -26,7 +26,7 @@ class MyExampleWidget extends Widget
* Set the category the widget belongs to. You can reuse any existing widget category or define
* your own category.
*/
- $config->setCategoryId('Example Widgets');
+ $config->setCategoryId('About Piwik');
/**
* Set the subcategory the widget belongs to. If a subcategory is set, the widget will be shown in the UI.
diff --git a/plugins/ExamplePlugin/plugin.json b/plugins/ExamplePlugin/plugin.json
index 9f8e7a09bf38f0789adb4db2135d28c1a1d2ce5c..71f81fb70dfdcc085eb33a2025e8eca7794a498c 100644
--- a/plugins/ExamplePlugin/plugin.json
+++ b/plugins/ExamplePlugin/plugin.json
@@ -12,5 +12,8 @@
"email": "",
"homepage": ""
}
- ]
+ ],
+ "homepage": "",
+ "license": "GPL v3+",
+ "keywords": []
}
\ No newline at end of file
diff --git a/plugins/ExampleRssWidget/Widgets/RssChangelog.php b/plugins/ExampleRssWidget/Widgets/RssChangelog.php
index 70ba5eb0c0b2fae5e6b8b35c338552bc33585ded..d42737b3fa67cbc1f4461f608e2d1a31811bbf7c 100644
--- a/plugins/ExampleRssWidget/Widgets/RssChangelog.php
+++ b/plugins/ExampleRssWidget/Widgets/RssChangelog.php
@@ -16,7 +16,7 @@ class RssChangelog extends \Piwik\Widget\Widget
{
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('Example Widgets');
+ $config->setCategoryId('About Piwik');
$config->setName('Piwik Changelog');
}
diff --git a/plugins/ExampleRssWidget/Widgets/RssPiwik.php b/plugins/ExampleRssWidget/Widgets/RssPiwik.php
index c3c7c76a16669910671cced7737c024f51b030af..489b703656c8b3cd8e32dd17fb08581caef8210f 100644
--- a/plugins/ExampleRssWidget/Widgets/RssPiwik.php
+++ b/plugins/ExampleRssWidget/Widgets/RssPiwik.php
@@ -16,7 +16,7 @@ class RssPiwik extends \Piwik\Widget\Widget
{
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('Example Widgets');
+ $config->setCategoryId('About Piwik');
$config->setName('Piwik.org Blog');
}
diff --git a/plugins/ExampleTheme/plugin.json b/plugins/ExampleTheme/plugin.json
index 433b1eac3f59e0331e6172c0e13d08a616923442..7f486d6ddf72219d2c6c63d38b8611d5f062a772 100644
--- a/plugins/ExampleTheme/plugin.json
+++ b/plugins/ExampleTheme/plugin.json
@@ -3,5 +3,15 @@
"description": "Piwik Platform showcase: example of how to create a simple Theme.",
"version": "0.1.0",
"theme": true,
- "stylesheet": "stylesheets/theme.less"
+ "stylesheet": "stylesheets/theme.less",
+ "homepage": "",
+ "license": "GPL v3+",
+ "keywords": [],
+ "authors": [
+ {
+ "name": "",
+ "email": "",
+ "homepage": ""
+ }
+ ]
}
\ No newline at end of file
diff --git a/plugins/ExampleTheme/stylesheets/theme.less b/plugins/ExampleTheme/stylesheets/theme.less
index 2763f2216d03039a5bcf63f6390fa99d8c597fae..6b68780734be8a486b927b565346976a8623d0f4 100644
--- a/plugins/ExampleTheme/stylesheets/theme.less
+++ b/plugins/ExampleTheme/stylesheets/theme.less
@@ -12,6 +12,7 @@
@theme-color-menu-contrast-text: #666666;
@theme-color-menu-contrast-textActive: #0d0d0d;
+@theme-color-menu-contrast-textSelected: @theme-color-menu-contrast-text;
@theme-color-menu-contrast-background: #f2f2f2;
@theme-color-text: #0d0d0d;
diff --git a/plugins/Feedback/lang/ar.json b/plugins/Feedback/lang/ar.json
index 01a49d99374faec18d813c15645581147e4ba88b..ba0dbcc43e2fa55c5f9524952bbe6d5d4cbd23b6 100644
--- a/plugins/Feedback/lang/ar.json
+++ b/plugins/Feedback/lang/ar.json
@@ -2,10 +2,9 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "هل لديك خطأ أو ميزة تود إضاÙتها وتريد إخبارنا عنها؟",
"IWantTo": "أرغب ÙÙŠ:",
- "LearnWaysToParticipate": "تعر٠على كاÙØ© الطرق التي يمكنك %s المساهمة %s بها.",
+ "LearnWaysToParticipate": "تعر٠على كاÙØ© الطرق التي يمكنك %1$s المساهمة %2$s بها.",
"ManuallySendEmailTo": "الرجاء إرسال رسالتك يدوياً إلى",
"SendFeedback": "أرسل التغذية الراجعة",
- "ThankYou": "شكراً لمساعدتك ÙÙŠ جعل Piwik Ø£Ùضل!",
- "VisitTheForums": "قم بزيارة %sالمنتديات%s"
+ "ThankYou": "شكراً لمساعدتك ÙÙŠ جعل Piwik Ø£Ùضل!"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/be.json b/plugins/Feedback/lang/be.json
index 0db00271d042dafb614a02df560e3adca92ca368..5fd20e94f2a9653d7bdc2bd0073db5e2dc5b5d77 100644
--- a/plugins/Feedback/lang/be.json
+++ b/plugins/Feedback/lang/be.json
@@ -2,10 +2,9 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Ці Ñ‘Ñць у Ð²Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ° аб Ñкой неабходна певедаміць?",
"IWantTo": "Я хачу, каб:",
- "LearnWaysToParticipate": "ДаведайцеÑÑ Ð¿Ñ€Ð° ÑžÑе ÑпоÑабы %s ўдзельнічыÑтва %s",
+ "LearnWaysToParticipate": "ДаведайцеÑÑ Ð¿Ñ€Ð° ÑžÑе ÑпоÑабы %1$s ўдзельнічыÑтва %2$s",
"ManuallySendEmailTo": "Калі лаÑка, уручную адпраўце паведамленне да",
"SendFeedback": "Ðдправіць водгук",
- "ThankYou": "ДзÑкуй за дапамогу нам зрабіць Piwik лепш!",
- "VisitTheForums": "Ðаведайце %s форумы %s"
+ "ThankYou": "ДзÑкуй за дапамогу нам зрабіць Piwik лепш!"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/bg.json b/plugins/Feedback/lang/bg.json
index 70b629ffe11d866c8b148e70b08af694732e3459..2085faac8bf6e14a3966501fb8fbd10018c53d38 100644
--- a/plugins/Feedback/lang/bg.json
+++ b/plugins/Feedback/lang/bg.json
@@ -2,12 +2,11 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Желаете да докладвате за грешка или имате предложение?",
"IWantTo": "Ð–ÐµÐ»Ð°Ñ Ð´Ð°:",
- "LearnWaysToParticipate": "Ðаучете повече за начините, как бихте могли да %sучаÑтвате%s",
+ "LearnWaysToParticipate": "Ðаучете повече за начините, как бихте могли да %1$sучаÑтвате%2$s",
"ManuallySendEmailTo": "ÐœÐ¾Ð»Ñ Ð¸Ð·Ð¿Ñ€Ð°Ñ‚ÐµÑ‚Ðµ ръчно Вашето Ñъобщение до",
"RateFeatureThankYouTitle": "Благодарим ви, че оценихте '%s'!",
"SendFeedback": "Изпрати Ñъобщението",
"ThankYou": "БлагодарÑ, че помогнахте да направим Piwik по-добър!",
- "TopLinkTooltip": "Може да ни кажете какво миÑлите, както и да изиÑкате профеÑионална помощ.",
- "VisitTheForums": "ПоÑетете нашиÑÑ‚ %sФорум%s"
+ "TopLinkTooltip": "Може да ни кажете какво миÑлите, както и да изиÑкате профеÑионална помощ."
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/ca.json b/plugins/Feedback/lang/ca.json
index fdf83f335c1f90ce109dbe0795a1bd541836398f..f172f63546b5cc4f9039a3bd96372ad6c01703d0 100644
--- a/plugins/Feedback/lang/ca.json
+++ b/plugins/Feedback/lang/ca.json
@@ -2,11 +2,10 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Teniu algun error que reportar o una petició de noves funcionalitats?",
"IWantTo": "Jo vull:",
- "LearnWaysToParticipate": "Apren sobre les formes en que tu pots %s participar %s",
+ "LearnWaysToParticipate": "Apren sobre les formes en que tu pots %1$s participar %2$s",
"ManuallySendEmailTo": "Siusplau envia el vostre missatge manualmetn a",
"SendFeedback": "Enviar Feedback",
"ThankYou": "Grà cies per ajudar-nos a fer el Piwik millor!",
- "TopLinkTooltip": "Digue'ns que en penses o demana suport Professional.",
- "VisitTheForums": "Entra als %s Forums%s"
+ "TopLinkTooltip": "Digue'ns que en penses o demana suport Professional."
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/cs.json b/plugins/Feedback/lang/cs.json
index 935e9913b4af72d8b06bcbcd2e6ea1691a5d3719..bda47c8959f7743f6126796e064aeaffb72a4ac6 100644
--- a/plugins/Feedback/lang/cs.json
+++ b/plugins/Feedback/lang/cs.json
@@ -3,19 +3,19 @@
"DoYouHaveBugReportOrFeatureRequest": "Máte hlášenà chyby, nebo námět na vylepšen�",
"HowToCreateTicket": "ProsÃm, pÅ™eÄtÄ›te si doporuÄenÃ, jak dobÅ™e nahlásit %1$schybu%2$s nebo %3$sžádost o vlastnost%4$s. Potom se zaregistrujte nebo pÅ™ihlaste do %5$ssystému pro sledovánà problémů%6$s a vytvoÅ™te %7$snový problém%8$s.",
"IWantTo": "Chci:",
- "LearnWaysToParticipate": "NauÄit způsoby jak %s spolupracovat %s",
+ "LearnWaysToParticipate": "NauÄit způsoby jak %1$s spolupracovat %2$s",
"ManuallySendEmailTo": "ProsÃm poÅ¡lete ruÄnÄ› zprávu",
"PluginDescription": "Pošlete tým Piwiku vaši odezvu. Podělte se o své návrhy a nápady a pomozte nám, aby se Piwik stal nejlepšà analytickou platformou vůbec.",
"PrivacyClaim": "Piwik respektuje vaÅ¡e %1$ssoukromÃ%2$s a dává vám plnou kontrolu nad vaÅ¡imi daty.",
"RateFeatureLeaveMessageDislike": "Je nám lÃto, že se vám to nelÃbÃ. ŘeknÄ›te nám, jak se můžeme zlepÅ¡it.",
"RateFeatureLeaveMessageLike": "Jsme rádi, že se vám to lÃbÃ. ŘeknÄ›te nám, co se vám lÃbà nejvÃc, nebo jestli máte nÄ›jaký návrh na novou funkci.",
- "RateFeatureSendFeedbackInformation": "Piwik platforma nám (týmu Piwiku) poÅ¡le zprávu s vaÅ¡Ã emailovou adresou, abychom vás v pÅ™ÃpadÄ› otázek mohli kontaktovat.",
+ "RateFeatureSendFeedbackInformation": "Piwik platforma nám (týmu Piwiku) poÅ¡le zprávu s vaÅ¡Ã e-mailovou adresou, abychom vás v pÅ™ÃpadÄ› otázek mohli kontaktovat.",
"RateFeatureThankYouTitle": "Děkujeme za ohodnocenà %s.",
"RateFeatureTitle": "LÃbà se vám vlastnost %s? OhodnoÅ¥te ji a zanechte komentář",
"SendFeedback": "Odeslat odezvu",
"ThankYou": "DÄ›kujeme vám, že pomáháte Piwik dÄ›lat lepÅ¡Ãm!",
"TopLinkTooltip": "Řekni co si myslÃÅ¡, nebo požádej o pomoc profesionála.",
- "ViewAnswersToFAQ": "Zobrazit odpovÄ›di na %sÄasto kladené otázky%s",
+ "ViewAnswersToFAQ": "Zobrazit odpovÄ›di na %1$sÄasto kladené otázky%2$s",
"ViewUserGuides": "NauÄte se, jak konfigurovat Piwik a efektivnÄ› analyzovat data s naÅ¡imi %1$suživatelskými pÅ™ÃruÄkami%2$s",
"CommunityHelp": "Komunitnà pomoc",
"ProfessionalHelp": "Profesionálnà pomoc",
@@ -23,12 +23,12 @@
"PiwikProOfferIntro": "NaÅ¡e nabÃdka obsahuje",
"PiwikProReviewPiwikSetup": "Kontrolu vašeho nastavenà Piwik",
"PiwikProOptimizationMaintenance": "Služby optimalizace a údržby Piwiku",
- "PiwikProPhoneEmailSupport": "Telefonická a emailová podpora",
+ "PiwikProPhoneEmailSupport": "Telefonická a e-mailová podpora",
"PiwikProTraining": "Uživatelská, technická a vývojářská Å¡kolenÃ",
"PiwikProPremiumFeatures": "Prémiové funkce",
"PiwikProCustomDevelopment": "Služby vlastnÃho vývoje",
"PiwikProAnalystConsulting": "Služby analytického konzultanta",
"ContactUs": "Kontaktujte nás",
- "VisitTheForums": "Navštivte %s forum%s"
+ "VisitTheForums": "Navštivte %1$s fóra%2$s a nechte si pomoci komunitou uživatelů aplikace Piwik"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/da.json b/plugins/Feedback/lang/da.json
index 49e24e53f7558ab7ba20696e2be480ffef89a635..4b3f74bf45c6b237a1390abce28a2bb3cc3feee1 100644
--- a/plugins/Feedback/lang/da.json
+++ b/plugins/Feedback/lang/da.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "Har du en fejlrapport eller en anmodning om en funktion?",
"HowToCreateTicket": "Læs anbefalingerne om at skrive en god %1$sfejlrapport%2$s eller %3$sfunktionsanmodning%4$s. Tilmeld eller log ind på %5$svores emne tracker%6$s og opret et %7$snyt emne%8$s.",
"IWantTo": "Jeg ønsker at:",
- "LearnWaysToParticipate": "Lær om alle de måder, du kan %s bidrage%s",
+ "LearnWaysToParticipate": "Lær om alle de måder, du kan %1$s bidrage%2$s",
"ManuallySendEmailTo": "Send din besked manuelt til",
"PluginDescription": "Send tilbagemelding til Piwik holdet. Del dine ideer og forslag til at gøre Piwik til den bedste analyseplatform i verden!",
"PrivacyClaim": "Piwik respekterer din %1$sprivacy%2$s og giver dig fuld kontrol over dine data.",
@@ -15,8 +15,7 @@
"SendFeedback": "Send tilbagemelding",
"ThankYou": "Tak, fordi du hjælper med at gøre Piwik bedre!",
"TopLinkTooltip": "Fortæl os hvad du mener eller anmod om professionel support",
- "ViewAnswersToFAQ": "Se svarene på %sOfte stillede spørgsmål%s",
- "ViewUserGuides": "Lær at konfigurere Piwik og hvordan man effektivt analyserer data med vores %1$sbrugervejledninger%2$s",
- "VisitTheForums": "Besøg %s Forum%s"
+ "ViewAnswersToFAQ": "Se svarene på %1$sOfte stillede spørgsmål%2$s",
+ "ViewUserGuides": "Lær at konfigurere Piwik og hvordan man effektivt analyserer data med vores %1$sbrugervejledninger%2$s"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/de.json b/plugins/Feedback/lang/de.json
index 84cc4e2687d5bd5c6498d1277ba8b54a755fb126..8d40755793ca69379f71e6f384d5f24a5d86c19d 100644
--- a/plugins/Feedback/lang/de.json
+++ b/plugins/Feedback/lang/de.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "Möchten Sie einen Fehler melden oder haben Sie eine Idee für eine neue Funktion?",
"HowToCreateTicket": "Bitte lesen Sie die Empfehlungen wie man eine gute %1$sFehlermeldung%2$s oder einen %3$sVerbesserungsvorschlag%4$s erstellt. Dann registrieren Sie sich oder loggen Sie sich bei %5$sunserem Fehlermeldesystem%6$s an und erstellen Sie einen %7$sneuen Fall%8$s.",
"IWantTo": "Ich möchte:",
- "LearnWaysToParticipate": "Lernen Sie alle Möglichkeiten kennen, wie Sie %s uns unterstützen können%s",
+ "LearnWaysToParticipate": "Lernen Sie alle Möglichkeiten kennen, wie Sie %1$s uns unterstützen können%2$s",
"ManuallySendEmailTo": "Senden Sie Ihre Nachricht manuell an",
"PluginDescription": "Senden Sie Ihr Feedback ans Piwik Team. Teilen Sie uns Ihre Ideen und Vorschläge mit, um Piwik zur besten Analyseplattform der Welt zu machen.",
"PrivacyClaim": "Piwik respektiert Ihre %1$sPrivatsphäre%2$s und gibt Ihnen volle Kontrolle über Ihre Daten.",
@@ -15,7 +15,7 @@
"SendFeedback": "Feedback absenden",
"ThankYou": "Danke für Ihre Unterstützung, Piwik zu verbessern!",
"TopLinkTooltip": "Teilen Sie uns Ihre Meinung mit, oder fordern professionelle Unterstützung an.",
- "ViewAnswersToFAQ": "Antworten zu %sFrequently Asked Questions%s ansehen",
+ "ViewAnswersToFAQ": "Antworten zu %1$sFrequently Asked Questions%2$s ansehen",
"ViewUserGuides": "Lernen Sie mithilfe unseres %1$sBenutzerhandbuches%2$s, wie Sie Piwik konfigurieren können und wie Sie effektiv Ihre Daten analysieren.",
"CommunityHelp": "Hilfe aus der Community",
"ProfessionalHelp": "Profesionelle Hilfe",
@@ -29,6 +29,6 @@
"PiwikProCustomDevelopment": "Individuelle Programmierung",
"PiwikProAnalystConsulting": "Analysenberatung",
"ContactUs": "Kontaktieren Sie uns",
- "VisitTheForums": "Besuchen Sie die %s Foren%s"
+ "VisitTheForums": "Besuchen Sie die %1$s Foren%2$s und erhalten Sie Hilfe von der Piwik Community"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/el.json b/plugins/Feedback/lang/el.json
index 58f53483e0bd0f2846217009ac97b8d6109c636c..d8a6176309768ba7c6dfae0e20dfee279ce6ae9d 100644
--- a/plugins/Feedback/lang/el.json
+++ b/plugins/Feedback/lang/el.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "Έχετε να αναφÎÏετε Îνα Ï€Ïόβλημα ή Îνα αίτημα για χαÏακτηÏιστικό;",
"HowToCreateTicket": "ΠαÏακαλοÏμε διαβάστε τις Ï€Ïοτάσεις για τη σÏνταξη μιας καλής %1$sαναφοÏάς σφάλματος%2$s ή %3$sαίτησης για νÎο χαÏακτηÏιστικό%4$s. Στη συνÎχεια κάντε εγγÏαφή ή συνδεθείτε στην %5$sπαÏακολοÏθηση αιτημάτων%6$s και υποβάλλετε Îνα %7$sνÎο αίτημα%8$s.",
"IWantTo": "ΘÎλω να:",
- "LearnWaysToParticipate": "Μάθετε όλους του Ï„Ïόπους που μποÏείτε να %sσυμμετÎχετε%s",
+ "LearnWaysToParticipate": "Μάθετε όλους του Ï„Ïόπους που μποÏείτε να %1$sσυμμετÎχετε%2$s",
"ManuallySendEmailTo": "Στείλτε χειÏοκίνητα το μήνυμά σας στον\/στην",
"PluginDescription": "Στείλτε τη γνώμη σας στην ομάδα του Piwik. ΜοιÏαστείτε τις ιδÎες και τις Ï€Ïοτάσεις σας για να κάνετε το Piwik την καλÏτεÏη πλατφόÏμα αναλυτικών στον κόσμο!",
"PrivacyClaim": "Το Piwik σÎβεται την %1$sιδιωτικότητά%2$s σας και σας δίνει πλήÏη Îλεγχο πάνω στα δεδομÎνα σας.",
@@ -15,7 +15,7 @@
"SendFeedback": "Στείλτε Επισημάνσεις",
"ThankYou": "ΕυχαÏιστοÏμε που βοηθήσατε να κάνουμε το Piwik καλÏτεÏο!",
"TopLinkTooltip": "Πείτε μας τι σκÎφτεστε ή ζητήστε Επαγγελματική ΥποστήÏιξη.",
- "ViewAnswersToFAQ": "Δείτε τις απαντήσεις στις %sΣυχνÎÏ‚ ΕÏωτήσεις%s",
+ "ViewAnswersToFAQ": "Δείτε απαντήσεις στις %1$sΣυχνÎÏ‚ ΕÏωτήσεις%2$s",
"ViewUserGuides": "Μάθετε πως να παÏαμετÏοποιείτε το Piwik και να αναλÏετε αποτελεσματικά τα δεδομÎνα σας με τους %1$sοδηγοÏÏ‚ χÏήση μας%2$s.",
"CommunityHelp": "Βοήθεια από την κοινότητα",
"ProfessionalHelp": "Βοήθεια από επαγγελματίες",
@@ -29,6 +29,6 @@
"PiwikProCustomDevelopment": "Î ÏοσαÏμοσμÎνες υπηÏεσίες ανάπτυξης",
"PiwikProAnalystConsulting": "ΥπηÏεσίες συμβουλευτικής από αναλυτÎÏ‚",
"ContactUs": "Επικοινωνήστε μαζί μας",
- "VisitTheForums": "Επισκεφτείτε τις %s Δημόσιες Συζητήσεις%s"
+ "VisitTheForums": "Δείτε τα %1$sΦόÏουμ%2$s και λάβετε βοήθεια από την κοινότητα χÏηστών του Piwik"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/en.json b/plugins/Feedback/lang/en.json
index d19caf97fa98455f002d0737781a058484b02d1e..4d55bcfe7a83c3829a919e76f02743ef00f9b882 100644
--- a/plugins/Feedback/lang/en.json
+++ b/plugins/Feedback/lang/en.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "Do you have a bug to report or a feature request?",
"HowToCreateTicket": "Please read the recommendations on writing a good %1$sbug report%2$s or %3$sfeature request%4$s. Then register or login on %5$sour issue tracker%6$s and create a %7$snew issue%8$s.",
"IWantTo": "I want to:",
- "LearnWaysToParticipate": "Learn about all the ways you can %s participate%s",
+ "LearnWaysToParticipate": "Learn about all the ways you can %1$s participate%2$s",
"ManuallySendEmailTo": "Please manually send your message to",
"PluginDescription": "Send your Feedback to the Piwik Team. Share your ideas and suggestions to make Piwik the best analytics platform in the world!",
"PrivacyClaim": "Piwik respects your %1$sprivacy%2$s and gives you full control over your data.",
@@ -15,7 +15,7 @@
"SendFeedback": "Send Feedback",
"ThankYou": "Thank you for helping us to make Piwik better!",
"TopLinkTooltip": "Tell us what you think, or request Professional Support.",
- "ViewAnswersToFAQ": "View answers to %sFrequently Asked Questions%s",
+ "ViewAnswersToFAQ": "View answers to %1$sFrequently Asked Questions%2$s",
"ViewUserGuides": "Learn how to configure Piwik and how to effectively analyze your data with our %1$suser guides%2$s",
"CommunityHelp": "Community Help",
"ProfessionalHelp": "Professional Help",
@@ -29,6 +29,6 @@
"PiwikProCustomDevelopment": "Custom Development services",
"PiwikProAnalystConsulting": "Analyst consulting services",
"ContactUs": "Contact us",
- "VisitTheForums": "Visit the %s Forums%s and get help from the community of Piwik users"
+ "VisitTheForums": "Visit the %1$s Forums%2$s and get help from the community of Piwik users"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/es.json b/plugins/Feedback/lang/es.json
index 849434a96adb60c602e2e428fdda5d7faf66d225..1dc66dfd09bde5d5651cc2ec9e52355587aa8663 100644
--- a/plugins/Feedback/lang/es.json
+++ b/plugins/Feedback/lang/es.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "¿Tienes un error que informar o una nueva caracterÃstica?",
"HowToCreateTicket": "Por favor, lee las recomendaciones de cómo escribir un buen %1$sinforme de error%2$s o %3$spetición de funcionalidad%4$s. Luego regÃstrese o inicie sesión en nuestro %5$ssistema de seguimiento de errores%6$s y crea un %7$snuevo tema de discusión%8$s.",
"IWantTo": "Yo quiero:",
- "LearnWaysToParticipate": "Aprende sobre todas las formas de %sparticipar%s",
+ "LearnWaysToParticipate": "Aprende sobre todas las formas de %1$sparticipar%2$s",
"ManuallySendEmailTo": "Por favor envÃe su mensaje manualmente a",
"PluginDescription": "EnvÃe su comentario al equipo de Piwik. ¡Comparte tus ideas y sugerencias para hacer de Piwik la mejor plataforma de analÃticas en el mundo!",
"PrivacyClaim": "Piwik respeta su %1$sprivacidad%2$s y le deja controlar todos sus datos.",
@@ -15,7 +15,7 @@
"SendFeedback": "Enviar comentario",
"ThankYou": "¡Gracias por ayudarnos a hacer Piwik mejor!",
"TopLinkTooltip": "Danos tu opinión o solicita Soporte Profesional",
- "ViewAnswersToFAQ": "Ver respuestas a las %sPreguntas frecuentes%s",
+ "ViewAnswersToFAQ": "Ver respuestas a las %1$sPreguntas frecuentes%2$s",
"ViewUserGuides": "Aprende a configurar Piwik y analizar sus datos de modo eficaz con nuestras %1$sguÃas de usuario%2$s",
"CommunityHelp": "Ayuda comunitaria",
"ProfessionalHelp": "Ayuda profesional",
@@ -29,6 +29,6 @@
"PiwikProCustomDevelopment": "Servicios de desarrollo personalizado",
"PiwikProAnalystConsulting": "Servicios de consultorÃa de análisis",
"ContactUs": "Contáctanos",
- "VisitTheForums": "Visita el %sForo%s y obtenga ayuda de la comuniad de usuarios Piwik"
+ "VisitTheForums": "Visita el %1$sForo%2$s y obtenga ayuda de la comuniad de usuarios Piwik"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/fa.json b/plugins/Feedback/lang/fa.json
index 9da5b8e998c7b4a50f1cbadd91e5cc076c3d000d..4eb2a5803c137af96eb1e0255ae4077e30e192b3 100644
--- a/plugins/Feedback/lang/fa.json
+++ b/plugins/Feedback/lang/fa.json
@@ -2,11 +2,10 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "آیا شما یک باگ برای گزارش دارید یا درخواستی برای یک ویژگی جدید دارید؟",
"IWantTo": "من می خواهم به :",
- "LearnWaysToParticipate": "درباره راه هایی که می توانید %sمشارکت کنید%s بیشتر بدانید.",
+ "LearnWaysToParticipate": "درباره راه هایی که می توانید %1$sمشارکت کنید%2$s بیشتر بدانید.",
"ManuallySendEmailTo": "لطÙا پیام خود را به صورت دستی ارسال کنید به",
"SendFeedback": "ارسال بازخورد",
"ThankYou": "از شما برای کمک به بهتر کردن پیویک متشکریم!",
- "TopLinkTooltip": "به ما بگویید Ú†Ù‡ Ù…ÛŒ اندیشید یا پشتیبانی ØرÙÙ‡ ای درخواست کنید.",
- "VisitTheForums": "بازدید %s از Ùروم %s"
+ "TopLinkTooltip": "به ما بگویید Ú†Ù‡ Ù…ÛŒ اندیشید یا پشتیبانی ØرÙÙ‡ ای درخواست کنید."
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/fi.json b/plugins/Feedback/lang/fi.json
index 48f3986a1e0300270626ed1087f11fe6fe69eee3..6ab6ec2a91ff6dc1313f45a1f28fc55f7502332b 100644
--- a/plugins/Feedback/lang/fi.json
+++ b/plugins/Feedback/lang/fi.json
@@ -2,7 +2,7 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Onko sinulle virheraportti tai pyyntö uudesta ominaisuudesta?",
"IWantTo": "Haluan:",
- "LearnWaysToParticipate": "Katso erilaisia tapoja %s osallistua%s",
+ "LearnWaysToParticipate": "Katso erilaisia tapoja %1$s osallistua%2$s",
"ManuallySendEmailTo": "Ole hyvä ja lähetä viesti osoitteeseen",
"RateFeatureLeaveMessageDislike": "Harmillista kuulla että et pidä siitä! Voisitko kertoa meille, miten voimme korjata tämän?",
"RateFeatureLeaveMessageLike": "Olemme iloisia että pidit siitä! Kerro meille mistä pidit eniten tai jos sinulla on ehdotuksia uusiksi ominaisuuksiksi.",
@@ -10,7 +10,6 @@
"RateFeatureTitle": "Pidätkö ominaisuudesta '%s'? Jätä arvostelu ja kommentti",
"SendFeedback": "Lähetä palaute",
"ThankYou": "Kiitos että autat parantamaan Piwikiä!",
- "TopLinkTooltip": "Kerro meille mitä ajattelet, tai osta tukipalveluita (englanniksi).",
- "VisitTheForums": "Käy %s foorumeilla %s"
+ "TopLinkTooltip": "Kerro meille mitä ajattelet, tai osta tukipalveluita (englanniksi)."
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/fr.json b/plugins/Feedback/lang/fr.json
index b992c5cfbc901565dca228c4565e9ac26f0c5ee1..0df0bf5e6b08cc2ad7acedb9f70665dbc27ea9c7 100644
--- a/plugins/Feedback/lang/fr.json
+++ b/plugins/Feedback/lang/fr.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "Avez-vous un bug à rapporter ou une fonctionnalité à demander ?",
"HowToCreateTicket": "Veuillez consulter les recommandations sur la rédaction d'un bon %1$srapport de bug%2$s ou %3$sdemande de fonctionnalité%4$s. Puis s'enregistrer ou se connecter sur %5$snotre système de suivi des incidents%6$s et créer un %7$snouvel incident%8$s.",
"IWantTo": "Je veux:",
- "LearnWaysToParticipate": "Renseignez vous sur les manières dont vous pouvez %s participer%s",
+ "LearnWaysToParticipate": "Renseignez vous sur les manières dont vous pouvez %1$s participer%2$s",
"ManuallySendEmailTo": "Merci d'envoyer manuellement votre message à ",
"PluginDescription": "Envoyez votre votre retour d'expérience à l'équipe Piwik. Partagez vos idées et suggestions pour aider à faire de Piwik la meilleure plateforme d'analyse web du monde!",
"PrivacyClaim": "Piwik respecte votre %1$svie privée%2$s et vous donne un contrôle total sur vos données.",
@@ -15,7 +15,7 @@
"SendFeedback": "Envoyer le retour",
"ThankYou": "Merci d'avoir aidé à améliorer Piwik!",
"TopLinkTooltip": "Dites nous ce que vous en pensez, ou demandez un Support Professionnel.",
- "ViewAnswersToFAQ": "Voir les réponses aux %squestions fréquemment posées%s",
+ "ViewAnswersToFAQ": "Voir les réponses aux %1$squestions fréquemment posées%2$s",
"ViewUserGuides": "Apprenez comment configurer Piwik et comment analyser de manière efficaces vos données avec notre %1$sguide utilisateur%2$s",
"CommunityHelp": "Aide de la communauté",
"ProfessionalHelp": "Aide professionnelle",
@@ -28,7 +28,6 @@
"PiwikProPremiumFeatures": "Fonctionnalités premium",
"PiwikProCustomDevelopment": "Services de développement personnalisés",
"PiwikProAnalystConsulting": "Services de consultation en analyse",
- "ContactUs": "Nous contacter",
- "VisitTheForums": "Visitez les %s Forums%s"
+ "ContactUs": "Nous contacter"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/hi.json b/plugins/Feedback/lang/hi.json
index 7cca19f3c5a07c23ac779b91ff1c50a1901788e8..eb9f385152d58509f3281289990f93f2342faa79 100644
--- a/plugins/Feedback/lang/hi.json
+++ b/plugins/Feedback/lang/hi.json
@@ -2,7 +2,7 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "कà¥à¤¯à¤¾ आपके पास à¤à¤• बग की रिपोरà¥à¤Ÿ या à¤à¤• सà¥à¤µà¤¿à¤§à¤¾ का अनà¥à¤°à¥‹à¤§ है?",
"IWantTo": "मैं चाहता हूà¤:",
- "LearnWaysToParticipate": "सà¤à¥€ तरीकों के बारे में जानें, आप %s à¤à¤¾à¤— %s ले सकते हैं",
+ "LearnWaysToParticipate": "सà¤à¥€ तरीकों के बारे में जानें, आप %1$s à¤à¤¾à¤— %2$s ले सकते हैं",
"ManuallySendEmailTo": "अपने संदेश को सà¥à¤µà¥‡à¤•à¥à¤·à¤¾ से à¤à¥‡à¤œà¤¨à¥‡ के लिठकृपया",
"RateFeatureLeaveMessageDislike": "आप इसे पसंद नहीं करते हम सà¥à¤¨à¤¨à¥‡ के लिठखेद है! कृपया हमें बतायें हम कैसे बेहतर कर सकते हैं।",
"RateFeatureLeaveMessageLike": "आप इसे पसंद हम खà¥à¤¶ हैं! हमें आप à¤à¤• सà¥à¤µà¤¿à¤§à¤¾ का अनà¥à¤°à¥‹à¤§ किया है अगर आप सबसे अधिक पसंद है या कà¥à¤¯à¤¾ पता है।",
@@ -10,7 +10,6 @@
"ThankYou": "Piwik बेहतर बनाने में हमें मदद करने के लिठआपका शà¥à¤•à¥à¤°à¤¿à¤¯à¤¾",
"TopLinkTooltip": "आप कà¥à¤¯à¤¾ सोचते हैं हमें बताओ,या वà¥à¤¯à¤¾à¤µà¤¸à¤¾à¤¯à¤¿à¤• सहायता का अनà¥à¤°à¥‹à¤§ करे",
"CommunityHelp": "समà¥à¤¦à¤¾à¤¯ सहायता",
- "ProfessionalHelp": "पेशेवर मदद",
- "VisitTheForums": "%s विचार मंच %s पर जाà¤à¤"
+ "ProfessionalHelp": "पेशेवर मदद"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/hu.json b/plugins/Feedback/lang/hu.json
index 8165b7f4999fb1c16a95c25ed8415fa6710d099c..94192d5b1736479aec558b2f0e2c6e9b217bbd9f 100644
--- a/plugins/Feedback/lang/hu.json
+++ b/plugins/Feedback/lang/hu.json
@@ -2,10 +2,9 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Hibát szeretnél bejelenteni, vagy egy funkció kifejlesztését szeretnéd kérni?",
"IWantTo": "A következőt szeretném:",
- "LearnWaysToParticipate": "GyÅ‘zÅ‘dj meg róla, %shányféleképpen segÃthetsz%s",
+ "LearnWaysToParticipate": "GyÅ‘zÅ‘dj meg róla, %1$shányféleképpen segÃthetsz%2$s",
"ManuallySendEmailTo": "Kérjük, küldd el manuálisan az üzeneted ide:",
"SendFeedback": "Visszajelzés elküldése",
- "ThankYou": "Köszönjük, hogy segÃtesz jobbá tenni a Piwik-et!",
- "VisitTheForums": "Látogasd meg a %sFórumot%s"
+ "ThankYou": "Köszönjük, hogy segÃtesz jobbá tenni a Piwik-et!"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/id.json b/plugins/Feedback/lang/id.json
index 39fed425390641eb7365bcc9e3e2fd47b967b611..32eaf8c16bdfe90c29852bf33c4c2e4c2850b09b 100644
--- a/plugins/Feedback/lang/id.json
+++ b/plugins/Feedback/lang/id.json
@@ -2,11 +2,10 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Apakah Anda ada laporan kutu atau permintaan fitur?",
"IWantTo": "Saya ingin:",
- "LearnWaysToParticipate": "Pelajari bagaimana kamu dapat %s berpartisipasi%s",
+ "LearnWaysToParticipate": "Pelajari bagaimana kamu dapat %1$s berpartisipasi%2$s",
"ManuallySendEmailTo": "Silakan kirim manual pesan Anda ke",
"SendFeedback": "Kirim Umpanbalik",
"ThankYou": "Terimaksih telah membantu kami menjadikan Piwik lebih baik!",
- "TopLinkTooltip": "Katakan apa yang Anda pikirkan, atau membutuhkan Bantuan Profesional.",
- "VisitTheForums": "Kunjungi %s Forum%s"
+ "TopLinkTooltip": "Katakan apa yang Anda pikirkan, atau membutuhkan Bantuan Profesional."
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/it.json b/plugins/Feedback/lang/it.json
index 1e3934e03f621cbe5d5fae4bd4cb3611b768289a..19028736b17561a54d7cad30556fbaade9bd893f 100644
--- a/plugins/Feedback/lang/it.json
+++ b/plugins/Feedback/lang/it.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "Hai un bug da segnalare o una richiesta di funzionalità ?",
"HowToCreateTicket": "Si prega di leggere le raccomandazioni per scrivere un buon %1$srapporto bug%2$s o una %3$srichiesta di funzionalità %4$s. Poi registrati o accedi al nostro %5$stracker dei problemi%6$s e segnala un %7$snuovo problema%8$s.",
"IWantTo": "Vorrei:",
- "LearnWaysToParticipate": "Impara tutti i modi attraverso i quali puoi %s partecipare%s",
+ "LearnWaysToParticipate": "Impara tutti i modi attraverso i quali puoi %1$s partecipare %2$s",
"ManuallySendEmailTo": "Perfavore invia manualmente il messaggio a",
"PluginDescription": "Invia un Feedback al Team di Piwik. Condividi idee e suggerimenti per rendere Piwik la migliore piattaforma al mondo di statistiche web!",
"PrivacyClaim": "Piwik rispetta la tua %1$sprivacy%2$s e ti dà il pieno controllo sui tuoi dati.",
@@ -15,7 +15,7 @@
"SendFeedback": "Invia",
"ThankYou": "Grazie per aiutarci a rendere Piwik migliore!",
"TopLinkTooltip": "Dicci cosa ne pensi, o richiedi supporto professionale.",
- "ViewAnswersToFAQ": "Guarda le risposte alle %sDomande frequenti%s",
+ "ViewAnswersToFAQ": "Guarda le risposte alle %1$sDomande frequenti%2$s",
"ViewUserGuides": "Impara a configurare Piwik e ad analizzare efficacemente i tuoi dati con le nostre %1$sguide utente%2$s",
"CommunityHelp": "Aiuto dalla comunità ",
"ProfessionalHelp": "Aiuto professionale",
@@ -29,6 +29,6 @@
"PiwikProCustomDevelopment": "Sviluppo personalizzato su commissione",
"PiwikProAnalystConsulting": "Consulenza di analisti",
"ContactUs": "Contattaci",
- "VisitTheForums": "Visita i %s Forum%s e ottieni aiuto dalla comunità degli utenti Piwik"
+ "VisitTheForums": "Visita i %1$s Forum%2$s e ottieni aiuto dalla comunità degli utenti Piwik"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/ja.json b/plugins/Feedback/lang/ja.json
index 1819573a93a68ad3b951159a3602e1424b4079b1..f43ceade9accc41091b12cfe8be87251324b9fde 100644
--- a/plugins/Feedback/lang/ja.json
+++ b/plugins/Feedback/lang/ja.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "å ±å‘Šã™ã‚‹ã¹ããƒã‚°ã‚„機能è¦æœ›ãŒã‚ã‚Šã¾ã™ã‹ï¼Ÿ",
"HowToCreateTicket": "æŽ¨å¥¨äº‹é …ã‚’ãŠèªã¿ã«ãªã‚Šã€%1$s ãƒã‚°å ±å‘Š %2$s ã‚„ %3$s 機能ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆ %4$s を書ã„ã¦ãã ã•ã„。ãã®å¾Œã€ç™»éŒ²åˆã¯ %5$s 課題トラッカー%6$s ã«ãƒã‚°ã‚¤ãƒ³ã—ã¦ã€%7$s æ–°ã—ã„課題 %8$s を作æˆã—ã¾ã™ã€‚",
"IWantTo": "ã‚ãªãŸã®å¸Œæœ›ï¼š",
- "LearnWaysToParticipate": "ã‚ãªãŸãŒå‚åŠ ã§ãã‚‹ã™ã¹ã¦ã®æ–¹æ³•ã‚’%så¦ã‚“ã§ãã ã•ã„%s",
+ "LearnWaysToParticipate": "ã‚ãªãŸãŒå‚åŠ ã§ãã‚‹ã™ã¹ã¦ã®æ–¹æ³•ã‚’%1$så¦ã‚“ã§ãã ã•ã„%2$s",
"ManuallySendEmailTo": "ã‚ãªãŸã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’手作æ¥ã§æ¬¡ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¸é€ã£ã¦ãã ã•ã„：",
"PluginDescription": "Piwik ãƒãƒ¼ãƒ ã«ãƒ•ã‚£ãƒ¼ãƒ‰ãƒãƒƒã‚¯ã‚’ãŠé€ã‚Šãã ã•ã„。ã‚ãªãŸã®ã‚¢ã‚¤ãƒ‡ã‚¢ã‚„æ案をシェアã™ã‚‹ã“ã¨ã§ã€Piwik を世界ã§æœ€é«˜ã®ã‚¢ãƒŠãƒªãƒ†ã‚£ãƒƒã‚¯ã‚¹ãƒ»ãƒ—ラットフォームã«ã—ã¾ã—ょã†ã€‚",
"PrivacyClaim": "Piwik 㯠ã‚ãªãŸã® %1$sprivacy%2$s ã‚’å°Šé‡ã—ã¾ã™ã€‚ã‚ãªãŸã®ãƒ‡ãƒ¼ã‚¿ã«é–¢ã™ã‚‹å…¨ã¦ã®ç®¡ç†ã¯ã‚ãªãŸã«ãŠä»»ã›ã—ã¾ã™ã€‚",
@@ -15,7 +15,7 @@
"SendFeedback": "フィードãƒãƒƒã‚¯ã‚’é€ä¿¡",
"ThankYou": "ç§ãŸã¡ãŒ Piwik をより良ãã™ã‚‹ã®ã‚’支æ´ã—ã¦ã„ãŸã ãã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã™ï¼",
"TopLinkTooltip": "ã‚ãªãŸã®æ„見をãŠçŸ¥ã‚‰ã›ãã ã•ã„。ã¾ãŸã¯ã€ãƒ—ãƒãƒ•ã‚§ãƒƒã‚·ãƒ§ãƒŠãƒ«ã‚µãƒãƒ¼ãƒˆã‚’リクエストã—ã¦ãã ã•ã„。",
- "ViewAnswersToFAQ": "%s Frequently Asked Questions %s ã¸ã®å›žç”ã‚’ã”覧ãã ã•ã„。",
+ "ViewAnswersToFAQ": "%1$s Frequently Asked Questions %2$s ã¸ã®å›žç”ã‚’ã”覧ãã ã•ã„。",
"ViewUserGuides": "Piwik ã®è¨å®šæ–¹æ³•ã¨ã€åŠ¹æžœçš„ãªãƒ‡ãƒ¼ã‚¿åˆ†æžæ–¹æ³•ã¯ã€%1$s user guides %2$s ã‚’ã”確èªãã ã•ã„。",
"CommunityHelp": "コミュニティヘルプ",
"ProfessionalHelp": "プãƒãƒ•ã‚§ãƒƒã‚·ãƒ§ãƒŠãƒ«ãƒ˜ãƒ«ãƒ—",
@@ -29,6 +29,6 @@
"PiwikProCustomDevelopment": "カスタム開発サービス",
"PiwikProAnalystConsulting": "アナリストã®ã‚³ãƒ³ã‚µãƒ«ãƒ†ã‚£ãƒ³ã‚°ã‚µãƒ¼ãƒ“ス",
"ContactUs": "ãŠå•ã„åˆã‚ã›",
- "VisitTheForums": "%s フォーラム%s ã«ã‚¢ã‚¯ã‚»ã‚¹ã—ã€Piwik ユーザーã®ã‚³ãƒŸãƒ¥ãƒ‹ãƒ†ã‚£ã‹ã‚‰åŠ©ã‘ã‚’å¾—ã‚‹"
+ "VisitTheForums": "%1$s フォーラム%2$s ã«ã‚¢ã‚¯ã‚»ã‚¹ã—ã€Piwik ユーザーã®ã‚³ãƒŸãƒ¥ãƒ‹ãƒ†ã‚£ã‹ã‚‰åŠ©ã‘ã‚’å¾—ã‚‹"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/ko.json b/plugins/Feedback/lang/ko.json
index 64a1086e7805dac522a5f389c2dbf1f816d50290..d7e0c317ed9db81c94e8594b5d38a38876db364e 100644
--- a/plugins/Feedback/lang/ko.json
+++ b/plugins/Feedback/lang/ko.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "발견한 버그나 ê¸°ëŠ¥ì— ëŒ€í•œ ì˜ê²¬ì„ ë³´ê³ í•˜ì‹œê² ìŠµë‹ˆê¹Œ?",
"HowToCreateTicket": "ì¢‹ì€ %1$s버그 리í¬íŠ¸%2$s í˜¹ì€ %3$s기능 ê°œì„ %4$sì„ ìž‘ì„±í•˜ëŠ” ì¶”ì²œë²•ì— ëŒ€í•´ ì½ì–´ì£¼ì„¸ìš”. ê·¸ 후 %5$sìš°ë¦¬ì˜ ì´ìŠˆ 트래커%6$sì— ê°€ìž… ë° ë¡œê·¸ì¸ í•˜ì…”ì„œ %7$s새로운 ì´ìŠˆ%8$s를 만들어주세요.",
"IWantTo": "ë‚´ê°€ ì›í•˜ëŠ” 것ì€:",
- "LearnWaysToParticipate": "ë‹¹ì‹ ì´ %s참여%sí• ìˆ˜ìžˆëŠ” ëª¨ë“ ë°©ë²•",
+ "LearnWaysToParticipate": "ë‹¹ì‹ ì´ %1$s참여%2$sí• ìˆ˜ìžˆëŠ” ëª¨ë“ ë°©ë²•",
"ManuallySendEmailTo": "ë‹¹ì‹ ì˜ ë©”ì‹œì§€ë¥¼ ë‹¤ìŒ ì£¼ì†Œë¡œ ì§ì ‘ 보내주세요:",
"PluginDescription": "Piwik 팀ì—게 피드백 보내기. ë‹¹ì‹ ì˜ ì•„ì´ë””어와 ì œì•ˆì€ ë” ë‚˜ì€ ì„¸ìƒì—ì„œ 가장 우수한 ë¶„ì„ í”Œëž«í¼ì´ ë Piwik를 ë§Œë“œëŠ”ë° í° ë„ì›€ì´ ë©ë‹ˆë‹¤.",
"PrivacyClaim": "Piwik는 ë‹¹ì‹ ì˜ %1$s프ë¼ì´ë²„ì‹œ%2$s를 존중하며 ë™ì‹œì— ë‹¹ì‹ ì˜ ë°ì´í„°ê°€ ë‹¹ì‹ ì˜ í†µì œ í•˜ì— ìžˆë„ë¡ ë…¸ë ¥í•©ë‹ˆë‹¤.",
@@ -15,7 +15,7 @@
"SendFeedback": "ì˜ê²¬ 보내기",
"ThankYou": "우리가 Piwikì„ í–¥ìƒì‹œí‚¤ëŠ” ë° ë„ì›€ì„ ì£¼ì…”ì„œ ê°ì‚¬í•©ë‹ˆë‹¤!",
"TopLinkTooltip": "ë‹¹ì‹ ì´ í•„ìš”ë¡œ 하는 ê¸°ìˆ ì§€ì› ìš”ì²ì„ ì•Œë ¤ì£¼ì„¸ìš”.",
- "ViewAnswersToFAQ": "%sìžì£¼ 하는 질문%sì—ì„œ 답변 보기",
+ "ViewAnswersToFAQ": "%1$sìžì£¼ 하는 질문%2$sì—ì„œ 답변 보기",
"ViewUserGuides": "%1$sì‚¬ìš©ìž ê°€ì´ë“œ%2$sì—ì„œ 효율ì 으로 ë‹¹ì‹ ì˜ ë°ì´í„°ë¥¼ 분ì„하는 방법과 Piwik를 구성하는 ë²•ì— ëŒ€í•´ì„œ ì•Œ 수 있습니다.",
"CommunityHelp": "커뮤니티ì—ì„œì˜ ë„움",
"ProfessionalHelp": "ì „ë¬¸ê°€ì˜ ë„움",
@@ -28,7 +28,6 @@
"PiwikProPremiumFeatures": "프리미엄",
"PiwikProCustomDevelopment": "맞춤 개발",
"PiwikProAnalystConsulting": "ì „ë¬¸ê°€ 컨설팅",
- "ContactUs": "ì—°ë½ì£¼ì„¸ìš”",
- "VisitTheForums": "%sí¬ëŸ¼%s으로 ì´ë™"
+ "ContactUs": "ì—°ë½ì£¼ì„¸ìš”"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/lt.json b/plugins/Feedback/lang/lt.json
index 2c7efb7f41441b68150ade26147b3dde91704b05..a00f39f1c93991a59a75afce2dbe57e2ec7926ea 100644
--- a/plugins/Feedback/lang/lt.json
+++ b/plugins/Feedback/lang/lt.json
@@ -2,7 +2,7 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Norite pranešti apie aptiktą klaidą arba paprašyti naujų ypatybių?",
"IWantTo": "AÅ¡ noriu:",
- "LearnWaysToParticipate": "Sužinokite kaip galite %s prisijungti%s",
+ "LearnWaysToParticipate": "Sužinokite kaip galite %1$s prisijungti%2$s",
"ManuallySendEmailTo": "Prašome išsiųsti rankiniu būdu",
"PluginDescription": "Siųskite savo atsiliepimus Piwik komandai. Dalinkitės savo idėjomis ir pasiūlymais, kad padarytumėte Piwik geriausia analitikos platforma pasaulyje!",
"RateFeatureLeaveMessageDislike": "Mes apgailestaujame išgirsti, kad jums ji nepatinka! Prašome parašyti, kaip mes galėtume ją patobulinti.",
@@ -12,7 +12,6 @@
"SendFeedback": "Siųsti atsiliepimą",
"ThankYou": "Dėkojame už pagalbą kuriant tobulesnį Piwik!",
"CommunityHelp": "BendruomenÄ—s pagalba",
- "ProfessionalHelp": "Profesionali pagalba",
- "VisitTheForums": "Apsilankykite %s forumuose%s"
+ "ProfessionalHelp": "Profesionali pagalba"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/lv.json b/plugins/Feedback/lang/lv.json
index 1a69aa6e39780d4084990a19cd1089d649d993ed..061ea389c3ea42f22619db54065786d65728d102 100644
--- a/plugins/Feedback/lang/lv.json
+++ b/plugins/Feedback/lang/lv.json
@@ -2,7 +2,7 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Vai Jums ir kļūdas ziņojums vai papildus funkcionalitÄtes pieprasÄ«jums?",
"IWantTo": "Es vēlos:",
- "LearnWaysToParticipate": "UzzinÄt vairÄk par to, kÄ JÅ«s varat %s piedalÄ«ties%s",
+ "LearnWaysToParticipate": "UzzinÄt vairÄk par to, kÄ JÅ«s varat %1$s piedalÄ«ties%2$s",
"ManuallySendEmailTo": "LÅ«dzu manuÄli nosÅ«tiet savu ziņu uz",
"SendFeedback": "Sūtīt atsauksmes",
"ThankYou": "Paldies, ka palīdzat uzlabot Piwik!"
diff --git a/plugins/Feedback/lang/nb.json b/plugins/Feedback/lang/nb.json
index 360ea76c03473308d23eeae5503f0c8c908f3693..d9d4847674c0d3d42791ecc1d508a8b7132701bd 100644
--- a/plugins/Feedback/lang/nb.json
+++ b/plugins/Feedback/lang/nb.json
@@ -2,7 +2,7 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Har du en feil å rapportere eller ny funksjonalitet du ønsker deg?",
"IWantTo": "Jeg vil:",
- "LearnWaysToParticipate": "Lær om alle måtene du kan %s bidra%s",
+ "LearnWaysToParticipate": "Lær om alle måtene du kan %1$s bidra%2$s",
"ManuallySendEmailTo": "Send meldingen manuelt til",
"RateFeatureThankYouTitle": "Takk for at du rangerer «%s»!",
"RateFeatureTitle": "Liker du funksjonen «%s»? Vennligst ranger den og legg igjen en kommentar",
@@ -15,7 +15,6 @@
"PiwikProPhoneEmailSupport": "Telefon og e-post-støtte",
"PiwikProTraining": "Bruker, teknisk- og utviklertrening",
"PiwikProPremiumFeatures": "Premium-funksjoner",
- "ContactUs": "Kontakt oss",
- "VisitTheForums": "Besøk %sforumet%s"
+ "ContactUs": "Kontakt oss"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/nl.json b/plugins/Feedback/lang/nl.json
index b4d5d7a3c300a181f26988b281755599665fbd4f..6ce9e37d181ffc39a54300405b7b27d22aa773f4 100644
--- a/plugins/Feedback/lang/nl.json
+++ b/plugins/Feedback/lang/nl.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "Heeft u een bugmelding of een verzoek voor nieuwe functies?",
"HowToCreateTicket": "Gelieve de richtlijnen te lezen over hoe een correct %1$sbug rapport%2$s of %3$sfeature request%4$s te schrijven. Daarna kun je je registreren of inloggen op %5$sonze issue tracker%6$s en een %7$snieuw issue%8$s aanmaken.",
"IWantTo": "Ik wil:",
- "LearnWaysToParticipate": "Ontdek op welke manieren je kunt %s bijdragen%s",
+ "LearnWaysToParticipate": "Ontdek op welke manieren je kunt %1$s bijdragen%2$s",
"ManuallySendEmailTo": "Gelieve uw bericht handmatig te zenden naar",
"PluginDescription": "Stuur je feedback naar het Piwik team. Deel je ideeën en suggesties om van Piwik het beste analytics platform in de wereld te maken!",
"PrivacyClaim": "Piwik respecteert je %1$sprivacy%2$s en geeft je alle controle over jouw data.",
@@ -15,7 +15,7 @@
"SendFeedback": "Stuur Feedback",
"ThankYou": "Bedankt voor uw bijdrage om Piwik beter te maken!",
"TopLinkTooltip": "Vertel ons je waat je ervan denkt, of vraag om Professionele Ondersteuning.",
- "ViewAnswersToFAQ": "Bekijk de antwoorden van %sveelgestelde vragen%s",
+ "ViewAnswersToFAQ": "Bekijk de antwoorden van %1$sveelgestelde vragen%2$s",
"ViewUserGuides": "Leer hoe je Piwik moet configureren en hoe je data te analyseren met onze %1$sgebruikers handleidingen%2$s",
"CommunityHelp": "Hulp van de community",
"ProfessionalHelp": "Professionele Hulp",
@@ -28,7 +28,6 @@
"PiwikProPremiumFeatures": "Premium functies",
"PiwikProCustomDevelopment": "Eigen Ontwikkel diensten",
"PiwikProAnalystConsulting": "Analyst consultatie diensten",
- "ContactUs": "Contacteer ons",
- "VisitTheForums": "Bezoek de %s Forums %s"
+ "ContactUs": "Contacteer ons"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/nn.json b/plugins/Feedback/lang/nn.json
index e39e42894445047fbffbb3510e46cb105df24dc9..21179bd3e2d83ef85996da0c649958e65e1355be 100644
--- a/plugins/Feedback/lang/nn.json
+++ b/plugins/Feedback/lang/nn.json
@@ -2,10 +2,9 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Vil du rapportera ein feil eller førespurnad om ein funksjon?",
"IWantTo": "Eg ønskjer:",
- "LearnWaysToParticipate": "Lær om korleis du kan %s medverka%s",
+ "LearnWaysToParticipate": "Lær om korleis du kan %1$s medverka%2$s",
"ManuallySendEmailTo": "Send meldinga di manuelt til",
"SendFeedback": "Send attendemelding",
- "ThankYou": "Takk for at hjelper oss med å forbetra Piwik!",
- "VisitTheForums": "GÃ¥ til %s Forumet%s"
+ "ThankYou": "Takk for at hjelper oss med å forbetra Piwik!"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/pl.json b/plugins/Feedback/lang/pl.json
index abf248a0c1ba4d6a52280615cfd1e2241b6a1a55..d877c5039bfd010810002bc0fa21ceb28bf32bd7 100644
--- a/plugins/Feedback/lang/pl.json
+++ b/plugins/Feedback/lang/pl.json
@@ -2,7 +2,7 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Czy odkryłeś błąd o którym chcesz poinformować, lub masz pomysł na nową funkcjonalność?",
"IWantTo": "PragnÄ™:",
- "LearnWaysToParticipate": "Poznaj wszystkie sposoby %s uczestnictwa%s",
+ "LearnWaysToParticipate": "Poznaj wszystkie sposoby %1$s uczestnictwa%2$s",
"ManuallySendEmailTo": "Prosimy ręcznie wysłać swoją wiadomość",
"PrivacyClaim": "Piwik respektuje twoją %1$sprywatność%2$s i oddaje ci pełną kontrolę nad twoimi danymi.",
"RateFeatureLeaveMessageDislike": "Przykro nam słyszeć, że Tobie się nie podoba! Proszę pozwól nam wiedzieć, jak możemy to poprawić.",
@@ -12,7 +12,6 @@
"SendFeedback": "Wyślij opinię",
"ThankYou": "Dziękujemy za pomoc, która pozwala uczynić statystyki Piwik jeszcze lepszymi!",
"TopLinkTooltip": "Powiedz nam co myslisz albo poproÅ› o profesjonalne wsparcie.",
- "ViewUserGuides": "Naucz się jak skonfigurować Piwik i jak efektywnie analizować twoje dane z naszym %1$spodręcznikiem użytkownika%2$s",
- "VisitTheForums": "Odwiedź %s forum%s"
+ "ViewUserGuides": "Naucz się jak skonfigurować Piwik i jak efektywnie analizować twoje dane z naszym %1$spodręcznikiem użytkownika%2$s"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/pt-br.json b/plugins/Feedback/lang/pt-br.json
index 7b060abb66ffdd4b709c4c8189e5348adbef7fa7..a2d46aee7b08cef82ebef9841034f3f529e86f46 100644
--- a/plugins/Feedback/lang/pt-br.json
+++ b/plugins/Feedback/lang/pt-br.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "Você tem algum bug para relatar ou alguma função para pedir?",
"HowToCreateTicket": "Por favor, leia as recomendações de como escrever um bom %1$sbug relatório%2$s ou %3$sfunção requerimento%4$s. Então, registre-se ou faço seu login em %5$snosso questões tracker%6$s e crie uma %7$snova questão%8$s.",
"IWantTo": "Eu quero:",
- "LearnWaysToParticipate": "Aprenda sobre todas as maneiras que você pode %s participar %s",
+ "LearnWaysToParticipate": "Aprenda sobre todas as maneiras que você pode %1$s participar %2$s",
"ManuallySendEmailTo": "Por favor envie manualmente sua mensagem para",
"PluginDescription": "Envie seu Feedback para a Equipe Piwik. Compartilhe as suas ideias e sugestões para tornar Piwik a melhor plataforma de análise do mundo!",
"PrivacyClaim": "Piwik respeita sua %1$sprivacy%2$s e lhe dá controle total de seus dados.",
@@ -15,7 +15,7 @@
"SendFeedback": "Envie FeedBack",
"ThankYou": "Obrigado por nos ajudar a fazer o Piwik melhor!",
"TopLinkTooltip": "Diga-nos o que você pensa, ou suporte.",
- "ViewAnswersToFAQ": "Ver respostas para %sPerguntas Frequentes%s",
+ "ViewAnswersToFAQ": "Ver respostas para %1$sPerguntas Frequentes%2$s",
"ViewUserGuides": "Saiba como configurar o Piwik e como efetivamente analisar seus dados com o nosso %1$sguias do usuário%2$s",
"CommunityHelp": "Ajuda da Comunidade",
"ProfessionalHelp": "Suporte Profissional",
@@ -29,6 +29,6 @@
"PiwikProCustomDevelopment": "Serviços de Desenvolvimento Personalizados",
"PiwikProAnalystConsulting": "Serviços de Consulturia AnalÃtica",
"ContactUs": "Contato",
- "VisitTheForums": "Visite o %s Foruns %s"
+ "VisitTheForums": "Visite o %1$s Fóruns%2$s e obtenha ajuda da comunidade de usuários Piwik"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/pt.json b/plugins/Feedback/lang/pt.json
index 87c378e9e7488f5ed07f6483e54711e67b965392..48329652cbf6adf7d6e9092fa137f2d41c39b408 100644
--- a/plugins/Feedback/lang/pt.json
+++ b/plugins/Feedback/lang/pt.json
@@ -2,10 +2,9 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Tem algum erro para reportar ou um pedido de funcionalidade?",
"IWantTo": "Eu quero:",
- "LearnWaysToParticipate": "Aprenda todas as formas como pode %s participar%s",
+ "LearnWaysToParticipate": "Aprenda todas as formas como pode %1$s participar%2$s",
"ManuallySendEmailTo": "Por favor envie a sua mensagem manualmente para",
"SendFeedback": "Enviar Opinião",
- "ThankYou": "Obrigado por nos ajudar a melhorar o Piwik!",
- "VisitTheForums": "Visitar os %s Fóruns%s"
+ "ThankYou": "Obrigado por nos ajudar a melhorar o Piwik!"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/ro.json b/plugins/Feedback/lang/ro.json
index b5dd25cca86c0e6d364e4eb5e488a83edf1a25b3..851b416a6ee397634ca04778adee9da63e1a6696 100644
--- a/plugins/Feedback/lang/ro.json
+++ b/plugins/Feedback/lang/ro.json
@@ -2,7 +2,7 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Doreşti să raportezi o problemă sau să propui o înbunătăţire?",
"IWantTo": "Doresc să:",
- "LearnWaysToParticipate": "Invata despre toate modalitatile in care poti %s participa%s",
+ "LearnWaysToParticipate": "Invata despre toate modalitatile in care poti %1$s participa%2$s",
"ManuallySendEmailTo": "Va rugam trimiteti manual mesajul dvs catre",
"PrivacyClaim": "Piwik respecta %1$sintimitatea%2$s Dvs. si va acorda control total pentru toate datele.",
"RateFeatureLeaveMessageDislike": "Ne pare rau sa aflam ca nu va place! Va rugam semnalati-ne cum putem imbunatati.",
@@ -13,8 +13,8 @@
"SendFeedback": "Trimite Feedback",
"ThankYou": "Va multumim pentru ca ne ajutati sa facem Piwik mai bun!",
"TopLinkTooltip": "Transmiteti-ne parerea Dvs sau cereti Support Profesional.",
- "ViewAnswersToFAQ": "Vedeti raspunsurile la %sIntrebari Frecvente(FAQ)%s",
+ "ViewAnswersToFAQ": "Vedeti raspunsurile la %1$sIntrebari Frecvente(FAQ)%2$s",
"ViewUserGuides": "Invata cum sa configurezi Piwik si cum sa analizezi datele eficient cu %1$sghidurile de utilizare%2$s",
- "VisitTheForums": "Vizitati %s Forumurile%s si primiti ajutor de la comunitatea de utilizatori Piwik."
+ "VisitTheForums": "Vizitati %1$s Forumurile%2$s si primiti ajutor de la comunitatea de utilizatori Piwik."
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/ru.json b/plugins/Feedback/lang/ru.json
index 60ea654045e2be2d347997707651342a016621f6..e04996be0bd3a948b7fb7fa588c0818bf4cbd445 100644
--- a/plugins/Feedback/lang/ru.json
+++ b/plugins/Feedback/lang/ru.json
@@ -2,7 +2,7 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ багрепорт, или предложение по улучшению функционала?",
"IWantTo": "Я хочу:",
- "LearnWaysToParticipate": "Изучить вÑе ÑпоÑобы, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ которых вы можете %s поучаÑтвовать%s",
+ "LearnWaysToParticipate": "Изучить вÑе ÑпоÑобы, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ которых вы можете %1$s поучаÑтвовать%2$s",
"ManuallySendEmailTo": "ПожалуйÑта, отправьте ваше Ñообщение вручную на",
"PluginDescription": "ÐаправлÑет обратную ÑвÑзь команде Piwik. ДелитеÑÑŒ Ñвоими идеÑми и предложениÑми чтобы Ñделать Piwik лучшей аналитичеÑкой платформой в мире!",
"PrivacyClaim": "Piwik уважает вашу %1$sконфиденциальноÑÑ‚ÑŒ%2$s и дает вам полный контроль над вашими данными.",
@@ -14,7 +14,7 @@
"SendFeedback": "Отправить отзыв",
"ThankYou": "СпаÑибо за помощь в развитии Piwik!",
"TopLinkTooltip": "РаÑÑкажите о Ñвоей проблеме Ñ Piwik или запроÑите профеÑÑиональную помощь.",
- "ViewAnswersToFAQ": "ПоÑмотреть ответы на %sЧаÑто Задаваемые ВопроÑÑ‹%s",
+ "ViewAnswersToFAQ": "ПоÑмотреть ответы на %1$sЧаÑто Задаваемые ВопроÑÑ‹%2$s",
"ViewUserGuides": "Узнайте, как наÑтроить Piwik и Ñффективно анализировать Ваши данные, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ %1$s руководÑтва пользователÑ%2$s",
"CommunityHelp": "Помощь ÑообщеÑтва",
"ProfessionalHelp": "Помощь профеÑÑионала",
@@ -26,7 +26,6 @@
"PiwikProPremiumFeatures": "Премиальные возможноÑти",
"PiwikProCustomDevelopment": "УÑлуги разработки",
"PiwikProAnalystConsulting": "УÑлуги аналитика-конÑультанта",
- "ContactUs": "СвÑжитеÑÑŒ Ñ Ð½Ð°Ð¼Ð¸",
- "VisitTheForums": "ПоÑетить %s Форумы%s"
+ "ContactUs": "СвÑжитеÑÑŒ Ñ Ð½Ð°Ð¼Ð¸"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/sl.json b/plugins/Feedback/lang/sl.json
index ca65fe1a382a8064d84ade3ae65e674cc3eb2106..17d70cb095d756edeb131b9b716bc7f619174dcc 100644
--- a/plugins/Feedback/lang/sl.json
+++ b/plugins/Feedback/lang/sl.json
@@ -2,10 +2,9 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Imate napako ali pa željo, ki nam jo želite sporoÄiti?",
"IWantTo": "Želim:",
- "LearnWaysToParticipate": "Oglejte si vse naÄine kako lahko %ssodelujete%s",
+ "LearnWaysToParticipate": "Oglejte si vse naÄine kako lahko %1$ssodelujete%2$s",
"ManuallySendEmailTo": "Prosimo, da sporoÄilo roÄno poÅ¡ljete",
"SendFeedback": "Pošlji povratno informacijo",
- "ThankYou": "Hvala, ker nam pomagate izboljšati Piwik!",
- "VisitTheForums": "ObiÅ¡Äite %sForume%s"
+ "ThankYou": "Hvala, ker nam pomagate izboljšati Piwik!"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/sq.json b/plugins/Feedback/lang/sq.json
index 803ab58ac869eaec3f76f65dcfb22c7c48d70ed8..e8ff0ace6d0243790535fcf609efcf184ad7b1de 100644
--- a/plugins/Feedback/lang/sq.json
+++ b/plugins/Feedback/lang/sq.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "Keni ndonjë të metë që ta raportoni apo kërkesë për veçori të reja?",
"HowToCreateTicket": "Ju lutemi, lexoni rekomandimet se si të shkruhet si duhet një %1$snjoftim të metash%2$s apo %3$skërkesë për veçori%4$s. Mandej regjistrohuni ose bëni hyrjen te %5$sndjekësi ynë i çështjeve%6$s dhe krijoni një %7$sçështje të re%8$s.",
"IWantTo": "Dua të:",
- "LearnWaysToParticipate": "Njihuni me krejt mënyrat përmes të cilave mund të %s merrni pjesë%s",
+ "LearnWaysToParticipate": "Njihuni me krejt mënyrat përmes të cilave mund të %1$s merrni pjesë%2$s",
"ManuallySendEmailTo": "Ju lutem, dërgojeni mesazhin tuaj dorazi te",
"PluginDescription": "Dërgojani Përshtypjet tuaja Ekipit të Piwik-ut. Ndani me taidetë dhe sugjerimet tuaja për ta bërë Piwik-un platformën më të mirë në botë për analiza!",
"PrivacyClaim": "Piwik-u respekton %1$sprivatësinë%2$s tuaj dhe ju jep kontroll të plotë mbi të dhënat tuaja.",
@@ -15,7 +15,7 @@
"SendFeedback": "Dërgoji Përshtypjet",
"ThankYou": "Faleminderit që na ndihmoni ta bëjmë më të mirë Piwik-un!",
"TopLinkTooltip": "Na thoni se ç’mendim keni, ose kërkoni Asistencë Profesionale.",
- "ViewAnswersToFAQ": "Shihni përgjigjet te %sPyetje të Bëra Shpesh%s",
+ "ViewAnswersToFAQ": "Shihni përgjigjet te %1$sPyetje të Bëra Shpesh%2$s",
"ViewUserGuides": "Mësoni përmes %1$sudhërëfyesit tonë për përdoruesit%2$s se si ta formësoni Piwik-un dhe si të analizoni me efektshmëri të dhënat tuaja",
"CommunityHelp": "Ndihmë nga Bashkësia",
"ProfessionalHelp": "Ndihmë Profesionale",
@@ -28,7 +28,6 @@
"PiwikProPremiumFeatures": "Veçori Me Pagesë",
"PiwikProCustomDevelopment": "Shërbime Personalizimesh",
"PiwikProAnalystConsulting": "Shërbime konsulence analizash",
- "ContactUs": "Lidhuni me ne",
- "VisitTheForums": "Vizitoni %s Forumet%s"
+ "ContactUs": "Lidhuni me ne"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/sr.json b/plugins/Feedback/lang/sr.json
index be5561cc65d290430a6f5c38acef2e77febf3349..274d669e6c72a66173cd561a8cad46aeb34973b0 100644
--- a/plugins/Feedback/lang/sr.json
+++ b/plugins/Feedback/lang/sr.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "Da li želite da prijavite grešku u programu ili imate neku želju?",
"HowToCreateTicket": "Molimo vas da proÄitate preporuke kako se piÅ¡e dobra %1$sprijava problema%2$s ili %3$szahtev za novom funkcionalnošću%4$s. Nakon toga se %5$sregistrujte ili prijavite%6$s i kreirajte %7$snovi zahtev%8$s.",
"IWantTo": "Želim da:",
- "LearnWaysToParticipate": "Pogledajte kako sve možete da %s uzmete uÄešće%s",
+ "LearnWaysToParticipate": "Pogledajte kako sve možete da %1$s uzmete uÄešće%2$s",
"ManuallySendEmailTo": "Molimo vas da pošaljete poruku na",
"PluginDescription": "PoÅ¡aljite vaÅ¡e komentare Piwik timu. Podelite vaÅ¡e ideje i predloge kako bismo uÄinili Piwik najboljom analitiÄkom platformom na svetu!",
"PrivacyClaim": "Piwik poštuje vašu %1$sprivatnost%2$s i daje vam potpunu kontrolu nad vašim podacima.",
@@ -15,7 +15,7 @@
"SendFeedback": "Pošaljite vaše zapažanje",
"ThankYou": "Hvala vam Å¡to nam pomažete da uÄinimo Piwik boljim!",
"TopLinkTooltip": "Recite nam šta mislite ili zatražite profesionalnu pomoć.",
- "ViewAnswersToFAQ": "Prikaži odgovore na %sÄesto postavljana pitanja%s",
+ "ViewAnswersToFAQ": "Prikaži odgovore na %1$sÄesto postavljana pitanja%2$s",
"ViewUserGuides": "NauÄite kako da podesite Piwik i kako da efikasno analizirate vaÅ¡e podatke prateći %1$skorisniÄko uputstvo%2$s",
"CommunityHelp": "Pomoć zajednice",
"ProfessionalHelp": "Profesionalna pomoć",
@@ -28,7 +28,6 @@
"PiwikProPremiumFeatures": "Premium sadržaje",
"PiwikProCustomDevelopment": "Razvoj usluga po vašoj želji",
"PiwikProAnalystConsulting": "Usluge analitiÄkog konsaltinga",
- "ContactUs": "Kontaktirajte nas",
- "VisitTheForums": "Posetite %s Forum%s"
+ "ContactUs": "Kontaktirajte nas"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/sv.json b/plugins/Feedback/lang/sv.json
index bad69f07d3a13a15ee5cf68c6fe338881d2585e8..379daed27b416cb2e42fb6e77cc1efd8929ae30b 100644
--- a/plugins/Feedback/lang/sv.json
+++ b/plugins/Feedback/lang/sv.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "Har du en bugg att rapportera eller en funktionsbegäran?",
"HowToCreateTicket": "Vänligen läs rekommendationerna för hur du skriver en bra %1$sfel rapport%2$s eller %3$sfunktionsförfrågan%4$s. Registrera eller logga in på %5$svårt ärendehanteringssystem%6$s och skapa %7$sett nytt ärende%8$s.",
"IWantTo": "Jag vill:",
- "LearnWaysToParticipate": "Läs om alla sätt du kan %s delta%s",
+ "LearnWaysToParticipate": "Läs om alla sätt du kan %1$s delta%2$s",
"ManuallySendEmailTo": "Vänligen skicka ditt meddelande manuellt till",
"PrivacyClaim": "Piwik respekterar din %1$sintegritet%2$s och ger dig full kontroll över din information.",
"RateFeatureLeaveMessageDislike": "Vi är ledsna över att du inte gillar det! Berätta gärna för oss hur vi kan förbättra Piwik.",
@@ -14,8 +14,12 @@
"SendFeedback": "Skicka Feedback",
"ThankYou": "Tack för att du hjälper oss att göra Piwik bättre!",
"TopLinkTooltip": "Tala om för oss vad du tycker, eller fråga efter professionell support.",
- "ViewAnswersToFAQ": "Se svar på %svanliga frågor%s",
+ "ViewAnswersToFAQ": "Se svar på %1$svanliga frågor%2$s",
"ViewUserGuides": "Lär dig att konfigurera Piwik och hur man på ett effektivt sätt analyserar data med våra %1$sanvändarguider%2$s",
- "VisitTheForums": "Besök %s Forumet%s"
+ "ProfessionalHelp": "Professionell hjälp",
+ "PiwikProOfferIntro": "VÃ¥rt erbjudande inkluderar",
+ "PiwikProPhoneEmailSupport": "Telefon och e-postsupport",
+ "PiwikProPremiumFeatures": "Premium-funktioner",
+ "ContactUs": "Kontakta oss"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/ta.json b/plugins/Feedback/lang/ta.json
index aae11b5308df5a547adc56a461dc04c6a7bdd96e..3c65c9cddf18dbf39d32ce5f27ee4b40f460bdc9 100644
--- a/plugins/Feedback/lang/ta.json
+++ b/plugins/Feedback/lang/ta.json
@@ -2,7 +2,7 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "நீஙà¯à®•à®³à¯ à®à®¤à¯‡à®©à¯à®®à¯ ஒர௠பிழையை அலà¯à®²à®¤à¯ பà¯à®¤à®¿à®¯ à®…à®®à¯à®šà®®à¯ பறà¯à®±à®¿ கோர வேணà¯à®Ÿà¯à®®à®¾?",
"IWantTo": "எனகà¯à®•à¯ தேவை:",
- "LearnWaysToParticipate": "நீஙà¯à®•à®³à¯ %s பஙà¯à®•à¯à®•à¯Šà®³à¯à®³à®•à¯‚டிய%s அனைதà¯à®¤à¯ வழிகளைவà¯à®®à¯ தெரிநà¯à®¤à¯ கொளà¯à®³",
+ "LearnWaysToParticipate": "நீஙà¯à®•à®³à¯ %1$s பஙà¯à®•à¯à®•à¯Šà®³à¯à®³à®•à¯‚டிய%2$s அனைதà¯à®¤à¯ வழிகளைவà¯à®®à¯ தெரிநà¯à®¤à¯ கொளà¯à®³",
"ManuallySendEmailTo": "தயவà¯à®šà¯†à®¯à¯à®¤à¯ சà¯à®¯à®®à®¾à®• உஙà¯à®•à®³à¯ செயà¯à®¤à®¿à®¯à¯ˆ இவரà¯à®•à¯à®•à¯ அனà¯à®ªà¯à®ªà¯à®™à¯à®•à®³à¯",
"SendFeedback": "கரà¯à®¤à¯à®¤à¯ தெரிவிகà¯à®•"
}
diff --git a/plugins/Feedback/lang/th.json b/plugins/Feedback/lang/th.json
index 11765a211e8facebe02c1a3902f58ac2c7fa9c40..c5fecf6fa831b89e1c11eae8bd4d1c44f8c36c47 100644
--- a/plugins/Feedback/lang/th.json
+++ b/plugins/Feedback/lang/th.json
@@ -2,10 +2,9 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "คุณมีข้à¸à¸šà¸à¸žà¸£à¹ˆà¸à¸‡à¹ƒà¸™à¸à¸²à¸£à¸£à¸²à¸¢à¸‡à¸²à¸™à¸«à¸£à¸·à¸à¸à¸²à¸£à¸£à¹‰à¸à¸‡à¸‚à¸à¸„ุณลัà¸à¸©à¸“ะหรืà¸à¹„ม่",
"IWantTo": "ฉันà¸à¸¢à¸²à¸à¸ˆà¸°:",
- "LearnWaysToParticipate": "เรียนรู้เà¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¸—ั้งหมดด้วยวิธี %s คุณสามารถ %s มีส่วนร่วมได้",
+ "LearnWaysToParticipate": "เรียนรู้เà¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¸—ั้งหมดด้วยวิธี %1$s คุณสามารถ %2$s มีส่วนร่วมได้",
"ManuallySendEmailTo": "à¸à¸£à¸¸à¸“าส่งข้à¸à¸„วามขà¸à¸‡à¸„ุณด้วยตนเà¸à¸‡",
"SendFeedback": "ส่งคำติชม",
- "ThankYou": "ขà¸à¸šà¸„ุณที่ช่วยให้เราสามารถทำให้ Piwik ดีà¸à¸§à¹ˆà¸²",
- "VisitTheForums": "เข้าชม %s เว็บบà¸à¸£à¹Œà¸” %s"
+ "ThankYou": "ขà¸à¸šà¸„ุณที่ช่วยให้เราสามารถทำให้ Piwik ดีà¸à¸§à¹ˆà¸²"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/tl.json b/plugins/Feedback/lang/tl.json
index ed55c67f5b168b39f94a0148cf95ab850240ab04..575f0a2152d77b841e588442ad44815f8ba7f025 100644
--- a/plugins/Feedback/lang/tl.json
+++ b/plugins/Feedback/lang/tl.json
@@ -3,7 +3,7 @@
"DoYouHaveBugReportOrFeatureRequest": "Mayroon ka bang iuulat na bug o hihilinging feature?",
"HowToCreateTicket": "Mangyaring basahin ang rekomendasyon sa mahusay na pagsusulat %1$sbug report%2$s o %3$sfeature request%4$s. Pagkatapos magrehistro o mag-login sa %5$sour issue tracker%6$s at gumawa ng %7$snew issue%8$s.",
"IWantTo": "Gusto kong:",
- "LearnWaysToParticipate": "Pag-aralan ang lahat ng daan upang %s makasali sa %s",
+ "LearnWaysToParticipate": "Pag-aralan ang lahat ng daan upang %1$s makasali sa %2$s",
"ManuallySendEmailTo": "Mangyaring manu-manong ipadala ang iyong mensahe sa.",
"PrivacyClaim": "Nirerespeto ng Piwik ang iyong %1$s privacy %2$s at nagbibigay sa iyo ng ganap na kontrol sa iyong data.",
"RateFeatureLeaveMessageDislike": "Ikinalulungkot namin na hindi mo ito gustong marinig! Mangyaring ipaalam samin kung paano naman ito mapapabuti.",
@@ -14,8 +14,8 @@
"SendFeedback": "Magpadala ng Feedback",
"ThankYou": "Salamat sa pagtulong sa amin upang maging mas mabuti ang Piwik!",
"TopLinkTooltip": "Sabihin sa amin ang iyong iniisip o humiling ng Propesyonal na Suporta.",
- "ViewAnswersToFAQ": "Ipakita ang sagot sa %s Mga Madalas Itanong %s",
+ "ViewAnswersToFAQ": "Ipakita ang sagot sa %1$s Mga Madalas Itanong %2$s",
"ViewUserGuides": "Alamin kung paano i-configure ang Piwik at kung paano epektibong pag-aralan ang iyong data sa aming %1$suser gabay sa %2$s.",
- "VisitTheForums": "Bisitahin ang mga %s Forum %s at makakuha ng tulong mula sa komunidad ng mga Piwik user."
+ "VisitTheForums": "Bisitahin ang mga %1$s Forum %2$s at makakuha ng tulong mula sa komunidad ng mga Piwik user."
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/tr.json b/plugins/Feedback/lang/tr.json
index 7afa546a627a8fb677ecd32d5b2bc1d4c12acab6..cbd95587dad8086b44c091622e7955e892f2842f 100644
--- a/plugins/Feedback/lang/tr.json
+++ b/plugins/Feedback/lang/tr.json
@@ -2,14 +2,13 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Hata raporu veya özellik öneriniz mi var?",
"IWantTo": "Ä°stiyorum:",
- "LearnWaysToParticipate": "%sOrtak olabileceğiniz%s tüm yolları öğrenin",
+ "LearnWaysToParticipate": "%1$sOrtak olabileceğiniz%2$s tüm yolları öğrenin",
"ManuallySendEmailTo": "Lütfen mesajınızı elle yollayın",
"RateFeatureLeaveMessageDislike": "Beğenmediğiniz için çok üzgünüz! Lütfen bunu nasıl geliştireceğimiz konusunda yardımcı olun.",
"RateFeatureThankYouTitle": "Oyladığınız için teşekkürler '%s'!",
"RateFeatureTitle": "'%s' özelliğini beğendiniz mi? Lütfen oy verip, bir yorum yapın",
"SendFeedback": "Geribildirim Yollayın",
"ThankYou": "Piwik'i daha iyi yapmamıza yardım ettiğiniz için teşekkür ederiz!",
- "TopLinkTooltip": "Bize fikirlerinizi iletin, ya da Profesyonel Destek isteyin.",
- "VisitTheForums": "%sForumları%s ziyaret edin"
+ "TopLinkTooltip": "Bize fikirlerinizi iletin, ya da Profesyonel Destek isteyin."
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/uk.json b/plugins/Feedback/lang/uk.json
index 94ce2e5322edb4f6088cf5146d1a481bdcbae897..6bebd8ff76c36163776344cb4554bd41621f7e4c 100644
--- a/plugins/Feedback/lang/uk.json
+++ b/plugins/Feedback/lang/uk.json
@@ -2,10 +2,9 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Ви хочете надіÑлати нам Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ помилку чи попроÑити додати нову функцію?",
"IWantTo": "Я хочу:",
- "LearnWaysToParticipate": "ДізнатиÑÑ Ð¿Ñ€Ð¾ вÑÑ– ÑпоÑоби %sдолучитиÑÑ%s",
+ "LearnWaysToParticipate": "ДізнатиÑÑ Ð¿Ñ€Ð¾ вÑÑ– ÑпоÑоби %1$sдолучитиÑÑ%2$s",
"ManuallySendEmailTo": "Будь-лаÑка надішліть ваше Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ð»Ð°Ñноручно на",
"SendFeedback": "ÐадіÑлати відгук",
- "ThankYou": "ДÑкуємо що допомагаєте робити Piwik кращим!",
- "VisitTheForums": "Відвідати %s Форум%s"
+ "ThankYou": "ДÑкуємо що допомагаєте робити Piwik кращим!"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/vi.json b/plugins/Feedback/lang/vi.json
index 0c83ad805b85716bc2d7533edbd6d324ea884259..6a4ab283151ce7579a546af96e22f93551530ea6 100644
--- a/plugins/Feedback/lang/vi.json
+++ b/plugins/Feedback/lang/vi.json
@@ -2,11 +2,10 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "Bạn đã có lá»—i vá»›i báo cáo hoặc yêu cầu tÃnh năng?",
"IWantTo": "Tôi muốn:",
- "LearnWaysToParticipate": "Tìm hiểu vỠtất cả các cách bạn có thể %s tham gia %s",
+ "LearnWaysToParticipate": "Tìm hiểu vỠtất cả các cách bạn có thể %1$s tham gia %2$s",
"ManuallySendEmailTo": "Hãy tá»± gá»i thông Ä‘iệp của bạn tá»›i",
"SendFeedback": "Gá»i feedback",
"ThankYou": "Cảm ơn bạn đã giúp chúng tôi để là m cho Piwik tốt hơn!",
- "TopLinkTooltip": "Hãy cho chúng tôi những suy nghÄ© của bạn, hoặc gá»i má»™t yá»u \"Professional Support\"",
- "VisitTheForums": "Thăm %s diễn đà n %s"
+ "TopLinkTooltip": "Hãy cho chúng tôi những suy nghÄ© của bạn, hoặc gá»i má»™t yá»u \"Professional Support\""
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/zh-cn.json b/plugins/Feedback/lang/zh-cn.json
index e95d1f0ddcb26c0843c7150ca7692c33325ab7ba..2fa0b05bccec41506f066cf08b33f41571413ad3 100644
--- a/plugins/Feedback/lang/zh-cn.json
+++ b/plugins/Feedback/lang/zh-cn.json
@@ -2,11 +2,10 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "您有bug报告或è¦æ–°å¢žåŠŸèƒ½ï¼Ÿ",
"IWantTo": "我想è¦:",
- "LearnWaysToParticipate": "了解所有您å¯ä»¥ %s å‚与%s 的方法",
+ "LearnWaysToParticipate": "了解所有您å¯ä»¥ %1$s å‚与%2$s 的方法",
"ManuallySendEmailTo": "请手动å‘é€ä¿¡æ¯è‡³",
"SendFeedback": "æ交å馈",
"ThankYou": "感谢您帮助我们改进 Piwik ï¼",
- "TopLinkTooltip": "告诉我们您的想法，或者寻求专业技术支æŒã€‚",
- "VisitTheForums": "访问 %s 论å›%s"
+ "TopLinkTooltip": "告诉我们您的想法，或者寻求专业技术支æŒã€‚"
}
}
\ No newline at end of file
diff --git a/plugins/Feedback/lang/zh-tw.json b/plugins/Feedback/lang/zh-tw.json
index 445de0fd3acc206bd5dc3429f7678f5f962b4cc3..c2b37bc959ab7cffb394ecb44a9ca22aed31c377 100644
--- a/plugins/Feedback/lang/zh-tw.json
+++ b/plugins/Feedback/lang/zh-tw.json
@@ -2,11 +2,10 @@
"Feedback": {
"DoYouHaveBugReportOrFeatureRequest": "ä½ æœ‰ä¸€å€‹è‡èŸ²å›žå ±æˆ–功能請求？",
"IWantTo": "我想è¦ï¼š",
- "LearnWaysToParticipate": "çžè§£æ‰€æœ‰ä½ å¯ä»¥ %s åƒèˆ‡%s 的方法",
+ "LearnWaysToParticipate": "çžè§£æ‰€æœ‰ä½ å¯ä»¥ %1$s åƒèˆ‡%2$s 的方法",
"ManuallySendEmailTo": "請手動寄é€ä½ 的訊æ¯è‡³",
"SendFeedback": "é€å‡ºæ„見",
"ThankYou": "è¬è¬ä½ å”助我們使 Piwik 變得更好ï¼",
- "TopLinkTooltip": "請分享您的æ„見，或æ出專æ¥æ”¯æ´è¦æ±‚。",
- "VisitTheForums": "è¨ªå• %s 論壇%s"
+ "TopLinkTooltip": "請分享您的æ„見，或æ出專æ¥æ”¯æ´è¦æ±‚。"
}
}
\ No newline at end of file
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 966005b690a71fd3b81aa8a95a2f0c75464f73a4..5d7a5168e25ced51f830feb835f90f3c4411542b 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -98,6 +98,7 @@ class Controller extends \Piwik\Plugin\Controller
// conversion rate for new and returning visitors
$view->conversion_rate_returning = $this->formatConversionRate($goalMetrics, 'conversion_rate_returning_visit');
$view->conversion_rate_new = $this->formatConversionRate($goalMetrics, 'conversion_rate_new_visit');
+ $view->idGoal = $idGoal;
return $view->render();
}
diff --git a/plugins/Goals/Pages.php b/plugins/Goals/Pages.php
index 571a5f75cd74cbe62730af00bb90939cface237d..72db6cc21bafec613f519d13f7ea1b1a33912a74 100644
--- a/plugins/Goals/Pages.php
+++ b/plugins/Goals/Pages.php
@@ -338,7 +338,8 @@ class Pages
private function createWidgetForReport($module, $action)
{
- $factory = new ReportWidgetFactory(Reports::factory($module, $action));
+ $report = Reports::factory($module, $action);
+ $factory = new ReportWidgetFactory($report);
return $factory->createWidget();
}
diff --git a/plugins/Goals/lang/ar.json b/plugins/Goals/lang/ar.json
index 8c40a009178684f16246e8520cbf1b7a0231824f..0f1394d2ecf20da521d193c235da72341f75ffc3 100644
--- a/plugins/Goals/lang/ar.json
+++ b/plugins/Goals/lang/ar.json
@@ -2,7 +2,7 @@
"Goals": {
"AddGoal": "أض٠هدÙاً",
"AddNewGoal": "أض٠هدÙاً جديداً",
- "AddNewGoalOrEditExistingGoal": "%s أض٠هدÙاً جديداً %s أو %s Øرر %s أهداÙاً قائمة",
+ "AddNewGoalOrEditExistingGoal": "%1$s أض٠هدÙاً جديداً %2$s أو %3$s Øرر %4$s أهداÙاً قائمة",
"AllowGoalConvertedMoreThanOncePerVisit": "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù‡Ø¯Ù Ø¨Ø§Ù„ØªØويل أكثر من مرة لكل زيارة",
"AllowMultipleConversionsPerVisit": "Ø§Ù„Ø³Ù…Ø§Ø Ø¨Ø¹Ø¯Ø© تØويلات لكل زيارة",
"BestCountries": "Ø£Ùضل الدول من Øيث التØويل هي:",
@@ -21,7 +21,7 @@
"DefaultRevenueHelp": "على سبيل المثال، نموذج الاتصال الذي يرسله الزائر قد يساوي 10 جنيه ÙÙŠ المتوسط. سيساعدك Piwik ÙÙŠ Ùهم كي٠تؤدي القطاعات المختلÙØ© من زياراتك.",
"DeleteGoalConfirm": "هل ترغب Øقاً ÙÙŠ Øذ٠الهد٠%sØŸ",
"Download": "تØميل ملÙ",
- "ExceptionInvalidMatchingString": "إذا اخترت \"مطابق تماماً\"ØŒ Ùإن العبارة المطابقة يجب أن تكون رابط ويب يبدأ بالتالي %s. على سبيل المثال \"%s\".",
+ "ExceptionInvalidMatchingString": "إذا اخترت \"مطابق تماماً\"ØŒ Ùإن العبارة المطابقة يجب أن تكون رابط ويب يبدأ بالتالي %1$s. على سبيل المثال \"%2$s\".",
"ExternalWebsiteUrl": "رابط موقع خارجي",
"Filename": "اسم الملÙ",
"GoalConversion": "تØويل الهدÙ",
@@ -51,6 +51,6 @@
"VisitUrl": "زيارة رابط معين (صÙØØ© أو مجموعة من الصÙØات)",
"WhenVisitors": "عندما يقوم الزوار",
"WhereThe": "Øيث يكون",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "Øيث تكون الصÙØØ© تØتوي على استدعاء لجاÙاسكريبت piwikTracker.trackGoal() (%sتعر٠على المزيد%s)"
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "Øيث تكون الصÙØØ© تØتوي على استدعاء لجاÙاسكريبت piwikTracker.trackGoal() (%1$sتعر٠على المزيد%2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/be.json b/plugins/Goals/lang/be.json
index 42efc85eed7c7fa50fdc5f2e6232fbb74c546bd9..4374b6ebf6d4e17bb7bf09f4de31f24cf541dc9c 100644
--- a/plugins/Goals/lang/be.json
+++ b/plugins/Goals/lang/be.json
@@ -3,7 +3,7 @@
"AbandonedCart": "Ðдмененых Кошыкаў",
"AddGoal": "Дадаць ÐœÑту",
"AddNewGoal": "Дадаць новую ÐœÑту",
- "AddNewGoalOrEditExistingGoal": "%sДадаць новую ÐœÑту%s або %sÐ Ñдагаваць%s Ñ–ÑÐ½ÑƒÑŽÑ‡Ñ‹Ñ ÐœÑÑ‚Ñ‹",
+ "AddNewGoalOrEditExistingGoal": "%1$sДадаць новую ÐœÑту%2$s або %3$sÐ Ñдагаваць%4$s Ñ–ÑÐ½ÑƒÑŽÑ‡Ñ‹Ñ ÐœÑÑ‚Ñ‹",
"AllowGoalConvertedMoreThanOncePerVisit": "Дазволіць канвертаванне ÐœÑÑ‚Ñ‹ больш чым адзін раз за наведванне",
"AllowMultipleConversionsPerVisit": "Дазволіць некалькі канверÑій за адно наведванне",
"BestCountries": "Краіны з Ñамай лепшай канверÑÑ–Ñй:",
@@ -42,7 +42,7 @@
"EcommerceOrder": "Ðлектронна-ÐºÐ°Ð¼ÐµÑ€Ñ†Ñ‹Ð¹Ð½Ð°Ñ Ð·Ð°Ð¼Ð¾Ð²Ð°",
"EcommerceOverview": "ÐглÑд Ðлектроннай камерцыі",
"EcommerceReports": "Справаздачы Ñлектроннай камерцыі",
- "ExceptionInvalidMatchingString": "Калі вы вылучыце 'дакладнае Ñупадзенне', адпавÑдаючы радок павінен быць URL-адраÑам, пачынаючы %s. Ðапрыклад, '%s'.",
+ "ExceptionInvalidMatchingString": "Калі вы вылучыце 'дакладнае Ñупадзенне', адпавÑдаючы радок павінен быць URL-адраÑам, пачынаючы %1$s. Ðапрыклад, '%2$s'.",
"ExternalWebsiteUrl": "знешні URL-Ð°Ð´Ñ€Ð°Ñ Ñайта",
"Filename": "Ñ–Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°",
"GoalConversion": "КанверÑÑ–Ñ ÐœÑÑ‚Ñ‹",
@@ -79,7 +79,7 @@
"VisitUrl": "Ðаведайце URL-Ð°Ð´Ñ€Ð°Ñ (Ñтаронкі, або групу Ñтаронак)",
"WhenVisitors": "калі наведвальнікі",
"WhereThe": "дзе",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "дзе Ñтаронка павінна змÑшчаць выклік JavaScript piwikTracker.trackGoal() метада (%sдаведацца больш%s)",
- "YouCanEnableEcommerceReports": "Ð’Ñ‹ можаце ўключыць %s Ð´Ð»Ñ Ð³Ñтага вÑб-Ñайта Ñž %s Ñтаронкі."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "дзе Ñтаронка павінна змÑшчаць выклік JavaScript piwikTracker.trackGoal() метада (%1$sдаведацца больш%2$s)",
+ "YouCanEnableEcommerceReports": "Ð’Ñ‹ можаце ўключыць %1$s Ð´Ð»Ñ Ð³Ñтага вÑб-Ñайта Ñž %2$s Ñтаронкі."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/bg.json b/plugins/Goals/lang/bg.json
index 2999f16f9de7e30c265955ffb8763dcbb582f020..8729dc5666cc76e218a20e69000012cd7320450e 100644
--- a/plugins/Goals/lang/bg.json
+++ b/plugins/Goals/lang/bg.json
@@ -3,7 +3,7 @@
"AbandonedCart": "ИзоÑтавена кошница",
"AddGoal": "Добави цел",
"AddNewGoal": "Добави нова цел",
- "AddNewGoalOrEditExistingGoal": "%sДобави нова цел%s или %sРедактирай%s ÑъщеÑтвуващите цели",
+ "AddNewGoalOrEditExistingGoal": "%1$sДобави нова цел%2$s или %3$sРедактирай%4$s ÑъщеÑтвуващите цели",
"AllowGoalConvertedMoreThanOncePerVisit": "Позволи Целта да бъде конвертирана повече от веднъж за едно поÑещение",
"AllowMultipleConversionsPerVisit": "Разреши нÑколко конверÑии за поÑещение.",
"BestCountries": "Вашето най-добро конвертиране на Ñтраните е:",
@@ -25,7 +25,7 @@
"ColumnVisits": "ПълниÑÑ‚ брой на поÑещениÑта, незавиÑимо дали е задейÑтвана цел или не.",
"ColumnVisitsProductDocumentation": "БроÑÑ‚ поÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð½Ð° Продуктовата\/Категорийна Ñтраница. Това Ñе използва Ñъщо за да Ñе изчиÑли %s Ñтепента на конверÑиÑ. Метричните данни Ñа в отчета, ако изгледа Електронна Ñ‚ÑŠÑ€Ð³Ð¾Ð²Ð¸Ñ Ðµ бил наÑтроен в Продукт\/ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ñтраниците.",
"Contains": "Ñъдържа %s",
- "ConversionByTypeReportDocumentation": "Този отчет дава детайлна Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñно развитието на целта (конверÑии, Ñтепен на конверÑиÑта и приход от поÑещението) за вÑÑка една от категориите, показани на Ð»ÐµÐ²Ð¸Ñ Ð¿Ð°Ð½ÐµÐ». %s ÐœÐ¾Ð»Ñ Ð½Ð°Ñ‚Ð¸Ñнете на нÑÐºÐ¾Ñ Ð¾Ñ‚ категориите, за да видите отчета. %s За повече информациÑ, прочетете %sдокументациÑта за проÑледÑване на целите на piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Този отчет дава детайлна Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñно развитието на целта (конверÑии, Ñтепен на конверÑиÑта и приход от поÑещението) за вÑÑка една от категориите, показани на Ð»ÐµÐ²Ð¸Ñ Ð¿Ð°Ð½ÐµÐ». %1$s ÐœÐ¾Ð»Ñ Ð½Ð°Ñ‚Ð¸Ñнете на нÑÐºÐ¾Ñ Ð¾Ñ‚ категориите, за да видите отчета. %2$s За повече информациÑ, прочетете %3$sдокументациÑта за проÑледÑване на целите на piwik.org%4$s",
"ConversionRate": "%s обменниÑÑ‚ курÑ",
"Conversions": "%s конверÑиÑ",
"ConversionsOverview": "Общ преглед на реализациите",
@@ -43,7 +43,7 @@
"EcommerceOrder": "Електронна Ñ‚ÑŠÑ€Ð³Ð¾Ð²Ð¸Ñ Ð¿Ð¾Ñ€ÑŠÑ‡ÐºÐ°",
"EcommerceOverview": "Електронна Ñ‚ÑŠÑ€Ð³Ð¾Ð²Ð¸Ñ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´",
"EcommerceReports": "Електронна Ñ‚ÑŠÑ€Ð³Ð¾Ð²Ð¸Ñ Ð´Ð¾ÐºÐ»Ð°Ð´Ð¸",
- "ExceptionInvalidMatchingString": "Ðко изберете 'точно Ñъвпадение', ÑъвпадащиÑÑ‚ низ, Ñ‚Ñ€Ñбва да започне Ñ URL %s. Ðапример, '%s'.",
+ "ExceptionInvalidMatchingString": "Ðко изберете 'точно Ñъвпадение', ÑъвпадащиÑÑ‚ низ, Ñ‚Ñ€Ñбва да започне Ñ URL %1$s. Ðапример, '%2$s'.",
"ExternalWebsiteUrl": "външен URL",
"Filename": "име на файла",
"GoalConversion": "КонверÑÐ¸Ñ Ð½Ð° цел",
@@ -83,7 +83,7 @@
"VisitUrl": "поÑетÑÑ‚ определен URL (Ñтраница или група от Ñтраници)",
"WhenVisitors": "когато поÑетителите",
"WhereThe": "където",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "когато поÑетена Ñтраница Ñъдържа призив към JavaScript piwikTracker.trackGoal() метод (%sнаучете повече%s)",
- "YouCanEnableEcommerceReports": "Можете да включите %s за този уебÑайт в %s Ñтраницата."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "когато поÑетена Ñтраница Ñъдържа призив към JavaScript piwikTracker.trackGoal() метод (%1$sнаучете повече%2$s)",
+ "YouCanEnableEcommerceReports": "Можете да включите %1$s за този уебÑайт в %2$s Ñтраницата."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/ca.json b/plugins/Goals/lang/ca.json
index d492440031d9ebf614a60de30404d490e26c44c1..f081f721ea38160e768fa20e094dbf19ab439ee8 100644
--- a/plugins/Goals/lang/ca.json
+++ b/plugins/Goals/lang/ca.json
@@ -3,7 +3,7 @@
"AbandonedCart": "Cistella abandonada",
"AddGoal": "Afegir un objectiu",
"AddNewGoal": "Afegir un nou objectiu",
- "AddNewGoalOrEditExistingGoal": "%sAfegeix un nou objectiu%s o %sEdita objectius existents%s",
+ "AddNewGoalOrEditExistingGoal": "%1$sAfegeix un nou objectiu%2$s o %3$sEdita objectius existents%4$s",
"AllowGoalConvertedMoreThanOncePerVisit": "Permetre convertir un objectiu més d'una vegada per visita",
"AllowMultipleConversionsPerVisit": "Permetre múltiples conversions per visita",
"BestCountries": "Els millors paÃsos amb conversions són:",
@@ -26,7 +26,7 @@
"ColumnVisits": "El nombre total de visites, sense tenir en compte si s'ha assolit l'objectiu o no.",
"ColumnVisitsProductDocumentation": "El nombre de visites a la pagina del Producte\/Categoria. S'utiltiza per calcular el rati de conversió del %s. Aquesta mètrica està a l'informe si",
"Contains": "conté %s",
- "ConversionByTypeReportDocumentation": "Aquest informe proporciona informació detallada sobre la productivitat dels objectius (conversions, rati de conversións i ingresos per visita) per cada una de les catagories disponibles al panell de l'esquerra. %s Cliqueu alguna de les categories per veure l'informe. %s Per mes informació, llegiu %s la documetnació sobre el rastreig d'objectius a piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Aquest informe proporciona informació detallada sobre la productivitat dels objectius (conversions, rati de conversións i ingresos per visita) per cada una de les catagories disponibles al panell de l'esquerra. %1$s Cliqueu alguna de les categories per veure l'informe. %2$s Per mes informació, llegiu %3$s la documetnació sobre el rastreig d'objectius a piwik.org%4$s",
"ConversionRate": "Rati de coversió de %s",
"Conversions": "%s conversions",
"ConversionsOverview": "Vista general de les conversions",
@@ -44,7 +44,7 @@
"EcommerceOrder": "Ordre d'ecomerç",
"EcommerceOverview": "Vista general ecomerç",
"EcommerceReports": "Informes d'Ecommerce",
- "ExceptionInvalidMatchingString": "Si escolleu 'coïncidencia exacta', el cadena de coincidència ha de ser una URL que comença per %s. Per exemple, '%s'.",
+ "ExceptionInvalidMatchingString": "Si escolleu 'coïncidencia exacta', el cadena de coincidència ha de ser una URL que comença per %1$s. Per exemple, '%2$s'.",
"ExternalWebsiteUrl": "URL del lloc web extern",
"Filename": "nom del fitxer",
"GoalConversion": "Conversió d'objectius",
@@ -83,7 +83,7 @@
"VisitUrl": "Visitar una URL donada (pà gina o grup de pà gines)",
"WhenVisitors": "quan el visitant",
"WhereThe": "quan el",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "quan la pagina visitada conté una crida al mètode piwikTracker.trackGoal() de la API de Javascript (%s saber més %s)",
- "YouCanEnableEcommerceReports": "Podeu activar el %s per aquest lloc web a la pà gina %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "quan la pagina visitada conté una crida al mètode piwikTracker.trackGoal() de la API de Javascript (%1$s saber més %2$s)",
+ "YouCanEnableEcommerceReports": "Podeu activar el %1$s per aquest lloc web a la pà gina %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/cs.json b/plugins/Goals/lang/cs.json
index e229f04e1446ee2402b69cb66de9fe76aa7bffc0..e26bd7f11aba3df82b46858122b4e6b318d0ba54 100644
--- a/plugins/Goals/lang/cs.json
+++ b/plugins/Goals/lang/cs.json
@@ -3,14 +3,14 @@
"AbandonedCart": "Neobjednané koÅ¡Ãky",
"AddGoal": "PÅ™idat cÃl",
"AddNewGoal": "PÅ™idat nový cÃl",
- "AddNewGoalOrEditExistingGoal": "%sPÅ™idat nový cÃl%s, nebo %sUpravit%s existujÃcà cÃle",
+ "AddNewGoalOrEditExistingGoal": "%1$sPÅ™idat nový cÃl%2$s, nebo %3$sUpravit%4$s existujÃcà cÃle",
"AllowGoalConvertedMoreThanOncePerVisit": "Povolit konverzi cÃle vÃce než jednou za návÅ¡tÄ›vu",
"AllowMultipleConversionsPerVisit": "Povolit vÃce konverzà za návÅ¡tÄ›vu",
"BestCountries": "ZemÄ› s nejvyÅ¡Å¡Ãm poÄtem konverzà jsou:",
"BestKeywords": "KlÃÄová slova s nejvyÅ¡Å¡Ãm poÄtem konverzà jsou:",
"BestReferrers": "OdkazujÃcà stránky s nejvyÅ¡Å¡Ãm poÄtem konverzà jsou:",
"CaseSensitive": "rozliÅ¡ovat velikost pÃsmen",
- "CancelAndReturnToGoals": "ZruÅ¡it a %svrátit se na seznam cÃlů%s",
+ "CancelAndReturnToGoals": "ZruÅ¡it a %1$svrátit se na seznam cÃlů%2$s",
"CategoryTextGeneral_Visitors": "UmÃstÄ›nà uživatele",
"CategoryTextReferrers_Referrers": "Referrery",
"CategoryTextVisitsSummary_VisitsSummary": "Uživatelský atribut",
@@ -33,7 +33,7 @@
"ColumnVisits": "Celkový poÄet návÅ¡tÄ›v bez ohledu na to, jestli doÅ¡lo k vyvolánà cÃle.",
"ColumnVisitsProductDocumentation": "PoÄet návÅ¡tÄ›v stránky produktu\/kategorie. Toto je také použito k výpoÄtu konverznÃho pomÄ›ru pro %s. Toto měřenà je ve hlášenà pouze, pokud bylo na stránkách produktů\/kategorià nastaveno sledovánà elektronického obchodu.",
"Contains": "obsahuje %s",
- "ConversionByTypeReportDocumentation": "Toto hlášenà poskytuje podrobné informace o výkonu cÃle (konverze, konverznà pomÄ›r, celkový pÅ™Ãjem za návÅ¡tÄ›vu) pro každou z kategorià zobrazených v levém panelu. %s KliknÄ›te na jednu z kategorià pro zobrazenà hlášenÃ. %s Pro vÃce informacà si pÅ™eÄtÄ›te %sdokumentaci sledovánà cÃlů%s",
+ "ConversionByTypeReportDocumentation": "Toto hlášenà poskytuje podrobné informace o výkonu cÃle (konverze, konverznà pomÄ›r, celkový pÅ™Ãjem za návÅ¡tÄ›vu) pro každou z kategorià zobrazených v levém panelu. %1$s KliknÄ›te na jednu z kategorià pro zobrazenà hlášenÃ. %2$s Pro vÃce informacà si pÅ™eÄtÄ›te %3$sdokumentaci sledovánà cÃlů%4$s",
"ConversionRate": "%s frekvence konverzÃ",
"Conversions": "%s konverzÃ",
"ConversionsOverview": "PÅ™ehled konverzÃ",
@@ -52,7 +52,7 @@
"EcommerceOrder": "Objednávky",
"EcommerceOverview": "Ochody - Přehled",
"EcommerceReports": "Hlášenà obchodů",
- "ExceptionInvalidMatchingString": "Pokud zvolÃte 'pÅ™esnou shodu' odpovÃdajÃcà řetÄ›zec musà být URL zaÄÃnajÃcà s %s. NapÅ™Ãklad, '%s'.",
+ "ExceptionInvalidMatchingString": "Pokud zvolÃte 'pÅ™esnou shodu' odpovÃdajÃcà řetÄ›zec musà být URL zaÄÃnajÃcà s %1$s. NapÅ™Ãklad, '%2$s'.",
"ExternalWebsiteUrl": "URL externÃho webu",
"Filename": "jméno souboru",
"GoalConversion": "CÃl konverze",
@@ -68,16 +68,16 @@
"GoalX": "CÃl: %s",
"HelpOneConversionPerVisit": "Pokud byla stránka odpovÃdajÃcà cÃli pÅ™i návÅ¡tÄ›vÄ› obnovena nebo zobrazena vÃcekrát, bude cÃl zapoÄÃtán pouze jednou a to pÅ™i prvnÃm zobrazenÃ.",
"IsExactly": "je přesně %s",
- "LearnMoreAboutGoalTrackingDocumentation": "VÃce o sledovánà cÃlů se dozvÃte v %suživatelské dokumentaci%s.",
+ "LearnMoreAboutGoalTrackingDocumentation": "VÃce o sledovánà cÃlů se dozvÃte v %1$suživatelské dokumentaci%2$s.",
"LeftInCart": "%s Zbylo v koÅ¡Ãku",
- "ManageGoalsOrCreateANewGoal": "%sSpravovat cÃle%s nebo ho vytvoÅ™te.",
+ "ManageGoalsOrCreateANewGoal": "%1$sSpravovat cÃle%2$s nebo ho vytvoÅ™te.",
"Manually": "ruÄnÄ›",
"ManuallyTriggeredUsingJavascriptFunction": "CÃl je ruÄnÄ› zaznamenáván pomocà JavaScriptového API trackGoal()",
"MatchesExpression": "odpovÃdá %s",
"NewGoalIntro": "Sledovánà konverznÃho pomÄ›ru cÃlů je jeden z nejefektivnÄ›jÅ¡Ãch způsobů měřenà a zlepÅ¡ovánà podnikatelských zájmů.",
"NewVisitorsConversionRateIs": "PomÄ›r konverze nové pÅ™ÃchozÃch uživatelů je %s",
- "NoGoalsNeedAccess": "Pouze administrátor nebo uživatel s právy super uživatele může spravovat cÃle pro dané webové stránky. Požádejte vaÅ¡eho Piwik administrátora, aby vám cÃl vytvoÅ™il.<br>Sledovánà cÃlů je skvÄ›lý způsob, jak sledovat a maximalizovat výkonnost vaÅ¡ich webových stránek.",
- "NeedAccess": "Pouze administrátor nebo uživatel s právy super uživatele může spravovat cÃle pro danou webovou stránku.",
+ "NoGoalsNeedAccess": "Pouze administrátor nebo uživatel s právy super-uživatele může spravovat cÃle pro daný web. Požádejte vaÅ¡eho Piwik administrátora, aby cÃl pro váš web vytvoÅ™il.<br>Sledovánà cÃlů je skvÄ›lý způsob, jak sledovat a maximalizovat výkonnost vaÅ¡eho webu!",
+ "NeedAccess": "Pouze administrátor nebo uživatel s právy super-uživatele může spravovat cÃle pro daný web.",
"Optional": "(volitelné)",
"OverallConversionRate": "%s celková frekvence konverzà (návÅ¡tÄ›v se splnÄ›ným cÃlem)",
"OverallRevenue": "%s celkový pÅ™Ãjem",
@@ -101,7 +101,7 @@
"VisitUrl": "NavÅ¡tÃvà zadanou URL (stránku nebo skupiny stránek)",
"WhenVisitors": "pokud návÅ¡tÄ›vnÃci",
"WhereThe": "když",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "kde navÅ¡tÃvená stránka obsahuhe volánà metody JavaScriptu 'trackGoal' (%svÃce%s)",
- "YouCanEnableEcommerceReports": "Pro tyto stránky můžete povolit %s na stránce %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "kde navÅ¡tÃvená stránka obsahuhe volánà metody JavaScriptu 'trackGoal' (%1$svÃce%2$s)",
+ "YouCanEnableEcommerceReports": "Pro tyto stránky můžete povolit %1$s na stránce %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/da.json b/plugins/Goals/lang/da.json
index a6224eee5795a8bb2f4394b7c80325016f9d9a73..55ae158edf2aa8061aed58ab7cd633f4ef5884e7 100644
--- a/plugins/Goals/lang/da.json
+++ b/plugins/Goals/lang/da.json
@@ -3,14 +3,14 @@
"AbandonedCart": "Afbrudt Ordre",
"AddGoal": "Tilføj mål",
"AddNewGoal": "Tilføj et nyt mål",
- "AddNewGoalOrEditExistingGoal": "%sTilføj et nyt mål%s eller %srediger%s eksisterende mål",
+ "AddNewGoalOrEditExistingGoal": "%1$sTilføj et nyt mål%2$s eller %3$srediger%4$s eksisterende mål",
"AllowGoalConvertedMoreThanOncePerVisit": "Tillad at mål konverteres mere end én gang pr. besøg",
"AllowMultipleConversionsPerVisit": "Tillad flere konverteringer pr. besøg",
"BestCountries": "De bedste konverteringslande er:",
"BestKeywords": "Top konverteringssøgeord er:",
"BestReferrers": "Bedste konverteringshjemmeside henvisning er:",
"CaseSensitive": "Forskel på små og store bogstaver",
- "CancelAndReturnToGoals": "Annuller og %sog vend tilbage til listen over mål%s",
+ "CancelAndReturnToGoals": "Annuller og %1$sog vend tilbage til listen over mål%2$s",
"ChooseGoal": "Vælg mål",
"ClickOutlink": "Klik på et link til en ekstern hjemmeside",
"SendEvent": "Send en hændelse",
@@ -29,7 +29,7 @@
"ColumnVisits": "Det samlede antal besøg, uanset om et mål blev udløst eller ej.",
"ColumnVisitsProductDocumentation": "Antallet af besøg på produktet\/kategori siden. Anvendes til at behandle %s konverteringsfrekvens. Målingen er med i rapporten, hvis e-handel sporing var konfigureret på produkt\/kategori siderne.",
"Contains": "indeholder %s",
- "ConversionByTypeReportDocumentation": "Rapporten indeholder detaljerede oplysninger om mål ydeevne (konverteringer, omregningskurser og indtægt pr. besøg) for hver af kategorierne tilgængelig i panelet til venstre. %s Klik på en af kategorierne for at få vist rapporten. %s For mere information læs %sSporing af mål dokumentation på piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Rapporten indeholder detaljerede oplysninger om mål ydeevne (konverteringer, omregningskurser og indtægt pr. besøg) for hver af kategorierne tilgængelig i panelet til venstre. %1$s Klik på en af kategorierne for at få vist rapporten. %2$s For mere information læs %3$sSporing af mål dokumentation på piwik.org%4$s",
"ConversionRate": "%s konverteringsrate",
"Conversions": "%s konverteringer",
"ConversionsOverview": "Konverteringsoversigt",
@@ -48,7 +48,7 @@
"EcommerceOrder": "E-handel ordre",
"EcommerceOverview": "E-handel oversigt",
"EcommerceReports": "E-handelsrapporter",
- "ExceptionInvalidMatchingString": "Hvis der vælges 'eksakt match', skal den matchende streng være en netadresse der starter med %s. F.eks., '%s'.",
+ "ExceptionInvalidMatchingString": "Hvis der vælges 'eksakt match', skal den matchende streng være en netadresse der starter med %1$s. F.eks., '%2$s'.",
"ExternalWebsiteUrl": "ekstern hjemmesideadresse",
"Filename": "filnavn",
"GoalConversion": "MÃ¥l konvertering",
@@ -64,9 +64,9 @@
"GoalX": "MÃ¥l %s",
"HelpOneConversionPerVisit": "Hvis en side der matcher målet opdateres eller ses mere end én gang i et besøg, vil målet kun spores første gang siden bliver indlæst under besøget.",
"IsExactly": "er nøjagtig %s",
- "LearnMoreAboutGoalTrackingDocumentation": "Lær mere om %s sporingsmål i Piwik%s i brugerdokumentationen.",
+ "LearnMoreAboutGoalTrackingDocumentation": "Lær mere om %1$s sporingsmål i Piwik%2$s i brugerdokumentationen.",
"LeftInCart": "%s tilbage i kurven",
- "ManageGoalsOrCreateANewGoal": "%sAdministrer mål%s eller opret et nyt mål nu!",
+ "ManageGoalsOrCreateANewGoal": "%1$sAdministrer mål%2$s eller opret et nyt mål nu!",
"Manually": "manuelt",
"ManuallyTriggeredUsingJavascriptFunction": "Målet udløses manuelt ved hjælp af JavaScript API trackGoal ()",
"MatchesExpression": "matcher udtrykket %s",
@@ -93,7 +93,7 @@
"VisitUrl": "Besøger en bestemt hjemmeside (side eller en gruppe af sider)",
"WhenVisitors": "når de besøgende",
"WhereThe": "Hvor",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "hvor den besøgte side indeholder et kald til JavaScriptet piwikTracker.trackGoal () metode (%s lær mere%s)",
- "YouCanEnableEcommerceReports": "Du kan aktivere %s for hjemmesiden på %s siden."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "hvor den besøgte side indeholder et kald til JavaScriptet piwikTracker.trackGoal () metode (%1$s lær mere%2$s)",
+ "YouCanEnableEcommerceReports": "Du kan aktivere %1$s for hjemmesiden på %2$s siden."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/de.json b/plugins/Goals/lang/de.json
index 73e5f8fca694a93d2178148e6e38b1c2a5b7ecc1..099058defab0a1c55ad1f3318d27be205a1b9463 100644
--- a/plugins/Goals/lang/de.json
+++ b/plugins/Goals/lang/de.json
@@ -3,14 +3,14 @@
"AbandonedCart": "Verlassener Warenkorb",
"AddGoal": "Ziel definieren",
"AddNewGoal": "Ein neues Ziel definieren",
- "AddNewGoalOrEditExistingGoal": "%s Eine neues Ziel definieren%s oder ein existierendes Ziel %sbearbeiten%s",
+ "AddNewGoalOrEditExistingGoal": "%1$sEine neues Ziel definieren%2$s oder ein existierendes Ziel %3$sbearbeiten%4$s",
"AllowGoalConvertedMoreThanOncePerVisit": "Erlauben, dass das Ziel mehr als einmal pro Besuch erreicht werden kann.",
"AllowMultipleConversionsPerVisit": "Mehrfacherreichung pro Besuch erlauben",
"BestCountries": "Beste Umsätze nach Länder:",
"BestKeywords": "Beste Umsätze nach Suchbegriffen:",
"BestReferrers": "Beste Umsätze nach verweisenden Websites:",
"CaseSensitive": "Groß-\/Kleinschreibung beachten",
- "CancelAndReturnToGoals": "Abbrechen und %szur Liste der Ziele zurückkehren%s",
+ "CancelAndReturnToGoals": "Abbrechen und %1$szur Liste der Ziele zurückkehren%2$s",
"CategoryTextGeneral_Visitors": "Benutzerstandort",
"CategoryTextReferrers_Referrers": "Verweise",
"CategoryTextVisitsSummary_VisitsSummary": "Benutzereigenschaft",
@@ -33,7 +33,7 @@
"ColumnVisits": "Die Gesamtanzahl an Besuchen, unabhängig davon ob dabei ein Ziel erreicht wurde oder nicht.",
"ColumnVisitsProductDocumentation": "Die Anzahl der Besuche auf der Produkt-\/Kategorieseite. Wird auch genutzt um die %s Konversionsrate zu berechnen.Diese Metrik ist auch im Report der Ecommerceansicht, wenn diese auf der Produkt-\/Kategorieseite eingestellt wurde.",
"Contains": "beinhaltet %s",
- "ConversionByTypeReportDocumentation": "In diesem Bericht finden Sie detaillierte Informationen über die Performance Ihrer Ziele für jede der Kategorien in der linken Leiste. %s Klicken Sie auf eine der Kategorien, um den entsprechenden Bericht anzuzeigen. %s Weitere Informationen finden Sie in der %sZiel-Dokumentation auf piwik.org%s",
+ "ConversionByTypeReportDocumentation": "In diesem Bericht finden Sie detaillierte Informationen über die Performance Ihrer Ziele für jede der Kategorien in der linken Leiste. %1$s Klicken Sie auf eine der Kategorien, um den entsprechenden Bericht anzuzeigen. %2$s Weitere Informationen finden Sie in der %3$sZiel-Dokumentation auf piwik.org%4$s",
"ConversionRate": "%s Konversionsrate",
"Conversions": "%s Konversionen",
"ConversionsOverview": "Konversions-Ãœberblick",
@@ -52,7 +52,7 @@
"EcommerceOrder": "Ecommerce Bestellung",
"EcommerceOverview": "Ecommerce Ãœbersicht",
"EcommerceReports": "Ecommerce Berichte",
- "ExceptionInvalidMatchingString": "Bei der Auswahl von 'Genauer Vergleich' muss die zu vergleichende Zeichenkette eine URL sein, die mit %s beginnt. Zum Beispiel '%s'.",
+ "ExceptionInvalidMatchingString": "Bei der Auswahl von 'Genauer Vergleich' muss die zu vergleichende Zeichenkette eine URL sein, die mit %1$s beginnt. Zum Beispiel '%2$s'.",
"ExternalWebsiteUrl": "externe Website-URL",
"Filename": "Dateiname",
"GoalConversion": "Ziel-Konversion",
@@ -68,9 +68,9 @@
"GoalX": "Ziel %s",
"HelpOneConversionPerVisit": "Wird eine Seite, auf die dieses Ziel passt, aktualisiert oder mehr als einmal während eines Besuchs betrachtet, wird das Ziel nur beim ersten Aufruf während des Besuchs gewertet.",
"IsExactly": "ist genau %s",
- "LearnMoreAboutGoalTrackingDocumentation": "Mehr zum Thema %s Erfassen von Zielen in Piwik%s erfahren Sie in der Dokumentation.",
+ "LearnMoreAboutGoalTrackingDocumentation": "Mehr zum Thema %1$s Erfassen von Zielen in Piwik%2$s erfahren Sie in der Dokumentation.",
"LeftInCart": "%s im Warenkorb gelassen",
- "ManageGoalsOrCreateANewGoal": "%sZiele verwalten%s oder ein neues Ziel erstellen!",
+ "ManageGoalsOrCreateANewGoal": "%1$sZiele verwalten%2$s oder ein neues Ziel erstellen!",
"Manually": "manuell",
"ManuallyTriggeredUsingJavascriptFunction": "Ziel wird manuell über die trackGoal() Funktion der Javascript-API auf erfüllt gesetzt",
"MatchesExpression": "entspricht dem Ausdruck %s",
@@ -101,7 +101,7 @@
"VisitUrl": "Die angegebene URL (Seite oder Gruppe von Seiten) wird besucht",
"WhenVisitors": "wenn vom Besucher",
"WhereThe": "bei denen die",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "wenn die besuchte Seite einen Aufruf der Javascript-Methode piwikTracker.trackGoal() enthält (%sweitere Informationen%s)",
- "YouCanEnableEcommerceReports": "Sie können %s für diese Website auf der Seite %s aktivieren."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "wenn die besuchte Seite einen Aufruf der Javascript-Methode 'trackGoal' enthält (%1$sweitere Informationen%2$s)",
+ "YouCanEnableEcommerceReports": "Sie können %1$s für diese Website auf der Seite %2$s aktivieren."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/el.json b/plugins/Goals/lang/el.json
index f1cc2fca4a560437a35bbdd6559ddd37189ffd10..612438258bba9bf063a36a2171cce109cd630b54 100644
--- a/plugins/Goals/lang/el.json
+++ b/plugins/Goals/lang/el.json
@@ -3,14 +3,14 @@
"AbandonedCart": "ΕγκατελειμÎνο Καλάθι",
"AddGoal": "Î Ïοσθήκη Στόχου",
"AddNewGoal": "Î Ïοσθήκη νÎου Στόχου",
- "AddNewGoalOrEditExistingGoal": "%sÎ ÏοσθÎστε Îναν νÎο Στόχο%s ή %sΕπεξεÏγαστείτε%s υπάÏχοντες Στόχους",
+ "AddNewGoalOrEditExistingGoal": "%1$sÎ ÏοσθÎστε νÎο Στόχο%2$s ή %3$sÏ„Ïοποποιήστε%4$s υπάÏχοντες Στόχους",
"AllowGoalConvertedMoreThanOncePerVisit": "Δικαίωμα μετατÏοπής Στόχου πεÏισσότεÏο από μια φοÏά τηη ημÎÏα",
"AllowMultipleConversionsPerVisit": "Δυνατότητα πολλαπλών μετατÏοπών ανά επίσκεψη",
"BestCountries": "Οι καλÏτεÏες χώÏες μετατÏοπής είναι:",
"BestKeywords": "Οι κοÏυφαίες λÎξεις-κλειδιά μετατÏοπής είναι:",
"BestReferrers": "Οι καλÏτεÏοι αναφοÏείς ιστοσελίδων μετατÏοπής είναι:",
"CaseSensitive": "ΤαίÏιασμα πεζών-κεφαλαίων",
- "CancelAndReturnToGoals": "ΑκÏÏωση και %sεπιστÏοφή στη λίστα στόχων%s",
+ "CancelAndReturnToGoals": "ΑκÏÏωση και %1$sεπιστÏοφή στη λίστα των στόχων%2$s",
"CategoryTextGeneral_Visitors": "Τοποθεσία χÏήστη",
"CategoryTextReferrers_Referrers": "ΑναφοÏείς",
"CategoryTextVisitsSummary_VisitsSummary": "ΧαÏακτηÏιστικό χÏήστη",
@@ -33,7 +33,7 @@
"ColumnVisits": "Ο συνολικός αÏιθμός των επισκÎψεων, ανεξάÏτητα αν Îνας στόχος εκπληÏώθηκε ή όχι..",
"ColumnVisitsProductDocumentation": "Ο αÏιθμός των επισκÎψεων στη σελίδα Î Ïοϊόντος\/ΚατηγοÏίας. Αυτό χÏησιμοποιείτε για τον υπολογισμό του Î²Î±Î¸Î¼Î¿Ï Î¼ÎµÏ„Î±Ï„Ïοπής του %s. Αυτή η μÎÏ„Ïηση είναι στην αναφοÏά, αν η καταγÏαφή Ï€Ïοβολής ΗλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Î•Î¼Ï€Î¿Ïίου εγκαταστάθηκε στις σελίδες Î Ïοϊόντος\/ΚατηγοÏίας.",
"Contains": "πεÏιÎχει %s",
- "ConversionByTypeReportDocumentation": "Αυτή αναφοÏά παÏÎχει λεπτομεÏείς πληÏοφοÏίες για την απόδοση του στόχου (μετατÏοπÎÏ‚, βαθμοί μετατÏοπής και Ï€Ïόσοδος ανά επίσκεψη) για κάθε διαθÎσιμη κατηγοÏία στον αÏιστεÏÏŒ πίνακα. %s Πατήστε μια από τις κατηγοÏίες για να δείτε την αναφοÏά. %s Για πεÏισσότεÏες πληÏοφοÏίες, διαβάστε την %sτεκμηÏίωση Ανίχνευσης Στόχων στο piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Η αναφοÏά αυτή παÏÎχει λεπτομεÏή πληÏοφοÏία σχετικά με την απόδοση των στόχων (μετατÏοπÎÏ‚, Ïυθμοί μετατÏοπών και κÎÏδος ανά επίσκεψη) για καθεμία από τις διαθÎσιμες κατηγοÏίες στον αÏιστεÏÏŒ πίνακα. %1$s Κάντε κλικ σε μία από τις κατηγοÏίες για να δείτε την αναφοÏά. %2$s Για πεÏισσότεÏες πληÏοφοÏίες, δείτε την %3$sτεκμηÏίωση ΜετατÏοπής Στόχων%4$s",
"ConversionRate": "%s βαθμός μετατÏοπής",
"Conversions": "%s μετατÏοπÎÏ‚",
"ConversionsOverview": "Επισκόπηση μετατÏοπών",
@@ -52,7 +52,7 @@
"EcommerceOrder": "ΗλεκτÏονική παÏαγγελία",
"EcommerceOverview": "Επισκόπηση ΗλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Î•Î¼Ï€Î¿Ïίου",
"EcommerceReports": "ΑναφοÏÎÏ‚ ΗλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Î•Î¼Ï€Î¿Ïίου",
- "ExceptionInvalidMatchingString": "Αν επιλÎξετε «είναι ακÏιβώς», το κείμενο για ταίÏιασμα Ï€ÏÎπει να είναι Îνα URL που θα ξεκινά με %s. Για παÏάδειγμα, %s.",
+ "ExceptionInvalidMatchingString": "Αν επιλÎξετε 'ακÏιβÎÏ‚ ταίÏιασμα', το κείμενο που θα αντιστοιχηθεί θα Ï€ÏÎπει να είναι διεÏθυνση URL που να ξεκινάει από %1$s. Για παÏάδειγμα, '%2$s'.",
"ExternalWebsiteUrl": "εξωτεÏικό URL ιστοσελίδας",
"Filename": "όνομα αÏχείου",
"GoalConversion": "ΜετατÏοπή στόχου",
@@ -68,9 +68,9 @@
"GoalX": "Στόχος %s",
"HelpOneConversionPerVisit": "Αν μια Σελίδα ταιÏιάζει, αυτός ο Στόχος ανανεώνεται ή Ï€Ïοβάλεται πεÏισσόεÏες φοÏÎÏ‚ ανά Επίσκεψη και ο Στόχος θα καταγÏάφετε μόνο την Ï€Ïώτη φοÏά που φοÏτώθηκε η σελίδα κατά την επίσκεψη.",
"IsExactly": "είναι ακÏιβώς %s",
- "LearnMoreAboutGoalTrackingDocumentation": "Μάθετε πεÏισσότεÏα σχετικά με την %sΠαÏακολοÏθηση Στόχων στο Piwik%s στην τεκμηÏίωση για το χÏήστη.",
+ "LearnMoreAboutGoalTrackingDocumentation": "Δείτε πεÏισσότεÏα για την %1$sΠαÏακολοÏθηση των Στόχων στο Piwik%2$s στην τεκμηÏίωση για το χÏήστη.",
"LeftInCart": "%s απομÎνουν στο καλάθι",
- "ManageGoalsOrCreateANewGoal": "%sΔιαχειÏιστείτε τους Στόχους%s ή δημιουÏγήστε Ï„ÏŽÏα Îναν νÎο!",
+ "ManageGoalsOrCreateANewGoal": "%1$sΔιαχειÏιστείτε τους Στόχους%2$s ή δημιουÏγήστε Îνα νÎο Ï„ÏŽÏα!",
"Manually": "χειÏοκίνητα",
"ManuallyTriggeredUsingJavascriptFunction": "Ο Στόχος ενεÏγοποιείτε χειÏοκίνητα με χÏήση του Javascript API trackGoal()",
"MatchesExpression": "ταιÏιάζει στην ÎκφÏαση %s",
@@ -101,7 +101,7 @@
"VisitUrl": "Επίσκεψη σε μια δοθείσα διεÏθυνση URL (σελίδα ή ομάδα σελίδων)",
"WhenVisitors": "όταν οι επισκÎψεις αφοÏοÏν",
"WhereThe": "όπου το",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "όπου η επισκεπτόμενη σελίδα πεÏιÎχει μια κλήση στη μÎθοδο Javascript piwikTracker.trackGoal() (%sμάθετε πεÏισσότεÏα%s)",
- "YouCanEnableEcommerceReports": "ΜποÏείτε να ενεÏγοποιήσετε τις %s για αυτή την ιστοσελίδα στη σελίδα %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "όπου η σελίδα που Îχει επισκεφθεί από κάποιο χÏήστη πεÏιÎχει μια κλήση για την μÎθοδο 'trackGoal' της JavaScript (%1$sδιαβάστε πεÏισσότεÏα%2$s)",
+ "YouCanEnableEcommerceReports": "ΜποÏείτε να ενεÏγοποιήσετε το %1$s για αυτό τον ιστοτόπο στη σελίδα %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/en.json b/plugins/Goals/lang/en.json
index 8820b333e7396d5fcfbc5b088458f4ea93b44f2d..d5b221a3fc457ab8dae268c0bdb0b8abe2416e44 100644
--- a/plugins/Goals/lang/en.json
+++ b/plugins/Goals/lang/en.json
@@ -3,16 +3,16 @@
"AbandonedCart": "Abandoned Cart",
"AddGoal": "Add Goal",
"AddNewGoal": "Add a new Goal",
- "AddNewGoalOrEditExistingGoal": "%sAdd a new Goal%s or %sEdit%s existing Goals",
+ "AddNewGoalOrEditExistingGoal": "%1$sAdd a new Goal%2$s or %3$sEdit%4$s existing Goals",
"AllowGoalConvertedMoreThanOncePerVisit": "Allow Goal to be converted more than once per visit",
"AllowMultipleConversionsPerVisit": "Allow multiple conversions per visit",
"BestCountries": "Your best converting countries are:",
"BestKeywords": "Your top converting keywords are:",
"BestReferrers": "Your best converting websites referrers are:",
"CaseSensitive": "Case sensitive match",
- "CancelAndReturnToGoals": "Cancel and %sreturn to the list of goals%s",
+ "CancelAndReturnToGoals": "Cancel and %1$sreturn to the list of goals%2$s",
"CategoryTextGeneral_Visitors": "User location",
- "CategoryTextReferrers_Referrers": "Referrers",
+ "CategoryTextReferrers_Referrers": "Referrers",
"CategoryTextVisitsSummary_VisitsSummary": "User attribute",
"CategoryTextGeneral_Visit": "engagement",
"ChooseGoal": "Choose Goal",
@@ -33,7 +33,7 @@
"ColumnVisits": "The total number of visits, regardless of whether a goal was triggered or not.",
"ColumnVisitsProductDocumentation": "The number of visits on the Product\/Category page. This is also used to process the %s conversion rate. This metric is in the report if Ecommerce view tracking was setup on Product\/Category pages.",
"Contains": "contains %s",
- "ConversionByTypeReportDocumentation": "This report provides detailed information about the goal performance (conversions, conversion rates and revenue per visit) for each of the categories available in the left panel. %s Please click on one of the categories to view the report. %s For more information, read the %sTracking Goals documentation%s",
+ "ConversionByTypeReportDocumentation": "This report provides detailed information about the goal performance (conversions, conversion rates and revenue per visit) for each of the categories available in the left panel. %1$s Please click on one of the categories to view the report. %2$s For more information, read the %3$sTracking Goals documentation%4$s",
"ConversionRate": "%s conversion rate",
"Conversions": "%s conversions",
"ConversionsDescription": "conversions",
@@ -53,7 +53,7 @@
"EcommerceOrder": "Ecommerce order",
"EcommerceOverview": "Ecommerce Overview",
"EcommerceReports": "Ecommerce Reports",
- "ExceptionInvalidMatchingString": "If you choose 'exact match', the matching string must be a URL starting with %s. For example, '%s'.",
+ "ExceptionInvalidMatchingString": "If you choose 'exact match', the matching string must be a URL starting with %1$s. For example, '%2$s'.",
"ExternalWebsiteUrl": "external website URL",
"Filename": "filename",
"GoalConversion": "Goal conversion",
@@ -69,9 +69,9 @@
"GoalX": "Goal %s",
"HelpOneConversionPerVisit": "If a Page matching this Goal is refreshed or viewed more than once in a Visit, the Goal will only be tracked the first time the page was loaded during this visit.",
"IsExactly": "is exactly %s",
- "LearnMoreAboutGoalTrackingDocumentation": "Learn more about %s Tracking Goals in Piwik%s in the user documentation.",
+ "LearnMoreAboutGoalTrackingDocumentation": "Learn more about %1$s Tracking Goals in Piwik%2$s in the user documentation.",
"LeftInCart": "%s left in cart",
- "ManageGoalsOrCreateANewGoal": "%sManage Goals%s or create a new Goal now!",
+ "ManageGoalsOrCreateANewGoal": "%1$sManage Goals%2$s or create a new Goal now!",
"Manually": "manually",
"ManuallyTriggeredUsingJavascriptFunction": "Goal is manually triggered using the JavaScript API trackGoal()",
"MatchesExpression": "matches the expression %s",
@@ -102,7 +102,7 @@
"VisitUrl": "Visit a given URL (page or group of pages)",
"WhenVisitors": "when visitors",
"WhereThe": "where the",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "where the visited page contains a call to the JavaScript 'trackGoal' method (%slearn more%s)",
- "YouCanEnableEcommerceReports": "You can enable %s for this website in the %s page."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "where the visited page contains a call to the JavaScript 'trackGoal' method (%1$slearn more%2$s)",
+ "YouCanEnableEcommerceReports": "You can enable %1$s for this website in the %2$s page."
}
}
diff --git a/plugins/Goals/lang/es.json b/plugins/Goals/lang/es.json
index 4d5a1edc99e07a82d2b378fb00e7c77d549226fd..97d6b9b375c26673c242b5a1e5449ecffae6285c 100644
--- a/plugins/Goals/lang/es.json
+++ b/plugins/Goals/lang/es.json
@@ -3,14 +3,14 @@
"AbandonedCart": "Carrito abandonado",
"AddGoal": "Agregar objetivo",
"AddNewGoal": "Agregar un nuevo objetivo",
- "AddNewGoalOrEditExistingGoal": "%sAgregar un nuevo objetivo%s o %sEditar%s objetivos existentes.",
+ "AddNewGoalOrEditExistingGoal": "%1$sAgregar un nuevo objetivo%2$s o %3$sEditar%4$s objetivos existentes.",
"AllowGoalConvertedMoreThanOncePerVisit": "Permitir que el objetivo sea convertido más de una vez por visita",
"AllowMultipleConversionsPerVisit": "Permitir múltiples conversiones por visita.",
"BestCountries": "Sus mejores paÃses de conversión son:",
"BestKeywords": "Sus principales palabras clave de conversión son:",
"BestReferrers": "Sus mejores páginas de internet referentes de conversión son:",
"CaseSensitive": "Coincidir mayúsculas y minúsculas",
- "CancelAndReturnToGoals": "Cancelar y %svolver a la lista de metas%s",
+ "CancelAndReturnToGoals": "Cancelar y %1$svolver a la lista de metas%2$s",
"CategoryTextGeneral_Visitors": "Ubicación del usuario",
"CategoryTextReferrers_Referrers": "Referencias",
"CategoryTextVisitsSummary_VisitsSummary": "Atributo del usuario",
@@ -33,7 +33,7 @@
"ColumnVisits": "El número total de visitas, sin importar si el objetivo fue cumplido o no.",
"ColumnVisitsProductDocumentation": "El número de visitas en la página de Producto\/CategorÃa. Esto también se usa para procesar el ratio de conversión de %s. Esta métrica está en el Informe si el seguimiento del comercio electrónico fue configurado en las páginas de Producto\/CategorÃa.",
"Contains": "contiene %s",
- "ConversionByTypeReportDocumentation": "Este reporte proporciona información detallada sobre el rendimiento del objetivo (conversiones, ratio de conversión y ingresos por visita) para cada de las categorÃas disponibles en el panel de la izquierda. %s Por favor, haga clic en una de las categorÃas para ver el informe. %s Para más información, lea la %sdocumentación sobre Seguimiento de Objetivos en piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Este reporte proporciona información detallada sobre el rendimiento del objetivo (conversiones, ratio de conversión y ingresos por visita) para cada de las categorÃas disponibles en el panel de la izquierda. %1$s Por favor, haga clic en una de las categorÃas para ver el informe. %2$s Para más información, lea la %3$sdocumentación sobre Seguimiento de Objetivos en piwik.org%4$s",
"ConversionRate": "%s tasa de conversión",
"Conversions": "%s conversiones",
"ConversionsOverview": "Vista general de conversiones",
@@ -52,7 +52,7 @@
"EcommerceOrder": "Pedido de Comercio Electrónico",
"EcommerceOverview": "Información general de Comercio Electrónico",
"EcommerceReports": "Informes de Comercio Electrónico",
- "ExceptionInvalidMatchingString": "Si elige 'coincidencia exacta', la cadena debe ser una URL que comience con %s. Por ejemplo, '%s'..",
+ "ExceptionInvalidMatchingString": "Si elige 'coincidencia exacta', la cadena debe ser una URL que comience con %1$s. Por ejemplo, '%2$s'.",
"ExternalWebsiteUrl": "URL del sitio de internet externo",
"Filename": "nombre de archivo",
"GoalConversion": "Conversión de objetivos",
@@ -68,9 +68,9 @@
"GoalX": "Objetivo %s",
"HelpOneConversionPerVisit": "Si una página que coincide con este objetivo es actualizada o vista más de una vez en una visita, el objetivo solo será convertido la primera vez que la página fue cargada durante la visita.",
"IsExactly": "es exactamente %s",
- "LearnMoreAboutGoalTrackingDocumentation": "Aprender más acerca de %sRastrear metas en Piwik%s en la documentación de usuario.",
+ "LearnMoreAboutGoalTrackingDocumentation": "Aprender más acerca de %1$sRastrear metas en Piwik%2$s en la documentación de usuario.",
"LeftInCart": "%s dejado en el carrito",
- "ManageGoalsOrCreateANewGoal": "%sAdministrar metas%s o crear un nuevo objetivo ahora!",
+ "ManageGoalsOrCreateANewGoal": "%1$sAdministrar metas%2$s o crear un nuevo objetivo ahora!",
"Manually": "manualmente",
"ManuallyTriggeredUsingJavascriptFunction": "Los objetivos son manualmente activados usando la API Javascript trackGoal()",
"MatchesExpression": "coincide con la expresión %s",
@@ -99,7 +99,7 @@
"VisitUrl": "Visita a una URL dada (página o grupo de páginas)",
"WhenVisitors": "cuando los visitantes",
"WhereThe": "donde el",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "donde las paginas visitadas contienen una llamada al método JavaScript piwikTracker.trackGoal() (%ssaber mas%s)",
- "YouCanEnableEcommerceReports": "Puede habilitar %s para este sitio de internet en la página %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "donde las paginas visitadas contienen una llamada al método JavaScript 'trackGoal' (%1$ssaber mas%2$s)",
+ "YouCanEnableEcommerceReports": "Puede habilitar %1$s para este sitio de internet en la página %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/et.json b/plugins/Goals/lang/et.json
index 253161fe5eedf4166b3f2870ab77f0c255001ae9..ce5bb66789dca82adc7afcec3b6c6c98300e8286 100644
--- a/plugins/Goals/lang/et.json
+++ b/plugins/Goals/lang/et.json
@@ -3,7 +3,7 @@
"AbandonedCart": "Hüljatud ostukorv",
"AddGoal": "Lisa eesmärk",
"AddNewGoal": "Lisa uus eesmärk",
- "AddNewGoalOrEditExistingGoal": "%sLisa uus eesmärk%s või %sMuuda%s olemasolevaid eesmärke",
+ "AddNewGoalOrEditExistingGoal": "%1$sLisa uus eesmärk%2$s või %3$sMuuda%4$s olemasolevaid eesmärke",
"AllowGoalConvertedMoreThanOncePerVisit": "Luba külastajate muundamist rohkem kui ühe korra külastuse jooksul (võib mitu korda muutuda tulu toovaks kliendiks)",
"AllowMultipleConversionsPerVisit": "Luba mitu tulutoomist ühe külastuse jooksul",
"BestCountries": "Sinu parimad tulutoovad riigid on:",
@@ -60,6 +60,6 @@
"VisitUrl": "Külastavad määratud URLi (leht või lehtede grupp)",
"WhenVisitors": "kui külastajad",
"WhereThe": "kus",
- "YouCanEnableEcommerceReports": "Sa saad aktiveerida %s antud veebilehele %s lehel."
+ "YouCanEnableEcommerceReports": "Sa saad aktiveerida %1$s antud veebilehele %2$s lehel."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/eu.json b/plugins/Goals/lang/eu.json
index 52293f09f23ee769f03606d137f12753dae6b4a1..fd208b8a56597b39ac38f5b4e7049f6e27c1740f 100644
--- a/plugins/Goals/lang/eu.json
+++ b/plugins/Goals/lang/eu.json
@@ -2,7 +2,7 @@
"Goals": {
"AddGoal": "Gehitu helburua",
"AddNewGoal": "Gehitu helburu berria",
- "AddNewGoalOrEditExistingGoal": "%sGehitu helburu berria%s edo %sEditatu%s dauden helburuak",
+ "AddNewGoalOrEditExistingGoal": "%1$sGehitu helburu berria%2$s edo %3$sEditatu%4$s dauden helburuak",
"ClickOutlink": "Egin klik kanpoko webgune baterako loturan",
"ColumnConversions": "Bihurketa",
"ConversionsOverview": "Bihurketen ikuspegi orokorra",
diff --git a/plugins/Goals/lang/fa.json b/plugins/Goals/lang/fa.json
index 1c15c530022c69ba453674d9d8150d2a719a6676..8366f700df741a44382d6b0c4ba8bc1c6a413159 100644
--- a/plugins/Goals/lang/fa.json
+++ b/plugins/Goals/lang/fa.json
@@ -3,7 +3,7 @@
"AbandonedCart": "سبد خرید رها شده",
"AddGoal": "هد٠اضاÙÙ‡ Ú©Ù†",
"AddNewGoal": "هد٠جدید اضاÙÙ‡ Ú©Ù†",
- "AddNewGoalOrEditExistingGoal": "%s یک هد٠جدید اضاÙÙ‡ کنید %s یا %sویرایش کنید %sهد٠های کنونی را",
+ "AddNewGoalOrEditExistingGoal": "%1$s یک هد٠جدید اضاÙÙ‡ کنید %2$s یا %3$sویرایش کنید %4$sهد٠های کنونی را",
"AllowGoalConvertedMoreThanOncePerVisit": "اجازه هد٠بیش از یک بار در هر بازدید تبدیل",
"AllowMultipleConversionsPerVisit": "اجازه تبدیل چند در هر بازدید",
"BestCountries": "بهترین شما تبدیل کشورها عبارتند از:",
@@ -74,6 +74,6 @@
"VisitUrl": "ارسال یک URL (صÙØÙ‡ یا گروهی از صÙØات)",
"WhenVisitors": "زمانی که بازدیدکنندگان",
"WhereThe": "کجاست",
- "YouCanEnableEcommerceReports": "شما Ù…ÛŒ توانید %s را برای این وبسایت در صÙØÙ‡ %s Ùعال کنید."
+ "YouCanEnableEcommerceReports": "شما Ù…ÛŒ توانید %1$s را برای این وبسایت در صÙØÙ‡ %2$s Ùعال کنید."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/fi.json b/plugins/Goals/lang/fi.json
index 22c000b676074957f3c19be05cb3465f562e13d1..09d853141f37d2080cb6a5757c9921dc489c4080 100644
--- a/plugins/Goals/lang/fi.json
+++ b/plugins/Goals/lang/fi.json
@@ -3,7 +3,7 @@
"AbandonedCart": "Hylätty ostoskori",
"AddGoal": "Lisää tavoite",
"AddNewGoal": "Lisää uusi tavoite",
- "AddNewGoalOrEditExistingGoal": "%sLisää uusi tavoite%s tai %smuokkaa%s olemassaolevia tavoitteita",
+ "AddNewGoalOrEditExistingGoal": "%1$sLisää uusi tavoite%2$s tai %3$smuokkaa%4$s olemassaolevia tavoitteita",
"AllowGoalConvertedMoreThanOncePerVisit": "Salli tavoitteen saavuttaminen useammin kuin kerran per käynti",
"AllowMultipleConversionsPerVisit": "Salli monta tavoitteen saavuttamista per käynti",
"BestCountries": "Parhaat maat ovat:",
@@ -28,7 +28,7 @@
"ColumnVisits": "Käyntien kokonaismäärä, riippumatta tavoitteiden saavuttamisesta.",
"ColumnVisitsProductDocumentation": "Käyntien määrä tuote-\/kategoriasivuilla. Tätä käytetään %s:n saavuttamisasteen laskemiseen. Tämä arvo on raportissa, jos verkkokaupan seuranta on otettu käyttöön tuote- ja kategoriasivuilla.",
"Contains": "sisältää %s",
- "ConversionByTypeReportDocumentation": "Tämä raportti antaa tarkempaa tietoa tavoitteista (saavuttaminen, saavuttamisprosentit, tulot per käynti) jokaiselle vasemman paneelin kategorialle. %s Näet raportin klikkaamalla kategoriaa. %s Saat lisätietoa englanninkielisestä %s dokumentaatiosta piwik.orgissa%s",
+ "ConversionByTypeReportDocumentation": "Tämä raportti antaa tarkempaa tietoa tavoitteista (saavuttaminen, saavuttamisprosentit, tulot per käynti) jokaiselle vasemman paneelin kategorialle. %1$s Näet raportin klikkaamalla kategoriaa. %2$s Saat lisätietoa englanninkielisestä %3$s dokumentaatiosta piwik.orgissa%4$s",
"ConversionRate": "%s siirtymisaste",
"Conversions": "%s siirtymää",
"ConversionsOverview": "Siirtymien yleiskatsaus",
@@ -46,7 +46,7 @@
"EcommerceOrder": "Verkkokaupan järjestys",
"EcommerceOverview": "Verkkokaupan yleiskatsaus",
"EcommerceReports": "Verkkokaupan raportit",
- "ExceptionInvalidMatchingString": "Jos valitset 'täsmällinen osuma', täsmäävän merkkijonon täytyy olla osoite, joka alkaa %s. Esimerkiksi '%s'.",
+ "ExceptionInvalidMatchingString": "Jos valitset 'täsmällinen osuma', täsmäävän merkkijonon täytyy olla osoite, joka alkaa %1$s. Esimerkiksi '%2$s'.",
"ExternalWebsiteUrl": "ulkopuolisen sivun osoite",
"Filename": "tiedostonimi",
"GoalConversion": "Maalin muunnos",
@@ -86,7 +86,7 @@
"VisitUrl": "Vierailee annetussa osoitteessa (sivu tai ryhmä sivuja)",
"WhenVisitors": "kun kävijöitä",
"WhereThe": "jossa",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "jossa sivu sisältää JavaScript-kutsun metodille piwikTracker.trackGoal() (%slue lisää%s)",
- "YouCanEnableEcommerceReports": "Voit ottaa käyttöön %s tälle sivustolle sivulla %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "jossa sivu sisältää JavaScript-kutsun metodille 'trackGoal' (%1$slue lisää%2$s)",
+ "YouCanEnableEcommerceReports": "Voit ottaa käyttöön %1$s tälle sivustolle sivulla %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/fr.json b/plugins/Goals/lang/fr.json
index 8518515c2efab677b97ccce87d3476fff53d8e03..3eb87a792bd4e847c8c5460339a5a08edcee91cf 100644
--- a/plugins/Goals/lang/fr.json
+++ b/plugins/Goals/lang/fr.json
@@ -3,14 +3,14 @@
"AbandonedCart": "Panier abandonné",
"AddGoal": "Ajouter un objectif",
"AddNewGoal": "Ajoutez un nouvel objectif",
- "AddNewGoalOrEditExistingGoal": "%sAjouter un nouvel objectif%s or %sEditer%s des objectifs existants",
+ "AddNewGoalOrEditExistingGoal": "%1$sAjouter un nouvel objectif%2$s or %3$sEditer%4$s des objectifs existants",
"AllowGoalConvertedMoreThanOncePerVisit": "Autoriser un objectif à être converti plus d'une fois par visite.",
"AllowMultipleConversionsPerVisit": "Autoriser les conversions multiples par visite",
"BestCountries": "Vos meilleurs pays de conversion sont :",
"BestKeywords": "Vos meilleurs mots-clés sont :",
"BestReferrers": "Vos meilleurs sites web de conversion sont :",
"CaseSensitive": "Correspondance sensible à la case",
- "CancelAndReturnToGoals": "Annuler et %sretourner à la liste des objectifs%s",
+ "CancelAndReturnToGoals": "Annuler et %1$sretourner à la liste des objectifs%2$s",
"CategoryTextGeneral_Visitors": "Emplacement de l'utilisateur",
"CategoryTextReferrers_Referrers": "Référents",
"CategoryTextVisitsSummary_VisitsSummary": "Attribut de l'utilisateur",
@@ -33,7 +33,7 @@
"ColumnVisits": "Nombre total de visites, indifféremment du fait qu'un objectif a été atteint ou non.",
"ColumnVisitsProductDocumentation": "Le nombre de visites sur la page produit \/ catégorie. Ceci est également utilisé pour traiter les taux de conversion %s. Cette mesure est dans le rapport si le suivi E-commerce produit \/ catégorie a été configuré.",
"Contains": "contient %s",
- "ConversionByTypeReportDocumentation": "Ce rapport apporte des informations détaillés les à propos de la performance de l'objectif (conversions, taux de conversion et recettes par visite) pour chacune des catégories disponibles sur le panneau de gauche. %s Veuillez cliquer sur une des catégories pour afficher le rapport. %s Pour plus d'informations sur les objectifs, lisez la %s documentation sur le suivi des objectifs sur Piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Ce rapport apporte des informations détaillés les à propos de la performance de l'objectif (conversions, taux de conversion et recettes par visite) pour chacune des catégories disponibles sur le panneau de gauche. %1$s Veuillez cliquer sur une des catégories pour afficher le rapport. %2$s Pour plus d'informations sur les objectifs, lisez la %3$s documentation sur le suivi des objectifs sur Piwik.org%4$s",
"ConversionRate": "%s taux de conversion",
"Conversions": "%s conversions",
"ConversionsOverview": "Vue globale des conversions",
@@ -52,7 +52,7 @@
"EcommerceOrder": "Commande E-Commerce",
"EcommerceOverview": "Aperçu E-Commerce",
"EcommerceReports": "Rapports E-Commerce",
- "ExceptionInvalidMatchingString": "Si vous choisissez 'correspondance exacte', la chaîne de caractères doit être une URL commençant par %s. Par exemple,'%s'.",
+ "ExceptionInvalidMatchingString": "Si vous choisissez 'correspondance exacte', la chaîne de caractères doit être une URL commençant par %1$s. Par exemple,'%2$s'.",
"ExternalWebsiteUrl": "URL externe du site web",
"Filename": "nom de fichier",
"GoalConversion": "Conversion de l'objectif",
@@ -68,9 +68,9 @@
"GoalX": "Objectif %s",
"HelpOneConversionPerVisit": "Si une page correspondant à cet objectif est actualisée ou vue plus d'une fois lors d'une visite, l'objectif ne pourra être suivi que la première fois la page a été chargée au cours de cette visite.",
"IsExactly": "est exactement %s",
- "LearnMoreAboutGoalTrackingDocumentation": "Apprenez en plus sur %s le Suivi des Objectifs dans Piwik%s dans la documentation utilisateur.",
+ "LearnMoreAboutGoalTrackingDocumentation": "Apprenez en plus sur %1$s le Suivi des Objectifs dans Piwik%2$s dans la documentation utilisateur.",
"LeftInCart": "%s laissé(s) dans le panier",
- "ManageGoalsOrCreateANewGoal": "%sGérer les objectifs%s ou créer un nouvel objectif maintenant!",
+ "ManageGoalsOrCreateANewGoal": "%1$sGérer les objectifs%2$s ou créer un nouvel objectif maintenant!",
"Manually": "manuellement",
"ManuallyTriggeredUsingJavascriptFunction": "Les objectifs sont déclenchés manuellement en utilisant l'API Javascript trackGoal()",
"MatchesExpression": "correspond à l'expression %s",
@@ -101,7 +101,7 @@
"VisitUrl": "Visitent une URL donnée (page ou groupe de pages)",
"WhenVisitors": "quand les visiteurs",
"WhereThe": "où le",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "où la page visitée contient un appel à la méthode JavaScript piwikTracker.trackGoal() (%sapprenez-en plus%s)",
- "YouCanEnableEcommerceReports": "Vous pouvez activer %s pour ce site web sur la page %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "où la page visitée contient un appel à la méthode JavaScript 'trackGoal' (%1$sapprenez-en plus%2$s)",
+ "YouCanEnableEcommerceReports": "Vous pouvez activer %1$s pour ce site web sur la page %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/hi.json b/plugins/Goals/lang/hi.json
index 79928e7757caaccd2a6d366f7a55a0be58cf121e..f2b3f4362d0d7d040275c5e8763b605b163c45ce 100644
--- a/plugins/Goals/lang/hi.json
+++ b/plugins/Goals/lang/hi.json
@@ -3,7 +3,7 @@
"AbandonedCart": "परितà¥à¤¯à¤•à¥à¤¤ कारà¥à¤Ÿ",
"AddGoal": "लकà¥à¤·à¥à¤¯ जोड़ें",
"AddNewGoal": "à¤à¤• नया लकà¥à¤·à¥à¤¯ जोड़ें",
- "AddNewGoalOrEditExistingGoal": "%sà¤à¤• नया लकà¥à¤·à¥à¤¯ जोड़ें%s या %sमौजूदा लकà¥à¤·à¥à¤¯ %sको संपादित करें",
+ "AddNewGoalOrEditExistingGoal": "%1$sà¤à¤• नया लकà¥à¤·à¥à¤¯ जोड़ें%2$s या %3$sमौजूदा लकà¥à¤·à¥à¤¯ %4$sको संपादित करें",
"AllowGoalConvertedMoreThanOncePerVisit": "लकà¥à¤·à¥à¤¯ पà¥à¤°à¤¤à¤¿ विज़िट à¤à¤• से अधिक बार परिवरà¥à¤¤à¤¿à¤¤ करने की अनà¥à¤®à¤¤à¤¿ दें",
"AllowMultipleConversionsPerVisit": "पà¥à¤°à¤¤à¤¿ यातà¥à¤°à¤¾ कई रूपांतरणों की अनà¥à¤®à¤¤à¤¿ दें",
"BestCountries": "आपका सबसे अचà¥à¤›à¤¾ परिवरà¥à¤¤à¤¿à¤¤ देश हैं:",
@@ -32,7 +32,7 @@
"ColumnVisits": "यातà¥à¤°à¤¾à¤“ं की कà¥à¤² संखà¥à¤¯à¤¾,परवाह किठबिना à¤à¤• लकà¥à¤·à¥à¤¯ सकà¥à¤°à¤¿à¤¯ हो गया था या नहीं.",
"ColumnVisitsProductDocumentation": "उतà¥à¤ªà¤¾à¤¦ \/ शà¥à¤°à¥‡à¤£à¥€ पेज पर यातà¥à¤°à¤¾à¤“ं की संखà¥à¤¯à¤¾. यह à¤à¥€ %s की रूपांतरण दर संसाधित करने के लिठपà¥à¤°à¤¯à¥‹à¤— किया जाता है. ईकॉमरà¥à¤¸ दृशà¥à¤¯ टà¥à¤°à¥ˆà¤•à¤¿à¤‚ग उतà¥à¤ªà¤¾à¤¦ \/ शà¥à¤°à¥‡à¤£à¥€ पृषà¥à¤ ों पर सेटअप किया गया तो यह मीटà¥à¤°à¤¿à¤• रिपोरà¥à¤Ÿ में है.",
"Contains": "%s में शामिल",
- "ConversionByTypeReportDocumentation": "इस रिपोरà¥à¤Ÿ के बाà¤à¤‚ पैनल में उपलबà¥à¤§ शà¥à¤°à¥‡à¤£à¤¿à¤¯à¥‹à¤‚ में से पà¥à¤°à¤¤à¥à¤¯à¥‡à¤• के लिठलकà¥à¤·à¥à¤¯ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ (रूपांतरण, रूपांतरण दर और यातà¥à¤°à¤¾ के पà¥à¤°à¤¤à¤¿ राजसà¥à¤µ) के बारे में विसà¥à¤¤à¥ƒà¤¤ जानकारी पà¥à¤°à¤¦à¤¾à¤¨ करता है.%s रिपोरà¥à¤Ÿ देखने के लिठशà¥à¤°à¥‡à¤£à¤¿à¤¯à¥‹à¤‚ में से à¤à¤• पर कà¥à¤²à¤¿à¤• करें. %sअधिक जानकारी के लिà¤, %sटà¥à¤°à¥ˆà¤•à¤¿à¤‚ग लकà¥à¤·à¥à¤¯ पà¥à¤°à¤²à¥‡à¤–न%s पढ़ें",
+ "ConversionByTypeReportDocumentation": "इस रिपोरà¥à¤Ÿ के बाà¤à¤‚ पैनल में उपलबà¥à¤§ शà¥à¤°à¥‡à¤£à¤¿à¤¯à¥‹à¤‚ में से पà¥à¤°à¤¤à¥à¤¯à¥‡à¤• के लिठलकà¥à¤·à¥à¤¯ पà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ (रूपांतरण, रूपांतरण दर और यातà¥à¤°à¤¾ के पà¥à¤°à¤¤à¤¿ राजसà¥à¤µ) के बारे में विसà¥à¤¤à¥ƒà¤¤ जानकारी पà¥à¤°à¤¦à¤¾à¤¨ करता है.%1$s रिपोरà¥à¤Ÿ देखने के लिठशà¥à¤°à¥‡à¤£à¤¿à¤¯à¥‹à¤‚ में से à¤à¤• पर कà¥à¤²à¤¿à¤• करें. %2$sअधिक जानकारी के लिà¤, %3$sटà¥à¤°à¥ˆà¤•à¤¿à¤‚ग लकà¥à¤·à¥à¤¯ पà¥à¤°à¤²à¥‡à¤–न%4$s पढ़ें",
"ConversionRate": "%s रूपांतरण दर",
"Conversions": "%s रूपांतरण",
"ConversionsOverview": "रूपांतरण अवलोकन",
@@ -50,7 +50,7 @@
"EcommerceOrder": "ईकॉमरà¥à¤¸ के आदेश",
"EcommerceOverview": "ईकॉमरà¥à¤¸ अवलोकन",
"EcommerceReports": "ईकॉमरà¥à¤¸ रिपोरà¥à¤Ÿà¥‡à¤‚",
- "ExceptionInvalidMatchingString": "आप 'सटीक मैच' चà¥à¤¨à¤¤à¥‡ हैं, तो मिलान सà¥à¤Ÿà¥à¤°à¤¿à¤‚ग %s की शà¥à¤°à¥à¤†à¤¤ के साथ à¤à¤• URL होना चाहिà¤. उदाहरण के लिà¤, '%s' में.",
+ "ExceptionInvalidMatchingString": "आप 'सटीक मैच' चà¥à¤¨à¤¤à¥‡ हैं, तो मिलान सà¥à¤Ÿà¥à¤°à¤¿à¤‚ग %1$s की शà¥à¤°à¥à¤†à¤¤ के साथ à¤à¤• URL होना चाहिà¤. उदाहरण के लिà¤, '%2$s' में.",
"ExternalWebsiteUrl": "बाहरी वेबसाइट यूआरà¤à¤²",
"Filename": "फ़ाइल का नाम",
"GoalConversion": "लकà¥à¤·à¥à¤¯ रूपांतरण",
@@ -93,7 +93,7 @@
"VisitUrl": "किसी दिठगठयूआरà¤à¤² (पृषà¥à¤ ों के पृषà¥à¤ या समूह) पर जाà¤à¤",
"WhenVisitors": "जब आगंतà¥à¤•à¥‹à¤‚",
"WhereThe": "जहां",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "दौरा पेज जावासà¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿ 'trackGoal' के लिठà¤à¤• कॉल शामिल है जहां विधि (%s अधिक जानें%s)",
- "YouCanEnableEcommerceReports": "आपको %s पेज में इस वेबसाइट को सकà¥à¤·à¤® %s कर सकते हैं."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "दौरा पेज जावासà¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿ 'trackGoal' के लिठà¤à¤• कॉल शामिल है जहां विधि (%1$s अधिक जानें%2$s)",
+ "YouCanEnableEcommerceReports": "आपको %1$s पेज में इस वेबसाइट को सकà¥à¤·à¤® %2$s कर सकते हैं."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/hu.json b/plugins/Goals/lang/hu.json
index 2af2eca01319d1b3ecf12f7adedc41d10391beac..7b6805d51d6f10c1fda4bd588447bc91761fc30d 100644
--- a/plugins/Goals/lang/hu.json
+++ b/plugins/Goals/lang/hu.json
@@ -2,7 +2,7 @@
"Goals": {
"AddGoal": "Cél hozzáadása",
"AddNewGoal": "Új cél létrehozása",
- "AddNewGoalOrEditExistingGoal": "%sHozz létre új célt%s vagy %sszerkeszd%s a már meglévő célokat",
+ "AddNewGoalOrEditExistingGoal": "%1$sHozz létre új célt%2$s vagy %3$sszerkeszd%4$s a már meglévő célokat",
"BestCountries": "A legjobban konvertáló országok a következőek:",
"BestKeywords": "A legjobban konvertáló kulcsszavak a következőek:",
"BestReferrers": "A legjobban konvertáló hivatkozó weboldalak a következőek:",
@@ -17,7 +17,7 @@
"DefaultRevenueHelp": "Például egy látogató által elküldött kapcsolatfelvételi űrlap 1000 forintnak megfelelÅ‘ értéket jelenthet átlagosan. A Piwik segÃt annak megértésében, hogy az egyes látogatói szegmensek hogyan teljesÃtenek ennek fényében.",
"DeleteGoalConfirm": "Biztosan törölni szeretnéd a %s elnevezésű célt?",
"Download": "letöltenek egy fájlt",
- "ExceptionInvalidMatchingString": "Ha a pontos egyezést választja, akkor a sztringnek egy %s kezdetű URL-nek kell lennie, mint pl. %s.",
+ "ExceptionInvalidMatchingString": "Ha a pontos egyezést választja, akkor a sztringnek egy %1$s kezdetű URL-nek kell lennie, mint pl. %2$s.",
"ExternalWebsiteUrl": "Külső weboldal URL-je",
"Filename": "fájlnév",
"GoalConversion": "Célkonverzió",
@@ -43,6 +43,6 @@
"VisitUrl": "meglátogatnak egy adott URL-t (mely egy weblapot vagy weblapok csoportját jelenti)",
"WhenVisitors": "bekövetkezik, ha a látogatók",
"WhereThe": "ahol a (z)",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "ahol a meglátogatott oldal tartalmaz egy JavaScript hÃvást a piwikTracker.trackGoal() funkció aktiválására (%stovábbi információ%s)"
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "ahol a meglátogatott oldal tartalmaz egy JavaScript hÃvást a 'trackGoal' funkció aktiválására (%1$stovábbi információ%2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/id.json b/plugins/Goals/lang/id.json
index e0c197d112e66ac2a4a7494eee2a6955495d8eb9..24d4fef44cfb70f94e6f761c4ab0785f842f6c10 100644
--- a/plugins/Goals/lang/id.json
+++ b/plugins/Goals/lang/id.json
@@ -3,7 +3,7 @@
"AbandonedCart": "Keranjang Terabaikan",
"AddGoal": "Tambah Tujuan",
"AddNewGoal": "Tambah Tujuan baru",
- "AddNewGoalOrEditExistingGoal": "%sTambah Tujuan baru%s atau %sSunting%s Tujuan saat ini",
+ "AddNewGoalOrEditExistingGoal": "%1$sTambah Tujuan baru%2$s atau %3$sSunting%4$s Tujuan saat ini",
"AllowGoalConvertedMoreThanOncePerVisit": "Perbolehkan Tujuan dikonversi lebih dari sekali tiap kunjungan",
"AllowMultipleConversionsPerVisit": "Perbolehkan banyak konversi tiap kunjungan",
"BestCountries": "Konversi terbaik untuk negara Anda adalah:",
@@ -26,7 +26,7 @@
"ColumnVisits": "Jumlah kunjungan, terlepas dari apakah tujuan telah dipicu atau tidak.",
"ColumnVisitsProductDocumentation": "Jumlah kunjungan halaman Produk\/Kategori. Ini juga digunakan untuk mengolah tingkat konversi %s. Matrik ini juga berada di laporan bila tampilan pelacakan Niaga-E diatur dalam halaman Produk\/Kategori.",
"Contains": "mengandung %s",
- "ConversionByTypeReportDocumentation": "Laporan ini menyediakan laporan terperinci tentang kinerja tujuan (konversi, ringkat konversi, dan pendapatan tiap kunjungan) untuk setiap kategori yang tersedia di panel kiri. %s Silakan klik salah satu kategori untuk melihat laporan. %s Informasi selengkapnya, silakan melihat %s dokumentasi Pelacakan Tujuan di piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Laporan ini menyediakan laporan terperinci tentang kinerja tujuan (konversi, ringkat konversi, dan pendapatan tiap kunjungan) untuk setiap kategori yang tersedia di panel kiri. %1$s Silakan klik salah satu kategori untuk melihat laporan. %2$s Informasi selengkapnya, silakan melihat %3$s dokumentasi Pelacakan Tujuan di piwik.org%4$s",
"ConversionRate": "%s tingkat konversi",
"Conversions": "%s konversi",
"ConversionsOverview": "Iktisar Konversi",
@@ -44,7 +44,7 @@
"EcommerceOrder": "Permintaan Niaga-E",
"EcommerceOverview": "Iktisar Niaga-E",
"EcommerceReports": "Laporan Niaga-E",
- "ExceptionInvalidMatchingString": "Bila Anda memilih 'persis sesuai', pencocokan huruf harus URL yang dimulai dengan %s. Misalnya, '%s'.",
+ "ExceptionInvalidMatchingString": "Bila Anda memilih 'persis sesuai', pencocokan huruf harus URL yang dimulai dengan %1$s. Misalnya, '%2$s'.",
"ExternalWebsiteUrl": "URL situs luar",
"Filename": "nama berkas",
"GoalConversion": "Konversi Tujuan",
@@ -84,7 +84,7 @@
"VisitUrl": "Kunjungi URL yang diberikan (halaman atau kelompok halaman)",
"WhenVisitors": "ketika pengunjung",
"WhereThe": "di mana",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "di mana halaman yang dikunjungi mengandung panggilan ke metode JavaScript piwikTracker.trackGoal() (%spelajari selengkapnya%s)",
- "YouCanEnableEcommerceReports": "Anda dapat mengaktifkan %s untuk situs ini dalam halaman %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "di mana halaman yang dikunjungi mengandung panggilan ke metode JavaScript 'trackGoal' (%1$spelajari selengkapnya%2$s)",
+ "YouCanEnableEcommerceReports": "Anda dapat mengaktifkan %1$s untuk situs ini dalam halaman %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/it.json b/plugins/Goals/lang/it.json
index cafa69d5a1906be8b6b01da3a7b6790736b64853..377c1d1949d3e69aeddb961ab1f17a27757d84a3 100644
--- a/plugins/Goals/lang/it.json
+++ b/plugins/Goals/lang/it.json
@@ -3,14 +3,14 @@
"AbandonedCart": "Ordini abbandonati",
"AddGoal": "Aggiungi un Goal",
"AddNewGoal": "Aggiungi un nuovo Goal",
- "AddNewGoalOrEditExistingGoal": "%sAggiungi un nuovo Goal%s o %sModificane%s uno esistente",
+ "AddNewGoalOrEditExistingGoal": "%1$sAggiungi un nuovo Goal%2$s o %3$sModificane%4$s uno esistente",
"AllowGoalConvertedMoreThanOncePerVisit": "Consenti di convertire il Goal più di una volta per visita",
"AllowMultipleConversionsPerVisit": "Permetti conversioni multiple per visita",
"BestCountries": "Le tue nazioni che convertono meglio sono:",
"BestKeywords": "Le tue keyword che convertono meglio sono:",
"BestReferrers": "I tuoi referenti che convertono meglio sono:",
"CaseSensitive": "Corrispondenza maiuscole e minuscole",
- "CancelAndReturnToGoals": "Annulla e %storna all'elenco dei goal%s",
+ "CancelAndReturnToGoals": "Annulla e %1$storna all'elenco dei goal%2$s",
"CategoryTextGeneral_Visitors": "Località utente",
"CategoryTextReferrers_Referrers": "Referenti",
"CategoryTextVisitsSummary_VisitsSummary": "Attributo utente",
@@ -33,7 +33,7 @@
"ColumnVisits": "Numero totale delle visite, indipendentemente dal fatto se un obiettivo sia stato attivato o meno.",
"ColumnVisitsProductDocumentation": "Numero di visite sulla pagina del Prodotto\/Categoria. Questo è anche utilizzato per elaborare la percentuale di conversioni %s. Questa metrica è nel report se è stato impostato nelle pagine Prodotto\/Categoria il view tracking Ecommerce.",
"Contains": "contiene %s",
- "ConversionByTypeReportDocumentation": "Questo report fornisce informazioni dettagliate sull'andamento degli obiettivi (conversioni, tassi di conversione ed entrate per visita), per ciascuna delle categorie disponibili nel pannello di sinistra. %s Si prega di cliccare su una delle categorie per visualizzare il report. %s Per ulteriori informazioni, leggere la %sDocumentazione Tracking Goals%s",
+ "ConversionByTypeReportDocumentation": "Questo report fornisce informazioni dettagliate sull'andamento degli obiettivi (conversioni, tassi di conversione ed entrate per visita), per ciascuna delle categorie disponibili nel pannello di sinistra. %1$s Si prega di cliccare su una delle categorie per visualizzare il report. %2$s Per ulteriori informazioni, leggere la %3$sDocumentazione Tracking Goals%4$s",
"ConversionRate": "%s rapporto di conversione",
"Conversions": "%s conversioni",
"ConversionsOverview": "Panoramica Conversioni",
@@ -52,7 +52,7 @@
"EcommerceOrder": "Ordini Ecommerce",
"EcommerceOverview": "Panoramica Ecommerce",
"EcommerceReports": "Report Ecommerce",
- "ExceptionInvalidMatchingString": "Se scegli 'corrispondenza esatta', la stringa corrispondente deve essere un URL che inizia con %s. Ad esempio, '%s'.",
+ "ExceptionInvalidMatchingString": "Se scegli 'corrispondenza esatta', la stringa corrispondente deve essere un URL che inizia con %1$s. Ad esempio, '%2$s'.",
"ExternalWebsiteUrl": "URL sito esterno",
"Filename": "nome file",
"GoalConversion": "Conversione Goal",
@@ -68,9 +68,9 @@
"GoalX": "Goal %s",
"HelpOneConversionPerVisit": "Se una pagina corrispondente a un Obiettivo è aggiornata o visualizzata più di una volta in una visita, l'Obiettivo verrà registrato solo la prima volta che la pagina è stata caricata durante questa visita.",
"IsExactly": "è esattamente %s",
- "LearnMoreAboutGoalTrackingDocumentation": "Impara di più sul %sTracciamento Obiettivi in Piwik%s nella documentazione per l'utente.",
+ "LearnMoreAboutGoalTrackingDocumentation": "Impara di più sul %1$sTracciamento Obiettivi in Piwik%2$s nella documentazione per l'utente.",
"LeftInCart": "%s lasciato nel carrello",
- "ManageGoalsOrCreateANewGoal": "%sAmministra i Goal%s o creane ora uno nuovo!",
+ "ManageGoalsOrCreateANewGoal": "%1$sAmministra i Goal%2$s o creane ora uno nuovo!",
"Manually": "manualmente",
"ManuallyTriggeredUsingJavascriptFunction": "Il Goal si attiva manualmente usando l'API Javascript trackGoal()",
"MatchesExpression": "soddisfa l'espressione %s",
@@ -101,7 +101,7 @@
"VisitUrl": "Visitano uno specifico URL (pagina o gruppo di pagine)",
"WhenVisitors": "quando i visitatori",
"WhereThe": "dove le",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "dove la pagina visitata contiene una chiamata al metodo JavaScript 'trackGoal' (%smaggiori dettagli%s)",
- "YouCanEnableEcommerceReports": "Puoi abilitare %s per questo sito nella pagina %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "dove la pagina visitata contiene una chiamata al metodo JavaScript 'trackGoal' (%1$smaggiori dettagli%2$s)",
+ "YouCanEnableEcommerceReports": "Puoi abilitare %1$s per questo sito nella pagina %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/ja.json b/plugins/Goals/lang/ja.json
index bbb26f8859031302b20444f019028ee06c04c5cd..798ff53050c9499a751b8d172cced5e1680d3504 100644
--- a/plugins/Goals/lang/ja.json
+++ b/plugins/Goals/lang/ja.json
@@ -3,14 +3,14 @@
"AbandonedCart": "放棄ã•ã‚ŒãŸã‚«ãƒ¼ãƒˆ",
"AddGoal": "ç›®æ¨™ã‚’è¿½åŠ ",
"AddNewGoal": "æ–°ã—ã„ç›®æ¨™ã‚’è¿½åŠ ",
- "AddNewGoalOrEditExistingGoal": "%sæ–°ã—ã„目標ã®è¿½åŠ %sã¾ãŸã¯%sæ—¢å˜ã®ç›®æ¨™ã®ç·¨é›†%s",
+ "AddNewGoalOrEditExistingGoal": "%1$sæ–°ã—ã„目標ã®è¿½åŠ %2$sã¾ãŸã¯%3$sæ—¢å˜ã®ç›®æ¨™ã®ç·¨é›†%4$s",
"AllowGoalConvertedMoreThanOncePerVisit": "目標é”æˆã¯ã€è¨ªå•ã®åº¦ã«è¤‡æ•°å›žã‚«ã‚¦ãƒ³ãƒˆ",
"AllowMultipleConversionsPerVisit": "訪å•ã”ã¨ã«è¤‡æ•°ã®ã‚³ãƒ³ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’許å¯",
"BestCountries": "ベストコンãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®å›½ï¼š",
"BestKeywords": "トップコンãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ã‚ーワード：",
"BestReferrers": "ベストコンãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®å‚照元ウェブサイト",
"CaseSensitive": "大文å—å°æ–‡å—を区別ã™ã‚‹ä¸€è‡´",
- "CancelAndReturnToGoals": "ã‚ャンセルã—ã¦ç›®æ¨™ %s ã®ãƒªã‚¹ãƒˆ %s ã«æˆ»ã‚‹",
+ "CancelAndReturnToGoals": "ã‚ャンセルã—ã¦ç›®æ¨™ %1$s ã®ãƒªã‚¹ãƒˆ %2$s ã«æˆ»ã‚‹",
"CategoryTextGeneral_Visitors": "ユーザーã®ä½ç½®æƒ…å ±",
"CategoryTextReferrers_Referrers": "リファラー",
"CategoryTextVisitsSummary_VisitsSummary": "ユーザー属性",
@@ -33,7 +33,7 @@
"ColumnVisits": "目標é”æˆã®å…ƒã¨ãªã£ãŸã‹ã©ã†ã‹ã«é–¢ã‚らãªã„ã€è¨ªå•æ•°ã®ç·æ•°",
"ColumnVisitsProductDocumentation": "製å“\/カテゴリーページ訪å•æ•°ã€‚ã“ã‚Œã¯ã€%s ã®ã‚³ãƒ³ãƒãƒ¼ã‚¸ãƒ§ãƒ³çŽ‡ã‚’処ç†ã™ã‚‹ãŸã‚ã«ã‚‚使ã‚ã‚Œã¦ã„ã¾ã™ã€‚ eコマースビュートラッã‚ングをã€è£½å“\/カテゴリーページã«è¨å®šã—ãŸå ´åˆã«ã€ã“ã®ãƒ¡ãƒˆãƒªãƒƒã‚¯ãŒãƒªãƒãƒ¼ãƒˆã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚",
"Contains": "%s ã‚’å«ã‚€",
- "ConversionByTypeReportDocumentation": "ã“ã®ãƒ¬ãƒãƒ¼ãƒˆã§ã¯ã€å·¦å´ã®ãƒ‘ãƒãƒ«ã§ä½¿ç”¨å¯èƒ½ãªã‚«ãƒ†ã‚´ãƒªã”ã¨ã®ç›®æ¨™ã®ãƒ‘フォーマンス（コンãƒãƒ¼ã‚¸ãƒ§ãƒ³ã€ã‚³ãƒ³ãƒãƒ¼ã‚¸ãƒ§ãƒ³çŽ‡ã€ãƒ“ジットã‚ãŸã‚Šã®åŽç›Šï¼‰ã«é–¢ã™ã‚‹è©³ç´°ãªæƒ…å ±ã‚’æä¾›ã—ã¾ã™ã€‚ %s レãƒãƒ¼ãƒˆã‚’表示ã™ã‚‹ã«ã¯ã€ã‚«ãƒ†ã‚´ãƒªã®ã„ãšã‚Œã‹ã‚’クリックã—ã¦ãã ã•ã„。%s 詳細ã«ã¤ã„ã¦ã¯ã€%s piwik.orgã®ãƒˆãƒ©ãƒƒã‚ングゴール(目標)ã®ãƒ‰ã‚ュメント %s ã‚’å‚ç…§ã—ã¦ãã ã•ã„。",
+ "ConversionByTypeReportDocumentation": "ã“ã®ãƒ¬ãƒãƒ¼ãƒˆã§ã¯ã€å·¦å´ã®ãƒ‘ãƒãƒ«ã§ä½¿ç”¨å¯èƒ½ãªã‚«ãƒ†ã‚´ãƒªã”ã¨ã®ç›®æ¨™ã®ãƒ‘フォーマンス（コンãƒãƒ¼ã‚¸ãƒ§ãƒ³ã€ã‚³ãƒ³ãƒãƒ¼ã‚¸ãƒ§ãƒ³çŽ‡ã€ãƒ“ジットã‚ãŸã‚Šã®åŽç›Šï¼‰ã«é–¢ã™ã‚‹è©³ç´°ãªæƒ…å ±ã‚’æä¾›ã—ã¾ã™ã€‚ %1$s レãƒãƒ¼ãƒˆã‚’表示ã™ã‚‹ã«ã¯ã€ã‚«ãƒ†ã‚´ãƒªã®ã„ãšã‚Œã‹ã‚’クリックã—ã¦ãã ã•ã„。%2$s 詳細ã«ã¤ã„ã¦ã¯ã€%3$s piwik.orgã®ãƒˆãƒ©ãƒƒã‚ングゴール(目標)ã®ãƒ‰ã‚ュメント %4$s ã‚’å‚ç…§ã—ã¦ãã ã•ã„。",
"ConversionRate": "%s コンãƒãƒ¼ã‚¸ãƒ§ãƒ³çŽ‡",
"Conversions": "%s コンãƒãƒ¼ã‚¸ãƒ§ãƒ³",
"ConversionsOverview": "コンãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®æ¦‚観",
@@ -52,7 +52,7 @@
"EcommerceOrder": "eコマース注文",
"EcommerceOverview": "eコマース概観",
"EcommerceReports": "eコマースリãƒãƒ¼ãƒˆ",
- "ExceptionInvalidMatchingString": "'完全ã«ä¸€è‡´ã™ã‚‹' ã‚’é¸æŠžã—ãŸå ´åˆã€ä¸€è‡´æ–‡å—列㯠%s ã§å§‹ã¾ã‚‹ URL ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ 例ãˆã°ã€%s ã§ã™ã€‚",
+ "ExceptionInvalidMatchingString": "'完全ã«ä¸€è‡´ã™ã‚‹' ã‚’é¸æŠžã—ãŸå ´åˆã€ä¸€è‡´æ–‡å—列㯠%1$s ã§å§‹ã¾ã‚‹ URL ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ 例ãˆã°ã€%2$s ã§ã™ã€‚",
"ExternalWebsiteUrl": "外部ウェブサイト㮠URL",
"Filename": "ファイルå",
"GoalConversion": "目標コンãƒãƒ¼ã‚¸ãƒ§ãƒ³",
@@ -68,9 +68,9 @@
"GoalX": "目標 %s",
"HelpOneConversionPerVisit": "ã‚‚ã—ã“ã®ç›®æ¨™ã«ãƒžãƒƒãƒã—ãŸãƒšãƒ¼ã‚¸ãŒæ›´æ–°ã•ã‚ŒãŸã‚Šã€ä¸€å›žã®ãƒ“ジットã§1回以上見られãŸã¨ã—ã¦ã‚‚ã€ãã®æœ€åˆã®è¨ªå•æ™‚ã«ã®ã¿ç›®æ¨™ã¯ãƒˆãƒ©ãƒƒã‚¯ã•ã‚Œã¾ã™ã€‚",
"IsExactly": "%s ã¨å®Œå…¨ã«ä¸€è‡´ã™ã‚‹",
- "LearnMoreAboutGoalTrackingDocumentation": "Piwik ã®ç›®æ¨™ã®ãƒˆãƒ©ãƒƒã‚ングã«ã¤ã„ã¦ã®è©³ç´°ã¯ã€%s ユーザーマニュアル %sã‚’å‚ç…§ã—ã¦ãã ã•ã„。",
+ "LearnMoreAboutGoalTrackingDocumentation": "Piwik ã®ç›®æ¨™ã®ãƒˆãƒ©ãƒƒã‚ングã«ã¤ã„ã¦ã®è©³ç´°ã¯ã€%1$s ユーザーマニュアル %2$sã‚’å‚ç…§ã—ã¦ãã ã•ã„。",
"LeftInCart": "カートã«æ®‹ã•ã‚ŒãŸ %s",
- "ManageGoalsOrCreateANewGoal": "%s ç›®æ¨™ç®¡ç† %s ã‚„æ–°ãŸãªç›®æ¨™ã‚’今ã™ã作æˆ!",
+ "ManageGoalsOrCreateANewGoal": "%1$s ç›®æ¨™ç®¡ç† %2$s ã‚„æ–°ãŸãªç›®æ¨™ã‚’今ã™ã作æˆ!",
"Manually": "手動",
"ManuallyTriggeredUsingJavascriptFunction": "JavaScript API ã® trackGoal() を使用ã—ãŸæ‰‹å‹•ãƒˆãƒªã‚¬ãƒ¼",
"MatchesExpression": "æ£è¦è¡¨ç¾ %s ã«ä¸€è‡´ã™ã‚‹",
@@ -101,7 +101,7 @@
"VisitUrl": "特定㮠URL を訪å•ï¼ˆãƒšãƒ¼ã‚¸ã¾ãŸã¯ãƒšãƒ¼ã‚¸ã‚°ãƒ«ãƒ¼ãƒ—）",
"WhenVisitors": "ビジター",
"WhereThe": "対象：",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "訪å•ã—ãŸãƒšãƒ¼ã‚¸ã« JavaScript ã® piwikTracker.trackGoal() メソッドã®ã‚³ãƒ¼ãƒ«ãŒå«ã¾ã‚Œã‚‹ã¨ã“ã‚（%s詳細%s）",
- "YouCanEnableEcommerceReports": "%s ページã§ã“ã®ã‚¦ã‚§ãƒ–サイトã«%s を有効ã«ã§ãã¾ã™ã€‚"
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "訪å•ã—ãŸãƒšãƒ¼ã‚¸ã« JavaScript ã® 'trackGoal' メソッドã®ã‚³ãƒ¼ãƒ«ãŒå«ã¾ã‚Œã‚‹ã¨ã“ã‚（%1$s詳細%2$s）",
+ "YouCanEnableEcommerceReports": "%1$s ページã§ã“ã®ã‚¦ã‚§ãƒ–サイトã«%2$s を有効ã«ã§ãã¾ã™ã€‚"
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/ko.json b/plugins/Goals/lang/ko.json
index 8dc370de94ecb655b2bfd9b1847a37b686eebab2..a4e356a5bf3ecf8406a9e270da768bc96b2b86b8 100644
--- a/plugins/Goals/lang/ko.json
+++ b/plugins/Goals/lang/ko.json
@@ -3,14 +3,14 @@
"AbandonedCart": "ë²„ë ¤ì§„ 장바구니",
"AddGoal": "목표 추가",
"AddNewGoal": "새로운 목표 추가",
- "AddNewGoalOrEditExistingGoal": "%s새로운 목표 추가%s ë˜ëŠ” %s기존 목표 편집%s",
+ "AddNewGoalOrEditExistingGoal": "%1$s새로운 목표 추가%2$s ë˜ëŠ” %3$s기존 목표 편집%4$s",
"AllowGoalConvertedMoreThanOncePerVisit": "목표 ë‹¬ì„±ì€ ë°©ë¬¸ 때마다 여러번 계산",
"AllowMultipleConversionsPerVisit": "방문마다 여러 ì „í™˜ 허용",
"BestCountries": "ìµœê³ ì „í™˜ êµê°€:",
"BestKeywords": "ìƒìœ„ ì „í™˜ 검색어:",
"BestReferrers": "ìµœê³ ì „í™˜ 참조 웹사ì´íŠ¸:",
"CaseSensitive": "ëŒ€ì†Œë¬¸ìž êµ¬ë¶„í•¨",
- "CancelAndReturnToGoals": "ì·¨ì†Œí•˜ê³ %s목표 리스트로 ëŒì•„가기%s",
+ "CancelAndReturnToGoals": "ì·¨ì†Œí•˜ê³ %1$s목표 리스트로 ëŒì•„가기%2$s",
"CategoryTextGeneral_Visitors": "ì‚¬ìš©ìž ìœ„ì¹˜",
"CategoryTextReferrers_Referrers": "리í¼ëŸ¬",
"CategoryTextVisitsSummary_VisitsSummary": "ì‚¬ìš©ìž ì†ì„±",
@@ -33,7 +33,7 @@
"ColumnVisits": "목표 달성 ì—¬ë¶€ì— ê´€ê³„ì—†ëŠ” 방문ìžì˜ ì´ê³„.",
"ColumnVisitsProductDocumentation": "ì œí’ˆ\/ì¹´í…Œê³ ë¦¬ 페ì´ì§€ 방문수입니다. ì´ê²ƒì€ %sì˜ ì „í™˜ìœ¨ì„ ì²˜ë¦¬í•˜ëŠ” ë°ì—ë„ ì‚¬ìš©ë©ë‹ˆë‹¤. ì „ìžìƒê±°ëž˜ 추ì , ì œí’ˆ\/ì¹´í…Œê³ ë¦¬ 페ì´ì§€ë¡œ ì„¤ì •í•œ 경우,ì´ í†µê³„ê°€ ë³´ê³ ì„œì— í‘œì‹œë©ë‹ˆë‹¤.",
"Contains": "%s를 í¬í•¨",
- "ConversionByTypeReportDocumentation": "ì´ ë³´ê³ ì„œëŠ” 왼쪽 패ë„ì—ì„œ 사용 가능한 ì¹´í…Œê³ ë¦¬ë³„ 목표 성능 (ì „í™˜, ì „í™˜ìœ¨, 비지트 당 수ìµ)ì— ëŒ€í•œ ìžì„¸í•œ ì •ë³´ë¥¼ ì œê³µí•©ë‹ˆë‹¤. %s ë³´ê³ ì„œë¥¼ í‘œì‹œí•˜ë ¤ë©´ ì¹´í…Œê³ ë¦¬ 중 하나를 í´ë¦í•˜ì„¸ìš”. %s ìžì„¸í•œ ë‚´ìš©ì€ %s piwik.org 목표 추ì 문서 %s를 참조하세요.",
+ "ConversionByTypeReportDocumentation": "ì´ ë³´ê³ ì„œëŠ” 왼쪽 패ë„ì—ì„œ 사용 가능한 ì¹´í…Œê³ ë¦¬ë³„ 목표 성능 (ì „í™˜, ì „í™˜ìœ¨, 비지트 당 수ìµ)ì— ëŒ€í•œ ìžì„¸í•œ ì •ë³´ë¥¼ ì œê³µí•©ë‹ˆë‹¤. %1$s ë³´ê³ ì„œë¥¼ í‘œì‹œí•˜ë ¤ë©´ ì¹´í…Œê³ ë¦¬ 중 하나를 í´ë¦í•˜ì„¸ìš”. %2$s ìžì„¸í•œ ë‚´ìš©ì€ %3$s piwik.org 목표 추ì 문서 %4$s를 참조하세요.",
"ConversionRate": "%s ì „í™˜ìœ¨",
"Conversions": "%s ì „í™˜",
"ConversionsOverview": "ì „í™˜ 개요",
@@ -52,7 +52,7 @@
"EcommerceOrder": "ì „ìžìƒê±°ëž˜ 주문",
"EcommerceOverview": "ì „ìžìƒê±°ëž˜ 개요",
"EcommerceReports": "ì „ìžìƒê±°ëž˜ ë³´ê³ ì„œ",
- "ExceptionInvalidMatchingString": "'ì™„ì „ ì¼ì¹˜'를 ì„ íƒí•˜ë©´ ì¼ì¹˜ 문ìžì—´ì€ %së¡œ 시작하는 URLì´ì–´ì•¼í•©ë‹ˆë‹¤. 예를 들면, %s입니다.",
+ "ExceptionInvalidMatchingString": "'ì™„ì „ ì¼ì¹˜'를 ì„ íƒí•˜ë©´ ì¼ì¹˜ 문ìžì—´ì€ %1$së¡œ 시작하는 URLì´ì–´ì•¼í•©ë‹ˆë‹¤. 예를 들면, %2$s입니다.",
"ExternalWebsiteUrl": "외부 웹사ì´íŠ¸ì˜ URL",
"Filename": "íŒŒì¼ ì´ë¦„",
"GoalConversion": "목표 ì „í™˜",
@@ -68,9 +68,9 @@
"GoalX": "목표 %s",
"HelpOneConversionPerVisit": "만약 ëª©í‘œì— ì¼ì¹˜í•˜ëŠ” 페ì´ì§€ê°€ ì—…ë°ì´íŠ¸ë˜ê±°ë‚˜ 한번 ì´ìƒ 방문해ë„, 첫 번째 방문시ì—만 목표가 달성ë©ë‹ˆë‹¤.",
"IsExactly": "%s와 ì¼ì¹˜",
- "LearnMoreAboutGoalTrackingDocumentation": "ì‚¬ìš©ìž ë¬¸ì„œ ë‚´ %sPiwik 목표 추ì %s 문서를 통해서 좀 ë” ì•Œ 수 있습니다.",
+ "LearnMoreAboutGoalTrackingDocumentation": "ì‚¬ìš©ìž ë¬¸ì„œ ë‚´ %1$sPiwik 목표 추ì %2$s 문서를 통해서 좀 ë” ì•Œ 수 있습니다.",
"LeftInCart": "ì¹´íŠ¸ì— ë‚¨ê²¨ì§„ %s",
- "ManageGoalsOrCreateANewGoal": "%s목표 관리%s í˜¹ì€ ìƒˆë¡œìš´ 목표를 만드세요!",
+ "ManageGoalsOrCreateANewGoal": "%1$s목표 관리%2$s í˜¹ì€ ìƒˆë¡œìš´ 목표를 만드세요!",
"Manually": "수ë™ìœ¼ë¡œ",
"ManuallyTriggeredUsingJavascriptFunction": "JavaScript APIì˜ trackGoal()ì„ ì‚¬ìš©í•˜ì—¬ ìˆ˜ë™ íŠ¸ë¦¬ê±°",
"MatchesExpression": "ì •ê·œì‹ %sì— ì¼ì¹˜",
@@ -101,7 +101,7 @@
"VisitUrl": "íŠ¹ì • URL 방문 (페ì´ì§€ ë˜ëŠ” 페ì´ì§€ 그룹)",
"WhenVisitors": "방문 시기",
"WhereThe": "방문 대ìƒ",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "방문한 페ì´ì§€ JavaScriptì˜ piwikTracker.trackGoal() 메서드 í˜¸ì¶œì´ í¬í•¨ëœ ê³³ (%sìžì„¸ížˆ%s)",
- "YouCanEnableEcommerceReports": "%s 페ì´ì§€ì—ì„œ ì´ ì›¹ì‚¬ì´íŠ¸ì— %s를 ì‚¬ìš©í• ìˆ˜ 있습니다."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "방문한 페ì´ì§€ JavaScriptì˜ 'trackGoal' 메서드 í˜¸ì¶œì´ í¬í•¨ëœ ê³³ (%1$sìžì„¸ížˆ%2$s)",
+ "YouCanEnableEcommerceReports": "%1$s 페ì´ì§€ì—ì„œ ì´ ì›¹ì‚¬ì´íŠ¸ì— %2$s를 ì‚¬ìš©í• ìˆ˜ 있습니다."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/lt.json b/plugins/Goals/lang/lt.json
index 7249bfc3b9bb3ceb4b19ed4297c7600a1e0081aa..10bcee0e283185607a1e758f590d0bd30ed6bfc4 100644
--- a/plugins/Goals/lang/lt.json
+++ b/plugins/Goals/lang/lt.json
@@ -2,7 +2,7 @@
"Goals": {
"AddGoal": "Pridėti uždavinį",
"AddNewGoal": "Pridėti naują uždavinį",
- "AddNewGoalOrEditExistingGoal": "%sPridėti naują uždavinį%s arba %sRedaguoti%s jau egzistuojantį",
+ "AddNewGoalOrEditExistingGoal": "%1$sPridėti naują uždavinį%2$s arba %3$sRedaguoti%4$s jau egzistuojantį",
"BestCountries": "Jūsų geriausios konversijos šalys:",
"BestKeywords": "Jū9sų geriausi konversijos raktažodžiai:",
"BestReferrers": "Jūsų geriausios konversijos svetainės:",
@@ -17,7 +17,7 @@
"DefaultRevenueHelp": "Pavyzdžiui, lankytojo užpildyta ir išsiųsta kontaktinė forma gali būti verta vidutiniškai 10 Lt. Piwik padės Jums suprasti Jūsų lankytojų segmentų efektyvumą.",
"DeleteGoalConfirm": "Ar tikrai norite ištrinti uždavinį %s?",
"Download": "Atsisiųsti failą",
- "ExceptionInvalidMatchingString": "Jei pasirinksite \"tikslų atitikimą\", tinkanti reikšmė turi būti URL prasidedanti %s. Pavyzdžiui, '%s'.",
+ "ExceptionInvalidMatchingString": "Jei pasirinksite \"tikslų atitikimą\", tinkanti reikšmė turi būti URL prasidedanti %1$s. Pavyzdžiui, '%2$s'.",
"ExternalWebsiteUrl": "išorinės svetainės URL",
"Filename": "failo pavadinimas",
"GoalIsTriggered": "Uždavinys paleistas",
diff --git a/plugins/Goals/lang/nb.json b/plugins/Goals/lang/nb.json
index ef41f48b6a4d451caaf853f5eea2980cf2e833c5..415c58bff036f0243a7be3ede50c99f4262f4dbb 100644
--- a/plugins/Goals/lang/nb.json
+++ b/plugins/Goals/lang/nb.json
@@ -3,9 +3,14 @@
"AbandonedCart": "Forlatt handlevogn",
"AddGoal": "Legg til mål",
"AddNewGoal": "Legg til et nytt mål",
- "AddNewGoalOrEditExistingGoal": "%sLegg til nytt mål%s eller %sRediger%s eksisterende mål",
+ "AddNewGoalOrEditExistingGoal": "%1$sLegg til nytt mål%2$s eller %3$sRediger%4$s eksisterende mål",
+ "AllowGoalConvertedMoreThanOncePerVisit": "Tillat mål å bli konvertert mer enn én gang per besøk",
"AllowMultipleConversionsPerVisit": "Tillat flere konverteringer per besøk",
- "CancelAndReturnToGoals": "Avbryt og %sreturner til listen over mål%s",
+ "BestCountries": "Dine best konverterende land er:",
+ "BestKeywords": "Dine best konverterende nøkkelord er:",
+ "BestReferrers": "Dine best konverterende nettstedshenvisere er:",
+ "CaseSensitive": "Skiller mellom store og små bokstaver",
+ "CancelAndReturnToGoals": "Avbryt og %1$sreturner til listen over mål%2$s",
"CategoryTextReferrers_Referrers": "Henvisere",
"ChooseGoal": "Velg mål",
"ColumnConversions": "Konvertering",
diff --git a/plugins/Goals/lang/nl.json b/plugins/Goals/lang/nl.json
index 710f410e2e8419319098502152ecdfe71d038931..a7469ad3477af15c960a1753163f44a2e8c04c00 100644
--- a/plugins/Goals/lang/nl.json
+++ b/plugins/Goals/lang/nl.json
@@ -3,14 +3,14 @@
"AbandonedCart": "Verlaat winkelwagen",
"AddGoal": "Voeg doelstelling toe",
"AddNewGoal": "Voeg een nieuwe doelstelling toe",
- "AddNewGoalOrEditExistingGoal": "%sVoeg een nieuwe doelstelling toe%s of %spas een bestaande doelstelling aan%s",
+ "AddNewGoalOrEditExistingGoal": "%1$sVoeg een nieuwe doelstelling toe%2$s of %3$spas een bestaande doelstelling aan%4$s",
"AllowGoalConvertedMoreThanOncePerVisit": "Sta pér bezoek meerdere conversie van dit doel toe",
"AllowMultipleConversionsPerVisit": "Sta meerdere conversies per bezoek toe",
"BestCountries": "Uw beste presterende landen zijn:",
"BestKeywords": "Uw beste presterende sleutelwoorden zijn:",
"BestReferrers": "Uw beste presterende referrers zijn:",
"CaseSensitive": "Hoofdletter gevoelig",
- "CancelAndReturnToGoals": "Annuleren en %sterugkeren naar de lijst van doelen%s",
+ "CancelAndReturnToGoals": "Annuleren en %1$sterugkeren naar de lijst van doelen%2$s",
"CategoryTextGeneral_Visitors": "Gebruikers locatie",
"CategoryTextReferrers_Referrers": "Herkomsten",
"CategoryTextVisitsSummary_VisitsSummary": "Gebruikers eigenschap",
@@ -33,7 +33,7 @@
"ColumnVisits": "Het totaal aantal bezoeken, ongeacht of er een conversiedoel werd bereikt of niet.",
"ColumnVisitsProductDocumentation": "Het aantal bezoeken aan de produkt\/catageorie pagina. Dit wordt ook gebruikt om het conversie percentage te berekenen. Deze gegevens zijn onderdeel van het rapport als Ecommerce-tracking is ingesteld op de produkt\/categorie paginas.The number of visits on the Product\/Category page. This is also used to process the %s conversion rate. This metric is in the report if Ecommerce view tracking was setup on Product\/Category pages.",
"Contains": "bevat %s",
- "ConversionByTypeReportDocumentation": "Dit rapport bevat gedetailleerde informatie over het doel prestaties (conversies, de wisselkoersen en de inkomsten per bezoek) voor elk van de categorieën in het linkervenster. %s Klik op een van de categorieën om het rapport te bekijken. %s voor meer informatie, lees de %sTracking Doelen documentatie over piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Dit rapport bevat gedetailleerde informatie over het doel prestaties (conversies, de wisselkoersen en de inkomsten per bezoek) voor elk van de categorieën in het linkervenster. %1$s Klik op een van de categorieën om het rapport te bekijken. %2$s voor meer informatie, lees de %3$sTracking Doelen documentatie over piwik.org%4$s",
"ConversionRate": "%s conversie rate",
"Conversions": "%s conversies",
"ConversionsOverview": "Overzicht conversies",
@@ -52,7 +52,7 @@
"EcommerceOrder": "E-commerce order",
"EcommerceOverview": "E-commerce Overzicht",
"EcommerceReports": "E-commerce Rapporten",
- "ExceptionInvalidMatchingString": "Als u voor 'exacte overeenkomst' kiest, moet de overeenkomende string een URL zijn en starten met %s. Bijvoorbeeld, '%s'.",
+ "ExceptionInvalidMatchingString": "Als u voor 'exacte overeenkomst' kiest, moet de overeenkomende string een URL zijn en starten met %1$s. Bijvoorbeeld, '%2$s'.",
"ExternalWebsiteUrl": "externe website URL",
"Filename": "bestandsnaam",
"GoalConversion": "Doel conversie",
@@ -68,9 +68,9 @@
"GoalX": "Doel %s",
"HelpOneConversionPerVisit": "Als een pagina - die dit doel bevat - wordt ververst of meerdere keren wordt opgevraagd in één bezoek, dan wordt de doelconversie geregistreerd tijdens de éérste keer dat de pagina werd opgevraagd.",
"IsExactly": "is exact %s",
- "LearnMoreAboutGoalTrackingDocumentation": "Leer meer over het %s bijhouden van Doelen in Piwik%s in de gebruikers documentatie.",
+ "LearnMoreAboutGoalTrackingDocumentation": "Leer meer over het %1$s bijhouden van Doelen in Piwik%2$s in de gebruikers documentatie.",
"LeftInCart": "%s achtergelaten in winkelwagen",
- "ManageGoalsOrCreateANewGoal": "%sBeheer Doelen%s of maak nu een nieuw Doel!",
+ "ManageGoalsOrCreateANewGoal": "%1$sBeheer Doelen%2$s of maak nu een nieuw Doel!",
"Manually": "handmatig",
"ManuallyTriggeredUsingJavascriptFunction": "Doelstelling is handmatig geactiveerd door de Javascript API trackGoal()",
"MatchesExpression": "Voldoet aan de expressie %s",
@@ -99,7 +99,7 @@
"VisitUrl": "Bezoek een gegeven url (pagina of groep pagina's)",
"WhenVisitors": "wanneer bezoekers",
"WhereThe": "waar de",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "Wanneer een bezochte pagina een oproep bevat naar de javascript piwikTracker.trackGoal() methode (%smeer info%s)",
- "YouCanEnableEcommerceReports": "U kunt de functie %s inschakelen voor deze website in de pagina %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "Wanneer een bezochte pagina een oproep bevat naar de javascript piwikTracker.trackGoal() methode (%1$smeer info%2$s)",
+ "YouCanEnableEcommerceReports": "U kunt de functie %1$s inschakelen voor deze website in de pagina %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/nn.json b/plugins/Goals/lang/nn.json
index 895d10582746fb435e24d3343757d20e10c913b1..b0e80f8461fe6f6629964235eda1ae48841bea28 100644
--- a/plugins/Goals/lang/nn.json
+++ b/plugins/Goals/lang/nn.json
@@ -39,6 +39,6 @@
"VisitUrl": "Vitj ein gitt URL (side eller gruppe av sider)",
"WhenVisitors": "når vitjarar",
"WhereThe": "når",
- "YouCanEnableEcommerceReports": "Du kan slå på %s for denne nettstaden på %s-sida."
+ "YouCanEnableEcommerceReports": "Du kan slå på %1$s for denne nettstaden på %2$s-sida."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/pl.json b/plugins/Goals/lang/pl.json
index 300db9740d015537692bc925fa6fe6a101ba6f89..68c8b04cbffccb01375445abe03a2ccc72a0cdbc 100644
--- a/plugins/Goals/lang/pl.json
+++ b/plugins/Goals/lang/pl.json
@@ -3,7 +3,7 @@
"AbandonedCart": "Opuszczony Koszyk",
"AddGoal": "Dodaj założenia",
"AddNewGoal": "Dodaj nowy cel",
- "AddNewGoalOrEditExistingGoal": "%sDodaj nowe założenie celu%s lub %sedytuj%s istniejące trafienia",
+ "AddNewGoalOrEditExistingGoal": "%1$sDodaj nowe założenie celu%2$s lub %3$sedytuj%4$s istniejące trafienia",
"AllowGoalConvertedMoreThanOncePerVisit": "Zezwól dla trafień, by były zamieniane częściej w trakcie jednej wizyty",
"AllowMultipleConversionsPerVisit": "Zezwalaj na wiele zamian przypadajÄ…cych w trakcie wizyty",
"BestCountries": "Pochodzenie najlepszych krajów:",
@@ -35,7 +35,7 @@
"Ecommerce": "Ecommerce",
"EcommerceLog": "E-commerce Zaloguj",
"EcommerceOrder": "E-commerce zamów",
- "ExceptionInvalidMatchingString": "Jeżeli wybierasz 'dokładne dopasowanie', łańcuch dopasowujący musi być adresem URL zaczynającym się od %s. Na przykład, '%s'.",
+ "ExceptionInvalidMatchingString": "Jeżeli wybierasz 'dokładne dopasowanie', łańcuch dopasowujący musi być adresem URL zaczynającym się od %1$s. Na przykład, '%2$s'.",
"ExternalWebsiteUrl": "adres zewnętrzny URL",
"Filename": "nazwa pliku",
"GoalConversion": "Zmiana założenia",
@@ -70,6 +70,6 @@
"VisitUrl": "odwiedź dany adres URL (stronę lub grupę stron)",
"WhenVisitors": "przez odwiedzajÄ…cego",
"WhereThe": "gdzie",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "gdzie odwiedzona strona zawiera wywołania do metody JavaScript piwikTracker.trackGoal() (%szobacz więcej%s)"
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "gdzie odwiedzona strona zawiera wywołania do metody JavaScript 'trackGoal' (%1$szobacz więcej%2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/pt-br.json b/plugins/Goals/lang/pt-br.json
index 0d6e3d7982e9838381c3352c9b81683a04bcb258..9434023edce1990a7e4e5c459bd40270234ac7d9 100644
--- a/plugins/Goals/lang/pt-br.json
+++ b/plugins/Goals/lang/pt-br.json
@@ -3,14 +3,14 @@
"AbandonedCart": "Carrinho abandonado",
"AddGoal": "Adicionar meta",
"AddNewGoal": "Adicionar nova meta",
- "AddNewGoalOrEditExistingGoal": "%sAdicionar nova meta%s ou %sEditar%s metas existentes",
+ "AddNewGoalOrEditExistingGoal": "%1$sAdicionar nova meta%2$s ou %3$sEditar%4$s metas existentes",
"AllowGoalConvertedMoreThanOncePerVisit": "Permitir convesão de metas mais do que uma vez por visita",
"AllowMultipleConversionsPerVisit": "Permitir múltiplas conversões por visita",
"BestCountries": "Seus melhores paÃses conversores são:",
"BestKeywords": "Suas palavras-chave top de conversão são:",
"BestReferrers": "Seus melhores websites referenciadores são:",
"CaseSensitive": "Equivalencia case sensitive",
- "CancelAndReturnToGoals": "Cancelar e %sretornar para a lista de objetivos%s",
+ "CancelAndReturnToGoals": "Cancelar e %1$sretornar para a lista de objetivos%2$s",
"CategoryTextGeneral_Visitors": "Localização do usuário",
"CategoryTextReferrers_Referrers": "Referenciadores",
"CategoryTextVisitsSummary_VisitsSummary": "CaracterÃstica do usuário",
@@ -33,7 +33,7 @@
"ColumnVisits": "O número total de visitas, independentemente de se uma meta foi disparado ou não.",
"ColumnVisitsProductDocumentation": "O número de visitas na página do produto\/Categoria. Este também é usado para processar a taxa de conversão %s. Esta métrica estará no relatório de monitoramento de comércio eletrônico se instalado nas páginas de Produto\/Categoria.",
"Contains": "contem %s",
- "ConversionByTypeReportDocumentation": "Esse relatório fornece informações detalhadas sobre o desempenho objetivo (conversões, taxas de conversão e receita por visita) para cada uma das categorias disponÃveis no painel esquerdo. %s Por favor, clique em uma das categorias para ver o relatório. %s para mais informações, leia a documentação %sTracking Metas em piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Esse relatório fornece informações detalhadas sobre o desempenho objetivo (conversões, taxas de conversão e receita por visita) para cada uma das categorias disponÃveis no painel esquerdo. %1$s Por favor, clique em uma das categorias para ver o relatório. %2$s para mais informações, leia a documentação %3$sTracking Metas em piwik.org%4$s",
"ConversionRate": "%s taxa de conversão",
"Conversions": "%s conversões",
"ConversionsOverview": "Visão geral de conversões",
@@ -52,7 +52,7 @@
"EcommerceOrder": "Ecommerce ordem",
"EcommerceOverview": "Visão geral do Ecommerce",
"EcommerceReports": "Relatórios de Ecommerce",
- "ExceptionInvalidMatchingString": "Se você escolher 'correspondência exata', a string correspondente deve ser uma URL que comece com %s. Por exemplo, \"%s\".",
+ "ExceptionInvalidMatchingString": "Se você escolher 'correspondência exata', a string correspondente deve ser uma URL que comece com %1$s. Por exemplo, \"%2$s\".",
"ExternalWebsiteUrl": "URL de website externo",
"Filename": "nome do arquivo",
"GoalConversion": "Conversão de meta",
@@ -68,9 +68,9 @@
"GoalX": "Meta %s",
"HelpOneConversionPerVisit": "Se a página correspondente a essa meta é recarregada ou vista mais de uma vez em uma visita, a Meta só será rastreada na primeira vez em que a página for carregada durante esta visita.",
"IsExactly": "é exatamente %s",
- "LearnMoreAboutGoalTrackingDocumentation": "Aprenda mais sobre Rastreamento de Metas %s em Piwik%s na documentação do usuário.",
+ "LearnMoreAboutGoalTrackingDocumentation": "Aprenda mais sobre Rastreamento de Metas %1$s em Piwik%2$s na documentação do usuário.",
"LeftInCart": "%s carrinhos abandonados",
- "ManageGoalsOrCreateANewGoal": "%sGerencie Metas%s ou crie uma nova Meta agora!",
+ "ManageGoalsOrCreateANewGoal": "%1$sGerencie Metas%2$s ou crie uma nova Meta agora!",
"Manually": "manualmente",
"ManuallyTriggeredUsingJavascriptFunction": "A meta é manualmente triggered usando a API do Javascript trackGoal()",
"MatchesExpression": "corresponde com a expressão %s",
@@ -101,7 +101,7 @@
"VisitUrl": "Visitar a URL dada(página ou grupo de páginas)",
"WhenVisitors": "quando visitantes",
"WhereThe": "onde o(a)",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "onde a página visitada contem um chamado para o JavaScript piwikTracker.trackGoal() metodo (%slearn more%s)",
- "YouCanEnableEcommerceReports": "Você pode habilitar %s para este site na página %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "onde a página visitada contem um chamado para o JavaScript 'trackGoal' metodo (%1$slearn more%2$s)",
+ "YouCanEnableEcommerceReports": "Você pode habilitar %1$s para este site na página %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/pt.json b/plugins/Goals/lang/pt.json
index 17e3a574c38e3fcd7d45830fd2a14d494212543e..4246f9bc6dc9fc1d552c5a6f687a57dccfceb0ea 100644
--- a/plugins/Goals/lang/pt.json
+++ b/plugins/Goals/lang/pt.json
@@ -3,7 +3,7 @@
"AbandonedCart": "Carrinhos abandonados",
"AddGoal": "Adicionar Objectivo",
"AddNewGoal": "Adicionar um novo Objectivo",
- "AddNewGoalOrEditExistingGoal": "%sAdicionar um novo Objectivo%s ou %sEditar%s Objectivos existentes",
+ "AddNewGoalOrEditExistingGoal": "%1$sAdicionar um novo Objectivo%2$s ou %3$sEditar%4$s Objectivos existentes",
"AllowGoalConvertedMoreThanOncePerVisit": "Permitir um Objectivo ser convertido mais de uma vez por visita",
"AllowMultipleConversionsPerVisit": "Permitir multiplas conversões por visitas",
"BestCountries": "Os seus melhores paÃses de conversões são:",
@@ -26,7 +26,7 @@
"ColumnVisits": "O número total de visitas, independente se um objectivo foi despoletado ou não.",
"ColumnVisitsProductDocumentation": "O número de visitas na página do produto \/ Categoria. Este também é usado para processar a taxa de conversão %s. Esta métrica está no relatório se a vista de rastreamento de Comério electrónico foi configurado nas páginas de Produto \/ Categoria.",
"Contains": "contém %s",
- "ConversionByTypeReportDocumentation": "Este relatório fornece informações detalhadas sobre o desempenho de Objectivos (conversões, as taxas de conversão e receita por visita) para cada uma das categorias disponÃveis no painel esquerdo. Por favor clique em %s em uma das categorias para visualizar o relatório. %s Para mais informações, leia a %sdocumentação Rastreamento de Objectivos em piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Este relatório fornece informações detalhadas sobre o desempenho de Objectivos (conversões, as taxas de conversão e receita por visita) para cada uma das categorias disponÃveis no painel esquerdo. Por favor clique em %1$s em uma das categorias para visualizar o relatório. %2$s Para mais informações, leia a %3$sdocumentação Rastreamento de Objectivos em piwik.org%4$s",
"ConversionRate": "%s taxa de conversão",
"Conversions": "%s conversões",
"ConversionsOverview": "Visão Geral das Conversões",
@@ -44,7 +44,7 @@
"EcommerceOrder": "Ordens de Comércio Electrónico",
"EcommerceOverview": "Visão Global de Comércio Electrónico",
"EcommerceReports": "Relatórios de Comércio Electrónico",
- "ExceptionInvalidMatchingString": "Se escolher 'correspondência exacta', a string correspondente tem que ser um endereço a começar por %s. Por exemplo, '%s'.",
+ "ExceptionInvalidMatchingString": "Se escolher 'correspondência exacta', a string correspondente tem que ser um endereço a começar por %1$s. Por exemplo, '%2$s'.",
"ExternalWebsiteUrl": "endereço de website externo",
"Filename": "nome do ficheiro",
"GoalConversion": "Conversão de Objectivo",
@@ -83,7 +83,7 @@
"VisitUrl": "Visitar um dado endereço (página ou grupo de páginas)",
"WhenVisitors": "quando visitantes",
"WhereThe": "onde o",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "onde a página visitada contém uma chamada ao método JavaScript piwikTracker.trackGoal() (%saprenda mais%s)",
- "YouCanEnableEcommerceReports": "Você pode ativar %s para este site na página %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "onde a página visitada contém uma chamada ao método JavaScript 'trackGoal' (%1$saprenda mais%2$s)",
+ "YouCanEnableEcommerceReports": "Você pode ativar %1$s para este site na página %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/ro.json b/plugins/Goals/lang/ro.json
index 7bec7dd7c29fe18327fbdc7c83aba6c59a8ac637..ed66db5624196293378fa9aef800d2fd39af565b 100644
--- a/plugins/Goals/lang/ro.json
+++ b/plugins/Goals/lang/ro.json
@@ -3,7 +3,7 @@
"AbandonedCart": "Cart abandonat",
"AddGoal": "Adaugă o ţintă",
"AddNewGoal": "Agaugă o ţintă nouă",
- "AddNewGoalOrEditExistingGoal": "%sAdaugă o ţintă nouă sau%s sau %sModifică%s ţinte existente",
+ "AddNewGoalOrEditExistingGoal": "%1$sAdaugă o ţintă nouă sau%2$s sau %3$sModifică%4$s ţinte existente",
"AllowGoalConvertedMoreThanOncePerVisit": "Obiectivul permite să fie convertite mai mult de o dată la fiecare vizită",
"AllowMultipleConversionsPerVisit": "Permite conversii multiple pe vizita",
"BestCountries": "Topul tarilor care convertesc cel mai bine este:",
@@ -26,7 +26,7 @@
"ColumnVisits": "Numărul total de vizite, indiferent dacă a fost declanșată scop sau nu.",
"ColumnVisitsProductDocumentation": "Numărul de vizite pe pagina de Produs\/Categorie. Acest lucru este, de asemenea, utilizat pentru a procesa %s rata de conversie. Această valoare este în raport, dacă pe Ecommerce urmarire a fost configurat pe paginile de produs \/ categorie.",
"Contains": "conţine %s",
- "ConversionByTypeReportDocumentation": "Acest raport oferă informații detaliate despre performanța obiectivului (conversii, ratele de conversie și venituri pe vizita), pentru fiecare dintre categoriile disponibile în panoul din stânga. %s Vă rugăm să faceți clic pe una dintre categoriile pentru a vizualiza raportul. %s Pentru mai multe informații, citiți documentația %sUrmarire Goluri%s",
+ "ConversionByTypeReportDocumentation": "Acest raport oferă informații detaliate despre performanța obiectivului (conversii, ratele de conversie și venituri pe vizita), pentru fiecare dintre categoriile disponibile în panoul din stânga. %1$s Vă rugăm să faceți clic pe una dintre categoriile pentru a vizualiza raportul. %2$s Pentru mai multe informații, citiți documentația %3$sUrmarire Goluri%4$s",
"ConversionRate": "%s rata conversie",
"Conversions": "%s conversii",
"ConversionsOverview": "Privire Generala Conversii",
@@ -44,7 +44,7 @@
"EcommerceOrder": "Comanda Magazin Online",
"EcommerceOverview": "Privire Generala Magazin Online",
"EcommerceReports": "Rapoarte Ecomerţ",
- "ExceptionInvalidMatchingString": "Dacă alegeți \"potrivire exactă\", șirul de potrivire trebuie să fie un URL incepand cu %s. De exemplu, \"%s\".",
+ "ExceptionInvalidMatchingString": "Dacă alegeți \"potrivire exactă\", șirul de potrivire trebuie să fie un URL incepand cu %1$s. De exemplu, \"%2$s\".",
"ExternalWebsiteUrl": "URL Site web extern",
"Filename": "nume fiÅŸier",
"GoalConversion": "conversie obiectiv",
@@ -84,7 +84,7 @@
"VisitUrl": "Viziteaza un URL dat (o pagina sau un grup de pagini)",
"WhenVisitors": "când vizitatorii",
"WhereThe": "unde",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "acolo unde pagina vizitată conține un call către metoda JavaScript 'trackGoal' (%svezi mai multe%s)",
- "YouCanEnableEcommerceReports": "Poţi activa %s pentru acest site pe pagina %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "acolo unde pagina vizitată conține un call către metoda JavaScript 'trackGoal' (%1$svezi mai multe%2$s)",
+ "YouCanEnableEcommerceReports": "Poţi activa %1$s pentru acest site pe pagina %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/ru.json b/plugins/Goals/lang/ru.json
index 7869ed28fa93760d1b29627fb56caf3de6e56512..52b761496a5e158b4dc08854731e29dcfe9188c6 100644
--- a/plugins/Goals/lang/ru.json
+++ b/plugins/Goals/lang/ru.json
@@ -3,14 +3,17 @@
"AbandonedCart": "Брошенных корзин",
"AddGoal": "Добавить цель",
"AddNewGoal": "Добавить новую цель",
- "AddNewGoalOrEditExistingGoal": "%sДобавить новую цель%s или %sредактировать%s уже ÑущеÑтвующие",
+ "AddNewGoalOrEditExistingGoal": "%1$sДобавить новую цель%2$s или %3$sредактировать%4$s уже ÑущеÑтвующие",
"AllowGoalConvertedMoreThanOncePerVisit": "Разрешить заÑчитывание цели более одного раза за поÑещение",
"AllowMultipleConversionsPerVisit": "Разрешить множеÑтвенную конверÑию за поÑещение",
"BestCountries": "Ðаиболее популÑрные Ñтраны:",
"BestKeywords": "Ðаиболее популÑрные ключевые Ñлова:",
"BestReferrers": "Ðаиболее популÑрные иÑточники входа:",
"CaseSensitive": "Ð¡Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÑвлÑÑŽÑ‚ÑÑ Ñ‡ÑƒÐ²Ñтвительными к региÑтру",
- "CancelAndReturnToGoals": "Отмена и %sвозврат к ÑпиÑку целей%s",
+ "CancelAndReturnToGoals": "Отмена и %1$sвозврат к ÑпиÑку целей%2$s",
+ "CategoryTextGeneral_Visitors": "МеÑтоположение пользователÑ",
+ "CategoryTextReferrers_Referrers": "ИÑточники",
+ "CategoryTextGeneral_Visit": "ВовлеченноÑÑ‚ÑŒ",
"ChooseGoal": "Выберите цель",
"ClickOutlink": "ПереходÑÑ‚ по ÑÑылке на внешний Ñайт",
"SendEvent": "ОтправлÑÑŽÑ‚ Ñобытие",
@@ -29,7 +32,7 @@
"ColumnVisits": "Общее чиÑло поÑещений внезавиÑимоÑти от того, была выполнена Цель или нет.",
"ColumnVisitsProductDocumentation": "ЧиÑло поÑещений Ñтраницы товаров\/категории товаров. Ðто иÑпользуетÑÑ Ð´Ð»Ñ Ð¿Ð¾Ð´Ñчета процента конверÑии %s. Ðтот показатель попадает в отчет, еÑли вы уÑтановили отÑлеживание Ñлектронной коммерции на Ñтранце товаров\/категории товаров.",
"Contains": "Ñодержит %s",
- "ConversionByTypeReportDocumentation": "Ðтот отчет Ñожержит детальную информацию о целÑÑ… (конверÑиÑ, процент конверÑии и прибыль за поÑещение) по каждой доÑтупной в левой панели категории. %s ПожалуйÑта, кликните на одну из категорий, чтобы увидеть детальный отчет. %s Больше информации в %sОтÑлеживании целей на piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Ðтот отчет Ñожержит детальную информацию о целÑÑ… (конверÑиÑ, процент конверÑии и прибыль за поÑещение) по каждой доÑтупной в левой панели категории. %1$s ПожалуйÑта, кликните на одну из категорий, чтобы увидеть детальный отчет. %2$s Больше информации в %3$sОтÑлеживании целей на piwik.org%4$s",
"ConversionRate": "%s коÑффициент конверÑий",
"Conversions": "%s конверÑий",
"ConversionsOverview": "Обзор переходов",
@@ -48,7 +51,7 @@
"EcommerceOrder": "Ðлектронный заказ",
"EcommerceOverview": "Обзор Ñлектронный заказов",
"EcommerceReports": "Отчеты по Ñлектронным заказам",
- "ExceptionInvalidMatchingString": "ЕÑли вы выберите «Ñовпадает точно», Ñтрока Ð´Ð»Ñ ÑÑ€Ð°Ð²Ð½ÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° быть URL'ом, начинающегоÑÑ Ñ %s. Ðапример, \"%s\".",
+ "ExceptionInvalidMatchingString": "ЕÑли вы выберите «Ñовпадает точно», Ñтрока Ð´Ð»Ñ ÑÑ€Ð°Ð²Ð½ÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° быть URL'ом, начинающегоÑÑ Ñ %1$s. Ðапример, \"%2$s\".",
"ExternalWebsiteUrl": "внешнÑÑ ÑÑылка выглÑдит Ñледующим образом:",
"Filename": "Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° выглÑдит Ñледующим образом:",
"GoalConversion": "КонверÑÐ¸Ñ Ñ†ÐµÐ»ÐµÐ¹",
@@ -64,14 +67,15 @@
"GoalX": "Цель %s",
"HelpOneConversionPerVisit": "ЕÑли Ñтраница, ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑŽÑ‰Ð°Ñ Ñ Ñтой целью перезагружаетÑÑ Ð¸Ð»Ð¸ проÑматриваетÑÑ Ð±Ð¾Ð»ÐµÐµ одного раза за поÑещение, цель будет заÑчитана только единожды – при первом визите Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° Ñту Ñтраницу.",
"IsExactly": "точно %s",
- "LearnMoreAboutGoalTrackingDocumentation": "Узнать больше об %sотÑлеживании целей в Piwik%s в руководÑтве пользователÑ.",
+ "LearnMoreAboutGoalTrackingDocumentation": "Узнать больше об %1$sотÑлеживании целей в Piwik%2$s в руководÑтве пользователÑ.",
"LeftInCart": "%s брошено в корзине",
- "ManageGoalsOrCreateANewGoal": "%sУправлÑйте целÑми%s или Ñоздайте новую прÑмо ÑейчаÑ!",
+ "ManageGoalsOrCreateANewGoal": "%1$sУправлÑйте целÑми%2$s или Ñоздайте новую прÑмо ÑейчаÑ!",
"Manually": "Ñ€ÑƒÑ‡Ð½Ð°Ñ Ð½Ð°Ñтройка",
"ManuallyTriggeredUsingJavascriptFunction": "Цель вручную Ñтала уÑловной через Javascript API trackGoal()",
"MatchesExpression": "Ñовпадает Ñ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸ÐµÐ¼ %s",
"NewGoalIntro": "ОтÑлеживание доÑтигнутых переходов ÑвлÑетÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из наиболее Ñффективных ÑпоÑобов измерить и улучшить Ñвои бизнеÑ-задачи.",
"NewVisitorsConversionRateIs": "КоÑффициент новых поÑетителей %s",
+ "NoGoalsNeedAccess": "Только админиÑтратор или пользователь Ñ Ð¿Ñ€Ð°Ð²Ð°Ð¼Ð¸ ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¼Ð¾Ð¶ÐµÑ‚ добавлÑÑ‚ÑŒ цели Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñайта. ПожалуйÑта, обратитеÑÑŒ к админиÑтратору Piwik, чтобы Ñоздать цели Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ Ñайта.<br>ОтÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ñ†ÐµÐ»ÐµÐ¹ ÑвлÑетÑÑ Ð¾Ñ‚Ð»Ð¸Ñ‡Ð½Ñ‹Ð¼ ÑпоÑобом, чтобы помочь понÑÑ‚ÑŒ как увеличить и макÑимизировать ÑффективноÑÑ‚ÑŒ веб-Ñайта!",
"Optional": "(необÑзательно)",
"OverallConversionRate": "%s общий коÑффициент конверÑий (переходы Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½Ð¾Ð¹ целью)",
"OverallRevenue": "%s Ð¾Ð±Ñ‰Ð°Ñ Ð¿Ñ€Ð¸Ð±Ñ‹Ð»ÑŒ",
@@ -93,7 +97,7 @@
"VisitUrl": "ПоÑещают данный URL (Ñтраницу или группу Ñтраниц)",
"WhenVisitors": "поÑетители",
"WhereThe": "где",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "где цель заÑчитываетÑÑ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ уÑтановки вызова метода JavaScript 'trackGoal' (%sузнать больше%s)",
- "YouCanEnableEcommerceReports": "Ð’Ñ‹ можете активировать %s Ð´Ð»Ñ Ñтого Ñайта на Ñтранице %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "где цель заÑчитываетÑÑ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ уÑтановки вызова метода JavaScript 'trackGoal' (%1$sузнать больше%2$s)",
+ "YouCanEnableEcommerceReports": "Ð’Ñ‹ можете активировать %1$s Ð´Ð»Ñ Ñтого Ñайта на Ñтранице %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/sk.json b/plugins/Goals/lang/sk.json
index b7d7a3cace5c1d942e0bd9ebe297823d6622d4d4..1d811b8b812e45b5588805d59e8bde5b9777d4d0 100644
--- a/plugins/Goals/lang/sk.json
+++ b/plugins/Goals/lang/sk.json
@@ -3,7 +3,7 @@
"AbandonedCart": "Opustený koÅ¡Ãk",
"AddGoal": "Pridať ciele",
"AddNewGoal": "Pridať nový cieľ",
- "AddNewGoalOrEditExistingGoal": "%sPridať nový Cieľ%s alebo %sUpraviť%s existujúce Ciele",
+ "AddNewGoalOrEditExistingGoal": "%1$sPridať nový Cieľ%2$s alebo %3$sUpraviť%4$s existujúce Ciele",
"AllowGoalConvertedMoreThanOncePerVisit": "Povoliť aby bol Cieľ konvertovaný viac ako raz za návštevu",
"AllowMultipleConversionsPerVisit": "Povoliť viacero konverzià za návštevu",
"BestCountries": "VaÅ¡a najlepÅ¡ia konverzia s krajÃn:",
diff --git a/plugins/Goals/lang/sq.json b/plugins/Goals/lang/sq.json
index 559f7a122cfac57eed0d3546fd122dd27e05a493..b3c92ded4351a5c21e4b1ed178f271035e19170d 100644
--- a/plugins/Goals/lang/sq.json
+++ b/plugins/Goals/lang/sq.json
@@ -3,14 +3,14 @@
"AbandonedCart": "Shportë e Braktisur",
"AddGoal": "Shtoni Objektiv",
"AddNewGoal": "Shtoni Objektiv të ri",
- "AddNewGoalOrEditExistingGoal": "%sShtoni Objektiv të ri%s ose %sPërpunoni%s Objektiva ekzistuese",
+ "AddNewGoalOrEditExistingGoal": "%1$sShtoni Objektiv të ri%2$s ose %3$sPërpunoni%4$s Objektiva ekzistuese",
"AllowGoalConvertedMoreThanOncePerVisit": "Lejoje Objektivin të shndërrohet më shumë se një herë për vizitë",
"AllowMultipleConversionsPerVisit": "Lejo shndërrime shumëfishe për vizitë",
"BestCountries": "Vendet me shndërrime më të mira për ju janë:",
"BestKeywords": "Fjalëkyçet kryesues për shndërrimet tuaja janë:",
"BestReferrers": "Referuesit më të mirë të shndërrimeve nga sajte për ju janë:",
"CaseSensitive": "Përputhje për siç është shkruajtur",
- "CancelAndReturnToGoals": "Anulojeni dhe %skthehuni te lista e objektivave%s",
+ "CancelAndReturnToGoals": "Anulojeni dhe %1$skthehuni te lista e objektivave%2$s",
"CategoryTextGeneral_Visitors": "Vend përdoruesi",
"CategoryTextReferrers_Referrers": "Referues",
"CategoryTextVisitsSummary_VisitsSummary": "Atribut përdoruesi",
@@ -33,7 +33,7 @@
"ColumnVisits": "Numër vizitash gjithsej, pavarësisht nëse u shkaktua a jo veprimtari te një objektiv.",
"ColumnVisitsProductDocumentation": "Numri i vizitave te faqja Produkt\/Kategori. Kjo përdoret gjithashtu për të përpunuar koeficientin %s e shndërrimeve. Kjo llogaritje gjendet te raporti nëse ndjekja e parjeve E-tregti është rregulluar te faqet Produkt\/Kategori.",
"Contains": "përmban %s",
- "ConversionByTypeReportDocumentation": "Ky raport ofron të dhëna të hollësishme rreth funksionimit të objektivave (shndërrime, koeficient shndërrimesh dhe të ardhura për vizitë) për secilën prej kategorive të mundshme te paneli majtas. %s Ju lutemi, klikoni mbi një nga këto kategori që të shihni raportin. %s Për më tepër të dhëna, lexoni %sdokumentimin për Ndjekje Objektivash te piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Ky raport ofron të dhëna të hollësishme rreth funksionimit të objektivave (shndërrime, koeficient shndërrimesh dhe të ardhura për vizitë) për secilën prej kategorive të mundshme te paneli majtas. %1$s Ju lutemi, klikoni mbi një nga këto kategori që të shihni raportin. %2$s Për më tepër të dhëna, lexoni %3$sdokumentimin për Ndjekje Objektivash te piwik.org%4$s",
"ConversionRate": "Koeficient shndërrimi %s",
"Conversions": "Shndërrime %s",
"ConversionsOverview": "Përmbledhje Shndërrimesh",
@@ -52,7 +52,7 @@
"EcommerceOrder": "Porosi E-tregtie",
"EcommerceOverview": "Përmbledhje E-tregtie",
"EcommerceReports": "Raporte E-tregtie",
- "ExceptionInvalidMatchingString": "Nëse zgjidhni 'përputhje e përpiktë', vargu për përputhje duhet të jetë një URL që fillon me %s. Për shembull, '%s'.",
+ "ExceptionInvalidMatchingString": "Nëse zgjidhni 'përputhje e përpiktë', vargu për përputhje duhet të jetë një URL që fillon me %1$s. Për shembull, '%2$s'.",
"ExternalWebsiteUrl": "URL sajti të jashtëm",
"Filename": "emër kartele",
"GoalConversion": "Shndërrim objektivi",
@@ -68,9 +68,9 @@
"GoalX": "Objektiv %s",
"HelpOneConversionPerVisit": "Nëse një faqe që përputhet me këtë Objektiv rifreskohet ose shihet më shumë se një herë gjatë një Vizite, Objektivi do të ndiqet vetëm herën e parë që faqja u ngarkua gjatë kësaj vizite.",
"IsExactly": "është saktësisht %s",
- "LearnMoreAboutGoalTrackingDocumentation": "Mësoni më tepër mbi %s Gjurmimin e Objektivave në Piwik%s, te dokumentimi i përdoruesit.",
+ "LearnMoreAboutGoalTrackingDocumentation": "Mësoni më tepër mbi %1$s Gjurmimin e Objektivave në Piwik%2$s, te dokumentimi i përdoruesit.",
"LeftInCart": "%s ende në shportë",
- "ManageGoalsOrCreateANewGoal": "%sAdministroni Objektiva%s ose krijoni tani një Objektiv të ri!",
+ "ManageGoalsOrCreateANewGoal": "%1$sAdministroni Objektiva%2$s ose krijoni tani një Objektiv të ri!",
"Manually": "dorazi",
"ManuallyTriggeredUsingJavascriptFunction": "Objektivi vihet në punë dorazi duke përdorur JavaScript API trackGoal()",
"MatchesExpression": "përputhet me shprehjen %s",
@@ -101,7 +101,7 @@
"VisitUrl": "Vizitoni një URL të dhënë (faqe ose grup faqesh)",
"WhenVisitors": "kur vizitorët",
"WhereThe": "kur",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "kur faqja e vizituar përmban një thirrje të metodës JavaScript piwikTracker.trackGoal() (%smësoni më tepër%s)",
- "YouCanEnableEcommerceReports": "Për këtë sajt mund të aktivizoni %s te faqja %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "kur faqja e vizituar përmban një thirrje të metodës JavaScript piwikTracker.trackGoal() (%1$smësoni më tepër%2$s)",
+ "YouCanEnableEcommerceReports": "Për këtë sajt mund të aktivizoni %1$s te faqja %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/sr.json b/plugins/Goals/lang/sr.json
index 6d99bbad146d15ed053ab61121d50ec7e8332ad2..b65739d5963d1e0bc050b0933a69811ec206a33c 100644
--- a/plugins/Goals/lang/sr.json
+++ b/plugins/Goals/lang/sr.json
@@ -3,14 +3,14 @@
"AbandonedCart": "Napuštene korpe",
"AddGoal": "Dodaj cilj",
"AddNewGoal": "Dodavanje novog cilja",
- "AddNewGoalOrEditExistingGoal": "%sDodaj novi cilj%s ili %sizmeni%s postojeće",
+ "AddNewGoalOrEditExistingGoal": "%1$sDodaj novi cilj%2$s ili %3$sizmeni%4$s postojeće",
"AllowGoalConvertedMoreThanOncePerVisit": "Dozvoli da cilj bude ostvaren više od jednom tokom jedne posete",
"AllowMultipleConversionsPerVisit": "Dozvoli više ispunjenja po poseti",
"BestCountries": "Zemlje koje imaju najbolje ispunjenje ciljeva:",
"BestKeywords": "KljuÄne reÄi koje imaju najbolje ispunjenje:",
"BestReferrers": "Reference koje imaju najbolje ispunjenje:",
"CaseSensitive": "Obrati pažnju na velika i mala slova",
- "CancelAndReturnToGoals": "Odustani i %svrati se na listu ciljeva%s",
+ "CancelAndReturnToGoals": "Odustani i %1$svrati se na listu ciljeva%2$s",
"CategoryTextGeneral_Visitors": "Lokacije posetilaca",
"CategoryTextReferrers_Referrers": "Reference",
"CategoryTextVisitsSummary_VisitsSummary": "Atributi korisnika",
@@ -33,7 +33,7 @@
"ColumnVisits": "Ukupan broj poseta bez obzira da li je cilj ispunjen ili ne.",
"ColumnVisitsProductDocumentation": "Broj poseta Proizvod\/Kategorija stranice. Ovo se koristi i za obradu %s stepena ispunjenosti cilja. Ova metrika je u izveÅ¡taju ako je na stranici Proizvod\/Kategorija ukljuÄeno praćene elektronskih porudžbina.",
"Contains": "sadrži %s",
- "ConversionByTypeReportDocumentation": "Ovaj izveÅ¡taj prikazuje detaljne informacije o ciljevima (stepene ispunjenja i prihod po poseti) za svaku od kategorija koja je izabrana s leve strane. %s Kliknite na neku od kategorija kako biste videli izveÅ¡taj. %s Za viÅ¡e informacija proÄitajte %sTracking Goals na piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Ovaj izveÅ¡taj prikazuje detaljne informacije o ciljevima (stepene ispunjenja i prihod po poseti) za svaku od kategorija koja je izabrana s leve strane. %1$s Kliknite na neku od kategorija kako biste videli izveÅ¡taj. %2$s Za viÅ¡e informacija proÄitajte %3$sTracking Goals na piwik.org%4$s",
"ConversionRate": "%s stepen ispunjenja",
"Conversions": "%s ispunjenja",
"ConversionsOverview": "Prikaz ispunjenja ciljeva",
@@ -52,7 +52,7 @@
"EcommerceOrder": "Redosled elektronskih porudžbina",
"EcommerceOverview": "Pregled elektronskih porudžbina",
"EcommerceReports": "Izveštaji elektronskih porudžbina",
- "ExceptionInvalidMatchingString": "Ukoliko izaberete 'taÄno poklapanje', izraz mora biti adresa koja poÄinje sa %s. Na primer, '%s'.",
+ "ExceptionInvalidMatchingString": "Ukoliko izaberete 'taÄno poklapanje', izraz mora biti adresa koja poÄinje sa %1$s. Na primer, '%2$s'.",
"ExternalWebsiteUrl": "adresa eksternog sajta",
"Filename": "datoteka",
"GoalConversion": "Ispunjenje cilja",
@@ -68,9 +68,9 @@
"GoalX": "Cilj %s",
"HelpOneConversionPerVisit": "Ukoliko je stranica koja odgovara ovom cilju otvorena više od jednom tokom jedne posete, cilj će biti ispraćen samo prilikom prvog otvaranja stranice.",
"IsExactly": "je taÄno %s",
- "LearnMoreAboutGoalTrackingDocumentation": "NauÄite viÅ¡e o %s Praćenju ciljeva u Piwik-u%s u korisniÄkoj dokumentaciji.",
+ "LearnMoreAboutGoalTrackingDocumentation": "NauÄite viÅ¡e o %1$s Praćenju ciljeva u Piwik-u%2$s u korisniÄkoj dokumentaciji.",
"LeftInCart": "%s ostalo u korpi",
- "ManageGoalsOrCreateANewGoal": "%sUpravljajte ciljevima%s ili kreirajte novi cilj",
+ "ManageGoalsOrCreateANewGoal": "%1$sUpravljajte ciljevima%2$s ili kreirajte novi cilj",
"Manually": "ruÄno",
"ManuallyTriggeredUsingJavascriptFunction": "Cilj je ruÄno dostignut pomoću JavaScript API trackGoal()",
"MatchesExpression": "je u skladu sa izrazom %s",
@@ -101,7 +101,7 @@
"VisitUrl": "Poseti datu adresu (stranicu ili grupu stranica)",
"WhenVisitors": "kad posetioci",
"WhereThe": "gde",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "gde posećena stranica sadrži poziv Java Script piwikTracker.trackGoal() metod (%ssaznajte više%s)",
- "YouCanEnableEcommerceReports": "Za ovaj sajt možete omogućiti %s na stranici %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "gde posećena stranica sadrži poziv Java Script 'trackGoal' metod (%1$ssaznajte više%2$s)",
+ "YouCanEnableEcommerceReports": "Za ovaj sajt možete omogućiti %1$s na stranici %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/sv.json b/plugins/Goals/lang/sv.json
index 9a01c91212361ce308384e20dfb85349e1f6dcc0..63810c8f5a29a053f5fa0cb2790eadc41c648ae8 100644
--- a/plugins/Goals/lang/sv.json
+++ b/plugins/Goals/lang/sv.json
@@ -3,14 +3,14 @@
"AbandonedCart": "Övergivna varukorgar",
"AddGoal": "Lägg till Mål",
"AddNewGoal": "Lägg till ett nytt Mål",
- "AddNewGoalOrEditExistingGoal": "%sLägg till ett nytt Mål%s eller %sRedigera%s befintliga Mål",
+ "AddNewGoalOrEditExistingGoal": "%1$sLägg till ett nytt Mål%2$s eller %3$sRedigera%4$s befintliga Mål",
"AllowGoalConvertedMoreThanOncePerVisit": "Tillåt att mål omvandlas mer än en gång per besök",
"AllowMultipleConversionsPerVisit": "Tillåt flera omvandlingar per besök",
"BestCountries": "Dina bäst omvandlade länder är:",
"BestKeywords": "Dina bäst omvandlade nyckelord är:",
"BestReferrers": "Dina bäst omvandlade hänvisningsadresser är:",
"CaseSensitive": "Skiftlägeskänslig matchning",
- "CancelAndReturnToGoals": "Avbryt och %såtergå till listan av mål%s",
+ "CancelAndReturnToGoals": "Avbryt och %1$såtergå till listan av mål%2$s",
"CategoryTextGeneral_Visitors": "användarens plats",
"CategoryTextReferrers_Referrers": "hänvisningar",
"CategoryTextVisitsSummary_VisitsSummary": "användarinformation",
@@ -33,7 +33,7 @@
"ColumnVisits": "Det totala antalet besök, oavsett om ett mål utlöstes eller inte.",
"ColumnVisitsProductDocumentation": "Antalet besök på Produktens\/Kategorins sida. Detta är används också för att bearbeta %s omvandlingsgraden. Det här måttet finns i rapporten om E-handelsspårning lagts in på Produkt\/ Kategorisidor.",
"Contains": "innehåller %s",
- "ConversionByTypeReportDocumentation": "Denna rapport ger detaljerad information om målprestanda (omvandlingar, omvandlingsgrader och intäkter per besök) för varje kategori som finns i den vänstra panelen. %s Klicka på en av kategorierna för att visa rapporten. %s För mer information, läs %sdokumentationen om Spårningsmål på piwik.org%s",
+ "ConversionByTypeReportDocumentation": "Denna rapport ger detaljerad information om målprestanda (omvandlingar, omvandlingsgrader och intäkter per besök) för varje kategori som finns i den vänstra panelen. %1$s Klicka på en av kategorierna för att visa rapporten. %2$s För mer information, läs %3$sdokumentationen om Spårningsmål på piwik.org%4$s",
"ConversionRate": "%s omvandlingsgrad",
"Conversions": "%s omvandlingar",
"ConversionsOverview": "Omvandlingsöversikt",
@@ -52,7 +52,7 @@
"EcommerceOrder": "E-handelsorder",
"EcommerceOverview": "E-handelsöversikt",
"EcommerceReports": "E-handelsrapporter",
- "ExceptionInvalidMatchingString": "Om du väljer \"exakt matchning\", måste den matchande strängen vara en URL som börjar med %s. Till exempel, \"%s'.",
+ "ExceptionInvalidMatchingString": "Om du väljer \"exakt matchning\", måste den matchande strängen vara en URL som börjar med %1$s. Till exempel, \"%2$s'.",
"ExternalWebsiteUrl": "extern webbplats URL",
"Filename": "filnamn",
"GoalConversion": "MÃ¥lomvandling",
@@ -68,9 +68,9 @@
"GoalX": "MÃ¥l %s",
"HelpOneConversionPerVisit": "Om en sida som matchar det här målet uppdateras eller visas mer än en gång under ett besök, kommer detta mål endast spåras första gången sidan laddas under detta besök.",
"IsExactly": "är exakt %s",
- "LearnMoreAboutGoalTrackingDocumentation": "Lär dig mer om %s att mäta mål i Piwik%s i dokumentationen.",
+ "LearnMoreAboutGoalTrackingDocumentation": "Lär dig mer om %1$s att mäta mål i Piwik%2$s i dokumentationen.",
"LeftInCart": "%s kvar i varukorgen",
- "ManageGoalsOrCreateANewGoal": "%sHantera mål%s eller skapa ett nytt mål nu.",
+ "ManageGoalsOrCreateANewGoal": "%1$sHantera mål%2$s eller skapa ett nytt mål nu.",
"Manually": "manuellt",
"ManuallyTriggeredUsingJavascriptFunction": "Målet utlöses manuellt genom att använda JavaScript API trackGoal()",
"MatchesExpression": "matchar uttrycket %s",
@@ -99,7 +99,7 @@
"VisitUrl": "besöker en definerad URL (sida eller grupp av sidor)",
"WhenVisitors": "när besökarna",
"WhereThe": "där",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "där den besökta sidan innehåller ett anrop till JavaScript piwikTracker.trackGoal ()-metoden (%slär dig mer%s)",
- "YouCanEnableEcommerceReports": "Du kan aktivera %s för denna webbplats på sidan %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "där den besökta sidan innehåller ett anrop till JavaScript 'trackGoal'-metoden (%1$slär dig mer%2$s)",
+ "YouCanEnableEcommerceReports": "Du kan aktivera %1$s för denna webbplats på sidan %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/th.json b/plugins/Goals/lang/th.json
index b8fd9cc071a5a3b17006a472a41b2f9a7839cbf6..69a05b9aecb347762d54fcf614fba348b42e7c5d 100644
--- a/plugins/Goals/lang/th.json
+++ b/plugins/Goals/lang/th.json
@@ -2,7 +2,7 @@
"Goals": {
"AddGoal": "เพิ่มเป้าหมาย",
"AddNewGoal": "เพิ่มค่าเป้าหมายใหม่",
- "AddNewGoalOrEditExistingGoal": "%s เพิ่มเป้าหมายใหม่ %s หรืภ%s à¹à¸à¹‰à¹„ข %s เป้าหมายที่มีà¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§",
+ "AddNewGoalOrEditExistingGoal": "%1$s เพิ่มเป้าหมายใหม่ %2$s หรืภ%3$s à¹à¸à¹‰à¹„ข %4$s เป้าหมายที่มีà¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§",
"BestCountries": "à¸à¸²à¸£à¹à¸›à¸¥à¸‡à¸›à¸£à¸°à¹€à¸—ศที่ดีที่สุดขà¸à¸‡à¸„ุณคืà¸:",
"BestKeywords": "à¸à¸²à¸£à¹à¸›à¸¥à¸‡à¸„ีย์เวิร์ดยà¸à¸”นิยมขà¸à¸‡à¸„ุณคืà¸:",
"BestReferrers": "à¹à¸›à¸¥à¸‡à¹à¸«à¸¥à¹ˆà¸‡à¸—ี่มาเว็บไซต์ที่ดีที่สุดขà¸à¸‡à¸„ุณคืà¸:",
@@ -21,7 +21,7 @@
"Ecommerce": "à¸à¸µà¸„à¸à¸¡à¹€à¸¡à¸´à¸£à¹Œà¸‹",
"EcommerceAndGoalsMenu": "à¸à¸µà¸„à¸à¸¡à¹€à¸¡à¸´à¸£à¹Œà¸‹ & เป้าหมาย",
"EcommerceOverview": "ข้à¸à¸¡à¸¹à¸¥à¸à¸µà¸„à¸à¸¡à¹€à¸¡à¸´à¸£à¹Œà¸‹à¹€à¸šà¸·à¹‰à¸à¸‡à¸•à¹‰à¸™",
- "ExceptionInvalidMatchingString": "ถ้าคุณเลืà¸à¸ 'ตรงà¸à¸±à¸™à¸žà¸à¸”ี' สตริงที่ตรงà¸à¸±à¸™à¸•à¹‰à¸à¸‡à¹€à¸›à¹‡à¸™ URL เริ่มต้นด้วย %s ตัวà¸à¸¢à¹ˆà¸²à¸‡à¹€à¸Šà¹ˆà¸™ '%s'",
+ "ExceptionInvalidMatchingString": "ถ้าคุณเลืà¸à¸ 'ตรงà¸à¸±à¸™à¸žà¸à¸”ี' สตริงที่ตรงà¸à¸±à¸™à¸•à¹‰à¸à¸‡à¹€à¸›à¹‡à¸™ URL เริ่มต้นด้วย %1$s ตัวà¸à¸¢à¹ˆà¸²à¸‡à¹€à¸Šà¹ˆà¸™ '%2$s'",
"ExternalWebsiteUrl": "URL ขà¸à¸‡à¹€à¸§à¹‡à¸šà¹„ซต์ภายนà¸à¸",
"Filename": "ชื่à¸à¹„ฟล์",
"GoalConversion": "à¸à¸²à¸£à¹à¸›à¸¥à¸‡à¹€à¸›à¹‰à¸²à¸«à¸¡à¸²à¸¢",
@@ -53,6 +53,6 @@
"VisitUrl": "à¸à¸²à¸£à¹€à¸‚้าชมได้รับ URL (หน้าหรืà¸à¸à¸¥à¸¸à¹ˆà¸¡à¸‚à¸à¸‡à¸«à¸™à¹‰à¸²)",
"WhenVisitors": "เมื่à¸à¸œà¸¹à¹‰à¹€à¸‚้าชม",
"WhereThe": "ที่ซึ่ง",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "ในหน้าเว็บเพจเมื่à¸à¹€à¸‚้าชมà¹à¸¥à¹‰à¸§ จะประà¸à¸à¸šà¹„ปด้วยวิธีà¸à¸²à¸£à¹€à¸£à¸µà¸¢à¸ JavaScript piwikTracker.trackGoal() à¹à¸¥à¸°à¸§à¸´à¸˜à¸µ (%s เรียนรู้เพิ่มเติม %s)"
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "ในหน้าเว็บเพจเมื่à¸à¹€à¸‚้าชมà¹à¸¥à¹‰à¸§ จะประà¸à¸à¸šà¹„ปด้วยวิธีà¸à¸²à¸£à¹€à¸£à¸µà¸¢à¸ JavaScript 'trackGoal' à¹à¸¥à¸°à¸§à¸´à¸˜à¸µ (%1$s เรียนรู้เพิ่มเติม %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/tr.json b/plugins/Goals/lang/tr.json
index 49611c8538fcccada51fed2b2cd4ad91c3b5ced2..7be99ef69adbfa089d27a5b62b34df9fe0d6042d 100644
--- a/plugins/Goals/lang/tr.json
+++ b/plugins/Goals/lang/tr.json
@@ -3,14 +3,14 @@
"AbandonedCart": "Terkedilen Sepet",
"AddGoal": "Hedef Ekle",
"AddNewGoal": "Yeni Hedef Ekle",
- "AddNewGoalOrEditExistingGoal": "%sYeni Hedef ekle%s veya Mevcut Hedefleri %sDüzenle%s",
+ "AddNewGoalOrEditExistingGoal": "%1$sYeni Hedef ekle%2$s veya Mevcut Hedefleri %3$sDüzenle%4$s",
"AllowGoalConvertedMoreThanOncePerVisit": "Hedefin ziyaret başına bir kereden fazla dönüştürülmesine izin ver",
"AllowMultipleConversionsPerVisit": "Ziyaret başına çoklu dönüşümlere izin ver",
"BestCountries": "En iyi dönüşüm aldığınız ülkeler:",
"BestKeywords": "En yüksek dönüşüm yapan anahtar kelimeler:",
"BestReferrers": "En iyi dönüşüm yapan web sayfaları yönlendiricileri:",
"CaseSensitive": "Büyük-küçük harf duyarlı eşleşme",
- "CancelAndReturnToGoals": "Vazgeç ve %shedefler listesine geri dön%s",
+ "CancelAndReturnToGoals": "Vazgeç ve %1$shedefler listesine geri dön%2$s",
"ChooseGoal": "Hedef Seç",
"ClickOutlink": "Harici bir web sayfasına olan Bağlantıya tıklayın",
"SendEvent": "Etkinlik gönder",
diff --git a/plugins/Goals/lang/uk.json b/plugins/Goals/lang/uk.json
index 28d4b1b9f105c4b9517525b7d093e58ca753e204..fda6fe3d4121643113da50892276e90d25e6d4df 100644
--- a/plugins/Goals/lang/uk.json
+++ b/plugins/Goals/lang/uk.json
@@ -2,7 +2,7 @@
"Goals": {
"AddGoal": "Додати Ціль",
"AddNewGoal": "Додати нову Ціль",
- "AddNewGoalOrEditExistingGoal": "%sДодати нову Ціль%s або %sРедагувати%s Ñ–Ñнуючі Цілі",
+ "AddNewGoalOrEditExistingGoal": "%1$sДодати нову Ціль%2$s або %3$sРедагувати%4$s Ñ–Ñнуючі Цілі",
"BestCountries": "Країни з найкращою корверÑією:",
"BestKeywords": "Ключові Ñлова з найкращоб конверÑією:",
"BestReferrers": "Джерела трафіку з найкращою конверÑією:",
@@ -17,7 +17,7 @@
"DefaultRevenueHelp": "Ð”Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»Ð°Ð´Ñƒ, надіÑлана відвідувачем Форма Контактів може в Ñередньому вартувати $10. Piwik дозволить вам зрозуміти наÑкільки добре поводÑÑ‚ÑŒ Ñебе різні Ñегменти ваших кориÑтувачів.",
"DeleteGoalConfirm": "Впевнені що хочете видалити Ціль %s?",
"Download": "Завантажено файл",
- "ExceptionInvalidMatchingString": "Якщо вибрати \"точне ÑіпвпадіннÑ\" то Ñтрічка Ð´Ð»Ñ ÑпівÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð¼Ð°Ñ” бути коректним URL та починатиÑÑ Ð· %s. Ðаприклад '%s'.",
+ "ExceptionInvalidMatchingString": "Якщо вибрати \"точне ÑіпвпадіннÑ\" то Ñтрічка Ð´Ð»Ñ ÑпівÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð¼Ð°Ñ” бути коректним URL та починатиÑÑ Ð· %1$s. Ðаприклад '%2$s'.",
"ExternalWebsiteUrl": "URL на зовнішній веб-Ñайт",
"Filename": "Ñ–Ð¼â€™Ñ Ñ„Ð°Ð¹Ð»Ð°",
"GoalConversion": "КонверÑÑ–Ñ Ñ†Ñ–Ð»Ñ–",
@@ -43,6 +43,6 @@
"VisitUrl": "Відвідано заданий URL (Ñторінку або групу Ñторінок)",
"WhenVisitors": "коли відвідувачі",
"WhereThe": "де",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "де відвідана Ñторінка міÑтить запит методу JavaScript piwikTracker.trackGoal()(%sдізнатиÑÑŒ більше%s)"
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "де відвідана Ñторінка міÑтить запит методу JavaScript 'trackGoal' (%1$sдізнатиÑÑŒ більше%2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/vi.json b/plugins/Goals/lang/vi.json
index 873d33151c0b8915c9a6f6b46d3a34d65809c567..6643c1a22548fcfc9ad48eb7cccddbc52750ee4e 100644
--- a/plugins/Goals/lang/vi.json
+++ b/plugins/Goals/lang/vi.json
@@ -3,7 +3,7 @@
"AbandonedCart": "GiỠhà ng không được để ý đến",
"AddGoal": "Thêm chỉ tiêu (Goal)",
"AddNewGoal": "Thêm chỉ tiêu mới",
- "AddNewGoalOrEditExistingGoal": "%s Thêm má»™t chỉ tiêu má»›i %s hoặc %s sá»a chữa %s chỉ tiêu hiện tại",
+ "AddNewGoalOrEditExistingGoal": "%1$s Thêm má»™t chỉ tiêu má»›i %2$s hoặc %3$s sá»a chữa %4$s chỉ tiêu hiện tại",
"AllowGoalConvertedMoreThanOncePerVisit": "Chỉ tiêu được chuyển đổi nhiá»u hÆ¡n má»™t lần của má»—i lượt truy cáºp",
"AllowMultipleConversionsPerVisit": "Cho phép chuyển đổi nhiá»u phần má»—i lần truy cáºp",
"BestCountries": "Các nước chuyển đổi tốt nhất của bạn là :",
@@ -26,7 +26,7 @@
"ColumnVisits": "Tổng lượt truy cáºp, Bất kể má»™t mục tiêu có được kÃch hoạt hay không",
"ColumnVisitsProductDocumentation": "Số lần truy cáºp trang Product\/Category. Nó cÅ©ng được sá» dụng để xá» lý %s tốc Ä‘á»™ chuyển trang. Chỉ số nà y sẽ xuất hiện trong báo cáo nếu hệ thống theo dõi thÆ°Æ¡ng mại Ä‘iện tỠđược xây dá»±ng trong các trang Product\/Category.",
"Contains": "Chứa %s",
- "ConversionByTypeReportDocumentation": "Báo cáo nà y cung cấp thông tin chi tiết vá» hiệu suất mong muốn (số lượt chuyển đổi, tốc Ä‘á»™ chuyển đổi và lợi nhuáºn trên má»—i lượt thăm) đối vá»›i má»—i danh mục có trên panel bên trái. %s Vui lòng nhấn và o má»™t trong các danh mục trên để xem báo cáo. %s Äể có thêm thông tin, Ä‘á»c %sTà i liệu Tracking Goals%s",
+ "ConversionByTypeReportDocumentation": "Báo cáo nà y cung cấp thông tin chi tiết vá» hiệu suất mong muốn (số lượt chuyển đổi, tốc Ä‘á»™ chuyển đổi và lợi nhuáºn trên má»—i lượt thăm) đối vá»›i má»—i danh mục có trên panel bên trái. %1$s Vui lòng nhấn và o má»™t trong các danh mục trên để xem báo cáo. %2$s Äể có thêm thông tin, Ä‘á»c %3$sTà i liệu Tracking Goals%4$s",
"ConversionRate": "Tỷ lệ chuyển đổi %s",
"Conversions": "%s chuyển đổi",
"ConversionsOverview": "Chuyển đổi tổng quan (Overview)",
@@ -44,7 +44,7 @@
"EcommerceOrder": "Äặt hà ng ThÆ°Æ¡ng mại Ä‘iện tá»",
"EcommerceOverview": "Thương mại điện tỠtổng quan",
"EcommerceReports": "Các báo cáo thÆ°Æ¡ng mại Ä‘iện tá»",
- "ExceptionInvalidMatchingString": "Nếu bạn chá»n 'kết hợp chÃnh xác', các chuá»—i kết hợp phải là má»™t URL bắt đầu vá»›i %s. Và dụ, '%s'.",
+ "ExceptionInvalidMatchingString": "Nếu bạn chá»n 'kết hợp chÃnh xác', các chuá»—i kết hợp phải là má»™t URL bắt đầu vá»›i %1$s. Và dụ, '%2$s'.",
"ExternalWebsiteUrl": "ÄÆ°á»ng dẫn (URL) của website nÆ°á»›c ngoà i",
"Filename": "Tên tệp tin",
"GoalConversion": "Chỉ tiêu chuyển đổi",
@@ -84,7 +84,7 @@
"VisitUrl": "Truy cáºp và o má»™t URL đã cho (trang hoặc má»™t nhóm trang)",
"WhenVisitors": "Khi các khách truy cáºp",
"WhereThe": "Ở đâu",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "Khi má»™t trang đã truy cáºp gá»i đến phÆ°Æ¡ng pháp JavaScript 'trackGoal' (%s tìm hiểu thêm %s)",
- "YouCanEnableEcommerceReports": "Bạn có thể kÃch hoạt %s cho website nà y trong trang %s."
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "Khi má»™t trang đã truy cáºp gá»i đến phÆ°Æ¡ng pháp JavaScript 'trackGoal' (%1$s tìm hiểu thêm %2$s)",
+ "YouCanEnableEcommerceReports": "Bạn có thể kÃch hoạt %1$s cho website nà y trong trang %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/zh-cn.json b/plugins/Goals/lang/zh-cn.json
index d9d118ad09c59e6cda5b51ab811766f6c54f79a9..71b887124db50c383224b9e022fb2d1122276857 100644
--- a/plugins/Goals/lang/zh-cn.json
+++ b/plugins/Goals/lang/zh-cn.json
@@ -3,7 +3,7 @@
"AbandonedCart": "丢弃的è´ç‰©è½¦",
"AddGoal": "æ–°å¢žç›®æ ‡",
"AddNewGoal": "æ–°å¢žç›®æ ‡",
- "AddNewGoalOrEditExistingGoal": "%sæ–°å¢žç›®æ ‡%s 或 %s编辑%s å·²æœ‰ç›®æ ‡",
+ "AddNewGoalOrEditExistingGoal": "%1$sæ–°å¢žç›®æ ‡%2$s 或 %3$s编辑%4$s å·²æœ‰ç›®æ ‡",
"AllowGoalConvertedMoreThanOncePerVisit": "æ¯æ¬¡è®¿é—®çš„æ‰€æœ‰ç›®æ ‡ä¼šè¢«å¤šæ¬¡è½¬åŒ–",
"AllowMultipleConversionsPerVisit": "æ¯æ¬¡è®¿é—®å…许多次转化",
"BestCountries": "您的最佳转化国家为:",
@@ -26,7 +26,7 @@
"ColumnVisits": "æ€»çš„è®¿é—®æ¬¡æ•°ï¼Œæ— è®ºæ˜¯å¦è§¦å‘ç›®æ ‡ã€‚",
"ColumnVisitsProductDocumentation": "产å“\/分类页é¢çš„访问次数，åŒæ—¶ç”¨äºŽè®¡ç®— %s 转化率。如果在产å“\/分类页é¢è®¾ç½®äº†ç”µå商务跟踪，报表ä¸å°†æ˜¾ç¤ºè¿™ä¸ªæŒ‡æ ‡ã€‚",
"Contains": "åŒ…å« %s",
- "ConversionByTypeReportDocumentation": "本报表显示左边æ¯ä¸ªåˆ†ç±»çš„è¯¦ç»†çš„ç›®æ ‡æ€§èƒ½ã€‚(转化, 转化率和å•æ¬¡è®¿é—®æ”¶å…¥)。%s 请点击分类查看报表。 %s 详情查看 %sè·Ÿè¸ªç›®æ ‡æ–‡æ¡£%s",
+ "ConversionByTypeReportDocumentation": "本报表显示左边æ¯ä¸ªåˆ†ç±»çš„è¯¦ç»†çš„ç›®æ ‡æ€§èƒ½ã€‚(转化, 转化率和å•æ¬¡è®¿é—®æ”¶å…¥)。%1$s 请点击分类查看报表。 %2$s 详情查看 %3$sè·Ÿè¸ªç›®æ ‡æ–‡æ¡£%4$s",
"ConversionRate": "%s转化率",
"Conversions": "%s 转化数",
"ConversionsOverview": "转化总表",
@@ -44,7 +44,7 @@
"EcommerceOrder": "订å•",
"EcommerceOverview": "总表",
"EcommerceReports": "电å商务报表",
- "ExceptionInvalidMatchingString": "如果选择 'exact match'，匹é…çš„å—符串必须是以 %s 开头的网å€ï¼Œä¾‹å¦‚，'%s' 。",
+ "ExceptionInvalidMatchingString": "如果选择 'exact match'，匹é…çš„å—符串必须是以 %1$s 开头的网å€ï¼Œä¾‹å¦‚，'%2$s' 。",
"ExternalWebsiteUrl": "外部网站",
"Filename": "文件å称",
"GoalConversion": "ç›®æ ‡è½¬åŒ–",
@@ -61,7 +61,7 @@
"HelpOneConversionPerVisit": "如果一次访问ä¸ï¼ŒåŒ¹é…ç›®æ ‡çš„é¡µé¢è¢«åˆ·æ–°æˆ–多次查看，åªæœ‰ç¬¬ä¸€æ¬¡è®¿é—®é¡µé¢çš„ç›®æ ‡ä¼šè¢«ç»Ÿè®¡ã€‚",
"IsExactly": "æ£å¥½æ˜¯ %s",
"LeftInCart": "%s(è´ç‰©è½¦å†…产å“)",
- "ManageGoalsOrCreateANewGoal": "%s管ç†ç›®æ ‡%s æˆ–é©¬ä¸Šæ–°å»ºä¸€ä¸ªç›®æ ‡ï¼",
+ "ManageGoalsOrCreateANewGoal": "%1$s管ç†ç›®æ ‡%2$s æˆ–é©¬ä¸Šæ–°å»ºä¸€ä¸ªç›®æ ‡ï¼",
"Manually": "手动触å‘",
"ManuallyTriggeredUsingJavascriptFunction": "手动触å‘çš„ç›®æ ‡æ˜¯ä½¿ç”¨ JavaScript API trackGoal()",
"MatchesExpression": "匹é…è¡¨è¾¾å¼ %s",
@@ -87,7 +87,7 @@
"VisitUrl": "访问特定网å€(页é¢æˆ–页é¢ç»„)",
"WhenVisitors": "当访客",
"WhereThe": "设置",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "在被访问的页é¢åŒ…å«ä¸€ä¸ª JavaScript piwikTracker.trackGoal() 方法(%s了解更多%s)",
- "YouCanEnableEcommerceReports": "您å¯ä»¥ä¸ºç½‘站开å¯%s在%s页é¢ã€‚"
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "在被访问的页é¢åŒ…å«ä¸€ä¸ª JavaScript piwikTracker.trackGoal() 方法(%1$s了解更多%2$s)",
+ "YouCanEnableEcommerceReports": "您å¯ä»¥ä¸ºç½‘站开å¯%1$s在%2$s页é¢ã€‚"
}
}
\ No newline at end of file
diff --git a/plugins/Goals/lang/zh-tw.json b/plugins/Goals/lang/zh-tw.json
index 3bba1830e639e1ae48eb85452eedc868b5525be5..9c636893fc2516456a8b004403ff954c35bf869d 100644
--- a/plugins/Goals/lang/zh-tw.json
+++ b/plugins/Goals/lang/zh-tw.json
@@ -2,7 +2,7 @@
"Goals": {
"AddGoal": "新增目標",
"AddNewGoal": "新增一個新的目標",
- "AddNewGoalOrEditExistingGoal": "%s新增一個新的目標%s 或 %s編輯%s å·²å˜åœ¨çš„目標",
+ "AddNewGoalOrEditExistingGoal": "%1$s新增一個新的目標%2$s 或 %3$s編輯%4$s å·²å˜åœ¨çš„目標",
"BestCountries": "ä½ çš„æœ€ä½³è½‰æ›åœ‹å®¶ç‚ºï¼š",
"BestKeywords": "ä½ çš„æœ€ä½³è½‰æ›é—œéµå—為：",
"BestReferrers": "ä½ çš„æœ€ä½³è½‰æ›ç¶²ç«™æŽ¨è–¦é€£çµç‚ºï¼š",
@@ -17,7 +17,7 @@
"DefaultRevenueHelp": "舉例來說，訪客é€å‡ºä¸€å€‹è¯ç¹«è¡¨å–®å¯èƒ½å¹³å‡åƒ¹å€¼ç‚º $10。Piwik å°‡å¹«åŠ©ä½ çžè§£ä½ 的訪客。",
"DeleteGoalConfirm": "ä½ ç¢ºå®šè¦åˆªé™¤ç›®æ¨™ %s ？",
"Download": "下載一個檔案",
- "ExceptionInvalidMatchingString": "å¦‚æžœä½ é¸æ“‡ '精準符åˆ'，相符的å—ä¸²å¿…é ˆåŒ…å«ä¸€å€‹ç¶²å€é–‹é %s. 舉例來說，'%s' 。",
+ "ExceptionInvalidMatchingString": "å¦‚æžœä½ é¸æ“‡ '精準符åˆ'，相符的å—ä¸²å¿…é ˆåŒ…å«ä¸€å€‹ç¶²å€é–‹é %1$s. 舉例來說，'%2$s' 。",
"ExternalWebsiteUrl": "外部網站網å€",
"Filename": "檔案å稱",
"GoalIsTriggered": "目標觸發",
@@ -42,6 +42,6 @@
"VisitUrl": "訪å•ç‰¹å®šç¶²å€ï¼ˆé é¢æˆ–é é¢ç¾¤çµ„）",
"WhenVisitors": "當訪客",
"WhereThe": "ä½æ–¼",
- "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "在被訪å•çš„é é¢åŒ…å«ä¸€å€‹ JavaScript piwikTracker.trackGoal() 方法（%s知é“更多%s）"
+ "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "在被訪å•çš„é é¢åŒ…å«ä¸€å€‹ JavaScript piwikTracker.trackGoal() 方法（%1$s知é“更多%2$s）"
}
}
\ No newline at end of file
diff --git a/plugins/Goals/templates/conversionOverview.twig b/plugins/Goals/templates/conversionOverview.twig
index 2697527eb737c0f2dc05e6367bc72e629254b6e2..a810c464aa2fcc3989c7376ce11938ed95be6133 100644
--- a/plugins/Goals/templates/conversionOverview.twig
+++ b/plugins/Goals/templates/conversionOverview.twig
@@ -12,4 +12,8 @@
{{ 'Goals_ReturningVisitorsConversionRateIs'|translate("<strong>"~conversion_rate_returning~"</strong>")|raw }}
, {{ 'Goals_NewVisitorsConversionRateIs'|translate("<strong>"~conversion_rate_new~"</strong>")|raw }}
</li>
-</ul><br style="clear:left"/>
\ No newline at end of file
+</ul>
+<a href="javascript:;" class="segmentedlog" onclick="SegmentedVisitorLog.show('Goals.getMetrics', 'visitConvertedGoalId=={{ idGoal }}', {})">
+ {{ 'Live_RowActionTooltipWithDimension'|translate('General_Goal'|translate) }}
+</a>
+<br style="clear:left"/>
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/bg.json b/plugins/ImageGraph/lang/bg.json
index e7da535f7bf9e25a9f977cf45d00aef3d9cd2e39..aa6ffdae6523538897cdea9629893703c6b3320c 100644
--- a/plugins/ImageGraph/lang/bg.json
+++ b/plugins/ImageGraph/lang/bg.json
@@ -1,5 +1,5 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "Колоната '%s' не е намерена в този доклад. Опитайте Ñ %s"
+ "ColumnOrdinateMissing": "Колоната '%1$s' не е намерена в този доклад. Опитайте Ñ %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/ca.json b/plugins/ImageGraph/lang/ca.json
index aa81dbc2793ff60056f05943769ccedcca3928b4..a5de45825a18bdcd71f1bfee8e1ecef5c8f45fd4 100644
--- a/plugins/ImageGraph/lang/ca.json
+++ b/plugins/ImageGraph/lang/ca.json
@@ -1,5 +1,5 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "La columan '%s' no s'ha trobat en aquest informe. Proveu algun dels següents: %s"
+ "ColumnOrdinateMissing": "La columan '%1$s' no s'ha trobat en aquest informe. Proveu algun dels següents: %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/cs.json b/plugins/ImageGraph/lang/cs.json
index cbb430459bbb07dfda7b0f4a38784cf599e6d1e6..53ee4c8ac9bd778f2e94d669adefd5a7de51d014 100644
--- a/plugins/ImageGraph/lang/cs.json
+++ b/plugins/ImageGraph/lang/cs.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "Sloupec %s nebyl v tomto hlášenà nalezen. Zkuste některé z %s",
+ "ColumnOrdinateMissing": "Sloupec %1$s nebyl v tomto hlášenà nalezen. Zkuste některé z %2$s",
"PluginDescription": "Generujte pÄ›kné statické PNG grafy z jakéhokoliv hlášenÃ."
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/da.json b/plugins/ImageGraph/lang/da.json
index 72b5ba3c0bbea78b2ea3f582c2d1d520700caef7..927adde448dd46e91061936779f65d4efa94d873 100644
--- a/plugins/ImageGraph/lang/da.json
+++ b/plugins/ImageGraph/lang/da.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "Kolonnen '%s' blev ikke fundet i denne rapport. Prøv en af %s",
+ "ColumnOrdinateMissing": "Kolonnen '%1$s' blev ikke fundet i denne rapport. Prøv en af %2$s",
"PluginDescription": "Generer flotte statiske PNG Graph billeder til alle datarapporter."
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/de.json b/plugins/ImageGraph/lang/de.json
index 150b572b7d26b3c99655d69de75bca1dedda6a1b..5f14931a4d3ed79dc008d73fea8dfb0b63bbf415 100644
--- a/plugins/ImageGraph/lang/de.json
+++ b/plugins/ImageGraph/lang/de.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "Die Spalte '%s' wurde in diesem Bericht nicht gefunden. Probieren Sie es mit einer hiervon: %s",
+ "ColumnOrdinateMissing": "Die Spalte '%1$s' wurde in diesem Bericht nicht gefunden. Probieren Sie es mit einer hiervon: %2$s",
"PluginDescription": "Generieren Sie schöne statische PNG Graph Bilder für Ihre Datenberichte."
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/el.json b/plugins/ImageGraph/lang/el.json
index 6a954ebfd2ab694a77bcb1a0bd929cef56a17230..85a300b67a3f23a067a6b06a9933c8a227a6d858 100644
--- a/plugins/ImageGraph/lang/el.json
+++ b/plugins/ImageGraph/lang/el.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "Η στήλη '%s' δε βÏÎθηκε σε αυτή την αναφοÏά. Δοκιμάστε Îνα από τα %s",
+ "ColumnOrdinateMissing": "Η στήλη '%1$s' δεν βÏÎθηκε στην αναφοÏά. Δοκιμάστε οποιαδήποτε από τις %2$s",
"PluginDescription": "ΔημιουÏγήστε όμοÏφες στατικÎÏ‚ εικόνες γÏαφικών PNG για κάθε μία από τις αναφοÏÎÏ‚ σας."
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/en.json b/plugins/ImageGraph/lang/en.json
index f229e539dc2dd3221439b802eb2d07d40dded54e..b5cc868782994a9c5b08b1db7cf8a9e5d0871218 100644
--- a/plugins/ImageGraph/lang/en.json
+++ b/plugins/ImageGraph/lang/en.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "The column '%s' was not found in this report. Try any of %s",
+ "ColumnOrdinateMissing": "The column '%1$s' was not found in this report. Try any of %2$s",
"PluginDescription": "Generate beautiful static PNG Graph images for any of your data report."
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/es.json b/plugins/ImageGraph/lang/es.json
index bb288a550dc787fcd2acbf90bc937aa63d9d4900..e11a85da22e36e66bfe009d6895e80727cd299f1 100644
--- a/plugins/ImageGraph/lang/es.json
+++ b/plugins/ImageGraph/lang/es.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "La columna '%s' no se encontró en este informe. Intente con alguno de %s",
+ "ColumnOrdinateMissing": "La columna '%1$s' no se encontró en este informe. Intente con alguno de %2$s",
"PluginDescription": "Genera bellas imágenes estáticas de gráficos PNG para cualquiera de sus informes de datos."
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/fa.json b/plugins/ImageGraph/lang/fa.json
index f825ade6e4e9a9cdb71f1f3c7ee09622c95f158d..7f9ae95d535ad68f0469909362f6611e0cd1db1a 100644
--- a/plugins/ImageGraph/lang/fa.json
+++ b/plugins/ImageGraph/lang/fa.json
@@ -1,5 +1,5 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "ستون '%s' در این گزارش پیدا نشد. تلاش کنید برای %s"
+ "ColumnOrdinateMissing": "ستون '%1$s' در این گزارش پیدا نشد. تلاش کنید برای %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/fi.json b/plugins/ImageGraph/lang/fi.json
index a65b80f8bbe214434c8dfb0bf0898cc72f7df524..5dac1b5f2009b05765d6577437212c6987ba93d3 100644
--- a/plugins/ImageGraph/lang/fi.json
+++ b/plugins/ImageGraph/lang/fi.json
@@ -1,5 +1,5 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "Kolumnia '%s' ei löydetty tässä raportissa. Kokeile mitä tahansa %s"
+ "ColumnOrdinateMissing": "Kolumnia '%1$s' ei löydetty tässä raportissa. Kokeile mitä tahansa %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/fr.json b/plugins/ImageGraph/lang/fr.json
index b2e3e5abc88acc66f7e0f16b5d400322f0dc725e..c13c874c9f3cec32b4e8677f55bca5d1eb2c7750 100644
--- a/plugins/ImageGraph/lang/fr.json
+++ b/plugins/ImageGraph/lang/fr.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "La colonne '%s' n'a pas été trouvée dans ce rapport. Essayez parmi %s",
+ "ColumnOrdinateMissing": "La colonne '%1$s' n'a pas été trouvée dans ce rapport. Essayez parmi %2$s",
"PluginDescription": "Générez de magnifiques images statiques PNG de graphiques de vos données de n'importe quelle donnée de votre rapport."
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/hi.json b/plugins/ImageGraph/lang/hi.json
index 03b6e2f0b757eab1f275247e3493a8107d172c7b..e99e78a256915f47351017b2015a8f4d488985a9 100644
--- a/plugins/ImageGraph/lang/hi.json
+++ b/plugins/ImageGraph/lang/hi.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "सà¥à¤¤à¤‚ठ'%s' इस रिपोरà¥à¤Ÿ में नहीं मिला था. किसी %sका पà¥à¤°à¤¯à¤¾à¤¸ करें",
+ "ColumnOrdinateMissing": "सà¥à¤¤à¤‚ठ'%1$s' इस रिपोरà¥à¤Ÿ में नहीं मिला था. किसी %2$sका पà¥à¤°à¤¯à¤¾à¤¸ करें",
"PluginDescription": "अपने डेटा रिपोरà¥à¤Ÿ से किसी के लिठसà¥à¤‚दर सà¥à¤¥à¤¿à¤° PNG गà¥à¤°à¤¾à¤« छवियों को उतà¥à¤ªà¤¨à¥à¤¨à¥¤"
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/id.json b/plugins/ImageGraph/lang/id.json
index b44d08b89cdf43509e91a5714cf04bcb98f01963..154544ffbc968ce196ffde0200c154e54e887c7c 100644
--- a/plugins/ImageGraph/lang/id.json
+++ b/plugins/ImageGraph/lang/id.json
@@ -1,5 +1,5 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "Kolom '%s' tidak ditemukan dalam laporan ini. Coba salah satu dari %s"
+ "ColumnOrdinateMissing": "Kolom '%1$s' tidak ditemukan dalam laporan ini. Coba salah satu dari %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/it.json b/plugins/ImageGraph/lang/it.json
index b86e0b0dd0145e8301afbe822eb86e971aeebaff..aa7405909969bfc3ef4dafc5ee4ffbd5254e51f6 100644
--- a/plugins/ImageGraph/lang/it.json
+++ b/plugins/ImageGraph/lang/it.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "La colonna '%s' non è stato trovata in questo report. Prova una di queste %s",
+ "ColumnOrdinateMissing": "La colonna '%1$s' non è stato trovata in questo report. Prova una di queste %2$s",
"PluginDescription": "Genera delle belle immagini statiche PNG di grafici per ognuno dei tuoi report dati."
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/ja.json b/plugins/ImageGraph/lang/ja.json
index bac9f01594b48c2e030a6d5eefeeb4cbacd1fd34..d60ea45b76852e25446658b055a3ca5d899114fa 100644
--- a/plugins/ImageGraph/lang/ja.json
+++ b/plugins/ImageGraph/lang/ja.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "列 '%s' ã¯ã€ã“ã®ãƒ¬ãƒãƒ¼ãƒˆã§è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚%s ã®ã„ãšã‚Œã‹ã‚’ãŠè©¦ã—ãã ã•ã„。",
+ "ColumnOrdinateMissing": "列 '%1$s' ã¯ã€ã“ã®ãƒ¬ãƒãƒ¼ãƒˆã§è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚%2$s ã®ã„ãšã‚Œã‹ã‚’ãŠè©¦ã—ãã ã•ã„。",
"PluginDescription": "ãƒ‡ãƒ¼ã‚¿å ±å‘Šã®ã„ãšã‚Œã‹ã®ãŸã‚ã®ç¾Žã—ã„é™çš„ãªPNGグラフã®ç”»åƒã‚’生æˆã—ã¾ã™ã€‚"
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/nb.json b/plugins/ImageGraph/lang/nb.json
index eb83d1fc9ea396ca8089d2091ef4fea235dd3e40..6d7378f3ee68db5995aecdd117ca9b784630a6e1 100644
--- a/plugins/ImageGraph/lang/nb.json
+++ b/plugins/ImageGraph/lang/nb.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "Kolonnen «%s» ble ikke funnet i denne rapporten. Prøv %s",
+ "ColumnOrdinateMissing": "Kolonnen «%1$s» ble ikke funnet i denne rapporten. Prøv %2$s",
"PluginDescription": "Generer statiske PNG-grafebilder for alle dine datarapporter."
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/nl.json b/plugins/ImageGraph/lang/nl.json
index 81a0c53eeb641737530d563c9a8bd72660a23bbb..cc43b5e2f5aaf91eb8a1550dc26f2a58b64a4c78 100644
--- a/plugins/ImageGraph/lang/nl.json
+++ b/plugins/ImageGraph/lang/nl.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "De kolom '%s' is niet gevonden in dit rapport. Probeer één van %s",
+ "ColumnOrdinateMissing": "De kolom '%1$s' is niet gevonden in dit rapport. Probeer één van %2$s",
"PluginDescription": "Genereer mooie statische PNG Grafiek afbeeldingen voor elk van uw data rapporten."
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/pt-br.json b/plugins/ImageGraph/lang/pt-br.json
index 1fba54512876db2ab21895c1d4f24546b198a3fc..58bb5d4062ddc7ff236e0308114b0086f12c08b5 100644
--- a/plugins/ImageGraph/lang/pt-br.json
+++ b/plugins/ImageGraph/lang/pt-br.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "A coluna '%s' não foi encontrada neste relatório. Tente qualquer %s",
+ "ColumnOrdinateMissing": "A coluna '%1$s' não foi encontrada neste relatório. Tente qualquer %2$s",
"PluginDescription": "Gera belas imagens estáticas PNG Grapf para os seus relatórios de dados."
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/ro.json b/plugins/ImageGraph/lang/ro.json
index cc07edab2fa801fa52b0482da7e5ce7dce195a2d..4824b8e948a5c2912f908eb48a1e9d7af1ae38b2 100644
--- a/plugins/ImageGraph/lang/ro.json
+++ b/plugins/ImageGraph/lang/ro.json
@@ -1,5 +1,5 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "Coloana '%s' nu a fost gasita in acest raport. Incearca oricare dintre %s"
+ "ColumnOrdinateMissing": "Coloana '%1$s' nu a fost gasita in acest raport. Incearca oricare dintre %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/ru.json b/plugins/ImageGraph/lang/ru.json
index c82145f94b116fc9c85b71f1cfba87cd56e596fc..6e8e646994f6e263ba49944456458f75ccdc97d9 100644
--- a/plugins/ImageGraph/lang/ru.json
+++ b/plugins/ImageGraph/lang/ru.json
@@ -1,5 +1,5 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "Колонка ’%s’ не была найдена в Ñтом отчете. Попробуйте что-нибудь из %s"
+ "ColumnOrdinateMissing": "Колонка ’%1$s’ не была найдена в Ñтом отчете. Попробуйте что-нибудь из %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/sr.json b/plugins/ImageGraph/lang/sr.json
index 6a2782bc3f458203486df4a8ea6f651ed226f5a5..3a25b0df4bd2e0964cd5dae0a9c9360156d460a4 100644
--- a/plugins/ImageGraph/lang/sr.json
+++ b/plugins/ImageGraph/lang/sr.json
@@ -1,6 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "Kolona '%s' nije nađena u ovom izveštaju. Pokušajte bilo koju od %s",
+ "ColumnOrdinateMissing": "Kolona '%1$s' nije nađena u ovom izveštaju. Pokušajte bilo koju od %2$s",
"PluginDescription": "Kreirajte predivne statiÄne PNG grafikone za bilo koji od vaÅ¡ih izveÅ¡taja."
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/sv.json b/plugins/ImageGraph/lang/sv.json
index 40983a891d457b67c8b891a87979fbc32125ec3a..2ee4983a51b5e22fb9e423fe805d4ff4828f685a 100644
--- a/plugins/ImageGraph/lang/sv.json
+++ b/plugins/ImageGraph/lang/sv.json
@@ -1,5 +1,6 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "Kolumn '%s' var inte hittad i den här rapporten. Pröva någon av %s"
+ "ColumnOrdinateMissing": "Kolumn '%1$s' var inte hittad i den här rapporten. Pröva någon av %2$s",
+ "PluginDescription": "Generera fina statiska PNG-grafer för dina data rapporter."
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/vi.json b/plugins/ImageGraph/lang/vi.json
index 540c0a2093c24f87753528e3239800b058d63421..ae48c4c742b37b79324049df3c3c367a44f32b83 100644
--- a/plugins/ImageGraph/lang/vi.json
+++ b/plugins/ImageGraph/lang/vi.json
@@ -1,5 +1,5 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "Cột nà y '%s' không thấy trong báo cáo nà y. ThỠbất kỳ của %s"
+ "ColumnOrdinateMissing": "Cột nà y '%1$s' không thấy trong báo cáo nà y. ThỠbất kỳ của %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/ImageGraph/lang/zh-cn.json b/plugins/ImageGraph/lang/zh-cn.json
index ea37a3b85c760b1864e99727f0407d03edfe7b53..c339cfb3a96374ed9634e9f200e42f616dbf1115 100644
--- a/plugins/ImageGraph/lang/zh-cn.json
+++ b/plugins/ImageGraph/lang/zh-cn.json
@@ -1,5 +1,5 @@
{
"ImageGraph": {
- "ColumnOrdinateMissing": "报表ä¸æ²¡æœ‰ '%s' æ ，请试试 %s"
+ "ColumnOrdinateMissing": "报表ä¸æ²¡æœ‰ '%1$s' æ ，请试试 %2$s"
}
}
\ No newline at end of file
diff --git a/plugins/Installation/FormSuperUser.php b/plugins/Installation/FormSuperUser.php
index b8c0565299122ec5c313a99d2e383825fb0f0a20..c4b1d0944dfaaf348c68288dd968b1922da9d200 100644
--- a/plugins/Installation/FormSuperUser.php
+++ b/plugins/Installation/FormSuperUser.php
@@ -11,6 +11,7 @@ namespace Piwik\Plugins\Installation;
use HTML_QuickForm2_DataSource_Array;
use HTML_QuickForm2_Factory;
use HTML_QuickForm2_Rule;
+use Piwik\Container\StaticContainer;
use Piwik\Piwik;
use Piwik\Plugins\UsersManager\UsersManager;
use Piwik\QuickForm2;
@@ -58,11 +59,22 @@ class FormSuperUser extends QuickForm2
'content' => ' ' . Piwik::translate('Installation_PiwikOrgNewsletter'),
));
+ $piwikProNewsletter = Piwik::translate('Installation_PiwikProNewsletter',
+ array("<a href='http://piwik.pro?pk_medium=App_Newsletter_link&pk_source=Piwik_App&pk_campaign=App_Installation' style='color:#444;' rel='noreferrer' target='_blank'>", "</a>")
+ );
+
+ $currentLanguage = StaticContainer::get('Piwik\Translation\Translator')->getCurrentLanguage();
+
+ if ($currentLanguage == 'de') {
+ $piwikProNewsletter = Piwik::translate('Installation_PiwikProNewsletter',
+ array("<a href='http://piwikpro.de?pk_medium=App_Newsletter_link&pk_source=Piwik_App&pk_campaign=App_Installation' style='color:#444;' rel='noreferrer' target='_blank'>", "</a>")
+ );
+ $piwikProNewsletter = preg_replace('(Piwik PRO(?! GmbH))', 'Piwik PRO GmbH', $piwikProNewsletter);
+ }
+
$this->addElement('checkbox', 'subscribe_newsletter_piwikpro', null,
array(
- 'content' => ' ' . Piwik::translate('Installation_PiwikProNewsletter',
- array("<a href='http://piwik.pro?pk_medium=App_Newsletter_link&pk_source=Piwik_App&pk_campaign=App_Installation' style='color:#444;' rel='noreferrer' target='_blank'>", "</a>")
- ),
+ 'content' => ' ' . $piwikProNewsletter,
));
$this->addElement('submit', 'submit', array('value' => Piwik::translate('General_Next') . ' »', 'class' => 'btn btn-lg'));
@@ -70,7 +82,7 @@ class FormSuperUser extends QuickForm2
// default values
$this->addDataSource(new HTML_QuickForm2_DataSource_Array(array(
'subscribe_newsletter_piwikorg' => 1,
- 'subscribe_newsletter_piwikpro' => 1,
+ 'subscribe_newsletter_piwikpro' => $currentLanguage == 'de' ? 0 : 1,
)));
}
}
diff --git a/plugins/Installation/lang/ar.json b/plugins/Installation/lang/ar.json
index 9e8226ad1eecb86211800df7391a2f0743dccbaa..301db9879af36023a2c5ddebd827a2b183bc1ccc 100644
--- a/plugins/Installation/lang/ar.json
+++ b/plugins/Installation/lang/ar.json
@@ -5,7 +5,7 @@
"ConfirmDeleteExistingTables": "هل ترغب Øقاً ÙÙŠ Øذ٠الجداول: %s من قاعدة بياناتك؟ تنبيه: لن يمكن إستعادة البيانات من هذه الجداول!",
"Congratulations": "مبروك",
"CongratulationsHelp": "<p>مبروك! تم تثبيت Piwik بنجاØ.<\/p><p>تأكد من إضاÙØ© كود JavaScript لكاÙØ© الصÙØات التي تود تتبعها، ثم انتظر أول زوارك!<\/p>",
- "DatabaseAbilities": "إمكانيات قاعدة البيانات",
+ "DatabaseAbilities": "إمكانات قاعدة البيانات",
"DatabaseCreation": "إنشاء قاعدة البيانات",
"DatabaseErrorConnect": "خطأ أثناء الاتصال بملقم قاعدة البيانات",
"DatabaseServerVersion": "إصدار ملقم قاعدة البيانات",
@@ -32,6 +32,7 @@
"LargePiwikInstances": "المساعدة ÙÙŠ مواقع Piwik العملاقة",
"Legend": "دليل",
"LoadDataInfileRecommended": "إذا كان خادم Piwik الخاص بك يتتبع مواقع وب كثيÙØ© الØركة ( > 100,000 صÙØØ© ÙÙŠ الشهر مثلاً ) Ù†Ù‚ØªØ±Ø Ø£Ù† تØاول ØÙ„ هذه المشكلة.",
+ "LoadDataInfileUnavailableHelp": "استخدام %1$s سيسرّع كثيراً عملية أرشÙØ© بيويك. لهذا الغرض ØŒ Øاول تØديث Øزم PHP Ùˆ MySQL لديك وتأكد من أن مستخدم قاعدة البيانات لديه صلاØية %2$s .",
"NfsFilesystemWarning": "الخادم لديك يستخدم نظام ملÙات NFS .",
"NfsFilesystemWarningSuffixAdmin": "هذا يعني أن Piwik سيكون بطيئاً جداً عند استخدام جلسات قائمة على الملÙات.",
"NfsFilesystemWarningSuffixInstall": "استخدام الجلسات القائمة على الملÙات ÙÙŠ بيئة NFS شيئ بطيئ جداً ØŒ ولهذا سيستخدم Piwik جلسات قواعد البيانات. قد تØتاج زيادة العدد الأقصى لاتصالات المستÙيدين بخادم قاعدة البيانات إذا كان لديك العديد من مستخدمي لوØات المعلومات المتزامنين.",
@@ -41,6 +42,8 @@
"PasswordDoNotMatch": "كلمة المرور غير متطابقة",
"PasswordRepeat": "كلمة المرور(كرّرها)",
"PercentDone": "تم تنÙيذ %s %%",
+ "PiwikProAdTitle": "تØليلات وخدمات متقدمة",
+ "PiwikProAdText": "أض٠أعلى الإمكانات وأطلق عنان %1$sPiwik PRO On-Premises%2$s أو اØصل على بيويك خاص بك دون عناء باستضاÙØ© سØابية على %3$sPiwik PRO Cloud%4$s .",
"PleaseFixTheFollowingErrors": "الرجاء Ø¥ØµÙ„Ø§Ø Ø§Ù„Ø£Ø®Ø·Ø§Ø¡ التالية",
"DefaultSettings": "إعدادات Piwik الاÙتراضية",
"DefaultSettingsHelp": "يأتي Piwik بإعدادات اÙتراضية. يمكنك تخصيصها الآن أو Ùعل ذلك لاØقاً ÙÙŠ شاشة الإدارة.",
@@ -48,7 +51,7 @@
"RestartWebServer": "أعد تشغيل خادم الويب لديك بعد القيام بهذا التغيير.",
"ReusingTables": "إعادة استخدام الجداول",
"PiwikOrgNewsletter": "أرسل لي بريداً بآخر تØديثات مجتمع Piwik",
- "PiwikProNewsletter": "أرسل لي معلومات عن خدمات وعروض %sPiwik PRO%s",
+ "PiwikProNewsletter": "أرسل لي معلومات عن خدمات وعروض %1$sPiwik PRO%2$s",
"SeeBelowForMoreInfo": "أنظر أدناه لمزيد من المعلومات.",
"SetupWebsite": "إعداد موقع ويب",
"SetupWebsiteError": "Øدث خطأ ما أثناء إضاÙØ© الموقع",
@@ -72,6 +75,7 @@
"SystemCheckExtensions": "الإضاÙات الأخرى المطلوبة",
"SystemCheckFileIntegrity": "سلامة الملÙات",
"SystemCheckFunctions": "الدوال المطلوبة",
+ "SystemCheckFunctionHelp": "تØتاج لتÙعيل هذه الوظيÙØ© المضمّنة.",
"SystemCheckGDFreeType": "GD > 2.x + Freetype (رسوم)",
"SystemCheckGDHelp": "لن تعمل خاصية sparklines (الرسومات المصغرة).",
"SystemCheckGlobHelp": "تم تعطيل هذه الدالة المبنية ضمنياً، وسيØاول Piwik تقليدها ولكنه قد يواجه اعتبارات أمنية أخرى. قد يتأثر عدد من الوظائ٠أيضاً.",
diff --git a/plugins/Installation/lang/cs.json b/plugins/Installation/lang/cs.json
index 8e32ed6f4a2ecaf70642a5dfe7cc5b42bcc21c6f..cdb5822ef51cacc9eb3e11f2f167ec68298e388f 100644
--- a/plugins/Installation/lang/cs.json
+++ b/plugins/Installation/lang/cs.json
@@ -15,7 +15,7 @@
"DatabaseSetupLogin": "uživatelské jméno",
"DatabaseSetupServer": "server s databázÃ",
"DatabaseSetupTablePrefix": "prefix tabulek",
- "Email": "Email",
+ "Email": "E-mail",
"Extension": "pÅ™Ãpona",
"Filesystem": "Souborový systém",
"GetInvolved": "Pokud se vám lÃbÃ, co vidÃte, %1$szapojte se%2$s.",
@@ -42,14 +42,15 @@
"PasswordDoNotMatch": "hesla si neodpovÃdajÃ",
"PasswordRepeat": "Heslo (zopakujte)",
"PercentDone": "%s %% hotovo",
+ "PiwikProAdTitle": "PokroÄilé analýzy a služby",
"PleaseFixTheFollowingErrors": "ProsÃm opravte následujÃcà chyby",
"DefaultSettings": "Výchozà nastavenà Piwiku",
"DefaultSettingsHelp": "Piwik má výchozà nastavenÃ. Můžete je zmÄ›nit teÄ, nebo pozdÄ›ji z administraÄnÃho rozhranÃ.",
"Requirements": "Požadavky Piwiku",
"RestartWebServer": "Po uloženà změn restartujte Vás web server.",
"ReusingTables": "Použità existujÃcÃch tabulek",
- "PiwikOrgNewsletter": "odesÃlat emaily s důležitými událostmi v komunitÄ› Piwiku",
- "PiwikProNewsletter": "ZasÃlejte mi informace o službách a nabÃdkách %sPiwik pro%s",
+ "PiwikOrgNewsletter": "odesÃlat e-maily s důležitými událostmi v komunitÄ› Piwiku",
+ "PiwikProNewsletter": "ZasÃlejte mi informace o službách a nabÃdkách %1$sPiwik pro%2$s",
"SeeBelowForMoreInfo": "Pro vÃce informacà se podÃvejte nÞe.",
"SetupWebsite": "Nastavit Web",
"SetupWebsiteError": "Při přidávánà Webu se vyskytla chyba",
@@ -58,10 +59,10 @@
"SetupWebSiteURL": "URL webových stránek",
"SiteSetup": "ProsÃm vytvoÅ™te prvnà stránky, které budou sledovány a analyzovány Piwikem:",
"SiteSetupFootnote": "Poznámka: Jakmile bude instalace Piwiku dokonÄena, budete moci pÅ™idat dalÅ¡Ã stránky ke sledovánÃ.",
- "SuperUser": "Super uživatel",
- "SuperUserLogin": "Přihlašovacà jméno super uživatele",
- "SuperUserSetupError": "Při přidávánà super uživatele došlo k chybě",
- "SuperUserSetupSuccess": "Super uživatel úspěšně vytvořen",
+ "SuperUser": "Super-uživatel",
+ "SuperUserLogin": "Přihlašovacà jméno super-uživatele",
+ "SuperUserSetupError": "Při přidávánà super-uživatele došlo k chybě",
+ "SuperUserSetupSuccess": "Super-uživatel úspěšně vytvořen",
"SystemCheck": "Kontrola systému",
"SystemCheckAutoUpdateHelp": "Poznámla: Aktualizace pomocà jednoho kliknutà vyžaduje práva pro zápis do adresářů Piwiku a jejich obsahu",
"SystemCheckCreateFunctionHelp": "Piwik pro zpÄ›tná volánà využÃvá anonymnà funkce",
diff --git a/plugins/Installation/lang/da.json b/plugins/Installation/lang/da.json
index 57d8f0e2201aa1b185e3ca75cb6b50c699d76a2a..a06a4585c87bad54cc3029fcd6951f8c4f1d605f 100644
--- a/plugins/Installation/lang/da.json
+++ b/plugins/Installation/lang/da.json
@@ -45,7 +45,7 @@
"RestartWebServer": "Efter ændringen er have foretaget - genstart webserveren.",
"ReusingTables": "Genbrug tabellerne",
"PiwikOrgNewsletter": "e-mail mig de vigtigste Piwik community opdateringer",
- "PiwikProNewsletter": "send mig information om %sPiwik PRO%s tjenester og tilbud",
+ "PiwikProNewsletter": "send mig information om %1$sPiwik PRO%2$s tjenester og tilbud",
"SeeBelowForMoreInfo": "Se nedenfor for mere information.",
"SetupWebsite": "Tilføj en hjemmeside",
"SetupWebsiteError": "Fejl ved tilføjelse af hjemmeside",
diff --git a/plugins/Installation/lang/de.json b/plugins/Installation/lang/de.json
index 22aef987ebe8488611e6ee0a41d1ff4a8b5405d9..d46012b93e4436d95671a0a468462d368ef29ddf 100644
--- a/plugins/Installation/lang/de.json
+++ b/plugins/Installation/lang/de.json
@@ -49,7 +49,7 @@
"RestartWebServer": "Nach dieser Änderung müssen Sie den Webserver neu starten.",
"ReusingTables": "Tabellen werden wiederverwendet",
"PiwikOrgNewsletter": "Wichtige Piwik Community Updates per Mail zukommen lassen",
- "PiwikProNewsletter": "Lassen Sie mir Informationen über Dienstleistungen und Angebote von %sPiwik PRO GmbH%s zukommen.",
+ "PiwikProNewsletter": "Lassen Sie mir Informationen über %1$sPiwik PRO%2$s Dienstleistungen und Angebote zukommen.",
"SeeBelowForMoreInfo": "Unterhalb können Sie weitere Informationen finden.",
"SetupWebsite": "Website hinzufügen",
"SetupWebsiteError": "Beim Hinzufügen der Website ist ein Fehler aufgetreten",
diff --git a/plugins/Installation/lang/el.json b/plugins/Installation/lang/el.json
index ed9584ded6c527564f7676114e0539b63b9cc1eb..a2c6a6e5c576c3f6e5de7fd4298f763dcdbd534a 100644
--- a/plugins/Installation/lang/el.json
+++ b/plugins/Installation/lang/el.json
@@ -42,6 +42,8 @@
"PasswordDoNotMatch": "ο κωδικός δεν ταιÏιάζει",
"PasswordRepeat": "Συνθηματικό (επιβεβαίωση)",
"PercentDone": "%s %% ΟλοκληÏώθηκε",
+ "PiwikProAdTitle": "Αναλυτικά & ΥπηÏεσίες για Î ÏοχωÏημÎνους",
+ "PiwikProAdText": "Î ÏοσθÎστε επιπλÎον λειτουÏγικότητα και ξεκλειδώστε την πλήÏη δÏναμη με το %1$sPiwik PRO On-Premises%2$s, ή αποκτήστε το δικό σας Piwik φιλοξενοÏμενο σε εξωτεÏική υποδομή με το %3$sPiwik PRO Cloud%4$s.",
"PleaseFixTheFollowingErrors": "ΔιοÏθώστε τα ακόλουθα σφάλματα",
"DefaultSettings": "Î ÏοκαθοÏισμÎνες Ïυθμίσεις του Piwik",
"DefaultSettingsHelp": "Το Piwik ÎÏχεται με Ï€ÏοκαθοÏισμÎνες Ïυθμίσεις. ΜποÏείτε να τις αλλάξετε Ï„ÏŽÏα ή αÏγότεÏα στην οθόνη διαχείÏισης.",
@@ -49,7 +51,7 @@
"RestartWebServer": "Μετά από αυτή την αλλαγή, επανεκκινήστε τον διακομιστή σας.",
"ReusingTables": "Γίνεται χÏήση των Πινάκων",
"PiwikOrgNewsletter": "στείλε μου e-mail για μεγάλες ενημεÏώσεις της κοινοτικής Îκδοσης του Piwik",
- "PiwikProNewsletter": "στείλε μου πληÏοφοÏίες σχετικά με τις υπηÏεσίες του %sPiwik PRO%s και τις Ï€ÏοσφοÏÎÏ‚ του",
+ "PiwikProNewsletter": "στείλε μου πληÏοφοÏίες σχετικά με τις υπηÏεσίες του %1$sPiwik PRO%2$s και τις Ï€ÏοσφοÏÎÏ‚ του",
"SeeBelowForMoreInfo": "Δείτε παÏακάτω για πεÏισσότεÏες πληÏοφοÏίες.",
"SetupWebsite": "ΡÏθμιση μιας ιστοσελίδας",
"SetupWebsiteError": "ΣυνÎβη Îνα σφάλμα κατά της Ï€Ïοσθήκη της ιστοσελίδας",
@@ -100,7 +102,7 @@
"SystemCheckSplHelp": "Î ÏÎπει να Ïυθμίσετε και ξαναεγκαταστήσετε την PHP με τη Βασική Βιβλιοθήκη PHP (SPL) ενεÏγοποιήμÎνη (ως Ï€Ïοεπιλογή).",
"SystemCheckSettings": "ΑπαιτοÏμενη παÏαμετÏοποίηση PHP (php.ini)",
"SystemCheckSummaryNoProblems": "Δεν υπάÏχουν Ï€Ïοβλήματα με την εγκατάσταση του Piwik. Όλα καλά!",
- "SystemCheckSummaryThereWereErrors": "Îωχ, το Piwik εντόπισε %1$sκÏίσιμα θÎματα%2$s με την εγκατάσταση του Piwik. %3$sΑυτά τα θÎματα Ï€ÏÎπει να διοÏθωθοÏν άμεσα.%4$s",
+ "SystemCheckSummaryThereWereErrors": "Îχ, το Piwik εντόπισε %1$sκÏίσιμα θÎματα%2$s με την εγκατάσταση του Piwik. %3$sΑυτά τα θÎματα Ï€ÏÎπει να διοÏθωθοÏν άμεσα.%4$s",
"SystemCheckSummaryThereWereWarnings": "ΥπάÏχουν οÏισμÎνα ζητήματα με το σÏστημά σας. Το Piwik θα Ï„ÏÎξει, αλλά μποÏεί να αντιμετωπίσετε κάποια μικÏοπÏοβλήματα.",
"SystemCheckTimeLimitHelp": "Σε ιστοσελίδες με μεγάλη επισκεψιμότητα, όταν διενεÏγείται η αποθήκευση ασφαλείας μποÏεί να δαπανήθει πεÏισσότεÏος χÏόνος από ότι είναι Ï€Ïος το παÏόν επιτÏεπτό.<br \/>Δείτε την οδηγία max_execution_time στο αÏχείο php.ini αν είναι απαÏαίτητο",
"SystemCheckTracker": "Κατάσταση Ανιχνευτή",
diff --git a/plugins/Installation/lang/en.json b/plugins/Installation/lang/en.json
index 049d191fb4bf70206a8f33a28d2baa4d21e2439d..0296e5f1087e60d8cc07c0b33e36b3c4bfe640f1 100644
--- a/plugins/Installation/lang/en.json
+++ b/plugins/Installation/lang/en.json
@@ -36,12 +36,14 @@
"NfsFilesystemWarning": "Your server is using an NFS filesystem.",
"NfsFilesystemWarningSuffixAdmin": "This means Piwik will be extremely slow when using file based sessions.",
"NfsFilesystemWarningSuffixInstall": "Using file based sessions on NFS is extremely slow, so Piwik will use database sessions. If you have many concurrent dashboard users, you may need to increase the maximum number of client connections to the database server.",
- "NoConfigFound": "The Piwik configuration file couldn't be found and you are trying to access a Piwik page.<br \/><b>\u00a0\u00a0\u00bb You can <a href='index.php'>install Piwik now<\/a><\/b><br \/><small>If you installed Piwik before and have some tables in your DB, don't worry, you can reuse the same tables and keep your existing data!<\/small>",
+ "NoConfigFound": "The Piwik configuration file couldn't be found and you are trying to access a Piwik page.<br \/><b>  » You can <a href='index.php'>install Piwik now<\/a><\/b><br \/><small>If you installed Piwik before and have some tables in your DB, don't worry, you can reuse the same tables and keep your existing data!<\/small>",
"Optional": "Optional",
"Password": "Password",
"PasswordDoNotMatch": "password do not match",
"PasswordRepeat": "Password (repeat)",
"PercentDone": "%s %% Done",
+ "PiwikProAdTitle": "Advanced Analytics & Services",
+ "PiwikProAdText": "Add premium functionality and unlock the full power with %1$sPiwik PRO On-Premises%2$s, or get your own hassle-free Piwik hosted in the %3$sPiwik PRO Cloud%4$s.",
"PleaseFixTheFollowingErrors": "Please fix the following errors",
"DefaultSettings": "Default Piwik settings",
"DefaultSettingsHelp": "Piwik comes with default settings. You can customize them now or do so later in the admin screen.",
@@ -49,7 +51,7 @@
"RestartWebServer": "After making this change, restart your web server.",
"ReusingTables": "Reusing the Tables",
"PiwikOrgNewsletter": "email me with major Piwik community updates",
- "PiwikProNewsletter": "send me information on %sPiwik PRO%s services and offers",
+ "PiwikProNewsletter": "send me information on %1$sPiwik PRO%2$s services and offers",
"SeeBelowForMoreInfo": "See below for more information.",
"SetupWebsite": "Setup a Website",
"SetupWebsiteError": "There was an error when adding the website",
@@ -118,7 +120,7 @@
"SystemCheckCronArchiveProcessCLI": "Managing processes via CLI",
"SystemCheckPhpSetting": "To prevent some critical issue, you must set the following in your php.ini file: %s",
"SystemCheckUpdateHttps": "Update over HTTPS",
- "SystemCheckUpdateHttpsNotSupported": "Piwik cannot use HTTPS to update, it will fall back to the insecure HTTP update. Check that CURL or allow_url_fopen is supported and that the openssl PHP extension is installed: http://piwik.org/faq/troubleshooting/faq_177/.",
+ "SystemCheckUpdateHttpsNotSupported": "Piwik cannot use HTTPS to update, it will fall back to the insecure HTTP update. Check that CURL or allow_url_fopen is supported and that the openssl PHP extension is installed: http:\/\/piwik.org\/faq\/troubleshooting\/faq_177\/.",
"NotSupported": "not supported",
"Tables": "Creating the Tables",
"TablesCreatedSuccess": "Tables created with success!",
@@ -137,4 +139,4 @@
"CannotConnectToDb": "Cannot connect to the database",
"CannotConnectToDbResolvingExplanation": "This may be a temporary issue, try %1$srefreshing the page%2$s. If the problem persists please contact your Piwik administrator."
}
-}
+}
\ No newline at end of file
diff --git a/plugins/Installation/lang/es.json b/plugins/Installation/lang/es.json
index 3b4c1a7dfbe88c79bbd8b2aa378ec55320df5683..58ad29cbea22a94b83ee442b86bcb9a1a42e71f0 100644
--- a/plugins/Installation/lang/es.json
+++ b/plugins/Installation/lang/es.json
@@ -49,7 +49,7 @@
"RestartWebServer": "Luego de realizar este cambio, reinicie su servidor de internet.",
"ReusingTables": "Reutilizando las Tablas",
"PiwikOrgNewsletter": "Enviarme un correo electrónico con las principales actualizaciones de la comunidad Piwik",
- "PiwikProNewsletter": "enviarme información sobre los servicios y ofertas de %sPiwik PRO%s",
+ "PiwikProNewsletter": "enviarme información sobre los servicios y ofertas de %1$sPiwik PRO%2$s",
"SeeBelowForMoreInfo": "Véase más adelante para mayor información.",
"SetupWebsite": "Configurar un sitio de internet",
"SetupWebsiteError": "Se ha producido un error al añadir el sitio de internet",
diff --git a/plugins/Installation/lang/fr.json b/plugins/Installation/lang/fr.json
index d20170b82aceac4bcf25bbee73b71781f72cb6a0..24a88721f493c52726741138820945292def3080 100644
--- a/plugins/Installation/lang/fr.json
+++ b/plugins/Installation/lang/fr.json
@@ -42,6 +42,7 @@
"PasswordDoNotMatch": "Le mot de passe ne concorde pas",
"PasswordRepeat": "Mot de passe (répétez)",
"PercentDone": "%s %% complété",
+ "PiwikProAdTitle": "Services et statistiques avancés",
"PleaseFixTheFollowingErrors": "Merci de corriger les erreurs suivantes",
"DefaultSettings": "Paramétrage par défaut",
"DefaultSettingsHelp": "Piwik est installé avec un paramétrage par défaut. Vous pouvez personnaliser ces réglages maintenant ou le faire plus tard dans l'espace d'administration.",
@@ -49,6 +50,7 @@
"RestartWebServer": "Après avoir effectué ces modifications, redémarrez votre serveur web.",
"ReusingTables": "Réutilisation des Tables",
"PiwikOrgNewsletter": "Envoyez moi des courriels pour les mises à jour importantes de Piwik",
+ "PiwikProNewsletter": "envoyez-moi des informations à propos des services et offres de %1$sPiwik PRO%2$s",
"SeeBelowForMoreInfo": "Voir ci-dessous pour plus d'informations.",
"SetupWebsite": "Paramétrer un site",
"SetupWebsiteError": "Une erreur a été rencontrée pendant l'ajout du site",
diff --git a/plugins/Installation/lang/it.json b/plugins/Installation/lang/it.json
index 8fa8415c4ff4082c40362342db7fda18b0b0d2de..b400e2b531265663798d809bcb52be1fedbe8009 100644
--- a/plugins/Installation/lang/it.json
+++ b/plugins/Installation/lang/it.json
@@ -41,6 +41,8 @@
"PasswordDoNotMatch": "Le Password non coincidono",
"PasswordRepeat": "Password (ripeti)",
"PercentDone": "%s %% Fatto",
+ "PiwikProAdTitle": "Statistiche & Servizi avanzati",
+ "PiwikProAdText": "Aggiungi le funzionalità premium e sblocca l'intera potenza con %1$sPiwik PRO On-Premises%2$s o prendi Piwik senza fastidi ospitato nel %3$sClousd Piwik PRO%4$s.",
"PleaseFixTheFollowingErrors": "Per favore, risolvi i seguenti errori",
"DefaultSettings": "Impostazioni predefinite di Piwik",
"DefaultSettingsHelp": "Piwik ha delle impostazioni predefinite. Puoi personalizzarle ora o farlo in seguito dalla schermata di amministrazione.",
@@ -48,7 +50,7 @@
"RestartWebServer": "Dopo aver fatto questa modifica, riavvia il server web.",
"ReusingTables": "Riutilizzo delle Tabelle",
"PiwikOrgNewsletter": "Inviami per email gli aggiornamenti importanti della comunità di Piwik",
- "PiwikProNewsletter": "inviami informazioni su servizi e offerte di %sPiwik PRO%s",
+ "PiwikProNewsletter": "inviami informazioni su servizi e offerte di %1$sPiwik PRO%2$s",
"SeeBelowForMoreInfo": "Guarda sotto per altre informazioni.",
"SetupWebsite": "Configura un sito web",
"SetupWebsiteError": "C'è stato un errore durante l'aggiunta del sito web",
diff --git a/plugins/Installation/lang/ja.json b/plugins/Installation/lang/ja.json
index a2bfe0e5b4c0f340b513af9e01d9d55139e6fed1..3e65be17e82bd66fc57e17a5e9aaad4375749be4 100644
--- a/plugins/Installation/lang/ja.json
+++ b/plugins/Installation/lang/ja.json
@@ -49,7 +49,7 @@
"RestartWebServer": "ã“ã®å¤‰æ›´ã‚’è¡Œã£ãŸå¾Œã€ã‚¦ã‚§ãƒ–サーãƒãƒ¼ã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„。",
"ReusingTables": "表ã®å†åˆ©ç”¨",
"PiwikOrgNewsletter": "ç§ã« Piwik コミュニティã®æœ€æ–°æƒ…å ±ã‚’ãƒ¡ãƒ¼ãƒ«ã§é€ã‚‹",
- "PiwikProNewsletter": "%s Piwik PRO %s ã®ã‚µãƒ¼ãƒ“ã‚¹ã‚„æœ€æ–°æƒ…å ±ã‚’é€ã£ã¦ãã ã•ã„",
+ "PiwikProNewsletter": "%1$s Piwik PRO %2$s ã®ã‚µãƒ¼ãƒ“ã‚¹ã‚„æœ€æ–°æƒ…å ±ã‚’é€ã£ã¦ãã ã•ã„",
"SeeBelowForMoreInfo": "詳細ã¯ã€ä»¥ä¸‹ã‚’ã”確èªãã ã•ã„。",
"SetupWebsite": "ウェブサイトã®ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—",
"SetupWebsiteError": "ã‚¦ã‚§ãƒ–ã‚µã‚¤ãƒˆã‚’è¿½åŠ ã™ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ",
diff --git a/plugins/Installation/lang/ko.json b/plugins/Installation/lang/ko.json
index 3fa7374b09e81bb16a0a7ecca5b958a8041cf0f1..bde1148c0217f3cb98ec4cacbed2fc8bdbeb4cd9 100644
--- a/plugins/Installation/lang/ko.json
+++ b/plugins/Installation/lang/ko.json
@@ -49,7 +49,7 @@
"RestartWebServer": "변경한 후 웹서버를 다시 시작하세요.",
"ReusingTables": "í…Œì´ë¸”",
"PiwikOrgNewsletter": "주요 Piwik ì»¤ë®¤ë‹ˆí‹°ì˜ ì—…ë°ì´íŠ¸ ì´ë©”ì¼ êµ¬ë…",
- "PiwikProNewsletter": "%sPiwik PRO%s 서비스 ë° ì‹ ì²ê³¼ ê´€ë ¨í•œ ì •ë³´ 받기",
+ "PiwikProNewsletter": "%1$sPiwik PRO%2$s 서비스 ë° ì‹ ì²ê³¼ ê´€ë ¨í•œ ì •ë³´ 받기",
"SeeBelowForMoreInfo": "ìžì„¸í•œ ë‚´ìš©ì€ ì•„ëž˜ë¥¼ 참조하세요.",
"SetupWebsite": "웹사ì´íŠ¸ ì„¤ì •",
"SetupWebsiteError": "웹사ì´íŠ¸ ì¶”ê°€ì¤‘ì— ì—러가 있었습니다",
diff --git a/plugins/Installation/lang/lt.json b/plugins/Installation/lang/lt.json
index 43bb4d653ca73fe008dbfd0c84c73155cd33f53a..61eb05852ceeb63830c83ce094cb806aa7b2bc70 100644
--- a/plugins/Installation/lang/lt.json
+++ b/plugins/Installation/lang/lt.json
@@ -34,6 +34,7 @@
"DefaultSettings": "Numatytieji Piwik nustatymai",
"Requirements": "Piwik reikalavimai sistemai",
"RestartWebServer": "Įvykdę šį pakeitimą, iš naujo paleiskite savo saityno serverį.",
+ "SeeBelowForMoreInfo": "Išsamesnę informaciją žiūrėkite žemiau.",
"SetupWebsite": "SvetainÄ—s nustatymai",
"SetupWebsiteError": "Rasta klaidų pridedant svetainę",
"SetupWebSiteName": "SvetainÄ—s pavadinimas",
diff --git a/plugins/Installation/lang/nb.json b/plugins/Installation/lang/nb.json
index 3def7c1d73a22f0bdee127accd2927a08c7f9b56..8a1eea35c61923d07af61f9a8a6431e0168e9d18 100644
--- a/plugins/Installation/lang/nb.json
+++ b/plugins/Installation/lang/nb.json
@@ -42,6 +42,8 @@
"PasswordDoNotMatch": "passordene stemmer ikke overens",
"PasswordRepeat": "Passord (gjenta)",
"PercentDone": "%s %% ferdig",
+ "PiwikProAdTitle": "Avansert analyse og tjenester",
+ "PiwikProAdText": "Legg til premium-funksjonalitet og lås opp høyeste gir med %1$sPiwik PRO On-Premises%2$s, eller få din egen Piwik drevet i %3$sPiwik PRO Cloud%4$s.",
"PleaseFixTheFollowingErrors": "Fiks følgende feil",
"DefaultSettings": "Standard Piwik-innstillinger",
"DefaultSettingsHelp": "Piwik kommer med standardinnstillinger. Du kan tilpasse dem nå eller gjøre det senere i administrasjonsskjermen.",
@@ -49,7 +51,7 @@
"RestartWebServer": "Etter å ha gjort denne endringen må du restarte webserveren.",
"ReusingTables": "Gjenbruker tabellene",
"PiwikOrgNewsletter": "Send meg e-poster med viktige oppdateringer om Piwik",
- "PiwikProNewsletter": "send meg informasjon om %sPiwik PRO%s tjenester og tilbud",
+ "PiwikProNewsletter": "send meg informasjon om %1$sPiwik PRO%2$s tjenester og tilbud",
"SeeBelowForMoreInfo": "Se nedenfor for mer informasjon.",
"SetupWebsite": "Legg til et nettsted",
"SetupWebsiteError": "Det skjedde en feil da nettstedet ble lagt til.",
diff --git a/plugins/Installation/lang/nl.json b/plugins/Installation/lang/nl.json
index a95963ef6a0ca978b7aec8d89ede8bc2b7cf3af6..07d4629d14cd49e8f732753b031bd49e35cceef2 100644
--- a/plugins/Installation/lang/nl.json
+++ b/plugins/Installation/lang/nl.json
@@ -49,7 +49,7 @@
"RestartWebServer": "Herstart uw webserver na deze aanpassing.",
"ReusingTables": "Hergebruik de tabellen",
"PiwikOrgNewsletter": "email mij bij grote Piwik gemeenschap updates",
- "PiwikProNewsletter": "Stuur mij informatie over %sPiwik PRO%s diensten en aanbiedingen",
+ "PiwikProNewsletter": "Stuur mij informatie over %1$sPiwik PRO%2$s diensten en aanbiedingen",
"SeeBelowForMoreInfo": "Zie hieronder voor meer informatie.",
"SetupWebsite": "Configureer een website",
"SetupWebsiteError": "Er heeft zich een fout voorgedaan tijdens het toevoegen van de website",
diff --git a/plugins/Installation/lang/pl.json b/plugins/Installation/lang/pl.json
index 58a4eb5239473553862167b86d1398a524bf8291..8bcc0d9c8dd735ef2e58d0e8654a4918928ea7ce 100644
--- a/plugins/Installation/lang/pl.json
+++ b/plugins/Installation/lang/pl.json
@@ -11,21 +11,24 @@
"DatabaseSetup": "Konfiguracja bazy danych",
"DatabaseSetupAdapter": "adapter",
"DatabaseSetupDatabaseName": "nazwa bazy",
- "DatabaseSetupLogin": "login",
+ "DatabaseSetupLogin": "Login",
"DatabaseSetupServer": "Serwer bazy danych",
"DatabaseSetupTablePrefix": "prefix tabel",
- "Extension": "rozszerzenia",
+ "Email": "Email",
+ "Extension": "rozszerzenie",
"Filesystem": "System plików",
"GoBackAndDefinePrefix": "Cofnij siÄ™ i zdefiniuj obowiÄ…zujÄ…cy Prefix dla tabel",
"HappyAnalysing": "Powodzenia!",
"Installation": "Instalacja",
- "InstallationStatus": "Status postępu instalacji",
+ "InstallationStatus": "Postęp instalacji",
"LargePiwikInstances": "Pomoc w przypadku dużych instalacji z Piwik",
"Legend": "Legenda",
"NfsFilesystemWarning": "Twój system używa systemu plików NFS",
"NoConfigFound": "Plik konfiguracyjny Piwik nie został odnaleziony, a ty próbujesz uzyskać dostęp do strony Piwik.<br \/><b>  » Możesz <a href='index.php'>zainstalować statystyki Piwik teraz<\/a><\/b><br \/><small>Jeżeli zainstalowałeś Piwik poprzednio i masz swoje tabele w bazie danych, nie przejmuj się, możesz uzyć tych samych tabel i zachować istniejące w nich dane!<\/small>",
"Optional": "Opcionalnie",
+ "Password": "Hasło",
"PasswordDoNotMatch": "hasło jest nieprawidłowe",
+ "PasswordRepeat": "Hasło (powtórzone)",
"PercentDone": "%s %% wykonano",
"PleaseFixTheFollowingErrors": "Prosimy naprawić następujące błędy",
"Requirements": "Wymagania systemu Piwik",
@@ -39,7 +42,7 @@
"SiteSetup": "Proszę utworzyć pierwszą stronę, która miała by być anmalizowana prze Piwik'a:",
"SiteSetupFootnote": "UWAGA: Nowe strony do śledzenia będzie mozna dodawać dopiero po zakończeniu instalacji Piwik'a",
"SuperUser": "Super Użytkownik",
- "SuperUserSetupError": "Wystąpił błąd podczas dodawania Super User",
+ "SuperUserSetupError": "Wystąpił błąd podczas dodawania Super Użytkownika",
"SuperUserSetupSuccess": "Konto Super Użytkownika utworzono pomyślnie!",
"SystemCheck": "Sprawdzenie systemu",
"SystemCheckAutoUpdateHelp": "Uwaga: automatyczna aktualizacja statystyk Piwik wymaga praw do zapisu w folderze Piwik i w jego podkatalogach.",
@@ -78,7 +81,7 @@
"SystemCheckTracker": "Status śledzenia",
"SystemCheckWarnDomHelp": "Rozszerzenie \"dom\" winno być włączone (np., instalując pakiety \"php-dom\" i\/lub pakiet \"php-xml\").",
"SystemCheckWarning": "Piwik będzie działać normalnie, ale pewnie funkcje mogą być nieosiągalne",
- "SystemCheckWarnJsonHelp": "Rozszerzenie \"json\" winno byc włączone (np., instalując pakiet \"php-json\") dla uzyskania lepszej wydajności.",
+ "SystemCheckWarnJsonHelp": "Rozszerzenie \"json\" powinno być włączone (np.poprzez instalację pakietu \"php-json\") dla uzyskania lepszej wydajności.",
"SystemCheckWarnLibXmlHelp": "Rozszerzenie \"libxml\" winno być włączone (np., instalując pakiet \"php-libxml\") tak jak jest to wymagane przez inne rozszerzenia jądra PHP.",
"SystemCheckWarnSimpleXMLHelp": "Rozszerzenie \"SimpleXML\" winno być włączone (np., instalując pakiety \"php-simplexml\" i\/lub \"php-xml\").",
"SystemCheckWinPdoAndMysqliHelp": "Na serwerach w oparciu o Windows możesz dodać następujące linie do pliku php.ini: %s",
diff --git a/plugins/Installation/lang/pt-br.json b/plugins/Installation/lang/pt-br.json
index e01033da0fdf4aea42becfa6a3b0fc2c266891d7..050420299ef6ad532549147f70077753bb7c2a10 100644
--- a/plugins/Installation/lang/pt-br.json
+++ b/plugins/Installation/lang/pt-br.json
@@ -42,6 +42,8 @@
"PasswordDoNotMatch": "senha não confere",
"PasswordRepeat": "Senha (repetir)",
"PercentDone": "%s %% Completo",
+ "PiwikProAdTitle": "Análises e Serviços Avançados",
+ "PiwikProAdText": "Adicione funcionalidades premium e libere a força total com o %1$sPiwik PRO On-Premises%2$s, ou obtenha o seu próprio Piwik livre de problemas hospedado no %3$sPiwik PRO Cloud%4$s.",
"PleaseFixTheFollowingErrors": "Por favor, corrija os seguintes erros",
"DefaultSettings": "Configurações Piwik padrão",
"DefaultSettingsHelp": "Piwik vem com configurações padrão. Você pode personalizá-las agora ou posteriormente no painel de administração.",
@@ -49,7 +51,7 @@
"RestartWebServer": "Depois de fazer essa alteração, reinicie o seu servidor web.",
"ReusingTables": "Reutilizando as Tabelas",
"PiwikOrgNewsletter": "me enviar e-mail com as principais atualizações da comunidade Piwik",
- "PiwikProNewsletter": "envie-me informações sobre os serviços e ofertas do %sPiwik PRO%s",
+ "PiwikProNewsletter": "envie-me informações sobre os serviços e ofertas do %1$sPiwik PRO%2$s",
"SeeBelowForMoreInfo": "Veja abaixo para mais informações.",
"SetupWebsite": "Configurar um website",
"SetupWebsiteError": "Ocorreu um erro ao tentar adicionar o website",
diff --git a/plugins/Installation/lang/ru.json b/plugins/Installation/lang/ru.json
index 276574b9f5ec1bd1b69697c4a570385ce6dfc745..a9d7e7eb4c1af48722137cbe311414d371b42a96 100644
--- a/plugins/Installation/lang/ru.json
+++ b/plugins/Installation/lang/ru.json
@@ -46,7 +46,7 @@
"RestartWebServer": "ПоÑле Ñтих изменений перезапуÑтите браузер.",
"ReusingTables": "ПереиÑпользование таблиц",
"PiwikOrgNewsletter": "поÑлать мне email о новых Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Piwik community",
- "PiwikProNewsletter": "пришлите мне информацию об уÑлугах и предложениÑÑ… %sPiwik PRO%s",
+ "PiwikProNewsletter": "пришлите мне информацию об уÑлугах и предложениÑÑ… %1$sPiwik PRO%2$s",
"SeeBelowForMoreInfo": "Смотрите ниже Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации.",
"SetupWebsite": "Добавить Ñайт",
"SetupWebsiteError": "Возникла ошибка при добавлении Ñайта",
diff --git a/plugins/Installation/lang/sr.json b/plugins/Installation/lang/sr.json
index 45dd3d36b1dcc2c4c6f400522df822e17a6fd649..ec4fab0a62b9ae299574f765f9cb3d80fc6f0845 100644
--- a/plugins/Installation/lang/sr.json
+++ b/plugins/Installation/lang/sr.json
@@ -49,7 +49,7 @@
"RestartWebServer": "Nakon ovih izmena restartujte vaš web server",
"ReusingTables": "Ponovna upotreba tabela",
"PiwikOrgNewsletter": "poÅ¡alji mi mejl kada doÄ‘e do znaÄajne Piwik izmene",
- "PiwikProNewsletter": "pošalji mi informacije o %sPiwik PRO%s uslugama i ponudama",
+ "PiwikProNewsletter": "pošalji mi informacije o %1$sPiwik PRO%2$s uslugama i ponudama",
"SeeBelowForMoreInfo": "Pogledajte ispod za više informacija.",
"SetupWebsite": "Podešavanje sajta",
"SetupWebsiteError": "Došlo je do greške prilikom dodavanja sajta",
diff --git a/plugins/Installation/lang/sv.json b/plugins/Installation/lang/sv.json
index 6ec73dcb00a28d20f17d2231c15522b213660a5b..0bbbd52ad87d97067d23f7515f84f2d312cef276 100644
--- a/plugins/Installation/lang/sv.json
+++ b/plugins/Installation/lang/sv.json
@@ -49,7 +49,7 @@
"RestartWebServer": "När du har gjort den här ändringen, starta om din webbserver.",
"ReusingTables": "Återanvänder tabellerna",
"PiwikOrgNewsletter": "maila mig vid större Piwik community uppdateringar",
- "PiwikProNewsletter": "skicka mer information om tjänster och erbjudanden från %sPiwik PRO%s",
+ "PiwikProNewsletter": "skicka mer information om tjänster och erbjudanden från %1$sPiwik PRO%2$s",
"SeeBelowForMoreInfo": "Se nedan för mer information.",
"SetupWebsite": "Konfigurera en webbplats",
"SetupWebsiteError": "Det uppstod ett fel när webbplatsen försökte läggas till.",
@@ -73,6 +73,7 @@
"SystemCheckExtensions": "Övriga nödvändiga tillägg",
"SystemCheckFileIntegrity": "Filintegritet",
"SystemCheckFunctions": "Funktioner som krävs",
+ "SystemCheckFunctionHelp": "Du måste aktivera denna inbyggda funktion.",
"SystemCheckGDFreeType": "GD > 2.x + Fristil (grafik)",
"SystemCheckGDHelp": "Graflinjerna kommer inte fungera.",
"SystemCheckGlobHelp": "Denna inbyggda funktionen har inaktiverats på din värd. Piwik försöker emulera denna funktion men kan stöta på ytterligare säkerhetsrestriktioner. Funktionalitet kan påverkas.",
diff --git a/plugins/Installation/lang/zh-cn.json b/plugins/Installation/lang/zh-cn.json
index edf6caa2a60a20efb7af5cb695a494d15d718684..bef29bf2aca3b1c0dbddacc09db2c65ad2d0434a 100644
--- a/plugins/Installation/lang/zh-cn.json
+++ b/plugins/Installation/lang/zh-cn.json
@@ -49,7 +49,7 @@
"RestartWebServer": "åšè¿‡è¿™ä¸ªæ”¹åŠ¨ä¹‹åŽï¼Œè¯·é‡æ–°å¯åŠ¨ç½‘络æœåŠ¡å™¨ã€‚",
"ReusingTables": "é‡ç”¨çš„表",
"PiwikOrgNewsletter": "邮件通知我é‡å¤§çš„ Piwik 社区更新",
- "PiwikProNewsletter": "给我å‘é€ %sPiwik PRO%s 的折扣和æœåŠ¡ç›¸å…³çš„ä¿¡æ¯",
+ "PiwikProNewsletter": "给我å‘é€ %1$sPiwik PRO%2$s 的折扣和æœåŠ¡ç›¸å…³çš„ä¿¡æ¯",
"SeeBelowForMoreInfo": "更详细的信æ¯è¯·çœ‹ä¸‹é¢",
"SetupWebsite": "设定一个网站",
"SetupWebsiteError": "å¢žåŠ æ¤ç½‘站时出现错误",
diff --git a/plugins/Installation/templates/finished.twig b/plugins/Installation/templates/finished.twig
index 636e8d397c1ddc135221a42b9617a86074516920..b64bb79812d48cdd3a6ccf09afd82360c3ade44c 100644
--- a/plugins/Installation/templates/finished.twig
+++ b/plugins/Installation/templates/finished.twig
@@ -17,6 +17,16 @@
<p>{{ 'Installation_WeHopeYouWillEnjoyPiwik'|translate }}</p>
<p><i>{{ 'Installation_HappyAnalysing'|translate }}</i></p>
+ {% if arePiwikProAdsEnabled %}
+ <h3>{{ 'Installation_PiwikProAdTitle'|translate }}</h3>
+ <p>
+ {% set linkOnPremises = 'Installation_End'|piwikProOnPremisesPromoUrl %}
+ {% set linkOnCloud = 'Installation_End'|piwikProCloudPromoUrl %}
+
+ {{ 'Installation_PiwikProAdText'|translate('<a rel="noreferrer" target="_blank" href="' ~ linkOnPremises ~ '">','</a>', '<a rel="noreferrer" target="_blank" href="' ~ linkOnCloud ~ '">','</a>')|raw }}
+ </p>
+ {% endif %}
+
<h3>{{ 'Installation_DefaultSettings'|translate }}</h3>
<p>{{ 'Installation_DefaultSettingsHelp'|translate }}</p>
diff --git a/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php b/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php
index cf85b79bcf09a73670bc72e4fbabc9d6f2c472a1..0017cb37298a15ac8e3fc092db682d7c4b3645ad 100755
--- a/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php
+++ b/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php
@@ -8,6 +8,7 @@
namespace Piwik\Plugins\LanguagesManager\Test\Integration;
+use Piwik\Cache;
use Piwik\Container\StaticContainer;
use Piwik\Intl\Data\Provider\LanguageDataProvider;
use Piwik\Plugins\LanguagesManager\API;
@@ -19,6 +20,7 @@ use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\UnnecassaryWhitespac
use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\CoreTranslations;
use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\NoScripts;
use Piwik\Plugins\LanguagesManager\TranslationWriter\Writer;
+use Piwik\Translate;
/**
* @group LanguagesManager
@@ -125,6 +127,27 @@ class LanguagesManagerTest extends \PHPUnit_Framework_TestCase
$this->assertFalse(API::getInstance()->getTranslationsForLanguage("../no-language"));
}
+ /**
+ * check all english translations do not contain more than one
+ *
+ * @group Plugins
+ * @group numbered
+ */
+ function testTranslationsUseNumberedPlaceholders()
+ {
+ Cache::flushAll();
+ $translator = StaticContainer::get('Piwik\Translation\Translator');
+ $translator->reset();
+ Translate::loadAllTranslations();
+ $translations = $translator->getAllTranslations();
+ foreach ($translations AS $plugin => $pluginTranslations) {
+ foreach ($pluginTranslations as $key => $pluginTranslation) {
+ $this->assertLessThanOrEqual(1, substr_count($pluginTranslation, '%s'),
+ sprintf('%s.%s must use numbered placeholders instead of multiple %%s', $plugin, $key));
+ }
+ }
+ }
+
/**
* test English short name for language
*
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 788f1d5c19ed75331ecbc475b072ba47615626da..e52410d8e52336c74c8dcf3f644672ae9172286c 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -260,10 +260,28 @@ class API extends \Piwik\Plugin\API
{
Piwik::checkUserHasViewAccess($idSite);
+ // for faster performance search for a visitor within the last 7 days first
+ $minTimestamp = Date::now()->subDay(7)->getTimestamp();
+
$dataTable = $this->loadLastVisitorDetailsFromDatabase(
- $idSite, $period = false, $date = false, $segment, $offset = 0, $limit = 1
+ $idSite, $period = false, $date = false, $segment, $offset = 0, $limit = 1, $minTimestamp
);
+ if (0 >= $dataTable->getRowsCount()) {
+ $minTimestamp = Date::now()->subYear(1)->getTimestamp();
+ // no visitor found in last 7 days, look further back for up to 1 year. This query will be slower
+ $dataTable = $this->loadLastVisitorDetailsFromDatabase(
+ $idSite, $period = false, $date = false, $segment, $offset = 0, $limit = 1, $minTimestamp
+ );
+ }
+
+ if (0 >= $dataTable->getRowsCount()) {
+ // no visitor found in last year, look over all logs. This query might be quite slow
+ $dataTable = $this->loadLastVisitorDetailsFromDatabase(
+ $idSite, $period = false, $date = false, $segment, $offset = 0, $limit = 1
+ );
+ }
+
if (0 >= $dataTable->getRowsCount()) {
return false;
}
diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php
index 1a71aa7b83cb0a427bbef0acc85cca3576a6605d..367d19c3a7793eb97340bcd9fdb60799877ded5f 100644
--- a/plugins/Live/Live.php
+++ b/plugins/Live/Live.php
@@ -38,6 +38,7 @@ class Live extends \Piwik\Plugin
{
$jsFiles[] = "libs/bower_components/visibilityjs/lib/visibility.core.js";
$jsFiles[] = "plugins/Live/javascripts/live.js";
+ $jsFiles[] = "plugins/Live/javascripts/SegmentedVisitorLog.js";
$jsFiles[] = "plugins/Live/javascripts/visitorProfile.js";
$jsFiles[] = "plugins/Live/javascripts/visitorLog.js";
$jsFiles[] = "plugins/Live/javascripts/rowaction.js";
diff --git a/plugins/Live/Model.php b/plugins/Live/Model.php
index 2152aee43aa18ceb2d1323d56c903f8c9fe1725d..276061e14d8d7224910b1d595ea9d437a5f3ed5c 100644
--- a/plugins/Live/Model.php
+++ b/plugins/Live/Model.php
@@ -382,11 +382,15 @@ class Model
$date = 'yesterdaySameTime';
}
- list($whereBind, $where) = $this->getWhereClauseAndBind($idSite, $period, $date, $visitorId, $minTimestamp);
+
+ list($whereClause, $bindIdSites) = $this->getIdSitesWhereClause($idSite);
+
+ list($whereBind, $where) = $this->getWhereClauseAndBind($whereClause, $bindIdSites, $idSite, $period, $date, $visitorId, $minTimestamp);
if (strtolower($filterSortOrder) !== 'asc') {
$filterSortOrder = 'DESC';
}
+
$segment = new Segment($segment, $idSite);
// Subquery to use the indexes for ORDER BY
@@ -395,7 +399,13 @@ class Model
$groupBy = false;
$limit = $limit >= 1 ? (int)$limit : 0;
$offset = $offset >= 1 ? (int)$offset : 0;
- $orderBy = "idsite, visit_last_action_time " . $filterSortOrder;
+
+ $orderBy = '';
+ if (count($bindIdSites) <= 1) {
+ $orderBy = 'idsite, ';
+ }
+
+ $orderBy .= "visit_last_action_time " . $filterSortOrder;
$orderByParent = "sub.visit_last_action_time " . $filterSortOrder;
$subQuery = $segment->getSelectQuery($select, $from, $where, $whereBind, $orderBy, $groupBy, $limit, $offset);
@@ -422,6 +432,8 @@ class Model
}
/**
+ * @param string $whereClause
+ * @param array $bindIdSites
* @param $idSite
* @param $period
* @param $date
@@ -430,10 +442,8 @@ class Model
* @return array
* @throws Exception
*/
- private function getWhereClauseAndBind($idSite, $period, $date, $visitorId, $minTimestamp)
+ private function getWhereClauseAndBind($whereClause, $bindIdSites, $idSite, $period, $date, $visitorId, $minTimestamp)
{
- list($whereClause, $bindIdSites) = $this->getIdSitesWhereClause($idSite);
-
$where = array();
$where[] = $whereClause;
$whereBind = $bindIdSites;
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 1525bfa5cff006cd8d4a702b16c416eb2f9ee379..4d15d5d3f6ed057ef96ed9e6c01e206a5fcc5025 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -359,6 +359,8 @@ class Visitor implements VisitorInterface
$ecommerceConversion['itemDetails'] = $itemsDetails;
}
+ $actionDetails = array_values($actionDetails);
+
// Enrich with time spent per action
foreach($actionDetails as $actionIdx => &$actionDetail) {
@@ -367,22 +369,24 @@ class Visitor implements VisitorInterface
if ($nextActionFound) {
$actionDetail['timeSpent'] = $actionDetails[$actionIdx + 1]['timeSpentRef'];
} else {
+
// Last action of a visit.
// By default, Piwik does not know how long the user stayed on the page
// If enableHeartBeatTimer() is used in piwik.js then we can find the accurate time on page for the last pageview
- $timeOfLastActionOrPingInVisitRow = $visitorDetailsArray['lastActionTimestamp'];
-
+ $visitTotalTime = $visitorDetailsArray['visitDuration'];
$timeOfLastAction = Date::factory($actionDetail['serverTimePretty'])->getTimestamp();
- $timeSpentOnPage = $timeOfLastActionOrPingInVisitRow - $timeOfLastAction;
+ $timeSpentOnAllActionsApartFromLastOne = ($timeOfLastAction - $visitorDetailsArray['firstActionTimestamp']);
+ $timeSpentOnPage = $visitTotalTime - $timeSpentOnAllActionsApartFromLastOne;
// Safe net, we assume the time is correct when it's more than 10 seconds
- if($timeSpentOnPage > 10) {
+ if ($timeSpentOnPage > 10) {
$actionDetail['timeSpent'] = $timeSpentOnPage;
}
+
}
- if(isset($actionDetail['timeSpent'])) {
+ if (isset($actionDetail['timeSpent'])) {
$actionDetail['timeSpentPretty'] = $formatter->getPrettyTimeFromSeconds($actionDetail['timeSpent'], true);
}
diff --git a/plugins/Live/VisitorProfile.php b/plugins/Live/VisitorProfile.php
index 20dca4b726e439e0de5632f1492b585d7bd05a9d..b92ead75e6b159ea38f2a331a296423f89f777ff 100644
--- a/plugins/Live/VisitorProfile.php
+++ b/plugins/Live/VisitorProfile.php
@@ -57,8 +57,12 @@ class VisitorProfile
// individual goal conversions are stored in action details
foreach ($visit->getColumn('actionDetails') as $action) {
$this->handleIfGoalAction($action);
+ $this->handleIfEventAction($action);
+ $this->handleIfDownloadAction($action);
+ $this->handleIfOutlinkAction($action);
$this->handleIfEcommerceAction($action);
$this->handleIfSiteSearchAction($action);
+ $this->handleIfPageViewAction($action);
$this->handleIfPageGenerationTime($action);
}
$this->handleGeoLocation($visit);
@@ -152,6 +156,50 @@ class VisitorProfile
return $this->isEcommerceEnabled;
}
+ /**
+ * @param $action
+ */
+ private function handleIfEventAction($action)
+ {
+ if ($action['type'] != 'event') {
+ return;
+ }
+ $this->profile['totalEvents']++;
+ }
+
+ /**
+ * @param $action
+ */
+ private function handleIfDownloadAction($action)
+ {
+ if ($action['type'] != 'download') {
+ return;
+ }
+ $this->profile['totalDownloads']++;
+ }
+
+ /**
+ * @param $action
+ */
+ private function handleIfOutlinkAction($action)
+ {
+ if ($action['type'] != 'outlink') {
+ return;
+ }
+ $this->profile['totalOutlinks']++;
+ }
+
+ /**
+ * @param $action
+ */
+ private function handleIfPageViewAction($action)
+ {
+ if ($action['type'] != 'action') {
+ return;
+ }
+ $this->profile['totalPageViews']++;
+ }
+
/**
* @param $action
*/
@@ -283,7 +331,11 @@ class VisitorProfile
$this->profile['totalVisits'] = 0;
$this->profile['totalVisitDuration'] = 0;
$this->profile['totalActions'] = 0;
+ $this->profile['totalEvents'] = 0;
+ $this->profile['totalOutlinks'] = 0;
+ $this->profile['totalDownloads'] = 0;
$this->profile['totalSearches'] = 0;
+ $this->profile['totalPageViews'] = 0;
$this->profile['totalPageViewsWithTiming'] = 0;
$this->profile['totalGoalConversions'] = 0;
$this->profile['totalConversionsByGoal'] = array();
diff --git a/plugins/Live/javascripts/SegmentedVisitorLog.js b/plugins/Live/javascripts/SegmentedVisitorLog.js
new file mode 100644
index 0000000000000000000000000000000000000000..1f3581423b03a3d805eac590c0347dab39cbcffa
--- /dev/null
+++ b/plugins/Live/javascripts/SegmentedVisitorLog.js
@@ -0,0 +1,142 @@
+var SegmentedVisitorLog = function() {
+
+ function getDataTableFromApiMethod(apiMethod)
+ {
+ var div = $(require('piwik/UI').DataTable.getDataTableByReport(apiMethod));
+ if (div.size() > 0 && div.data('uiControlObject')) {
+ return div.data('uiControlObject');
+ }
+ }
+
+ function getLabelFromTr ($tr, apiMethod) {
+ var label;
+
+ if (apiMethod && 0 === apiMethod.indexOf('Actions.')) {
+ // for now only use this for Actions... I know a hack :( Otherwise in Search Engines
+ // it would show "http://www.searchenginename.org" instead of "SearchEngineName"
+ label = $tr.attr('data-url-label');
+ }
+
+ if (!label) {
+ label = $tr.find('.label .value').text();
+ }
+
+ if (label) {
+ label = $.trim(label);
+ }
+
+ return label;
+ }
+
+
+ function getDimensionFromApiMethod(apiMethod)
+ {
+ if (!apiMethod) {
+ return;
+ }
+
+ var dataTable = getDataTableFromApiMethod(apiMethod);
+ var metadata = getMetadataFromDataTable(dataTable);
+
+ if (metadata && metadata.dimension) {
+ return metadata.dimension;
+ }
+ }
+
+ function getMetadataFromDataTable(dataTable)
+ {
+ if (dataTable) {
+
+ return dataTable.getReportMetadata();
+ }
+ }
+
+ function findTitleOfRowHavingRawSegmentValue(apiMethod, rawSegmentValue)
+ {
+ var $tr = $('[data-report="' + apiMethod + '"] tr[data-segment-filter="' + rawSegmentValue + '"]').first();
+
+ return getLabelFromTr($tr, apiMethod);
+ }
+
+ function setPopoverTitle(apiMethod, segment, index) {
+ var dataTable = getDataTableFromApiMethod(apiMethod);
+
+ if (!dataTable) {
+ if (index < 15) {
+ // this is needed when the popover is opened before the dataTable is there which can often
+ // happen when opening the popover directly via URL (broadcast.popoverHandler)
+ setTimeout(function () {
+ setPopoverTitle(apiMethod, segment, index + 1);
+ }, 150);
+ }
+ return;
+ }
+
+ var segmentName = getDimensionFromApiMethod(apiMethod);
+ var segmentValue = findTitleOfRowHavingRawSegmentValue(apiMethod, segment);
+
+ if (!segmentName || (segment && segment.indexOf(';') > 0)) {
+ segmentName = _pk_translate('General_Segment');
+ var segmentParts = segment.split(';');
+ segmentValue = segmentParts.join(' ' + _pk_translate('General_And') + ' ');
+ }
+
+ segmentName = piwikHelper.escape(segmentName);
+ segmentName = piwikHelper.htmlEntities(segmentName);
+ segmentValue = piwikHelper.escape(segmentValue);
+ segmentValue = piwikHelper.htmlEntities(segmentValue);
+ segmentName = segmentName.replace(/(&)(#[0-9]{2,5};)/g, '&$2');
+ segmentValue = segmentValue.replace(/(&)(#[0-9]{2,5};)/g, '&$2');
+
+ var title = _pk_translate('Live_SegmentedVisitorLogTitle', [segmentName, segmentValue]);
+
+ Piwik_Popover.setTitle(title);
+ }
+
+ function show(apiMethod, segment, extraParams) {
+
+ // open the popover
+ var box = Piwik_Popover.showLoading('Segmented Visitor Log');
+ box.addClass('segmentedVisitorLogPopover');
+
+
+ var callback = function (html) {
+ Piwik_Popover.setContent(html);
+
+ // remove title returned from the server
+ var title = box.find('h2[piwik-enriched-headline]');
+ var defaultTitle = title.text();
+
+ if (title.size() > 0) {
+ title.remove();
+ }
+
+ Piwik_Popover.setTitle(defaultTitle);
+
+ setPopoverTitle(apiMethod, segment, 0);
+ };
+
+ // prepare loading the popover contents
+ var requestParams = {
+ module: 'Live',
+ action: 'indexVisitorLog',
+ segment: segment,
+ disableLink: 1,
+ small: 1,
+ hideProfileLink: 1
+ };
+
+ $.extend(requestParams, extraParams);
+
+ var ajaxRequest = new ajaxHelper();
+ ajaxRequest.addParams(requestParams, 'get');
+ ajaxRequest.setCallback(callback);
+ ajaxRequest.setFormat('html');
+ ajaxRequest.send(false);
+ }
+
+ return {
+ show: show
+ }
+}();
+
diff --git a/plugins/Live/javascripts/rowaction.js b/plugins/Live/javascripts/rowaction.js
index 5c54e961b5ea1a247dcdd21425fc1596fbd1dd59..3524805dd8f53910566ae9566179d020d7e548a5 100644
--- a/plugins/Live/javascripts/rowaction.js
+++ b/plugins/Live/javascripts/rowaction.js
@@ -13,38 +13,11 @@
var actionName = 'SegmentVisitorLog';
- function getLabelFromTr ($tr, apiMethod) {
- var label;
-
- if (apiMethod && 0 === apiMethod.indexOf('Actions.')) {
- // for now only use this for Actions... I know a hack :( Otherwise in Search Engines
- // it would show "http://www.searchenginename.org" instead of "SearchEngineName"
- label = $tr.attr('data-url-label');
- }
-
- if (!label) {
- label = $tr.find('.label .value').text();
- }
-
- if (label) {
- label = $.trim(label);
- }
-
- return label;
- }
-
function getRawSegmentValueFromRow(tr)
{
return $(tr).attr('data-segment-filter');
}
- function findTitleOfRowHavingRawSegmentValue(apiMethod, rawSegmentValue)
- {
- var $tr = $('[data-report="' + apiMethod + '"] tr[data-segment-filter="' + rawSegmentValue + '"]').first();
-
- return getLabelFromTr($tr, apiMethod);
- }
-
function getDataTableFromApiMethod(apiMethod)
{
var div = $(require('piwik/UI').DataTable.getDataTableByReport(apiMethod));
@@ -81,8 +54,6 @@
// has to be overridden in subclasses
this.trEventName = 'piwikTriggerSegmentVisitorLogAction';
-
- this.segmentComparison = '==';
}
DataTable_RowActions_SegmentVisitorLog.prototype = new DataTable_RowAction();
@@ -121,86 +92,7 @@
// assume the parameter is an int/string describing whether to use multi row evolution
}
- this.showVisitorLog(apiMethod, segment, extraParams);
- };
-
- DataTable_RowActions_SegmentVisitorLog.prototype.showVisitorLog = function (apiMethod, segment, extraParams) {
-
- var self = this;
-
- // open the popover
- var box = Piwik_Popover.showLoading('Segmented Visitor Log');
- box.addClass('segmentedVisitorLogPopover');
-
- function setPopoverTitle(apiMethod, index)
- {
- var dataTable = getDataTableFromApiMethod(apiMethod);
-
- if (!dataTable) {
- if (index < 15) {
- // this is needed when the popover is opened before the dataTable is there which can often
- // happen when opening the popover directly via URL (broadcast.popoverHandler)
- setTimeout(function () {
- setPopoverTitle(apiMethod, index + 1);
- }, 150);
- }
- return;
- }
-
- var segmentName = getDimensionFromApiMethod(apiMethod);
- var segmentValue = findTitleOfRowHavingRawSegmentValue(apiMethod, segment);
-
- if (!segmentName || (segment && segment.indexOf(';') > 0)) {
- segmentName = _pk_translate('General_Segment');
- var segmentParts = segment.split(';');
- segmentValue = segmentParts.join(' ' + _pk_translate('General_And') + ' ');
- }
-
- segmentName = piwikHelper.escape(segmentName);
- segmentName = piwikHelper.htmlEntities(segmentName);
- segmentValue = piwikHelper.escape(segmentValue);
- segmentValue = piwikHelper.htmlEntities(segmentValue);
- segmentName = segmentName.replace(/(&)(#[0-9]{2,5};)/g, '&$2')
- segmentValue = segmentValue.replace(/(&)(#[0-9]{2,5};)/g, '&$2')
-
- var title = _pk_translate('Live_SegmentedVisitorLogTitle', [segmentName, segmentValue]);
-
- Piwik_Popover.setTitle(title);
- }
-
- var callback = function (html) {
- Piwik_Popover.setContent(html);
-
- // remove title returned from the server
- var title = box.find('h2[piwik-enriched-headline]');
- var defaultTitle = title.text();
-
- if (title.size() > 0) {
- title.remove();
- }
-
- Piwik_Popover.setTitle(defaultTitle);
-
- setPopoverTitle(apiMethod, 0);
- };
-
- // prepare loading the popover contents
- var requestParams = {
- module: 'Live',
- action: 'indexVisitorLog',
- segment: segment,
- disableLink: 1,
- small: 1,
- hideProfileLink: 1
- };
-
- $.extend(requestParams, extraParams);
-
- var ajaxRequest = new ajaxHelper();
- ajaxRequest.addParams(requestParams, 'get');
- ajaxRequest.setCallback(callback);
- ajaxRequest.setFormat('html');
- ajaxRequest.send(false);
+ SegmentedVisitorLog.show(apiMethod, segment, extraParams);
};
DataTable_RowActions_Registry.register({
diff --git a/plugins/Live/lang/be.json b/plugins/Live/lang/be.json
index 7746b4ec90d0bf3fc78d2bd5a24d1ecf906daca7..d50fa5dab972782fc2c71082845b97278cb802eb 100644
--- a/plugins/Live/lang/be.json
+++ b/plugins/Live/lang/be.json
@@ -7,7 +7,7 @@
"LinkVisitorLog": "ПаглÑдзець падрабÑзны Ð·Ð°Ð¿Ñ–Ñ Ð½Ð°Ð²ÐµÐ´Ð²Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°Ñž",
"Referrer_URL": "URL ÑпаÑыльніка",
"VisitorLog": "Ð—Ð°Ð¿Ñ–Ñ Ð½Ð°Ð²ÐµÐ´Ð²Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°Ñž",
- "VisitorLogDocumentation": "ГÑÑ‚Ð°Ñ Ñ‚Ð°Ð±Ð»Ñ–Ñ†Ð° паказвае Ð°Ð¿Ð¾ÑˆÐ½Ñ–Ñ Ð½Ð°Ð²ÐµÐ´Ð²Ð°Ð½Ð½Ñ– Ñž межах выбранага дыÑпазону дат. %s Калі дыÑпазон дат ўключае Ñž ÑÑбе ÑённÑ, то вы можаце ўбачыць вашых наведвальнікаў у Ñ€Ñжыме Ñ€Ñальнага чаÑу! %s ДадзеныÑ, ÑÐºÑ–Ñ Ð°Ð´Ð»ÑŽÑтроўваюцца тут заўÑёды \"жывыÑ\", незалежна ад таго, Ñ– Ñк чаÑта вы карыÑтаецеÑÑ cron архіваваннем.",
+ "VisitorLogDocumentation": "ГÑÑ‚Ð°Ñ Ñ‚Ð°Ð±Ð»Ñ–Ñ†Ð° паказвае Ð°Ð¿Ð¾ÑˆÐ½Ñ–Ñ Ð½Ð°Ð²ÐµÐ´Ð²Ð°Ð½Ð½Ñ– Ñž межах выбранага дыÑпазону дат. %1$s Калі дыÑпазон дат ўключае Ñž ÑÑбе ÑённÑ, то вы можаце ўбачыць вашых наведвальнікаў у Ñ€Ñжыме Ñ€Ñальнага чаÑу! %2$s ДадзеныÑ, ÑÐºÑ–Ñ Ð°Ð´Ð»ÑŽÑтроўваюцца тут заўÑёды \"жывыÑ\", незалежна ад таго, Ñ– Ñк чаÑта вы карыÑтаецеÑÑ cron архіваваннем.",
"VisitorsInRealTime": "Ðаведвальнікаў у Ñ€Ñжыме Ñ€Ñальнага чаÑу"
}
}
\ No newline at end of file
diff --git a/plugins/Live/lang/bg.json b/plugins/Live/lang/bg.json
index 97e23787e37b456e21254197333f58b84265bc1d..f25cb9e3083c5d57c292ffbd45013aeb0b82149b 100644
--- a/plugins/Live/lang/bg.json
+++ b/plugins/Live/lang/bg.json
@@ -3,7 +3,6 @@
"AveragePageGenerationTime": "Ð’ÑÑка Ñтраница отнема Ñредно по %1$s, за да бъде заредена от този поÑетител.",
"ClickToViewMoreAboutVisit": "Щракнете, за да видите повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° това поÑещение",
"ConvertedNGoals": "Конвертирани %s цели",
- "EcommerceSummaryConversions": "%1$s%2$s поръчки от общо %3$s%4$s, закупени %5$s артикули.",
"FirstVisit": "Първо поÑещение",
"GoalType": "Тип",
"HideMap": "Ñкриване на картата",
@@ -22,15 +21,14 @@
"RealTimeVisitorCount": "Броене на поÑетителите в реално време",
"Referrer_URL": "URL Референции",
"ShowMap": "покажи картата",
- "SimpleRealTimeWidget_Message": "%s и %s в поÑледното %s",
+ "SimpleRealTimeWidget_Message": "%1$s и %2$s в поÑледното %3$s",
"ViewVisitorProfile": "Преглед профила на поÑетителÑ",
"VisitedPages": "ПоÑетени Ñтраници",
"VisitorLog": "СтатиÑтика за поÑетителÑ",
- "VisitorLogDocumentation": "Тази таблица показва поÑледните поÑещениÑ, включени в избраниÑÑ‚ обхват от време. Можете да видите кога Ñе е Ñлучило поÑледното поÑещение на поÑетител, като поÑочите върху датата на поÑещението. %s Ðко обхвата на датата включва Ð´Ð½ÐµÑˆÐ½Ð¸Ñ Ð´ÐµÐ½, можете да видите вашите поÑетители в реално време! %s ИнформациÑта тук винаги е в реално време, незавиÑимо дали и колко чеÑто използвате инÑтрументите за архивиране.",
+ "VisitorLogDocumentation": "Тази таблица показва поÑледните поÑещениÑ, включени в избраниÑÑ‚ обхват от време. Можете да видите кога Ñе е Ñлучило поÑледното поÑещение на поÑетител, като поÑочите върху датата на поÑещението. %1$s Ðко обхвата на датата включва Ð´Ð½ÐµÑˆÐ½Ð¸Ñ Ð´ÐµÐ½, можете да видите вашите поÑетители в реално време! %2$s ИнформациÑта тук винаги е в реално време, незавиÑимо дали и колко чеÑто използвате инÑтрументите за архивиране.",
"VisitorProfile": "Профил на поÑетителÑ",
"VisitorsInRealTime": "ПоÑетители в реално време",
"VisitorsLastVisit": "ПоÑледното поÑещение от този поÑетител беше от преди %s дни.",
- "VisitsFrom": "%1$s%2$s поÑещениÑ%3$s от",
- "VisitSummary": "Общо прекарано време %1$s%2$s в Ñайта%3$s, и %4$sразгледани %5$s Ñтраници за %6$s поÑещениÑ.%7$s"
+ "VisitsFrom": "%1$s%2$s поÑещениÑ%3$s от"
}
}
\ No newline at end of file
diff --git a/plugins/Live/lang/ca.json b/plugins/Live/lang/ca.json
index 8fd7d2f561271230dc535a99b9c521446591e9ec..8124e7f243d6d20a93819e175dce9cc5ac7a1f18 100644
--- a/plugins/Live/lang/ca.json
+++ b/plugins/Live/lang/ca.json
@@ -9,7 +9,7 @@
"PageRefreshed": "Nombre de vegades que s'ha vist\/refrescat una pà gina",
"Referrer_URL": "URL del referent",
"VisitorLog": "Registre de visitants",
- "VisitorLogDocumentation": "Aquesta taula mostra les últimes visites pel perÃode de temps seleccionat. Podeu veure quan s'ha produït l'últim accès d'un visitant pasant per damunt de la data de visita. %s Si el perÃode de temps inclou avui, podeu veure els visitants en temps real! %s La informació que es mostra és sempre en directa, sense dependre de cada quan executeu el treball programat d'arxivat.",
+ "VisitorLogDocumentation": "Aquesta taula mostra les últimes visites pel perÃode de temps seleccionat. Podeu veure quan s'ha produït l'últim accès d'un visitant pasant per damunt de la data de visita. %1$s Si el perÃode de temps inclou avui, podeu veure els visitants en temps real! %2$s La informació que es mostra és sempre en directa, sense dependre de cada quan executeu el treball programat d'arxivat.",
"VisitorsInRealTime": "Visitants en temps real",
"VisitorsLastVisit": "L'ultima visita d'aquest visitant va ser fa %s dies."
}
diff --git a/plugins/Live/lang/cs.json b/plugins/Live/lang/cs.json
index caf56e0adc2115997a537ae243cc32fd5bf21ac5..4c5d166fcf367ee2716c52d302d083c4f81ab06c 100644
--- a/plugins/Live/lang/cs.json
+++ b/plugins/Live/lang/cs.json
@@ -1,11 +1,11 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s opuÅ¡tÄ›ných koÅ¡Ãků%3$s a %4$s opuÅ¡tÄ›ných položek %5$scelkem za %6$s%7$s.",
+ "AbandonedCartSummary": "%1$s opuÅ¡tÄ›ných koÅ¡Ãků%2$s a %3$s opuÅ¡tÄ›ných položek%4$s celkem za %5$s%6$s.",
"AveragePageGenerationTime": "Pro tohoto návÅ¡tÄ›vnÃka se každá stránka naÄetla v průmÄ›ru za %1$s.",
"CalculatedOverNPageViews": "VypoÄÃtáno na základÄ› %1$s poslednÃch zobrazenà stránek tohoto návÅ¡tÄ›vnÃka.",
"ClickToViewMoreAboutVisit": "KliknÄ›te pro zobrazenà vÃce informacà o této návÅ¡tÄ›vÄ›",
"ConvertedNGoals": "PromÄ›nÄ›no %s cÃlů",
- "EcommerceSummaryConversions": "%1$s%2$s objednávek celkem za %3$s%4$s, zakoupeno %5$s položek.",
+ "EcommerceSummaryConversions": "%1$s objednávek%2$s celkem za %3$s%4$s, zakoupeno %5$s položek%6$s.",
"FirstVisit": "Prvnà návštěva",
"GoalType": "Typ",
"HideMap": "skrýt mapu",
@@ -26,20 +26,21 @@
"RealTimeVisitorCount": "PoÄet návÅ¡tÄ›vnÃků v reálném Äase",
"Referrer_URL": "OdkazujÃcà URL",
"ShowMap": "Zobrazit mapu",
- "SimpleRealTimeWidget_Message": "%s a %s v poslednÃch %s.",
+ "SimpleRealTimeWidget_Message": "%1$s a %2$s v poslednÃch %3$s.",
"ViewVisitorProfile": "Zobrazit profil návÅ¡tÄ›vnÃka",
"VisitedPages": "NavÅ¡tÃvené stránky",
"VisitorLog": "Pohled na návÅ¡tÄ›vnÃky",
- "VisitorLogDocumentation": "Tato tabulka zobrazuje poslednà návÅ¡tÄ›vy v daném obdobÃ. NajetÃm na datum návÅ¡tÄ›vy zobrazÃte Äas, kdy tento návÅ¡tÄ›vnÃk navÅ¡tÃvil stránky naposledy. %s Pokud obdobà zahrnuje dneÅ¡ek, můžete vidÄ›t návÅ¡tÄ›vnÃky v reálném Äase! %s Zde zobrazovaná data jsou vždy živá bez ohledu na to, jak a kdy probÃhá archivaÄnà cron úloha.",
+ "VisitorLogDocumentation": "Tato tabulka zobrazuje poslednà návÅ¡tÄ›vy v daném obdobÃ. NajetÃm na datum návÅ¡tÄ›vy zobrazÃte Äas, kdy tento návÅ¡tÄ›vnÃk navÅ¡tÃvil stránky naposledy. %1$s Pokud obdobà zahrnuje dneÅ¡ek, můžete vidÄ›t návÅ¡tÄ›vnÃky v reálném Äase! %2$s Zde zobrazovaná data jsou vždy živá bez ohledu na to, jak a kdy probÃhá archivaÄnà cron úloha.",
"VisitorProfile": "Profil návÅ¡tÄ›vnÃka",
"VisitorsInRealTime": "NávÅ¡tÄ›vnÃci v reálném Äase",
"VisitorsLastVisit": "K poslednà návÅ¡tÄ›vÄ› tohoto návÅ¡tÄ›vnÃka doÅ¡lo pÅ™ed %s dny.",
"VisitsFrom": "%1$s%2$s návštěv%3$s z",
- "VisitSummary": "Strávil celkem %1$s%2$s na stránkách%3$s a %4$szobrazil %5$s stránek za %6$s návštěv.%7$s",
+ "VisitSummary": "Strávil celkem %1$s%2$s na stránkách%3$s, a zobrazil %4$s stránek%5$s při %6$s návštěvách%7$s.",
+ "VisitSummaryWithActionDetails": "Strávil celkem %1$s%2$s na stránkách%3$s, a provedl %4$s akcÃ%5$s (%6$s) pÅ™i %7$s návÅ¡tÄ›vách%8$s.",
"RowActionTooltipDefault": "Zobrazit záznam návÅ¡tÄ›vnÃků rozdÄ›lený podle tohoto řádku",
"RowActionTooltipWithDimension": "Zobrazit záznam návÅ¡tÄ›vnÃků rozdÄ›lený podle %s",
"RowActionTooltipTitle": "OtevÅ™Ãt rozdÄ›lený záznam návÅ¡tÄ›vnÃků",
- "SegmentedVisitorLogTitle": "Záznam návÅ¡tÄ›vnÃků, zobrazujÃcà návÅ¡tÄ›vy, kde %s je \"%s\"",
+ "SegmentedVisitorLogTitle": "Záznam návÅ¡tÄ›vnÃků, zobrazujÃcà návÅ¡tÄ›vy, kde %1$s je \"%2$s\"",
"OnClickPause": "%s běžÃ. KliknÄ›te pro pozastavenÃ.",
"OnClickStart": "%s je zastaven. KliknÄ›te pro spuÅ¡tÄ›nÃ."
}
diff --git a/plugins/Live/lang/da.json b/plugins/Live/lang/da.json
index 1c6af1bc30f26fc76a6b1d68eed5bfd8686e157a..e5a99a34b94d8247fdb4d8507b7b616dee8bb89b 100644
--- a/plugins/Live/lang/da.json
+++ b/plugins/Live/lang/da.json
@@ -1,11 +1,9 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s afbrudte ordrer%3$s og %4$s usolgte varer %5$stil en samlet værdi af %6$s%7$s.",
"AveragePageGenerationTime": "Det tog gennemsnitligt %1$s at indlæse hver side for denne besøgende.",
"CalculatedOverNPageViews": "Beregnet på baggrund af denne besøgendes seneste %1$s sidevisninger.",
"ClickToViewMoreAboutVisit": "Klik for at se mere information om dette besøg",
"ConvertedNGoals": "Omregnet %s mål",
- "EcommerceSummaryConversions": "%1$s%2$s ordrer til en værdi af %3$s%4$s, købte %5$s varer.",
"FirstVisit": "Første besøg",
"GoalType": "Type",
"HideMap": "skjul kort",
@@ -25,19 +23,18 @@
"RealTimeVisitorCount": "Tidstro besøgsantal",
"Referrer_URL": "Henvisning netadresse",
"ShowMap": "vis kort",
- "SimpleRealTimeWidget_Message": "%s og %s i den sidste %s.",
+ "SimpleRealTimeWidget_Message": "%1$s og %2$s i den sidste %3$s.",
"ViewVisitorProfile": "Vis besøgendes profil",
"VisitedPages": "Besøgte sider",
"VisitorLog": "Besøgslog",
- "VisitorLogDocumentation": "Tabelen viser de nyeste besøg inden for det valgte datointerval.%s Hvis datointervallet omfatter i dag, kan du se dine besøgende i virkelig tid! %s Data, der vises her er altid live, uanset hvor ofte arkiveringsjob kører.",
+ "VisitorLogDocumentation": "Tabelen viser de nyeste besøg inden for det valgte datointerval.%1$s Hvis datointervallet omfatter i dag, kan du se dine besøgende i virkelig tid! %2$s Data, der vises her er altid live, uanset hvor ofte arkiveringsjob kører.",
"VisitorProfile": "Besøgendes profil",
"VisitorsInRealTime": "Besøgende her og nu",
"VisitorsLastVisit": "Besøgendes seneste besøg var for %s dage siden.",
"VisitsFrom": "%1$s%2$s besøg %3$s fra",
- "VisitSummary": "Brugte i alt %1$s%2$s på hjemmesiden %3$s og %4$sså %5$s sider på %6$s besøg. %7$s",
"RowActionTooltipDefault": "Vis besøgslog opdelt efter denne række",
"RowActionTooltipWithDimension": "Vis besøgslog opdelt efter %s",
"RowActionTooltipTitle": "Åben segmenteret besøgslog",
- "SegmentedVisitorLogTitle": "Besøgslog viser besøg, hvor %s er \\\"%s\\\""
+ "SegmentedVisitorLogTitle": "Besøgslog viser besøg, hvor %1$s er \"%2$s\""
}
}
\ No newline at end of file
diff --git a/plugins/Live/lang/de.json b/plugins/Live/lang/de.json
index fed711aa8941e968e750de140a9e0073a4df0071..4796bbc01f2be2fa7bb51f37a15cb19fdaa339b6 100644
--- a/plugins/Live/lang/de.json
+++ b/plugins/Live/lang/de.json
@@ -1,11 +1,10 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s verlassene Warenkörbe%3$s und %4$s verlassene Produkte %5$sim Gesamtwert von %6$s%7$s.",
+ "AbandonedCartSummary": "%1$s verlassene Warenkörbe%2$s und %3$s verlassene Produkte%4$s im Gesamtwert von %5$s%6$s.",
"AveragePageGenerationTime": "Jede Seite benötigte im Durchschnitt %1$s um bei diesem Besucher zu laden.",
"CalculatedOverNPageViews": "Berechnet mithilfe der letzten %1$s Seitenansichten dieses Besuchers.",
"ClickToViewMoreAboutVisit": "Klicken Sie um nähere Informationen zu diesem Besuch zu sehen",
"ConvertedNGoals": "%s Ziele konvertiert",
- "EcommerceSummaryConversions": "%1$s%2$s Bestellungen für insgesamt %3$s%4$s, bestellte %5$s Produkte.",
"FirstVisit": "Erster Besuch",
"GoalType": "Typ",
"HideMap": "Karte ausblenden",
@@ -26,20 +25,19 @@
"RealTimeVisitorCount": "Echtzeit-Besucherzähler",
"Referrer_URL": "Herkunftsseite",
"ShowMap": "Karte einblenden",
- "SimpleRealTimeWidget_Message": "%s und %s in den letzten %s.",
+ "SimpleRealTimeWidget_Message": "%1$s und %2$s in den letzten %3$s.",
"ViewVisitorProfile": "Besucherprofil ansehen",
"VisitedPages": "Besuchte Seiten",
"VisitorLog": "Besucher-Log",
- "VisitorLogDocumentation": "Diese Tabelle zeigt die letzten Besuche innerhalb der ausgewählten Periode. Sie können sehen, wann der Besucher die Seite zuletzt besucht hat, wenn Sie die Maus über das Datum eines Besuches bewegen. %s Wenn die gewählte Periode den heutigen Tag enthält, können Sie die Besuche in Echtzeit sehen! %s Die angezeigten Daten sind immer live, egal ob und in welchem Intervall Sie den Archivierungs-Cronjob verwenden.",
+ "VisitorLogDocumentation": "Diese Tabelle zeigt die letzten Besuche innerhalb der ausgewählten Periode. Sie können sehen, wann der Besucher die Seite zuletzt besucht hat, wenn Sie die Maus über das Datum eines Besuches bewegen. %1$s Wenn die gewählte Periode den heutigen Tag enthält, können Sie die Besuche in Echtzeit sehen! %2$s Die angezeigten Daten sind immer live, egal ob und in welchem Intervall Sie den Archivierungs-Cronjob verwenden.",
"VisitorProfile": "Besucherprofil",
"VisitorsInRealTime": "Besucher in Echtzeit",
"VisitorsLastVisit": "Der letzte Besuch dieses Besuchers war vor %s Tagen.",
"VisitsFrom": "%1$s%2$s Besuche%3$s aus",
- "VisitSummary": "Verbrachte insgesamt %1$s%2$s auf der Website%3$s, und %4$sbesuchte %5$s Seiten in %6$s Besuchen.%7$s",
"RowActionTooltipDefault": "Zeige Besucher-Log aufgeteilt durch diese Zeile",
"RowActionTooltipWithDimension": "Zeige Besucher-Log segmentiert durch %s",
"RowActionTooltipTitle": "Log segmentierter Besucher öffnen",
- "SegmentedVisitorLogTitle": "Besucher-Log zeigt Besuche bei denen gilt: %s ist \\\"%s\\\"",
+ "SegmentedVisitorLogTitle": "Besucher-Log zeigt Besuche bei denen gilt: %1$s ist \"%2$s\"",
"OnClickPause": "%s ist gestartet. Klicken Sie um zu pausieren.",
"OnClickStart": "%s ist gestoppt. Klicken Sie um zu starten."
}
diff --git a/plugins/Live/lang/el.json b/plugins/Live/lang/el.json
index 53f2b0fc4a7a88955e1e7cb6a1431c9809c69643..88c51846079f5a9bae3bb849923839ced998f4d4 100644
--- a/plugins/Live/lang/el.json
+++ b/plugins/Live/lang/el.json
@@ -1,11 +1,11 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s εγκατÎλειψε καλάθια%3$s και %4$s εγκαταλελειμμÎνα αντικείμενα %5$sαξίας συνόλου %6$s%7$s.",
+ "AbandonedCartSummary": "%1$s εγκαταλελειμμÎνα καλάθια αγοÏών%2$s και %3$s εγκαταλελειμμÎνα αντικείμενα%4$s με συνολική αξία %5$s%6$s.",
"AveragePageGenerationTime": "Κάθε σελίδα χÏειάστηκε κατά μÎσο ÏŒÏο %1$s για να φοÏτωθεί στον επισκÎπτη.",
"CalculatedOverNPageViews": "Έγινε υπολογισμός βάση των τελευταίων %1$s αναγνώσεων σελίδων του επισκÎπτη.",
"ClickToViewMoreAboutVisit": "Κάντε κλικ για να δείτε πεÏισσότεÏες λεπτομÎÏειες γÏÏω από την επίσκεψη",
"ConvertedNGoals": "ΜετατÏάπηκαν %s Στόχοι",
- "EcommerceSummaryConversions": "%1$s%2$s παÏαγγελίες από σÏνολο %3$s%4$s, αγοÏάστηκαν %5$s αντικείμενα.",
+ "EcommerceSummaryConversions": "%1$s αγοÏÎÏ‚%2$s για Îνα σÏνολο %3$s%4$s, με αγοÏασμÎνα %5$s αντικείμενα%6$s.",
"FirstVisit": "Î Ïώτη επίσκεψη",
"GoalType": "ΤÏπος",
"HideMap": "απόκÏυψη χάÏτη",
@@ -26,20 +26,21 @@
"RealTimeVisitorCount": "ΑÏιθμός επισκεπτών σε Ï€Ïαγματικό χÏόνο",
"Referrer_URL": "ΔιεÏθυνση URL παÏαπομποÏ",
"ShowMap": "εμφάνιση χάÏτη",
- "SimpleRealTimeWidget_Message": "%s και %s στα τελευταία %s.",
+ "SimpleRealTimeWidget_Message": "%1$s και %2$s στα τελευταία %3$s",
"ViewVisitorProfile": "Εμφάνιση του Ï€Ïοφίλ επισκÎπτη",
"VisitedPages": "Σελίδες που Îχουν επισκεφθεί",
"VisitorLog": "ΚαταγÏαφή Επισκεπτών",
- "VisitorLogDocumentation": "Αυτός ο πίνακας δείχνει τις τελευταίες επισκÎψεις εντός της επιλεγμÎνης χÏονικής πεÏιόδου. ΜποÏείτε να δείτε πότε Îγινε η τελευταία επίσκεψη του επισκÎπτη μετακινόντας το ποντίκι στην ημεÏομηνία της επίσκεψης.%s Αν η χÏονική πεÏίοδος πεÏιλαμβάνει τη σημεÏινή μÎÏα, μποÏείτε να δείτε τους επισκÎπτες σας σε Ï€Ïαγματικό χÏόνο! %s Τα δεδομÎνα που εμφανίζονται εδώ είναι σε απευθείας μετάδοση, ανεξάÏτητα αν και πόσο συχνά χÏησιμοποιείτε την εÏγασία αÏχειοθÎτησης.",
+ "VisitorLogDocumentation": "Ο πίνακας εμφανίζει τις τελευταίες επισκÎψεις στο επιλεγμÎνο εÏÏος ημεÏομηνιών. ΜποÏείτε να δείτε την τελευταία ημεÏομηνία επίσκεψης ενός επισκÎπτη πηγαίνοντας με το ποντίκι πάνω από την ημεÏομηνία μιας επίσκεψης. %1$s Αν το εÏÏος ημεÏομηνιών πεÏιλαμβάνει και τη σημεÏινή μÎÏα, μποÏείτε να δείτε τους επισκÎπτες σε Ï€Ïαγματικό χÏόνο! %2$s Τα δεδομÎνα που εμφανίζονται είναι πάντα σε Ï€Ïαγματικό χÏόνο, ανεξάÏτητα από το αν και πόσο συχνά χÏησιμοποιείτε την αυτοματοποιημÎνη εÏγασία αÏχειοθÎτησης του cron.",
"VisitorProfile": "Î Ïοφίλ επισκÎπτη",
"VisitorsInRealTime": "ΕπισκÎπτες σε Ï€Ïαγματικό χÏόνο",
"VisitorsLastVisit": "Η τελευταία επίσκεψη Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… επισκÎπτη ήταν Ï€Ïιν από %s ημÎÏες.",
"VisitsFrom": "%1$s%2$s επισκÎψεις%3$s από",
- "VisitSummary": "Ξόδεψε συνολικά %1$s%2$s στον ιστοτόπο%3$s και %4$sείδε %5$s σελίδες σε %6$s επισκÎψεις.%7$s",
+ "VisitSummary": "Σπαταλήθηκε συνολικός χÏόνος %1$s%2$s στον ιστοτόπο %3$s και αναγνώστηκαν %4$s σελίδες%5$s σε %6$s επισκÎψεις%7$s.",
+ "VisitSummaryWithActionDetails": "Σπαταλήθηκε συνολικός χÏόνος %1$s%2$s στον ιστοτόπο %3$s και Îγιναν %4$s ενÎÏγειες%5$s (%6$s) σε %7$s επισκÎψεις%8$s.",
"RowActionTooltipDefault": "Εμφάνιση του ΗμεÏολογίου Επισκεπτών κατατμημÎνο σε αυτή τη γÏαμμή",
"RowActionTooltipWithDimension": "Εμφάνιση του ΗμεÏολογίου Επισκεπτών κατατμημÎνο με αυτό το %s",
"RowActionTooltipTitle": "Άνοιγμα κατετμημÎνου ΗμεÏολογίου Επισκεπτών",
- "SegmentedVisitorLogTitle": "ΗμεÏολόγιο επισκεπτών που δείχνει επισκÎψεις όπου το %s είναι \"%s\"",
+ "SegmentedVisitorLogTitle": "ΗμεÏολόγιο Επισκεπτών με επισκÎψεις όπου το %1$s είναι \"%2$s\"",
"OnClickPause": "Το %s Îχει ξεκινήσει. Πατήστε για παÏση.",
"OnClickStart": "Το %s είναι σταματημÎνο. Πατήστε για εκκίνηση."
}
diff --git a/plugins/Live/lang/en.json b/plugins/Live/lang/en.json
index 44526bdea4b130472f3f78733e22204db8ba19d0..b45e43da8327fa6d7ef0d49d4a792a2f748b1856 100644
--- a/plugins/Live/lang/en.json
+++ b/plugins/Live/lang/en.json
@@ -1,11 +1,11 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s abandoned carts%3$s and %4$s abandoned items %5$sworth a total of %6$s%7$s.",
+ "AbandonedCartSummary": "%1$s abandoned carts%2$s and %3$s abandoned items%4$s worth a total of %5$s%6$s.",
"AveragePageGenerationTime": "Each page took on average %1$s to load for this visitor.",
"CalculatedOverNPageViews": "Calculated using this visitor's last %1$s page views.",
"ClickToViewMoreAboutVisit": "Click to view more information about this visit",
"ConvertedNGoals": "Converted %s Goals",
- "EcommerceSummaryConversions": "%1$s%2$s orders for a total of %3$s%4$s, purchased %5$s items.",
+ "EcommerceSummaryConversions": "%1$s orders%2$s for a total of %3$s%4$s, purchased %5$s items%6$s.",
"FirstVisit": "First visit",
"GoalType": "Type",
"HideMap": "hide map",
@@ -26,20 +26,21 @@
"RealTimeVisitorCount": "Real Time Visitor Count",
"Referrer_URL": "Referrer URL",
"ShowMap": "show map",
- "SimpleRealTimeWidget_Message": "%s and %s in the last %s",
+ "SimpleRealTimeWidget_Message": "%1$s and %2$s in the last %3$s",
"ViewVisitorProfile": "View visitor profile",
"VisitedPages": "Visited pages",
"VisitorLog": "Visitor Log",
- "VisitorLogDocumentation": "This table shows the latest visits within the selected date range. You can see when a visitor's last visit occurred by hovering over the date of a visit. %s If the date range includes today, you can see your visitors real time! %s The data displayed here is always live, regardless of whether and how often you are using the archiving cron job.",
+ "VisitorLogDocumentation": "This table shows the latest visits within the selected date range. You can see when a visitor's last visit occurred by hovering over the date of a visit. %1$s If the date range includes today, you can see your visitors real time! %2$s The data displayed here is always live, regardless of whether and how often you are using the archiving cron job.",
"VisitorProfile": "Visitor profile",
"VisitorsInRealTime": "Visitors in Real-time",
"VisitorsLastVisit": "This visitor's last visit was %s days ago.",
"VisitsFrom": "%1$s%2$s visits%3$s from",
- "VisitSummary": "Spent a total of %1$s%2$s on the website%3$s, and %4$sviewed %5$s pages in %6$s visits.%7$s",
+ "VisitSummary": "Spent a total of %1$s%2$s on the website%3$s, and viewed %4$s pages%5$s in %6$s visits%7$s.",
+ "VisitSummaryWithActionDetails": "Spent a total of %1$s%2$s on the website%3$s, and performed %4$s actions%5$s (%6$s) in %7$s visits%8$s.",
"RowActionTooltipDefault": "Show Visitor Log segmented by this row",
"RowActionTooltipWithDimension": "Show Visitor Log segmented by this %s",
"RowActionTooltipTitle": "Open segmented Visitor Log",
- "SegmentedVisitorLogTitle": "Visitor Log showing visits where %s is \"%s\"",
+ "SegmentedVisitorLogTitle": "Visitor Log showing visits where %1$s is \"%2$s\"",
"OnClickPause": "%s is started. Click to pause.",
"OnClickStart": "%s is stopped. Click to start."
}
diff --git a/plugins/Live/lang/es.json b/plugins/Live/lang/es.json
index 2a67b6e426c123f7899db8cb9db64193e55c109f..dfd02688b6846ce03e715d7e2d529bd4351c453d 100644
--- a/plugins/Live/lang/es.json
+++ b/plugins/Live/lang/es.json
@@ -1,11 +1,9 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s carritos abandonados%3$s y %4$s artÃculos abandonados %5$scon un valor total de %6$s%7$s.",
"AveragePageGenerationTime": "Cada página tomó en promedio %1$s para cargar este visitante.",
"CalculatedOverNPageViews": "Calculado usando las últimas %1$s páginas vistas de este visitante.",
"ClickToViewMoreAboutVisit": "Clic para ver más información acerca de esta visita.",
"ConvertedNGoals": "%s Objetivos convertidos",
- "EcommerceSummaryConversions": "%1$s%2$s pedidos de un total de %3$s%4$s, %5$s artÃculos comprados.",
"FirstVisit": "Primer visita",
"GoalType": "Tipo",
"HideMap": "ocultar mapa",
@@ -26,20 +24,19 @@
"RealTimeVisitorCount": "Contador de visitantes en tiempo real",
"Referrer_URL": "URL de referencia",
"ShowMap": "mostrar mapa",
- "SimpleRealTimeWidget_Message": "%s y %s en los últimos %s",
+ "SimpleRealTimeWidget_Message": "%1$s y %2$s en los últimos %3$s",
"ViewVisitorProfile": "Ver perfil de visitante",
"VisitedPages": "Páginas vsitadas",
"VisitorLog": "Registro de visitantes",
- "VisitorLogDocumentation": "Esta tabla muestra las últimas visitas en el rango de fecha seleccionado. Puede ver cuando fue la última visita de un visitante posicionándose sobre la fecha de la visita. %s Si el rango de fecha incluye el dÃa actual, ¡puede ver a sus visitantes en tiempo real! %s La información mostrada aquà es siempre en tiempo real, independientemente de si y con qué frecuencia está utilizando un cron archivando.",
+ "VisitorLogDocumentation": "Esta tabla muestra las últimas visitas en el rango de fecha seleccionado. Puede ver cuando fue la última visita de un visitante posicionándose sobre la fecha de la visita. %1$s Si el rango de fecha incluye el dÃa actual, ¡puede ver a sus visitantes en tiempo real! %2$s La información mostrada aquà es siempre en tiempo real, independientemente de si y con qué frecuencia está utilizando un cron archivando.",
"VisitorProfile": "Perfil de visitante",
"VisitorsInRealTime": "Visitantes en tiempo real",
"VisitorsLastVisit": "La última visita de este visitante fue hace %s dÃas.",
"VisitsFrom": "%1$s%2$s visitas%3$s desde",
- "VisitSummary": "Pasó un total de %1$s%2$s en el sitio de internet%3$s y %4$svió %5$s paáinas en %6$s visitas.%7$s",
"RowActionTooltipDefault": "Mostrar registro de visitante segmentado por esta fila",
"RowActionTooltipWithDimension": "Mostrar registro de visitante segmentado por este %s",
"RowActionTooltipTitle": "Abrir registro de visitante segmentado",
- "SegmentedVisitorLogTitle": "Mostrando visitas del Registro de Visitante donde %s es \"%s\"",
+ "SegmentedVisitorLogTitle": "Mostrando visitas del Registro de Visitante donde %1$s es \"%2$s\"",
"OnClickPause": "%s está iniciado. Clic para pausar.",
"OnClickStart": "%s está detenido. Clic para iniciar."
}
diff --git a/plugins/Live/lang/et.json b/plugins/Live/lang/et.json
index d5543f23db34760e241f86a84d9c081aaa7c26fc..731319485cec188a0b08518d03f16fee2959875d 100644
--- a/plugins/Live/lang/et.json
+++ b/plugins/Live/lang/et.json
@@ -22,14 +22,13 @@
"RealTimeVisitorCount": "Reaalajas külastuste arv",
"Referrer_URL": "Viitaja URL",
"ShowMap": "kuva kaart",
- "SimpleRealTimeWidget_Message": "%s ja %s perioodis viimased %s",
+ "SimpleRealTimeWidget_Message": "%1$s ja %2$s perioodis viimased %3$s",
"ViewVisitorProfile": "Kuva külastaja profiil",
"VisitedPages": "Külastatud lehed",
"VisitorLog": "Külastuste logi",
"VisitorProfile": "Külastaja profiil",
"VisitorsInRealTime": "Reaalajas külastused",
"VisitorsLastVisit": "Antud külastaja viimane külastus lehel oli %s päeva tagasi.",
- "VisitsFrom": "%1$s%2$s külastust %3$s pärineb",
- "VisitSummary": "Viibis kokku %1$s%2$s veebilehel%3$s ja %4$svaatas %5$s lehte %6$s külastuse jooksul.%7$s"
+ "VisitsFrom": "%1$s%2$s külastust %3$s pärineb"
}
}
\ No newline at end of file
diff --git a/plugins/Live/lang/fa.json b/plugins/Live/lang/fa.json
index 6b027d1d77364f598b65d00a8975838c21d8badf..393c015c9830b5eae063529a3785cf947ab75f29 100644
--- a/plugins/Live/lang/fa.json
+++ b/plugins/Live/lang/fa.json
@@ -22,7 +22,7 @@
"RealTimeVisitorCount": "زمان واقعی تعداد بازدید کنندگان",
"Referrer_URL": "URL بازگشتی",
"ShowMap": "نمایش نقشه",
- "SimpleRealTimeWidget_Message": "%s و %s در اخرین %s",
+ "SimpleRealTimeWidget_Message": "%1$s و %2$s در اخرین %3$s",
"ViewVisitorProfile": "مشاهده نمایه دیدن کننده",
"VisitedPages": "صÙØات بازدید شده",
"VisitorLog": "لاگ بازدیدکننده",
diff --git a/plugins/Live/lang/fi.json b/plugins/Live/lang/fi.json
index 3d68a9466bf6127a534ea11ddb4a0198a6bd82f7..505ef58e1b646686894c0017a61a948de01592d5 100644
--- a/plugins/Live/lang/fi.json
+++ b/plugins/Live/lang/fi.json
@@ -1,11 +1,9 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s hylätyt ostoskorit%3$s ja %4$s hylätyt tuotteet %5$s,joiden arvo on yhteensä %6$s%7$s.",
"AveragePageGenerationTime": "Jokainen sivun lataaminen kesti keskimäärin %1$s tälle käyttäjälle.",
"CalculatedOverNPageViews": "Laskettu käyttämällä tämän kävijän %1$s viimeisintä nähtyä sivua.",
"ClickToViewMoreAboutVisit": "Klikkaa saadaksesi lisätietoa tästä käynnistä",
"ConvertedNGoals": "Konvertoidut %s tavoitteet",
- "EcommerceSummaryConversions": "%1$s%2$s tilausta, yhteensä %3$s%4$s, ostettuja tuotteita %5$s.",
"FirstVisit": "Ensimmäinen käynti",
"GoalType": "Tyyppi",
"HideMap": "piilota kartta",
@@ -25,15 +23,14 @@
"RealTimeVisitorCount": "Reaaliaikainen kävijälaskuri",
"Referrer_URL": "Saapumisosoite",
"ShowMap": "näytä kartta",
- "SimpleRealTimeWidget_Message": "%s ja %s viimeisessä %s",
+ "SimpleRealTimeWidget_Message": "%1$s ja %2$s viimeisessä %3$s",
"ViewVisitorProfile": "Näytä kävijäprofiili",
"VisitedPages": "Vieraillut sivut",
"VisitorLog": "Kävijän tiedot",
- "VisitorLogDocumentation": "Tämä taulukko näyttää viimeisimmät käynnit valitulta aikaväliltä. Voit nähdä, koska viimeisin käynti oli pitämällä hiirtä päiväyksen päällä. %s Jos aikaväli sisältää tämän päivän, näet kävijät reaaliaikaisena! %s Näytetyt tiedot ovat aina reaaliaikaisia, riippumatta arkistoinnista.",
+ "VisitorLogDocumentation": "Tämä taulukko näyttää viimeisimmät käynnit valitulta aikaväliltä. Voit nähdä, koska viimeisin käynti oli pitämällä hiirtä päiväyksen päällä. %1$s Jos aikaväli sisältää tämän päivän, näet kävijät reaaliaikaisena! %2$s Näytetyt tiedot ovat aina reaaliaikaisia, riippumatta arkistoinnista.",
"VisitorProfile": "Kävijäprofiili",
"VisitorsInRealTime": "Reaaliaikaiset kävijätiedot",
"VisitorsLastVisit": "Tämän kävijän edellinen käynti oli %s päivää sitten.",
- "VisitsFrom": "%1$s%2$s käyntiä%3$s lähteestä",
- "VisitSummary": "Viipyi yhteensä %1$s%2$s verkkosivulla%3$s, ja %4$skatsoi %5$s sivua %6$s käynnillä.%7$s"
+ "VisitsFrom": "%1$s%2$s käyntiä%3$s lähteestä"
}
}
\ No newline at end of file
diff --git a/plugins/Live/lang/fr.json b/plugins/Live/lang/fr.json
index ad9dd10a44cbc6f7a35041ede22247f694642c09..2dff46092b8a5183911bc95d181adb5c782c7b9f 100644
--- a/plugins/Live/lang/fr.json
+++ b/plugins/Live/lang/fr.json
@@ -1,11 +1,9 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s caddies abandonnés %3$s et %4$s articles abandonnés %5$spour une valeur totale de %6$s%7$s.",
"AveragePageGenerationTime": "Chaque page a pris une moyenne de %1$s à charger pour ce visiteur.",
"CalculatedOverNPageViews": "Calculé sur la base des %1$s dernières pages vues par ce visiteur.",
"ClickToViewMoreAboutVisit": "Cliquez pour afficher plus d'informations à propos de cette visite",
"ConvertedNGoals": "Conversion de %s objectifs",
- "EcommerceSummaryConversions": "%1$s%2$s commandes sur un total de %3$s%4$s, comptaient %5$s articles.",
"FirstVisit": "Première visite",
"GoalType": "Type",
"HideMap": "Cacher la carte",
@@ -26,20 +24,19 @@
"RealTimeVisitorCount": "Décompte des visiteurs en temps réel",
"Referrer_URL": "URL du référent",
"ShowMap": "Montrer la carte",
- "SimpleRealTimeWidget_Message": "%s et %s dans le(s)\/la dernier(s)\/ière(s) %s.",
+ "SimpleRealTimeWidget_Message": "%1$s et %2$s dans le(s)\/la dernier(s)\/ière(s) %3$s.",
"ViewVisitorProfile": "Afficher le profil du visiteur",
"VisitedPages": "Pages visitées",
"VisitorLog": "Log visiteur",
- "VisitorLogDocumentation": "Ce tableau affiche les dernières visites parmi la période sélectionnée. %s Si la période inclut aujourd'hui, vous pouvez voir vos visiteurs en temps réel! %s Les données affichées ici le sont toujours en temps réel, indépendamment de quand et à quelle fréquence vous utilisez la tâche automatique (cron) d'archivage.",
+ "VisitorLogDocumentation": "Ce tableau affiche les dernières visites parmi la période sélectionnée. %1$s Si la période inclut aujourd'hui, vous pouvez voir vos visiteurs en temps réel! %2$s Les données affichées ici le sont toujours en temps réel, indépendamment de quand et à quelle fréquence vous utilisez la tâche automatique (cron) d'archivage.",
"VisitorProfile": "Profil visiteur",
"VisitorsInRealTime": "Visiteurs en temps réel",
"VisitorsLastVisit": "La dernière visite du visiteur était il y a %s jours.",
"VisitsFrom": "%1$s%2$s visites%3$s de",
- "VisitSummary": "A passé un total de %1$s%2$s sur le site web%3$s, et %4$saffiché %5$s pages en %6$s visites.%7$s",
"RowActionTooltipDefault": "Afficher le logs des visiteurs segmenté par cette rangée",
"RowActionTooltipWithDimension": "Afficher le log des visiteurs segmenté en fonction de %s",
"RowActionTooltipTitle": "Ouvrir le log des visiteur segmenté",
- "SegmentedVisitorLogTitle": "Log des visiteurs affichant les visites ou %s est \"%s\"",
+ "SegmentedVisitorLogTitle": "Log des visiteurs affichant les visites ou %1$s est \"%2$s\"",
"OnClickPause": "%s est démarré. Cliquer pour mettre en pause.",
"OnClickStart": "%s est arrêté. Cliquer pour démarrer."
}
diff --git a/plugins/Live/lang/hi.json b/plugins/Live/lang/hi.json
index 388a3b2375c2074dd670a7bcb3530e563e7fc6ec..6982a61af3547436d67e34236a1646b1c0d775c4 100644
--- a/plugins/Live/lang/hi.json
+++ b/plugins/Live/lang/hi.json
@@ -21,14 +21,13 @@
"RealTimeVisitorCount": "रीयल टाइम आगंतà¥à¤• गणना",
"Referrer_URL": "संदरà¥à¤ URL",
"ShowMap": "नकà¥à¤¶à¤¾ दिखाना",
- "SimpleRealTimeWidget_Message": "अंतिम %s में %s और %s है.",
+ "SimpleRealTimeWidget_Message": "अंतिम %1$s में %2$s और %3$s है.",
"VisitedPages": "पृषà¥à¤ ों का दौरा",
"VisitorLog": "आगंतà¥à¤• पà¥à¤°à¤µà¥‡à¤¶",
- "VisitorLogDocumentation": "इस तालिका में चयनित तिथि सीमा के à¤à¥€à¤¤à¤° नवीनतम यातà¥à¤°à¤¾à¤“ं से पता चलता है. %sआप देख सकते हैं जब à¤à¤• आगंतà¥à¤• की अंतिम यातà¥à¤°à¤¾ की तारीख के आस-पास उतà¥à¤ªà¤¨à¥à¤¨ हà¥à¤ˆà¥¤à¤¤à¤¿à¤¥à¤¿ सीमा आज à¤à¥€ शामिल है, तो आप अपने दरà¥à¤¶à¤•à¥‹à¤‚ के वासà¥à¤¤à¤µà¤¿à¤• समय देख सकते हैं! %s यहाठपà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ डेटा की परवाह किठबिना कि कà¥à¤¯à¤¾ और कितनी बार आप पà¥à¤°à¤¾à¤²à¥‡à¤–ण कà¥à¤°à¥‰à¤¨ जॉब का उपयोग कर रहे हैं.",
+ "VisitorLogDocumentation": "इस तालिका में चयनित तिथि सीमा के à¤à¥€à¤¤à¤° नवीनतम यातà¥à¤°à¤¾à¤“ं से पता चलता है. %1$sआप देख सकते हैं जब à¤à¤• आगंतà¥à¤• की अंतिम यातà¥à¤°à¤¾ की तारीख के आस-पास उतà¥à¤ªà¤¨à¥à¤¨ हà¥à¤ˆà¥¤à¤¤à¤¿à¤¥à¤¿ सीमा आज à¤à¥€ शामिल है, तो आप अपने दरà¥à¤¶à¤•à¥‹à¤‚ के वासà¥à¤¤à¤µà¤¿à¤• समय देख सकते हैं! %2$s यहाठपà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ डेटा की परवाह किठबिना कि कà¥à¤¯à¤¾ और कितनी बार आप पà¥à¤°à¤¾à¤²à¥‡à¤–ण कà¥à¤°à¥‰à¤¨ जॉब का उपयोग कर रहे हैं.",
"VisitorProfile": "आगंतà¥à¤• रूपरेखा",
"VisitorsInRealTime": "वासà¥à¤¤à¤µà¤¿à¤• समय से आगंतà¥à¤•",
"VisitorsLastVisit": "इस आगंतà¥à¤• की आखिरी यातà¥à¤°à¤¾ %s दिन पहले की बात है.",
- "VisitsFrom": "%1$s%2$s से दौरा %3$s",
- "VisitSummary": "वेबसाइट पर %1$s%2$s का कà¥à¤² खरà¥à¤š किया%3$s, और%4$s यातà¥à¤°à¤¾à¤“ं में %5$sपृषà¥à¤ ों को %6$s देखा.%7$s"
+ "VisitsFrom": "%1$s%2$s से दौरा %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/Live/lang/hu.json b/plugins/Live/lang/hu.json
index c798b9f4864cacdd8c9a6e34a867081eeccd7ccc..c193f8734fba0558e507a3f7168e0c118d159d2d 100644
--- a/plugins/Live/lang/hu.json
+++ b/plugins/Live/lang/hu.json
@@ -7,7 +7,7 @@
"LinkVisitorLog": "Részletes látogatói adatok megtekintése",
"Referrer_URL": "Hivatkozó URL",
"VisitorLog": "Látogatói adatok",
- "VisitorLogDocumentation": "Ez a táblázat a legutolsó látogatásokat mutatja a kiválasztott időintervallumon belül.%s Ha az időintervallum tartalmazz a mai napot is, akkor élőben láthatod látogatóid! %s Az itt kijelzett adatok mindig élőek maradnak, függetlenül, hogy hogyan és milyen gyakran használod az archiválásra szolgáló cron job-ot.",
+ "VisitorLogDocumentation": "Ez a táblázat a legutolsó látogatásokat mutatja a kiválasztott időintervallumon belül.%1$s Ha az időintervallum tartalmazz a mai napot is, akkor élőben láthatod látogatóid! %2$s Az itt kijelzett adatok mindig élőek maradnak, függetlenül, hogy hogyan és milyen gyakran használod az archiválásra szolgáló cron job-ot.",
"VisitorsInRealTime": "Látogatók valós időben"
}
}
\ No newline at end of file
diff --git a/plugins/Live/lang/id.json b/plugins/Live/lang/id.json
index 3a75b77885939296996d4fdfbb11a7db4daa9698..06a528cba00c873946b8a392cdbefd02848b8f2e 100644
--- a/plugins/Live/lang/id.json
+++ b/plugins/Live/lang/id.json
@@ -11,9 +11,9 @@
"PageRefreshed": "Jumlah kali halaman ini ditampilkan \/ disegarkan berurutan.",
"RealTimeVisitorCount": "Jumlah Pengunjung Waktu Nyata",
"Referrer_URL": "URL Pengarah",
- "SimpleRealTimeWidget_Message": "%s dan %s dalam %s terakhir.",
+ "SimpleRealTimeWidget_Message": "%1$s dan %2$s dalam %3$s terakhir.",
"VisitorLog": "Catatan Pengunjung",
- "VisitorLogDocumentation": "Tabel berikut menampilkan kunjungan terakhir selama rentang tanggal yang dipilih.%s Bila hari ini termasuk dalam rentang tanggal, Anda dapat melihat pengunjung Anda dalam waktu nyata! %s Data yang ditampilkan di sini selalu ditampilkan secara langsung, tidak terpengaruh bagaimana Anda mengatur pengarsipan di tugas Cron.",
+ "VisitorLogDocumentation": "Tabel berikut menampilkan kunjungan terakhir selama rentang tanggal yang dipilih.%1$s Bila hari ini termasuk dalam rentang tanggal, Anda dapat melihat pengunjung Anda dalam waktu nyata! %2$s Data yang ditampilkan di sini selalu ditampilkan secara langsung, tidak terpengaruh bagaimana Anda mengatur pengarsipan di tugas Cron.",
"VisitorsInRealTime": "Pengunjung dalam Waktu Nyata",
"VisitorsLastVisit": "Pengunjung ini telah berkunjung %s hari yang lalu."
}
diff --git a/plugins/Live/lang/it.json b/plugins/Live/lang/it.json
index 5a00adfa52e453dc3aa35063229ec20b4adef5b2..a2ac489301356c9d6b383aa1fff17649c6c633f7 100644
--- a/plugins/Live/lang/it.json
+++ b/plugins/Live/lang/it.json
@@ -1,11 +1,11 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s carrelli abbandonati%3$s e %4$s articoli abbandonati %5$sper un valore complessivo di %6$s%7$s.",
+ "AbandonedCartSummary": "%1$s carrelli abbandonati%2$s e %3$s articoli abbandonati%4$s per un valore complessivo di %5$s%6$s.",
"AveragePageGenerationTime": "Ciascuna pagina ha richiesto una media di %1$s per essere caricata per questo visitatore.",
"CalculatedOverNPageViews": "Calcolate usando le ultime %1$s pagine visualizzate da questo visitatore.",
"ClickToViewMoreAboutVisit": "Clicca per vedere ulteriori informazioni su questa visita",
"ConvertedNGoals": "%s Obiettivi Convertiti",
- "EcommerceSummaryConversions": "%1$s%2$s ordini per un totale di %3$s%4$s, acquistati %5$s articoli.",
+ "EcommerceSummaryConversions": "%1$s ordini%2$s per un totale di %3$s%4$s, acquistati %5$s articoli%6$s.",
"FirstVisit": "Prima visita",
"GoalType": "Tipo",
"HideMap": "nascondi mappa",
@@ -26,20 +26,21 @@
"RealTimeVisitorCount": "Conteggio Visitatori in Tempo Reale",
"Referrer_URL": "URL del referrer",
"ShowMap": "mostra mappa",
- "SimpleRealTimeWidget_Message": "%s e %s negli ultimi %s",
+ "SimpleRealTimeWidget_Message": "%1$s e %2$s negli ultimi %3$s",
"ViewVisitorProfile": "Guarda profilo visitatore",
"VisitedPages": "Pagine visitate",
"VisitorLog": "Log Visitatori",
- "VisitorLogDocumentation": "Questa tabella mostra le ultime visite nell'intervallo di date selezionato. Puoi vedere quando c'è stata l'ultima visita di un visitatore posizionando il mouse sopra la data di una visita. %sSe l'intervallo di date comprende oggi, è possibile vedere in tempo reale i tuoi visitatori!%s I dati visualizzati qui sono sempre aggiornati, indipendentemente da quanto spesso usi l'archiviazione automatica.",
+ "VisitorLogDocumentation": "Questa tabella mostra le ultime visite nell'intervallo di date selezionato. Puoi vedere quando c'è stata l'ultima visita di un visitatore posizionando il mouse sopra la data di una visita. %1$sSe l'intervallo di date comprende oggi, è possibile vedere in tempo reale i tuoi visitatori!%2$s I dati visualizzati qui sono sempre aggiornati, indipendentemente da quanto spesso usi l'archiviazione automatica.",
"VisitorProfile": "Profilo visitatore",
"VisitorsInRealTime": "Visite in tempo reale",
"VisitorsLastVisit": "L'ultima visita di questo visitatore è stata %s giorni fa.",
"VisitsFrom": "%1$s%2$s visite%3$s da",
- "VisitSummary": "Passato un totale di %1$s%2$s sul sito%3$s e %4$sviste %5$s pagine in %6$s visite.%7$s",
+ "VisitSummary": "Speso un totale di %1$s%2$s sul sito%3$s, e viste %4$s pagine%5$s in %6$s visite%7$s.",
+ "VisitSummaryWithActionDetails": "Speso un totale di %1$s%2$s sul sito%3$s, ed eseguite %4$s azioni%5$s (%6$s) in %7$s visite%8$s.",
"RowActionTooltipDefault": "Mostra Log Visitatori segmentato per questa riga",
"RowActionTooltipWithDimension": "Mostra Log Visitatori segmentato per questo %s",
"RowActionTooltipTitle": "Apri il log segmentato dei visitatori",
- "SegmentedVisitorLogTitle": "Log Visitatori che mostra le visite, dove %s è \"%s\"",
+ "SegmentedVisitorLogTitle": "Log Visitatori che mostra le visite, dove %1$s è \"%2$s\"",
"OnClickPause": "%s è avviato. Clicca per mettere in pausa.",
"OnClickStart": "%s è stato arrestato. Clicca per avviare."
}
diff --git a/plugins/Live/lang/ja.json b/plugins/Live/lang/ja.json
index 1bcc483702cfe8c3832ed7c367d586a84eff658d..8e15f18ee84124b4d28a66f0622247fe6b2ba0d2 100644
--- a/plugins/Live/lang/ja.json
+++ b/plugins/Live/lang/ja.json
@@ -1,11 +1,9 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s ã¯ã‚«ãƒ¼ãƒˆ %3$s 㨠%4$s を放棄ã—〠ã¯ã‚¢ã‚¤ãƒ†ãƒ %5$s (ç·åˆ %6$s%7$s ã«å€¤ã™ã‚‹)を放棄ã—ã¾ã—ãŸã€‚",
"AveragePageGenerationTime": "ã“ã®ãƒ“ジターã®ãƒãƒ¼ãƒ‰ã«ã€å„ãƒšãƒ¼ã‚¸å¹³å‡ %1$s ã‹ã‹ã‚Šã¾ã—ãŸã€‚",
"CalculatedOverNPageViews": "ã“ã®ãƒ“ジターã®æœ€çµ‚ %1$s ページビューを利用ã—ã¦è¨ˆç®—",
"ClickToViewMoreAboutVisit": "ã“ã®è¨ªå•ã«é–¢ã™ã‚‹è©³ç´°æƒ…å ±ã‚’è¦‹ã‚‹ã«ã¯ã€ã‚¯ãƒªãƒƒã‚¯ã—ã¦ãã ã•ã„。",
"ConvertedNGoals": "変æ›ã•ã‚ŒãŸ %s 目標",
- "EcommerceSummaryConversions": "%1$s%2$s ã¯ã€åˆè¨ˆ %3$s%4$s を注文ã—ã€%5$s アイテムを購入ã—ã¾ã—ãŸã€‚",
"FirstVisit": "最åˆã®è¨ªå•",
"GoalType": "タイプ",
"HideMap": "éš ã‚ŒãŸãƒžãƒƒãƒ—",
@@ -26,20 +24,19 @@
"RealTimeVisitorCount": "リアルタイムã®ãƒ“ジター数",
"Referrer_URL": "å‚照元 URL",
"ShowMap": "地図を表示",
- "SimpleRealTimeWidget_Message": "最後㮠%s 㮠%s 㨠%s",
+ "SimpleRealTimeWidget_Message": "最後㮠%1$s 㮠%2$s 㨠%3$s",
"ViewVisitorProfile": "ビジターã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’ã¿ã‚‹",
"VisitedPages": "訪å•ã•ã‚ŒãŸãƒšãƒ¼ã‚¸",
"VisitorLog": "ビジターãƒã‚°",
- "VisitorLogDocumentation": "ã“ã®è¡¨ã¯é¸æŠžã—ãŸæ—¥ä»˜æœŸé–“内ã§æœ€æ–°ã®ãƒ“ジットã«ã¤ã„ã¦è¡¨ç¤ºã—ã¦ã„ã¾ã™ã€‚ビジットã®æ—¥ä»˜ã®ä¸Šã«ãƒžã‚¦ã‚¹ã‚’移動ã—ã¦ã€ãã®ãƒ“ジターã®æœ€å¾Œã®ãƒ“ジットãŒä½•æ—¥å‰ã‹è¦‹ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚%s 期間内ã«æœ¬æ—¥ãŒå«ã¾ã‚Œã¦ã„ã‚Œã°ã€ãƒ“ジターをリアルタイムã§è¦‹ã‚‰ã‚Œã¾ã™ï¼ %s ã“ã“ã«è¡¨ç¤ºã•ã‚Œã‚‹ã®ã¯ã€ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®ãŸã‚ã®cronジョブè¨å®šã®é »åº¦ã«é–¢ã‚らãšã€å¸¸ã«ãƒ©ã‚¤ãƒ–ã®ãƒ‡ãƒ¼ã‚¿ã§ã™ã€‚",
+ "VisitorLogDocumentation": "ã“ã®è¡¨ã¯é¸æŠžã—ãŸæ—¥ä»˜æœŸé–“内ã§æœ€æ–°ã®ãƒ“ジットã«ã¤ã„ã¦è¡¨ç¤ºã—ã¦ã„ã¾ã™ã€‚ビジットã®æ—¥ä»˜ã®ä¸Šã«ãƒžã‚¦ã‚¹ã‚’移動ã—ã¦ã€ãã®ãƒ“ジターã®æœ€å¾Œã®ãƒ“ジットãŒä½•æ—¥å‰ã‹è¦‹ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚%1$s 期間内ã«æœ¬æ—¥ãŒå«ã¾ã‚Œã¦ã„ã‚Œã°ã€ãƒ“ジターをリアルタイムã§è¦‹ã‚‰ã‚Œã¾ã™ï¼ %2$s ã“ã“ã«è¡¨ç¤ºã•ã‚Œã‚‹ã®ã¯ã€ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®ãŸã‚ã®cronジョブè¨å®šã®é »åº¦ã«é–¢ã‚らãšã€å¸¸ã«ãƒ©ã‚¤ãƒ–ã®ãƒ‡ãƒ¼ã‚¿ã§ã™ã€‚",
"VisitorProfile": "ビジターã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«",
"VisitorsInRealTime": "リアルタイムã®ãƒ“ジター",
"VisitorsLastVisit": "ã“ã®ãƒ“ジターã®æœ€æ–°ã®ãƒ“ジット㯠%s æ—¥å‰ã§ã™ã€‚",
"VisitsFrom": "ã‹ã‚‰ %1$s%2$s ㌠%3$s を訪å•",
- "VisitSummary": "ウェブサイト %3$s ã§ã€åˆè¨ˆ %1$s%2$s を消費ã—ã€%4$s 㯠%6$s 訪å•ã§ã€%5$s ページ閲覧ã—ã¾ã—ãŸã€‚%7$s",
"RowActionTooltipDefault": "ã“ã®è¡Œã§åˆ†å‰²ã•ã‚ŒãŸãƒ“ジターãƒã‚°ã‚’表示",
"RowActionTooltipWithDimension": "ã“ã® %s ã§åˆ†å‰²ã•ã‚ŒãŸãƒ“ジターãƒã‚°ã‚’表示",
"RowActionTooltipTitle": "セグメントビジターãƒã‚°ã‚’表示",
- "SegmentedVisitorLogTitle": "%s ㌠\" %s \" ã®ãƒ“ジットを示ã™ãƒ“ジターãƒã‚°",
+ "SegmentedVisitorLogTitle": "%1$s ㌠\" %2$s \" ã®ãƒ“ジットを示ã™ãƒ“ジターãƒã‚°",
"OnClickPause": "%s ãŒé–‹å§‹ã•ã‚Œã¾ã—ãŸã€‚クリックã—ã¦ä¸€æ™‚åœæ¢ã—ã¾ã™ã€‚",
"OnClickStart": "%s ã¯åœæ¢ã—ã¦ã„ã¾ã™ã€‚クリックã—ã¦é–‹å§‹ã—ã¾ã™ã€‚"
}
diff --git a/plugins/Live/lang/ko.json b/plugins/Live/lang/ko.json
index e1de77a61ff4fad7437e1fec642007982578ec82..4b843fbc8928c5065d6b9d531dd2002b8e679650 100644
--- a/plugins/Live/lang/ko.json
+++ b/plugins/Live/lang/ko.json
@@ -2,6 +2,7 @@
"Live": {
"CalculatedOverNPageViews": "해당 방문ìžì˜ %1$s 번 페ì´ì§€ ë°©ë¬¸ì„ í†µí•´ 계산ë˜ì—ˆìŠµë‹ˆë‹¤.",
"ClickToViewMoreAboutVisit": "ì´ ë°©ë¬¸ì— ëŒ€í•´ ë” ìžì„¸í•œ ì •ë³´ë¥¼ 보기 위해서 í´ë¦í•˜ì„¸ìš”.",
+ "ConvertedNGoals": "ë³€í™˜ëœ %s 목표",
"FirstVisit": "첫 방문",
"GoalType": "ìœ í˜•",
"HideMap": "ì§€ë„ ìˆ¨ê¸°ê¸°",
@@ -24,7 +25,7 @@
"ViewVisitorProfile": "ë°©ë¬¸ìž í”„ë¡œí•„ 보기",
"VisitedPages": "방문한 페ì´ì§€ë“¤",
"VisitorLog": "ë°©ë¬¸ìž ê¸°ë¡",
- "VisitorLogDocumentation": "ì´ í‘œëŠ” ì„ íƒí•œ ë‚ ì§œ 기간 ë‚´ì— ìµœì‹ ë°©ë¬¸ì— í‘œì‹œí•˜ê³ ìžˆìŠµë‹ˆë‹¤. 방문 ë‚ ì§œ 위로 마우스를 ì´ë™í•˜ê³ , ê·¸ 방문ìžì˜ 마지막 ë°©ë¬¸ì´ ë©°ì¹ ì „ì¸ì§€ ë³¼ 수 있습니다. %s ê¸°ê°„ë‚´ì— ì˜¤ëŠ˜ì´ í¬í•¨ë˜ì–´ 있으면, 방문ê°ì„ 실시간으로 ë³¼ 수 있습니다! %s ì—¬ê¸°ì— í‘œì‹œë˜ëŠ” ê²ƒì€ ë³´ê´€ì„위한 cron ìž‘ì—… ì„¤ì • 빈ë„ì— ìƒê´€ì—†ëŠ” ë¼ì´ë¸Œ ë°ì´í„°ìž…니다.",
+ "VisitorLogDocumentation": "ì´ í‘œëŠ” ì„ íƒí•œ ë‚ ì§œ 기간 ë‚´ì— ìµœì‹ ë°©ë¬¸ì— í‘œì‹œí•˜ê³ ìžˆìŠµë‹ˆë‹¤. 방문 ë‚ ì§œ 위로 마우스를 ì´ë™í•˜ê³ , ê·¸ 방문ìžì˜ 마지막 ë°©ë¬¸ì´ ë©°ì¹ ì „ì¸ì§€ ë³¼ 수 있습니다. %1$s ê¸°ê°„ë‚´ì— ì˜¤ëŠ˜ì´ í¬í•¨ë˜ì–´ 있으면, 방문ê°ì„ 실시간으로 ë³¼ 수 있습니다! %2$s ì—¬ê¸°ì— í‘œì‹œë˜ëŠ” ê²ƒì€ ë³´ê´€ì„위한 cron ìž‘ì—… ì„¤ì • 빈ë„ì— ìƒê´€ì—†ëŠ” ë¼ì´ë¸Œ ë°ì´í„°ìž…니다.",
"VisitorProfile": "ë°©ë¬¸ìž í”„ë¡œí•„",
"VisitorsInRealTime": "실시간 방문ìž",
"VisitorsLastVisit": "ì´ ë°©ë¬¸ê°ì˜ ìµœì‹ ë°©ë¬¸ì€ %sì¼ ìž…ë‹ˆë‹¤.",
diff --git a/plugins/Live/lang/lv.json b/plugins/Live/lang/lv.json
index e75bddf313e9cb1dcf46d10de7c8470aba8df9c6..8c31bcd3bd23e67010b72f4a3ea08054783d1fd5 100644
--- a/plugins/Live/lang/lv.json
+++ b/plugins/Live/lang/lv.json
@@ -7,7 +7,7 @@
"LinkVisitorLog": "ApskatÄ«t detalizÄ“tu apmeklÄ“tÄju žurnÄlu",
"Referrer_URL": "Atsauces URL",
"VisitorLog": "ApmeklÄ“tÄju žurnÄls",
- "VisitorLogDocumentation": "Å Ä« tabula atspoguļo pÄ“dÄ“jos apmeklÄ“jumus izvÄ“lÄ“tajÄ datumu intervÄlÄ. JÅ«s varat apskatÄ«t pÄ“dÄ“jo apmeklÄ“tÄja apmeklÄ“juma laiku kursoru uzbÄ«dot uz apmeklÄ“juma datuma. %s Ja datumu intervÄls iekļauj Å¡odienu, JÅ«s varat skatÄ«t apmeklÄ“tÄjus reÄllaikÄ! %s Dati, kas apskatÄmi Å¡eit, ir vienmÄ“r aktuÄlie, neatkarÄ«gi no tÄ vai lietojat arhivÄ“Å¡anas darbu, vai nÄ“.",
+ "VisitorLogDocumentation": "Å Ä« tabula atspoguļo pÄ“dÄ“jos apmeklÄ“jumus izvÄ“lÄ“tajÄ datumu intervÄlÄ. JÅ«s varat apskatÄ«t pÄ“dÄ“jo apmeklÄ“tÄja apmeklÄ“juma laiku kursoru uzbÄ«dot uz apmeklÄ“juma datuma. %1$s Ja datumu intervÄls iekļauj Å¡odienu, JÅ«s varat skatÄ«t apmeklÄ“tÄjus reÄllaikÄ! %2$s Dati, kas apskatÄmi Å¡eit, ir vienmÄ“r aktuÄlie, neatkarÄ«gi no tÄ vai lietojat arhivÄ“Å¡anas darbu, vai nÄ“.",
"VisitorsInRealTime": "ApmeklÄ“tÄji reÄllaikÄ",
"VisitorsLastVisit": "Å Ä« apmeklÄ“tÄja pÄ“dÄ“jais apmklÄ“jums bija %s dienas atpakaļ."
}
diff --git a/plugins/Live/lang/nb.json b/plugins/Live/lang/nb.json
index 2d82e3aa6363685681ca2097917c93509c90af7a..f70474f6c62a99358d209f3b371f75ed9e7209ba 100644
--- a/plugins/Live/lang/nb.json
+++ b/plugins/Live/lang/nb.json
@@ -16,7 +16,7 @@
"RealTimeVisitorCount": "Besøkstall i sanntid",
"Referrer_URL": "Henvisnings-URL",
"ShowMap": "vis kart",
- "SimpleRealTimeWidget_Message": "%s og %s i de siste %s",
+ "SimpleRealTimeWidget_Message": "%1$s og %2$s i de siste %3$s",
"ViewVisitorProfile": "Vis besøksprofil",
"VisitedPages": "Besøkte sider",
"VisitorLog": "Logg over besøkere",
diff --git a/plugins/Live/lang/nl.json b/plugins/Live/lang/nl.json
index 6258bb4bcbbe1b3c2527797abb501f24da852cf7..571ac72f2eb85294e19df68775bd3f259bcfdbf9 100644
--- a/plugins/Live/lang/nl.json
+++ b/plugins/Live/lang/nl.json
@@ -1,11 +1,9 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s achtergelaten winkelwagens%3$s en %4$s achtergelaten items %5$s, voor een totale waarde van %6$s%7$s.",
"AveragePageGenerationTime": "Elke pagina duurde gemiddeld %1$s om te laden voor deze bezoeker.",
"CalculatedOverNPageViews": "Berekend met de laatste %1$s paginaweergaves van deze bezoeker.",
"ClickToViewMoreAboutVisit": "Klik om meer informatie over dit bezoek te zien",
"ConvertedNGoals": "Behaalde %s Doelen",
- "EcommerceSummaryConversions": "%1$s%2$s aankopen voor een totaal van %3$s%4$s, kochten %5$s items aan.",
"FirstVisit": "Eerste bezoek",
"GoalType": "Type",
"HideMap": "Verberg kaart",
@@ -26,20 +24,19 @@
"RealTimeVisitorCount": "Real Time bezoekers aantal",
"Referrer_URL": "Referrer URL",
"ShowMap": "Toon kaart",
- "SimpleRealTimeWidget_Message": "%s en %s in de laatste %s",
+ "SimpleRealTimeWidget_Message": "%1$s en %2$s in de laatste %3$s",
"ViewVisitorProfile": "Bekijk bezoeker profiel",
"VisitedPages": "Bezochte pagina's",
"VisitorLog": "Bezoekerslogboek",
- "VisitorLogDocumentation": "Deze tabel toont de laatste bezoeken binnen het geselecteerde datumbereik. Je kunt zien wanneer een bezoeker zijn laatste bezoek bracht door je muis boven de datum te houden. %s Indien het datumbereik ook vandaag bevat, kun je je bezoekers zien in real time! %s De data die hier wordt getoond is steeds live, ongeacht of en wanneer je de archiving cron job gebruikt.",
+ "VisitorLogDocumentation": "Deze tabel toont de laatste bezoeken binnen het geselecteerde datumbereik. Je kunt zien wanneer een bezoeker zijn laatste bezoek bracht door je muis boven de datum te houden. %1$s Indien het datumbereik ook vandaag bevat, kun je je bezoekers zien in real time! %2$s De data die hier wordt getoond is steeds live, ongeacht of en wanneer je de archiving cron job gebruikt.",
"VisitorProfile": "Bezoekers profiel",
"VisitorsInRealTime": "Bezoekers in real-time",
"VisitorsLastVisit": "Het laatste bezoek van deze bezoekers was %s dagen geleden.",
"VisitsFrom": "%1$s%2$s bezoeken%3$s van",
- "VisitSummary": "Spendeerde in totaal %1$s%2$s op de website %3$s, en %4$sbekeek %5$s pagina's in %6$s bezoeken.%7$s",
"RowActionTooltipDefault": "Toon bezoekers log verdeeld volgens deze rij",
"RowActionTooltipWithDimension": "Toon bezoekers log verdeeld volgens %s",
"RowActionTooltipTitle": "Open gesegmenteerd Bezoekerslogboek",
- "SegmentedVisitorLogTitle": "Bezoekers log toont bezoeken waar %s is \"%s\"",
+ "SegmentedVisitorLogTitle": "Bezoekers log toont bezoeken waar %1$s is \"%2$s\"",
"OnClickPause": "%s is gestart. Klik om te pauzeren.",
"OnClickStart": "%s is gestopt. Klik om te starten."
}
diff --git a/plugins/Live/lang/nn.json b/plugins/Live/lang/nn.json
index 02bc75a3335b3dad846745d58088c9ffa121e78d..106c7300c682e087cc5c8347c5715d4f8092b5fc 100644
--- a/plugins/Live/lang/nn.json
+++ b/plugins/Live/lang/nn.json
@@ -7,7 +7,7 @@
"MorePagesNotDisplayed": "fleire sider av denne vitjaren er ikkje vist",
"PageRefreshed": "Tal på gonger denne sida var vist \/ oppdatert.",
"VisitorLog": "Vitjarlogg",
- "VisitorLogDocumentation": "Denne tabellen visar dei seinaste vitjingane innan tidsperioden. Du kan sjå den førre vitjinga til ein vitjar ved å halda peikaren over datoen til ei vitjing. %s Viss tidsperioden inkluderer idag, kan du sjå vitjarane dine i sanntid! %s Data her er alltid i sanntid, same om og kor ofte Piwik arkiverer dei.",
+ "VisitorLogDocumentation": "Denne tabellen visar dei seinaste vitjingane innan tidsperioden. Du kan sjå den førre vitjinga til ein vitjar ved å halda peikaren over datoen til ei vitjing. %1$s Viss tidsperioden inkluderer idag, kan du sjå vitjarane dine i sanntid! %2$s Data her er alltid i sanntid, same om og kor ofte Piwik arkiverer dei.",
"VisitorsInRealTime": "Vitjarar i sanntid",
"VisitorsLastVisit": "Den førre vitjinga til vitjaren var %s dagar sidan."
}
diff --git a/plugins/Live/lang/pl.json b/plugins/Live/lang/pl.json
index a0ca6439b36b5d08eb8b88b96a007620a3fe6da7..0acd83d60d8ea94e2eb26a4c224ed6a3c4b080b1 100644
--- a/plugins/Live/lang/pl.json
+++ b/plugins/Live/lang/pl.json
@@ -1,7 +1,6 @@
{
"Live": {
"ClickToViewMoreAboutVisit": "Kliknij po więcej informacji o tej wizycie",
- "EcommerceSummaryConversions": "%1$s%2$s zamówienia na łączną %3$s%4$s, zakupione %5$s elementy.",
"FirstVisit": "Pierwsza wizyta",
"GoalType": "Rodzaj",
"HideMap": "ukryj mapÄ™",
@@ -18,7 +17,7 @@
"PreviousVisitor": "Poprzedni odwiedzajÄ…cy",
"Referrer_URL": "Przysyłający adres URL",
"ShowMap": "Pokaż mapę",
- "SimpleRealTimeWidget_Message": "%s %s na %s ostatni",
+ "SimpleRealTimeWidget_Message": "%1$s %2$s na %3$s ostatni",
"ViewVisitorProfile": "Zobacz profil odwiedzajÄ…cego",
"VisitedPages": "Odwiedzone strony",
"VisitorLog": "Log odwiedzajÄ…cych",
diff --git a/plugins/Live/lang/pt-br.json b/plugins/Live/lang/pt-br.json
index a49b7707329d30d0f66d07dbb2a8d7f1f0ff8deb..7ff29e747e28271329cc762c7587d63e2a2702b4 100644
--- a/plugins/Live/lang/pt-br.json
+++ b/plugins/Live/lang/pt-br.json
@@ -1,11 +1,11 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s carrinhos abandonados%3$s e %4$s itens abandonados %5$svalem um total de %6$s%7$s.",
+ "AbandonedCartSummary": "%1$s carrinhos abandonados%2$s e %3$s itens abandonados%4$s valendo um total de %5$s%6$s.",
"AveragePageGenerationTime": "Cada página levou em média %1$s para carregar para este visitante.",
"CalculatedOverNPageViews": "Calculado usando as últimas %1$s exibições de página deste visitante.",
"ClickToViewMoreAboutVisit": "Clique para ver mais informações sobre esta visita",
"ConvertedNGoals": "%s Metas convertidas",
- "EcommerceSummaryConversions": "%1$s%2$s pedidos de um total de %3$s%4$s, comprados %5$s itens.",
+ "EcommerceSummaryConversions": "%1$s pedidos%2$s de um total de %3$s%4$s, comprados %5$s itens%6$s.",
"FirstVisit": "Primeiro visitante",
"GoalType": "Tipo",
"HideMap": "esconder mapa",
@@ -26,20 +26,21 @@
"RealTimeVisitorCount": "Contagem de visitantes em tempo real",
"Referrer_URL": "URL do Referenciador",
"ShowMap": "mostrar mapa",
- "SimpleRealTimeWidget_Message": "%s e %s na última %s.",
+ "SimpleRealTimeWidget_Message": "%1$s e %2$s na última %3$s.",
"ViewVisitorProfile": "Ver o perfil do visitante",
"VisitedPages": "Páginas visitadas",
"VisitorLog": "Log de visitantes",
- "VisitorLogDocumentation": "Esta tabela mostra as últimas visitas dentro do perÃodo selecionado. Você pode ver quando a última visita de um visitante ocorreu passando o mouse sobre a data da visita. %s se o intervalo de data incluir hoje, você pode ver os seus visitantes em tempo real! %s Os dados exibidos aqui são sempre ao vivo, independentemente de estar usando o arquivamento agendado por cron.",
+ "VisitorLogDocumentation": "Esta tabela mostra as últimas visitas dentro do perÃodo selecionado. Você pode ver quando a última visita de um visitante ocorreu passando o mouse sobre a data da visita. %1$s se o intervalo de data incluir hoje, você pode ver os seus visitantes em tempo real! %2$s Os dados exibidos aqui são sempre ao vivo, independentemente de estar usando o arquivamento agendado por cron.",
"VisitorProfile": "Páginas visitadas",
"VisitorsInRealTime": "Visitantes em tempo real",
"VisitorsLastVisit": "A última visita deste visitante foi a %s dias atrás.",
"VisitsFrom": "%1$s%2$s visitas%3$s de",
- "VisitSummary": "Passou um total de %1$s%2$s no site%3$s, e %4$spáginas %5$s vistas em %6$s visitas.%7$s",
+ "VisitSummary": "Passou um total de %1$s%2$s no website%3$s, e viu %4$s páginas%5$s em %6$s visitas%7$s.",
+ "VisitSummaryWithActionDetails": "Passou um total de %1$s%2$s no website%3$s, e realizou %4$s ações%5$s (%6$s) em %7$s visitas%8$s.",
"RowActionTooltipDefault": "Mostrar Log de Visitantes segmentado por esta linha",
"RowActionTooltipWithDimension": "Mostrar Log de Visitantes segmentado por este %s",
"RowActionTooltipTitle": "Abrir Log de Visitantes segmentado",
- "SegmentedVisitorLogTitle": "Log de Visitantes mostrando visitas onde %s é \"%s\"",
+ "SegmentedVisitorLogTitle": "Log de visitante mostrando visitas onde %1$s é \"%2$s\"",
"OnClickPause": "%s iniciou. Clique para pausar.",
"OnClickStart": "%s parou. Clique para iniciar."
}
diff --git a/plugins/Live/lang/pt.json b/plugins/Live/lang/pt.json
index f91c27b7540e4431395b4a5714fed1184862df0b..42a4d29d797d82dd1cfd0a0d296995a66066079b 100644
--- a/plugins/Live/lang/pt.json
+++ b/plugins/Live/lang/pt.json
@@ -7,7 +7,7 @@
"LinkVisitorLog": "Ver registo de visitantes detalhado",
"Referrer_URL": "Endereço do Referente",
"VisitorLog": "Registo de Visitantes",
- "VisitorLogDocumentation": "Esta tabela mostra as últimas visitas dentro do perÃodo selecionado. Você pode ver quando a última visita de um visitante ocorreu passando o cursor sobre os dados de uma visita. %s Se o intervalo de datas incluir hoje, você pode ver os seus visitantes em tempo real! %s Os dados apresentados aqui são sempre em tempo real, independentemente de quantas vezes você está usando o cron job de arquivamento.",
+ "VisitorLogDocumentation": "Esta tabela mostra as últimas visitas dentro do perÃodo selecionado. Você pode ver quando a última visita de um visitante ocorreu passando o cursor sobre os dados de uma visita. %1$s Se o intervalo de datas incluir hoje, você pode ver os seus visitantes em tempo real! %2$s Os dados apresentados aqui são sempre em tempo real, independentemente de quantas vezes você está usando o cron job de arquivamento.",
"VisitorsInRealTime": "Visitantes em Tempo Real",
"VisitorsLastVisit": "A última visita do utilizador ocorreu à %s dias atrás."
}
diff --git a/plugins/Live/lang/ro.json b/plugins/Live/lang/ro.json
index 8df0a174bbb3ac3d116bf3f3339debb2f7725fc1..673eb72363508a64a35d584cd8a5389f43b51f9c 100644
--- a/plugins/Live/lang/ro.json
+++ b/plugins/Live/lang/ro.json
@@ -1,11 +1,9 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s casute abandonate%3$s si %4$s obiective abandonte %5$svaloare total de %6$s%7$s.",
"AveragePageGenerationTime": "Fiecare pagină a avut, în medie %1$s pentru a încărca pentru acest vizitator.",
"CalculatedOverNPageViews": "Calculat folosind aceast vizitator trecut %1$s pagini văzute.",
"ClickToViewMoreAboutVisit": "Click pentru a vedea mai multe informații despre această vizită",
"ConvertedNGoals": "Convertit %s Goluri",
- "EcommerceSummaryConversions": "%1$s%2$s comenzi pentru un total de %3$s%4$s, produse achizitionate %5$s .",
"FirstVisit": "Prima vizita",
"GoalType": "Tip",
"HideMap": "ascunde hartă",
@@ -25,15 +23,14 @@
"RealTimeVisitorCount": "Numărul vizitatori în timp real",
"Referrer_URL": "Referal URL",
"ShowMap": "Arata harta",
- "SimpleRealTimeWidget_Message": "%s și %s în ultimele %s",
+ "SimpleRealTimeWidget_Message": "%1$s și %2$s în ultimele %3$s",
"ViewVisitorProfile": "Vezi profilul vizitatorului",
"VisitedPages": "Pagini vizitate",
"VisitorLog": "Registrul vizitatorilor",
- "VisitorLogDocumentation": "Acest tabel arată cele mai recente vizite în intervalul de date selectat. Puteți vedea când a fost ultima vizita a unui vizitator a avut loc. %s În cazul în care intervalul de date include astăzi, puteți vedea vizitatorii dvs. în timp real! %s Datele afișate aici sunt mereu actualizate, indiferent cand si cât de des folosiți arhivarea cron.",
+ "VisitorLogDocumentation": "Acest tabel arată cele mai recente vizite în intervalul de date selectat. Puteți vedea când a fost ultima vizita a unui vizitator a avut loc. %1$s În cazul în care intervalul de date include astăzi, puteți vedea vizitatorii dvs. în timp real! %2$s Datele afișate aici sunt mereu actualizate, indiferent cand si cât de des folosiți arhivarea cron.",
"VisitorProfile": "Profilul vizitator",
"VisitorsInRealTime": "Vizitatori în timp real",
"VisitorsLastVisit": "Ultima vizită a acestui vizitator a avut loc cu %s zile în urmă.",
- "VisitsFrom": "%1$s%2$s vizite%3$s de la",
- "VisitSummary": "A petrecut un total de %1$s%2$s pe site-ul%3$s și%4$s vizionari %5$s paginile %6$s în vizite de .%7$s"
+ "VisitsFrom": "%1$s%2$s vizite%3$s de la"
}
}
\ No newline at end of file
diff --git a/plugins/Live/lang/ru.json b/plugins/Live/lang/ru.json
index 31388029f4a69f576426a51b885a98d0c61e3d1b..96f0c998900d786cd38803ec9a92bb214ef7569a 100644
--- a/plugins/Live/lang/ru.json
+++ b/plugins/Live/lang/ru.json
@@ -24,18 +24,17 @@
"RealTimeVisitorCount": "Счётчик поÑетителей в реальном времени",
"Referrer_URL": "URL иÑточника",
"ShowMap": "показать карту",
- "SimpleRealTimeWidget_Message": "%s и %s за поÑледние %s",
+ "SimpleRealTimeWidget_Message": "%1$s и %2$s за поÑледние %3$s",
"ViewVisitorProfile": "ПоÑмотреть профиль поÑетителÑ",
"VisitedPages": "ПоÑещённые Ñтраницы",
"VisitorLog": "Журнал поÑетителей",
- "VisitorLogDocumentation": "Ðта таблица показывает поÑледние поÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð·Ð° выбранный период. Ð’Ñ‹ можете видеть поÑледнее поÑещение Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ наведении мыши на дату поÑещениÑ. %s ЕÑли период включает ÑегоднÑшний день, вы можете наблюдать за поÑетителÑми в реальном времени! %s Данные здеÑÑŒ вÑегда отображаютÑÑ Ð² режиме реального времени вне завиÑимоÑти от того, как чаÑто вы иÑпользуете архивацию по крону.",
+ "VisitorLogDocumentation": "Ðта таблица показывает поÑледние поÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð·Ð° выбранный период. Ð’Ñ‹ можете видеть поÑледнее поÑещение Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ наведении мыши на дату поÑещениÑ. %1$s ЕÑли период включает ÑегоднÑшний день, вы можете наблюдать за поÑетителÑми в реальном времени! %2$s Данные здеÑÑŒ вÑегда отображаютÑÑ Ð² режиме реального времени вне завиÑимоÑти от того, как чаÑто вы иÑпользуете архивацию по крону.",
"VisitorProfile": "Профиль поÑетителÑ",
"VisitorsInRealTime": "ПоÑетители в реальном времени",
"VisitorsLastVisit": "ПоÑледнее поÑещение Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð±Ñ‹Ð»Ð¾ %s дней назад.",
"VisitsFrom": "%1$s%2$s визитов%3$s от",
- "VisitSummary": "Провёл в общей ÑложноÑти %1$s%2$s на Ñтом Ñайте%3$s, и %4$sпроÑмотрел %5$s Ñтраниц за %6$s поÑещений%7$s.",
"RowActionTooltipDefault": "Показать журнал поÑетителей, Ñегментированный по Ñтой Ñтроке",
"RowActionTooltipTitle": "Открыть Ñегментированный журнал поÑетителей",
- "SegmentedVisitorLogTitle": "ПроÑмотр поÑещений где %s равно \\\"%s\\\""
+ "SegmentedVisitorLogTitle": "ПроÑмотр поÑещений где %1$s равно \"%2$s\""
}
}
\ No newline at end of file
diff --git a/plugins/Live/lang/sk.json b/plugins/Live/lang/sk.json
index 6f57149a23da3e5ead0359188a0c930df889428c..7913b725cd1500e55e0e913cfd076118ca25d15f 100644
--- a/plugins/Live/lang/sk.json
+++ b/plugins/Live/lang/sk.json
@@ -15,7 +15,7 @@
"PreviousVisitor": "Predchádzajúci návÅ¡tevnÃk",
"RealTimeVisitorCount": "Sledovanie návÅ¡tev v reálnom Äase",
"Referrer_URL": "ReferenÄné URL",
- "SimpleRealTimeWidget_Message": "%s a %s v posledných %s",
+ "SimpleRealTimeWidget_Message": "%1$s a %2$s v posledných %3$s",
"VisitorLog": "Záznam návÅ¡tevnÃka",
"VisitorsInRealTime": "NávÅ¡tevnÃci v reálnom Äase"
}
diff --git a/plugins/Live/lang/sq.json b/plugins/Live/lang/sq.json
index dc43082b48a3066aa8162bcd2c9361b5f21ce482..f1b14ea1d9e1d05eea381f7c7138031dc8ac4241 100644
--- a/plugins/Live/lang/sq.json
+++ b/plugins/Live/lang/sq.json
@@ -8,7 +8,7 @@
"PageRefreshed": "Sa herë rresht është parë \/ rifreskuar kjo faqew.",
"Referrer_URL": "URL Referuesi",
"VisitorLog": "Regjistër Vizitori",
- "VisitorLogDocumentation": "Kjo tabelë tregon vizitat e fundit brenda intervalit kohor të përzgjedhur. Se kur u bë vizita e fundit nga një vizitor mund ta shihni duke kaluar kursorin përsipër datës së një vizite. %s Nëse intervali kohor e përfshin ditën e sotme, mund t’i shihni vizitorët aty për aty! %s Të dhënat e shfaqura këtu janë përherë më të rejat, pavarësisht nëse e përdorni a jo dhe se sa shpesh funksionin cron për arkivim.",
+ "VisitorLogDocumentation": "Kjo tabelë tregon vizitat e fundit brenda intervalit kohor të përzgjedhur. Se kur u bë vizita e fundit nga një vizitor mund ta shihni duke kaluar kursorin përsipër datës së një vizite. %1$s Nëse intervali kohor e përfshin ditën e sotme, mund t’i shihni vizitorët aty për aty! %2$s Të dhënat e shfaqura këtu janë përherë më të rejat, pavarësisht nëse e përdorni a jo dhe se sa shpesh funksionin cron për arkivim.",
"VisitorsInRealTime": "Vizitorë në Kohë Reale",
"VisitorsLastVisit": "Vizita e fundit e këtij vizitori ndodhi %s ditë më parë."
}
diff --git a/plugins/Live/lang/sr.json b/plugins/Live/lang/sr.json
index f45b67a510512c33edd7247c16f658836d03a367..d84b91cfa1674da2184c582be216fedead487e4f 100644
--- a/plugins/Live/lang/sr.json
+++ b/plugins/Live/lang/sr.json
@@ -1,11 +1,9 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s napuštenih koripi%3$s i %4$s napuštenih artikala %5$sukupne vrednosti %6$s%7$s.",
"AveragePageGenerationTime": "Ovom korisniku je za svaku stranicu u proseku potrebno %1$s kako bi se uÄitala.",
"CalculatedOverNPageViews": "IzraÄunato na osnovu poslednjih %1$s prikaza stranica ovog korisnika",
"ClickToViewMoreAboutVisit": "Kliknite kako biste videli više informacija o ovoj poseti.",
"ConvertedNGoals": "Ispunjeno ciljeva: %s",
- "EcommerceSummaryConversions": "%1$s%2$s narudžbina od ukupno %3$s%4$s, naruÄeno %5$s artikala.",
"FirstVisit": "Prva poseta",
"GoalType": "Tip",
"HideMap": "sakrij mapu",
@@ -26,20 +24,19 @@
"RealTimeVisitorCount": "BrojaÄ posetilaca u realnom vremenu",
"Referrer_URL": "Referenca",
"ShowMap": "prikaži mapu",
- "SimpleRealTimeWidget_Message": "%s i %s u poslednjih %s.",
+ "SimpleRealTimeWidget_Message": "%1$s i %2$s u poslednjih %3$s.",
"ViewVisitorProfile": "Profil novog posetioca",
"VisitedPages": "Posećene stranice",
"VisitorLog": "Zapis poseta",
- "VisitorLogDocumentation": "Ova tabela prikazuje poslednje posete unutar izabranog vremenskog opsega. Možete videti poslednju posetu pomeranjem miÅ¡a preko datuma posete. %s Ako vremenski opseg obuhvata i danaÅ¡nji dan, možete videti vaÅ¡e posetioce u realnom vremenu! %s Podaci ovde prikazani su uvek u realnom vremenu bez obzira na to koliko Äesto koristite cron.",
+ "VisitorLogDocumentation": "Ova tabela prikazuje poslednje posete unutar izabranog vremenskog opsega. Možete videti poslednju posetu pomeranjem miÅ¡a preko datuma posete. %1$s Ako vremenski opseg obuhvata i danaÅ¡nji dan, možete videti vaÅ¡e posetioce u realnom vremenu! %2$s Podaci ovde prikazani su uvek u realnom vremenu bez obzira na to koliko Äesto koristite cron.",
"VisitorProfile": "Profil posetioca",
"VisitorsInRealTime": "Posetioci u realnom vremenu",
"VisitorsLastVisit": "Poslednja poseta je bila pre %s dana.",
"VisitsFrom": "%1$s%2$s poseta%3$s sa",
- "VisitSummary": "Utrošeno ukupno %1$s%2$s na sajtu%3$s, %4$sprikazano %5$s stranica u %6$s poseta.%7$s",
"RowActionTooltipDefault": "Prikaži zapis poseta podeljen ovim redom",
"RowActionTooltipWithDimension": "Prikaži zapis poseta podeljen %s",
"RowActionTooltipTitle": "Otvori podeljeni zapis psoeta",
- "SegmentedVisitorLogTitle": "Zapis poseta prikazuje posete kod kojih %s je \"%s\"",
+ "SegmentedVisitorLogTitle": "Zapis poseta prikazuje posete kod kojih %1$s je \"%2$s\"",
"OnClickPause": "%s je pokrenut. Kliknite za pauzu.",
"OnClickStart": "%s je zaustavljen. Kliknite za start."
}
diff --git a/plugins/Live/lang/sv.json b/plugins/Live/lang/sv.json
index 26610f850f2d0eaab642586140e6f676e6a4b7fe..7e4b82f6d21ed4ffa290dc6ac87f8a6fd09bd4f0 100644
--- a/plugins/Live/lang/sv.json
+++ b/plugins/Live/lang/sv.json
@@ -1,11 +1,10 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s övergivna korgar %3$s och %4$s övergivna varor %5$still ett värde av totalt %6$s%7$s.",
+ "AbandonedCartSummary": "%1$s övergivna varukorgar%2$s och %3$s övergivna varor%4$s värda totalt %5$s%6$s.",
"AveragePageGenerationTime": "Varje sida tog i genomsnitt %1$s att ladda för besökaren.",
"CalculatedOverNPageViews": "Beräknat på denna besöakrens senaste %1$s sidvisningar.",
"ClickToViewMoreAboutVisit": "Klicka för mer information om det här besöket",
"ConvertedNGoals": "Konverteringar %s MÃ¥l",
- "EcommerceSummaryConversions": "%1$s%2$s ordrar för totalt %3$s%4$s, köpt %5$s varor.",
"FirstVisit": "Första besöket",
"GoalType": "Sort",
"HideMap": "Dölj mapp",
@@ -25,15 +24,14 @@
"RealTimeVisitorCount": "Besöksräknare i realtid",
"Referrer_URL": "Hänvisningsadress",
"ShowMap": "Visa mapp",
- "SimpleRealTimeWidget_Message": "%s och %s dom senaste %s.",
+ "SimpleRealTimeWidget_Message": "%1$s och %2$s dom senaste %3$s.",
"ViewVisitorProfile": "Ny besöksprofil",
"VisitedPages": "Besökta sidor",
"VisitorLog": "Besökslogg",
- "VisitorLogDocumentation": "Denna tabell visar de senaste besök inom det valda datumintervallet. %s Om datumet inkluderar idag kan du se dina besökare i realtid! %s data som visas här är alltid live, oavsett om och hur ofta du använder cron-jobb för arkivering.",
+ "VisitorLogDocumentation": "Denna tabell visar de senaste besök inom det valda datumintervallet. %1$s Om datumet inkluderar idag kan du se dina besökare i realtid! %2$s data som visas här är alltid live, oavsett om och hur ofta du använder cron-jobb för arkivering.",
"VisitorProfile": "Besöksprofil",
"VisitorsInRealTime": "Besökare i realtid",
"VisitorsLastVisit": "Denna besökares senaste besök var %s dagar sedan.",
- "VisitsFrom": "%1$s%2$s besökta %3$s från",
- "VisitSummary": "Spenderade totalt %1$s%2$s på den här webbsidan%3$s, och %4$svar inne på %5$s sidor under %6$sbesöket. %7$s"
+ "VisitsFrom": "%1$s%2$s besökta %3$s från"
}
}
\ No newline at end of file
diff --git a/plugins/Live/lang/th.json b/plugins/Live/lang/th.json
index cc8ca1e901a44de0a35e3743b32ee433e39866f1..40c9fd4ef82450f0e2adeee69fe2d4dfc490e75e 100644
--- a/plugins/Live/lang/th.json
+++ b/plugins/Live/lang/th.json
@@ -7,7 +7,7 @@
"LinkVisitorLog": "ดูไฟล์ประวัติผู้เข้าชม",
"Referrer_URL": "ที่มา URL",
"VisitorLog": "ประวัติผู้เข้าชม",
- "VisitorLogDocumentation": "ตารางนี้à¹à¸ªà¸”งà¸à¸²à¸£à¹€à¸‚้าชมล่าสุดภายในช่วงวันที่ที่เลืà¸à¸ %s หาà¸à¸Šà¹ˆà¸§à¸‡à¸§à¸±à¸™à¸—ี่ที่รวมถึงวันนี้คุณสามารถเห็นผู้เข้าชมขà¸à¸‡à¸„ุณเวลาจริง! %s ข้à¸à¸¡à¸¹à¸¥à¸—ี่à¹à¸ªà¸”งที่นี่à¸à¸¢à¸¹à¹ˆà¹€à¸ªà¸¡à¸à¹‚ดยไม่คำนึงว่าà¹à¸¥à¸°à¸„วามถี่ที่คุณà¸à¸³à¸¥à¸±à¸‡à¹ƒà¸Šà¹‰ cron job",
+ "VisitorLogDocumentation": "ตารางนี้à¹à¸ªà¸”งà¸à¸²à¸£à¹€à¸‚้าชมล่าสุดภายในช่วงวันที่ที่เลืà¸à¸ %1$s หาà¸à¸Šà¹ˆà¸§à¸‡à¸§à¸±à¸™à¸—ี่ที่รวมถึงวันนี้คุณสามารถเห็นผู้เข้าชมขà¸à¸‡à¸„ุณเวลาจริง! %2$s ข้à¸à¸¡à¸¹à¸¥à¸—ี่à¹à¸ªà¸”งที่นี่à¸à¸¢à¸¹à¹ˆà¹€à¸ªà¸¡à¸à¹‚ดยไม่คำนึงว่าà¹à¸¥à¸°à¸„วามถี่ที่คุณà¸à¸³à¸¥à¸±à¸‡à¹ƒà¸Šà¹‰ cron job",
"VisitorsInRealTime": "ผู้เข้าชมในเวลาจริง"
}
}
\ No newline at end of file
diff --git a/plugins/Live/lang/tl.json b/plugins/Live/lang/tl.json
index 75df40235b87dedd2762066338c6e8a31abb77a3..81fdec8e68766fedd3065dcffb69685d6784d7dd 100644
--- a/plugins/Live/lang/tl.json
+++ b/plugins/Live/lang/tl.json
@@ -1,6 +1,5 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s inabandunang mga cart%3$s at %4$s inabandunang mga item %5$sna may halagang aabot sa total na %6$s%7$s.",
"AveragePageGenerationTime": "Bawat pahina ay umaabot ng %1$s upang mag-load para sa bisita.",
"CalculatedOverNPageViews": "Kinakalkula gamit ang huling %1$s page view ng bisita na ito.",
"ClickToViewMoreAboutVisit": "Pindutin dito upang makita ang marami pang impormasyon tungkol sa pagbisita.",
@@ -23,11 +22,11 @@
"RealTimeVisitorCount": "Real Time na bilang ng mga bisita",
"Referrer_URL": "Referrer URL",
"ShowMap": "ipakita ang mapa",
- "SimpleRealTimeWidget_Message": "%s at %s sa nakaraang %s",
+ "SimpleRealTimeWidget_Message": "%1$s at %2$s sa nakaraang %3$s",
"ViewVisitorProfile": "Tingnan ang profile ng bisita",
"VisitedPages": "Binisitang mga pahina",
"VisitorLog": "Log ng bisita",
- "VisitorLogDocumentation": "Ang table na ito ay nagpapakita ng mga pinakabagong mga pagbisita sa loob ng napiling hanay ng petsa. Maaari mong makita kung kelan ang huling pag bisita ng iyong bisita sa pamamagitan ng pag hover sa petsa ng pag bisita. %s Kung ang sakop ng petsa ay kaasama ngayon makikita mo ang lahat ng iyong mga bisita real time! %s Ang datus ng pinapakita dito ay laging live hindi alintana at kung gaano kadalas mo ginagamit ang archiving cron-job.",
+ "VisitorLogDocumentation": "Ang table na ito ay nagpapakita ng mga pinakabagong mga pagbisita sa loob ng napiling hanay ng petsa. Maaari mong makita kung kelan ang huling pag bisita ng iyong bisita sa pamamagitan ng pag hover sa petsa ng pag bisita. %1$s Kung ang sakop ng petsa ay kaasama ngayon makikita mo ang lahat ng iyong mga bisita real time! %2$s Ang datus ng pinapakita dito ay laging live hindi alintana at kung gaano kadalas mo ginagamit ang archiving cron-job.",
"VisitorProfile": "profile ng Bisita",
"VisitorsInRealTime": "Real time na pagbisita",
"VisitorsLastVisit": "Ang huling bisita ng bisitang ito ay %s araw na ang nakakalipas.",
diff --git a/plugins/Live/lang/vi.json b/plugins/Live/lang/vi.json
index 10697bbe84fe2f638f3f94383e1b5176b83929b1..56babf205bbbd83ab0ec9a12690969d08127e489 100644
--- a/plugins/Live/lang/vi.json
+++ b/plugins/Live/lang/vi.json
@@ -1,11 +1,9 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s giỠhà ng bị quên %3$s và %4$s mặt hà ng bị quên %5$s trị giá tổng cộng của %6$s%7$s.",
"AveragePageGenerationTime": "Má»—i trang mất trung bình %1$s để nạp cho khách truy cáºp nà y.",
"CalculatedOverNPageViews": "Việc tÃnh toán sá» dụng lượt xem trang %1$s cuối cùng của khách truy cáºp nà y.",
"ClickToViewMoreAboutVisit": "Click để xem thêm thông tin vá» lượt truy cáºp nà y",
"ConvertedNGoals": "%s Mục tiêu đã được chuyển đổi",
- "EcommerceSummaryConversions": "%1$s%2$s đơn đặt hà ng với tổng số %3$s%4$s, %5$s các mặt hà ng đã mua.",
"FirstVisit": "Lượt truy cáºp đầu tiên",
"GoalType": "Kiểu",
"HideMap": "Ẩn bản đồ",
@@ -25,15 +23,14 @@
"RealTimeVisitorCount": "Số lượt khách truy cáºp thá»i gian thá»±c",
"Referrer_URL": "URL tham chiếu",
"ShowMap": "Hiện thị bản đồ",
- "SimpleRealTimeWidget_Message": "%s và %s trong %s cuối cùng",
+ "SimpleRealTimeWidget_Message": "%1$s và %2$s trong %3$s cuối cùng",
"ViewVisitorProfile": "Xem hồ sÆ¡ khách truy cáºp",
"VisitedPages": "Các trang đã truy cáºp",
"VisitorLog": "Khách truy cáºp đăng nháºp",
- "VisitorLogDocumentation": "Bảng nà y cho thấy lần truy cáºp má»›i nhất trong phạm vi ngà y đã chá»n. Bạn có thể thấy khi má»™t lượt truy cáºp cuối của khách truy cáºp đã xảy ra bằng cách lÆ°á»›t qua ngà y của má»™t truy cáºp.%s Nếu phạm vi ngà y bao gồm ngà y hôm nay, bạn có thể thấy khách truy cáºp thá»i gian thá»±c của bạn! %s Dữ liệu hiển thị ở đây là luôn luôn sống, bất kể lúc nà o và cách bạn thÆ°á»ng Ä‘ang sá» dụng công việc lÆ°u trữ theo định kỳ.",
+ "VisitorLogDocumentation": "Bảng nà y cho thấy lần truy cáºp má»›i nhất trong phạm vi ngà y đã chá»n. Bạn có thể thấy khi má»™t lượt truy cáºp cuối của khách truy cáºp đã xảy ra bằng cách lÆ°á»›t qua ngà y của má»™t truy cáºp.%1$s Nếu phạm vi ngà y bao gồm ngà y hôm nay, bạn có thể thấy khách truy cáºp thá»i gian thá»±c của bạn! %2$s Dữ liệu hiển thị ở đây là luôn luôn sống, bất kể lúc nà o và cách bạn thÆ°á»ng Ä‘ang sá» dụng công việc lÆ°u trữ theo định kỳ.",
"VisitorProfile": "Hồ sơ cá nhân của khách",
"VisitorsInRealTime": "Các khách truy cáºp trong thá»i gian thá»±c",
"VisitorsLastVisit": "Lần truy cáºp trÆ°á»›c của khách truy cáºp nà y là %s ngà y trÆ°á»›c.",
- "VisitsFrom": "%1$s%2$s lượt truy cáºp %3$s từ",
- "VisitSummary": "Äã dà nh tổng cá»™ng %1$s%2$s trên website %3$s, và %4$s đã xem %5$s trang trong %6$s lượt truy cáºp.%7$s"
+ "VisitsFrom": "%1$s%2$s lượt truy cáºp %3$s từ"
}
}
\ No newline at end of file
diff --git a/plugins/Live/lang/zh-cn.json b/plugins/Live/lang/zh-cn.json
index b3e36afbe4fe47e75c85c5d166367c700263be20..54e6ac56f120c3bcf2b868ae66a52eea2088714d 100644
--- a/plugins/Live/lang/zh-cn.json
+++ b/plugins/Live/lang/zh-cn.json
@@ -1,11 +1,9 @@
{
"Live": {
- "AbandonedCartSummary": "%1$s%2$s 个丢弃的è´ç‰©è½¦%3$s å’Œ %4$s ä¸ªä¸¢å¼ƒçš„äº§å“ %5$s，总价值为 %6$s%7$s。",
"AveragePageGenerationTime": "这个访客的æ¯ä¸ªé¡µé¢åŠ 载平å‡èŠ± %1$s。",
"CalculatedOverNPageViews": "é‡‡ç”¨è¿™ä¸ªè®¿å®¢æœ€åŽ %1$s 个访问页é¢ç»Ÿè®¡ã€‚",
"ClickToViewMoreAboutVisit": "点击查看关于这次访问的详细信æ¯ã€‚",
"ConvertedNGoals": "转化了 %s ä¸ªç›®æ ‡",
- "EcommerceSummaryConversions": "%1$s%2$s 个订å•ï¼Œæ€»ä»·å€¼ %3$s%4$s，è´ä¹°äº† %5$s 个产å“。",
"FirstVisit": "首次访问",
"GoalType": "类型",
"HideMap": "éšè—地图",
@@ -25,15 +23,14 @@
"RealTimeVisitorCount": "实时访客计数",
"Referrer_URL": "æ¥æºç½‘å€",
"ShowMap": "显示地图",
- "SimpleRealTimeWidget_Message": "%s 和 %s 在最近 %s。",
+ "SimpleRealTimeWidget_Message": "%1$s 和 %2$s 在最近 %3$s。",
"ViewVisitorProfile": "查看访客资料",
"VisitedPages": "访问的页é¢",
"VisitorLog": "访客日志",
- "VisitorLogDocumentation": "æœ¬è¡¨æ˜¾ç¤ºæ‰€é€‰æ—¶é—´æ®µå†…æœ€æ–°çš„è®¿å®¢èµ„æ–™ï¼Œé¼ æ ‡ç§»åˆ°æ—¥æœŸä¸Šå¯ä»¥æŸ¥çœ‹ä¸Šæ¬¡è®¿é—®æ—¶é—´ï¼Œ%s 如果时间段包å«ä»Šå¤©ï¼Œæ‚¨å¯ä»¥å®žæ—¶æŸ¥çœ‹è®¿å®¢! %s 这里显示的数æ®æ€»æ˜¯å®žæ—¶çš„ï¼Œæ— è®ºæ˜¯å¦ä½¿ç”¨å®šæ—¶å¤„ç†ä»»åŠ¡ã€‚",
+ "VisitorLogDocumentation": "æœ¬è¡¨æ˜¾ç¤ºæ‰€é€‰æ—¶é—´æ®µå†…æœ€æ–°çš„è®¿å®¢èµ„æ–™ï¼Œé¼ æ ‡ç§»åˆ°æ—¥æœŸä¸Šå¯ä»¥æŸ¥çœ‹ä¸Šæ¬¡è®¿é—®æ—¶é—´ï¼Œ%1$s 如果时间段包å«ä»Šå¤©ï¼Œæ‚¨å¯ä»¥å®žæ—¶æŸ¥çœ‹è®¿å®¢! %2$s 这里显示的数æ®æ€»æ˜¯å®žæ—¶çš„ï¼Œæ— è®ºæ˜¯å¦ä½¿ç”¨å®šæ—¶å¤„ç†ä»»åŠ¡ã€‚",
"VisitorProfile": "访客资料",
"VisitorsInRealTime": "实时访客",
"VisitorsLastVisit": "æ¤è®¿å®¢ä¸Šæ¬¡è®¿é—®æ˜¯%s天å‰ã€‚",
- "VisitsFrom": "%1$s%2$s 次访问%3$s æ¥è‡ª",
- "VisitSummary": "åœç•™äº† %1$s%2$s 在网站%3$s，%4$s查看了 %5$s 个页é¢ï¼Œè®¿é—®æ¬¡æ•° %6$s 。%7$s"
+ "VisitsFrom": "%1$s%2$s 次访问%3$s æ¥è‡ª"
}
}
\ No newline at end of file
diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less
index 230893a741a02c08037683007ceecba55b08110e..7bbdde40444607ed6877e9cfdc018fc4665f882a 100644
--- a/plugins/Live/stylesheets/live.less
+++ b/plugins/Live/stylesheets/live.less
@@ -41,7 +41,7 @@
}
#visitsLive .settings {
- background: @theme-color-background-base none repeat scroll 0 0;
+ background: @theme-color-widget-background none repeat scroll 0 0;
}
#visitsLive .settings a {
@@ -312,4 +312,14 @@ a.visitor-log-visitor-profile-link {
.visitorReferrer {
clear:both;
padding-top: 1em;
-}
\ No newline at end of file
+}
+
+.segmentedlog {
+ margin: 8px;
+ display: block;
+ background: transparent url('plugins/Live/images/visitorlog.png') no-repeat 0 0;
+ padding-left: 25px;
+}
+.segmentedlog:hover {
+ background-image: url('plugins/Live/images/visitorlog-hover.png');
+}
diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig
index 16cac60b73def6f0bc05131e1a3a2890db39f7af..5ae56c957074f440110e7671fd06dbd98ead3c92 100644
--- a/plugins/Live/templates/_dataTableViz_visitorLog.twig
+++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig
@@ -190,6 +190,7 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
{% endif %}
<div class="col-md-{% if displayVisitorsInOwnColumn %}7{% else %}8{% endif %} column {% if visitor.getColumn('visitConverted') and not isWidget %}highlightField{% endif %}">
+ {{ postEvent('Live.visitorLogViewBeforeActionsInfo', visitor) }}
<div class="visitor-log-page-list">
<strong>
{{ visitor.getColumn('actionDetails')|length }}
@@ -205,6 +206,7 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
{% include "@Live/_actionsList.twig" with {'actionDetails': visitor.getColumn('actionDetails')} %}
</ol>
</div>
+ {{ postEvent('Live.visitorLogViewAfterActionsInfo', visitor) }}
</div>
</div>
{% endset %}
diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig
index e2a99e4dd9dbdd258a5d79254e0e595be07091fe..59a4a1fb9d39a0f52fa81cc18981677bec2b3f68 100644
--- a/plugins/Live/templates/getLastVisitsStart.twig
+++ b/plugins/Live/templates/getLastVisitsStart.twig
@@ -7,6 +7,7 @@
<div style="display:none;" class="idvisit">{{ visitor.idVisit }}</div>
<div title="{{ visitor.actionDetails|length }} {{ 'General_Actions'|translate }}" class="datetime">
<span style="display:none;" class="serverTimestamp">{{ visitor.serverTimestamp|raw }}</span>
+ {{ postEvent('Live.visitorLogWidgetViewBeforeVisitInfo', visitor) }}
{% set year = visitor.serverTimestamp|date('Y') %}
{{ visitor.serverDatePretty|replace({(year): ' '}) }} - {{ visitor.serverTimePretty }} {% if visitor.visitDuration > 0 %}<em>({{ visitor.visitDurationPretty|raw }})</em>{% endif %}
{% if visitor.visitorId|default(false) is not empty %}
diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig
index 2171d458f99f702ab5f810b8a5dfb313112c37d8..c41acd19a4ace23ce7d2de2e23f2c794293bb77c 100644
--- a/plugins/Live/templates/getVisitorProfilePopup.twig
+++ b/plugins/Live/templates/getVisitorProfilePopup.twig
@@ -40,20 +40,30 @@
<div class="visitor-profile-summary">
<h1>{{ 'General_Summary'|translate }}</h1>
<div>
- <p>{{ 'Live_VisitSummary'|translate('<strong>' ~ visitorData.totalVisitDurationPretty ~ '</strong>', '', '', '<strong>', visitorData.totalActions, visitorData.totalVisits, '</strong>')|raw }}</p>
+ {% if visitorData.totalPageViews != visitorData.totalActions %}
+ {% set actionDetails = [] %}
+ {% if visitorData.totalPageViews > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalPageViews ~ ' ' ~ 'General_ColumnPageviews'|translate]) %}{% endif %}
+ {% if visitorData.totalEvents > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalEvents ~ ' ' ~ 'Events_Events'|translate]) %}{% endif %}
+ {% if visitorData.totalDownloads > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalDownloads ~ ' ' ~ 'General_Downloads'|translate]) %}{% endif %}
+ {% if visitorData.totalOutlinks > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalOutlinks ~ ' ' ~ 'General_Outlinks'|translate]) %}{% endif %}
+ {% if visitorData.totalSearches > 0 %}{% set actionDetails = actionDetails|merge([visitorData.totalSearches ~ ' ' ~ 'Actions_ColumnSearches'|translate]) %}{% endif %}
+ <p>{{ 'Live_VisitSummaryWithActionDetails'|translate('<strong>' ~ visitorData.totalVisitDurationPretty ~ '</strong>', '', '', '<strong>' ~ visitorData.totalActions, '</strong>', actionDetails|join(', ') , '<strong>' ~ visitorData.totalVisits, '</strong>')|raw }}</p>
+ {% else %}
+ <p>{{ 'Live_VisitSummary'|translate('<strong>' ~ visitorData.totalVisitDurationPretty ~ '</strong>', '', '', '<strong>' ~ visitorData.totalActions, '</strong>', '<strong>' ~ visitorData.totalVisits, '</strong>')|raw }}</p>
+ {% endif %}
<p>{% if visitorData.totalGoalConversions %}<strong>{% endif %}{{ 'Live_ConvertedNGoals'|translate(visitorData.totalGoalConversions) }}{% if visitorData.totalGoalConversions %}</strong>{% endif %}
{%- if visitorData.totalGoalConversions %} (
{%- for idGoal, totalConversions in visitorData.totalConversionsByGoal -%}
{%- set idGoal = idGoal[7:] -%}
- {%- if not loop.first %}, {% endif -%}{{- totalConversions }} <span class="visitor-profile-goal-name">{{ goals[idGoal]['name'] -}}</span>
+ {%- if not loop.first %}, {% endif -%}{{- totalConversions }} {{ goals[idGoal]['name'] -}}
{%- endfor -%}
){% endif %}.</p>
{% if visitorData.totalEcommerceConversions|default(0) > 0 or visitorData.totalAbandonedCarts|default(0) > 0%}
<p>
{{ 'Goals_Ecommerce'|translate }}:
- {%- if visitorData.totalEcommerceConversions|default(0) > 0 %} {{ 'Live_EcommerceSummaryConversions'|translate('<strong>', visitorData.totalEcommerceConversions, visitorData.totalEcommerceRevenue|money(idSite), '</strong>', visitorData.totalEcommerceItems)|raw }}
+ {%- if visitorData.totalEcommerceConversions|default(0) > 0 %} {{ 'Live_EcommerceSummaryConversions'|translate('<strong>' ~ visitorData.totalEcommerceConversions, '</strong>', '<strong>' ~ visitorData.totalEcommerceRevenue|money(idSite), '</strong>', '<strong>' ~ visitorData.totalEcommerceItems, '</strong>')|raw }}
{%- endif -%}
- {%- if visitorData.totalAbandonedCarts|default(0) > 0 %} {{ 'Live_AbandonedCartSummary'|translate('<strong>', visitorData.totalAbandonedCarts, '</strong>', visitorData.totalAbandonedCartsItems, '<strong>', visitorData.totalAbandonedCartsRevenue|money(idSite), '</strong>')|raw }}{%- endif -%}
+ {%- if visitorData.totalAbandonedCarts|default(0) > 0 %} {{ 'Live_AbandonedCartSummary'|translate('<strong>' ~ visitorData.totalAbandonedCarts, '</strong>', '<strong>' ~ visitorData.totalAbandonedCartsItems, '</strong>', '<strong>' ~ visitorData.totalAbandonedCartsRevenue|money(idSite), '</strong>')|raw }}{%- endif -%}
</p>
{% endif %}
{% if visitorData.totalSearches|default(0) %}
@@ -74,18 +84,18 @@
<div>
<h1>{% if visitorData.visitsAggregated == 100 %}{{ 'General_Visit'|translate }}# 100{% else %}{{ 'Live_FirstVisit'|translate }}{% endif %}</h1>
<div>
- <p><strong>{{ visitorData.firstVisit.prettyDate }}</strong><span> - {{ 'UserCountryMap_DaysAgo'|translate(visitorData.firstVisit.daysAgo) }}</span></p>
- <p><span>{{ 'General_FromReferrer'|translate }}</span>
- <strong {% if visitorData.firstVisit.referrerType == 'search' and '(' not in visitorData.firstVisit.referralSummary %}title="{{ keywordNotDefined }}"{% endif %}>{{ visitorData.firstVisit.referralSummary }}</strong></p>
+ <p><strong>{{ visitorData.firstVisit.prettyDate }}</strong> - {{ 'UserCountryMap_DaysAgo'|translate(visitorData.firstVisit.daysAgo) }}</p>
+ <p>
+ {{ 'General_FromReferrer'|translate }}<strong {% if visitorData.firstVisit.referrerType == 'search' and '(' not in visitorData.firstVisit.referralSummary %}title="{{ keywordNotDefined }}"{% endif %}>{{ visitorData.firstVisit.referralSummary }}</strong></p>
</div>
</div>
{% if visitorData.lastVisits.getRowsCount() != 1 %}
<div>
<h1>{{ 'Live_LastVisit'|translate }}</h1>
<div>
- <p><strong>{{ visitorData.lastVisit.prettyDate }}</strong><span> - {{ 'UserCountryMap_DaysAgo'|translate(visitorData.lastVisit.daysAgo) }}</span></p>
- <p><span>{{ 'General_FromReferrer'|translate }}</span>
- <strong {% if visitorData.lastVisit.referrerType == 'search' and '(' not in visitorData.lastVisit.referralSummary %}title="{{ keywordNotDefined }}"{% endif %}>{{ visitorData.lastVisit.referralSummary }}</strong></p>
+ <p><strong>{{ visitorData.lastVisit.prettyDate }}</strong> - {{ 'UserCountryMap_DaysAgo'|translate(visitorData.lastVisit.daysAgo) }}</p>
+ <p>
+ {{ 'General_FromReferrer'|translate }}<strong {% if visitorData.lastVisit.referrerType == 'search' and '(' not in visitorData.lastVisit.referralSummary %}title="{{ keywordNotDefined }}"{% endif %}>{{ visitorData.lastVisit.referralSummary }}</strong></p>
</div>
</div>
{% endif %}
diff --git a/plugins/Live/tests/Integration/ModelTest.php b/plugins/Live/tests/Integration/ModelTest.php
index 1bc14d63754447eb1420701c4b999456922f1521..355f1fb77733d2ae6d6f4e81ed0c678d4cd12a1c 100644
--- a/plugins/Live/tests/Integration/ModelTest.php
+++ b/plugins/Live/tests/Integration/ModelTest.php
@@ -9,6 +9,7 @@
namespace Piwik\Plugins\Live\tests\Integration;
use Piwik\Common;
+use Piwik\Piwik;
use Piwik\Plugins\Live\Model;
use Piwik\Tests\Framework\Fixture;
use Piwik\Tests\Framework\Mock\FakeAccess;
@@ -66,6 +67,48 @@ class ModelTest extends IntegrationTestCase
$this->assertEquals(SegmentTest::removeExtraWhiteSpaces($expectedBind), SegmentTest::removeExtraWhiteSpaces($bind));
}
+ public function test_makeLogVisitsQueryString_withMultipleIdSites()
+ {
+ Piwik::addAction('Live.API.getIdSitesString', function (&$idSites) {
+ $idSites = array(2,3,4);
+ });
+
+ $model = new Model();
+ list($sql, $bind) = $model->makeLogVisitsQueryString(
+ $idSite = 1,
+ $period = 'month',
+ $date = '2010-01-01',
+ $segment = false,
+ $offset = 0,
+ $limit = 100,
+ $visitorId = false,
+ $minTimestamp = false,
+ $filterSortOrder = false
+ );
+ $expectedSql = ' SELECT sub.* FROM
+ (
+ SELECT log_visit.*
+ FROM ' . Common::prefixTable('log_visit') . ' AS log_visit
+ WHERE log_visit.idsite in (?,?,?)
+ AND log_visit.visit_last_action_time >= ?
+ AND log_visit.visit_last_action_time <= ?
+ ORDER BY visit_last_action_time DESC
+ LIMIT 100
+ ) AS sub
+ GROUP BY sub.idvisit
+ ORDER BY sub.visit_last_action_time DESC
+ ';
+ $expectedBind = array(
+ '2',
+ '3',
+ '4',
+ '2010-01-01 00:00:00',
+ '2010-02-01 00:00:00',
+ );
+ $this->assertEquals(SegmentTest::removeExtraWhiteSpaces($expectedSql), SegmentTest::removeExtraWhiteSpaces($sql));
+ $this->assertEquals(SegmentTest::removeExtraWhiteSpaces($expectedBind), SegmentTest::removeExtraWhiteSpaces($bind));
+ }
+
public function test_makeLogVisitsQueryStringWithOffset()
{
$model = new Model();
diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
index 25b150b17b0bef613e29026c08ceefe677b0f9d1..5a85f3d79577cedd7a983f8c9202aeb0665b7cd6 100644
--- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
@@ -3,7 +3,11 @@
<totalVisits>31</totalVisits>
<totalVisitDuration>0</totalVisitDuration>
<totalActions>31</totalActions>
+ <totalEvents>0</totalEvents>
+ <totalOutlinks>0</totalOutlinks>
+ <totalDownloads>0</totalDownloads>
<totalSearches>0</totalSearches>
+ <totalPageViews>31</totalPageViews>
<totalPageViewsWithTiming>0</totalPageViewsWithTiming>
<totalGoalConversions>0</totalGoalConversions>
<totalConversionsByGoal>
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 c5e105bab3517798947811149bf60a0ed0d0ce91..135d6e020acb49328804ca13c014db1613786541 100644
--- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
@@ -3,7 +3,11 @@
<totalVisits>31</totalVisits>
<totalVisitDuration>0</totalVisitDuration>
<totalActions>31</totalActions>
+ <totalEvents>0</totalEvents>
+ <totalOutlinks>0</totalOutlinks>
+ <totalDownloads>0</totalDownloads>
<totalSearches>0</totalSearches>
+ <totalPageViews>31</totalPageViews>
<totalPageViewsWithTiming>0</totalPageViewsWithTiming>
<totalGoalConversions>0</totalGoalConversions>
<totalConversionsByGoal>
diff --git a/plugins/LogViewer b/plugins/LogViewer
index 0ee846df5038e82a87abb98e35b4d7cd1718d228..1703d7536e39240643204a1f334d8b8da6cd6fc5 160000
--- a/plugins/LogViewer
+++ b/plugins/LogViewer
@@ -1 +1 @@
-Subproject commit 0ee846df5038e82a87abb98e35b4d7cd1718d228
+Subproject commit 1703d7536e39240643204a1f334d8b8da6cd6fc5
diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php
index b05d31f32ebe9b3b6af88a72f0f6d8f9939954c8..2de99c6934270564717a0b23c2f0f912eac39de7 100644
--- a/plugins/Login/Auth.php
+++ b/plugins/Login/Auth.php
@@ -11,14 +11,16 @@ namespace Piwik\Plugins\Login;
use Exception;
use Piwik\AuthResult;
use Piwik\Db;
+use Piwik\Piwik;
use Piwik\Plugins\UsersManager\Model;
+use Piwik\Plugins\UsersManager\UsersManager;
use Piwik\Session;
class Auth implements \Piwik\Auth
{
protected $login;
protected $token_auth;
- protected $md5Password;
+ protected $hashedPassword;
/**
* @var Model
@@ -47,7 +49,7 @@ class Auth implements \Piwik\Auth
*/
public function authenticate()
{
- if (!empty($this->md5Password)) { // favor authenticating by password
+ if (!empty($this->hashedPassword)) { // favor authenticating by password
return $this->authenticateWithPassword($this->login, $this->getTokenAuthSecret());
} elseif (is_null($this->login)) {
return $this->authenticateWithToken($this->token_auth);
@@ -132,7 +134,7 @@ class Auth implements \Piwik\Auth
*/
public function getTokenAuthSecret()
{
- return $this->md5Password;
+ return $this->hashedPassword;
}
/**
@@ -153,9 +155,9 @@ class Auth implements \Piwik\Auth
public function setPassword($password)
{
if (empty($password)) {
- $this->md5Password = null;
+ $this->hashedPassword = null;
} else {
- $this->md5Password = md5($password);
+ $this->hashedPassword = UsersManager::getPasswordHash($password);
}
}
@@ -163,19 +165,17 @@ class Auth implements \Piwik\Auth
* Sets the password hash to use when authentication.
*
* @param string $passwordHash The password hash.
- * @throws Exception if $passwordHash does not have 32 characters in it.
*/
public function setPasswordHash($passwordHash)
{
if ($passwordHash === null) {
- $this->md5Password = null;
+ $this->hashedPassword = null;
return;
}
- if (strlen($passwordHash) != 32) {
- throw new Exception("Invalid hash: incorrect length " . strlen($passwordHash));
- }
+ // check that the password hash is valid (sanity check)
+ UsersManager::checkPasswordHash($passwordHash, Piwik::translate('Login_ExceptionPasswordMD5HashExpected'));
- $this->md5Password = $passwordHash;
+ $this->hashedPassword = $passwordHash;
}
}
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 74a546d01ba727689e6038663857c8a2470127aa..707f9a2c9fe3c5ae42cb487a0b06310bd00c474d 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -48,7 +48,7 @@ class Controller extends \Piwik\Plugin\Controller
* @param PasswordResetter $passwordResetter
* @param AuthInterface $auth
* @param SessionInitializer $authenticatedSessionFactory
-\ */
+ */
public function __construct($passwordResetter = null, $auth = null, $sessionInitializer = null)
{
parent::__construct();
@@ -184,9 +184,10 @@ class Controller extends \Piwik\Plugin\Controller
* Authenticate user and password. Redirect if successful.
*
* @param string $login user name
- * @param string $password md5 password
+ * @param string $password plain-text or hashed password
* @param bool $rememberMe Remember me?
* @param string $urlToRedirect URL to redirect to, if successfully authenticated
+ * @param bool $passwordHashed indicates if $password is hashed
* @return string failure message if unable to authenticate
*/
protected function authenticateAndRedirect($login, $password, $rememberMe, $urlToRedirect = false, $passwordHashed = false)
diff --git a/plugins/Login/PasswordResetter.php b/plugins/Login/PasswordResetter.php
index d2631abdf980b6dda30bc37c088690a87a9c0fb3..ebbc7577cd5d39bc73099d4cb87d740f4ac570fb 100644
--- a/plugins/Login/PasswordResetter.php
+++ b/plugins/Login/PasswordResetter.php
@@ -310,7 +310,7 @@ class PasswordResetter
}
/**
- * Hashes a string. By default generates an MD5 hash.
+ * Hashes a string.
*
* Derived classes can override this to provide a different hashing implementation.
*
@@ -378,14 +378,12 @@ class PasswordResetter
*
* Derived classes can override this method to provide fewer or more checks.
*
- * @param string $password The password to check.
- * @throws Exception if the password is not 32 bytes long.
+ * @param string $passwordHash The password hash to check.
+ * @throws Exception if the password hash length is incorrect.
*/
- protected function checkPasswordHash($password)
+ protected function checkPasswordHash($passwordHash)
{
- if (strlen($password) != 32) {
- throw new Exception(Piwik::translate('Login_ExceptionPasswordMD5HashExpected'));
- }
+ UsersManager::checkPasswordHash($passwordHash, Piwik::translate('Login_ExceptionPasswordMD5HashExpected'));
}
/**
@@ -477,4 +475,4 @@ class PasswordResetter
{
return $login . '_reset_password_info';
}
-}
\ No newline at end of file
+}
diff --git a/plugins/Login/lang/ar.json b/plugins/Login/lang/ar.json
index d017f60adc843ebe5216a6b90142de3152ef97e3..08c035af34b96356ffbc6ffb7184fd5caa314aae 100644
--- a/plugins/Login/lang/ar.json
+++ b/plugins/Login/lang/ar.json
@@ -2,7 +2,7 @@
"Login": {
"ContactAdmin": "الأسباب المØتملة: قد يكون مستضي٠الموقع قد عطل خاصية mail().<br\/> الرجاء الاتصال بمدير Piwik.",
"ExceptionPasswordMD5HashExpected": "باراميتر كلمة المرور كان يتوقع أن يكون MD5 hash لكلمة المرور.",
- "InvalidNonceOrHeadersOrReferrer": "Ùشل نموذج الأمن. الرجاء إعادة تØديث النموذج ÙˆÙØص ما إذا كانت الكوكيز Ù…Ùعلة لديك. إذا كنت تستخدم ملقم بروكسي، يتوجب عليك %s ضبط Piwik ليقبل ترويسات البروكسي %s والتي ترسل ترويسة المضيÙ. أيضاً اÙØص ما إذا كان يتم إرسال ترويسة المرسل بشكل صØÙŠØ.",
+ "InvalidNonceOrHeadersOrReferrer": "Ùشل نموذج الأمن. الرجاء إعادة تØديث النموذج ÙˆÙØص ما إذا كانت الكوكيز Ù…Ùعلة لديك. إذا كنت تستخدم ملقم بروكسي، يتوجب عليك %1$s ضبط Piwik ليقبل ترويسات البروكسي %2$s والتي ترسل ترويسة المضيÙ. أيضاً اÙØص ما إذا كان يتم إرسال ترويسة المرسل بشكل صØÙŠØ.",
"InvalidOrExpiredToken": "الشÙرة غير صالØØ© أو انتهت صلاØيتها",
"InvalidUsernameEmail": "اسم المستخدم\/البريد الإلكتروني غير صالØ",
"LogIn": "تسجيل الدخول",
diff --git a/plugins/Login/lang/be.json b/plugins/Login/lang/be.json
index f730289526449ed1ed420e3c3e06e536e8e5d843..68e273be9ef7e1744b1cf0173ae3b662d06d816b 100644
--- a/plugins/Login/lang/be.json
+++ b/plugins/Login/lang/be.json
@@ -2,7 +2,7 @@
"Login": {
"ContactAdmin": "Магчымы чыннік: Ñ„ÑƒÐ½ÐºÑ†Ñ‹Ñ mail() адключана. <br \/>Калі лаÑка, звÑжыцеÑÑ Ð· адмініÑтратарам.",
"ExceptionPasswordMD5HashExpected": "Параметр Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð°Ð¿Ñ‹Ð½ÑƒÑžÑÑ MD5-Ñ…Ñшаваным паролÑм.",
- "InvalidNonceOrHeadersOrReferrer": "БÑÑпека формы не атрымалаÑÑ. Калі лаÑка, перазагрузіце форму Ñ– пераканаецеÑÑ, што вашы cookies ўключаны. Калі вы выкарыÑтоўваеце прокÑÑ–-Ñервер, то неабходна %s наладзіць Piwik да прынÑÑ†Ñ†Ñ Ð¿Ñ€Ð¾ÐºÑÑ– загалоўкаў%s, ÑÐºÑ–Ñ Ð¿ÐµÑ€Ð°Ð½Ð°ÐºÑ–Ñ€Ð¾ÑžÐ²Ð°ÑŽÑ†ÑŒ да загалоўкаў вузлоў. ÐÐºÑ€Ð°Ð¼Ñ Ñ‚Ð°Ð³Ð¾, праверце, што ваш Referer загаловак перадаецца правільна.",
+ "InvalidNonceOrHeadersOrReferrer": "БÑÑпека формы не атрымалаÑÑ. Калі лаÑка, перазагрузіце форму Ñ– пераканаецеÑÑ, што вашы cookies ўключаны. Калі вы выкарыÑтоўваеце прокÑÑ–-Ñервер, то неабходна %1$s наладзіць Piwik да прынÑÑ†Ñ†Ñ Ð¿Ñ€Ð¾ÐºÑÑ– загалоўкаў%2$s, ÑÐºÑ–Ñ Ð¿ÐµÑ€Ð°Ð½Ð°ÐºÑ–Ñ€Ð¾ÑžÐ²Ð°ÑŽÑ†ÑŒ да загалоўкаў вузлоў. ÐÐºÑ€Ð°Ð¼Ñ Ñ‚Ð°Ð³Ð¾, праверце, што ваш Referer загаловак перадаецца правільна.",
"InvalidOrExpiredToken": "ТокÑн з'ÑўлÑецца неÑапраўдным або мінуў.",
"InvalidUsernameEmail": "ÐÑÑлушнае Ñ–Ð¼Ñ ÐºÐ°Ñ€Ñ‹Ñтача Ñ–\/ці e-mail",
"LogIn": "УвайÑці",
diff --git a/plugins/Login/lang/bg.json b/plugins/Login/lang/bg.json
index 2e80e5cf9d51305f823dc7227bbc117facebac5b..4044f52a62bb36595448b41558fb78266f077722 100644
--- a/plugins/Login/lang/bg.json
+++ b/plugins/Login/lang/bg.json
@@ -3,7 +3,7 @@
"ConfirmationLinkSent": "Изпратена е връзка за потвърждение. Проверете пощенÑката Ñи кутиÑ, за да потвърдите заÑвката за ÑмÑна на парола.",
"ContactAdmin": "Възможни причини: функциÑта mail() е липÑваща или забранена на Ñървъра. <br \/>Свържете Ñе Ñ Ð²Ð°ÑˆÐ¸Ñ Piwik админиÑтратор.",
"ExceptionPasswordMD5HashExpected": "Параметърът на паролата Ñе очаква да бъде MD5 хеш на парола.",
- "InvalidNonceOrHeadersOrReferrer": "СигурноÑтта на формата е нарушена. ÐœÐ¾Ð»Ñ Ð¿Ñ€ÐµÐ·Ð°Ñ€ÐµÐ´ÐµÑ‚Ðµ формата и проверете отново дали биÑквитките Ñа включени. Ðко използвате прокÑи Ñървър, Ñ‚Ñ€Ñбва да %s конфигурирате Piwik да приема хеадъра%s на прокÑито, който препраща хоÑÑ‚ хеадъра. Също така проверете, дали вашиÑÑ‚ хеадър за прапращане(Referer header) е изпратен правилно.",
+ "InvalidNonceOrHeadersOrReferrer": "СигурноÑтта на формата е нарушена. ÐœÐ¾Ð»Ñ Ð¿Ñ€ÐµÐ·Ð°Ñ€ÐµÐ´ÐµÑ‚Ðµ формата и проверете отново дали биÑквитките Ñа включени. Ðко използвате прокÑи Ñървър, Ñ‚Ñ€Ñбва да %1$s конфигурирате Piwik да приема хеадъра%2$s на прокÑито, който препраща хоÑÑ‚ хеадъра. Също така проверете, дали вашиÑÑ‚ хеадър за прапращане(Referer header) е изпратен правилно.",
"InvalidOrExpiredToken": "Token е грешен или изтекъл",
"InvalidUsernameEmail": "Грешно потребителÑко име и\/или имейл адреÑ",
"LogIn": "Вход",
diff --git a/plugins/Login/lang/ca.json b/plugins/Login/lang/ca.json
index 122d30eab00b38bc9883463b7dd8341f2e5cd868..6a70ee8a507182a95c9a6b4fd2a4cc74b453c531 100644
--- a/plugins/Login/lang/ca.json
+++ b/plugins/Login/lang/ca.json
@@ -4,7 +4,7 @@
"ContactAdmin": "Possiblement sigui perquè el vostre proveïdor d'allotjament ha desactivat la funció mail().<br \/>Contacteu amb l'administrador del lloc.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "No es pot autentificar mitjançant el mecanisme '%s' un usuari amb accessos de super usuari.",
"ExceptionPasswordMD5HashExpected": "El parà metre contrasenya hauria de ser un hash MD5 de la contrasenya.",
- "InvalidNonceOrHeadersOrReferrer": "El formulari de seguretat ha fallat. Sisuplau recarregeu el formaulari i reviseu que teniu les cookies activades. Si feu servir un proxy, heu de %s configurar el Piwik per a que accepti la capcelera del proxy %s que conté la capçalera del host. També reviseu que el la vostra capçalera de referent s'envia correctament.",
+ "InvalidNonceOrHeadersOrReferrer": "El formulari de seguretat ha fallat. Sisuplau recarregeu el formaulari i reviseu que teniu les cookies activades. Si feu servir un proxy, heu de %1$s configurar el Piwik per a que accepti la capcelera del proxy %2$s que conté la capçalera del host. També reviseu que el la vostra capçalera de referent s'envia correctament.",
"InvalidOrExpiredToken": "El codi és invà lid o ha caducat",
"InvalidUsernameEmail": "Aquest usuari i\/o direcció de correu-e és invà lid.",
"LogIn": "Inicia la sessió",
diff --git a/plugins/Login/lang/cs.json b/plugins/Login/lang/cs.json
index 8dc2f4f2f0f4733b0772cc5472d4ac0da26a924c..46ba3eff8bc8f79fff35265fe1a9ce3505a8debd 100644
--- a/plugins/Login/lang/cs.json
+++ b/plugins/Login/lang/cs.json
@@ -1,14 +1,15 @@
{
"Login": {
- "ConfirmationLinkSent": "Do vašà schránky byl odeslán potvrzovacà email. Pro potvrzenà požadavku na změnu hesla navštivte odkaz uvedený v emailu.",
+ "ConfirmationLinkSent": "Do vašà schránky byl odeslán potvrzovacà e-mail. Pro potvrzenà požadavku na změnu hesla navštivte odkaz uvedený v e-mailu.",
"ContactAdmin": "Možná pÅ™ÃÄina: Váš hosting zakázal funkci mail().. <br \/>ProsÃm kontaktujte svého administrátora Piwiku.",
- "ExceptionInvalidSuperUserAccessAuthenticationMethod": "Uživatel se Super uživatelským pÅ™Ãstupem nemůže být autentizován mechanismem %s.",
+ "ExceptionInvalidSuperUserAccessAuthenticationMethod": "Uživatel se super-uživatelským pÅ™Ãstupem nemůže být ověřen mechanismem %s.",
"ExceptionPasswordMD5HashExpected": "Parametr hesla je oÄekáván jako MD5 hash hesla",
- "InvalidNonceOrHeadersOrReferrer": "ZabezpeÄenà formuláře selhalo. ProsÃm obnovte formulář a zkontrolujte, že máte povolené cookies. Pokud použÃváte proxy server, %smusÃte nakonfigurovat Piwik aby pÅ™ijÃmal proxy hlaviÄku%s, která pÅ™eposÃlá hlaviÄku hosta. Zkontrolujte také, že je správnÄ› posÃlána hlaviÄka referrer.",
+ "InvalidNonceOrHeadersOrReferrer": "ZabezpeÄenà formuláře selhalo. ProsÃm obnovte formulář a zkontrolujte, že máte povolené cookies. Pokud použÃváte proxy server, %1$smusÃte nakonfigurovat Piwik aby pÅ™ijÃmal proxy hlaviÄku%2$s, která pÅ™eposÃlá hlaviÄku hosta. Zkontrolujte také, že je správnÄ› posÃlána hlaviÄka referrer.",
+ "InvalidNonceSSLMisconfigured": "Můžete také %1$s pÅ™inutit Piwik použÃvat zabezpeÄené pÅ™ipojenÃ%2$s: ve svém konfiguraÄnÃm souboru %3$s nastavte %4$s pod sekci %5$s",
"InvalidOrExpiredToken": "KlÃÄ je neplatný, nebo vyprÅ¡el",
- "InvalidUsernameEmail": "Neplatné uživatelské jméno a\/nebo emailová adresa",
+ "InvalidUsernameEmail": "Neplatné uživatelské jméno a\/nebo e-mailová adresa",
"LogIn": "Přihlásit",
- "LoginOrEmail": "Uživatelské jméno nebo Email",
+ "LoginOrEmail": "Uživatelské jméno nebo E-mail",
"LoginPasswordNotCorrect": "Chybná kombinace uživatelského jména a hesla.",
"LostYourPassword": "Zapomněli jste vaše heslo?",
"MailPasswordChangeBody": "Ahoj %1$s,\n\nZ %2$s byl zaslán požadavek o zmÄ›nu hesla. Pro potvrzenà nových pÅ™ihlaÅ¡ovacÃch údajů navÅ¡tivte následujÃcà odkaz:\n\n%3$s\n\nPoznámka: Tento token je platný 24 hodin.\n\nA dÃky za použÃvánà Piwiku!",
diff --git a/plugins/Login/lang/da.json b/plugins/Login/lang/da.json
index 0815389fe4be515c35dd0d6c0450a25d5e65f597..dd97a5e5771573653e46b5c8092db9e3a3a525d3 100644
--- a/plugins/Login/lang/da.json
+++ b/plugins/Login/lang/da.json
@@ -4,7 +4,7 @@
"ContactAdmin": "Mulig årsag: udbyderen har måske deaktiveret mail()-funktionen. <br \/>Kontakt Piwik administrator.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "En bruger med superbruger adgang kan ikke godkendes ved hjælp af '%s' mekanisme.",
"ExceptionPasswordMD5HashExpected": "Adgangskode parameteren forventes at være en MD5 hash af adgangskoden.",
- "InvalidNonceOrHeadersOrReferrer": "Formularsikkerhed fejlede. Genindlæs formularen og kontroller, at dine cookies er aktiveret. Hvis du bruger en proxyserver, skal du %s konfigurere Piwik til at acceptere proxyheaderen%s, der videresender hostheaderen. Kontroller også, at din Referer header er sendt korrekt",
+ "InvalidNonceOrHeadersOrReferrer": "Formularsikkerhed fejlede. Genindlæs formularen og kontroller, at dine cookies er aktiveret. Hvis du bruger en proxyserver, skal du %1$s konfigurere Piwik til at acceptere proxyheaderen%2$s, der videresender hostheaderen. Kontroller også, at din Referer header er sendt korrekt",
"InvalidOrExpiredToken": "Nøglen er forkert eller udløbet",
"InvalidUsernameEmail": "Fejl i brugernavn og\/eller e-mail-adresse.",
"LogIn": "Log på",
diff --git a/plugins/Login/lang/de.json b/plugins/Login/lang/de.json
index 1948ed9dadf65be690dcf4665327c4e053ff00af..15618ddbdfcf37ba12b10f5c567ee92c7ce0b295 100644
--- a/plugins/Login/lang/de.json
+++ b/plugins/Login/lang/de.json
@@ -2,9 +2,9 @@
"Login": {
"ConfirmationLinkSent": "Ein Bestätigungslink wurde an Ihren Posteingang verschickt. Überprüfen Sie Ihre E-Mails und besuchen diesen Link um die Passwortänderung zu bestätigen.",
"ContactAdmin": "Möglicher Grund: Der Server könnte die mail()-Funktion deaktiviert haben.<br\/>Bitte sprechen Sie mit Ihrem Piwik-Administrator.",
- "ExceptionInvalidSuperUserAccessAuthenticationMethod": "Ein Benutzer mit Hauptadministrator-Berechtigung kann nicht mit der Methode '%s' authentifiziert werden.",
- "ExceptionPasswordMD5HashExpected": "Der 'password'-Parameter wird als MD5-Hash des Passworts erwartet.",
- "InvalidNonceOrHeadersOrReferrer": "Sicherheitschecks fehlgeschlagen. Bitte laden Sie das Formular erneut und prüfen Sie, ob Ihr Browser Cookies zulässt. Wenn Sie einen Proxy Server verwenden, müssen Sie %sPiwik so einrichten, dass es Proxy Header akzeptiert%s.",
+ "ExceptionInvalidSuperUserAccessAuthenticationMethod": "Ein Benutzer mit Systemverwaltunszugriff kann nicht mit der Methode »%s« legitimiert werden.",
+ "ExceptionPasswordMD5HashExpected": "Der Parameter »password« wird als MD5-Hash des Passwortes erwartet.",
+ "InvalidNonceOrHeadersOrReferrer": "Sicherheitschecks fehlgeschlagen. Bitte laden Sie das Formular erneut und prüfen Sie, ob Ihr Browser Cookies zulässt. Wenn Sie einen Proxy Server verwenden, müssen Sie %1$sPiwik so einrichten, dass es Proxy Header akzeptiert%2$s.",
"InvalidOrExpiredToken": "Der Token ist ungültig oder dessen Gültigkeitsdauer ist bereits abgelaufen.",
"InvalidUsernameEmail": "Ungültiger Bernutzername und\/oder E-Mail-Adresse",
"LogIn": "Anmelden",
diff --git a/plugins/Login/lang/el.json b/plugins/Login/lang/el.json
index b68a6f18ab41f8a83b880ea04c996d7541082d2e..c4caac5e6e8cdda7867a71969a94595562acbc16 100644
--- a/plugins/Login/lang/el.json
+++ b/plugins/Login/lang/el.json
@@ -4,7 +4,8 @@
"ContactAdmin": "Πιθανή αιτία: ο διακομιστής Îχει απενεÏγοποιημÎνη τη συνάÏτηση mail() <br \/>Επικοινωνήστε με τον διαχειÏιστή.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "Ένας χÏήστης με δικαίωμα ΥπεÏ-ΧÏήστη μποÏεί να πιστοποιηθεί χÏησιμοποιώντας το μηχανισμό '%s'.",
"ExceptionPasswordMD5HashExpected": "Η παÏάμετÏος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης αναμενόταν να είναι ο αÏιθμός MD5 του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης.",
- "InvalidNonceOrHeadersOrReferrer": "Η ασφάλεια της φόÏμας απÎτυχε. ΕπαναφοÏτώστε τη φόÏμα και ελÎγξτε ότι είναι ενεÏγοποιημÎνα τα cookies. Αν χÏησιμοποιείτε διακομιστή μεσολάβησης, Ï€ÏÎπει να %sÏυθμίσετε το Piwik να δÎχεται την κεφαλίδα proxy%s που Ï€Ïοωθεί την κεφαλίδα του διακομιστή. Επίσης, ελÎγξτε ότι η κεφαλίδα ΑναφοÏÎα στÎλνεται σωστά.",
+ "InvalidNonceOrHeadersOrReferrer": "Η ασφάλεια της φόÏμας απÎτυχε. ΠαÏακαλώ επαναφοÏτώστε τη φόÏμα και ελÎγξτε αν τα cookies είναι ενεÏγοποιημÎνα. Αν χÏησιμοποιείτε κάποιο διακομιστή μεσολάβησης, θα Ï€ÏÎπει να %1$s παÏαμετÏοποιήσετε το Piwik να δÎχεται τις κεφαλίδες του μεσολαβητή%2$s που Ï€ÏοωθοÏν την κεφαλίδα Host. Επίσης, ελÎγξτε αν η κεφαλίδα Referrer αποστÎλλεται σωστά.",
+ "InvalidNonceSSLMisconfigured": "Επίσης, μποÏείτε να %1$sαναγκάσετε το Piwik να χÏησιμοποιεί ασφαλή σÏνδεση%2$s: στο αÏχείο Ïυθμίσεων %3$s οÏίστε το %4$s στο παÏακάτω τμήμα %5$s",
"InvalidOrExpiredToken": "Το τεκμήÏιο είναι άκυÏο ή Îχει λήξει",
"InvalidUsernameEmail": "ΛανθασμÎνο όνομα χÏήστη ή\/και λάθος ηλεκτÏονική διεÏθυνση",
"LogIn": "ΣÏνδεση",
diff --git a/plugins/Login/lang/en.json b/plugins/Login/lang/en.json
index ad7d3524f047efea30197d392369f84219bb6e3d..7597684359fbf867010e0a3aab079da378ab0f4c 100644
--- a/plugins/Login/lang/en.json
+++ b/plugins/Login/lang/en.json
@@ -4,7 +4,7 @@
"ContactAdmin": "Possible reason: your host may have disabled the mail() function. <br \/>Please contact your Piwik administrator.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "A user with Super User access cannot be authenticated using the '%s' mechanism.",
"ExceptionPasswordMD5HashExpected": "The password parameter is expected to be a MD5 hash of the password.",
- "InvalidNonceOrHeadersOrReferrer": "Form security failed. Please reload the form and check that your cookies are enabled. If you use a proxy server, you must %s configure Piwik to accept the proxy header%s that forwards the Host header. Also, check that your Referrer header is sent correctly.",
+ "InvalidNonceOrHeadersOrReferrer": "Form security failed. Please reload the form and check that your cookies are enabled. If you use a proxy server, you must %1$s configure Piwik to accept the proxy header%2$s that forwards the Host header. Also, check that your Referrer header is sent correctly.",
"InvalidNonceSSLMisconfigured": "Also, you may %1$s force Piwik to use a secure connection%2$s: in your config file %3$s set %4$s below section %5$s",
"InvalidOrExpiredToken": "Token is invalid or has expired.",
"InvalidUsernameEmail": "Invalid username or e-mail address.",
@@ -21,4 +21,4 @@
"RememberMe": "Remember Me",
"ResetPasswordInstructions": "Enter a new password for your account."
}
-}
+}
\ No newline at end of file
diff --git a/plugins/Login/lang/es.json b/plugins/Login/lang/es.json
index 5a855159f57242190b1822859d41aedc5cf039f1..113da72c497aade9a1d4a56d3424603da601f85f 100644
--- a/plugins/Login/lang/es.json
+++ b/plugins/Login/lang/es.json
@@ -4,7 +4,7 @@
"ContactAdmin": "Posible razón: su servicio de alojamiento puede tener deshabilitado la función mail(). <br \/>Por favor contáctese con su administrador de Piwik.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "Un usuario con acceso Super Usuario no puede ser autenticado usando el mecanismo '%s'.",
"ExceptionPasswordMD5HashExpected": "Se espera que el parámetro contraseña sea un hash MD5 de la contraseña.",
- "InvalidNonceOrHeadersOrReferrer": "La seguridad del formulario falló. Por favor cargue nuevamente el formulario y compruebe que sus cookies están habilitadas. Si usa un proxy, debe %s configurar Piwik para aceptar la cabecera proxy%s que precede a la cabecera Host. Compruebe también que su cabecera Referrer se envÃa correctamente.",
+ "InvalidNonceOrHeadersOrReferrer": "La seguridad del formulario falló. Por favor cargue nuevamente el formulario y compruebe que sus cookies están habilitadas. Si usa un proxy, debe %1$s configurar Piwik para aceptar la cabecera proxy%2$s que precede a la cabecera Host. Compruebe también que su cabecera Referrer se envÃa correctamente.",
"InvalidOrExpiredToken": "El Token no es válido o ha caducado",
"InvalidUsernameEmail": "Nombre de usuario y\/o correo electrónico incorrectos.",
"LogIn": "Iniciar sesión",
diff --git a/plugins/Login/lang/fi.json b/plugins/Login/lang/fi.json
index 782204bc2ef486d795bd683e90ec4f5f0e137455..c2a5ca27d577acb0b2ab130a0acc1786a4f151d0 100644
--- a/plugins/Login/lang/fi.json
+++ b/plugins/Login/lang/fi.json
@@ -4,7 +4,7 @@
"ContactAdmin": "Mahdollisia syitä: palvelin ei välttämättä salli sähköpostien lähetystä (mail()-funktiota).<br\/>Ota yhteyttä Piwikin ylläpitäjään.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "Käyttäjää, jolla on Superkäyttäjäoikeudet, ei voida todentaa käyttämällä '%s' mekanismia.",
"ExceptionPasswordMD5HashExpected": "Salasanaparametrin kuuluu olla MD5-tiiviste salasanasta.",
- "InvalidNonceOrHeadersOrReferrer": "Lomakkeen turvatarkastus epäonnistui. Lataa lomake uudelleen, ja tarkista että evästeet on sallittu. Jos käytät välityspalvelinta, sinun täytyy %s säätää Piwik sallimaan välityspalvelimen otsake %s joka välittää Host-otsakkeen. Tarkista, että \"Referer\"-otsake lähetetään oikein.",
+ "InvalidNonceOrHeadersOrReferrer": "Lomakkeen turvatarkastus epäonnistui. Lataa lomake uudelleen, ja tarkista että evästeet on sallittu. Jos käytät välityspalvelinta, sinun täytyy %1$s säätää Piwik sallimaan välityspalvelimen otsake %2$s joka välittää Host-otsakkeen. Tarkista, että \"Referer\"-otsake lähetetään oikein.",
"InvalidOrExpiredToken": "Virheellinen tai vanhentunut tunnistautuminen",
"InvalidUsernameEmail": "Virheellinen käyttäjätunnus ja\/tai sähköpostiosoite",
"LogIn": "Kirjaudu sisään",
diff --git a/plugins/Login/lang/fr.json b/plugins/Login/lang/fr.json
index dba180c81f5044eefb07f6ca887ca823f3055beb..be79d33a892631676621e40cb37c97bf01928736 100644
--- a/plugins/Login/lang/fr.json
+++ b/plugins/Login/lang/fr.json
@@ -4,7 +4,7 @@
"ContactAdmin": "Raison possible : Votre hébergeur peut avoir désactivé la fonction mail(). <br \/> Veuillez contacter votre administrateur Piwik.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "Un utilisateur avec un accès super utilisateur ne peut être authentifié en utilisant le mécanisme '%s'.",
"ExceptionPasswordMD5HashExpected": "Le paramètre mot de passe doit être le hash MD5 du mot de passe.",
- "InvalidNonceOrHeadersOrReferrer": "La sécurité du formulaire a échoué. Veuillez recharger le formulaire et vérifier que vos cookies sont activés. Si vous utilisez un serveur proxy, vous devez %s configurer Piwik pour accepter les en-têtes du proxy %s qui relaient les en-têtes de l'hôte. Vérifiez aussi que l'en-tête de votre référent est correctement transmis.",
+ "InvalidNonceOrHeadersOrReferrer": "La sécurité du formulaire a échoué. Veuillez recharger le formulaire et vérifier que vos cookies sont activés. Si vous utilisez un serveur proxy, vous devez %1$s configurer Piwik pour accepter les en-têtes du proxy %2$s qui relaient les en-têtes de l'hôte. Vérifiez aussi que l'en-tête de votre référent est correctement transmis.",
"InvalidOrExpiredToken": "La clef est invalide ou a expiré",
"InvalidUsernameEmail": "Nom d'utilisateur et\/ou courriel invalide.",
"LogIn": "Connexion",
diff --git a/plugins/Login/lang/hi.json b/plugins/Login/lang/hi.json
index 9eb062b859d1bf0650b8b9baa632bbd7e83599d9..9d66a4a9bdbcac5a25c976f7dcdb86cc1c5e73f8 100644
--- a/plugins/Login/lang/hi.json
+++ b/plugins/Login/lang/hi.json
@@ -4,7 +4,7 @@
"ContactAdmin": "संà¤à¤¾à¤µà¤¿à¤¤ कारण: आपके मेजबान मेल () फलन में अकà¥à¤·à¤® हो सकता है. <br \/> अपने Piwik पà¥à¤°à¤¶à¤¾à¤¸à¤• से संपरà¥à¤• करें.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "सà¥à¤ªà¤° पà¥à¤°à¤¯à¥‹à¤•à¥à¤¤à¤¾ का उपयोग के साथ à¤à¤• उपयोगकरà¥à¤¤à¤¾ '%s' के तंतà¥à¤° का उपयोग कर पà¥à¤°à¤®à¤¾à¤£à¥€à¤•à¥ƒà¤¤ नहीं किया जा सकता।",
"ExceptionPasswordMD5HashExpected": "पासवरà¥à¤¡ पैरामीटर पासवरà¥à¤¡ का à¤à¤• à¤à¤®à¤¡à¥€ 5 हैश होने की उमà¥à¤®à¥€à¤¦ है.",
- "InvalidNonceOrHeadersOrReferrer": "पà¥à¤°à¤ªà¤¤à¥à¤° सà¥à¤°à¤•à¥à¤·à¤¾ में विफल रहा है. पà¥à¤°à¤ªà¤¤à¥à¤° लोड करें और अपने कà¥à¤•à¥€à¤œà¤¼ सकà¥à¤·à¤® किठगठहैं कि जांच करें. आप à¤à¤• पà¥à¤°à¥‰à¤•à¥à¤¸à¥€ सरà¥à¤µà¤° का उपयोग करते हैं, तो आपको चाहिà¤% है कि होसà¥à¤Ÿ हेडर पà¥à¤°à¥‰à¤•à¥à¤¸à¥€ हैडर %s को आगे सà¥à¤µà¥€à¤•à¤¾à¤° करने के लिठPiwik %s कॉनà¥à¤«à¤¼à¤¿à¤—र करें. इसके अलावा, आपके जो Referer हेडर सही ढंग से à¤à¥‡à¤œà¤¾ गया है कि जांच ले.",
+ "InvalidNonceOrHeadersOrReferrer": "पà¥à¤°à¤ªà¤¤à¥à¤° सà¥à¤°à¤•à¥à¤·à¤¾ में विफल रहा है. पà¥à¤°à¤ªà¤¤à¥à¤° लोड करें और अपने कà¥à¤•à¥€à¤œà¤¼ सकà¥à¤·à¤® किठगठहैं कि जांच करें. आप à¤à¤• पà¥à¤°à¥‰à¤•à¥à¤¸à¥€ सरà¥à¤µà¤° का उपयोग करते हैं, तो आपको चाहिà¤% है कि होसà¥à¤Ÿ हेडर पà¥à¤°à¥‰à¤•à¥à¤¸à¥€ हैडर %1$s को आगे सà¥à¤µà¥€à¤•à¤¾à¤° करने के लिठPiwik %2$s कॉनà¥à¤«à¤¼à¤¿à¤—र करें. इसके अलावा, आपके जो Referer हेडर सही ढंग से à¤à¥‡à¤œà¤¾ गया है कि जांच ले.",
"InvalidOrExpiredToken": "टोकन अमानà¥à¤¯ है या समापà¥à¤¤ हो गया है.",
"InvalidUsernameEmail": "अमानà¥à¤¯ उपयोगकरà¥à¤¤à¤¾ नाम या ई - मेल का पता.",
"LogIn": "साइन इन करें",
diff --git a/plugins/Login/lang/hu.json b/plugins/Login/lang/hu.json
index 045fe68e62d162dc8cf8d973b840882b58dd7150..22ee716bd94123e177815f36dca881f98715626c 100644
--- a/plugins/Login/lang/hu.json
+++ b/plugins/Login/lang/hu.json
@@ -4,7 +4,7 @@
"ContactAdmin": "Lehetséges ok: talán a szolgáltatód tiltja a mail() funkciót. <br \/> Kérjük, lépj kapcsolatba a Piwik adminisztrátoroddal.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "Egy felhasználó, akor Szuper felhasználó szinttel rendelkezik, nem használhatja a %s belépési mechanizmust.",
"ExceptionPasswordMD5HashExpected": "A jelszóparaméternek egyeznie kellene a jelszó MD5 hash értékével.",
- "InvalidNonceOrHeadersOrReferrer": "Űrlap biztonsági probléma. Kérjük töltse újra az űrlapot és ellenőrizze, hogy a sütik engedélyezve vannak-e. Amennyiben proxy szervert használ, akkor engedélyezni kell %s a Piwik-nek, hogy elfogadja a proxy fejléceket %s, amelyek visszamutatnak a hoszt fejlécére. Ezen felül ellenőrizze, hogy a Hivatkozó fejléc helyesen lett-e elküldve.",
+ "InvalidNonceOrHeadersOrReferrer": "Űrlap biztonsági probléma. Kérjük töltse újra az űrlapot és ellenőrizze, hogy a sütik engedélyezve vannak-e. Amennyiben proxy szervert használ, akkor engedélyezni kell %1$s a Piwik-nek, hogy elfogadja a proxy fejléceket %2$s, amelyek visszamutatnak a hoszt fejlécére. Ezen felül ellenőrizze, hogy a Hivatkozó fejléc helyesen lett-e elküldve.",
"InvalidOrExpiredToken": "A kód érvénytelen vagy lejárt.",
"InvalidUsernameEmail": "Helytelen felhasználói név és\/vagy e-mail cÃm",
"LogIn": "Bejelentkezés",
diff --git a/plugins/Login/lang/id.json b/plugins/Login/lang/id.json
index cf7938773350ccd922e34a45ea37b52301ecee64..3d70d5c642e7f761ad8162b0e4d0885842d4c7e4 100644
--- a/plugins/Login/lang/id.json
+++ b/plugins/Login/lang/id.json
@@ -3,7 +3,7 @@
"ConfirmationLinkSent": "Tautan konfirmasi telah dikirim ke kotak masuk Anda. Periksa surel Anda dan kunjungi tautan ini untuk memberi izin permintaan perubahan sandi Anda.",
"ContactAdmin": "Kemungkinan: inang Anda kemungkinan mematikan fungsi mail(). <br \/>Silakan hubungi pengelola Piwik Anda.",
"ExceptionPasswordMD5HashExpected": "Parameter sandi diperkirakan menjadi hash MD5 dari sandi.",
- "InvalidNonceOrHeadersOrReferrer": "Borang keamanan gagal. Silkan muat ulang borang dan periksa apakah kuki Anda telah aktif. Bila Anda menggunakan peladen wali, Anda harus %s mengkonfigurasi Piwik untuk menerima `header` wali%s yang meneruskan `header` Inang. Serta, periksa apakah `header` Pengarah telah terkirim dengan benar.",
+ "InvalidNonceOrHeadersOrReferrer": "Borang keamanan gagal. Silkan muat ulang borang dan periksa apakah kuki Anda telah aktif. Bila Anda menggunakan peladen wali, Anda harus %1$s mengkonfigurasi Piwik untuk menerima `header` wali%2$s yang meneruskan `header` Inang. Serta, periksa apakah `header` Pengarah telah terkirim dengan benar.",
"InvalidOrExpiredToken": "Kepingan tak sahih atau telah kedaluwarsa.",
"InvalidUsernameEmail": "Nama-id dan\/atau alamat surel tak sahih",
"LogIn": "Masuk-log",
diff --git a/plugins/Login/lang/it.json b/plugins/Login/lang/it.json
index 74b65a1b5bba9edfdc44e6fc6ff3c23ee57a8253..7897d60adb26fb1f0698a95484103d9e026e68ae 100644
--- a/plugins/Login/lang/it.json
+++ b/plugins/Login/lang/it.json
@@ -4,7 +4,8 @@
"ContactAdmin": "Possibile ragione: il tuo host potrebbe non avere attive le funzionalità di e-mail.<br \/>Per favore, contatta l'amministratore del server.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "Un utente con accesso Super User non può essere autenticato utilizzando il sistema '%s'.",
"ExceptionPasswordMD5HashExpected": "I parametri della password che ci si aspetta sono un hash MD5 della password.",
- "InvalidNonceOrHeadersOrReferrer": "Sicurezza modulo non riuscita. Si prega di ricaricare il modulo e verificare che i cookie siano abilitati. Se si utilizza un server proxy, è necessario %s configurare Piwik per accettare gli header del proxy %s che inoltri l'header host. Inoltre, verificare che l'intestazione Referer venga inviata correttamente.",
+ "InvalidNonceOrHeadersOrReferrer": "Sicurezza modulo non riuscita. Si prega di ricaricare il modulo e verificare che i cookie siano abilitati. Se si utilizza un server proxy, è necessario %1$s configurare Piwik per accettare gli header del proxy %2$s che inoltri l'header host. Inoltre, verificare che l'intestazione Referer venga inviata correttamente.",
+ "InvalidNonceSSLMisconfigured": "Inoltre puoi %1$s forzare Piwik a utilizzare una connessione sicura%2$s: nel tuo file di configurazione %3$s imposta %4$s sotto la sezione %5$s",
"InvalidOrExpiredToken": "Token non valido o scaduto",
"InvalidUsernameEmail": "Nome utente e\/o indirizzo e-mail non validi",
"LogIn": "Accedi",
diff --git a/plugins/Login/lang/ja.json b/plugins/Login/lang/ja.json
index 112438441d8b047cdd45bcbdffe50bcec096856a..68e2dc17ba594c36ba62a2a1b504a449f79ea4eb 100644
--- a/plugins/Login/lang/ja.json
+++ b/plugins/Login/lang/ja.json
@@ -4,7 +4,7 @@
"ContactAdmin": "考ãˆã‚‰ã‚Œã‚‹ç†ç”±ï¼š ホスト㧠mail() 関数ãŒç„¡åŠ¹ã«ã•ã‚Œã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚<br \/>Piwik 管ç†è€…ã«ã”連絡ãã ã•ã„。",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "スーパーユーザーアクセス権をæŒã¤ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ã€'%s' ã®ãƒ¡ã‚«ãƒ‹ã‚ºãƒ を使用ã—ã¦ã€èªè¨¼ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。",
"ExceptionPasswordMD5HashExpected": "パスワードパラメータã¯ã€ãƒ‘スワード㮠MD5 ãƒãƒƒã‚·ãƒ¥å€¤ã§ã‚ã‚‹ã“ã¨ã‚’想定ã•ã‚Œã¦ã„ã¾ã™ã€‚",
- "InvalidNonceOrHeadersOrReferrer": "安全ã«ãƒ•ã‚©ãƒ¼ãƒ ã‚’ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚フォームをå†ãƒãƒ¼ãƒ‰ã—ã€cookie ãŒæœ‰åŠ¹ã«ãªã£ã¦ã„ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。プãƒã‚シサーãƒãƒ¼ã‚’使用ã™ã‚‹å ´åˆã€ãƒ›ã‚¹ãƒˆãƒ˜ãƒƒãƒ€ãƒ¼ã‚’転é€ã™ã‚‹ãƒ—ãƒã‚シヘッダー %s を許å¯ã™ã‚‹ãŸã‚ã«ã€Piwik ã‚’ %s è¨å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã¾ãŸã€ãƒªãƒ•ã‚¡ãƒ©ãƒ¼ãƒ˜ãƒƒãƒ€ãƒ¼ãŒæ£ã—ãé€ä¿¡ã•ã‚Œã¦ã„ã‚‹ã‹ã©ã†ã‹ã”確èªãã ã•ã„。",
+ "InvalidNonceOrHeadersOrReferrer": "安全ã«ãƒ•ã‚©ãƒ¼ãƒ ã‚’ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚フォームをå†ãƒãƒ¼ãƒ‰ã—ã€cookie ãŒæœ‰åŠ¹ã«ãªã£ã¦ã„ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。プãƒã‚シサーãƒãƒ¼ã‚’使用ã™ã‚‹å ´åˆã€ãƒ›ã‚¹ãƒˆãƒ˜ãƒƒãƒ€ãƒ¼ã‚’転é€ã™ã‚‹ãƒ—ãƒã‚シヘッダー %1$s を許å¯ã™ã‚‹ãŸã‚ã«ã€Piwik ã‚’ %2$s è¨å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã¾ãŸã€ãƒªãƒ•ã‚¡ãƒ©ãƒ¼ãƒ˜ãƒƒãƒ€ãƒ¼ãŒæ£ã—ãé€ä¿¡ã•ã‚Œã¦ã„ã‚‹ã‹ã©ã†ã‹ã”確èªãã ã•ã„。",
"InvalidOrExpiredToken": "トークンãŒç„¡åŠ¹ã¾ãŸã¯æœŸé™åˆ‡ã‚Œã§ã™ã€‚",
"InvalidUsernameEmail": "ユーザーåã¾ãŸã¯ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒç„¡åŠ¹ã§ã™",
"LogIn": "ãƒã‚°ã‚¤ãƒ³",
diff --git a/plugins/Login/lang/ko.json b/plugins/Login/lang/ko.json
index e924445eda88c7e9e71b052ea4ec77c5d945362b..5b0072aed2f0781b6d2971df1ed3e8cd29607c89 100644
--- a/plugins/Login/lang/ko.json
+++ b/plugins/Login/lang/ko.json
@@ -4,7 +4,8 @@
"ContactAdmin": "가능한 ì´ìœ : 호스트가 ë©”ì¼ ê¸°ëŠ¥ì„ ë¹„í™œì„±í™”í–ˆì„ ìˆ˜ 있습니다. <br \/>ë‹¹ì‹ ì˜ Piwik 관리ìžì—게 ì—°ë½í•´ë³´ì„¸ìš”.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "ìŠˆí¼ ìœ ì € ì ‘ê·¼ì˜ '%s' 방법으로는 ì¸ì¦ë˜ì§€ 않습니다.",
"ExceptionPasswordMD5HashExpected": "비밀번호 매개변수는 MD5í•´ì‹œ ê°’ì´ ì‚¬ìš©ë˜ê³ 있습니다.",
- "InvalidNonceOrHeadersOrReferrer": "ì–‘ì‹ ë³´ì•ˆ 실패, ì–‘ì‹ì„ ìƒˆë¡œê³ ì¹¨í•˜ì—¬ ì¿ í‚¤ê°€ 활성화ë˜ì–´ 있는지 확ì¸í•˜ì„¸ìš”. 프ë¡ì‹œ 서버를 사용하는 경우ë¼ë©´, 호스트 í—¤ë”ì— %sPiwik configureì—ì„œ 프ë¡ì‹œ í—¤ë”를 수ë½%sí•˜ê³ ì „ë‹¬í•´ì•¼í•©ë‹ˆë‹¤. ë˜í•œ 리í¼ëŸ¬ í—¤ë”ê°€ 올바르게 ì „ì†¡ë˜ëŠ”지 확ì¸í•©ë‹ˆë‹¤.",
+ "InvalidNonceOrHeadersOrReferrer": "ì–‘ì‹ ë³´ì•ˆ 실패, ì–‘ì‹ì„ ìƒˆë¡œê³ ì¹¨í•˜ì—¬ ì¿ í‚¤ê°€ 활성화ë˜ì–´ 있는지 확ì¸í•˜ì„¸ìš”. 프ë¡ì‹œ 서버를 사용하는 경우ë¼ë©´, 호스트 í—¤ë”ì— %1$sPiwik configureì—ì„œ 프ë¡ì‹œ í—¤ë”를 수ë½%2$sí•˜ê³ ì „ë‹¬í•´ì•¼í•©ë‹ˆë‹¤. ë˜í•œ 리í¼ëŸ¬ í—¤ë”ê°€ 올바르게 ì „ì†¡ë˜ëŠ”지 확ì¸í•©ë‹ˆë‹¤.",
+ "InvalidNonceSSLMisconfigured": "ë˜í•œ, ë‹¹ì‹ ì€ %1$s Piwikì— ë³´ì•ˆ ì—°ê²° 사용 ê°•ì œ%2$sí• ìˆ˜ 있습니다: ì„¤ì • 파ì¼ì— %3$s %4$s ì„¤ì •, section 아래 %5$s",
"InvalidOrExpiredToken": "í† í°ì´ 잘못ë˜ì—ˆê±°ë‚˜ 만료ë˜ì—ˆìŠµë‹ˆë‹¤.",
"InvalidUsernameEmail": "ìž˜ëª»ëœ ì‚¬ìš©ìžëª… ê·¸ë¦¬ê³ \/ë˜ëŠ” ì´ë©”ì¼ ì£¼ì†Œ",
"LogIn": "로그ì¸",
diff --git a/plugins/Login/lang/lt.json b/plugins/Login/lang/lt.json
index 8bcb8496d132459dbcc49b0a6350b499be0147d9..984eec6149fc78cbc2dce534da6e25cd8254f020 100644
--- a/plugins/Login/lang/lt.json
+++ b/plugins/Login/lang/lt.json
@@ -7,6 +7,7 @@
"LoginOrEmail": "Registracijos vardas arba el. paštas",
"LoginPasswordNotCorrect": "Naudotojo vardas ir slaptažodis neteisingi",
"LostYourPassword": "Pamiršote slaptažodį?",
+ "PasswordChanged": "Jūsų slaptažodis buvo pakeistas.",
"PasswordRepeat": "Slaptažodis (pakartoti)",
"PasswordsDoNotMatch": "Slaptažodžiai nesutampa",
"RememberMe": "Prisiminti mane"
diff --git a/plugins/Login/lang/lv.json b/plugins/Login/lang/lv.json
index 7fd21114caf284b799efec83186501ab6b8ab07d..9a0983978660b0ff8cdcc0daf859e3a14703d68f 100644
--- a/plugins/Login/lang/lv.json
+++ b/plugins/Login/lang/lv.json
@@ -2,7 +2,7 @@
"Login": {
"ContactAdmin": "IespÄ“jams, ka JÅ«su resursdatoram ir atslÄ“gta mail() metode. <br \/>Sazinieties ar savu Piwik administrÄtoru.",
"ExceptionPasswordMD5HashExpected": "Paroles parametram ir jÄbÅ«t paroles MD5 summai.",
- "InvalidNonceOrHeadersOrReferrer": "Formas droÅ¡Ä«ba nenostrÄdÄja. LÅ«dzu pÄrlÄdÄ“jiet formu un pÄrbaudiet vai sÄ«kfailu atbalsts ir ieslÄ“gts. Ja lietojat starpniekserveri, Jums %s jÄiestata Piwik lai pieņemtu starpniekservera galveni %s, kas pÄrsÅ«ta resursdatora galveni. Papildus pÄrbaudiet vai JÅ«su iepriekÅ¡Ä“jÄs vietnes galvene ir nosÅ«tÄ«ta pareizi.",
+ "InvalidNonceOrHeadersOrReferrer": "Formas droÅ¡Ä«ba nenostrÄdÄja. LÅ«dzu pÄrlÄdÄ“jiet formu un pÄrbaudiet vai sÄ«kfailu atbalsts ir ieslÄ“gts. Ja lietojat starpniekserveri, Jums %1$s jÄiestata Piwik lai pieņemtu starpniekservera galveni %2$s, kas pÄrsÅ«ta resursdatora galveni. Papildus pÄrbaudiet vai JÅ«su iepriekÅ¡Ä“jÄs vietnes galvene ir nosÅ«tÄ«ta pareizi.",
"InvalidOrExpiredToken": "Kods ir nepareizs vai tam ir beidzies termiņš.",
"InvalidUsernameEmail": "Nepareizs lietotÄjvÄrds un\/vai e-pasta adrese",
"LogIn": "Pieteikties",
diff --git a/plugins/Login/lang/nb.json b/plugins/Login/lang/nb.json
index 45385fbc4f70b5085bd665b02df3e7af068a684e..20e48735ecd97e886dd324db923368b230807daf 100644
--- a/plugins/Login/lang/nb.json
+++ b/plugins/Login/lang/nb.json
@@ -4,7 +4,8 @@
"ContactAdmin": "Mulig grunn: Din tjener har kanskje deaktivert mail()-funksjonen. <br \/>Kontakt din Piwik administrator.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "En bruker med superbrukertilgang kan ikke autentiseres med «%s»-mekanismen.",
"ExceptionPasswordMD5HashExpected": "Passordparameteret er forventet å være en MD5-hash av passordet.",
- "InvalidNonceOrHeadersOrReferrer": "Skjemasikkerhet feilet. Vennligst last inn skjemaet på nytt og sjekk at datakapsler er aktivert. Hvis du bruker en proxy-server må du %s konfigurere Piwik til å akseptere proxy-headere %s som sender videre Host-headeren. Sjekk også at Referrer-headeren sendes uten feil.",
+ "InvalidNonceOrHeadersOrReferrer": "Skjemasikkerhet feilet. Vennligst last inn skjemaet på nytt og sjekk at datakapsler er aktivert. Hvis du bruker en proxy-server må du %1$s konfigurere Piwik til å akseptere proxy-headere %2$s som sender videre Host-headeren. Sjekk også at Referrer-headeren sendes uten feil.",
+ "InvalidNonceSSLMisconfigured": "I tillegg kan du %1$s tvinge Piwik til å bruke en sikker tilkobling%2$s: i din config-fil %3$s sett %4$s under seksjonen %5$s",
"InvalidOrExpiredToken": "Autentiseringsnøkkelen er ugyldig eller har utløpt.",
"InvalidUsernameEmail": "Feil brukernavn og\/eller epost-adresse.",
"LogIn": "Logg inn",
diff --git a/plugins/Login/lang/nl.json b/plugins/Login/lang/nl.json
index d062ac8a812066a124b7653ed6fff211ba1fd3ba..45a46d52f42771588dcb2c3b703a91bbf6efee77 100644
--- a/plugins/Login/lang/nl.json
+++ b/plugins/Login/lang/nl.json
@@ -4,7 +4,7 @@
"ContactAdmin": "Mogelijke reden: uw host heeft mogelijk de mail() functie geblokkeerd. <br \/>Neem contact op met uw Piwik beheerder.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "Een gebruiker met Super User toegang kan niet geauthenticeerd worden met het '%s' mechanisme.",
"ExceptionPasswordMD5HashExpected": "De wachtwoord parameter moet een MD5 hash zijn van het wachtwoord.",
- "InvalidNonceOrHeadersOrReferrer": "Securityformulier gefaald. Herlaad het formulier en controleer dat cookies worden toegestaan. Als u een proxyserver gebruikt, %s configureer Piwik dan zodanig dat deze proxy headers%s accepteert, die de Hostheaders doorstuurt. Controleer tevens dat de refererheader correct wordt verzonden.",
+ "InvalidNonceOrHeadersOrReferrer": "Securityformulier gefaald. Herlaad het formulier en controleer dat cookies worden toegestaan. Als u een proxyserver gebruikt, %1$s configureer Piwik dan zodanig dat deze proxy headers%2$s accepteert, die de Hostheaders doorstuurt. Controleer tevens dat de refererheader correct wordt verzonden.",
"InvalidOrExpiredToken": "Token is ongeldig of is verlopen",
"InvalidUsernameEmail": "Ongeldige gebruikersnaam en\/of e-mail adres",
"LogIn": "Log in",
diff --git a/plugins/Login/lang/pl.json b/plugins/Login/lang/pl.json
index 8a43531505bb34beb973fd5c1afb518afc88c8db..6355e10c8f16cd581dff53f76c56b39fb0e6f781 100644
--- a/plugins/Login/lang/pl.json
+++ b/plugins/Login/lang/pl.json
@@ -3,7 +3,7 @@
"ConfirmationLinkSent": "Potwierdzenie zostało wysłane na skrzynkę odbiorczą. Sprawdź swój e-mail i odwiedzić link do autoryzacji żądania zmiany hasła.",
"ContactAdmin": "Prawdopodobny powód: twój host mógł wyłączyć działanie funkcji mail(). <br \/>Skontaktuj się w tej sprawie ze swoim administratorem statystyk Piwik.",
"ExceptionPasswordMD5HashExpected": "Oczekiwanym parametrem hasła jest hash z MD5 uzyskany z hasła.",
- "InvalidNonceOrHeadersOrReferrer": "Błąd zabezpieczeń formularza. Proszę przeładować stronę z formularzem i upewnić się, że obsługa ciasteczek jest włączona. Jeśli korzystasz z serwera proxy, należy %s skonfigurować Piwik, tak aby akceptował nagłówek serwera proxy%s, który przekazuje nagłówek serwera docelowego. Ponadto sprawdź, czy naglówek Referrer jest poprawnie wysyłany.",
+ "InvalidNonceOrHeadersOrReferrer": "Błąd zabezpieczeń formularza. Proszę przeładować stronę z formularzem i upewnić się, że obsługa ciasteczek jest włączona. Jeśli korzystasz z serwera proxy, należy %1$s skonfigurować Piwik, tak aby akceptował nagłówek serwera proxy%2$s, który przekazuje nagłówek serwera docelowego. Ponadto sprawdź, czy naglówek Referrer jest poprawnie wysyłany.",
"InvalidOrExpiredToken": "Token jest błędny lub już wygasł.",
"InvalidUsernameEmail": "Błędna nazwa użytkownika i\/lub adres e-mail",
"LogIn": "Zaloguj siÄ™",
diff --git a/plugins/Login/lang/pt-br.json b/plugins/Login/lang/pt-br.json
index e154cbd25ac2783f39bcc906d844a1950e41669d..332306ddb0695febc1369db063cef590e2f80135 100644
--- a/plugins/Login/lang/pt-br.json
+++ b/plugins/Login/lang/pt-br.json
@@ -4,7 +4,8 @@
"ContactAdmin": "PossÃvel razão: o seu host desabilitou a função mail(). <br \/>Por favor contacte o administrador do Piwik.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "Um usuário com acesso de Super Usuário não pode ser autenticado usando o mecanismo '%s'.",
"ExceptionPasswordMD5HashExpected": "É esperado que o parâmetro da senha seja um hash MD5 da senha.",
- "InvalidNonceOrHeadersOrReferrer": "O formulário de segurança falhou. Por favor, recarregue o formulário e verifique se seus cookies estão habilitados. Se você usa um servidor proxy, você deve configurar %s Piwik para aceitar proxy header%s que encaminhe para o Host header. Além disso, verifique se o header do Referenciador esta sendo enviada corretamente.",
+ "InvalidNonceOrHeadersOrReferrer": "O formulário de segurança falhou. Por favor, recarregue o formulário e verifique se seus cookies estão habilitados. Se você usa um servidor proxy, você deve configurar %1$s Piwik para aceitar proxy header%2$s que encaminhe para o Host header. Além disso, verifique se o header do Referenciador esta sendo enviada corretamente.",
+ "InvalidNonceSSLMisconfigured": "Além disso, você pode %1$s forçar o Piwik a usar uma conexão segura%2$s: em seu arquivo de configuração %3$s configure %4$s abaixo da secção %5$s",
"InvalidOrExpiredToken": "Token inválido ou expirado",
"InvalidUsernameEmail": "Nome de usuário ou e-mail inválido",
"LogIn": "Entrar",
diff --git a/plugins/Login/lang/pt.json b/plugins/Login/lang/pt.json
index d46f97c705c30552666548a9ffbf885ab11779a2..d442b40f9899d60eba79082832c7b670da99d6cb 100644
--- a/plugins/Login/lang/pt.json
+++ b/plugins/Login/lang/pt.json
@@ -2,7 +2,7 @@
"Login": {
"ContactAdmin": "Razão possÃvel: o seu administrador desactivou a função mail(). <br \/>Por favor contacte o seu administrador Piwik.",
"ExceptionPasswordMD5HashExpected": "Espera-se que o parâmetro da palavra-passe seja uma hash MD5 da palavra-passe.",
- "InvalidNonceOrHeadersOrReferrer": "Erro de Segurança do formulário. Por favor, recarregar o formulário e verificar se os cookies estão activos. Se você usar um servidor proxy, você deve configurar %s Piwik para aceitar os cabeçalhos proxy %s que encaminha o cabeçalho do Host. Além disso, verifique se o cabeçalho Referer é enviado corretamente.",
+ "InvalidNonceOrHeadersOrReferrer": "Erro de Segurança do formulário. Por favor, recarregar o formulário e verificar se os cookies estão activos. Se você usar um servidor proxy, você deve configurar %1$s Piwik para aceitar os cabeçalhos proxy %2$s que encaminha o cabeçalho do Host. Além disso, verifique se o cabeçalho Referer é enviado corretamente.",
"InvalidOrExpiredToken": "A chave é inválida ou expirou.",
"InvalidUsernameEmail": "Nome de utilizador e\/ou endereço de e-mail inválido",
"LogIn": "Entrar",
diff --git a/plugins/Login/lang/ro.json b/plugins/Login/lang/ro.json
index 746eb60cb97a1a03de88de4690b1867a9c51c33b..e60867324d91ae892cbd82677974df46732454a3 100644
--- a/plugins/Login/lang/ro.json
+++ b/plugins/Login/lang/ro.json
@@ -4,7 +4,7 @@
"ContactAdmin": "Motiv posibil: gazda ta poate avea dezactivata functia email . <br\/>Contactati adminstratorul.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "Un utilizator cu acces la Super utilizator nu poate fi autentificat folosind '%s' mecanismul.",
"ExceptionPasswordMD5HashExpected": "Parametrul parolei este aşteptat să fie un hash MD5 al parolei.",
- "InvalidNonceOrHeadersOrReferrer": "Formular de securitate nereusit. Vă rugăm să reîncărcați formularul și verificați dacă modulele cookie sunt activate. Dacă utilizați un server proxy, trebuie să configurati %s Piwik pentru a accepta antetul proxy %s care transmite antetul Host. De asemenea, verificați dacă antetul dvs. Referrer este trimis corect.",
+ "InvalidNonceOrHeadersOrReferrer": "Formular de securitate nereusit. Vă rugăm să reîncărcați formularul și verificați dacă modulele cookie sunt activate. Dacă utilizați un server proxy, trebuie să configurati %1$s Piwik pentru a accepta antetul proxy %2$s care transmite antetul Host. De asemenea, verificați dacă antetul dvs. Referrer este trimis corect.",
"InvalidOrExpiredToken": "Jetonul este invalid sau expirat.",
"InvalidUsernameEmail": "Nume sau adresa email invalidă.",
"LogIn": "Intrare",
diff --git a/plugins/Login/lang/ru.json b/plugins/Login/lang/ru.json
index bf6a6ad20aa909bb97bacdb5de307e2c68d3b86a..b143491922a6d4b7028ec6ec0d8c6f905b2349d9 100644
--- a/plugins/Login/lang/ru.json
+++ b/plugins/Login/lang/ru.json
@@ -4,7 +4,7 @@
"ContactAdmin": "Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð°: Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ mail() отключена. <br \/>ПожалуйÑта, ÑвÑжитеÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "Пользователь Ñ Ð¿Ñ€Ð°Ð²Ð°Ð¼Ð¸ ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ðµ может пройти проверку подлинноÑти Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ данного механизма: '%s'.",
"ExceptionPasswordMD5HashExpected": "Параметр Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð²ÐµÑ€Ð¾Ñтно ÑвлÑетÑÑ MD5-Ñ…Ñшем паролÑ.",
- "InvalidNonceOrHeadersOrReferrer": "Ошибка при загрузки формы безопаÑноÑти. ПожалуйÑта, обновите форму и проверьте, что ваши cookies включены. ЕÑли вы иÑпользуете прокÑи-Ñервер, вы должны %s наÑтроить принÑтие прокÑи-заголовков в Piwik%s, которые Ñледуют за названием хоÑта. Также убедитеÑÑŒ, что заголовки иÑточника трафика отправлÑÑŽÑ‚ÑÑ Ð²ÐµÑ€Ð½Ð¾.",
+ "InvalidNonceOrHeadersOrReferrer": "Ошибка при загрузки формы безопаÑноÑти. ПожалуйÑта, обновите форму и проверьте, что ваши cookies включены. ЕÑли вы иÑпользуете прокÑи-Ñервер, вы должны %1$s наÑтроить принÑтие прокÑи-заголовков в Piwik%2$s, которые Ñледуют за названием хоÑта. Также убедитеÑÑŒ, что заголовки иÑточника трафика отправлÑÑŽÑ‚ÑÑ Ð²ÐµÑ€Ð½Ð¾.",
"InvalidOrExpiredToken": "Код неправильный или проÑрочен.",
"InvalidUsernameEmail": "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸\/или e-mail",
"LogIn": "Войти",
diff --git a/plugins/Login/lang/sq.json b/plugins/Login/lang/sq.json
index f283222e934f8f01ea30d3c7350b9c9e657f492f..04d268333c5ea0fecace1ebc39fbe5b6db162055 100644
--- a/plugins/Login/lang/sq.json
+++ b/plugins/Login/lang/sq.json
@@ -2,7 +2,7 @@
"Login": {
"ContactAdmin": "Arsye e mundshme: streha juaj mund të ketë çaktivizuar funksionin mail(). <br \/>Ju lutem, lidhuni me përgjegjësin e Piwik-ut tuaj.",
"ExceptionPasswordMD5HashExpected": "Parametri i fjalëkalimit pritet të jetë një hash MD5 fjalëkalimi.",
- "InvalidNonceOrHeadersOrReferrer": "Siguria e formularit dështoi. Ju lutem, ringarkoni formularin dhe kontrolloni nëse janë të aktivizuara \"cookie\"-et tuaja. Nëse përdorni një shërbyes ndërmjetës, duhet ta formësoni %s Piwik-un që të pranojë titull ndërmjetësi%s i cili përcjell titull Strehe. Kontrolloni gjithashtu që titulli i Referuesit dërgohet saktë.",
+ "InvalidNonceOrHeadersOrReferrer": "Siguria e formularit dështoi. Ju lutem, ringarkoni formularin dhe kontrolloni nëse janë të aktivizuara \"cookie\"-et tuaja. Nëse përdorni një shërbyes ndërmjetës, duhet ta formësoni %1$s Piwik-un që të pranojë titull ndërmjetësi%2$s i cili përcjell titull Strehe. Kontrolloni gjithashtu që titulli i Referuesit dërgohet saktë.",
"InvalidOrExpiredToken": "Elementi është i pavlefshëm ose ka skaduar",
"InvalidUsernameEmail": "Emër përdoruesi dhe\/ose vendndodhje e-mail e pavlefshme",
"LogIn": "Hyni",
diff --git a/plugins/Login/lang/sr.json b/plugins/Login/lang/sr.json
index efa7f36cca9dd14701f1243418470b0c533fa710..69ef62ef763b64e35d2c89c50eb8ae95930c1b06 100644
--- a/plugins/Login/lang/sr.json
+++ b/plugins/Login/lang/sr.json
@@ -4,7 +4,7 @@
"ContactAdmin": "Moguć razlog: vaš hosting provajder je možda onemogućio mail() funkciju. <br \/>Molimo vas da kontaktirate vašeg Piwik administratora.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "Korisnik sa superkorisniÄkim nivoom pristupa ne može biti autentifikovan korišćenjem mehanizma '%s'.",
"ExceptionPasswordMD5HashExpected": "Parametar za lozinku bi trebalo da bude MD5 hash lozinke.",
- "InvalidNonceOrHeadersOrReferrer": "Problem sa sigurnošću. Molimo vas da proverite da li su kolaÄići (cookies) omogućeni i da ponovo uÄitate stranicu. Ukoliko se nalazite iza proxy servera, morate %s podesiti Piwik da prihvata proxy zaglavlje%s koje prosleÄ‘uje zaglavlje servera. TakoÄ‘e, proverite da li je referer zaglavlje poslato kako treba.",
+ "InvalidNonceOrHeadersOrReferrer": "Problem sa sigurnošću. Molimo vas da proverite da li su kolaÄići (cookies) omogućeni i da ponovo uÄitate stranicu. Ukoliko se nalazite iza proxy servera, morate %1$s podesiti Piwik da prihvata proxy zaglavlje%2$s koje prosleÄ‘uje zaglavlje servera. TakoÄ‘e, proverite da li je referer zaglavlje poslato kako treba.",
"InvalidOrExpiredToken": "Token ili nije validan ili je istekao.",
"InvalidUsernameEmail": "PogreÅ¡no korisniÄko ime i\/ili elektronska adresa",
"LogIn": "Prijavljivanje",
diff --git a/plugins/Login/lang/sv.json b/plugins/Login/lang/sv.json
index 8baae71d7e482873d072d72796fe81733a11b773..8590790862df31bb9fe25ecebb2affb376389830 100644
--- a/plugins/Login/lang/sv.json
+++ b/plugins/Login/lang/sv.json
@@ -4,7 +4,7 @@
"ContactAdmin": "Möjlig orsak: din värd kan ha inaktiverat mail() funktionen. <br\/>Kontakta din Piwik administratör.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "En användare med Superanvändaråtkomst kan inte bli autensieras vid användande av '%s' mekanism.",
"ExceptionPasswordMD5HashExpected": "Lösenordsparametern förväntas bli en MD5-hash av lösenordet.",
- "InvalidNonceOrHeadersOrReferrer": "Formulärets säkerhet misslyckades. Vänligen ladda formuläret och kontrollera att cookies är aktiverade. Om du använder en proxyserver måste du %s konfigurera Piwik att acceptera proxy huvuden %s som överför Host-huvuden. Kontrollera också att din Referer header skickas korrekt.",
+ "InvalidNonceOrHeadersOrReferrer": "Formulärets säkerhet misslyckades. Vänligen ladda formuläret och kontrollera att cookies är aktiverade. Om du använder en proxyserver måste du %1$s konfigurera Piwik att acceptera proxy huvuden %2$s som överför Host-huvuden. Kontrollera också att din Referer header skickas korrekt.",
"InvalidOrExpiredToken": "Lösenordsbevis är felaktigt eller har utgått.",
"InvalidUsernameEmail": "Felaktigt användarnamn och\/eller e-postadress",
"LogIn": "Logga in",
diff --git a/plugins/Login/lang/th.json b/plugins/Login/lang/th.json
index ca598b83e8e1129bf510dcd99a596c08146d311f..c350a9d2081e3c0ef1ca72c0e358a51114cb9e80 100644
--- a/plugins/Login/lang/th.json
+++ b/plugins/Login/lang/th.json
@@ -2,7 +2,7 @@
"Login": {
"ContactAdmin": "เหตุผลที่à¸à¸²à¸ˆà¹€à¸›à¹‡à¸™à¹„ปได้: โฮสต์ขà¸à¸‡à¸„ุณà¸à¸²à¸ˆà¸›à¸´à¸”à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¸™ mail()<br \/>à¸à¸£à¸¸à¸“าติดต่à¸à¸œà¸¹à¹‰à¸”ูà¹à¸¥ Piwik ขà¸à¸‡à¸„ุณ",
"ExceptionPasswordMD5HashExpected": "พารามิเตà¸à¸£à¹Œà¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸ˆà¸°à¸„าดว่าจะ เป็น MD5 hash ขà¸à¸‡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™",
- "InvalidNonceOrHeadersOrReferrer": "à¹à¸šà¸šà¸Ÿà¸à¸£à¹Œà¸¡à¸à¸²à¸£à¸£à¸±à¸à¸©à¸²à¸„วามปลà¸à¸”ภัยความล้มเหลว โปรดโหลดà¹à¸šà¸šà¸Ÿà¸à¸£à¹Œà¸¡à¹à¸¥à¸°à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸§à¹ˆà¸²à¸„ุà¸à¸à¸µà¹‰à¸‚à¸à¸‡à¸„ุณำได้เปิดใช้งานà¹à¸¥à¹‰à¸§ ถ้าคุณใช้พร็à¸à¸à¸‹à¸µà¹ˆà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ, คุณจะต้à¸à¸‡à¸à¸³à¸«à¸™à¸”ค่า %s ขà¸à¸‡ Piwik เพื่à¸à¸—ี่จะยà¸à¸¡à¸£à¸±à¸šà¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸‚à¸à¸‡à¸žà¸£à¹‡à¸à¸à¸‹à¸µà¹ˆ %s ที่ส่งต่à¸à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸‚à¸à¸‡à¹‚ฮสต์ นà¸à¸à¸ˆà¸²à¸à¸™à¸µà¹‰à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸§à¹ˆà¸²à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¸‚à¸à¸‡à¸„ุณจะถูà¸à¸ªà¹ˆà¸‡à¸à¸¢à¹ˆà¸²à¸‡à¸–ูà¸à¸•à¹‰à¸à¸‡",
+ "InvalidNonceOrHeadersOrReferrer": "à¹à¸šà¸šà¸Ÿà¸à¸£à¹Œà¸¡à¸à¸²à¸£à¸£à¸±à¸à¸©à¸²à¸„วามปลà¸à¸”ภัยความล้มเหลว โปรดโหลดà¹à¸šà¸šà¸Ÿà¸à¸£à¹Œà¸¡à¹à¸¥à¸°à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸§à¹ˆà¸²à¸„ุà¸à¸à¸µà¹‰à¸‚à¸à¸‡à¸„ุณำได้เปิดใช้งานà¹à¸¥à¹‰à¸§ ถ้าคุณใช้พร็à¸à¸à¸‹à¸µà¹ˆà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ, คุณจะต้à¸à¸‡à¸à¸³à¸«à¸™à¸”ค่า %1$s ขà¸à¸‡ Piwik เพื่à¸à¸—ี่จะยà¸à¸¡à¸£à¸±à¸šà¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸‚à¸à¸‡à¸žà¸£à¹‡à¸à¸à¸‹à¸µà¹ˆ %2$s ที่ส่งต่à¸à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸‚à¸à¸‡à¹‚ฮสต์ นà¸à¸à¸ˆà¸²à¸à¸™à¸µà¹‰à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸§à¹ˆà¸²à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¸‚à¸à¸‡à¸„ุณจะถูà¸à¸ªà¹ˆà¸‡à¸à¸¢à¹ˆà¸²à¸‡à¸–ูà¸à¸•à¹‰à¸à¸‡",
"InvalidOrExpiredToken": "Token ไม่ถูà¸à¸•à¹‰à¸à¸‡à¸«à¸£à¸·à¸à¸«à¸¡à¸”à¸à¸²à¸¢à¸¸",
"InvalidUsernameEmail": "ไม่มี ชื่à¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ à¹à¸¥à¸°\/หรืภที่à¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¸¥à¹Œà¸”ังà¸à¸¥à¹ˆà¸²à¸§",
"LogIn": "เข้าสู่ระบบ",
diff --git a/plugins/Login/lang/tl.json b/plugins/Login/lang/tl.json
index 949573351ed970a4a316de1d4b5bf9e361423eaa..e11aa0e681c28d09a325e5085066e4c8dc3f0894 100644
--- a/plugins/Login/lang/tl.json
+++ b/plugins/Login/lang/tl.json
@@ -4,7 +4,7 @@
"ContactAdmin": "Mga posibleng dahilan: maaaring hindi pinagana ng iyong host ang function mail (). <br \/> Mangyaring makipag-ugnay sa iyong Piwik administrator.",
"ExceptionInvalidSuperUserAccessAuthenticationMethod": "Ang isang user na may Super-access ay hindi maaaring e-authenticate gamit ang '%s' mechanism.",
"ExceptionPasswordMD5HashExpected": "Ang parameter ng password ay inaasahan na maging isang MD5 hash ng password.",
- "InvalidNonceOrHeadersOrReferrer": "Form security failed. Mangyaring i-reload ang form at suriin kung ang iyong cookies ay gumagana. Kung ikaw ay gumagamit ng proxy server dapat mong %s i-configure ang Piwik upang makatanggap ng proxy header %s para ma e-forward sa host header. At dapat mong e-check ang iyong Referrer header kung ito ay napadala ng tama.",
+ "InvalidNonceOrHeadersOrReferrer": "Form security failed. Mangyaring i-reload ang form at suriin kung ang iyong cookies ay gumagana. Kung ikaw ay gumagamit ng proxy server dapat mong %1$s i-configure ang Piwik upang makatanggap ng proxy header %2$s para ma e-forward sa host header. At dapat mong e-check ang iyong Referrer header kung ito ay napadala ng tama.",
"InvalidOrExpiredToken": "Ang token ay hindi wasto o nag-expire.",
"InvalidUsernameEmail": "Di-wasto ang username o e-mail address.",
"LogIn": "Mag-sign in",
diff --git a/plugins/Login/lang/vi.json b/plugins/Login/lang/vi.json
index caa4bd003be6b6721bfae7eb4f8076b36c06c219..f8274e299b580f24b312b91d32bab96f3c7f56af 100644
--- a/plugins/Login/lang/vi.json
+++ b/plugins/Login/lang/vi.json
@@ -3,7 +3,7 @@
"ConfirmationLinkSent": "Má»™t liên kết xác nháºn đã được gá»i đến há»™p thÆ° của bạn. Kiểm tra e-mail của bạn và truy cáºp và o liên kết nà y để cấp phép yêu cầu thay đổi máºt khẩu của bạn.",
"ContactAdmin": "Có thể lý do là : máy chủ của bạn có thể đã bị vô hiệu hóa hà m mail(). <br \/> Xin vui lòng liên hệ với quản trị viên Piwik của bạn.",
"ExceptionPasswordMD5HashExpected": "Máºt khẩu dá»± kiến ​​sẽ là má»™t máºt khẩu dạng mã MD5.",
- "InvalidNonceOrHeadersOrReferrer": "Hình thức bảo máºt thất bại. Hãy nạp lại hình thức bảo máºt và kiểm tra các cookie là được kÃch hoạt. Nếu bạn sá» dụng má»™t máy chủ proxy, bạn phải cấu hình %s Piwik chấp nháºn %s tiêu Ä‘á» proxy chuyển tiếp tiêu Ä‘á» máy chủ. Ngoà i ra, kiểm tra rằng tiêu Ä‘á» trang giá»›i thiệu của bạn được gá»i má»™t cách chÃnh xác.",
+ "InvalidNonceOrHeadersOrReferrer": "Hình thức bảo máºt thất bại. Hãy nạp lại hình thức bảo máºt và kiểm tra các cookie là được kÃch hoạt. Nếu bạn sá» dụng má»™t máy chủ proxy, bạn phải cấu hình %1$s Piwik chấp nháºn %2$s tiêu Ä‘á» proxy chuyển tiếp tiêu Ä‘á» máy chủ. Ngoà i ra, kiểm tra rằng tiêu Ä‘á» trang giá»›i thiệu của bạn được gá»i má»™t cách chÃnh xác.",
"InvalidOrExpiredToken": "Mã thông báo là không hợp lệ hoặc đã hết hạn.",
"InvalidUsernameEmail": "Tên hoặc địa chỉ e-mail truy cáºp không hợp lệ.",
"LogIn": "Äăng nháºp",
diff --git a/plugins/Login/lang/zh-cn.json b/plugins/Login/lang/zh-cn.json
index 98c38d68249750ec846e29f48b93a272c4f76cd0..1b128e914d387376544877bca50dab1d84e47d01 100644
--- a/plugins/Login/lang/zh-cn.json
+++ b/plugins/Login/lang/zh-cn.json
@@ -3,7 +3,7 @@
"ConfirmationLinkSent": "确认链接已å‘到您的邮箱，请接收邮件并点击链接确认密ç 修改。",
"ContactAdmin": "å¯èƒ½çš„åŽŸå› : 您的主机å¯èƒ½å·²ç»åœç”¨äº† mail() å‡½æ•°ï¼ <br \/>请è”络您的 Piwik 管ç†å‘˜ï¼",
"ExceptionPasswordMD5HashExpected": "密ç å‚数是一个 MD5 åŠ å¯†çš„å¯†ç 。",
- "InvalidNonceOrHeadersOrReferrer": "表å•å®‰å…¨æ£€æŸ¥å¤±è´¥ï¼Œè¯·é‡æ–°æ‰“开表å•ï¼Œæ£€æŸ¥æ˜¯å¦å¯ç”¨cookie。如果é…置了代ç†æœåŠ¡å™¨ï¼Œéœ€è¦ %s 设置Piwik接收代ç†å¤´ä¿¡æ¯ %s ，åŒæ—¶æ£€æŸ¥Referer头是å¦æ£ç¡®",
+ "InvalidNonceOrHeadersOrReferrer": "表å•å®‰å…¨æ£€æŸ¥å¤±è´¥ï¼Œè¯·é‡æ–°æ‰“开表å•ï¼Œæ£€æŸ¥æ˜¯å¦å¯ç”¨cookie。如果é…置了代ç†æœåŠ¡å™¨ï¼Œéœ€è¦ %1$s 设置Piwik接收代ç†å¤´ä¿¡æ¯ %2$s ，åŒæ—¶æ£€æŸ¥Referer头是å¦æ£ç¡®",
"InvalidOrExpiredToken": "å‡è¯æ— 效或已ç»è¿‡æœŸã€‚",
"InvalidUsernameEmail": "用户å或邮件地å€ä¸æ£ç¡®",
"LogIn": "登录",
diff --git a/plugins/Login/stylesheets/login.less b/plugins/Login/stylesheets/login.less
index 80c5e6e87b8914a5b638ecd75eaedccaffaf338f..ae35e24efdf5b3bb0f066f5afe2084f7ab0442d8 100644
--- a/plugins/Login/stylesheets/login.less
+++ b/plugins/Login/stylesheets/login.less
@@ -126,6 +126,7 @@
#login_form_login,
#reset_form_login {
background: @theme-color-background-base url(../../Morpheus/images/login-sprite.png) no-repeat;
+ outline: 0;
}
#login_form_password,
diff --git a/plugins/MobileAppMeasurable/lang/en.json b/plugins/MobileAppMeasurable/lang/en.json
index de6c59c8d2146667fff94c572747d60c20674fbb..073f2a415fbd198a25d1c3c0c366c64da509b18a 100644
--- a/plugins/MobileAppMeasurable/lang/en.json
+++ b/plugins/MobileAppMeasurable/lang/en.json
@@ -1,7 +1,7 @@
{
- "MobileAppMeasurable": {
- "MobileApp": "Mobile App",
- "MobileApps": "Mobile Apps",
- "MobileAppDescription": " A native mobile app for iOS, Android or any other mobile operating system."
- }
+ "MobileAppMeasurable": {
+ "MobileApp": "Mobile App",
+ "MobileApps": "Mobile Apps",
+ "MobileAppDescription": " A native mobile app for iOS, Android or any other mobile operating system."
+ }
}
\ No newline at end of file
diff --git a/plugins/MobileAppMeasurable/lang/lt.json b/plugins/MobileAppMeasurable/lang/lt.json
new file mode 100644
index 0000000000000000000000000000000000000000..7783ba817c49533fb755dfd1a4c236c041db075a
--- /dev/null
+++ b/plugins/MobileAppMeasurable/lang/lt.json
@@ -0,0 +1,5 @@
+{
+ "MobileAppMeasurable": {
+ "MobileApp": "Mobilioji programa"
+ }
+}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/bg.json b/plugins/MobileMessaging/lang/bg.json
index 2894a84bd8b400e715ed825ef1bee7611716aea9..ff1791594b9af923b00ad78503f32a765413f34d 100644
--- a/plugins/MobileMessaging/lang/bg.json
+++ b/plugins/MobileMessaging/lang/bg.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Името на доÑтавчика '%s' е неизвеÑтно. Пробвайте друго име вмеÑто: %s.",
+ "Exception_UnknownProvider": "Името на доÑтавчика '%1$s' е неизвеÑтно. Пробвайте друго име вмеÑто: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Могат да бъдат добавени повече телефонни номера доÑтъпвайки",
"MobileReport_MobileMessagingSettingsLink": "Страницата за наÑтройка на мобилните ÑъобщениÑ",
"MobileReport_NoPhoneNumbers": "МолÑ, активирайте поне един телефонен номер, доÑтъпвайки",
@@ -23,12 +23,12 @@
"Settings_SMSProvider": "SMS провайдър",
"Settings_SuperAdmin": "ÐаÑтройки на Ñупер потребителÑ",
"Settings_SuspiciousPhoneNumber": "Ðко не получите текÑтовото Ñъобщение, може да опитате без водещата нула. Ñ‚.е. %s",
- "Settings_UpdateOrDeleteAccount": "%sОбновÑване%s или %sизтриване%s на този профил.",
+ "Settings_UpdateOrDeleteAccount": "%1$sОбновÑване%2$s или %3$sизтриване%4$s на този профил.",
"Settings_ValidatePhoneNumber": "Валидиране",
"Settings_VerificationCodeJustSent": "Туко-що беше изпратено кратко Ñъобщение (SMS) до този номер Ñ ÐºÐ¾Ð´: молÑ, въведете този код в горното поле и натиÑнете „Потвърди“.",
"SettingsMenu": "Мобилни ÑъобщениÑ",
"TopLinkTooltip": "Вземете Web Analytics Reports доÑтавен във вашата пощенÑка ÐºÑƒÑ‚Ð¸Ñ Ð¸Ð»Ð¸ във Ð²Ð°ÑˆÐ¸Ñ Ð¼Ð¾Ð±Ð¸Ð»ÐµÐ½ телефон!",
"TopMenu": "Email & SMS Доклади",
- "VerificationText": "Кодът е %s. За да потвърдите Ð²Ð°ÑˆÐ¸Ñ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½ÐµÐ½ номер и да получите Piwik SMS отчети, молÑ, копирайте този код във формата доÑтъпна чрез Piwik > %s > %s."
+ "VerificationText": "Кодът е %1$s. За да потвърдите Ð²Ð°ÑˆÐ¸Ñ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½ÐµÐ½ номер и да получите Piwik SMS отчети, молÑ, копирайте този код във формата доÑтъпна чрез Piwik > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/cs.json b/plugins/MobileMessaging/lang/cs.json
index 6b4d0ad68b03454d8cdcf7ca697a65110435b1b4..f8492f1f616c5510fa634b7f30232edd4c3f8044 100644
--- a/plugins/MobileMessaging/lang/cs.json
+++ b/plugins/MobileMessaging/lang/cs.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Jméno poskytovatele '%s' nenà známé. Zkuste některé z %s.",
+ "Exception_UnknownProvider": "Jméno poskytovatele '%1$s' nenà známé. Zkuste některé z %2$s.",
"MobileReport_AdditionalPhoneNumbers": "VÃce telefonnÃch ÄÃsel můžete pÅ™idat pÅ™ejitÃm na",
"MobileReport_MobileMessagingSettingsLink": "Stránka nastavenà mobilnÃch zpráv",
"MobileReport_NoPhoneNumbers": "ProsÃm aktivujte aspoň jedno telefonnà ÄÃslo pÅ™ejitÃm na",
@@ -27,15 +27,15 @@
"Settings_PleaseSignUp": "Pokud chcetevytvářet SMS hlášenà a dostávat krátké zprávy o statistikách do svého telefonu, zaregistrujte se na SMS API a zadejte svoje informace nÞe.",
"Settings_SMSAPIAccount": "Správa SMS API úÄtu",
"Settings_SMSProvider": "SMS Provider",
- "Settings_SuperAdmin": "Nastavenà super uživatele",
+ "Settings_SuperAdmin": "Nastavenà super-uživatele",
"Settings_SuspiciousPhoneNumber": "Pokud neobdržÃte SMS zprávu, můžete to zkusit bez úvodnà nuly, t. j. %s",
- "Settings_UpdateOrDeleteAccount": "Také můžete tento úÄet %saktualizovat%s nebo %ssmazat%s.",
+ "Settings_UpdateOrDeleteAccount": "Také můžete tento úÄet %1$saktualizovat%2$s nebo %3$ssmazat%4$s.",
"Settings_ValidatePhoneNumber": "Ověřit",
"Settings_VerificationCodeJustSent": "PrávÄ› jsme na zadané telefonnà ÄÃslo odeslali SMS s kódem. Zadejte ho výše a stisknÄ›te \"ověřit\".",
"SettingsMenu": "Mobilnà zprávy",
"SMS_Content_Too_Long": "[pÅ™ÃliÅ¡ dlouhé]",
- "TopLinkTooltip": "Nechte si webové analýzy zasÃlat na email nebo na svůj mobilnà telefon.",
- "TopMenu": "Email a SMS reporty",
- "VerificationText": "Kód je %s. Pro ověřenà vaÅ¡eh otelefonnÃho ÄÃsla tento kód zkopÃrujte do formuláře pÅ™Ãstupného na Piwik > %s > %s."
+ "TopLinkTooltip": "Nechte si webové analýzy zasÃlat na e-mail nebo na svůj mobilnà telefon.",
+ "TopMenu": "E-mail a SMS hlášenÃ",
+ "VerificationText": "Kód je %1$s. Pro ověřenà vaÅ¡eh otelefonnÃho ÄÃsla tento kód zkopÃrujte do formuláře pÅ™Ãstupného na Piwik > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/da.json b/plugins/MobileMessaging/lang/da.json
index 0be0220ae2fc4f9ed40ef46b32c11eacc4649929..0f61cf442295d5cfb4b2afb48ddbf01a22ce6b08 100644
--- a/plugins/MobileMessaging/lang/da.json
+++ b/plugins/MobileMessaging/lang/da.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Udbydernavn '%s' er ukendt. Prøv et af følgende i stedet: %s.",
+ "Exception_UnknownProvider": "Udbydernavn '%1$s' er ukendt. Prøv et af følgende i stedet: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Du kan tilføje flere telefonnumre ved at åbne",
"MobileReport_MobileMessagingSettingsLink": "Mobil besked indstillinger",
"MobileReport_NoPhoneNumbers": "Aktiver mindst ét telefonnummer ved at besøge",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "SMS udbyder",
"Settings_SuperAdmin": "Superbruger indstillinger",
"Settings_SuspiciousPhoneNumber": "Hvis du ikke modtager en SMS-besked, kan du prøve uden det forreste nul. dvs. %s",
- "Settings_UpdateOrDeleteAccount": "Du kan også %sopdatere%s eller %sslette%s denne konto.",
+ "Settings_UpdateOrDeleteAccount": "Du kan også %1$sopdatere%2$s eller %3$sslette%4$s denne konto.",
"Settings_ValidatePhoneNumber": "Bekræft",
"Settings_VerificationCodeJustSent": "Vi har sendt dig en SMS med en kode til dette nummer: Indtast denne kode nedenfor og klik på \"Godkend\".",
"SettingsMenu": "Mobile beskeder",
"SMS_Content_Too_Long": "[for lang]",
"TopLinkTooltip": "FÃ¥ web analyse rapporter leveret til din indbakke eller din mobiltelefon!",
"TopMenu": "Email & SMS rapporter",
- "VerificationText": "Koden er %s. For at validere dit telefonnummer og modtage Piwik SMS rapporter, kopierer koden til formularen tilgængelig på Piwik > %s > %s."
+ "VerificationText": "Koden er %1$s. For at validere dit telefonnummer og modtage Piwik SMS rapporter, kopierer koden til formularen tilgængelig på Piwik > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/de.json b/plugins/MobileMessaging/lang/de.json
index 1a79a7059ef3da564b5e59eea863e0db3fd7ceee..4a704f36fdd0a1c17b7b5b4196113ba60d77bbee 100644
--- a/plugins/MobileMessaging/lang/de.json
+++ b/plugins/MobileMessaging/lang/de.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Der Anbietername '%s' ist unbekannt. Versuchen Sie stattdessen einen der folgenden: %s.",
+ "Exception_UnknownProvider": "Der Anbietername '%1$s' ist unbekannt. Versuchen Sie stattdessen einen der folgenden: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Sie können weitere Telefonnummern hinzufügen auf",
"MobileReport_MobileMessagingSettingsLink": "der Mobile Messaging Einstellungsseite",
"MobileReport_NoPhoneNumbers": "Bitte aktivieren Sie mindestens eine Telefonnummer auf",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "SMS-Anbieter",
"Settings_SuperAdmin": "Einstellungen für Hauptadministrator",
"Settings_SuspiciousPhoneNumber": "Falls Sie keine Textnachricht erhalten probieren Sie es bitte ohne eine führende 0, z.B.: %s",
- "Settings_UpdateOrDeleteAccount": "Sie können diesen Zugang auch %saktualisieren%s oder %sentfernen%s.",
+ "Settings_UpdateOrDeleteAccount": "Sie können diesen Zugang auch %1$saktualisieren%2$s oder %3$sentfernen%4$s.",
"Settings_ValidatePhoneNumber": "Validieren",
"Settings_VerificationCodeJustSent": "Wir haben Ihnen eine SMS mit einem Code an diese Nummer geschickt: Bitte geben Sie diesen Code unterhalb ein und klicken auf \"Validieren\".",
"SettingsMenu": "Mobile Messaging",
"SMS_Content_Too_Long": "[zu lang]",
"TopLinkTooltip": "Erhalten Sie Webanalytik Berichte direkt in Ihren E-Mail Posteingang oder auf Ihr Mobiltelefon!",
"TopMenu": "E-Mail & SMS Berichte",
- "VerificationText": "Der Code lautet %s. Um Ihre Telefonnummer zu validieren und Piwik SMS Berichte zu erhalten kopieren Sie bitte diesen Code in das Formular unter Piwik > %s > %s."
+ "VerificationText": "Der Code lautet %1$s. Um Ihre Telefonnummer zu validieren und Piwik SMS Berichte zu erhalten kopieren Sie bitte diesen Code in das Formular unter Piwik > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/el.json b/plugins/MobileMessaging/lang/el.json
index dd378aceacf35cc48b4fbca726fdf27f99161d46..a51270908a3c10d042beb3dda6960527fbb575d5 100644
--- a/plugins/MobileMessaging/lang/el.json
+++ b/plugins/MobileMessaging/lang/el.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Άγνωστο όνομα ΠαÏόχου '%s'. Εναλλακτικά, δοκιμάστε Îνα από τα παÏακάτω: %s.",
+ "Exception_UnknownProvider": "Άγνωστο όνομα ΠαÏόχου '%1$s'. Εναλλακτικά, δοκιμάστε Îνα από τα παÏακάτω: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "ΜποÏείτε να Ï€ÏοσθÎσετε πεÏισσότεÏους αÏιθμοÏÏ‚ τηλεφώνου με Ï€Ïόσβαση",
"MobileReport_MobileMessagingSettingsLink": "τη σελίδα Ïυθμίσεων ΜηνÏματα σε Κινητά",
"MobileReport_NoPhoneNumbers": "ΠαÏακαλοÏμε ενεÏγοποιήστε τουλάχιστον Îναν αÏιθμό τηλεφώνου με Ï€Ïόσβαση",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "ΠάÏοχος SMS",
"Settings_SuperAdmin": "Ρυθμίσεις ΥπεÏχÏήστη",
"Settings_SuspiciousPhoneNumber": "Εάν δεν λάβετε το μήνυμα κειμÎνου, μποÏείτε να δοκιμάσετε χωÏίς το Ï€Ïόθεμα μηδÎν, δηλαδή %s",
- "Settings_UpdateOrDeleteAccount": "ΜποÏείτε επίσης να %sαναβαθμίσετε%s ή να %sδιαγÏάψετε%s αυτό το λογαÏιασμό.",
+ "Settings_UpdateOrDeleteAccount": "ΜποÏείτε επίσης να %1$sÏ„Ïοποποιήσετε%2$s ή να %3$sδιαγÏάψετε%4$s αυτόν τον λογαÏιασμό.",
"Settings_ValidatePhoneNumber": "Επαλήθευση",
"Settings_VerificationCodeJustSent": "Στείλαμε μόλις Îνα SMS σε αυτόν τον αÏιθμό με κωδικό: παÏακαλώ πληκτÏολογήστε το κωδικό παÏαπάνω και κάντε κλικ στο κουμπί \"Επαλήθευση\".",
"SettingsMenu": "ΜηνÏματα σε Κινητά",
"SMS_Content_Too_Long": "[Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ μήκος]",
"TopLinkTooltip": "Λάβετε αναφοÏÎÏ‚ Στατιστικών Ιστοσελίδων στο e-mail σας ή το κινητό σας τηλÎφωνο!",
"TopMenu": "ΑναφοÏÎÏ‚ Email & SMS",
- "VerificationText": "Ο κωδικός είναι %s. Για να επικυÏώσετε τον αÏιθμό τηλεφώνου σας και να λάβετε αναφοÏÎÏ‚ του Piwik με SMS παÏακαλοÏμε αντιγÏάψτε τον κώδικα σε μοÏφή Ï€Ïοσβάσιμη μÎσω του Piwik > %s > %s."
+ "VerificationText": "Ο κωδικός είναι %1$s. Για να επαληθεÏσετε τον τηλεφωνικό σας αÏιθμό και να λάβετε αναφοÏÎÏ‚ του Piwik σε SMS, αντιγÏάψτε τον κωδικό αυτόν στη διαθÎσιμη φόÏμα στο Piwik > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/en.json b/plugins/MobileMessaging/lang/en.json
index 63df29ceefd9f7a037da9e5592dd5bde2658038d..3bc39147efc57bf613fb6f90d4cec0e1d662463d 100644
--- a/plugins/MobileMessaging/lang/en.json
+++ b/plugins/MobileMessaging/lang/en.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Provider name '%s' unknown. Try any of the following instead: %s.",
+ "Exception_UnknownProvider": "Provider name '%1$s' unknown. Try any of the following instead: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "You can add more phone numbers by accessing",
"MobileReport_MobileMessagingSettingsLink": "the Mobile Messaging settings page",
"MobileReport_NoPhoneNumbers": "Please activate at least one phone number by accessing",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "SMS Provider",
"Settings_SuperAdmin": "Super User Settings",
"Settings_SuspiciousPhoneNumber": "If you don't receive the text message, you may try without the leading zero. ie. %s",
- "Settings_UpdateOrDeleteAccount": "You can also %supdate%s or %sdelete%s this account.",
+ "Settings_UpdateOrDeleteAccount": "You can also %1$supdate%2$s or %3$sdelete%4$s this account.",
"Settings_ValidatePhoneNumber": "Validate",
"Settings_VerificationCodeJustSent": "We just sent a SMS to this number with a code: please enter this code above and click \"Validate\".",
"SettingsMenu": "Mobile Messaging",
"SMS_Content_Too_Long": "[too long]",
"TopLinkTooltip": "Get Web Analytics Reports delivered to your email inbox or your mobile phone.",
"TopMenu": "Email & SMS Reports",
- "VerificationText": "Code is %s. To validate your phone number and receive Piwik SMS reports please copy this code in the form accessible via Piwik > %s > %s."
+ "VerificationText": "Code is %1$s. To validate your phone number and receive Piwik SMS reports please copy this code in the form accessible via Piwik > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/es.json b/plugins/MobileMessaging/lang/es.json
index 2de7c1e0719c6316f50209d90a59fbf41642b541..68b8c3a083ab989f2ed5216271a0f8ad73074011 100644
--- a/plugins/MobileMessaging/lang/es.json
+++ b/plugins/MobileMessaging/lang/es.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Nombre del proveedor '%s' desconocido. Intente con los siguientes: %s.",
+ "Exception_UnknownProvider": "Nombre del proveedor '%1$s' desconocido. Intente con los siguientes: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Puede agregar más números telefónicos accediendo",
"MobileReport_MobileMessagingSettingsLink": "página de configuraciones de mensajerÃa móvil",
"MobileReport_NoPhoneNumbers": "Por favor, active al menos un número telefónico accediendo",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "Proveedor SMS",
"Settings_SuperAdmin": "Configuraciones Super Usuario",
"Settings_SuspiciousPhoneNumber": "Si no recibe el mensaje de texto, puede intentarlo sin el cero inicial. Por ejemplo, %s",
- "Settings_UpdateOrDeleteAccount": "Puede también %sactualizar%s o %sborrar%s esta cuenta.",
+ "Settings_UpdateOrDeleteAccount": "Puede también %1$sactualizar%2$s o %3$sborrar%4$s esta cuenta.",
"Settings_ValidatePhoneNumber": "Convalidado",
"Settings_VerificationCodeJustSent": "Hemos enviado un mensaje de texto (SMS) con un código: por favor, ingrese este código arriba y clic en \"Validar\".",
"SettingsMenu": "Mensajero móvil",
"SMS_Content_Too_Long": "[demasiado largo]",
"TopLinkTooltip": "Obtenga informes analÃticos de su sitio de internet enviados a su casilla de correo electrónico o su teléfono móvil.",
"TopMenu": "Informes por correo electrónico & SMS",
- "VerificationText": "Código es %s. Para validar su número de teléfono y recibir los informes Piwik vÃa mensaje de texto (SMS), por favor, copie este código en el formulario accesible vÃa Piwik > %s > %s."
+ "VerificationText": "Código es %1$s. Para validar su número de teléfono y recibir los informes Piwik vÃa mensaje de texto (SMS), por favor, copie este código en el formulario accesible vÃa Piwik > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/fa.json b/plugins/MobileMessaging/lang/fa.json
index 3df2e4344023cb5a752c5351293c635d0cea9900..418407be1dc4b950d3b655a1b435c435771c86bc 100644
--- a/plugins/MobileMessaging/lang/fa.json
+++ b/plugins/MobileMessaging/lang/fa.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "ارائه کننده خدمات با نام '%s' ناشناخته است. یکی از این ها را امتØان کنید: %s",
+ "Exception_UnknownProvider": "ارائه کننده خدمات با نام '%1$s' ناشناخته است. یکی از این ها را امتØان کنید: %2$s",
"MobileReport_AdditionalPhoneNumbers": "پس از دسترسی Ù…ÛŒ توانید شماره موبایل های بیشتری اضاÙÙ‡ کنید",
"MobileReport_MobileMessagingSettingsLink": "صÙØÙ‡ تنظیمات پیام رسانی با موبایل",
"MobileReport_NoPhoneNumbers": "لطÙا پس از دسترسی Øداقل یک شماره موبایل را Ùعال کنید",
@@ -25,7 +25,7 @@
"Settings_SMSAPIAccount": "تنظیم اکانت SMS API",
"Settings_SMSProvider": "ارائه دهنده خدمات پیامک",
"Settings_SuperAdmin": "تنظیمات ابر کاربر",
- "Settings_UpdateOrDeleteAccount": "شما می توانید این اکانت را %supdate%s یا %sdelete%s نمایید.",
+ "Settings_UpdateOrDeleteAccount": "شما می توانید این اکانت را %1$supdate%2$s یا %3$sdelete%4$s نمایید.",
"Settings_ValidatePhoneNumber": "تایید",
"Settings_VerificationCodeJustSent": "ما همین الان یک پیامک به همراه یک کد به این شماره Ùرستادیم: لطÙا آن کد را بالا وارد کنید Ùˆ بر روی \"تایید\" کلیک کنید.",
"SettingsMenu": "پیام رسانی با موبایل",
diff --git a/plugins/MobileMessaging/lang/fi.json b/plugins/MobileMessaging/lang/fi.json
index c4dab907836709267d430a8831317b0da02af4cd..169451300157b73da18817ce6d5e8331a4934fb6 100644
--- a/plugins/MobileMessaging/lang/fi.json
+++ b/plugins/MobileMessaging/lang/fi.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Tarjoajan nimi '%s' on tuntematon. Kokeile jotakin seuraavista: %s.",
+ "Exception_UnknownProvider": "Tarjoajan nimi '%1$s' on tuntematon. Kokeile jotakin seuraavista: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Voit lisätä puhelinnumeroita",
"MobileReport_MobileMessagingSettingsLink": "Mobiiliviestinnän asetukset",
"MobileReport_NoPhoneNumbers": "Aktivoi vähintään yksi puhelinnumero",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "SMS-toimittaja",
"Settings_SuperAdmin": "Superkäyttäjäasetukset",
"Settings_SuspiciousPhoneNumber": "Jos et saa tekstiviestiä, kokeile ottaa ensimmäinen nolla pois numerosta, eli %s",
- "Settings_UpdateOrDeleteAccount": "Voit myös %späivittää%s tai %spoistaa%s tämän tilin.",
+ "Settings_UpdateOrDeleteAccount": "Voit myös %1$späivittää%2$s tai %3$spoistaa%4$s tämän tilin.",
"Settings_ValidatePhoneNumber": "Varmista",
"Settings_VerificationCodeJustSent": "Olemme juuri lähettäneet tähän numeroon koodin sisältävän tekstiviestin: kirjoita koodi ylle ja klikkaa \"Todenna\".",
"SettingsMenu": "Mobiiliviestit",
"SMS_Content_Too_Long": "[liian pitkä]",
"TopLinkTooltip": "Saa verkkoanalyysiraportteja suoraan sähköpostiisi tai puhelimeesi!",
"TopMenu": "Sähköposti- ja SMS-raportit",
- "VerificationText": "Koodi on %s. Todentaaksesi puhelinnumerosi ja vastaanottaaksesi Piwik SMS raportteja, kopioi tämä koodi lomakkeeseen, jonka löydät Piwikissä > %s > %s."
+ "VerificationText": "Koodi on %1$s. Todentaaksesi puhelinnumerosi ja vastaanottaaksesi Piwik SMS raportteja, kopioi tämä koodi lomakkeeseen, jonka löydät Piwikissä > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/fr.json b/plugins/MobileMessaging/lang/fr.json
index d3be3b6938dc9200f5d926b443cd7374b909a24f..26ee3e98f0483598aa7fb2c9cb29a9ef5c231aca 100644
--- a/plugins/MobileMessaging/lang/fr.json
+++ b/plugins/MobileMessaging/lang/fr.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Le fournisseur avec le nom '%s' est inconnu. Essayez un de ceux-ci à la place : %s.",
+ "Exception_UnknownProvider": "Le fournisseur avec le nom '%1$s' est inconnu. Essayez un de ceux-ci à la place : %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Vous pouvez ajouter plus de numéro de téléphone en accédant à ",
"MobileReport_MobileMessagingSettingsLink": "la page des paramètres mobiles",
"MobileReport_NoPhoneNumbers": "Veuillez activer au moins un des numéros de téléphone en accédant à ",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "Fournisseur SMS",
"Settings_SuperAdmin": "Paramètres Super Utilisateur",
"Settings_SuspiciousPhoneNumber": "Si vous ne recevez pas de SMS, vous devriez essayer sans le zéro initial. ie. %s",
- "Settings_UpdateOrDeleteAccount": "Vous pouvez aussi %smettre à jour%s ou %ssupprimer%s ce compte.",
+ "Settings_UpdateOrDeleteAccount": "Vous pouvez aussi %1$smettre à jour%2$s ou %3$ssupprimer%4$s ce compte.",
"Settings_ValidatePhoneNumber": "Valider",
"Settings_VerificationCodeJustSent": "Nous venons juste de vous envoyer un SMS à ce numéro avec un code : veuillez entrer ce code ci-dessus et cliquer sur \"Valider\".",
"SettingsMenu": "Messagerie Mobile",
"SMS_Content_Too_Long": "[trop long]",
"TopLinkTooltip": "Recevez vos rapports d'analyse web dans votre boite de courriels ou sur votre téléphone mobile!",
"TopMenu": "Rapports Email & SMS",
- "VerificationText": "Le code est %s. Pour valider votre numéro de téléphone et recevoir les rapports SMS de Piwik veuillez copier ce code dans le formulaire accessible via Piwik > %s > %s."
+ "VerificationText": "Le code est %1$s. Pour valider votre numéro de téléphone et recevoir les rapports SMS de Piwik veuillez copier ce code dans le formulaire accessible via Piwik > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/hi.json b/plugins/MobileMessaging/lang/hi.json
index ecb78d2b1020289ebacae70b08cb19142b1da8cd..ac074b88e5973c3cc664ee8aabaa2e41f1734d3f 100644
--- a/plugins/MobileMessaging/lang/hi.json
+++ b/plugins/MobileMessaging/lang/hi.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "पà¥à¤°à¤¦à¤¾à¤¤à¤¾ का नाम '%s' अजà¥à¤žà¤¾à¤¤ है. बजाय निमà¥à¤¨ में से किसी का पà¥à¤°à¤¯à¤¾à¤¸ करें:%s.",
+ "Exception_UnknownProvider": "पà¥à¤°à¤¦à¤¾à¤¤à¤¾ का नाम '%1$s' अजà¥à¤žà¤¾à¤¤ है. बजाय निमà¥à¤¨ में से किसी का पà¥à¤°à¤¯à¤¾à¤¸ करें:%2$s.",
"MobileReport_AdditionalPhoneNumbers": "तà¥à¤® अà¤à¤¿à¤—म के दà¥à¤µà¤¾à¤°à¤¾ अधिक फोन नंबर जोड़ सकते हैं",
"MobileReport_MobileMessagingSettingsLink": "मोबाइल संदेश सेटिंग पेज",
"MobileReport_NoPhoneNumbers": "अà¤à¤¿à¤—म के दà¥à¤µà¤¾à¤°à¤¾ कम से कम à¤à¤• फोन नंबर को सकà¥à¤°à¤¿à¤¯ करें",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "à¤à¤¸à¤à¤®à¤à¤¸ पà¥à¤°à¤¦à¤¾à¤¤à¤¾",
"Settings_SuperAdmin": "सà¥à¤ªà¤° पà¥à¤°à¤¯à¥‹à¤•à¥à¤¤à¤¾ सेटिंगà¥à¤¸",
"Settings_SuspiciousPhoneNumber": "आपको टेकà¥à¤¸à¥à¤Ÿ संदेश नहीं मिलता, तो आप अगà¥à¤°à¤£à¥€ शूनà¥à¤¯ के बिना कोशिश कर सकते हैं. अरà¥à¤¥à¤¾à¤¤à¥. %s",
- "Settings_UpdateOrDeleteAccount": "आप à¤à¥€ %sअपडेट%s करने या इस खाते को %sहटा%s सकते हैं.",
+ "Settings_UpdateOrDeleteAccount": "आप à¤à¥€ %1$sअपडेट%2$s करने या इस खाते को %3$sहटा%4$s सकते हैं.",
"Settings_ValidatePhoneNumber": "मानà¥à¤¯ करें",
"Settings_VerificationCodeJustSent": "हम सिरà¥à¤« à¤à¤• कोड के साथ इस संखà¥à¤¯à¤¾ के लिठà¤à¤• à¤à¤¸à¤à¤®à¤à¤¸ à¤à¥‡à¤œà¤¾: ऊपर यह कोड दरà¥à¤œ करें और \"मानà¥à¤¯\" पर कà¥à¤²à¤¿à¤• करें.",
"SettingsMenu": "मोबाइल संदेश",
"SMS_Content_Too_Long": "[बहà¥à¤¤ लंबा]",
"TopLinkTooltip": "आपके ईमेल इनबॉकà¥à¤¸ या आपके मोबाइल फोन के लिठवेब विशà¥à¤²à¥‡à¤·à¤¿à¤•à¥€ रिपोरà¥à¤Ÿ पà¥à¤°à¤¾à¤ªà¥à¤¤ करें!",
"TopMenu": "ईमेल और à¤à¤¸à¤à¤®à¤à¤¸ रिपोरà¥à¤Ÿà¥‡à¤‚",
- "VerificationText": "पà¥à¤°à¤µà¤¿à¤·à¥à¤Ÿ कोड %s है. अपना फोन नंबर मानà¥à¤¯ है और Piwik à¤à¤¸à¤à¤®à¤à¤¸ रिपोरà¥à¤Ÿ पà¥à¤°à¤¾à¤ªà¥à¤¤ करने के लिà¤. Piwik के माधà¥à¤¯à¤® से सà¥à¤²à¤ रूप से यह कोड की नकल बनाये कृपया > %s > %s."
+ "VerificationText": "पà¥à¤°à¤µà¤¿à¤·à¥à¤Ÿ कोड %1$s है. अपना फोन नंबर मानà¥à¤¯ है और Piwik à¤à¤¸à¤à¤®à¤à¤¸ रिपोरà¥à¤Ÿ पà¥à¤°à¤¾à¤ªà¥à¤¤ करने के लिà¤. Piwik के माधà¥à¤¯à¤® से सà¥à¤²à¤ रूप से यह कोड की नकल बनाये कृपया > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/id.json b/plugins/MobileMessaging/lang/id.json
index 5420b5a4188aabe2ba9c455b822b580af3831279..be3b8702454fdce52d6a30362c5f340ca8ce1128 100644
--- a/plugins/MobileMessaging/lang/id.json
+++ b/plugins/MobileMessaging/lang/id.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Nama penyedia '%s' tidak dikenal. Coba salah satu berikut ini sebagai pengganti: %s.",
+ "Exception_UnknownProvider": "Nama penyedia '%1$s' tidak dikenal. Coba salah satu berikut ini sebagai pengganti: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Anda dapat menambah nomor telepon dengan mengakses",
"MobileReport_MobileMessagingSettingsLink": "halaman pengaturan Pesan Bergerak",
"MobileReport_NoPhoneNumbers": "Harap aktifkan sekurangnya satu nomor telepon dengan mengakses",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "Penyedia SMS",
"Settings_SuperAdmin": "Pengaturan Pengguna Super",
"Settings_SuspiciousPhoneNumber": "Bila Anda tidak menerima pesan teks, silakan coba tanpa awalan nol. Misal, %s",
- "Settings_UpdateOrDeleteAccount": "Anda juga dapat %smemperbarui%s atau %smenghapus%s akun ini.",
+ "Settings_UpdateOrDeleteAccount": "Anda juga dapat %1$smemperbarui%2$s atau %3$smenghapus%4$s akun ini.",
"Settings_ValidatePhoneNumber": "Sahkan",
"Settings_VerificationCodeJustSent": "Kami baru saja mengirim sebuah SMS kepada nomor ini dengan kode: harap masukkan kode di atas dan klik \"Sahkan\".",
"SettingsMenu": "Pesan Bergerak",
"SMS_Content_Too_Long": "[terlalu panjang]",
"TopLinkTooltip": "Dapatkan Laporan Analitis Ramatraya dikirim ke kotak masuk surel atau telepon seluler Anda!",
"TopMenu": "Laporan Surel & SMS",
- "VerificationText": "Kode adalah %s. Untuk mengesahkan nomor telepon Anda dan memperoleh laporan SMS Piwik, harap menyalin kode ini di borang yang daoat diraih melalui Piwik > %s > %s."
+ "VerificationText": "Kode adalah %1$s. Untuk mengesahkan nomor telepon Anda dan memperoleh laporan SMS Piwik, harap menyalin kode ini di borang yang daoat diraih melalui Piwik > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/it.json b/plugins/MobileMessaging/lang/it.json
index e981206157bfd01ea8b2b8999faeeb3eff3885da..cb4e358da53f0034394e72004c77227cee564d7b 100644
--- a/plugins/MobileMessaging/lang/it.json
+++ b/plugins/MobileMessaging/lang/it.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Nome provider '%s' sconosciuto. Prova uno di questi: %s.",
+ "Exception_UnknownProvider": "Nome provider '%1$s' sconosciuto. Prova uno di questi: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Accedendo puoi aggiungere altri numeri telefonici",
"MobileReport_MobileMessagingSettingsLink": "pagina delle impostazioni Messaggistica Mobile",
"MobileReport_NoPhoneNumbers": "Si prega di attivare con l'accesso almeno un numero di telefono",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "Gestore SMS",
"Settings_SuperAdmin": "Impostazioni Super User",
"Settings_SuspiciousPhoneNumber": "Se non si riceve il messaggio di testo, si può provare senza lo zero iniziale. Cioè %s",
- "Settings_UpdateOrDeleteAccount": "Puoi anche %saggiornare%s o %scancellare%s questo account.",
+ "Settings_UpdateOrDeleteAccount": "Puoi anche %1$saggiornare%2$s o %3$scancellare%4$s questo account.",
"Settings_ValidatePhoneNumber": "Convalida",
"Settings_VerificationCodeJustSent": "Abbiamo inviato ora un SMS con un codice a questo numero: si prega di inserire questo codice qui sopraa e cliccare su \"Convalida\".",
"SettingsMenu": "Messaggeria Mobile",
"SMS_Content_Too_Long": "[troppo lungo]",
"TopLinkTooltip": "Ricevi i Rapporti delle Statistiche Web sulla tua casella di posta elettronica o sul tuo cellulare!",
"TopMenu": "Rapporti Email & SMS",
- "VerificationText": "Il codice è %s. Per convalidare il tuo numero telefonico e ricevere i report SMS di Piwik copia questo codice nel form accessibile da Piwik > %s > %s."
+ "VerificationText": "Il codice è %1$s. Per convalidare il tuo numero telefonico e ricevere i report SMS di Piwik copia questo codice nel form accessibile da Piwik > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/ja.json b/plugins/MobileMessaging/lang/ja.json
index 06a6d42f02cc73ec636797f6cebd03c1db7528f2..7296a247ec8c7884985b63cea67705ed3aa5d8a3 100644
--- a/plugins/MobileMessaging/lang/ja.json
+++ b/plugins/MobileMessaging/lang/ja.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "プãƒãƒã‚¤ãƒ€å '%s' ã¯ä¸æ˜Žã§ã™ã€‚代ã‚ã‚Šã«æ¬¡ã®ã„ãšã‚Œã‹ã‚’ãŠè©¦ã—ãã ã•ã„。%s",
+ "Exception_UnknownProvider": "プãƒãƒã‚¤ãƒ€å '%1$s' ã¯ä¸æ˜Žã§ã™ã€‚代ã‚ã‚Šã«æ¬¡ã®ã„ãšã‚Œã‹ã‚’ãŠè©¦ã—ãã ã•ã„。%2$s",
"MobileReport_AdditionalPhoneNumbers": "アクセスã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šã€ã•ã‚‰ã«é›»è©±ç•ªå·ã‚’è¿½åŠ ã§ãã¾ã™ã€‚",
"MobileReport_MobileMessagingSettingsLink": "モãƒã‚¤ãƒ«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®è¨å®šãƒšãƒ¼ã‚¸",
"MobileReport_NoPhoneNumbers": "アクセスã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šã€å°‘ãªãã¨ã‚‚ 1 ã¤ä»¥ä¸Šã®é›»è©±ç•ªå·ã‚’有効ã«ã—ã¦ãã ã•ã„。",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "SMS プãƒãƒã‚¤ãƒ€",
"Settings_SuperAdmin": "スーパーユーザーè¨å®š",
"Settings_SuspiciousPhoneNumber": "テã‚ストメッセージをå—ã‘å–らãªã„å ´åˆã€å…ˆé ã« 0 を付ã‘ãšã«ãŠè©¦ã—ãã ã•ã„。例 %s",
- "Settings_UpdateOrDeleteAccount": "ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ %supdate%s ã¾ãŸã¯ %sdelete%s ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚",
+ "Settings_UpdateOrDeleteAccount": "ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ %1$supdate%2$s ã¾ãŸã¯ %3$sdelete%4$s ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚",
"Settings_ValidatePhoneNumber": "検証ã™ã‚‹",
"Settings_VerificationCodeJustSent": "今ã“ã®ç•ªå·ã«ã‚³ãƒ¼ãƒ‰ä»˜ãã® SMS ã‚’é€ä¿¡ã—ã¾ã—ãŸã€‚上ã®ã‚³ãƒ¼ãƒ‰ã‚’入力ã—ã€\"検証\" をクリックã—ã¦ãã ã•ã„。",
"SettingsMenu": "モãƒã‚¤ãƒ«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸",
"SMS_Content_Too_Long": "[ é•·éŽãŽã¾ã™ ]",
"TopLinkTooltip": "E メールå—ä¿¡ç®±ã¾ãŸã¯æºå¸¯é›»è©±ã«å±Šã‘られãŸã‚¦ã‚§ãƒ–解æžãƒ¬ãƒãƒ¼ãƒˆã‚’å–å¾—ã™ã‚‹",
"TopMenu": "Eメール & SMS レãƒãƒ¼ãƒˆ",
- "VerificationText": "コード㯠%sã§ã™ã€‚電話番å·ã‚’検証ã¾ãŸã¯ Piwik SMS レãƒãƒ¼ãƒˆã‚’å—ã‘å–ã‚‹ã«ã¯ã€Piwik > %s > %s 経由ã§ã‚¢ã‚¯ã‚»ã‚¹ã§ãるフォームã§ã“ã®ã‚³ãƒ¼ãƒ‰ã‚’コピーã—ã¦ãã ã•"
+ "VerificationText": "コード㯠%1$sã§ã™ã€‚電話番å·ã‚’検証ã¾ãŸã¯ Piwik SMS レãƒãƒ¼ãƒˆã‚’å—ã‘å–ã‚‹ã«ã¯ã€Piwik > %2$s > %3$s 経由ã§ã‚¢ã‚¯ã‚»ã‚¹ã§ãるフォームã§ã“ã®ã‚³ãƒ¼ãƒ‰ã‚’コピーã—ã¦ãã ã•"
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/ko.json b/plugins/MobileMessaging/lang/ko.json
index 44cb019a84abcfba46d496ca66d065c6e722f544..74f5ff5ed2cfcbb86665ae4ac80de7c516d1239c 100644
--- a/plugins/MobileMessaging/lang/ko.json
+++ b/plugins/MobileMessaging/lang/ko.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "'%s' ê³µê¸‰ìž ì´ë¦„ì€ ì•Œ 수 없습니다. ëŒ€ì‹ ë‹¤ìŒì„ 사용하세요: %s.",
+ "Exception_UnknownProvider": "'%1$s' ê³µê¸‰ìž ì´ë¦„ì€ ì•Œ 수 없습니다. ëŒ€ì‹ ë‹¤ìŒì„ 사용하세요: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "ì ‘ê·¼ì— ì˜í•´ ë” ë§Žì€ ì „í™” 번호를 ì¶”ê°€í• ìˆ˜ 있습니다",
"MobileReport_MobileMessagingSettingsLink": "ëª¨ë°”ì¼ ë©”ì‹œì§• ì„¤ì • 페ì´ì§€",
"MobileReport_NoPhoneNumbers": "ì ‘ê·¼ 단위로 하나 ì´ìƒì˜ ì „í™” 번호를 활성화해 주세요",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "SMS 공급ìž",
"Settings_SuperAdmin": "ìŠˆí¼ ìœ ì € ì„¤ì •",
"Settings_SuspiciousPhoneNumber": "만약 ë¬¸ìž ë©”ì‹œì§€ë¥¼ 받지 못했다면, ë‹¹ì‹ ì€ ë¦¬ë”© ì œë¡œ ì—†ì´ ì‹œë„í• ìˆ˜ 있습니다. 즉. %s",
- "Settings_UpdateOrDeleteAccount": "ë˜í•œ 해당 ê³„ì •ì„ %supdate%s나 %sdelete%sí• ìˆ˜ 있습니다.",
+ "Settings_UpdateOrDeleteAccount": "ë˜í•œ 해당 ê³„ì •ì„ %1$supdate%2$s나 %3$sdelete%4$sí• ìˆ˜ 있습니다.",
"Settings_ValidatePhoneNumber": "확ì¸",
"Settings_VerificationCodeJustSent": "해당 번호로 코드를 발송했습니다: ìˆ˜ì‹ í•œ 코드를 ìž…ë ¥í•˜ê³ '확ì¸'ì„ í´ë¦í•˜ì„¸ìš”.",
"SettingsMenu": "ëª¨ë°”ì¼ ë©”ì‹œì§•",
"SMS_Content_Too_Long": "[너무 김]",
"TopLinkTooltip": "ì´ë©”ì¼ ë˜ëŠ” íœ´ëŒ€ì „í™”ë¡œ 웹로그 분ì„ì„ ë³´ê³ í• ìˆ˜ 있습니다!",
"TopMenu": "ì´ë©”ì¼ ë° SMS ë³´ê³ ì„œ",
- "VerificationText": "ì¸ì¦ì½”드는 %s 입니다. Piwik SMS ë³´ê³ ì„œë¥¼ 받기 위한 ì „í™”ë²ˆí˜¸ 확ì¸ì„ 위해 ìˆ˜ì‹ í•œ ì¸ì¦ì½”드를 Piwik > %s > %s으로 ì´ë™í•˜ì—¬ ìž…ë ¥í•˜ì„¸ìš”."
+ "VerificationText": "ì¸ì¦ì½”드는 %1$s 입니다. Piwik SMS ë³´ê³ ì„œë¥¼ 받기 위한 ì „í™”ë²ˆí˜¸ 확ì¸ì„ 위해 ìˆ˜ì‹ í•œ ì¸ì¦ì½”드를 Piwik > %2$s > %3$s으로 ì´ë™í•˜ì—¬ ìž…ë ¥í•˜ì„¸ìš”."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/lt.json b/plugins/MobileMessaging/lang/lt.json
new file mode 100644
index 0000000000000000000000000000000000000000..35993aca89b7a92341351511c6bb707300c8d13c
--- /dev/null
+++ b/plugins/MobileMessaging/lang/lt.json
@@ -0,0 +1,11 @@
+{
+ "MobileMessaging": {
+ "Settings_APIKey": "API raktas",
+ "Settings_CountryCode": "Å alies kodas",
+ "Settings_DeleteAccountConfirm": "Ar tikrai norite ištrinti šią SMS paskyrą?",
+ "Settings_InvalidActivationCode": "Įvestas kodas buvo neteisingas, prašome bandyti dar kartą.",
+ "Settings_PhoneNumber": "Telefono numeris",
+ "Settings_PhoneNumbers_Add": "Pridėti naują telefono numerį",
+ "Settings_SuperAdmin": "Super naudotojo nustatymai"
+ }
+}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/nb.json b/plugins/MobileMessaging/lang/nb.json
index 79b4224f2a8c662b800d56216045c881afc44747..faea5eb984ede63e138c089a40645a994bc719b8 100644
--- a/plugins/MobileMessaging/lang/nb.json
+++ b/plugins/MobileMessaging/lang/nb.json
@@ -12,7 +12,7 @@
"Settings_SMSAPIAccount": "Behandle SMS API-konto",
"Settings_SMSProvider": "SMS-leverandør",
"Settings_SuperAdmin": "Superbruker-instillinger",
- "Settings_UpdateOrDeleteAccount": "Du kan også %soppdatere%s eller %sslette%s denne kontoen.",
+ "Settings_UpdateOrDeleteAccount": "\"Du kan også %1$soppdatere%2$s eller %3$sslette%4$s denne kontoen.",
"Settings_ValidatePhoneNumber": "Valider",
"Settings_VerificationCodeJustSent": "Vi har nettopp sendt en SMS til dette nummeret med en kode: Skriv inn denne koden ovenfor og klikk \"Valider\".",
"SettingsMenu": "Meldingstjenester",
diff --git a/plugins/MobileMessaging/lang/nl.json b/plugins/MobileMessaging/lang/nl.json
index 5c06b59c90351ef5ebc508fd29c32c396fd5d3d4..8c1c5f227652b1115b5c229dcdbfd66ef12f2e55 100644
--- a/plugins/MobileMessaging/lang/nl.json
+++ b/plugins/MobileMessaging/lang/nl.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Provider naam '%s' is onbekend. Probeer één van de volgende in de plaats: %s.",
+ "Exception_UnknownProvider": "Provider naam '%1$s' is onbekend. Probeer één van de volgende in de plaats: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Je kunt meer telefoon nummers toevoegen via",
"MobileReport_MobileMessagingSettingsLink": "De Mobiele Messaging instellingen pagina",
"MobileReport_NoPhoneNumbers": "Gelieve ten minste één telefoonnummer te activeren door",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "SMS provider",
"Settings_SuperAdmin": "Super User instellingen",
"Settings_SuspiciousPhoneNumber": "Indien je geen SMS bericht ontvangt, kun je proberen zonder de 0 vooraf te gaan. bijv. %s",
- "Settings_UpdateOrDeleteAccount": "Je kunt dit account ook %supdaten%s of %sverwijderen%s",
+ "Settings_UpdateOrDeleteAccount": "Je kunt dit account ook %1$supdaten%2$s of %3$sverwijderen%4$s",
"Settings_ValidatePhoneNumber": "Valideer",
"Settings_VerificationCodeJustSent": "We hebben net een SMS met een code naar dit nummer verstuurd: Gelieve de code hierboven in te vullen en klik op \"Valideer\".",
"SettingsMenu": "Mobiele berichten",
"SMS_Content_Too_Long": "[te lang]",
"TopLinkTooltip": "Krijg je Web Analyse rapporten toegestuurd naar je mailbox of je mobiele telefoon!",
"TopMenu": "Email & SMS Rapporten",
- "VerificationText": "Code %s. Kopieer deze code naar Piwik > %s > %s om je telefoonnummer te valideren en sms rapporten te ontvangen."
+ "VerificationText": "Code %1$s. Kopieer deze code naar Piwik > %2$s > %3$s om je telefoonnummer te valideren en sms rapporten te ontvangen."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/pt-br.json b/plugins/MobileMessaging/lang/pt-br.json
index 045303b9d10fa1c3072c7ade07f7601ccb4e6ef4..54e0c4239e63b73bb23db63d9b054d632649a592 100644
--- a/plugins/MobileMessaging/lang/pt-br.json
+++ b/plugins/MobileMessaging/lang/pt-br.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Nome do provedor '%s' desconhecido. Tente um dos seguintes: %s.",
+ "Exception_UnknownProvider": "Provedor '%1$s' desconhecido. Tente um dos seguintes em vez: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Você pode adicionar mais números de telefone, acessando",
"MobileReport_MobileMessagingSettingsLink": "Página de configurações de Mensagens móveis",
"MobileReport_NoPhoneNumbers": "Por favor ative pelo menos um número de telefone acessando",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "Provedor SMS",
"Settings_SuperAdmin": "Configurações de super usuário",
"Settings_SuspiciousPhoneNumber": "Se você não receber a mensagem de texto, você pode experimentar sem o zero à esquerda. ou seja. %s",
- "Settings_UpdateOrDeleteAccount": "Você também pode %satualizar%s ou %sapagar%s esta conta.",
+ "Settings_UpdateOrDeleteAccount": "Você também pode %1$satualizar%2$s ou %3$sapagar%4$s esta conta.",
"Settings_ValidatePhoneNumber": "Validar",
"Settings_VerificationCodeJustSent": "Acabamos de enviar um SMS para este número com um código: por favor digite o código acima e clique em \"Validar\".",
"SettingsMenu": "Mensagem móvel",
"SMS_Content_Too_Long": "[muito longo]",
"TopLinkTooltip": "Obter relatórios analÃticos da Web em seu e-mail ou telefone móvel!",
"TopMenu": "Relatórios de e-mail e SMS",
- "VerificationText": "O código é %s. Para validar o seu número de telefone e receber relatórios Piwik de SMS, copie este código no formulário acessÃvel no Piwik em > %s > %s."
+ "VerificationText": "O código é %1$s. Para validar o seu número de telefone e receber relatórios Piwik de SMS, copie este código no formulário acessÃvel no Piwik em > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/ro.json b/plugins/MobileMessaging/lang/ro.json
index ab8d4b18d7fe54b297cfeb69eee9da61f851b79d..60a35d16acac5d490e6ad2b245fde0c838fca7b9 100644
--- a/plugins/MobileMessaging/lang/ro.json
+++ b/plugins/MobileMessaging/lang/ro.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Numele furnizorului '%s' necunoscut. Încercați oricare dintre următoarele: %s.",
+ "Exception_UnknownProvider": "Numele furnizorului '%1$s' necunoscut. Încercați oricare dintre următoarele: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Poţi adîuga mai multe numele de telefon accesând",
"MobileReport_MobileMessagingSettingsLink": "Pagina setări mesage mobile",
"MobileReport_NoPhoneNumbers": "Vă rugăm să activați cel puțin un număr de telefon accesand",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "Operator SMS",
"Settings_SuperAdmin": "Setările utilizatorului privilegiat",
"Settings_SuspiciousPhoneNumber": "Dacă nu primiți un mesaj text, puteți încerca fără primul zero. de exemplu. %s.",
- "Settings_UpdateOrDeleteAccount": "Puteți, de asemenea %sactualiza%s sau %ssterge%s acest cont.",
+ "Settings_UpdateOrDeleteAccount": "Puteți, de asemenea %1$sactualiza%2$s sau %3$ssterge%4$s acest cont.",
"Settings_ValidatePhoneNumber": "Verifică",
"Settings_VerificationCodeJustSent": "Tocmai am trimis un SMS la acest număr cu un cod: Va rugam introduceti codul de mai sus și faceți clic pe \"Validare\".",
"SettingsMenu": "Mesagerie mobil",
"SMS_Content_Too_Long": "[prea lung]",
"TopLinkTooltip": "Web Analytics Rapoarte livrate pe email-ul sau telefonul mobil!",
"TopMenu": "Email & SMS Rapoarte",
- "VerificationText": "Codul este de %s. Pentru a valida numărul dvs. de telefon și pentru a primi rapoarte SMS Piwik vă rugăm să copiați acest cod în formă accesibilă prin intermediul Piwik > %s > %s."
+ "VerificationText": "Codul este de %1$s. Pentru a valida numărul dvs. de telefon și pentru a primi rapoarte SMS Piwik vă rugăm să copiați acest cod în formă accesibilă prin intermediul Piwik > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/ru.json b/plugins/MobileMessaging/lang/ru.json
index 96a0b55e1cfe45feaf7b983992dc9600f0538c2f..e54e2c7748fe5edaf97ff42cfe90ee5844c31a27 100644
--- a/plugins/MobileMessaging/lang/ru.json
+++ b/plugins/MobileMessaging/lang/ru.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Провайдер Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ '%s' неизвеÑтен. Попробуйте один из предложенных вариантов: %s.",
+ "Exception_UnknownProvider": "Провайдер Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ '%1$s' неизвеÑтен. Попробуйте один из предложенных вариантов: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Ð’Ñ‹ можете добавить неÑколько телефонных номеров получив доÑтуп",
"MobileReport_MobileMessagingSettingsLink": "Страница наÑтроек Mobile Messaging",
"MobileReport_NoPhoneNumbers": "ПожалуйÑта, включите Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ один номер телефона получив доÑтуп",
@@ -28,12 +28,12 @@
"Settings_SMSAPIAccount": "Управление API SMS аккаунтом",
"Settings_SMSProvider": "SMS-гейт",
"Settings_SuperAdmin": "ÐаÑтройки ÑуперпользователÑ",
- "Settings_UpdateOrDeleteAccount": "Так же вы можете %sобновить%s или %sудалить%s Ñтот аккаунт.",
+ "Settings_UpdateOrDeleteAccount": "Так же вы можете %1$sобновить%2$s или %3$sудалить%4$s Ñтот аккаунт.",
"Settings_ValidatePhoneNumber": "Проверить",
"Settings_VerificationCodeJustSent": "Мы только что отправили SMS Ñ ÐºÐ¾Ð´Ð¾Ð¼ на ваш номер: введите его ниже и нажмите \"Подтвердить\"",
"SettingsMenu": "СМС ÑообщениÑ",
"SMS_Content_Too_Long": "[Ñлишком длинно]",
"TopMenu": "Email и SMS отчёты",
- "VerificationText": "Код %s. Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ номера Вашего телефона и Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ SMS-отчетов Piwik, пожалуйÑта, Ñкопируйте Ñтот код в форму > %s > %s."
+ "VerificationText": "\"Код %1$s. Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ номера Вашего телефона и Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ SMS-отчетов Piwik, пожалуйÑта, Ñкопируйте Ñтот код в форму > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/sr.json b/plugins/MobileMessaging/lang/sr.json
index c2a01e2ac63a4bb8a665c84988630b1f3fafd023..d0c22a0182bc2d1a151901323e76990f1e487f79 100644
--- a/plugins/MobileMessaging/lang/sr.json
+++ b/plugins/MobileMessaging/lang/sr.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Ime provajdera '%s' je nepoznato. Pokušajte sa nekim od ovih: %s.",
+ "Exception_UnknownProvider": "Ime provajdera '%1$s' je nepoznato. Pokušajte sa nekim od ovih: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Možete dodati više brojeva telefona preko",
"MobileReport_MobileMessagingSettingsLink": "stranica sa podešavanjima za SMS",
"MobileReport_NoPhoneNumbers": "Molimo vas da aktivirate barem jedan broj telefona preko",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "SMS provajder",
"Settings_SuperAdmin": "Podešavanja za superkorisnika",
"Settings_SuspiciousPhoneNumber": "Ukoliko ne dobijete SMS poruku, pokušajte bez vodećih nula. Na primer %s",
- "Settings_UpdateOrDeleteAccount": "Ovaj nalog možete i %sažurirati%s ili %sobrisati%s.",
+ "Settings_UpdateOrDeleteAccount": "Ovaj nalog možete i %1$sažurirati%2$s ili %3$sobrisati%4$s.",
"Settings_ValidatePhoneNumber": "Validacija",
"Settings_VerificationCodeJustSent": "Upravo je poslata SMS poruka sa kodom na ovaj broj. Molimo vas da upišete kod u polje iznad i kliknete na \"Validacija\".",
"SettingsMenu": "SMS poruke",
"SMS_Content_Too_Long": "Sadržaj poruke je predug",
"TopLinkTooltip": "Neka izveÅ¡taji i analitike stižu u vaÅ¡e poÅ¡tansko sanduÄe ili na mobilni!",
"TopMenu": "Elektronski i SMS izveštaji",
- "VerificationText": "Kod je %s. Da biste izvrÅ¡ili validaciju broja vaÅ¡eg telefona i poÄeli da primate SMS izveÅ¡taje, molimo vas da kopirate ovaj kod u Piwik > %s > %s."
+ "VerificationText": "Kod je %1$s. Da biste izvrÅ¡ili validaciju broja vaÅ¡eg telefona i poÄeli da primate SMS izveÅ¡taje, molimo vas da kopirate ovaj kod u Piwik > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/sv.json b/plugins/MobileMessaging/lang/sv.json
index 4c1cd77c4d366a5f1b61a0e7e41599db4c4791b7..d7e3bfbd1995fd58fbcd8a64b60411dfd48171f8 100644
--- a/plugins/MobileMessaging/lang/sv.json
+++ b/plugins/MobileMessaging/lang/sv.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Användarnamn '%s' är okänt. Försök med något av följande istället: %s.",
+ "Exception_UnknownProvider": "Användarnamn '%1$s' är okänt. Försök med något av följande istället: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Du kan lägga till flera telefonnummer genom att ge dem tillgång",
"MobileReport_MobileMessagingSettingsLink": "Sidan för Mobila meddelanden",
"MobileReport_NoPhoneNumbers": "Aktivera minst ett telefonnummer genom att ge åtkomst",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "SMS Leverantör",
"Settings_SuperAdmin": "Administratörsinställningar",
"Settings_SuspiciousPhoneNumber": "Om du inte får något meddelande, pröva att ta bort första nollan i numret %s",
- "Settings_UpdateOrDeleteAccount": "Du kan också %suppdatera%s eller %sradera%s det här kontot.",
+ "Settings_UpdateOrDeleteAccount": "Du kan också %1$suppdatera%2$s eller %3$sradera%4$s det här kontot.",
"Settings_ValidatePhoneNumber": "Bekräfta",
"Settings_VerificationCodeJustSent": "Vi har precis skickat ett SMS till det här numret med en kod: var snäll och skriv in den här koden ovan och klicka på \"verifiera\"",
"SettingsMenu": "Mobila meddelanden",
"SMS_Content_Too_Long": "[för långt]",
"TopLinkTooltip": "FÃ¥ Webb Analysrapporter levererade till din mail inkorg eller din mobiltelefon",
"TopMenu": "E-post och SMS-rapporter",
- "VerificationText": "Koden är %s. För att verifiera ditt telefonnummer och få Piwiks SMS rapporter ber vi dig kopiera den här koden i formuläret för åtkomlighet via Piwik > %s > %s."
+ "VerificationText": "Koden är %1$s. För att verifiera ditt telefonnummer och få Piwiks SMS rapporter ber vi dig kopiera den här koden i formuläret för åtkomlighet via Piwik > %2$s > %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/tl.json b/plugins/MobileMessaging/lang/tl.json
index 22c3efe4c4e3059a9d7558694cb2e5ea59031307..36ffcd81d9f5c5f4ab54c3a34f85e0dd6921d376 100644
--- a/plugins/MobileMessaging/lang/tl.json
+++ b/plugins/MobileMessaging/lang/tl.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "%s' ay hindi kilalang pangalan ng Provider. Subukan ang alinman sa mga sumusunod sa halip: %s.",
+ "Exception_UnknownProvider": "'%1$s' ay hindi kilalang pangalan ng Provider. Subukan ang alinman sa mga sumusunod sa halip: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Maaari kang magdagdag iba pang numero ng telepono sa pag-access sa",
"MobileReport_MobileMessagingSettingsLink": "Ang pahina para sa Mobile Messaging settings.",
"MobileReport_NoPhoneNumbers": "Mangyaring i-activate ang kahit isang phone number sa pamamagitan ng pag-access",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "SMS Provider",
"Settings_SuperAdmin": "Mga Super Setting ng User",
"Settings_SuspiciousPhoneNumber": "Kung hindi mo natanggap ang text message maaari mong subukan mo ng walang mga zero sa unahan ng numbero. ibig sabihin. %s",
- "Settings_UpdateOrDeleteAccount": "Pwede mo ring %s i-update %s o %s tanggalin %s ang account na ito.",
+ "Settings_UpdateOrDeleteAccount": "Pwede mo ring %1$s i-update %2$s o %3$s tanggalin %4$s ang account na ito.",
"Settings_ValidatePhoneNumber": "Validate",
"Settings_VerificationCodeJustSent": "Kakapadala lang namin ng SMS sa numerong ito na may code na: mangyarin ilagay ang code sa taas at e-click ang \"Validate\".",
"SettingsMenu": "Mobile Messaging",
"SMS_Content_Too_Long": "[masyadong mahaba]",
"TopLinkTooltip": "Kumuha ng Ulat para sa Web Analytics na mai-hahatid sa iyong email inbox o sa iyong mobile phone.",
"TopMenu": "Mga ulat ng Email at SMS",
- "VerificationText": "Ang code ay %s. Upang mapatunayan ang iyong numero at makatanggap ng Piwik SMS mangyaring kopyahin ang code na ito sa form sa pamamagitan ng Piwik >%s >%s"
+ "VerificationText": "Ang code ay %1$s. Upang mapatunayan ang iyong numero at makatanggap ng Piwik SMS mangyaring kopyahin ang code na ito sa form sa pamamagitan ng Piwik >%2$s >%3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/vi.json b/plugins/MobileMessaging/lang/vi.json
index d5deb6ff9209c6fad7a2190360e3eb03848d5230..13c11448f8b1b9ea8f51d1af755f8d0902986c95 100644
--- a/plugins/MobileMessaging/lang/vi.json
+++ b/plugins/MobileMessaging/lang/vi.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "Tên nhà cung cấp '%s' chưa biết. ThỠcác cách sau đây để thay thế: %s.",
+ "Exception_UnknownProvider": "Tên nhà cung cấp '%1$s' chưa biết. ThỠcác cách sau đây để thay thế: %2$s.",
"MobileReport_AdditionalPhoneNumbers": "Bạn có thể thêm nhiá»u số Ä‘iện thoại bằng cách truy cáºp",
"MobileReport_MobileMessagingSettingsLink": "Trang cà i đặt tin nhắn di động",
"MobileReport_NoPhoneNumbers": "Hãy kÃch hoạt Ãt nhất má»™t số Ä‘iện thoại bằng cách truy cáºp",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "Nhà cung cấp SMS",
"Settings_SuperAdmin": "Cà i đặt siêu ngÆ°á»i dùng",
"Settings_SuspiciousPhoneNumber": "Nếu bạn không nháºn được tin nhắn văn bản, bạn có thể thá» ngoà i hà ng 0 đầu. tức là . %s",
- "Settings_UpdateOrDeleteAccount": "Bạn cÅ©ng có thể %s cáºp nháºt %s hoặc %s xóa %s tà i khoản nà y.",
+ "Settings_UpdateOrDeleteAccount": "Bạn cÅ©ng có thể %1$s cáºp nháºt %2$s hoặc %3$s xóa %4$s tà i khoản nà y.",
"Settings_ValidatePhoneNumber": "Xác nháºn",
"Settings_VerificationCodeJustSent": "Chúng tôi đã gá»i má»™t tin nhắn SMS đến số nà y vá»›i má»™t mã số: vui lòng Ä‘iá»n mã ở trên và click \"Xác nháºn\".",
"SettingsMenu": "Tin nhắn trên điện thoại di động",
"SMS_Content_Too_Long": "[quá lâu]",
"TopLinkTooltip": "Nháºn các báo cáo Web Analytics đã được gá»i đến há»™p thÆ° email của bạn hoặc Ä‘iện thoại di Ä‘á»™ng của bạn!",
"TopMenu": "Các báo cáo Email & SMS",
- "VerificationText": "Mã số là %s. Äể xác nháºn số Ä‘iện thoại của bạn và nháºn được báo cáo SMS Piwik hãy sao chép mã nà y trong mẫu truy cáºp thông qua Piwik > %s> %s."
+ "VerificationText": "Mã số là %1$s. Äể xác nháºn số Ä‘iện thoại của bạn và nháºn được báo cáo SMS Piwik hãy sao chép mã nà y trong mẫu truy cáºp thông qua Piwik > %2$s> %3$s."
}
}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/lang/zh-cn.json b/plugins/MobileMessaging/lang/zh-cn.json
index ea6510149994453070d8edf14a47ed08afef3830..8dec33bdc43d66d5f5508051d89c252785917b7b 100644
--- a/plugins/MobileMessaging/lang/zh-cn.json
+++ b/plugins/MobileMessaging/lang/zh-cn.json
@@ -1,6 +1,6 @@
{
"MobileMessaging": {
- "Exception_UnknownProvider": "æœåŠ¡å•†åå— '%s' 未知，请试试下é¢çš„: %s。",
+ "Exception_UnknownProvider": "æœåŠ¡å•†åå— '%1$s' 未知，请试试下é¢çš„: %2$s。",
"MobileReport_AdditionalPhoneNumbers": "通过访问，您å¯ä»¥æ·»åŠ 多个电è¯å·ç ",
"MobileReport_MobileMessagingSettingsLink": "手机çŸä¿¡è®¾ç½®é¡µ",
"MobileReport_NoPhoneNumbers": "激活至少一个电è¯å·ç ，请访问",
@@ -29,13 +29,13 @@
"Settings_SMSProvider": "çŸä¿¡æœåŠ¡å•†",
"Settings_SuperAdmin": "用户设置",
"Settings_SuspiciousPhoneNumber": "如果没有收到çŸä¿¡ï¼Œè¯•è¯•å‰é¢ä¸è¦ 0。例如. %s",
- "Settings_UpdateOrDeleteAccount": "您也å¯ä»¥ %s修改%s 或 %såˆ é™¤%s 这个å¸å·ã€‚",
+ "Settings_UpdateOrDeleteAccount": "您也å¯ä»¥ %1$s修改%2$s 或 %3$såˆ é™¤%4$s 这个å¸å·ã€‚",
"Settings_ValidatePhoneNumber": "有效",
"Settings_VerificationCodeJustSent": "我们刚å‘了代ç çŸä¿¡åˆ°è¿™ä¸ªå·ç : 请输入上é¢çš„代ç 然åŽç‚¹ \"验è¯\"。",
"SettingsMenu": "手机çŸä¿¡",
"SMS_Content_Too_Long": "[太长]",
"TopLinkTooltip": "设置网站分æžæŠ¥è¡¨å‘é€åˆ°é‚®ç®±æˆ–者手机!",
"TopMenu": "邮件和çŸä¿¡æŠ¥è¡¨",
- "VerificationText": "代ç 为 %s。è¦éªŒè¯ç”µè¯å·ç åŠæŽ¥æ”¶ Piwik çŸä¿¡æŠ¥è¡¨ï¼Œè¯·å¤åˆ¶æœ¬ä»£ç 到 Piwik > %s > %s çš„è¡¨æ ¼ä¸ã€‚"
+ "VerificationText": "代ç 为 %1$s。è¦éªŒè¯ç”µè¯å·ç åŠæŽ¥æ”¶ Piwik çŸä¿¡æŠ¥è¡¨ï¼Œè¯·å¤åˆ¶æœ¬ä»£ç 到 Piwik > %2$s > %3$s çš„è¡¨æ ¼ä¸ã€‚"
}
}
\ No newline at end of file
diff --git a/plugins/Monolog/tests/System/TrackerLoggingTest.php b/plugins/Monolog/tests/System/TrackerLoggingTest.php
index 87162291165827780dcc9dc44ae13769d01f7a87..0c8533885035948880134a44e01dee4b2ba3f534 100644
--- a/plugins/Monolog/tests/System/TrackerLoggingTest.php
+++ b/plugins/Monolog/tests/System/TrackerLoggingTest.php
@@ -12,6 +12,7 @@ use Piwik\Config;
use Piwik\Date;
use Piwik\Tests\Framework\Fixture;
use Piwik\Tests\Framework\TestCase\SystemTestCase;
+use Piwik\Tests\Framework\TestingEnvironmentVariables;
use PiwikTracker;
/**
@@ -82,7 +83,7 @@ DEBUG: 'apiv' => '1',", $response);
private function setTrackerConfig($trackerConfig)
{
- $testingEnvironment = self::$fixture->getTestEnvironment();
+ $testingEnvironment = new TestingEnvironmentVariables();
$testingEnvironment->overrideConfig('Tracker', $trackerConfig);
$testingEnvironment->overrideConfig('log', 'log_writers', array('screen'));
$testingEnvironment->save();
diff --git a/plugins/Morpheus/stylesheets/general/_default.less b/plugins/Morpheus/stylesheets/general/_default.less
index 689cb0351f692b7f3157e2dc2cfb6359266ceee6..68d182780687bb11235cc7f974517801f1c190e1 100644
--- a/plugins/Morpheus/stylesheets/general/_default.less
+++ b/plugins/Morpheus/stylesheets/general/_default.less
@@ -33,7 +33,11 @@ blockquote, q {
/* remember to define focus styles! */
:focus {
- outline: auto;
+ outline: thin dotted;
+}
+
+a:focus {
+ outline: thin dotted;
}
/* remember to highlight inserts somehow! */
diff --git a/plugins/Morpheus/stylesheets/general/_jqueryUI.less b/plugins/Morpheus/stylesheets/general/_jqueryUI.less
index f5025fbd03e40425cec801d3070cff3bc1fd9a6d..51d5cd0b9a73e46292aa4143a59aadbad4dc2211 100644
--- a/plugins/Morpheus/stylesheets/general/_jqueryUI.less
+++ b/plugins/Morpheus/stylesheets/general/_jqueryUI.less
@@ -262,3 +262,22 @@ body .ui-tooltip.small {
.ui-dialog ~ .ui-dialog {
border: 1px solid #aaa;
}
+
+.ui-dialog-titlebar .ui-icon-closethick {
+ font-family: 'piwik';
+ font-weight: bold;
+
+ /* Better Font Rendering =========== */
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+
+ font-size:8px;
+ background-image: none !important;
+ text-indent: 0px !important;
+ opacity: 1 !important;
+ color:@theme-color-brand-contrast;
+
+ &:before{
+ content:"\e60a";
+ }
+}
diff --git a/plugins/Morpheus/stylesheets/main.less b/plugins/Morpheus/stylesheets/main.less
index 3bbe2602f5480d3f8329a90574224bd430f34111..5d37b9ab2bad76327ef368e6ea8630a8904e2a44 100644
--- a/plugins/Morpheus/stylesheets/main.less
+++ b/plugins/Morpheus/stylesheets/main.less
@@ -163,13 +163,8 @@ table.entityTable tr td a:hover {
.segmentationContainer {
.submenu {
li {
- .font-default(13px, 16px);
- color: @theme-color-text-light;
- &:hover {
- border-color: @color-silver-l80 !important;
- background:@theme-color-background-base !important;
- .border-radius(0px);
- }
+ .font-default(13px, 16px);
+ color: @theme-color-text-light;
}
}
}
@@ -561,7 +556,7 @@ div.sparkline {
}
.visitor-profile-more-info {
- margin-top: 15px;
+ margin: 5px 0 15px 0;
}
.visitor-profile-visits-container {
diff --git a/plugins/Morpheus/stylesheets/theme-advanced.less b/plugins/Morpheus/stylesheets/theme-advanced.less
index 82efdbb57178bd74763dc35a83bbb7eebff6a9e9..31e91e6cd8d0c784ce65bbbd0b102fc48c2ccc09 100644
--- a/plugins/Morpheus/stylesheets/theme-advanced.less
+++ b/plugins/Morpheus/stylesheets/theme-advanced.less
@@ -8,3 +8,6 @@
@theme-color-code: #F3F3F3;
@theme-color-code-background: #4D4D4D;
+
+@theme-color-widget-background: @theme-color-background-base;
+@theme-color-widget-border: @color-silver-l85;
diff --git a/plugins/Morpheus/stylesheets/theme.less b/plugins/Morpheus/stylesheets/theme.less
index 97eb216d2fa05fcf3f37ea64854ff8237ed106bf..54a49bd9dba96ae6bb894b1145b35292440af060 100644
--- a/plugins/Morpheus/stylesheets/theme.less
+++ b/plugins/Morpheus/stylesheets/theme.less
@@ -13,6 +13,7 @@
@theme-color-base-series: #ee3024;
@theme-color-menu-contrast-text: @theme-color-text;
+@theme-color-menu-contrast-textSelected: @theme-color-menu-contrast-text;
@theme-color-menu-contrast-textActive: @theme-color-brand;
@theme-color-menu-contrast-background: @theme-color-background-tinyContrast;
diff --git a/plugins/Morpheus/stylesheets/uibase/_loading.less b/plugins/Morpheus/stylesheets/uibase/_loading.less
index e57e3d0a6d6c98e8b0059656ffba48fb9741c23d..f375f7917ffc0dcc58b775c382680738dd319686 100644
--- a/plugins/Morpheus/stylesheets/uibase/_loading.less
+++ b/plugins/Morpheus/stylesheets/uibase/_loading.less
@@ -15,6 +15,11 @@
display:none;
}
+#root > #loadingError {
+ margin-left: 20px;
+ margin-right: 20px;
+}
+
#loadingError {
font-size: 15px;
padding: 8px 0;
diff --git a/plugins/Morpheus/templates/admin.twig b/plugins/Morpheus/templates/admin.twig
index 348cd71f72cb17d8fd52959a4e88e199ed3bd44d..bb669acf519f2fa2932dac070d8ca365e450e7da 100644
--- a/plugins/Morpheus/templates/admin.twig
+++ b/plugins/Morpheus/templates/admin.twig
@@ -19,7 +19,7 @@
{% include "@CoreHome/_topScreen.twig" %}
{% import 'ajaxMacros.twig' as ajax %}
- {{ ajax.requestErrorDiv(emailSuperUser|default('')) }}
+ {{ ajax.requestErrorDiv(emailSuperUser|default(''), arePiwikProAdsEnabled) }}
{{ postEvent("Template.beforeContent", "admin", currentModule) }}
<div class="page">
diff --git a/plugins/Morpheus/templates/ajaxMacros.twig b/plugins/Morpheus/templates/ajaxMacros.twig
index 4d06fd4e30d0f35e057c8fe0db3875f745fa58c7..267ff8e83dddad0bb24f71bb9578fb89c7e2422a 100644
--- a/plugins/Morpheus/templates/ajaxMacros.twig
+++ b/plugins/Morpheus/templates/ajaxMacros.twig
@@ -13,10 +13,26 @@
</div>
{% endmacro %}
-{% macro requestErrorDiv(emailSuperUser) %}
- {% if emailSuperUser is defined and emailSuperUser %}
- <div id="loadingError">{{ 'General_ErrorRequest'|translate('<a href="mailto:' ~ emailSuperUser ~ '">', '</a>')|raw }}</div>
- {% else %}
- <div id="loadingError">{{ 'General_ErrorRequest'|translate('', '') }}</div>
- {% endif %}
+{% macro requestErrorDiv(emailSuperUser, arePiwikProAdsEnabled = false) %}
+ <div id="loadingError">
+ <div class="alert alert-danger">
+
+ {% if emailSuperUser is defined and emailSuperUser %}
+ {{ 'General_ErrorRequest'|translate('<a href="mailto:' ~ emailSuperUser ~ '">', '</a>')|raw }}
+ {% else %}
+ {{ 'General_ErrorRequest'|translate('', '') }}
+ {% endif %}
+
+ <br /><br />
+ {{ 'General_NeedMoreHelp'|translate }}
+
+ <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> –
+ <a rel="noreferrer" target="_blank" href="http://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a>
+
+ {%- if arePiwikProAdsEnabled %}
+ –
+ <a rel="noreferrer" target="_blank" href="{{ 'https://piwik.pro/'|piwikProCampaignParameters('Help', 'AjaxError')|e('html_attr') }}">{{ 'Feedback_ProfessionalHelp'|translate }}</a>
+ {%- endif %}.
+ </div>
+ </div>
{% endmacro %}
\ No newline at end of file
diff --git a/plugins/Morpheus/templates/dashboard.twig b/plugins/Morpheus/templates/dashboard.twig
index c9feafebe6ed708bd27d599ab7623a99becb9172..8adf020f2cfbebe9a878c1ac35fd303f4512b09b 100644
--- a/plugins/Morpheus/templates/dashboard.twig
+++ b/plugins/Morpheus/templates/dashboard.twig
@@ -8,7 +8,7 @@
<![endif]-->
{% endblock %}
-{% set title %}{{ siteName|raw }} - {{ 'CoreHome_WebAnalyticsReports'|translate }}{% endset %}
+{% set title %}{{ siteName|raw }}{% if prettyDateLong is defined %} - {{ prettyDateLong }}{% endif %} - {{ 'CoreHome_WebAnalyticsReports'|translate }}{% endset %}
{% block pageDescription %}Web Analytics report for {{ siteName|escape("html_attr") }} - Piwik{% endblock %}
@@ -43,13 +43,13 @@
<div class="pageWrap">
- <a name="main"></a>
<div class="top_controls">
{% block topcontrols %}
{% endblock %}
</div>
+ <a name="main"></a>
{% block notification %}
{% include "@CoreHome/_notifications.twig" %}
{% endblock %}
diff --git a/plugins/Morpheus/templates/user.twig b/plugins/Morpheus/templates/user.twig
index 39710e2bb2e769c4c158e30cb3c545c87c1c3e3f..f1fed83d2eb45c4520791288974905bf01b8364a 100644
--- a/plugins/Morpheus/templates/user.twig
+++ b/plugins/Morpheus/templates/user.twig
@@ -21,7 +21,7 @@
{% include "@CoreHome/_topScreen.twig" %}
{% import 'ajaxMacros.twig' as ajax %}
- {{ ajax.requestErrorDiv(emailSuperUser|default('')) }}
+ {{ ajax.requestErrorDiv(emailSuperUser|default(''), arePiwikProAdsEnabled) }}
{{ postEvent("Template.beforeContent", "user", currentModule) }}
<div class="page">
diff --git a/plugins/MultiSites/MultiSites.php b/plugins/MultiSites/MultiSites.php
index 1fb90cfeae6561d45de7c83f9c17668faf124986..d104db301bc5ef4e158150219517c757ec84e3da 100644
--- a/plugins/MultiSites/MultiSites.php
+++ b/plugins/MultiSites/MultiSites.php
@@ -62,6 +62,10 @@ class MultiSites extends \Piwik\Plugin
$translations[] = 'General_ErrorRequest';
$translations[] = 'General_Pagination';
$translations[] = 'General_ClickToSearch';
+ $translations[] = 'General_NeedMoreHelp';
+ $translations[] = 'General_Faq';
+ $translations[] = 'Feedback_CommunityHelp';
+ $translations[] = 'Feedback_ProfessionalHelp';
}
public function getJsFiles(&$jsFiles)
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js b/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js
index 3ba1b15a21be498e0cbfa7a3209e23fc8f1f32d2..35cf26a5de819dd294759616857ad56f1c242eb8 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js
@@ -19,6 +19,7 @@
$scope.idSite = piwik.broadcast.getValueFromUrl('idSite');
$scope.url = piwik.piwik_url;
$scope.period = piwik.period;
+ $scope.arePiwikProAdsEnabled = piwik.config && piwik.config.are_ads_enabled;
this.refresh = function (interval) {
multisitesDashboardModel.refreshInterval = interval;
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
index a0f183a7c6b2db95f00c16c512e1be0862ce3695..06a7fb66137532e74a5f50d87918044cefd9dd6d 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
@@ -59,6 +59,15 @@
<td colspan="7">
<div class="notification system notification-error">
{{ 'General_ErrorRequest'|translate:(''):('') }}
+
+ <br /><br />
+ {{ 'General_NeedMoreHelp'|translate }}
+
+ <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a>
+ –
+ <a rel="noreferrer" target="_blank" href="http://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a>
+ <span ng-show="arePiwikProAdsEnabled"> – </span>
+ <a ng-show="arePiwikProAdsEnabled" rel="noreferrer" target="_blank" href="https://piwik.pro/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Piwik_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>.
</div>
</td>
</tr>
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less
index a200b3d626a9c28abf12d4d13ee6386c10dcb531..c83ab162aa574572bcc9f0d0ca8f930c497d0241 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less
@@ -21,6 +21,9 @@
.notification-error {
margin-top: 15px;
+ a {
+ text-decoration: underline !important;
+ }
}
.add_new_site,
diff --git a/plugins/MultiSites/lang/bg.json b/plugins/MultiSites/lang/bg.json
index 6535de584cd23481cc8602ac095c92abcfea59bb..a99b4f15a9e5a7ced5478b4ed5a648aa264aa417 100644
--- a/plugins/MultiSites/lang/bg.json
+++ b/plugins/MultiSites/lang/bg.json
@@ -3,6 +3,6 @@
"Evolution": "Развитие",
"LoadingWebsites": "Зарежда Ñайтовете",
"TopLinkTooltip": "Сравнете ÑтатиÑтиката за вÑички ваши уебÑайтове.",
- "Pagination": "%s - %s като %s"
+ "Pagination": "%1$s - %2$s като %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/ca.json b/plugins/MultiSites/lang/ca.json
index 764efcbeb19ef55815c34ecdd873618aef255d4d..caa5d9b4271184bda74f2947ef9fad548afde6ef 100644
--- a/plugins/MultiSites/lang/ca.json
+++ b/plugins/MultiSites/lang/ca.json
@@ -2,6 +2,6 @@
"MultiSites": {
"Evolution": "Evolució",
"TopLinkTooltip": "Compareu les estadÃstiques anà litiques de tots els vostres llocs web.",
- "Pagination": "%s - %s de %s"
+ "Pagination": "%1$s - %2$s de %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/cs.json b/plugins/MultiSites/lang/cs.json
index 2e5df85149a0a877c13a121c122ba72f04a678cb..0b9c753c867600eae93deebd26e82237c0dc4d04 100644
--- a/plugins/MultiSites/lang/cs.json
+++ b/plugins/MultiSites/lang/cs.json
@@ -3,7 +3,7 @@
"Evolution": "Vývoj",
"LoadingWebsites": "NaÄÃtánà webových stránek",
"PluginDescription": "Zobrazte a porovnejte vÅ¡echny vaÅ¡e stránky a aplikace na této užiteÄné nástÄ›nce vÅ¡ech stránek.",
- "TopLinkTooltip": "Porovnejte webové analytické statistiky pro všechny vaše webové stránky.",
- "Pagination": "%s - %s z %s"
+ "TopLinkTooltip": "Porovnejte webové analytické statistiky pro všechny vaše weby.",
+ "Pagination": "%1$s - %2$s z %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/da.json b/plugins/MultiSites/lang/da.json
index 7ef8b6853889102f1532c7069d6854787c1f1851..5effb77da67933d1fc09bc8a4c148a1e34284d70 100644
--- a/plugins/MultiSites/lang/da.json
+++ b/plugins/MultiSites/lang/da.json
@@ -3,6 +3,6 @@
"Evolution": "Udvikling",
"LoadingWebsites": "Loading websites",
"TopLinkTooltip": "Sammenlign analyse statistik for alle hjemmesider.",
- "Pagination": "%s - %s af %s"
+ "Pagination": "%1$s - %2$s af %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/de.json b/plugins/MultiSites/lang/de.json
index e85dd962f0d0adb391b4d2153268caffa3bf87de..d8e8a37fed6e2b032795c3a700aed6c1555f9e91 100644
--- a/plugins/MultiSites/lang/de.json
+++ b/plugins/MultiSites/lang/de.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "Lade Websites",
"PluginDescription": "Zeige und vergleiche alle Websites und Apps im hilfreichen 'Alle Websites' Dashboard.",
"TopLinkTooltip": "Vergleichen Sie Webanalytikstatistiken für alle Ihre Websites.",
- "Pagination": "%s - %s von %s"
+ "Pagination": "%1$s - %2$s von %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/el.json b/plugins/MultiSites/lang/el.json
index 930b87d814df538b0fb541936fa3c7d2edbc0992..2dfc77c22c40e5652d535fe7a761ff54e28e93bf 100644
--- a/plugins/MultiSites/lang/el.json
+++ b/plugins/MultiSites/lang/el.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "Γίνεται φόÏτωση των ιστοτόπων",
"PluginDescription": "Δείτε και συγκÏίνετε όλους τους ιστοτόπους σας και τις εφαÏμογÎÏ‚ σας σε αυτό τον χÏήσιμο πίνακα 'Όλοι οι Ιστοτόποι'.",
"TopLinkTooltip": "ΣÏγκÏιση στατιστικών Î™ÏƒÏ„Î¿Ï Î³Î¹Î± όλες τις ιστοσελίδες σας.",
- "Pagination": "%s - %s από %s"
+ "Pagination": "%1$s - %2$s από %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/en.json b/plugins/MultiSites/lang/en.json
index d2a89bbbbd53f28232e0d9e2343c42c3a94f584b..a96871d54c0c95d3cecd113afadc0e288cbba31a 100644
--- a/plugins/MultiSites/lang/en.json
+++ b/plugins/MultiSites/lang/en.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "Loading websites",
"PluginDescription": "View and compare all your websites and apps in this useful 'All Websites' dashboard. ",
"TopLinkTooltip": "Compare Web Analytics stats for all of your Websites.",
- "Pagination": "%s - %s of %s"
+ "Pagination": "%1$s - %2$s of %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/es.json b/plugins/MultiSites/lang/es.json
index 87690d1f1868ea7196d7cc0dd330c7bf9ef0e365..732aed218c01d225ce34d28e50a30cf55bb976fc 100644
--- a/plugins/MultiSites/lang/es.json
+++ b/plugins/MultiSites/lang/es.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "Cargando sitios de internet",
"PluginDescription": "Vea y compare todos sus sitios de internet y aplicaciones en este tablero 'Todos los sitios de internet'",
"TopLinkTooltip": "Comparar la estadÃsticas de Análisis de internet para todos sus sitios.",
- "Pagination": "%s - %s de %s"
+ "Pagination": "%1$s - %2$s de %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/fi.json b/plugins/MultiSites/lang/fi.json
index 1c8e1221b3c9b759dc0a95ed9dea3dfaff7ad792..f947b96527618f89f6d99f11bf51a76ac5f33ed2 100644
--- a/plugins/MultiSites/lang/fi.json
+++ b/plugins/MultiSites/lang/fi.json
@@ -3,6 +3,6 @@
"Evolution": "Kehitys",
"LoadingWebsites": "Lataa verkkosivuja",
"TopLinkTooltip": "Vertaile eri sivujen tilastoja.",
- "Pagination": "%s - %s %s:sta."
+ "Pagination": "%1$s - %2$s %3$s:sta."
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/fr.json b/plugins/MultiSites/lang/fr.json
index 6f7a2d11177b7029777394c1b6148cc8e79fe84f..511b1937feb0d2b4e3cf1837844ea717251a0805 100644
--- a/plugins/MultiSites/lang/fr.json
+++ b/plugins/MultiSites/lang/fr.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "Chargement des sites",
"PluginDescription": "Visualisez et comparez tous vos sites web et application en utilisant le tableau de bord \"tous les sites web\".",
"TopLinkTooltip": "Comparez les statistiques pour tous vos sites web.",
- "Pagination": "%s - %s de %s"
+ "Pagination": "%1$s - %2$s de %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/hi.json b/plugins/MultiSites/lang/hi.json
index 07700bb3c5c2a542bd586346628386b1ba655191..78e21fb4f4d69bc292ba2070280d05cc8faa097c 100644
--- a/plugins/MultiSites/lang/hi.json
+++ b/plugins/MultiSites/lang/hi.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "लोड हो रहा है वेबसाइट",
"PluginDescription": "देखें और इस उपयोगी 'सà¤à¥€ वेबसाइटों के' डैशबोरà¥à¤¡ में अपने सà¤à¥€ वेबसाइटों और कà¥à¤·à¥à¤§à¤¾ की तà¥à¤²à¤¨à¤¾ करें।",
"TopLinkTooltip": "आपकी वेबसाइट सà¤à¥€ के लिठवेब विशà¥à¤²à¥‡à¤·à¤¿à¤•à¥€ आà¤à¤•à¤¡à¤¼à¥‹à¤‚ की तà¥à¤²à¤¨à¤¾ करें.",
- "Pagination": "%s - %s के लिठ%s"
+ "Pagination": "%1$s - %2$s के लिठ%3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/it.json b/plugins/MultiSites/lang/it.json
index d3fbb5db23e8943c9115bfddbf158646cfedbe20..6c0a52d635b20b5c2b2c454fc665b3419194996d 100644
--- a/plugins/MultiSites/lang/it.json
+++ b/plugins/MultiSites/lang/it.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "Caricamento siti web",
"PluginDescription": "Guarda e confronta tutti i siti e le app in questa utile dashboard 'Tutti i Siti'.",
"TopLinkTooltip": "Compara le statistiche web di tutti i tuoi siti web.",
- "Pagination": "%s - %s di %s"
+ "Pagination": "%1$s - %2$s di %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/ja.json b/plugins/MultiSites/lang/ja.json
index 56c9ac9e6412def172f7554d7c2b04eb9b142941..6ee7a2ad3aeb0bf0ea13b2545260d123db2eaa95 100644
--- a/plugins/MultiSites/lang/ja.json
+++ b/plugins/MultiSites/lang/ja.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "ウェブサイトをãƒãƒ¼ãƒ‰ä¸",
"PluginDescription": "ã“ã®ä¾¿åˆ©ãªã€Œã™ã¹ã¦ã®ã‚¦ã‚§ãƒ–サイトã€ãƒ€ãƒƒã‚·ãƒ¥ãƒœãƒ¼ãƒ‰ã§ã€ã™ã¹ã¦ã®ã‚¦ã‚§ãƒ–サイトã¨ã‚¢ãƒ—リケーションを見ã¦ã€æ¯”較ã—ã¦ãã ã•ã„。",
"TopLinkTooltip": "ã‚ãªãŸã®å…¨ã‚¦ã‚§ãƒ–サイトã«å¯¾ã™ã‚‹ã‚¦ã‚§ãƒ–解æžçµ±è¨ˆæƒ…å ±ã‚’æ¯”è¼ƒã—ã¦ãã ã•ã„。",
- "Pagination": "%s ã® %s - %s"
+ "Pagination": "%1$s ã® %2$s - %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/ko.json b/plugins/MultiSites/lang/ko.json
index 69e154b027f1981db627b9da8b060c01a9907175..ce8aa8a772e12acc8bfb05b71ecd7786fd21a790 100644
--- a/plugins/MultiSites/lang/ko.json
+++ b/plugins/MultiSites/lang/ko.json
@@ -2,6 +2,6 @@
"MultiSites": {
"Evolution": "변화 추ì´",
"TopLinkTooltip": "웹사ì´íŠ¸ì˜ ëª¨ë“ ì›¹ë¶„ì„ í†µê³„ë¥¼ 비êµí•©ë‹ˆë‹¤.",
- "Pagination": "%s - %s ì˜ %s"
+ "Pagination": "%1$s - %2$s ì˜ %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/lt.json b/plugins/MultiSites/lang/lt.json
index 8969e9c66c72c9013d2b137df9f57deb86285f0e..e4f996cedb94626aac1e616a3643f5413f3f148d 100644
--- a/plugins/MultiSites/lang/lt.json
+++ b/plugins/MultiSites/lang/lt.json
@@ -1,5 +1,7 @@
{
"MultiSites": {
- "Evolution": "Raida"
+ "Evolution": "Raida",
+ "LoadingWebsites": "Įkeliamos svetainės",
+ "Pagination": "%1$s - %2$s iš %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/nb.json b/plugins/MultiSites/lang/nb.json
index 2f317cc9fa12a9e861dbf7ef1b9bd6bb0300ed8d..321ce0743a33e7b164490485e31965d322cb763a 100644
--- a/plugins/MultiSites/lang/nb.json
+++ b/plugins/MultiSites/lang/nb.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "Laster nettsteder",
"PluginDescription": "Se og sammenligne alle dine nettsteder og apper i denne nyttige «Alle nettsteder»-oversikten.",
"TopLinkTooltip": "Sammenligne web-statistikk for alle dine nettsteder.",
- "Pagination": "%s – %s av %s"
+ "Pagination": "%1$s – %2$s av %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/nl.json b/plugins/MultiSites/lang/nl.json
index de44ae763c71ad825d11745a622870008426cbc2..2479c97ecb7210c3cffd561a474713fa7997e013 100644
--- a/plugins/MultiSites/lang/nl.json
+++ b/plugins/MultiSites/lang/nl.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "Websites laden",
"PluginDescription": "Bekijk en vergelijk al uw websites en apps in dit handige 'Alle Websites' paneel.",
"TopLinkTooltip": "Vergelijk Website statistieken van al je websites.",
- "Pagination": "%s - %s van %s"
+ "Pagination": "%1$s - %2$s van %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/pl.json b/plugins/MultiSites/lang/pl.json
index db8a26af67f822745e384434e642a9cd1c8081dc..c05c3bf9ddc9397e57e4e84aa815388103c4fafa 100644
--- a/plugins/MultiSites/lang/pl.json
+++ b/plugins/MultiSites/lang/pl.json
@@ -2,6 +2,6 @@
"MultiSites": {
"Evolution": "Postęp",
"LoadingWebsites": "Åadowanie stron",
- "Pagination": "%s - %s z %s"
+ "Pagination": "%1$s - %2$s z %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/pt-br.json b/plugins/MultiSites/lang/pt-br.json
index 781e7f7e840860664becdedf1d0eebb72f81e212..e83116d3950eb4e22bdd50195e321f04c917332b 100644
--- a/plugins/MultiSites/lang/pt-br.json
+++ b/plugins/MultiSites/lang/pt-br.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "Carregando sites",
"PluginDescription": "Veja e compare todos os seus sites e aplicativos neste útil painel 'Todos Websites'.",
"TopLinkTooltip": "Comparar estatÃsticas de todos os websites.",
- "Pagination": "%s - %s de %s"
+ "Pagination": "%1$s - %2$s de %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/pt.json b/plugins/MultiSites/lang/pt.json
index 975aadbe4c4a213017af073dceb71249d2b4a885..e4378b299bff41cb4f32bbb3fcceeb0af84d2a27 100644
--- a/plugins/MultiSites/lang/pt.json
+++ b/plugins/MultiSites/lang/pt.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "A carregar websites",
"PluginDescription": "Veja e compare todos os seus websites e aplicações no painel \"Todos os Websites\".",
"TopLinkTooltip": "Compare as estatÃsticas de todos os seus websites.",
- "Pagination": "%s - %s de %s"
+ "Pagination": "%1$s - %2$s de %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/ro.json b/plugins/MultiSites/lang/ro.json
index 147d73ab512446e8fcb817681c6610fbd455625b..c2a10ba4619bb63dba0a3ea5dba7894c9c77df26 100644
--- a/plugins/MultiSites/lang/ro.json
+++ b/plugins/MultiSites/lang/ro.json
@@ -3,6 +3,6 @@
"Evolution": "Evoluţie",
"LoadingWebsites": "încărcare site-uri web",
"TopLinkTooltip": "Compara statisticiLE Web Analytics pentru toate site-urile dvs..",
- "Pagination": "%s - %s of %s"
+ "Pagination": "%1$s - %2$s of %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/ru.json b/plugins/MultiSites/lang/ru.json
index 544c78b5197d9e011dafd21ccf065a06323a9de2..6f2aec05714a1f49ef25485c54c6be563873fb6e 100644
--- a/plugins/MultiSites/lang/ru.json
+++ b/plugins/MultiSites/lang/ru.json
@@ -3,6 +3,6 @@
"Evolution": "ÐволюциÑ",
"LoadingWebsites": "Загрузка Ñайтов",
"TopLinkTooltip": "Сравните веб-аналитику Ð´Ð»Ñ Ð²Ñех ваших Ñайтов.",
- "Pagination": "%s - %s из %s"
+ "Pagination": "%1$s - %2$s из %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/sl.json b/plugins/MultiSites/lang/sl.json
index 9843800020eab3acf3a6f546d37823cc3d213e6c..eac6a08232f2992a0fa5107b25e97c75e7f0f2b6 100644
--- a/plugins/MultiSites/lang/sl.json
+++ b/plugins/MultiSites/lang/sl.json
@@ -2,6 +2,6 @@
"MultiSites": {
"Evolution": "Evolucija",
"LoadingWebsites": "Nalaganje strani",
- "Pagination": "%s - %s od %s"
+ "Pagination": "%1$s - %2$s od %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/sq.json b/plugins/MultiSites/lang/sq.json
index 480a6eb843b7f73e2867c8bd7b7a12132e30e648..cdcbe04e65a40aba7492245abea3bb9b4cb3ab0b 100644
--- a/plugins/MultiSites/lang/sq.json
+++ b/plugins/MultiSites/lang/sq.json
@@ -1,6 +1,6 @@
{
"MultiSites": {
"Evolution": "Evolution",
- "Pagination": "%s - %s of %s"
+ "Pagination": "%1$s - %2$s of %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/sr.json b/plugins/MultiSites/lang/sr.json
index c6cdf66780304428df04d15978953a598425f932..020b8e00d12add29e8711160764095c049c9114e 100644
--- a/plugins/MultiSites/lang/sr.json
+++ b/plugins/MultiSites/lang/sr.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "UÄitavanje sajtova",
"PluginDescription": "Pregledajte i uporedite sve vaše sajtove i aplikacije preko ovog korisnog 'Svi sajtovi' dodatka.",
"TopLinkTooltip": "Uporedi statistiku za sve vaše sajtove",
- "Pagination": "%s - %s od %s"
+ "Pagination": "%1$s - %2$s od %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/sv.json b/plugins/MultiSites/lang/sv.json
index 16573231042b987b406ec7cf27e22ebe3b6efbf5..a8a1adb4b1100ff66dbb4cbcd3c1ac276b6c8227 100644
--- a/plugins/MultiSites/lang/sv.json
+++ b/plugins/MultiSites/lang/sv.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "Laddar webbplatser",
"PluginDescription": "Visa och jämför alla dina webbplatser i panelen 'All Websites'.",
"TopLinkTooltip": "Jämför statistik för alla dina webbplatser.",
- "Pagination": "%s - %s av %s"
+ "Pagination": "%1$s - %2$s av %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/tl.json b/plugins/MultiSites/lang/tl.json
index fe4d4256192b681e5b8abe310f8393a00e96fa25..20f6feec10298c08a037a2d6ca7051c7421816ed 100644
--- a/plugins/MultiSites/lang/tl.json
+++ b/plugins/MultiSites/lang/tl.json
@@ -3,6 +3,6 @@
"Evolution": "Ebolusyon",
"LoadingWebsites": "Naglo-load ang mga website",
"TopLinkTooltip": "Ikumpara ang stats ng Web Analytics para sa lahat ng iyong Website.",
- "Pagination": "%s - %s ng %s"
+ "Pagination": "%1$s - %2$s ng %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/MultiSites/lang/vi.json b/plugins/MultiSites/lang/vi.json
index 7a09ec5c7cfca562a5c2d51277d9c6aeb1aff3a7..70af095242ce4f9616064073d58d6c1eb4003c76 100644
--- a/plugins/MultiSites/lang/vi.json
+++ b/plugins/MultiSites/lang/vi.json
@@ -4,6 +4,6 @@
"LoadingWebsites": "Äang tải website",
"PluginDescription": "Xem và so sánh toà n bộ các website bạn quản lý",
"TopLinkTooltip": "So sánh các số liệu thống kê Web Analytics cho tất cả các trang web của bạn.",
- "Pagination": "%s - %s trên %s"
+ "Pagination": "%1$s - %2$s trên %3$s"
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/client/followingpages.js b/plugins/Overlay/client/followingpages.js
index 860fbc2274a68a17aace27a0cac8f63df41259d0..3185b87b67f7c4a6b55ba7eff5d014c8efdf0109 100644
--- a/plugins/Overlay/client/followingpages.js
+++ b/plugins/Overlay/client/followingpages.js
@@ -164,7 +164,12 @@ var Piwik_Overlay_FollowingPages = (function () {
linkTag[0].piwikTagElement = true;
var rate = data.clickRate;
- if (rate < 10) {
+
+ if( rate < 0.001 ) {
+ rate = '<0.001';
+ } else if (rate < 1) {
+ rate = Math.round( rate * 1000 ) / 1000;
+ } else if (rate < 10) {
rate = Math.round(rate * 10) / 10;
} else {
rate = Math.round(rate);
diff --git a/plugins/Overlay/javascripts/Piwik_Overlay.js b/plugins/Overlay/javascripts/Piwik_Overlay.js
index 4bde0ee34364ba901596d1962cbc479ea027f2c4..35584be17751912c1657f188ec3ce6d36d892fb6 100644
--- a/plugins/Overlay/javascripts/Piwik_Overlay.js
+++ b/plugins/Overlay/javascripts/Piwik_Overlay.js
@@ -240,19 +240,23 @@ var Piwik_Overlay = (function () {
if (segment) {
unescapedSegment = unescape(segment);
}
- DataTable_RowActions_Transitions.launchForUrl(iframeCurrentPageNormalized, unescapedSegment);
+ if (window.DataTable_RowActions_Transitions) {
+ DataTable_RowActions_Transitions.launchForUrl(iframeCurrentPageNormalized, unescapedSegment);
+ }
return false;
});
// handle row evolution link
$rowEvolutionLink.click(function () {
- DataTable_RowActions_RowEvolution.launch('Actions.getPageUrls', iframeCurrentActionLabel);
+ if (window.DataTable_RowActions_RowEvolution) {
+ DataTable_RowActions_RowEvolution.launch('Actions.getPageUrls', iframeCurrentActionLabel);
+ }
return false;
});
// handle segmented visitor log link
$visitorLogLink.click(function () {
- DataTable_RowActions_Registry.getActionByName('SegmentVisitorLog').createInstance({}).showVisitorLog('Actions.getPageUrls', $('#segment').val(), {});
+ SegmentedVisitorLog.show('Actions.getPageUrls', $('#segment').val(), {});
return false;
});
diff --git a/plugins/Overlay/lang/bg.json b/plugins/Overlay/lang/bg.json
index 4f1a8ffa4175dee2bc7948a1643042ddebe134e6..cdd5c2c06d20c7d35cf4e3e8d37e34d52fc334bb 100644
--- a/plugins/Overlay/lang/bg.json
+++ b/plugins/Overlay/lang/bg.json
@@ -10,7 +10,7 @@
"NoData": "ÐÑма данни за тази Ñтраница по време на Ð¸Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ Ð¿ÐµÑ€Ð¸Ð¾Ð´.",
"OneClick": "1 клик",
"OpenFullScreen": "ЦÑл екран (без Ñтранична лента)",
- "RedirectUrlErrorAdmin": "Може да добавите домейнът като допълнителен Ð°Ð´Ñ€ÐµÑ %sв наÑтройките%s.",
+ "RedirectUrlErrorAdmin": "Може да добавите домейнът като допълнителен Ð°Ð´Ñ€ÐµÑ %1$sв наÑтройките%2$s.",
"RedirectUrlErrorUser": "Попитайте вашиÑÑ‚ админиÑтратор да добави домейна, като допълнителен URL."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/ca.json b/plugins/Overlay/lang/ca.json
index daebb34b52f3a6ab70818a6de99555a9ac321882..c7f6810ee628939262a306225c74e14a687a4221 100644
--- a/plugins/Overlay/lang/ca.json
+++ b/plugins/Overlay/lang/ca.json
@@ -13,8 +13,8 @@
"OneClick": "1 click",
"OpenFullScreen": "Mostra a pantalla complerta (sense barra lateral)",
"Overlay": "Overlay de pà gina",
- "RedirectUrlError": "Esteu intentant obrir un pà gina Overlay per la URL \"%s\". %s Cap dels dominis configurats al Piwik concòrda amb l'enllaç.",
- "RedirectUrlErrorAdmin": "Podeu afegir una URL addicional per un domini a %s les preferències%s.",
+ "RedirectUrlError": "Esteu intentant obrir un pà gina Overlay per la URL \"%1$s\". %2$s Cap dels dominis configurats al Piwik concòrda amb l'enllaç.",
+ "RedirectUrlErrorAdmin": "Podeu afegir una URL addicional per un domini a %1$s les preferències%2$s.",
"RedirectUrlErrorUser": "Contacteu amb el vostre administrador per afegir el domini com una URL adicional."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/cs.json b/plugins/Overlay/lang/cs.json
index 69d47451753f0ac5561ef64655297bf4a48392ec..d759cb38673c64ac6bce1c78d5c02453814fa529 100644
--- a/plugins/Overlay/lang/cs.json
+++ b/plugins/Overlay/lang/cs.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "PÅ™ejÃt na celou obrazovku (bez postrannà liÅ¡ty)",
"Overlay": "Překryv stránky",
"PluginDescription": "PodÃvejte se na vaÅ¡e analytická data jako na pÅ™ekryv na vaÅ¡ich stránkách. ZjistÄ›te, kolik uživatelů kliklo na kterýkoliv odkaz. Poznámka: vyžaduje povolený zásuvný modul pÅ™echodů.",
- "RedirectUrlError": "PokouÅ¡Ãte se spustit pÅ™ekryv pro stránku s url \"%s\". %s Žádná doména z nastavenà Piwiku ale neodpovÃdá odkazu.",
- "RedirectUrlErrorAdmin": "Doménu můžete jako dalÅ¡Ã URL pÅ™idat v %snastavenÃ%s.",
+ "RedirectUrlError": "PokouÅ¡Ãte se spustit pÅ™ekryv pro stránku s url \"%1$s\". %2$s Žádná doména z nastavenà Piwiku ale neodpovÃdá odkazu.",
+ "RedirectUrlErrorAdmin": "Doménu můžete jako dalÅ¡Ã URL pÅ™idat v %1$snastavenÃ%2$s.",
"RedirectUrlErrorUser": "Požádejte svého administrátora o přidánà stránky jako dalšà URL:."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/da.json b/plugins/Overlay/lang/da.json
index 89423a11e2421ad2b84c8083f3512537daa0fd2d..6caa11f7630ce5fed4051511da52e61e9130df00 100644
--- a/plugins/Overlay/lang/da.json
+++ b/plugins/Overlay/lang/da.json
@@ -13,8 +13,8 @@
"OneClick": "1 klik",
"OpenFullScreen": "Vis fuldskærm (ingen sidebjælke)",
"Overlay": "Side overlejring",
- "RedirectUrlError": "Du forsøger at åbne sideoverlejring for URL \"%s\". %s Ingen af ​​domæner fra Piwiks indstillinger matcher linket.",
- "RedirectUrlErrorAdmin": "Du kan tilføje domænet som en yderligere URL %si indstillingerne%s.",
+ "RedirectUrlError": "Du forsøger at åbne sideoverlejring for URL \"%1$s\". %2$s Ingen af ​​domæner fra Piwiks indstillinger matcher linket.",
+ "RedirectUrlErrorAdmin": "Du kan tilføje domænet som en yderligere URL %1$si indstillingerne%2$s.",
"RedirectUrlErrorUser": "Spørg administratoren om at tilføje domænet som en yderligere URL."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/de.json b/plugins/Overlay/lang/de.json
index d44a6a8084b6c291291305fae7cf2fb5376b0aa4..12391dc874557f66236bc7778f2ff7bb963ecb09 100644
--- a/plugins/Overlay/lang/de.json
+++ b/plugins/Overlay/lang/de.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "Vollbildmodus starten (keine Sidebar)",
"Overlay": "Seiten Overlay",
"PluginDescription": "Sehen Sie Ihre Analysedaten als ein Overlay auf Ihrer aktuellen Website an. Lassen Sie sich anzeigen wie oft Ihre Benutzer auf welchen Link geklickt haben. Hinweis: Benötigt das Transitions-Plugin.",
- "RedirectUrlError": "Sie versuchen, eine Seiten Overlay Sitzung für die URL \"%s\" zu starten. %s Keine der in den Piwik Einstellungen hinterlegten Domains passt zu diesem Link.",
- "RedirectUrlErrorAdmin": "Sie können diese Domain %sin den Einstellungen%s als zusätzliche URL hinzufügen.",
+ "RedirectUrlError": "Sie versuchen, eine Seiten Overlay Sitzung für die URL \"%1$s\" zu starten. %2$s Keine der in den Piwik Einstellungen hinterlegten Domains passt zu diesem Link.",
+ "RedirectUrlErrorAdmin": "Sie können diese Domain %1$sin den Einstellungen%2$s als zusätzliche URL hinzufügen.",
"RedirectUrlErrorUser": "Bitten Sie Ihren Administrator diese Domain als zusätzliche URL hinzuzufügen."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/el.json b/plugins/Overlay/lang/el.json
index fafe81eb5336f38b48e412a64e37ccad5a5c0285..76a2b56f98cadb7063c327382ed03a8dc5f66612 100644
--- a/plugins/Overlay/lang/el.json
+++ b/plugins/Overlay/lang/el.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "Μετάβαση σε πλήÏη οθόνη (χωÏίς πλευÏική γÏαμμή)",
"Overlay": "ΥπεÏκάλυψη Σελίδας",
"PluginDescription": "Δείτε τα δεδομÎνα αναλυτικών σας ως ΥπÎÏθεση στον ιστοτόπο σας. Δείτε πόσες φοÏÎÏ‚ οι χÏήστες σας κάνανε κλικ σε κάθε σÏνδεσμο. Σημείωση: Απαιτείται να είναι ενεÏγοποιημÎνο το Ï€Ïόσθετο Transitions.",
- "RedirectUrlError": "Î Ïοσπαθείτε να ανοίξετε την Επικάλυψη Σελίδων για τη διεÏθυνση URL \"%s\". %s ΚανÎνα από τα ονόματα χώÏου που βÏίσκονται στις Ïυθμίσεις του Piwik δεν ταιÏιάζει με το σÏνδεσμο.",
- "RedirectUrlErrorAdmin": "ΜποÏείτε να Ï€ÏοσθÎσετε το όνομα χώÏου ως μια Ï€Ïόσθετη διεÏθυνση URL %sστις Ïυθμίσεις%s.",
+ "RedirectUrlError": "Î Ïοσπαθείτε να ανοίξετε τη Σελίδα ΥπÎÏθεσης για το URL \"%1$s\". %2$s ΚανÎνα από τα ονόματα στις Ïυθμίσεις του Piwik συμφωνεί με το σÏνδεσμο.",
+ "RedirectUrlErrorAdmin": "ΜποÏείτε να Ï€ÏοσθÎσετε το όνομα ως επιπÏόσθετο URL %1$sστις Ïυθμίσεις%2$s.",
"RedirectUrlErrorUser": "Ζητήστε από το διαχειÏιστή σας για να Ï€ÏοσθÎσετε το όνομα χώÏου ως μια επιπλÎον διεÏθυνση URL."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/en.json b/plugins/Overlay/lang/en.json
index 2e97cff7dbce54493cb883adae9ba145354655a9..e6aaec28ff7636d7216667cf05704552658e49c5 100644
--- a/plugins/Overlay/lang/en.json
+++ b/plugins/Overlay/lang/en.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "Go full screen (no sidebar)",
"Overlay": "Page Overlay",
"PluginDescription": "See your analytics data as an Overlay on your actual website. View how many times your users have clicked on each link. Note: Requires the Transitions plugin enabled.",
- "RedirectUrlError": "You are attempting to open Page Overlay for the URL \"%s\". %s None of the domains from the Piwik settings matches the link.",
- "RedirectUrlErrorAdmin": "You can add the domain as an additional URL %sin the settings%s.",
+ "RedirectUrlError": "You are attempting to open Page Overlay for the URL \"%1$s\". %2$s None of the domains from the Piwik settings matches the link.",
+ "RedirectUrlErrorAdmin": "You can add the domain as an additional URL %1$sin the settings%2$s.",
"RedirectUrlErrorUser": "Ask your administrator to add the domain as an additional URL."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/es.json b/plugins/Overlay/lang/es.json
index f146775efd8cbd12cbed65d21e294ff17f3490b9..24cda29637da3f31a5841142430224bdd70cc6f4 100644
--- a/plugins/Overlay/lang/es.json
+++ b/plugins/Overlay/lang/es.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "Ir a pantalla completa (sin barras laterales)",
"Overlay": "Superposición de página",
"PluginDescription": "Vea su información analÃtica como una superposición en su actual sitio de internet. Vea cuántas veces sus usuarios han hecho clic en cada enlace. Nota: Requiere el complemento Transitions habilitado.",
- "RedirectUrlError": "Está intentando abrir Superposición de página de la dirección de internet \"%s\"- %s Ninguno de los dominios de su configuración Piwik coincide con el enlace.",
- "RedirectUrlErrorAdmin": "Puede agregar el dominio como una dirección de internet %sen la configuración%s.",
+ "RedirectUrlError": "Está intentando abrir Superposición de página de la dirección de internet \"%1$s\"- %2$s Ninguno de los dominios de su configuración Piwik coincide con el enlace.",
+ "RedirectUrlErrorAdmin": "Puede agregar el dominio como una dirección de internet %1$sen la configuración%2$s.",
"RedirectUrlErrorUser": "Pregunte a su administrador para agregar el dominio como una dirección de internet adicional."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/fa.json b/plugins/Overlay/lang/fa.json
index e10e1473f7a683bfc86a9ff4219c204c132eec4b..3265a3ae1dc7e9513973a9a7b7575256e79c6571 100644
--- a/plugins/Overlay/lang/fa.json
+++ b/plugins/Overlay/lang/fa.json
@@ -11,7 +11,7 @@
"OneClick": "1 کلیک",
"OpenFullScreen": "به Øالت تمام صÙØÙ‡ برو (بدون ستون کناری)",
"Overlay": "صÙØÙ‡ از دسترس خارج شد",
- "RedirectUrlErrorAdmin": "شما توانید آدرس های جدیدی را اضاÙÙ‡ نمایید URL %sin the settings%s.",
+ "RedirectUrlErrorAdmin": "شما توانید آدرس های جدیدی را اضاÙÙ‡ نمایید URL %1$sin the settings%2$s.",
"RedirectUrlErrorUser": "از مدیریت بخواهید Ú©Ù‡ این دامنه را به عنوان دامنه اضاÙÛŒ بیاÙزاید."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/fi.json b/plugins/Overlay/lang/fi.json
index 2a3719e35687eb5e28709c63cfd462a0c4773ba8..9296b2d7e5c56fb51c886360263c27d8cbef3ad5 100644
--- a/plugins/Overlay/lang/fi.json
+++ b/plugins/Overlay/lang/fi.json
@@ -13,8 +13,8 @@
"OneClick": "1 klikkaus",
"OpenFullScreen": "Siirry koko näytön tilaan (ei sivupalkkia)",
"Overlay": "Sivun leijuke",
- "RedirectUrlError": "Yrität avata sivun leijuketta URL:lle \"%s\". %s mikän Piwikin asetuksien domain ei vastaa linkkiä.",
- "RedirectUrlErrorAdmin": "Voit lisätä domainin ylimääräisenä URL:nä %sasetuksissa%s.",
+ "RedirectUrlError": "Yrität avata sivun leijuketta URL:lle \"%1$s\". %2$s mikän Piwikin asetuksien domain ei vastaa linkkiä.",
+ "RedirectUrlErrorAdmin": "Voit lisätä domainin ylimääräisenä URL:nä %1$sasetuksissa%2$s.",
"RedirectUrlErrorUser": "Pyydä ylläpitää lisäämään domain ylimääräisenä verkkosivuna."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/fr.json b/plugins/Overlay/lang/fr.json
index 3e2093d4f3bef5f457b941ef86c6219b4703f298..e099c43d87c744cfa2091341633506e644764316 100644
--- a/plugins/Overlay/lang/fr.json
+++ b/plugins/Overlay/lang/fr.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "Ouvrir en plein écran",
"Overlay": "Analyse des pages web",
"PluginDescription": "Visualisez vos données d'analyse comme une Superposition de votre site web. Voyez combien de fois vos utilisateurs ont cliqué sur chaque lien. Remarque : Nécessite que le composant Transitions soit activé.",
- "RedirectUrlError": "Vous tentez d'ouvrir l'analyse des pages web pour l'URL \"%s\". %s Aucun des domaines configurés dans Piwik ne correspond à cette URL.",
- "RedirectUrlErrorAdmin": "Vous pouvez ajouter le domaine en tant qu'URL additionnelle %sdans les paramètres%s.",
+ "RedirectUrlError": "Vous tentez d'ouvrir l'analyse des pages web pour l'URL \"%1$s\". %2$s Aucun des domaines configurés dans Piwik ne correspond à cette URL.",
+ "RedirectUrlErrorAdmin": "Vous pouvez ajouter le domaine en tant qu'URL additionnelle %1$sdans les paramètres%2$s.",
"RedirectUrlErrorUser": "Demandez à votre administrateur d'ajouter le domaine en tant qu'URL additionnelle."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/hi.json b/plugins/Overlay/lang/hi.json
index a8a35d73a71a98179dfe5d5600973fc62c5af3c6..2d17629eb61c8c524f0d73d2ca836d443d007568 100644
--- a/plugins/Overlay/lang/hi.json
+++ b/plugins/Overlay/lang/hi.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "पूरà¥à¤£ सà¥à¤•à¥à¤°à¥€à¤¨ (कोई साइडबार नहीं ) के लिठजाओ",
"Overlay": "पृषà¥à¤ आवरण",
"PluginDescription": "अपने वासà¥à¤¤à¤µà¤¿à¤• वेबसाइट पर ओवरले के रूप में अपने Analytics डेटा देखें। अपने उपयोगकरà¥à¤¤à¤¾à¤“ं को à¤à¤• लिंक पर कà¥à¤²à¤¿à¤• किया है कि कैसे कई बार देखें। नोट: सकà¥à¤·à¤® बदलाव पà¥à¤²à¤—इन की आवशà¥à¤¯à¤•à¤¤à¤¾ है।",
- "RedirectUrlError": "आप यूआरà¤à¤² \"%s\" के लिठपृषà¥à¤ आवरण खोलने के लिठपà¥à¤°à¤¯à¤¾à¤¸ कर रहे हैं. Piwik सेटिंग से डोमेन में से कोई%s à¤à¥€ लिंक से मेल नहीं खाता है.",
- "RedirectUrlErrorAdmin": "आप सेटिंगà¥à¤¸%s से à¤à¤• अतिरिकà¥à¤¤ URL%s के रूप में डोमेन जोड़ सकते हैं",
+ "RedirectUrlError": "आप यूआरà¤à¤² \"%1$s\" के लिठपृषà¥à¤ आवरण खोलने के लिठपà¥à¤°à¤¯à¤¾à¤¸ कर रहे हैं. Piwik सेटिंग से डोमेन में से कोई%2$s à¤à¥€ लिंक से मेल नहीं खाता है.",
+ "RedirectUrlErrorAdmin": "आप सेटिंगà¥à¤¸%1$s से à¤à¤• अतिरिकà¥à¤¤ URL%2$s के रूप में डोमेन जोड़ सकते हैं",
"RedirectUrlErrorUser": "à¤à¤• अतिरिकà¥à¤¤ URL के रूप में डोमेन को जोड़ने के लिठअपने वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤• से पूछें."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/id.json b/plugins/Overlay/lang/id.json
index 2b751ebcbeeff7cee8dfbe79e35b81a65e6421e7..2623f618522b0f5638728759018d9c71a004f4bf 100644
--- a/plugins/Overlay/lang/id.json
+++ b/plugins/Overlay/lang/id.json
@@ -13,8 +13,8 @@
"OneClick": "1 kilik",
"OpenFullScreen": "Menuju halaman penuh (tanpa batang sisi)",
"Overlay": "Penghampar Halaman",
- "RedirectUrlError": "Anda mencoba membuka Penghampar Halaman dari URL \"%s\". %s Tidak ada ranah dari pengaturan Piwik sesuai dengan tautan.",
- "RedirectUrlErrorAdmin": "Anda dapat menambah ranah sebagai URL tambahan di %spengaturan%s.",
+ "RedirectUrlError": "Anda mencoba membuka Penghampar Halaman dari URL \"%1$s\". %2$s Tidak ada ranah dari pengaturan Piwik sesuai dengan tautan.",
+ "RedirectUrlErrorAdmin": "Anda dapat menambah ranah sebagai URL tambahan di %1$spengaturan%2$s.",
"RedirectUrlErrorUser": "Silakan bertanya kepada pengelola Anda untuk menambah ranah sebagai URL tambahan."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/it.json b/plugins/Overlay/lang/it.json
index 8f5411007ac65e887455dd0330ca11e1356b7a31..f220c226dace86442531e384b6acb462c632ffee 100644
--- a/plugins/Overlay/lang/it.json
+++ b/plugins/Overlay/lang/it.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "Vai a schermo intero (niente barra laterale)",
"Overlay": "Overlay di Pagina",
"PluginDescription": "Vedi i tuoi dati statistici in sovrapposizione al tuo sito web. Guarda quante volte i tuoi utenti hanno cliccato su ciascun link. Nota: Richiede che sia abilitato il plugin Transitions.",
- "RedirectUrlError": "Si sta tentando di aprire la Pagina Overlay per l'URL \"%s\". %s Nessuno dei domini dalle impostazioni di Piwik corrisponde al link.",
- "RedirectUrlErrorAdmin": "È possibile aggiungere il dominio come un ulteriore URL %snelle impostazioni%s.",
+ "RedirectUrlError": "Si sta tentando di aprire la Pagina Overlay per l'URL \"%1$s\". %2$s Nessuno dei domini dalle impostazioni di Piwik corrisponde al link.",
+ "RedirectUrlErrorAdmin": "È possibile aggiungere il dominio come un ulteriore URL %1$snelle impostazioni%2$s.",
"RedirectUrlErrorUser": "Chiedi all'amministratore di aggiungere il dominio come un URL aggiuntivo."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/ja.json b/plugins/Overlay/lang/ja.json
index 3c99e23c55c5a8032f5f149e3698248a28bfa431..a83faf5776db70b3dd2478cc83ebeebe624d8728 100644
--- a/plugins/Overlay/lang/ja.json
+++ b/plugins/Overlay/lang/ja.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "フルスクリーン㸠(サイドãƒãƒ¼ãªã—)",
"Overlay": "ページオーãƒãƒ¼ãƒ¬ã‚¤",
"PluginDescription": "実際㮠web サイト上ã®ã‚ªãƒ¼ãƒãƒ¼ãƒ¬ã‚¤åˆ†æžãƒ‡ãƒ¼ã‚¿ã‚’å‚ç…§ã—ã¦ãã ã•ã„。ユーザーãŒå„リンクをクリックã—ãŸå›žæ•°ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚注: 有効ãªãƒˆãƒ©ãƒ³ã‚¸ã‚·ãƒ§ãƒ³ãƒ—ラグインãŒå¿…è¦ã§ã™ã€‚",
- "RedirectUrlError": "URL \"%s\" ã«å¯¾ã™ã‚‹ãƒšãƒ¼ã‚¸ã‚ªãƒ¼ãƒãƒ¼ãƒ¬ã‚¤ã‚’é–‹ã“ã†ã¨ã—ã¦ã„ã¾ã™ã€‚%s Piwik è¨å®šã®ãƒ‰ãƒ¡ã‚¤ãƒ³ãŒã€ã™ã¹ã¦ãƒªãƒ³ã‚¯ã«ä¸€è‡´ã—ã¾ã›ã‚“。",
- "RedirectUrlErrorAdmin": "%s è¨å®šã§ %s è¿½åŠ ã® URL ã¨ã—ã¦ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’è¿½åŠ ã§ãã¾ã™ã€‚",
+ "RedirectUrlError": "URL \"%1$s\" ã«å¯¾ã™ã‚‹ãƒšãƒ¼ã‚¸ã‚ªãƒ¼ãƒãƒ¼ãƒ¬ã‚¤ã‚’é–‹ã“ã†ã¨ã—ã¦ã„ã¾ã™ã€‚%2$s Piwik è¨å®šã®ãƒ‰ãƒ¡ã‚¤ãƒ³ãŒã€ã™ã¹ã¦ãƒªãƒ³ã‚¯ã«ä¸€è‡´ã—ã¾ã›ã‚“。",
+ "RedirectUrlErrorAdmin": "%1$s è¨å®šã§ %2$s è¿½åŠ ã® URL ã¨ã—ã¦ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’è¿½åŠ ã§ãã¾ã™ã€‚",
"RedirectUrlErrorUser": "管ç†è€…ã«ã€ä»»æ„ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’è¿½åŠ URL ã¨ã—ã¦è¿½åŠ ã™ã‚‹ã‚ˆã†ç®¡ç†è€…ã«ä¾é ¼ã—ã¦ãã ã•ã„。"
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/ko.json b/plugins/Overlay/lang/ko.json
index 1c2ebbc404450236058aec3b6c19e8dbd3293dee..0b0ceb85069a11096863948f2f1d1bb3a13e6234 100644
--- a/plugins/Overlay/lang/ko.json
+++ b/plugins/Overlay/lang/ko.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "ì „ì²´ 화면 (사ì´ë“œë°” 아님)으로 ì´ë™",
"Overlay": "페ì´ì§€ ì˜¤ë²„ë ˆì´",
"PluginDescription": "ë‹¹ì‹ ì˜ ì›¹ì‚¬ì´íŠ¸ ë¶„ì„ ë°ì´í„°ë¥¼ ì˜¤ë²„ë ˆì´ í˜•ì‹ìœ¼ë¡œ ë³¼ 수 있습니다. 사용ìžê°€ 얼마나 ê° ë§í¬ë¥¼ í´ë¦í–ˆëŠ”지 확ì¸í•´ë³´ì„¸ìš”. ì°¸ê³ : Transitions 플러그ì¸ì´ 활성화 ë˜ì–´ 있어야 합니다.",
- "RedirectUrlError": "URL \"%s\"ì— ëŒ€í•œ 페ì´ì§€ ì˜¤ë²„ë ˆì´ë¥¼ ì—´ë ¤ê³ ì‹œë„합니다. %sì€ Piwik ì„¤ì •í•œ ë„ë©”ì¸ê³¼ ì–´ë–¤ ë§í¬ë„ ì¼ì¹˜í•˜ì§€ 않습니다.",
- "RedirectUrlErrorAdmin": "ë‹¹ì‹ ì€ %sì„¤ì •%sì—ì„œ 추가ì ì¸ URLë¡œ ë„ë©”ì¸ì„ ì¶”ê°€í• ìˆ˜ 있습니다.",
+ "RedirectUrlError": "URL \"%1$s\"ì— ëŒ€í•œ 페ì´ì§€ ì˜¤ë²„ë ˆì´ë¥¼ ì—´ë ¤ê³ ì‹œë„합니다. %2$sì€ Piwik ì„¤ì •í•œ ë„ë©”ì¸ê³¼ ì–´ë–¤ ë§í¬ë„ ì¼ì¹˜í•˜ì§€ 않습니다.",
+ "RedirectUrlErrorAdmin": "ë‹¹ì‹ ì€ %1$sì„¤ì •%2$sì—ì„œ 추가ì ì¸ URLë¡œ ë„ë©”ì¸ì„ ì¶”ê°€í• ìˆ˜ 있습니다.",
"RedirectUrlErrorUser": "ë„ë©”ì¸ì— 추가ì ì¸ URLì„ ì¶”ê°€í•˜ë ¤ë©´ 관리ìžì—게 문ì˜í•˜ì„¸ìš”."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/lt.json b/plugins/Overlay/lang/lt.json
index 423410a4d492de0d55df1d0d9cfb29b71663cb7f..dfa6b324881f45beb1fdb7c4cd60fbac964cc037 100644
--- a/plugins/Overlay/lang/lt.json
+++ b/plugins/Overlay/lang/lt.json
@@ -1,5 +1,6 @@
{
"Overlay": {
+ "Clicks": "%s spustelėjimų",
"Location": "VietovÄ—"
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/nl.json b/plugins/Overlay/lang/nl.json
index 1d13d8d471919c716050c0e283d981b4a0235c29..9fc4153d7ad051d61a0bfac8f168613a32b83280 100644
--- a/plugins/Overlay/lang/nl.json
+++ b/plugins/Overlay/lang/nl.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "Toon volledig scherm (geen zijbalk)",
"Overlay": "Pagina Overlay",
"PluginDescription": "Zie je analyse data als een transparant op je eigenlijke website. Zie hoeveel keer je bezoekers hebben geklik op elke link. Opmerking: Vereist dat de Transitions plugin is ingeschakeld.",
- "RedirectUrlError": "Je probeert Pagina overlay te openen voor de URL \"%s\". %s Geen enkel domain van de Piwik instellingen komt overeen met de link.",
- "RedirectUrlErrorAdmin": "Je kunt het domein toevoegen als extra URL %sin de instellingen%s.",
+ "RedirectUrlError": "Je probeert Pagina overlay te openen voor de URL \"%1$s\". %2$s Geen enkel domain van de Piwik instellingen komt overeen met de link.",
+ "RedirectUrlErrorAdmin": "Je kunt het domein toevoegen als extra URL %1$sin de instellingen%2$s.",
"RedirectUrlErrorUser": "Vraag je beheerder om het domein toe te voegen als additionele URL."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/pt-br.json b/plugins/Overlay/lang/pt-br.json
index 7ac9592fc5064a547a9daa1544d364086efc906b..0962c16ed2891c68851f694d2b1adec729676faf 100644
--- a/plugins/Overlay/lang/pt-br.json
+++ b/plugins/Overlay/lang/pt-br.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "Ir para tela cheia (sem barra lateral)",
"Overlay": "Sobreposição de Página",
"PluginDescription": "Veja os dados das suas análises como uma sobreposição em seu site real. Veja quantas vezes os usuários clicaram em cada link. Nota: Requer o plugin Transições ativado.",
- "RedirectUrlError": "Você está tentando abrir sobreposição de página para a URL \"%s\". %s Nenhum dos domÃnios configurados no Piwik corresponde ao link.",
- "RedirectUrlErrorAdmin": "Você pode adicionar um domÃnio como uma URL adicional %sem definições%s.",
+ "RedirectUrlError": "Você está tentando abrir sobreposição de página para a URL \"%1$s\". %2$s Nenhum dos domÃnios configurados no Piwik corresponde ao link.",
+ "RedirectUrlErrorAdmin": "Você pode adicionar um domÃnio como uma URL adicional %1$sem definições%2$s.",
"RedirectUrlErrorUser": "Solicite ao seu administrador para adicionar o domÃnio como uma URL adicional."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/ro.json b/plugins/Overlay/lang/ro.json
index 88dc5924781c762e51a85f6a2ef23fe6a1891ed0..6f5c63cce21e2bbd4ce9f6106810adf7b2b6ac80 100644
--- a/plugins/Overlay/lang/ro.json
+++ b/plugins/Overlay/lang/ro.json
@@ -13,8 +13,8 @@
"OneClick": "1 click",
"OpenFullScreen": "Tot ecranul (fără bara laterală)",
"Overlay": "Acoperire Pagina",
- "RedirectUrlError": "Încercați să deschideți Acoperire Pagina pentru URL-ul \"%s\". %s Niciunul dintre domeniile de setările Piwik nu se potrivește lcu acest link.",
- "RedirectUrlErrorAdmin": "Puteți adăuga domeniul ca o suplimentare de URL-ul %s in setarile%s.",
+ "RedirectUrlError": "Încercați să deschideți Acoperire Pagina pentru URL-ul \"%1$s\". %2$s Niciunul dintre domeniile de setările Piwik nu se potrivește lcu acest link.",
+ "RedirectUrlErrorAdmin": "Puteți adăuga domeniul ca o suplimentare de URL-ul %1$s in setarile%2$s.",
"RedirectUrlErrorUser": "Adresați-vă administratorului pentru a adăuga un domeniu ca un URL suplimentar."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/ru.json b/plugins/Overlay/lang/ru.json
index 14e1780a95d2657e91d7469bf775ec6c22be399f..3d9a4a1966738d8850efdff4189dd1efb2896066 100644
--- a/plugins/Overlay/lang/ru.json
+++ b/plugins/Overlay/lang/ru.json
@@ -9,7 +9,7 @@
"OneClick": "1 клик",
"OpenFullScreen": "Перейти к полному Ñкрану",
"Overlay": "Глубина проникновениÑ",
- "RedirectUrlErrorAdmin": "Можете добавить домен как дополнительный URL %sв наÑтройках%s.",
+ "RedirectUrlErrorAdmin": "Можете добавить домен как дополнительный URL %1$sв наÑтройках%2$s.",
"RedirectUrlErrorUser": "ПопроÑите админиÑтратора добавить домен как дополнительный URL."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/sr.json b/plugins/Overlay/lang/sr.json
index 76b071399637066a63115e71c43e662dc71f6dd8..902037b8a243984b448090904a8e43da05e1f628 100644
--- a/plugins/Overlay/lang/sr.json
+++ b/plugins/Overlay/lang/sr.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "Prikaži preko celog ekrana",
"Overlay": "Prikaz preko (overlay)",
"PluginDescription": "Prikažite analitiÄke podatke preko vaÅ¡eg sajta. Pogledajte koliko puta su korisnici kliknuli na svaki od linkova. Morate imati ukljuÄen Transitions dodatak.",
- "RedirectUrlError": "Pokušali ste da otvorite stranicu za URL \"%s\". %s Nijedan od domena iz Piwik podešavanja ne odgovara ovom linku.",
- "RedirectUrlErrorAdmin": "Možete dodati domen kao dodatni URL %su podešavanjima%s.",
+ "RedirectUrlError": "Pokušali ste da otvorite stranicu za URL \"%1$s\". %2$s Nijedan od domena iz Piwik podešavanja ne odgovara ovom linku.",
+ "RedirectUrlErrorAdmin": "Možete dodati domen kao dodatni URL %1$su podešavanjima%2$s.",
"RedirectUrlErrorUser": "Zamolite administratora da doda domen kao dodatni URL."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/sv.json b/plugins/Overlay/lang/sv.json
index 9974f217d7ce33330b461bd59243c29da0ae744f..29de918027d8a89254f3c3c2610330a3517dbb94 100644
--- a/plugins/Overlay/lang/sv.json
+++ b/plugins/Overlay/lang/sv.json
@@ -13,8 +13,8 @@
"OneClick": "1 klick",
"OpenFullScreen": "Gå till helskärmsläge (ingen sidolist)",
"Overlay": "Sidöverlägg",
- "RedirectUrlError": "Du försöker öppna ett överliggande lager för URL \"%s\". %s Ingen av domänerna från Piwik's inställningar matchar länken.",
- "RedirectUrlErrorAdmin": "Du kan lägga till domänen som en extra URL %si inställningarna%s.",
+ "RedirectUrlError": "Du försöker öppna ett överliggande lager för URL \"%1$s\". %2$s Ingen av domänerna från Piwik's inställningar matchar länken.",
+ "RedirectUrlErrorAdmin": "Du kan lägga till domänen som en extra URL %1$si inställningarna%2$s.",
"RedirectUrlErrorUser": "Be administratören att lägga till domänen som en extra webbadress"
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/tl.json b/plugins/Overlay/lang/tl.json
index ad94f4a07dc9b8dfc25ee8b486d038561cb93b70..087270534754b5f822246cc5b2c1d1e22b3bb139 100644
--- a/plugins/Overlay/lang/tl.json
+++ b/plugins/Overlay/lang/tl.json
@@ -12,8 +12,8 @@
"NoData": "Walang datos para sa pahinang ito sa napiling panahon.",
"OpenFullScreen": "Mag full screen (walang sidebar)",
"Overlay": "Page Overlay",
- "RedirectUrlError": "Sinusubukan mo upang buksan ang Overlay ng Pahina para sa URL na \"%s\". %s Wala sa mga domains ng Piwik settings ang tugma sa link",
- "RedirectUrlErrorAdmin": "Maaari mong idagdag ang domain na karagdagang URL %s sa mga setting ng %s.",
+ "RedirectUrlError": "Sinusubukan mo upang buksan ang Overlay ng Pahina para sa URL na \"%1$s\". %2$s Wala sa mga domains ng Piwik settings ang tugma sa link",
+ "RedirectUrlErrorAdmin": "Maaari mong idagdag ang domain na karagdagang URL %1$s sa mga setting ng %2$s.",
"RedirectUrlErrorUser": "Tanungin ang iyong administrator upang idagdag ang domain bilang isang karagdagang URL."
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/vi.json b/plugins/Overlay/lang/vi.json
index a84ed3122be657aa25e0c2430b0bd98befc6a226..a896ef4d8abd86e0ccfdf31c087f4d5ca423492a 100644
--- a/plugins/Overlay/lang/vi.json
+++ b/plugins/Overlay/lang/vi.json
@@ -13,8 +13,8 @@
"OneClick": "1 click",
"OpenFullScreen": "Toà n mà n hình (không có sidebar)",
"Overlay": "Trang Overlay",
- "RedirectUrlError": "Bạn Ä‘ang cố mở trang Overlay cho URL \"%s\". Không có %s của các tên miá»n từ các thiết láºp Piwik phù hợp vá»›i liên kết nà y.",
- "RedirectUrlErrorAdmin": "Bạn có thể thêm các tên miá»n nhÆ° má»™t URL bổ sung %s trong cà i đặt %s.",
+ "RedirectUrlError": "Bạn Ä‘ang cố mở trang Overlay cho URL \"%1$s\". Không có %2$s của các tên miá»n từ các thiết láºp Piwik phù hợp vá»›i liên kết nà y.",
+ "RedirectUrlErrorAdmin": "Bạn có thể thêm các tên miá»n nhÆ° má»™t URL bổ sung %1$s trong cà i đặt %2$s.",
"RedirectUrlErrorUser": "Yêu cầu quản trị của bạn thêm các tên miá»n nhÆ° má»™t URL bổ sung"
}
}
\ No newline at end of file
diff --git a/plugins/Overlay/lang/zh-cn.json b/plugins/Overlay/lang/zh-cn.json
index c6fec4aa708c0b7f859ca39e360a27cf55c353d3..01cfb83dd32fd9a144a696c81e2efa2a6b4f1c4d 100644
--- a/plugins/Overlay/lang/zh-cn.json
+++ b/plugins/Overlay/lang/zh-cn.json
@@ -14,8 +14,8 @@
"OpenFullScreen": "å…¨å±(æ— è¾¹æ¡†)",
"Overlay": "页é¢å åŠ ",
"PluginDescription": "请å‚阅您的分æžæ•°æ®ä¸ºæ‚¨çš„实际网站的å åŠ ã€‚æŸ¥çœ‹æœ‰å¤šå°‘æ¬¡ä½ çš„ç”¨æˆ·ç‚¹å‡»æ¯ä¸€ä¸ªçŽ¯èŠ‚上。注：需è¦åœ¨è½¬æ¢æ’件å¯ç”¨ã€‚",
- "RedirectUrlError": "您æ£åœ¨æ‰“å¼€ç½‘å€ \"%s\" 的页é¢å åŠ ã€‚%s 没有 Piwik 设置的域å匹é…这个链接。",
- "RedirectUrlErrorAdmin": "您å¯ä»¥åœ¨ %s管ç†è®¾ç½®%s ä¸ä»¥é™„åŠ ç½‘å€æ·»åŠ 域å。",
+ "RedirectUrlError": "您æ£åœ¨æ‰“å¼€ç½‘å€ \"%1$s\" 的页é¢å åŠ ã€‚%2$s 没有 Piwik 设置的域å匹é…这个链接。",
+ "RedirectUrlErrorAdmin": "您å¯ä»¥åœ¨ %1$s管ç†è®¾ç½®%2$s ä¸ä»¥é™„åŠ ç½‘å€æ·»åŠ 域å。",
"RedirectUrlErrorUser": "请管ç†å‘˜ä»¥é™„åŠ ç½‘å€æ¥æ·»åŠ 域å。"
}
}
\ No newline at end of file
diff --git a/plugins/PiwikPro/PiwikPro.php b/plugins/PiwikPro/PiwikPro.php
new file mode 100644
index 0000000000000000000000000000000000000000..590b2a94b59784abcebc2b05d1d0ece79d844c4d
--- /dev/null
+++ b/plugins/PiwikPro/PiwikPro.php
@@ -0,0 +1,27 @@
+<?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\PiwikPro;
+
+class PiwikPro extends \Piwik\Plugin
+{
+ /**
+ * @see Piwik\Plugin::registerEvents
+ */
+ public function registerEvents()
+ {
+ return array(
+ 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
+ );
+ }
+
+ public function getStylesheetFiles(&$stylesheets)
+ {
+ $stylesheets[] = 'plugins/PiwikPro/stylesheets/widget.less';
+ }
+}
diff --git a/plugins/PiwikPro/Promo.php b/plugins/PiwikPro/Promo.php
new file mode 100644
index 0000000000000000000000000000000000000000..c253df0f430551d92df85a7cb8a4e34a2cdab239
--- /dev/null
+++ b/plugins/PiwikPro/Promo.php
@@ -0,0 +1,65 @@
+<?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\PiwikPro;
+
+class Promo
+{
+ protected $linkTitles = array('Read more', 'Learn more');
+
+ protected $content = array(
+ array(
+ 'campaignContent' => 'discoverPower',
+ 'text' => 'Discover the power of open-source combined with enterprise-grade support and premium functionalities.'
+ ),
+ array(
+ 'campaignContent' => 'bringEnterpriseLevel',
+ 'text' => 'Bring your analytics to enterprise level. Upgrade your Piwik platform and receive access to numerous premium features and assistance from our experts.'
+ ),
+ array(
+ 'campaignContent' => 'funnelAnalytics',
+ 'text' => 'Want Funnel Analytics? Get Premium features and enterprise-grade support from the makers of Piwik.'
+ ),
+ array(
+ 'campaignContent' => 'monitoringAndIncident',
+ 'text' => 'Do you need 24/7 Monitoring and Incident Handling for your Piwik? Get Premium features and enterprise-grade support from the makers of Piwik.'
+ ),
+ array(
+ 'campaignContent' => 'slowingDown',
+ 'text' => 'Is your Piwik slowing down? The Piwik makers can help with your server setup!'
+ ),
+ array(
+ 'campaignContent' => 'excitingFeatures',
+ 'text' => 'Want to know how to use all the exciting features in Piwik? Try our User training to be up to speed with working with Piwik.'
+ ),
+ array(
+ 'campaignContent' => 'slowingDown',
+ 'text' => 'Did you know you can adjust the look and feel of Piwik to your brand, and even replace "Piwik" with your product name? Try our White Label product!',
+ ),
+ array(
+ 'campaignContent' => 'metaSites',
+ 'text' => 'Did you know you can aggregate the tracked data across hundreds of sites and display it in a single dashboard? Get Premium features and enterprise-grade support.',
+ ),
+ );
+
+ public function getLinkTitle()
+ {
+ $titles = $this->linkTitles;
+ shuffle($titles);
+
+ return array_shift($titles);
+ }
+
+ public function getContent()
+ {
+ $content = $this->content;
+ shuffle($content);
+
+ return array_shift($content);
+ }
+}
diff --git a/plugins/PiwikPro/Widgets/PromoPiwikPro.php b/plugins/PiwikPro/Widgets/PromoPiwikPro.php
new file mode 100644
index 0000000000000000000000000000000000000000..a9203d417f61d807999a42d97d086cce9957ae68
--- /dev/null
+++ b/plugins/PiwikPro/Widgets/PromoPiwikPro.php
@@ -0,0 +1,55 @@
+<?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\PiwikPro\Widgets;
+
+use Piwik\Container\StaticContainer;
+use Piwik\Piwik;
+use Piwik\PiwikPro\Advertising;
+use Piwik\Plugins\PiwikPro\Promo;
+use Piwik\View;
+use Piwik\Widget\WidgetConfig;
+
+class PromoPiwikPro extends \Piwik\Widget\Widget
+{
+ /**
+ * @var Advertising
+ */
+ private $advertising;
+
+ /**
+ * @var Promo
+ */
+ private $promo;
+
+ public function __construct(Advertising $advertising, Promo $promo)
+ {
+ $this->advertising = $advertising;
+ $this->promo = $promo;
+ }
+
+ public static function configure(WidgetConfig $config)
+ {
+ $config->setCategoryId('About Piwik');
+ $config->setName('PiwikPro_WidgetPiwikProAd');
+ $config->setIsEnabled(StaticContainer::get('Piwik\PiwikPro\Advertising')->arePiwikProAdsEnabled());
+ }
+
+ public function render()
+ {
+ $view = new View('@PiwikPro/promoPiwikProWidget');
+
+ $promo = $this->promo->getContent();
+
+ $view->ctaLinkUrl = $this->advertising->getPromoUrlForOnPremises('PromoWidget', $promo['campaignContent']);
+ $view->ctaText = $promo['text'];
+ $view->ctaLinkTitle = $this->promo->getLinkTitle();
+
+ return $view->render();
+ }
+}
diff --git a/plugins/PiwikPro/Widgets/RssPiwikPro.php b/plugins/PiwikPro/Widgets/RssPiwikPro.php
new file mode 100644
index 0000000000000000000000000000000000000000..26e87f92bee0f86af34da8d284ed6ecce2a94e2a
--- /dev/null
+++ b/plugins/PiwikPro/Widgets/RssPiwikPro.php
@@ -0,0 +1,49 @@
+<?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\PiwikPro\Widgets;
+
+use Piwik\Container\StaticContainer;
+use Piwik\Piwik;
+use Piwik\Widget\WidgetConfig;
+use Piwik\Plugins\ExampleRssWidget\RssRenderer;
+
+class RssPiwikPro extends \Piwik\Widget\Widget
+{
+ public static function configure(WidgetConfig $config)
+ {
+ $config->setCategoryId('About Piwik');
+ $config->setName('PiwikPro_WidgetBlogTitle');
+ $config->setIsEnabled(StaticContainer::get('Piwik\PiwikPro\Advertising')->arePiwikProAdsEnabled());
+ }
+
+ public function render()
+ {
+ try {
+ $rss = new RssRenderer('https://piwik.pro/feed/');
+ $rss->showDescription(true);
+
+ return $rss->get();
+
+ } catch (\Exception $e) {
+
+ return $this->error($e);
+ }
+ }
+
+ /**
+ * @param \Exception $e
+ * @return string
+ */
+ private function error($e)
+ {
+ return '<div class="pk-emptyDataTable">'
+ . Piwik::translate('General_ErrorRequest', array('', ''))
+ . ' - ' . $e->getMessage() . '</div>';
+ }
+}
diff --git a/plugins/PiwikPro/config/test.php b/plugins/PiwikPro/config/test.php
new file mode 100644
index 0000000000000000000000000000000000000000..327acd520568a4c774328e5330d661f1de9694d3
--- /dev/null
+++ b/plugins/PiwikPro/config/test.php
@@ -0,0 +1,13 @@
+<?php
+
+use Piwik\Tests\Framework\Mock\PiwikPro\Advertising;
+use Piwik\Plugins\PiwikPro\tests\Framework\Mock\Promo;
+
+return array(
+ 'Piwik\PiwikPro\Advertising' => function () {
+ return new Advertising();
+ },
+ 'Piwik\Plugins\PiwikPro\Promo' => function () {
+ return new Promo();
+ }
+);
diff --git a/plugins/PiwikPro/images/promo.png b/plugins/PiwikPro/images/promo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac15b596df4d082573e2d36487c00d595b001182
Binary files /dev/null and b/plugins/PiwikPro/images/promo.png differ
diff --git a/plugins/PiwikPro/lang/en.json b/plugins/PiwikPro/lang/en.json
new file mode 100644
index 0000000000000000000000000000000000000000..34e405f8f04fcfb0443c597802e3feb5006c2a12
--- /dev/null
+++ b/plugins/PiwikPro/lang/en.json
@@ -0,0 +1,6 @@
+{
+ "PiwikPro": {
+ "WidgetBlogTitle": "Piwik PRO Blog",
+ "WidgetPiwikProAd": "Piwik PRO: Advanced Analytics & Services"
+ }
+}
\ No newline at end of file
diff --git a/plugins/PiwikPro/plugin.json b/plugins/PiwikPro/plugin.json
new file mode 100644
index 0000000000000000000000000000000000000000..089dd4abf204f568ce9381913a7513cccddb951b
--- /dev/null
+++ b/plugins/PiwikPro/plugin.json
@@ -0,0 +1,5 @@
+{
+ "name": "PiwikPro",
+ "description": "Provides widgets to follow Piwik PRO blog and to see info about Piwik PRO services and products.",
+ "theme": false
+}
\ No newline at end of file
diff --git a/plugins/PiwikPro/stylesheets/widget.less b/plugins/PiwikPro/stylesheets/widget.less
new file mode 100644
index 0000000000000000000000000000000000000000..fdb9cb1eae03582355e04f69b00b41e4feddea3c
--- /dev/null
+++ b/plugins/PiwikPro/stylesheets/widget.less
@@ -0,0 +1,29 @@
+.promoWidget {
+ // hard coded background color because image has hardcoded background
+ background-color: white;
+
+ .promo {
+ padding: 20px;
+ &:after {
+ content: '';
+ clear: both;
+ visibility: hidden;
+ }
+ }
+ .text {
+ overflow: hidden;
+ }
+ hr {
+ margin: 0px;
+ }
+ .link {
+ padding: 20px;
+ }
+ .icon {
+ margin-top:20px;
+ width: 64px;
+ height: 64px;
+ float: left;
+ margin-right: 20px;
+ }
+}
\ No newline at end of file
diff --git a/plugins/PiwikPro/templates/promoPiwikProWidget.twig b/plugins/PiwikPro/templates/promoPiwikProWidget.twig
new file mode 100644
index 0000000000000000000000000000000000000000..2864fa340f19925d6d1ed832d16a97e7cff185ef
--- /dev/null
+++ b/plugins/PiwikPro/templates/promoPiwikProWidget.twig
@@ -0,0 +1,12 @@
+<div class="promoWidget">
+ <div class="promo">
+ <img class="icon" src="plugins/PiwikPro/images/promo.png">
+ <p class="text">
+ {{ ctaText }}
+ <br /><br />
+ <a class="btn" href="{{ ctaLinkUrl|e('html_attr') }}" target="_blank" rel="noreferrer">
+ {{ ctaLinkTitle }}
+ </a>
+ </p>
+ </div>
+</div>
\ No newline at end of file
diff --git a/plugins/PiwikPro/tests/Framework/Mock/Promo.php b/plugins/PiwikPro/tests/Framework/Mock/Promo.php
new file mode 100644
index 0000000000000000000000000000000000000000..47dd6f6497a0b9ac86222b889590c0c1cd531818
--- /dev/null
+++ b/plugins/PiwikPro/tests/Framework/Mock/Promo.php
@@ -0,0 +1,22 @@
+<?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\PiwikPro\tests\Framework\Mock;
+
+class Promo extends \Piwik\Plugins\PiwikPro\Promo
+{
+ public function getLinkTitle()
+ {
+ return $this->linkTitles[0];
+ }
+
+ public function getContent()
+ {
+ return $this->content[0];
+ }
+}
\ No newline at end of file
diff --git a/plugins/PrivacyManager/lang/be.json b/plugins/PrivacyManager/lang/be.json
index dbad381752b7d18e8c6f07a2c94da36c69968a0e..c7da31457ecce2d7f8d082e5e7c5a19a5db8596d 100644
--- a/plugins/PrivacyManager/lang/be.json
+++ b/plugins/PrivacyManager/lang/be.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "ÐбÑрыце \"Так\", калі вы хочаце, каб Piwik не адÑочваў поўны IP-адраÑ.",
"AnonymizeIpInlineHelp": "Схаваць апошні байт(Ñ‹) IP-адраÑоў наведвальнікаў, каб выканаць вашы мÑÑÑ†Ð¾Ð²Ñ‹Ñ Ð·Ð°ÐºÐ¾Ð½Ñ‹ кіруючых органаў.",
"AnonymizeIpMaskLengtDescription": "Выбраць, колькі байтаў IP-адраÑоў наведвальнікаў павінны быць ÑхаваныÑ.",
- "AnonymizeIpMaskLength": "%s байт(ы) - напр., %s",
+ "AnonymizeIpMaskLength": "%1$s байт(ы) - напр., %2$s",
"ClickHereSettings": "ÐаціÑніце тут, каб атрымаць доÑтуп да %s наладак.",
"DeleteLogDescription2": "Калі вы ўключыце аўтаматычнае выдаленне запіÑаў, вы павінны пераканацца, што ÑžÑе папÑÑ€ÑÐ´Ð½Ñ–Ñ ÑˆÑ‚Ð¾Ð´Ð·Ñ‘Ð½Ð½Ñ‹Ñ Ñправаздачы былі апрацаваны, каб пазбегнуць Ð³ÑƒÐ±Ð»ÐµÐ½Ð½Ñ Ð´Ð°Ð´Ð·ÐµÐ½Ñ‹Ñ….",
"DeleteLogInfo": "ЗапіÑÑ‹ з наÑтупнай табліцы будуць выдаленыÑ: %s",
diff --git a/plugins/PrivacyManager/lang/bg.json b/plugins/PrivacyManager/lang/bg.json
index 4e1a6ea7d228f732148bcaf0c23d96348cd8ee54..cad5e085e8d89fb0c11071c94b65b76440b02aa8 100644
--- a/plugins/PrivacyManager/lang/bg.json
+++ b/plugins/PrivacyManager/lang/bg.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "Изберете \"Да\", ако желаете Piwik да не проÑледÑва напълно квалифицирани IP адреÑи.",
"AnonymizeIpInlineHelp": "Скрива поÑледните цифри на IP адреÑа на поÑетителÑ, за да бъде Ñпазен закона за поверителноÑÑ‚.",
"AnonymizeIpMaskLengtDescription": "Изберете колко байта от IP на поÑетителите да е маÑкирано.",
- "AnonymizeIpMaskLength": "%s байта - пример %s",
+ "AnonymizeIpMaskLength": "%1$s байта - пример %2$s",
"ClickHereSettings": "ÐатиÑнете тук, за да влезете в %s наÑтройките.",
"CurrentDBSize": "ÐаÑтоÑщ размер на базата данни",
"DBPurged": "Базата от данни е изтрита.",
@@ -18,8 +18,8 @@
"DeleteMaxRows": "МакÑималниÑÑ‚ брой редове, които да бъдат изтрити на един път:",
"DeleteMaxRowsNoLimit": "без лимит",
"DeleteReportsConfirm": "Ðа път Ñте да включите изтриване на отчетите. Ðко Ñтарите отчети Ñа изтрити, вие ще Ñ‚Ñ€Ñбвате да ги изготвите наново за да ги видите. Сигурни ли Ñте, че иÑкате да направите това?",
- "DeleteReportsDetailedInfo": "ИнформациÑта от базата данни за цифровите архивни таблици (%s) и текÑтовите архивни таблици (%s) ще бъде изтрита.",
- "DeleteReportsInfo": "Ðко е включено, Ñтарите отчети ще бъдат изтрити. %sПрепоръчваме да включвате Ñамо когато мÑÑтото за база данни е ограничено.%s",
+ "DeleteReportsDetailedInfo": "ИнформациÑта от базата данни за цифровите архивни таблици (%1$s) и текÑтовите архивни таблици (%2$s) ще бъде изтрита.",
+ "DeleteReportsInfo": "Ðко е включено, Ñтарите отчети ще бъдат изтрити. %1$sПрепоръчваме да включвате Ñамо когато мÑÑтото за база данни е ограничено.%2$s",
"DeleteReportsInfo2": "Ðко не Ñте включили \"%s\", Ñтарите отчети ще Ñе Ñъздават автоматично при поиÑкване.",
"DeleteReportsInfo3": "Ðко Ñте включили \"%s\", информациÑта ще бъде изгубена завинаги.",
"DeleteReportsOlderThan": "Изтрива отчети по-Ñтари от",
@@ -47,7 +47,7 @@
"PurgingData": "Изтриване на базата данни...",
"ReportsDataSavedEstimate": "Размер на базата данни",
"SaveSettingsBeforePurge": "Вие променихте наÑтройките за изтриване на информациÑ. ÐœÐ¾Ð»Ñ Ð·Ð°Ð¿Ð°Ð·ÐµÑ‚Ðµ ги, преди да започнете изтриване.",
- "Teaser": "Ðа тази Ñтраница можете да перÑонализирате Piwik, за да ÑъглаÑувате поверителноÑтта ÑÑŠÑ ÑъщеÑтвуващото законодателÑтво, чрез: %s правейки поÑетителÑкото IP анонимно %s, %s автоматично премахване на Ñтари поÑетителÑки логове от базата данни %s, и %s даване на възможноÑÑ‚ за отказ от уÑлуги за вашиÑÑ‚ уеб Ñайт%s.",
+ "Teaser": "Ðа тази Ñтраница можете да перÑонализирате Piwik, за да ÑъглаÑувате поверителноÑтта ÑÑŠÑ ÑъщеÑтвуващото законодателÑтво, чрез: %1$s правейки поÑетителÑкото IP анонимно %2$s, %3$s автоматично премахване на Ñтари поÑетителÑки логове от базата данни %4$s, и %5$s даване на възможноÑÑ‚ за отказ от уÑлуги за вашиÑÑ‚ уеб Ñайт%6$s.",
"TeaserHeadline": "ÐаÑтройки на поверителноÑтта",
"UseAnonymizeIp": "Правене на IP-тата на поÑетителите анонимни",
"UseDeleteLog": "Периодично изтриване на Ñтарите поÑетителÑки логове от базата данни",
diff --git a/plugins/PrivacyManager/lang/ca.json b/plugins/PrivacyManager/lang/ca.json
index 1e06cfbfc59a99c64c24350e56b2bf59a306f863..bc9e47251a0c325fd51160884516010808f1d0cc 100644
--- a/plugins/PrivacyManager/lang/ca.json
+++ b/plugins/PrivacyManager/lang/ca.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "Seleccioneu \"SÃ\" si voleu que el Piwik no registri l'adreça IP complerta.",
"AnonymizeIpInlineHelp": "Anonimitzar el(s) últim(s) de la IP de les adreces dels visitants per complir amb la vostra polÃtica de privacitat\/llei.",
"AnonymizeIpMaskLengtDescription": "Seleccioneu quans bytes de l'adreça IP del visitant voleu enmascarar.",
- "AnonymizeIpMaskLength": "%s byte(s) - p.e. %s",
+ "AnonymizeIpMaskLength": "%1$s byte(s) - p.e. %2$s",
"CannotLockSoDeleteLogActions": "La taula log_action no es purgarà : siusplau doneu el privilegi LOCK TABLES a l'ususair de MySQL '%s'.",
"ClickHereSettings": "Feu click aquà per entrar a %s la configuració",
"CurrentDBSize": "Tamany actual de la Base de dades",
@@ -19,8 +19,8 @@
"DeleteMaxRows": "Nombre mà xim de files per eliminar en una sola execució:",
"DeleteMaxRowsNoLimit": "sense lÃmit",
"DeleteReportsConfirm": "Esteu a punt d'activar l'eliminació de la informació dels informes. Si els informes antics s'eliminen, haure de tornar-los a procesar per veure'ls. Esteu segur que voleu fer això?",
- "DeleteReportsDetailedInfo": "S'eliminarà la informació de les taules númeriques (%s) i de les taules binà ries (%s).",
- "DeleteReportsInfo": "Si s'activa els informes antic s'esborraran. %s Recomanem que només ho activeu quan l'espai de la BD es limitat. %s",
+ "DeleteReportsDetailedInfo": "S'eliminarà la informació de les taules númeriques (%1$s) i de les taules binà ries (%2$s).",
+ "DeleteReportsInfo": "Si s'activa els informes antic s'esborraran. %1$s Recomanem que només ho activeu quan l'espai de la BD es limitat. %2$s",
"DeleteReportsInfo2": "Si no heu activat \"%s\", els informes anteriors es recrearan de forma automà tica quan es demanin.",
"DeleteReportsInfo3": "Si heu activat \"%s\", la informació s'esborrarà permanentment.",
"DeleteReportsOlderThan": "Elmina els informes anteriors a",
@@ -49,7 +49,7 @@
"PurgingData": "Prugant la informació...",
"ReportsDataSavedEstimate": "Mida de la Base de dades",
"SaveSettingsBeforePurge": "Heu canviat la configuració d'esborrament. Sisplau, guardeu les vostres preferències abans de començar la purga.",
- "Teaser": "En aquesta pà gina podeu personalitzar el Piwik per tal de que compleixi amb les legislacions actuals. Podeu: %sconvertir la IP del visitant en anònima%s, %sesborrar automà ticmant els registres antics de la base de dades%s i %s proporcionar un mecanisme per a que els vostreus usuaris puguin triar de no ser rastrejats %s.",
+ "Teaser": "En aquesta pà gina podeu personalitzar el Piwik per tal de que compleixi amb les legislacions actuals. Podeu: %1$sconvertir la IP del visitant en anònima%2$s, %3$sesborrar automà ticmant els registres antics de la base de dades%4$s i %5$s proporcionar un mecanisme per a que els vostreus usuaris puguin triar de no ser rastrejats %6$s.",
"TeaserHeadline": "Preferències de Privacitat",
"UseAnonymizeIp": "Convertir la IP dels vostres visitants en anònima",
"UseDeleteLog": "Esborrar de forma perÃodica el registres de visitants.",
diff --git a/plugins/PrivacyManager/lang/cs.json b/plugins/PrivacyManager/lang/cs.json
index 1677ed1252b75080f78b3294b50d3f3e576cc56d..a5c8be3f678d4d74a8c7b21838da96fbd827eba6 100644
--- a/plugins/PrivacyManager/lang/cs.json
+++ b/plugins/PrivacyManager/lang/cs.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "Zvolte \"ano\", pokud nemá Piwik sledovat plně kvalifikované IP adresy.",
"AnonymizeIpInlineHelp": "Skryje poslednà byte IP adresy návÅ¡tÄ›vnÃka, aby souhlasila se zákony vaÅ¡Ã zemÄ›.",
- "AnonymizeIpExtendedHelp": "Když uživatelé navÅ¡tÃvà vaÅ¡e stránky, Piwik neuložà jejich plnou IP adresu (jako %s), ale nejprve bude anonymizována (na %s). Anonymizace IP adres je jednÃm z požadavků práva na ochranu soukromà v nÄ›kterých zemÃ, jako je tÅ™eba NÄ›mecko.",
+ "AnonymizeIpExtendedHelp": "Když uživatelé navÅ¡tÃvà vaÅ¡e stránky, Piwik neuložà jejich plnou IP adresu (jako %1$s), ale nejprve bude anonymizována (na %2$s). Anonymizace IP adres je jednÃm z požadavků práva na ochranu soukromà v nÄ›kterých zemÃ, jako je tÅ™eba NÄ›mecko.",
"AnonymizeIpMaskLengtDescription": "Zvolte, kolik bitů z návÅ¡tÄ›vnÃkovy IP adresy má být maskováno.",
- "AnonymizeIpMaskLength": "%s bitů - např. %s",
+ "AnonymizeIpMaskLength": "%1$s bitů - např. %2$s",
"CannotLockSoDeleteLogActions": "Tabulka log_action nebude vyprázdněna: dejte Mysql uživateli %s privilegium LOCK TABLES.",
"ClickHereSettings": "Pro pÅ™Ãstup k nastavenà %s kliknÄ›te zde.",
"CurrentDBSize": "Aktuálnà velikost databáze",
@@ -22,14 +22,14 @@
"DeleteMaxRows": "Maximálnà poÄet řádků, které se majà smazat pÅ™i jednom bÄ›hu:",
"DeleteMaxRowsNoLimit": "bez limitu",
"DeleteReportsConfirm": "Chystáte se povolit mazánà starých hlášenÃ. Pokud je budete chtÃt zobrazit, budou muset být znovu vytvoÅ™ena. Opravdu to chcete provést?",
- "DeleteReportsDetailedInfo": "Data z databázových archivnÃch ÄÃselných tabulek (%s) a archivnÃch tabulek syrových dat (%s) budou odstranÄ›na.",
- "DeleteReportsInfo": "Pokud je povoleno, stará hlášenà budou smazána. %sDoporuÄujeme použÃt tuto možnost pouze, je-li velikost vaÅ¡Ã databáze omezená.%s",
+ "DeleteReportsDetailedInfo": "Data z databázových archivnÃch ÄÃselných tabulek (%1$s) a archivnÃch tabulek syrových dat (%2$s) budou odstranÄ›na.",
+ "DeleteReportsInfo": "Pokud je povoleno, stará hlášenà budou smazána. %1$sDoporuÄujeme použÃt tuto možnost pouze, je-li velikost vaÅ¡Ã databáze omezená.%2$s",
"DeleteReportsInfo2": "Pokud nenà povoleno \"%s\", stará hlášenà budou na požádánà znovu vytvořena.",
"DeleteReportsInfo3": "Pokud je povoleno \"%s\", data budou nevratnÄ› ztracena.",
"DeleteReportsOlderThan": "Smazat hlášenà staršà než",
"DeleteSchedulingSettings": "Maplánovat výmaz starých dat",
"DeleteDataSettings": "Smazat staré logy návÅ¡tÄ›vnÃků a hlášenÃ",
- "DoNotTrack_Description": "Do not track je návrh technologie a politiky, která umožňuje uživatelům indikovat, že si nepÅ™ejà být stránkami, které navÅ¡tÄ›vujà a to vÄetnÄ› služeb webové analýzi, reklamnÃch služeb a sociálnÃch platforem.",
+ "DoNotTrack_Description": "Do Not Track je návrh technologie a politiky, která umožňuje uživatelům odhlásit se ze sledovánà stránkami, které navÅ¡tÃvÃ, vÄetnÄ› služeb webových analýz, reklamnÃch sÃtà a sociálnÃch platforem.",
"DoNotTrack_Disable": "Zakázat podporu Do not track",
"DoNotTrack_Disabled": "Piwik sleduje vÅ¡echny návÅ¡tÄ›vnÃky vÄetnÄ› tÄ›ch, kteřà v možnostech svého webového prohlÞeÄe nastavili, že si nepÅ™ejà být sledováni.",
"DoNotTrack_DisabledMoreInfo": "DoporuÄujeme respektovat soukromà vaÅ¡ich návÅ¡tÄ›vnÃků a podporu Do not track povolit.",
@@ -56,8 +56,8 @@
"RecommendedForPrivacy": "DoporuÄeno pro soukromÃ",
"ReportsDataSavedEstimate": "Velikost databáze",
"SaveSettingsBeforePurge": "Nastavenà mazánà dat byla zmÄ›nÄ›na. Uložte je pÅ™ed promazánÃm.",
- "SeeAlsoOurOfficialGuidePrivacy": "PodÃvejte se také na náš oficiálnà návod: %ssoukromà webové analýzy%s",
- "Teaser": "Na této stránce můžete Piwik nastavit tak, aby splňoval zákony o soukromà s použitÃm %s anonymizovánà IP adresy návÅ¡tÄ›vnÃků%s, %s automatického odstraňovánà starých logů návÅ¡tÄ›vnÃků z databáze%s a %s poskytovánÃm mechanismu vylouÄenà pro vaÅ¡e webové stránky%s.",
+ "SeeAlsoOurOfficialGuidePrivacy": "PodÃvejte se také na náš oficiálnà návod: %1$ssoukromà webové analýzy%2$s",
+ "Teaser": "Na této stránce můžete Piwik nastavit tak, aby chránil osobnà údaje tak, že bude: %1$s anonymizovat IP adresy návÅ¡tÄ›vnÃků%2$s, %3$s automaticky odstraňovat staré logy návÅ¡tÄ›vnÃků z databáze%4$s a %5$s poskytovat mechanismus odhlášenà pro váš web%6$s.",
"TeaserHeadline": "Nastavenà ochrany soukromÃ",
"UseAnonymizedIpForVisitEnrichment": "Anonymizované IP adresy použÃt i pÅ™i obohacovánà návÅ¡tÄ›v.",
"UseAnonymizedIpForVisitEnrichmentNote": "Zásuvné moduly jako geolokace podle IP a poskytovatel vylepÅ¡ujà metadata o návÅ¡tÄ›vnÃcÃch. Ve výchozÃm stavu tyto zásuvné moduly použÃvajà anonymizované IP adresy. Pokud vyberete \"ne\", pak tyto zásuvné moduly budou použÃvat plné adresy, což způsobà omezenà soukromà ale zlepÅ¡enà výsledků.",
diff --git a/plugins/PrivacyManager/lang/da.json b/plugins/PrivacyManager/lang/da.json
index 223eeaa4f5bac46026b9fb2360d0024979be16f5..f4255ab3bda5b71c322ae0c16de2696771ccd025 100644
--- a/plugins/PrivacyManager/lang/da.json
+++ b/plugins/PrivacyManager/lang/da.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "Vælg \"Ja\", hvis Piwik ikke skal spore fuldt kvalificerede IP-adresser.",
"AnonymizeIpInlineHelp": "Anonymiser besøgendes IP-adresser for at efterkomme den lokale lovgivning om privatlivets fred\/retningslinjer.",
- "AnonymizeIpExtendedHelp": "Når brugerne besøger hjemmesiden, vil Piwik ikke bruge den fulde IP-adresse (f.eks %s), men i stedet vil Piwik anonymisere det først (til %s). IP-adresse anonymisering er et af de krav, som lovgivningen om privatlivets fred i visse lande som fx. Tyskland.",
+ "AnonymizeIpExtendedHelp": "Når brugerne besøger hjemmesiden, vil Piwik ikke bruge den fulde IP-adresse (f.eks %1$s), men i stedet vil Piwik anonymisere det først (til %2$s). IP-adresse anonymisering er et af de krav, som lovgivningen om privatlivets fred i visse lande som fx. Tyskland.",
"AnonymizeIpMaskLengtDescription": "Vælg hvor mange bytes af de besøgendes IP-adresser der skal maskeres.",
- "AnonymizeIpMaskLength": "%s bytes - f.eks %s",
+ "AnonymizeIpMaskLength": "%1$s bytes - f.eks %2$s",
"CannotLockSoDeleteLogActions": "log_action tabellen vil ikke blive slettet: giv LOCK TABELLER privilegium til '%s' MYSQL brugeren.",
"ClickHereSettings": "Klik her for at få adgang til %s indstillinger.",
"CurrentDBSize": "Nuværende database størrelse",
@@ -20,8 +20,8 @@
"DeleteMaxRows": "Maksimale antal rækker der slettes på én gang:",
"DeleteMaxRowsNoLimit": "ingen begrænsning",
"DeleteReportsConfirm": "Aktiver rapportdata sletning. Hvis gamle rapporter fjernes, skal de forarbejdes igen dem med henblik på se dem. Bekræft sletning.",
- "DeleteReportsDetailedInfo": "Data fra de numeriske arkiv tabeller (%s) og blob arkiv tabeller (%s) i databasen vil blive slettet.",
- "DeleteReportsInfo": "Hvis aktiveret, vil gamle rapporter blive slettet. %sVi anbefaler kun at aktivere dette, når din database-plads er begrænset.%s",
+ "DeleteReportsDetailedInfo": "Data fra de numeriske arkiv tabeller (%1$s) og blob arkiv tabeller (%2$s) i databasen vil blive slettet.",
+ "DeleteReportsInfo": "Hvis aktiveret, vil gamle rapporter blive slettet. %1$sVi anbefaler kun at aktivere dette, når din database-plads er begrænset.%2$s",
"DeleteReportsInfo2": "Hvis ikke \"%s\" er aktiveret , vil gamle rapporter genskabes automatisk når det anmodes.",
"DeleteReportsInfo3": "Hvis du har aktiveret \"%s\", slettes data permanent.",
"DeleteReportsOlderThan": "Slet rapporter ældre end",
@@ -50,8 +50,8 @@
"PurgingData": "Rydder op i data...",
"ReportsDataSavedEstimate": "Database størrelse",
"SaveSettingsBeforePurge": "Indstillinger for datasletning er ændret. Gem før oprydning.",
- "SeeAlsoOurOfficialGuidePrivacy": "Se også vores officielle vejledning: %sWeb Analytics Privacy%s",
- "Teaser": "Tilpas Piwik til at beskytte personlige oplysninger i overensstemmelse med gældende lovgivning, ved at: %s anonymisere den besøgendes IP%s, %s automatisk fjerne gamle besøgs logfiler fra databasen%s og %s giver en frameld mekanisme til hjemmesiden%s.",
+ "SeeAlsoOurOfficialGuidePrivacy": "Se også vores officielle vejledning: %1$sWeb Analytics Privacy%2$s",
+ "Teaser": "Tilpas Piwik til at beskytte personlige oplysninger i overensstemmelse med gældende lovgivning, ved at: %1$s anonymisere den besøgendes IP%2$s, %3$s automatisk fjerne gamle besøgs logfiler fra databasen%4$s og %5$s giver en frameld mekanisme til hjemmesiden%6$s.",
"TeaserHeadline": "Privatlivsindstillinger",
"UseAnonymizedIpForVisitEnrichment": "Brug også anonymiseret IP-adresser, når beriger besøg.",
"UseAnonymizedIpForVisitEnrichmentNote": "Programudvidelser som Geo Location via IP og udbyder forbedrer besøgendes metadata. Som standard bruger disse udvidelsesmoduler anonyme IP-adresser. Hvis du vælger 'Nej', så vil den ikke-anonymiseret fulde IP-adresse blive brugt i stedet for, hvilket resulterer i mindre privatliv, men bedre data nøjagtighed.",
diff --git a/plugins/PrivacyManager/lang/de.json b/plugins/PrivacyManager/lang/de.json
index 8771dd1286503e4a1fff6c7e3502c0192b36e549..2303439d4597c1a534c1a8876c575dad421db72b 100644
--- a/plugins/PrivacyManager/lang/de.json
+++ b/plugins/PrivacyManager/lang/de.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "Wählen Sie \"Ja\", wenn Piwik keine vollständigen IP-Adressen speichern soll.",
"AnonymizeIpInlineHelp": "Um den Datenschutzbestimmungen Ihres Landes gerecht zu werden, können Sie mit diesem Plugin die letzten Bytes der IP-Adresse Ihrer Besucher anonymisieren.",
- "AnonymizeIpExtendedHelp": "Wenn Benutzer Ihre Website besuchen, wird Piwik nicht die komplette IP Adresse (so wie %s) benützen, sondern sie stattdessen zuerst anonymisieren (zu %s). Die Anonymisierung der IP Adresse ist in einigen Ländern eine gesetzliche Pflicht, zum Beispiel in Deutschland vorgegeben durch das Datenschutzrecht.",
+ "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": "%s byte(s) - z.B. %s",
+ "AnonymizeIpMaskLength": "%1$s byte(s) - z.B. %2$s",
"CannotLockSoDeleteLogActions": "Die log_action Tabelle wird nicht geleert: bitte geben Sie dem MySQL User '%s' das LOCK TABLES Privileg.",
"ClickHereSettings": "Hier klicken, um die %s Einstellungen zu bearbeiten.",
"CurrentDBSize": "Aktuelle Größe der Datenbank",
@@ -22,8 +22,8 @@
"DeleteMaxRows": "Maximale Anzahl der Datensätze, die pro Durchlauf gelöscht werden dürfen:",
"DeleteMaxRowsNoLimit": "Keine Begrenzung",
"DeleteReportsConfirm": "Sie sind dabei, das Löschen von Berichtsdaten zu aktivieren. Wenn alte Berichte entfernt wurden, müssen Sie diese neu generieren, um Sie anzusehen. Sind Sie sicher, dass Sie das wollen?",
- "DeleteReportsDetailedInfo": "Daten aus den Numerischen Archiv Tabellen (%s) und Blob Archiv Tabellen (%s) werden aus der Datenbank gelöscht.",
- "DeleteReportsInfo": "Wenn aktiviert, dann werden alte Berichte gelöscht. %sWir empfehlen dies nur, wenn die maximale Größe der Datenbank begrenzt ist%s.",
+ "DeleteReportsDetailedInfo": "Daten aus den Numerischen Archiv Tabellen (%1$s) und Blob Archiv Tabellen (%2$s) werden aus der Datenbank gelöscht.",
+ "DeleteReportsInfo": "Wenn aktiviert, dann werden alte Berichte gelöscht. %1$sWir empfehlen dies nur, wenn die maximale Größe der Datenbank begrenzt ist%2$s.",
"DeleteReportsInfo2": "Wenn Sie \"%s\" nicht aktiviert haben, dann werden alte Berichte automatisch bei Bedarf neu generiert.",
"DeleteReportsInfo3": "Wenn Sie \"%s\" aktiviert haben, sind die Daten dauerhaft gelöscht.",
"DeleteReportsOlderThan": "Lösche Berichte, die älter sind als",
@@ -56,8 +56,8 @@
"RecommendedForPrivacy": "Für den Datenschutz empfohlen",
"ReportsDataSavedEstimate": "Größe der Datenbank",
"SaveSettingsBeforePurge": "Sie haben die Einstellungen für das Löschen von Daten geändert. Bitte erst speichern, bevor Sie einen Löschvorgang starten.",
- "SeeAlsoOurOfficialGuidePrivacy": "Siehe auch unser offizielles Handbuch: %sWebanalyse Privatsphäre%s",
- "Teaser": "Auf dieser Seite können Sie Piwik so anpassen, dass es die bei Ihnen herrschenden Datenschutzbestimmungen einhält. Sie können %sBenutzer-IPs anonymisieren%s, %sautomatisch alte Logs aus der Datenbank löschen%s und %seinen Opt-out Mechanismus auf Ihrer Website anbieten%s.",
+ "SeeAlsoOurOfficialGuidePrivacy": "Siehe auch unser offizielles Handbuch: %1$sWebanalyse Privatsphäre%2$s",
+ "Teaser": "Auf dieser Seite können Sie Piwik so anpassen, dass es die bei Ihnen herrschenden Datenschutzbestimmungen einhält. Sie können %1$sBenutzer-IPs anonymisieren%2$s, %3$sautomatisch alte Logs aus der Datenbank löschen%4$s und %5$seinen Opt-out Mechanismus auf Ihrer Website anbieten%6$s.",
"TeaserHeadline": "Privatsphäreeinstellungen",
"UseAnonymizedIpForVisitEnrichment": "Benutze die anonymisierte IP-Adresse auch für die Aufbereitung der Besuche.",
"UseAnonymizedIpForVisitEnrichmentNote": "Plugins wie Geolokalisierung anhand IP und Provider verbessern die Metadaten eines Besuchers. Normalerweise verwenden diese Plugins die anonymisierte IP Adresse. Wenn sie 'Nein' auswählen wird stattdessen die nicht anonymisierte volle IP Adresse verwendet. Daraus resultiert eine größere Genauigkeit, jedoch weniger Privatsphäre.",
diff --git a/plugins/PrivacyManager/lang/el.json b/plugins/PrivacyManager/lang/el.json
index 3c6f8d4933527af56da5f4154f94b9dfcea58065..c61f608b45b3373300e2c68e38cb19bffcc1f301 100644
--- a/plugins/PrivacyManager/lang/el.json
+++ b/plugins/PrivacyManager/lang/el.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "ΕπιλÎξτε «Îαι» αν θÎλετε το Piwik να μην ανιχνεÏει πλήÏως ταυτοποιημÎνες διευθÏνσεις IP.",
"AnonymizeIpInlineHelp": "ΑποκÏÏπτει το τελευταίο byte των διευθÏνσεων IP των επισκεπτών σας για συμμόÏφωση με την τοπική νομοθεσία πεÏί Î™Î´Î¹Ï‰Ï„Î¹ÎºÎ¿Ï Î‘Ï€Î¿ÏÏήτου.",
- "AnonymizeIpExtendedHelp": "Όταν οι χÏήστες επισκÎπτονται τον ιστοτόπο σας, το Piwik δε θα χÏησιμοποιεί την πλήÏη διεÏθυνση IP (όπως το %s), αλλά αντίθετα θα το κάνει Ï€Ïώτα ανώνυμο (σε %s). Η μετατÏοπή των διευθÏνσεων IP σε ανώνυμες είναι μία από τις απαιτήσεις που οÏίζει η νομοθεσία γÏÏω από την ιδιωτικότητα σε οÏισμÎνες χώÏες όπως η ΓεÏμανία.",
+ "AnonymizeIpExtendedHelp": "Όταν οι χÏήστες επισκÎπτονται τον ιστοτόπο σας, το Piwik δε θα χÏησιμοποιήσει την πλήÏη διεÏθυνση IP (όπως %1$s), αντίθετα το Piwik θα την κάνει Ï€Ïώτα ανώνυμη (σε %2$s). Η ανωνυμοποίηση των διευθÏνσεων IP είναι μία από τις απαιτήσεις που θÎτει η νομοθεσία σε οÏισμÎνες χώÏες όπως η ΓεÏμανία.",
"AnonymizeIpMaskLengtDescription": "ΕπιλÎξτε πόσα bytes από τις διευθÏνσεις IP των επισκεπτών Ï€ÏÎπει να κÏÏβονται.",
- "AnonymizeIpMaskLength": "%s byte(s) - π.χ.. %s",
+ "AnonymizeIpMaskLength": "%1$s byte - πχ. %2$s",
"CannotLockSoDeleteLogActions": "Ο πίκανας log_action δεν θα διαγÏαφεί: δώστε δικαιώματα LOCK TABLES στον χÏήστη MYSQL «%s».",
"ClickHereSettings": "Πατήστε εδώ για να Îχετε Ï€Ïόσβαση στις Ïυθμίσεις %s.",
"CurrentDBSize": "ΤÏÎχον μÎγεθος βάσης δεδομÎνων",
@@ -22,8 +22,8 @@
"DeleteMaxRows": "ÎœÎγιστος αÏιθμός εγγÏαφών για διαγÏαφή κάθε φοÏά:",
"DeleteMaxRowsNoLimit": "χωÏίς πεÏιοÏισμό",
"DeleteReportsConfirm": "Î Ïόκειται να ενεÏγοποιήσετε τη διαγÏαφή δεδομÎνων αναφοÏών. Αν οι παλαιÎÏ‚ αναφοÏÎÏ‚ απομακÏυνθοÏν, θα Ï€ÏÎπει να τις ξαναδημιουÏγήσετε ώστε να τις δείτε. ΘÎλετε, σίγουÏα, να συνεχίσετε;",
- "DeleteReportsDetailedInfo": "Τα δεδομÎνα από τους πίνακες αÏιθμητικής αÏχειοθÎτησης της βάσης δεδομÎνων (%s) και οι πίνακες αÏχειοθÎτησης blob (%s) θα διαγÏαφοÏν.",
- "DeleteReportsInfo": "Αν ενεÏγοποιηθεί, οι παλαιÎÏ‚ αναφοÏÎÏ‚ θα διαγÏαφοÏν. %sÎ Ïοτείνουμε να ενεÏγοποιήσετε την επιλογή αυτή μόνο όταν ο διαθÎσιμος χώÏος της βάσης δεδομÎνων σας είναι πεÏιοÏισμÎνος.%s",
+ "DeleteReportsDetailedInfo": "Τα δεδομÎνα από τους αÏιθμητικοÏÏ‚ πίνακες αÏχειοθÎτησης (%1$s) και οι πίνακες πίνακες αÏχειοθÎτησης με δυαδικά δεδομÎνα (%2$s) θα διαγÏαφοÏν.",
+ "DeleteReportsInfo": "Αν ενεÏγοποιηθεί, οι παλιÎÏ‚ αναφοÏÎÏ‚ θα διαγÏαφοÏν. %1$sÎ Ïοτείνουμε να το ενεÏγοποιήσετε μόνο σε πεÏίπτωση πεÏιοÏισμÎνου χώÏου στη βάση δεδομÎνων. %2$s",
"DeleteReportsInfo2": "Αν δεν ενεÏγοποιήσατε το «%s», οι παλαιÎÏ‚ αναφοÏÎÏ‚ θα επαναδημιουÏγηθοÏν όταν ζητηθεί.",
"DeleteReportsInfo3": "Αν Îχετε ενεÏγοποιήσει το «%s», τα δεδομÎνα θα χαθοÏν.",
"DeleteReportsOlderThan": "ΔιαγÏαφή αναφοÏών παλαιότεÏων από",
@@ -56,8 +56,8 @@
"RecommendedForPrivacy": "Î Ïοτείνεται για λόγους ιδιωτικότητας",
"ReportsDataSavedEstimate": "ÎœÎγεθος βάσης δεδομÎνων",
"SaveSettingsBeforePurge": "Έχετε αλλάξει τις Ïυθμίσεις διαγÏαφής δεδομÎνων. ΑποθηκεÏστε τες Ï€Ïιν αÏχίσετε μια εκκαθάÏιση.",
- "SeeAlsoOurOfficialGuidePrivacy": "Δείτε ακόμη τον επίσημο οδηγό μας: %sΙδιωτικότητα Αναλυτικών ΙστοÏ%s",
- "Teaser": "Σε αυτή τη σελίδα, μποÏείτε να Ï€ÏοσαÏμόσετε το Piwik ώστε να είναι συμβατό με την ισχÏουσα νομοθεσία όσο αφοÏά τα Ï€Ïοσωπικά δεδομÎνα, %sκάνοντας ανώνυμες τις διευθÏνσεις IP των επισκεπτών%s, %sαπομακÏÏνοντας αυτόματα τις παλαιÎÏ‚ καταγÏαφÎÏ‚ επισκεπτών από τη βάση δεδομÎνων%s και %sπαÏÎχοντας Îνα μηχανισμό απενεÏγοποίησης για την ιστοσελίδα σας%s.",
+ "SeeAlsoOurOfficialGuidePrivacy": "Δείτε επίσης τον επίσημο οδηγό μας: %1$sΙδιωτικότητα στα Αναλυτικά ΙστοÏ%2$s",
+ "Teaser": "Στη σελίδα αυτή, μποÏείτε να παÏαμετÏοποιήσετε το Piwik ώστε να είναι συμβατό με την υπάÏχουσα νομοθεσία για την ιδιωτικότητα, με %1$s ανωνυμοποίηση των διευθÏνσεων IP των επισκεπτών %2$s, %3$s αυτόματη διαγÏαφή των παλιών καταγÏαφών επισκεπτών από την βάση δεδομÎνων%4$s και %5$s διάθεση ενός Î¼Î·Ï‡Î±Î½Î¹ÏƒÎ¼Î¿Ï Î³Î¹Î± μη συμπεÏίληψη στην καταγÏαφή για τον ιστοτόπο σας%6$s.",
"TeaserHeadline": "Ρυθμίσεις Î¹Î´Î¹Ï‰Ï„Î¹ÎºÎ¿Ï Î±Ï€Î¿ÏÏήτου",
"UseAnonymizedIpForVisitEnrichment": "ΧÏησιμοποιήστε παÏάλληλα και τις Ανώνυμες ΔιευθÏνσεις IP κατά τον εμπλουτισμό των επισκÎψεων.",
"UseAnonymizedIpForVisitEnrichmentNote": "Î Ïόσθετα όπως αυτό της Γεωτοποθεσίας και του ΠαÏόχου βελτιώνουν τα μεταδεδομÎνα για τους επισκÎπτες. Εξ' οÏÎ¹ÏƒÎ¼Î¿Ï Ï„Î± Ï€Ïόσθετα αυτά χÏησιμοποιοÏν ανώνυμες διευθÏνσεις IP. Αν επιλÎξετε 'Όχι', τότε θα χÏησιμοποιηθοÏν οι πλήÏεις διευθÏνσεις IP, Îχοντας ως αποτÎλεσμα λιγότεÏη ιδιωτικότητα, αλλά καλÏτεÏη ακÏίβεια δεδομÎνων.",
diff --git a/plugins/PrivacyManager/lang/en.json b/plugins/PrivacyManager/lang/en.json
index d8946a40568d84673c1ba4cb589f06cc522ab968..a4350a6fc26fb840b63f6e17acaa5ff8b82960dd 100644
--- a/plugins/PrivacyManager/lang/en.json
+++ b/plugins/PrivacyManager/lang/en.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "Select \"Yes\" if you want Piwik not to track fully qualified IP-Addresses.",
"AnonymizeIpInlineHelp": "Anonymize the last byte(s) of visitors IP addresses to comply with your local privacy laws\/guidelines.",
- "AnonymizeIpExtendedHelp": "When users visit your website, Piwik will not use the full IP address (such as %s) but instead Piwik will anonymise it first (to %s). IP address anonymisation is one of the requirements set by the privacy laws in some countries such as Germany.",
+ "AnonymizeIpExtendedHelp": "When users visit your website, Piwik will not use the full IP address (such as %1$s) but instead Piwik will anonymise it first (to %2$s). IP address anonymisation is one of the requirements set by the privacy laws in some countries such as Germany.",
"AnonymizeIpMaskLengtDescription": "Select how many bytes of the visitors' IPs should be masked.",
- "AnonymizeIpMaskLength": "%s byte(s) - e.g. %s",
+ "AnonymizeIpMaskLength": "%1$s byte(s) - e.g. %2$s",
"CannotLockSoDeleteLogActions": "The log_action table will not be purged: please grant the LOCK TABLES privilege to the '%s' MYSQL user.",
"ClickHereSettings": "Click here to access the %s settings.",
"CurrentDBSize": "Current database size",
@@ -22,8 +22,8 @@
"DeleteMaxRows": "Maximum number of rows to delete in one run:",
"DeleteMaxRowsNoLimit": "no limit",
"DeleteReportsConfirm": "You are about to enable report data deletion. If old reports are removed, you will have to re-process them in order view them. Are you sure you want to do this?",
- "DeleteReportsDetailedInfo": "Data from the database numeric archive tables (%s) and blob archive tables (%s) will be deleted.",
- "DeleteReportsInfo": "If enabled, old reports will be deleted. %sWe recommend to enable only when your database space is limited.%s",
+ "DeleteReportsDetailedInfo": "Data from the database numeric archive tables (%1$s) and blob archive tables (%2$s) will be deleted.",
+ "DeleteReportsInfo": "If enabled, old reports will be deleted. %1$sWe recommend to enable only when your database space is limited.%2$s",
"DeleteReportsInfo2": "If you have not enabled \"%s\", old reports will be recreated automatically when requested.",
"DeleteReportsInfo3": "If you have enabled \"%s\", the data will be permanently lost.",
"DeleteReportsOlderThan": "Delete reports older than",
@@ -56,8 +56,8 @@
"RecommendedForPrivacy": "Recommended for privacy",
"ReportsDataSavedEstimate": "Database size",
"SaveSettingsBeforePurge": "You have changed the data deletion settings. Please save them before starting a purge.",
- "SeeAlsoOurOfficialGuidePrivacy": "See also our official guide: %sWeb Analytics Privacy%s",
- "Teaser": "On this page, you can customize Piwik to make it privacy compliant with existing legislations, by: %s anonymizing the visitor IP%s, %s automatically remove old visitor logs from the database%s, and %s providing an Opt-out mechanism for your website%s.",
+ "SeeAlsoOurOfficialGuidePrivacy": "See also our official guide: %1$sWeb Analytics Privacy%2$s",
+ "Teaser": "On this page, you can customize Piwik to make it privacy compliant with existing legislations, by: %1$s anonymizing the visitor IP%2$s, %3$s automatically remove old visitor logs from the database%4$s, and %5$s providing an Opt-out mechanism for your website%6$s.",
"TeaserHeadline": "Privacy Settings",
"UseAnonymizedIpForVisitEnrichment": "Also use the Anonymized IP addresses when enriching visits.",
"UseAnonymizedIpForVisitEnrichmentNote": "Plugins such as Geo Location via IP and Provider improve visitor's metadata. By default these plugins use the anonymized IP addresses. If you select 'No', then the non-anonymized full IP address will be used instead, resulting in less privacy but better data accuracy.",
diff --git a/plugins/PrivacyManager/lang/es.json b/plugins/PrivacyManager/lang/es.json
index 277c534d44d0e62205002144d119ecf7aec9681c..c97538b7d6bb71ccdba646241c8f4ed26cf9c230 100644
--- a/plugins/PrivacyManager/lang/es.json
+++ b/plugins/PrivacyManager/lang/es.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "Seleccione \"Si\" si desea que Piwik no registre direcciones IP completas.",
"AnonymizeIpInlineHelp": "Ocultar los últimos bit(s) de la dirección IP del visitante para cumplir con las leyes\/directrices de privacidad de su jurisdicción.",
- "AnonymizeIpExtendedHelp": "Cuando los usuarios visiten su sitio de internet, Piwik no usará la dirección completa IP (tales como %s) sino que Piwik las mantendrá anónimas primeramente (como %s). El anonimato de una dirección IP es uno de los requerimientos dispuesto por leyes de privacidad en algunos paÃses tales como Alemania.",
+ "AnonymizeIpExtendedHelp": "Cuando los usuarios visiten su sitio de internet, Piwik no usará la dirección completa IP (tales como %1$s) sino que Piwik las mantendrá anónimas primeramente (como %2$s). El anonimato de una dirección IP es uno de los requerimientos dispuesto por leyes de privacidad en algunos paÃses tales como Alemania.",
"AnonymizeIpMaskLengtDescription": "Seleccione cuantos bytes de las direcciones IP de los visitantes deben ser enmascaradas.",
- "AnonymizeIpMaskLength": "%s byte(s) - ej. %s",
+ "AnonymizeIpMaskLength": "%1$s byte(s) - ej. %2$s",
"CannotLockSoDeleteLogActions": "La tabla log_action no será purgada: por favor, conceda el privilegio LOCK TABLES al usuario MYSQL '%s'.",
"ClickHereSettings": "Haga clic aquà para acceder a la configuración de %s",
"CurrentDBSize": "Tamaño de la actual base de datos",
@@ -22,8 +22,8 @@
"DeleteMaxRows": "Número máximo de filas que serán eliminadas en cada ejecución:",
"DeleteMaxRowsNoLimit": "sin lÃmites",
"DeleteReportsConfirm": "Está disponiendo la eliminación de datos de informes. Si un antiguo informe es borrado, tendrá que reprocesarlos nuevamente para visualizarlos. ¿Está seguro que desea hacer esto?",
- "DeleteReportsDetailedInfo": "Información desde las tablas numéricas de los archivos de la base de datos (%s) y borradores de archivos de tablas (%s) serán eliminados.",
- "DeleteReportsInfo": "Si es habilitado, todos los antiguos informes serán eliminados. %sRecomendamos habilitarlo solo cuando el espacio de la base de datos sea limitado.%s",
+ "DeleteReportsDetailedInfo": "Información desde las tablas numéricas de los archivos de la base de datos (%1$s) y borradores de archivos de tablas (%2$s) serán eliminados.",
+ "DeleteReportsInfo": "Si es habilitado, todos los antiguos informes serán eliminados. %1$sRecomendamos habilitarlo solo cuando el espacio de la base de datos sea limitado.%2$s",
"DeleteReportsInfo2": "Si no ha habilitado \"%s\", los antiguos informes serán recreados automáticamente cuando sean solicitados.",
"DeleteReportsInfo3": "Si ha habilitado \"%s\", la información será eliminada de forma permanente.",
"DeleteReportsOlderThan": "Borrar informes anteriores a",
@@ -56,8 +56,8 @@
"RecommendedForPrivacy": "Recomendado por privacidad",
"ReportsDataSavedEstimate": "Tamaño de la base de datos",
"SaveSettingsBeforePurge": "Ha cambiado la configuración de borrado de información. Por favor, guárdelas antes de iniciar la purga.",
- "SeeAlsoOurOfficialGuidePrivacy": "Lee también nuestra guÃa oficial: %sPrivacidad del análisis de internet%s",
- "Teaser": "En esta página, puede personalizar Piwik para hacer que cumpla con la privacidad de las legislaciones existentes: %s haciendo anónima la IP del visitante%s, %s eliminar automáticamente los antiguos registros de los visitantes de la base de datos%s. y %s proporcionando un mecanismo de opción de desconectarse de su sitio de internet (para que los visitantes no sean seguidos)%s",
+ "SeeAlsoOurOfficialGuidePrivacy": "Lee también nuestra guÃa oficial: %1$sPrivacidad del análisis de internet%2$s",
+ "Teaser": "En esta página, puede personalizar Piwik para hacer que cumpla con la privacidad de las legislaciones existentes: %1$s haciendo anónima la IP del visitante%2$s, %3$s eliminar automáticamente los antiguos registros de los visitantes de la base de datos%4$s. y %5$s proporcionando un mecanismo de opción de desconectarse de su sitio de internet (para que los visitantes no sean seguidos)%6$s",
"TeaserHeadline": "Configuración de privacidad",
"UseAnonymizedIpForVisitEnrichment": "Usa también direcciones IP anónimas para enriquecer las visitas.",
"UseAnonymizedIpForVisitEnrichmentNote": "Los complementos Geo Location a través de IP y Provider mejoran los metadatos de los visitantes. Por defecto estos complementos utilizan las direcciones IP anónimas. Si elige 'No' será utilizada una dirección completa de forma no anónima lo que resulta en una menor privacidad pero una mayor precisión de datos.",
diff --git a/plugins/PrivacyManager/lang/fa.json b/plugins/PrivacyManager/lang/fa.json
index d4e64510fa6bd13fa083a68725fab4c1438ce0f2..8da25f70a4ee398b17d21c06183a7b203c96cbad 100644
--- a/plugins/PrivacyManager/lang/fa.json
+++ b/plugins/PrivacyManager/lang/fa.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "انتخاب \"بله\" اگر می خواهید Piwik به ردیابی کاملا واجد شرایط IP آدرس.",
"AnonymizeIpInlineHelp": "گمنام آخرین بایت از آدرس های IP بازدید کنندگان مطابق با قوانین ØÙظ Øریم خصوصی خود را Ù…ØÙ„ÛŒ \/ دستورالعمل.",
"AnonymizeIpMaskLengtDescription": "انتخاب کنید Ú†Ù‡ تعداد از IP های بازدید کنندهگان باید مخÙÛŒ باشند.",
- "AnonymizeIpMaskLength": "%s بایت (ها) - e.g. %s",
+ "AnonymizeIpMaskLength": "%1$s بایت (ها) - e.g. %2$s",
"ClickHereSettings": "اینجا کلیلک کنید تا به تنظیمات %s دسترسی پیدا کنید.",
"CurrentDBSize": "اندازه بانک اطلاعاتی کنونی",
"DBPurged": "پایگاه داده پالایش شد.",
@@ -17,8 +17,8 @@
"DeleteMaxRows": "بیشترین تعداد ردی٠را Øذ٠کنید در 1 اجرا:",
"DeleteMaxRowsNoLimit": "هیچ Ù…Øدودیتی",
"DeleteReportsConfirm": "شما را قادر Ù…ÛŒ سازد گزارش Øذ٠داده ها هستند. اگر گزارش های قدیمی ØØ°Ù Ù…ÛŒ شوند، شما باید دوباره پردازش آنها را در جهت آنها را مشاهده کنید. آیا شما مطمئن هستید Ú©Ù‡ Ù…ÛŒ خواهید برای انجام این کار؟",
- "DeleteReportsDetailedInfo": "داده ها از جداول عددی dabase آرشیو (%s) Ùˆ جداول آرشیو Ù„Ú©Ù‡ (%s) Øذ٠خواهد شد.",
- "DeleteReportsInfo": "اگر Ùعال شود, گزارش های قدیمی پاک Ù…ÛŒ شوند. %s ما پیشنهاد Ù…ÛŒ کنیم زمانی این گزینه را Ùعال نمایید Ú©Ù‡ Ùضای دیتابیس شما Ù…Øدود باشد. %s",
+ "DeleteReportsDetailedInfo": "داده ها از جداول عددی dabase آرشیو (%1$s) Ùˆ جداول آرشیو Ù„Ú©Ù‡ (%2$s) Øذ٠خواهد شد.",
+ "DeleteReportsInfo": "اگر Ùعال شود, گزارش های قدیمی پاک Ù…ÛŒ شوند. %1$s ما پیشنهاد Ù…ÛŒ کنیم زمانی این گزینه را Ùعال نمایید Ú©Ù‡ Ùضای دیتابیس شما Ù…Øدود باشد. %2$s",
"DeleteReportsInfo2": "اگر شما \"%s\" را Ùعال نکرده اید , گزارش های قدیمی هنگامی Ú©Ù‡ درخواست شوند دوباره به طور خودکار ایجاد خواهند شد.",
"DeleteReportsInfo3": "اگر شما \"%s\" را Ùعال کرده باشید , داده ها برای همیشه از دست خواهد رÙت.",
"DeleteReportsOlderThan": "Øذ٠گزارش های مسن تر از",
diff --git a/plugins/PrivacyManager/lang/fi.json b/plugins/PrivacyManager/lang/fi.json
index 91c4f2d7c8bfb3712a1df614cff301d0f1ca4cc8..bc8d0c0085eba79b0e281270e1f03886f0ffee9e 100644
--- a/plugins/PrivacyManager/lang/fi.json
+++ b/plugins/PrivacyManager/lang/fi.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "Valitse \"Kyllä\", jos et halua, että Piwik seuraa kokonaisia IP-osoitteita.",
"AnonymizeIpInlineHelp": "Poistaa viimeisen tavun vierailijoiden IP-osoitteista, mikäli paikalliset yksityiseensuojalait\/-ohjeistukset vaativat.",
"AnonymizeIpMaskLengtDescription": "Valitse, montako tavua käyttäjien IP-osoitteista piilotetaan.",
- "AnonymizeIpMaskLength": "%s tavua - esim. %s",
+ "AnonymizeIpMaskLength": "%1$s tavua - esim. %2$s",
"CannotLockSoDeleteLogActions": "log_action-taulua ei ole tyhjätty. Lisää \"LOCK TABLES\"-oikeus käyttäjälle %s.",
"ClickHereSettings": "Muokkaa %s:n asetuksia.",
"CurrentDBSize": "Nykyinen tietokannan koko",
@@ -19,8 +19,8 @@
"DeleteMaxRows": "Yhdellä kertaa poistettavien rivien maksimimäärä:",
"DeleteMaxRowsNoLimit": "ei rajaa",
"DeleteReportsConfirm": "Olet ottamassa käyttöön raporttien poistamisen. Jos vanhat raportit poistetaan, sinun täytyy luoda ne uudelleen ennen katsomista. Haluatko varmasti tehdä tämän?",
- "DeleteReportsDetailedInfo": "Tiedot tietokannan numeerisista tauluista (%s) ja arkistotauluista (%s) poistetaan.",
- "DeleteReportsInfo": "Jos käytössä, vanhat raportit poistetaan. %sSuosittelemme, että tämä otetaan käyttöön vain jos tietokannan tila loppuu.%s",
+ "DeleteReportsDetailedInfo": "Tiedot tietokannan numeerisista tauluista (%1$s) ja arkistotauluista (%2$s) poistetaan.",
+ "DeleteReportsInfo": "Jos käytössä, vanhat raportit poistetaan. %1$sSuosittelemme, että tämä otetaan käyttöön vain jos tietokannan tila loppuu.%2$s",
"DeleteReportsInfo2": "Jos et ole ottanut käyttöön \"%s\":ää, vanhat raportit luodaan automaattisesti uudelleen tarvittaessa.",
"DeleteReportsInfo3": "Jos olet ottanut käyttöön \"%s\":n, vanhat tiedot poistetaan lopullisesti.",
"DeleteReportsOlderThan": "Poista raportit, jotka ovat vanhempia kuin",
@@ -49,8 +49,8 @@
"PurgingData": "Siivotaan tietoja...",
"ReportsDataSavedEstimate": "Tietokannan koko",
"SaveSettingsBeforePurge": "Olet muuttanut tietojen poistamisen asetuksia. Tallenna muutokset ennen jatkamista.",
- "SeeAlsoOurOfficialGuidePrivacy": "Lue myös virallinen oppaamme: %sVerkkoanalyysi ja yksityisyys%s",
- "Teaser": "Tällä sivulla voit kustomoida Piwikiä, jotta se noudattaa voimassaolevia lakeja ja säännöksiä. Voit %s anonymisoida vierailijoiden IP-osoitteita%s, %s poistaa vanhat lokit automaattisesti%s ja %s tarjota mahdollisuuden poistaa seuranta käytöstä sivullasi%s.",
+ "SeeAlsoOurOfficialGuidePrivacy": "Lue myös virallinen oppaamme: %1$sVerkkoanalyysi ja yksityisyys%2$s",
+ "Teaser": "Tällä sivulla voit kustomoida Piwikiä, jotta se noudattaa voimassaolevia lakeja ja säännöksiä. Voit %1$s anonymisoida vierailijoiden IP-osoitteita%2$s, %3$s poistaa vanhat lokit automaattisesti%4$s ja %5$s tarjota mahdollisuuden poistaa seuranta käytöstä sivullasi%6$s.",
"TeaserHeadline": "Yksityisyysasetukset",
"UseAnonymizedIpForVisitEnrichment": "Käytä piilotettuja IP-osoitteita myös käyntejä rikastettaessa.",
"UseAnonymizedIpForVisitEnrichmentNote": "Geopaikannusliitännäiset parantavat käyttäjien metadataa. Nämä liitännäiset käyttävät oletuksena piilotettuja IP-osoitteita. Jos valitset \"Ei\", käytetään täysiä, ei-piilotettuja IP-osoitteita. Tämä vähentää yksityisyyttä, mutta parantaa datan tarkkuutta.",
diff --git a/plugins/PrivacyManager/lang/fr.json b/plugins/PrivacyManager/lang/fr.json
index dbdc71c6024efde6cc59c2c095bfc20afa35d899..916447f682b1659691b6d009eb50c0b9ddb0e8fd 100644
--- a/plugins/PrivacyManager/lang/fr.json
+++ b/plugins/PrivacyManager/lang/fr.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "Sélectionnez \"Oui\" si vous voulez que Piwik ne trace pas les adresses IP complètes.",
"AnonymizeIpInlineHelp": "Masque les adresses IP des visiteurs pour remplir les conditions légales et politiques locales.",
- "AnonymizeIpExtendedHelp": "Quand les utilisateurs visitent votre site, Piwik n'utilisera pas l'adresse IP complète (par exemple %s) mais l'anonymisera (par exemple %s). L'anonymisation des adresses IP est requise par certaines lois adressant la protection de la vie privée dans certains pays comme l'Allemagne.",
+ "AnonymizeIpExtendedHelp": "Quand les utilisateurs visitent votre site, Piwik n'utilisera pas l'adresse IP complète (par exemple %1$s) mais l'anonymisera (par exemple %2$s). L'anonymisation des adresses IP est requise par certaines lois adressant la protection de la vie privée dans certains pays comme l'Allemagne.",
"AnonymizeIpMaskLengtDescription": "Sélectionnez combien de bytes de l'adresse IP du visiteur doivent être masqués.",
- "AnonymizeIpMaskLength": "%s byte(s) - ex %s",
+ "AnonymizeIpMaskLength": "%1$s byte(s) - ex %2$s",
"CannotLockSoDeleteLogActions": "La table log_action ne sera pas purgée : veuillez accorder le privilège LOCK TABLES à l'utilisateur MYSQL '%s'.",
"ClickHereSettings": "Cliquez ici pour accéder aux paramètres %s.",
"CurrentDBSize": "Taille actuelle de la base de données",
@@ -22,8 +22,8 @@
"DeleteMaxRows": "Nombre maximal de lignes à supprimer à la fois:",
"DeleteMaxRowsNoLimit": "aucune limite",
"DeleteReportsConfirm": "Vous êtes sur le point d'activer la suppression des donées de rapports. Si d'anciens rapports sont supprimés, vous devrez les recalculer afin de les visualiser. Êtes vous sûr(e) de vouloir effectuer cela?",
- "DeleteReportsDetailedInfo": "Les données des tables d'archives numériques (%s) et d'archives binaires (%s) seront supprimées.",
- "DeleteReportsInfo": "Si activé, les anciens rapports seront supprimés. %sNous vous recommandons de l'activer seulement quand l'espace de votre base de données est limité.%s",
+ "DeleteReportsDetailedInfo": "Les données des tables d'archives numériques (%1$s) et d'archives binaires (%2$s) seront supprimées.",
+ "DeleteReportsInfo": "Si activé, les anciens rapports seront supprimés. %1$sNous vous recommandons de l'activer seulement quand l'espace de votre base de données est limité.%2$s",
"DeleteReportsInfo2": "Si vous n'avez pas activé \"%s\" les anciens rapports seront recréés automatiquement à la demande.",
"DeleteReportsInfo3": "Si vous avez activé \"%s\" les données seront perdues définitivement.",
"DeleteReportsOlderThan": "Supprimer les rapports plus anciens que",
@@ -56,8 +56,8 @@
"RecommendedForPrivacy": "Recommandé pour le respect de la vie privée",
"ReportsDataSavedEstimate": "Taille de la base de données",
"SaveSettingsBeforePurge": "Vous avez modifié les paramètres de suppression des données. Veuillez les sauvegarder avant de démmarrer une purge.",
- "SeeAlsoOurOfficialGuidePrivacy": "Consultez aussi notre guide officiel : %sConfidentialité de l'analyse web%s",
- "Teaser": "Sur cette page, vous pouvez personnaliser Piwik pour que sa gestion de la vie privée respecte la législation en vigueur, en : %s rendant anonyme l'adresse IP du visiteur%s, %s supprimant automatiquement les anciens logs de visiteurs de la base de données%s, et %s en fournissant un mécanisme d'exclusion pour votre site web%s.",
+ "SeeAlsoOurOfficialGuidePrivacy": "Consultez aussi notre guide officiel : %1$sConfidentialité de l'analyse web%2$s",
+ "Teaser": "Sur cette page, vous pouvez personnaliser Piwik pour que sa gestion de la vie privée respecte la législation en vigueur, en : %1$s rendant anonyme l'adresse IP du visiteur%2$s, %3$s supprimant automatiquement les anciens logs de visiteurs de la base de données%4$s, et %5$s en fournissant un mécanisme d'exclusion pour votre site web%6$s.",
"TeaserHeadline": "Paramètres de vie privée",
"UseAnonymizedIpForVisitEnrichment": "Utiliser les adresses IP anonymisées pour enrichir les visites",
"UseAnonymizedIpForVisitEnrichmentNote": "Les composants tels que Geo Location (localisation) par IP et Fournisseur améliorent les métadonnées des visiteurs. Par défaut ces composants utilisent des adresses IP anonymisées. Si vous sélectionnez \"Non\", l'adresse IP réelle et complète sera utilisée à la place. Ceci améliorera la précision des données mais diminuera le respect de la vie privée.",
diff --git a/plugins/PrivacyManager/lang/hi.json b/plugins/PrivacyManager/lang/hi.json
index cb9fc2610fcc0c41df78a3608a34459931d282f1..d32636d9468b41273a32bf5e27f92ce129e82200 100644
--- a/plugins/PrivacyManager/lang/hi.json
+++ b/plugins/PrivacyManager/lang/hi.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "यदि आप पूरी तरह से योगà¥à¤¯ आईपी पतों को Piwik से टà¥à¤°à¥ˆà¤• नहीं करना चाहते हैं तो \"हाà¤\" का चयन करें.",
"AnonymizeIpInlineHelp": "अपने सà¥à¤¥à¤¾à¤¨à¥€à¤¯ गोपनीयता कानून \/ दिशा निरà¥à¤¦à¥‡à¤¶à¥‹à¤‚ का अनà¥à¤ªà¤¾à¤²à¤¨ करने के लिठआगंतà¥à¤•à¥‹à¤‚ आईपी पतों की अजà¥à¤žà¤¾à¤¤ आखिरी बाइट",
"AnonymizeIpMaskLengtDescription": "आवृत किया जाना चाहिठकि कितने बाइटà¥à¤¸ 'दरà¥à¤¶à¤•à¥‹à¤‚ के आईपी का चयन करें.",
- "AnonymizeIpMaskLength": "%s बाइट - e.g. %s",
+ "AnonymizeIpMaskLength": "%1$s बाइट - e.g. %2$s",
"CannotLockSoDeleteLogActions": "Log_action तालिका शà¥à¤¦à¥à¤§ नहीं किया जाà¤à¤—ा: '%s' में MYSQL उपयोगकरà¥à¤¤à¤¾ के लिठLOCK TABLES विशेषाधिकार का अनà¥à¤¦à¤¾à¤¨ करे कृपया.",
"ClickHereSettings": "%s की सेटिंगà¥à¤¸ का उपयोग करने के लिठयहां कà¥à¤²à¤¿à¤• करें.",
"CurrentDBSize": "वरà¥à¤¤à¤®à¤¾à¤¨ डेटाबेस का आकार",
@@ -21,8 +21,8 @@
"DeleteMaxRows": "à¤à¤• समय में नषà¥à¤Ÿ करने के लिठपंकà¥à¤¤à¤¿à¤¯à¥‹à¤‚ की अधिकतम संखà¥à¤¯à¤¾:",
"DeleteMaxRowsNoLimit": "कोई सीमा नहीं",
"DeleteReportsConfirm": "आप रिपोरà¥à¤Ÿ डेटा मिटाना सकà¥à¤·à¤® करने के बारे में हैं. पà¥à¤°à¤¾à¤¨à¥‡ रिपोरà¥à¤Ÿà¥‹à¤‚ को हटा रहे हैं, तो आप उनà¥à¤¹à¥‡à¤‚ देखने के कà¥à¤°à¤® में फिर से पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ उनमें करनी होगी. आप सà¥à¤¨à¤¿à¤¶à¥à¤šà¤¿à¤¤ करें कि आप यह करना चाहते हैं?",
- "DeleteReportsDetailedInfo": "डेटाबेस सांखà¥à¤¯à¤¿à¤• संगà¥à¤°à¤¹ तालिकाओं (%s) और बà¥à¤²à¥‰à¤¬ संगà¥à¤°à¤¹ तालिकाओं (%s) से डेटा हटा दिया जाà¤à¤—ा.",
- "DeleteReportsInfo": "यदि सकà¥à¤·à¤®, पà¥à¤°à¤¾à¤¨à¥‡ रिपोरà¥à¤Ÿ हटा दी जाà¤à¤—ी। %sहम केवल जब अपने डेटाबेस सà¥à¤¥à¤¾à¤¨ सीमित है को सकà¥à¤·à¤® करने के लिठसलाह देते हैं। %s",
+ "DeleteReportsDetailedInfo": "डेटाबेस सांखà¥à¤¯à¤¿à¤• संगà¥à¤°à¤¹ तालिकाओं (%1$s) और बà¥à¤²à¥‰à¤¬ संगà¥à¤°à¤¹ तालिकाओं (%2$s) से डेटा हटा दिया जाà¤à¤—ा.",
+ "DeleteReportsInfo": "दि सकà¥à¤·à¤®, पà¥à¤°à¤¾à¤¨à¥‡ रिपोरà¥à¤Ÿ हटा दी जाà¤à¤—ी। %1$sहम केवल जब अपने डेटाबेस सà¥à¤¥à¤¾à¤¨ सीमित है को सकà¥à¤·à¤® करने के लिठसलाह देते हैं। %2$s",
"DeleteReportsInfo2": "आपका \"%s\" सकà¥à¤·à¤® नहीं है, तो अनà¥à¤°à¥‹à¤§ किठजाने पर, पà¥à¤°à¤¾à¤¨à¥€ रिपोरà¥à¤Ÿà¥‹à¤‚ को सà¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ रूप से निरà¥à¤®à¤¿à¤¤ किया जाà¤à¤—ा.",
"DeleteReportsInfo3": "आप \"%s\" को सकà¥à¤·à¤® किया है, डेटा सà¥à¤¥à¤¾à¤¯à¥€ रूप से नषà¥à¤Ÿ हो जाà¤à¤‚गे.",
"DeleteReportsOlderThan": "की तà¥à¤²à¤¨à¤¾ में पà¥à¤°à¤¾à¤¨à¥‡ रिपोरà¥à¤Ÿà¥‹à¤‚ को हटाà¤à¤",
@@ -51,7 +51,7 @@
"PurgingData": "डेटा शà¥à¤¦à¥à¤§à¥€à¤•à¤°à¤£ ...",
"ReportsDataSavedEstimate": "डेटाबेस विसà¥à¤¤à¤¾à¤°",
"SaveSettingsBeforePurge": "अपने डेटा विलोपन सेटिंगà¥à¤¸ को बदल दिया है. शà¥à¤¦à¥à¤§à¥€à¤•à¤°à¤£ शà¥à¤°à¥‚ करने से पहले उनà¥à¤¹à¥‡à¤‚ बचाइà¤.",
- "Teaser": "इस पृषà¥à¤ पर, आप विदà¥à¤¯à¤®à¤¾à¤¨ विधान के साथ इसे गोपनीयता के अनà¥à¤°à¥‚प बनाने के लिठPiwik को अनà¥à¤•à¥‚लित कर सकते हैं: %sगà¥à¤®à¤¨à¤¾à¤® आगंतà¥à¤• आईपी%s, %sसà¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ रूप से डेटाबेस से पà¥à¤°à¤¾à¤¨à¥‡ आगंतà¥à¤• लॉग को हटाने, और अपनी वेबसाइट%s के लिठà¤à¤• बाहर निकलने की वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾%s पà¥à¤°à¤¦à¤¾à¤¨ करते हैं%s.",
+ "Teaser": "इस पृषà¥à¤ पर, आप विदà¥à¤¯à¤®à¤¾à¤¨ विधान के साथ इसे गोपनीयता के अनà¥à¤°à¥‚प बनाने के लिठPiwik को अनà¥à¤•à¥‚लित कर सकते हैं: %1$sगà¥à¤®à¤¨à¤¾à¤® आगंतà¥à¤• आईपी%2$s, %3$sसà¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ रूप से डेटाबेस से पà¥à¤°à¤¾à¤¨à¥‡ आगंतà¥à¤• लॉग को हटाने, और अपनी वेबसाइट%4$s के लिठà¤à¤• बाहर निकलने की वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾%5$s पà¥à¤°à¤¦à¤¾à¤¨ करते हैं%6$s.",
"TeaserHeadline": "गोपनीयता की सेटिंगà¥à¤¸",
"UseAnonymizeIp": "आगंतà¥à¤• आईपी पते को गà¥à¤®à¤¨à¤¾à¤® करे",
"UseDeleteLog": "नियमित रूप से डेटाबेस से पà¥à¤°à¤¾à¤¨à¥‡ आगंतà¥à¤• लॉग को हटाना",
diff --git a/plugins/PrivacyManager/lang/id.json b/plugins/PrivacyManager/lang/id.json
index 9f515e9556db519e8ae1af01a0d9413042056272..183caceb0320b6ba3be2ed7a811b7c09484debb6 100644
--- a/plugins/PrivacyManager/lang/id.json
+++ b/plugins/PrivacyManager/lang/id.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "Pilih \"Ya\" jika Anda ingin Piwik tidak melacak Alamat IP sepenuhnya.",
"AnonymizeIpInlineHelp": "Anonimasi bita terakhir dari alamat IP pengunjung sesuai dengan peraturan privasi\/panduan setempat Anda.",
"AnonymizeIpMaskLengtDescription": "Pilih berapa banyak bita dari IP pengunjung harus ditutupi.",
- "AnonymizeIpMaskLength": "%s bita - misalnya %s",
+ "AnonymizeIpMaskLength": "%1$s bita - misalnya %2$s",
"CannotLockSoDeleteLogActions": "Tabel log_action tidak akan dibersihakan: harap memberi hak LOCK TABLES terhadap pengguna MySQL '%s'.",
"ClickHereSettings": "Klik di sini untuk mengakses pengaturan %s.",
"CurrentDBSize": "Ukuran basisdata saat ini",
@@ -19,8 +19,8 @@
"DeleteMaxRows": "Jumlah maksimum baris yang dihapus dalam sekali tindakan:",
"DeleteMaxRowsNoLimit": "tak terbatas",
"DeleteReportsConfirm": "Anda berkeinginan mengaktifkan penghapusan data laporan. Bila laporan lama dihapus, Anda harus memroses ulang laporan tersebut sebelum dapat ditampilkan. Apakah Anda yakin melakukan ini?",
- "DeleteReportsDetailedInfo": "Data dari tabel arsip angka basisdata (%s) dan tabel arsip blob basisdata (%s) akan dihapus.",
- "DeleteReportsInfo": "Bila ini diaktifkan laporan lama akan dihapus. %sKami menyarankan ini hanya bila ruang basisdata Anda terbatas.%s",
+ "DeleteReportsDetailedInfo": "Data dari tabel arsip angka basisdata (%1$s) dan tabel arsip blob basisdata (%2$s) akan dihapus.",
+ "DeleteReportsInfo": "Bila ini diaktifkan laporan lama akan dihapus. %1$sKami menyarankan ini hanya bila ruang basisdata Anda terbatas.%2$s",
"DeleteReportsInfo2": "Bila Anda tidak mengaktifkan \"%s\", laporan lama akan dibuat kembali otomatis saat dibutuhkan.",
"DeleteReportsInfo3": "Bila Anda mengaktifkan \"%s\", data akan hilang permanen.",
"DeleteReportsOlderThan": "Hapus laporan yang berumur lebih dari",
@@ -49,7 +49,7 @@
"PurgingData": "Membersihkan data...",
"ReportsDataSavedEstimate": "Ukuran basisdata",
"SaveSettingsBeforePurge": "Anda melakukan perubahan pengaturan penghapusan. Harap menyimpan perubahan tersebut sebelum melakukan pembersihan.",
- "Teaser": "Pada halaman ini, Anda dapat menyesuaikan Piwik untuk membuatnya sesuai dengan peraturan perundang-undangan privasi yang ada, dengan: %s anonimasi IP pengunjung%s, %s otomatis hapus catatan pengunjung lama dari basis data%s, dan %s menyediakan pilihan Jangan-Lacak untuk situs Anda%s.",
+ "Teaser": "Pada halaman ini, Anda dapat menyesuaikan Piwik untuk membuatnya sesuai dengan peraturan perundang-undangan privasi yang ada, dengan: %1$s anonimasi IP pengunjung%2$s, %3$s otomatis hapus catatan pengunjung lama dari basis data%4$s, dan %5$s menyediakan pilihan Jangan-Lacak untuk situs Anda%6$s.",
"TeaserHeadline": "Pengaturan Privasi",
"UseAnonymizeIp": "Anonimasi alamat IP Pengunjung",
"UseDeleteLog": "Hapus teratur catatan pengunjung lama dari basis data",
diff --git a/plugins/PrivacyManager/lang/it.json b/plugins/PrivacyManager/lang/it.json
index b0203718af01a5de9cbe213eade9f7040b38de14..012b45e312bfefe80a67ff6e3ce8f3354e75dad0 100644
--- a/plugins/PrivacyManager/lang/it.json
+++ b/plugins/PrivacyManager/lang/it.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "Seleziona \"Sì\" se vuoi che Piwik non mostri gli indirizzi IP completi dei visitatori.",
"AnonymizeIpInlineHelp": "Rende anonimi gli ip dei tuoi visitatori per conformarsi alle leggi o ai regolamenti locali.",
- "AnonymizeIpExtendedHelp": "Quando gli utenti visitano il tuo sito web, Piwik non userà l'indirizzo IP completo (come %s) ma lo renderà prima anonimo (%s). Questo è uno dei requisiti definiti dalle leggi sulla privacy in alcuni paesi come la Germania.",
+ "AnonymizeIpExtendedHelp": "Quando gli utenti visitano il tuo sito web, Piwik non userà l'indirizzo IP completo (come %1$s) ma lo renderà prima anonimo (%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": "%s byte(s) - es. %s",
+ "AnonymizeIpMaskLength": "%1$s byte(s) - es. %2$s",
"CannotLockSoDeleteLogActions": "La tabella log_action non verrà pulita: assicura il privilegio LOCK TABLES all'utente MYSQL '%s'.",
"ClickHereSettings": "Accedi alle impostazioni %s.",
"CurrentDBSize": "Dimensione corrente del database",
@@ -22,8 +22,8 @@
"DeleteMaxRows": "Numero massimo di righe da cancellare in un passaggio:",
"DeleteMaxRowsNoLimit": "nessun limite",
"DeleteReportsConfirm": "Stai per consentire la cancellazione dei dati dei report. Se i vecchi report vengono rimossi, si dovranno rielaborare per visualizzarli. Sei sicuro di volerlo fare?",
- "DeleteReportsDetailedInfo": "I dati delle tabelle numeriche d'archivio del database(%s) e le tabelle d'archivio blob (%s) saranno cancellate.",
- "DeleteReportsInfo": "Se abilitato, i vecchi report verranno cancellati. %sRaccomandiamo di abilitare solo quando lo spazio del database è limitato.%s",
+ "DeleteReportsDetailedInfo": "I dati delle tabelle numeriche d'archivio del database (%1$s) e le tabelle d'archivio blob (%2$s) saranno cancellate.",
+ "DeleteReportsInfo": "Se abilitato, i vecchi report verranno cancellati. %1$sRaccomandiamo di abilitare solo quando lo spazio del database è limitato.%2$s",
"DeleteReportsInfo2": "Se non è stato abilitato \"%s\", i vecchi report verranno automaticamente ricreati quando richiesti.",
"DeleteReportsInfo3": "Se abilitato \"%s\", i dati andranno definitivamente persi.",
"DeleteReportsOlderThan": "Elimina i report più vecchi di",
@@ -56,8 +56,8 @@
"RecommendedForPrivacy": "Raccomandato per la privacy",
"ReportsDataSavedEstimate": "Dimensioni database",
"SaveSettingsBeforePurge": "Hai cambiato le impostazioni per la cancellazione dei dati. Si consiglia di salvarli prima di cominciare una pulizia.",
- "SeeAlsoOurOfficialGuidePrivacy": "Leggi anche la nostra guida ufficiale: %sWeb Analytics Privacy%s",
- "Teaser": "In questa pagina è possibile personalizzare Piwik per renderlo conforme alle norme vigenti sulla privacy. È possibile %s rendere anonimi gli IP dei visitatori%s, %s rimuovere automaticamente dal database i vecchi log dei visitatori%s e %s fornire un meccanismo opt-out per il sito%s.",
+ "SeeAlsoOurOfficialGuidePrivacy": "Leggi anche la nostra guida ufficiale: %1$sWeb Analytics Privacy%2$s",
+ "Teaser": "In questa pagina è possibile personalizzare Piwik per renderlo conforme alle norme vigenti sulla privacy. È possibile %1$s rendere anonimi gli IP dei visitatori%2$s, %3$s rimuovere automaticamente dal database i vecchi log dei visitatori%4$s e %5$s fornire un meccanismo opt-out per il sito%6$s.",
"TeaserHeadline": "Impostazioni privacy",
"UseAnonymizedIpForVisitEnrichment": "Usa anche gli indirizzi IP Anonimi quando si arricchiscono le visite",
"UseAnonymizedIpForVisitEnrichmentNote": "Plugin come Geo Location tramite IP e Provider incrementano i metadati dei visitatori. Di default questi plugin utiizzano gli indirizzi IP resi anonimi. Se selezioni 'No', verrà utilizzato l'indirizzo IP completo non reso anonimo, con la conseguenza di una minore privacy ma con un'accuratezza dei dati migliore.",
diff --git a/plugins/PrivacyManager/lang/ja.json b/plugins/PrivacyManager/lang/ja.json
index aee8d4f8981ba4554bc291d99b69224f7801846e..c830a60a91d797e34318fd41ef930c818347877a 100644
--- a/plugins/PrivacyManager/lang/ja.json
+++ b/plugins/PrivacyManager/lang/ja.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "完全ã«ç‰¹å®šã•ã‚ŒãŸIPアドレスを追跡ã—ãªã„よã†ã«ã™ã‚‹ã«ã¯ã€Œã¯ã„ã€ã‚’é¸ã‚“ã§ãã ã•ã„。",
"AnonymizeIpInlineHelp": "ãƒãƒ¼ã‚«ãƒ«ãƒ—ライãƒã‚·ãƒ¼è¦å‰‡ã‚„ガイドラインã«å¿œã˜ã¦ã€ãƒ“ジター㮠IP アドレスã®æœ€çµ‚ãƒã‚¤ãƒˆã‚’匿å化ã—ã¾ã™ã€‚",
- "AnonymizeIpExtendedHelp": "ユーザーãŒã‚¦ã‚§ãƒ–サイトを訪れるã¨ãã€Piwik 㯠( %s ã®ã‚ˆã†ãª ) 完全㪠IP アドレスを使用ã—ã¾ã›ã‚“ãŒã€ä»£ã‚ã‚Šã«æœ€åˆã«åŒ¿å化ã—ã¾ã™ ( %s ã¾ã§ ) 。IP アドレスã®åŒ¿å化ã¯ãƒ‰ã‚¤ãƒ„ã‚’å«ã‚€ã„ãã¤ã‹ã®å›½ã«ãŠã„ã¦ãƒ—ライãƒã‚·ãƒ¼æ³•ã«ã‚ˆã£ã¦è¨å®šã•ã‚Œã¦ã„ã‚‹æ¡ä»¶ã®ä¸ã®ï¼‘ã¤ã§ã™ã€‚",
+ "AnonymizeIpExtendedHelp": "ユーザーãŒã‚¦ã‚§ãƒ–サイトを訪れるã¨ãã€Piwik 㯠( %1$s ã®ã‚ˆã†ãª ) 完全㪠IP アドレスを使用ã—ã¾ã›ã‚“ãŒã€ä»£ã‚ã‚Šã«æœ€åˆã«åŒ¿å化ã—ã¾ã™ ( %2$s ã¾ã§ ) 。IP アドレスã®åŒ¿å化ã¯ãƒ‰ã‚¤ãƒ„ã‚’å«ã‚€ã„ãã¤ã‹ã®å›½ã«ãŠã„ã¦ãƒ—ライãƒã‚·ãƒ¼æ³•ã«ã‚ˆã£ã¦è¨å®šã•ã‚Œã¦ã„ã‚‹æ¡ä»¶ã®ä¸ã®ï¼‘ã¤ã§ã™ã€‚",
"AnonymizeIpMaskLengtDescription": "ビジターã®IPアドレスã‹ã‚‰ä½•ãƒã‚¤ãƒˆãƒžã‚¹ã‚¯ã™ã‚‹ã‹é¸æŠžã—ã¦ãã ã•ã„。",
- "AnonymizeIpMaskLength": "%s ãƒã‚¤ãƒˆ- 例. %s",
+ "AnonymizeIpMaskLength": "%1$s ãƒã‚¤ãƒˆ- 例. %2$s",
"CannotLockSoDeleteLogActions": "log_action 表ã¯ã€ãƒ‘ージã•ã‚Œã¾ã›ã‚“。'%s' MYSQL ユーザーã«ã€LOCK TABLES 権é™ã‚’付与ã—ã¦ãã ã•ã„。",
"ClickHereSettings": "%s è¨å®šã¯ã“ã¡ã‚‰ã‚’クリック",
"CurrentDBSize": "ç¾åœ¨ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚µã‚¤ã‚º",
@@ -22,8 +22,8 @@
"DeleteMaxRows": "一回ã®å®Ÿè¡Œã§å‰Šé™¤ã™ã‚‹æœ€å¤§ã®è¡Œæ•°ï¼š",
"DeleteMaxRowsNoLimit": "制é™ãªã—",
"DeleteReportsConfirm": "リãƒãƒ¼ãƒˆãƒ‡ãƒ¼ã‚¿ã®å‰Šé™¤ã‚’å¯èƒ½ã«ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚å¤ã„リãƒãƒ¼ãƒˆãŒå‰Šé™¤ã•ã‚ŒãŸå ´åˆã¯ã€å†åº¦ç”Ÿæˆã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚続ã‘ã¾ã™ã‹ï¼Ÿ",
- "DeleteReportsDetailedInfo": "データベースã®æ•°å€¤åž‹ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–テーブル（%s）ã¨ãƒ–ãƒãƒ–åž‹ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–テーブル（%s）ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚",
- "DeleteReportsInfo": "有効ã®å ´åˆã¯ã€å¤ã„レãƒãƒ¼ãƒˆãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚%sデータベース容é‡ãŒé™ã‚‰ã‚Œã¦ã„ã‚‹å ´åˆã®ã¿æœ‰åŠ¹ã«ã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚%s",
+ "DeleteReportsDetailedInfo": "データベースã®æ•°å€¤åž‹ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–テーブル（%1$s）ã¨ãƒ–ãƒãƒ–åž‹ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–テーブル（%2$s）ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚",
+ "DeleteReportsInfo": "有効ã®å ´åˆã¯ã€å¤ã„レãƒãƒ¼ãƒˆãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚%1$sデータベース容é‡ãŒé™ã‚‰ã‚Œã¦ã„ã‚‹å ´åˆã®ã¿æœ‰åŠ¹ã«ã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚%2$s",
"DeleteReportsInfo2": "\"%s\"ãŒæœ‰åŠ¹ã§ãªã„å ´åˆã¯ã€è¦æ±‚ã•ã‚Œã‚Œã°ã€å¤ã„レãƒãƒ¼ãƒˆãŒè‡ªå‹•çš„ã«å†ä½œæˆã•ã‚Œã¾ã™ã€‚",
"DeleteReportsInfo3": "\"%s\" を有効ã«ã™ã‚‹ã¨ã€ãƒ‡ãƒ¼ã‚¿ã¯æ°¸ä¹…ã«å¤±ã‚ã‚Œã¾ã™ã€‚",
"DeleteReportsOlderThan": "ã“ã®æœˆæ•°ã‚ˆã‚Šå¤ã„リãƒãƒ¼ãƒˆã‚’削除",
@@ -56,8 +56,7 @@
"RecommendedForPrivacy": "プライãƒã‚·ãƒ¼æŽ¨å¥¨",
"ReportsDataSavedEstimate": "データベースサイズ",
"SaveSettingsBeforePurge": "データ削除è¨å®šã‚’変更ã—ã¾ã—ãŸã€‚削除ãŒé–‹å§‹ã•ã‚Œã‚‹å‰ã«ä¿å˜ã—ã¦ãã ã•ã„。",
- "SeeAlsoOurOfficialGuidePrivacy": "ç§é”ã®ã‚ªãƒ•ã‚£ã‚·ãƒ£ãƒ«ã‚¬ã‚¤ãƒ‰ã‚‚ã”確èªãã ã•ã„。%sWeb Analytics Privacy%s",
- "Teaser": "ã“ã®ãƒšãƒ¼ã‚¸ã§ã¯ã€æ—¢å˜ã®æ³•å¾‹ã«ã®ã£ã¨ã‚Šã€PiwikãŒãƒ—ライãƒã‚·ãƒ¼ã«æº–æ‹ ã™ã‚‹ã‚ˆã†ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼š%s 匿åã®è¨ªå•è€…ã®IPアドレス %sã€%s 自動的ã«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‹ã‚‰å¤ã„ビジターã®ãƒã‚°ã‚’削除 %sã€%sウェブサイトをオプトアウトã™ã‚‹ä»•çµ„ã¿ã®æä¾›%s ã«ã‚ˆã‚‹ã€‚",
+ "SeeAlsoOurOfficialGuidePrivacy": "ç§é”ã®ã‚ªãƒ•ã‚£ã‚·ãƒ£ãƒ«ã‚¬ã‚¤ãƒ‰ã‚‚ã”確èªãã ã•ã„。%1$sWeb Analytics Privacy%2$s",
"TeaserHeadline": "プライãƒã‚·ãƒ¼è¨å®š",
"UseAnonymizedIpForVisitEnrichment": "訪å•æ•°ã‚’増やã™éš›ã€åŒ¿å化ã•ã‚ŒãŸ IP アドレスもã”利用ãã ã•ã„。",
"UseAnonymizedIpForVisitEnrichmentNote": "IP ãŠã‚ˆã³ãƒ—ãƒãƒã‚¤ãƒ€ãƒ¼çµŒç”±ã®ä½ç½®æƒ…å ±æŽ¢ç´¢æ©Ÿèƒ½ã®ã‚ˆã†ãªãƒ—ラグインã¯ã€ãƒ“ジターã®ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿ã‚’ä¿®æ£ã—ã¾ã™ã€‚デフォルトã§ã¯ã€ã“ã®ã‚ˆã†ãªãƒ—ラグインã¯åŒ¿å IP アドレスを使用ã—ã¾ã™ã€‚'No' ã‚’é¸ã¶ã¨ã€éžåŒ¿åã®å®Œå…¨ãª IP アドレスãŒä»£ã‚ã‚Šã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ã“ã®å ´åˆã€ãƒ‡ãƒ¼ã‚¿ã®æ£ç¢ºæ€§ã¯å‘上ã—ã¾ã™ãŒãƒ—ライãƒã‚·ãƒ¼ã¯å¤šå°‘劣りã¾ã™ã€‚",
diff --git a/plugins/PrivacyManager/lang/ko.json b/plugins/PrivacyManager/lang/ko.json
index 84987a600ad111ccd13a97f58ed8c8121ea44299..033621a5efdf480bc17c0f9e4afe0e3e3978d427 100644
--- a/plugins/PrivacyManager/lang/ko.json
+++ b/plugins/PrivacyManager/lang/ko.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "ì™„ì „ížˆ í™•ì¸ ëœ IP 주소를 추ì 하지 ì•Šë„ë¡í•˜ë ¤ë©´ \"예\"를 ì„ íƒí•©ë‹ˆë‹¤.",
"AnonymizeIpInlineHelp": "ê°œì¸ì´ ì„¤ì •í•œ 내부 규칙 ë° ì§€ì¹¨ì— ë”°ë¼ ë°©ë¬¸ìžì˜ IPì£¼ì†Œì˜ ë§ˆì§€ë§‰ ë°”ì´íŠ¸ë¥¼ 숨ê¹ë‹ˆë‹¤.",
- "AnonymizeIpExtendedHelp": "ìœ ì €ë“¤ì´ ì›¹ì‚¬ì´íŠ¸ì— ì ‘ì†í• ë•Œ, Piwik는 ëª¨ë“ IP 주소(예: %s)를 사용하지 ì•Šê³ ì¼ë¶€ë¥¼ 숨ê¹ë‹ˆë‹¤(예: %s). IP 주소 ìµëª… 처리는 ë…ì¼ê³¼ ê°™ì´ íŠ¹ì • êµê°€ì—ì„œ 프ë¼ì´ë²„ì‹œ ë²•ë¥ ì— ë”°ë¼ ìš”êµ¬ë˜ëŠ” 것 중 하나입니다.",
+ "AnonymizeIpExtendedHelp": "ìœ ì €ë“¤ì´ ì›¹ì‚¬ì´íŠ¸ì— ì ‘ì†í• ë•Œ, Piwik는 ëª¨ë“ IP 주소(예: %1$s)를 사용하지 ì•Šê³ ì¼ë¶€ë¥¼ 숨ê¹ë‹ˆë‹¤(예: %2$s). IP 주소 ìµëª… 처리는 ë…ì¼ê³¼ ê°™ì´ íŠ¹ì • êµê°€ì—ì„œ 프ë¼ì´ë²„ì‹œ ë²•ë¥ ì— ë”°ë¼ ìš”êµ¬ë˜ëŠ” 것 중 하나입니다.",
"AnonymizeIpMaskLengtDescription": "방문ìžì˜ IP 주소ì—ì„œ 몇 ë°”ì´íŠ¸ë¥¼ ìˆ¨ê¸°ë ¤ë©´ ì„ íƒí•˜ì„¸ìš”.",
- "AnonymizeIpMaskLength": "%s ë°”ì´íŠ¸ - 예) %s",
+ "AnonymizeIpMaskLength": "%1$s ë°”ì´íŠ¸ - 예) %2$s",
"CannotLockSoDeleteLogActions": "log_action í…Œì´ë¸”ì„ ë¹„ìš¸ 수 없습니다: '%s' MYSQL 사용ìžì—게 LOCK í…Œì´ë¸” ê¶Œí•œì„ ë¶€ì—¬í•˜ì„¸ìš”.",
"ClickHereSettings": "%s ì„¤ì •ì€ ì—¬ê¸°ë¥¼ í´ë¦í•˜ì„¸ìš”.",
"CurrentDBSize": "현재 ë°ì´í„°ë² ì´ìŠ¤ í¬ê¸°",
@@ -22,8 +22,8 @@
"DeleteMaxRows": "í•œë²ˆì˜ ì‹¤í–‰ìœ¼ë¡œ 최대 ì œê±° í–‰ 수:",
"DeleteMaxRowsNoLimit": "ì œí•œ ì—†ìŒ",
"DeleteReportsConfirm": "ë³´ê³ ì„œ ë°ì´í„°ì˜ ì‚ì œë¥¼ ê°€ëŠ¥í•˜ê²Œí•˜ë ¤ê³ í•©ë‹ˆë‹¤. ì´ì „ ë³´ê³ ì„œê°€ ì‚ì œ ëœ ê²½ìš° 다시 ìƒì„±í•´ì•¼í•©ë‹ˆë‹¤. ê³„ì† í•˜ì‹œê² ìŠµë‹ˆê¹Œ?",
- "DeleteReportsDetailedInfo": "ë°ì´í„°ë² ì´ìŠ¤ì˜ ìˆ«ìž ì•„ì¹´ì´ë¸Œ í…Œì´ë¸” (%s)와 blob ì•„ì¹´ì´ë¸Œ í…Œì´ë¸” (%s)ì—ì„œ ë°ì´í„°ê°€ ì‚ì œë©ë‹ˆë‹¤.",
- "DeleteReportsInfo": "í™œì„±í™”ëœ ê²½ìš°, ì´ì „ ë³´ê³ ì„œê°€ ì‚ì œë©ë‹ˆë‹¤. %së°ì´í„°ë² ì´ìŠ¤ ìš©ëŸ‰ì´ ì œí•œëœ ê²½ìš°ì—만 사용하는 ê²ƒì´ ì¢‹ìŠµë‹ˆë‹¤.%s",
+ "DeleteReportsDetailedInfo": "ë°ì´í„°ë² ì´ìŠ¤ì˜ ìˆ«ìž ì•„ì¹´ì´ë¸Œ í…Œì´ë¸” (%1$s)와 blob ì•„ì¹´ì´ë¸Œ í…Œì´ë¸” (%2$s)ì—ì„œ ë°ì´í„°ê°€ ì‚ì œë©ë‹ˆë‹¤.",
+ "DeleteReportsInfo": "í™œì„±í™”ëœ ê²½ìš°, ì´ì „ ë³´ê³ ì„œê°€ ì‚ì œë©ë‹ˆë‹¤. %1$së°ì´í„°ë² ì´ìŠ¤ ìš©ëŸ‰ì´ ì œí•œëœ ê²½ìš°ì—만 사용하는 ê²ƒì´ ì¢‹ìŠµë‹ˆë‹¤.%2$s",
"DeleteReportsInfo2": "\"%s\"ê°€ ìœ íš¨í•˜ì§€ ì•Šì€ ê²½ìš°, 요구ë˜ëŠ” 경우, ì´ì „ ë³´ê³ ì„œê°€ ìžë™ìœ¼ë¡œ 다시 만들어집니다.",
"DeleteReportsInfo3": "\"%s\"를 사용하면 ë°ì´í„°ê°€ ì˜êµ¬ì 으로 ì†ì‹¤ë©ë‹ˆë‹¤.",
"DeleteReportsOlderThan": "ì˜¤ëž˜ëœ ë³´ê³ ì„œ ì‚ì œ",
@@ -56,8 +56,8 @@
"RecommendedForPrivacy": "프ë¼ì´ë²„시를 위해 권장함",
"ReportsDataSavedEstimate": "ë°ì´í„°ë² ì´ìŠ¤ í¬ê¸°",
"SaveSettingsBeforePurge": "ë°ì´í„° ì‚ì œ ì„¤ì •ì„ ë³€ê²½í–ˆìŠµë‹ˆë‹¤. ì‚ì œê°€ 시작ë˜ê¸° ì „ì— ì €ìž¥í•˜ì„¸ìš”.",
- "SeeAlsoOurOfficialGuidePrivacy": "ê³µì‹ ê°€ì´ë“œì¸ %sWeb Analytics Privacy%sì„ ì°¸ê³ í•´ì£¼ì„¸ìš”.",
- "Teaser": "ì´ íŽ˜ì´ì§€ì—서는 ê¸°ì¡´ì˜ ë²•ë¥ ì— ë”°ë¼, Piwikì´ ê°œì¸ì— 맞ë„ë¡ ì •ì˜í• 수 있습니다: %s ìµëª… 방문ìžì˜ IP 주소 %s, %s ìžë™ìœ¼ë¡œ ë°ì´í„°ë² ì´ìŠ¤ì—ì„œ ì˜¤ëž˜ëœ ë°©ë¬¸ìžì˜ 로그를 ì‚ì œ %s, %s 웹사ì´íŠ¸ë¥¼ 탈퇴하는 ë°©ë²•ì„ ì œê³µ %sì— ë”°ë¦„.",
+ "SeeAlsoOurOfficialGuidePrivacy": "ê³µì‹ ê°€ì´ë“œì¸ %1$sWeb Analytics Privacy%2$sì„ ì°¸ê³ í•´ì£¼ì„¸ìš”.",
+ "Teaser": "ì´ íŽ˜ì´ì§€ì—서는 ê¸°ì¡´ì˜ ë²•ë¥ ì— ë”°ë¼, Piwikì´ ê°œì¸ì— 맞ë„ë¡ ì •ì˜í• 수 있습니다: %1$s ìµëª… 방문ìžì˜ IP 주소 %2$s, %3$s ìžë™ìœ¼ë¡œ ë°ì´í„°ë² ì´ìŠ¤ì—ì„œ ì˜¤ëž˜ëœ ë°©ë¬¸ìžì˜ 로그를 ì‚ì œ %4$s, %5$s 웹사ì´íŠ¸ë¥¼ 탈퇴하는 ë°©ë²•ì„ ì œê³µ %6$sì— ë”°ë¦„.",
"TeaserHeadline": "ê°œì¸ ì •ë³´ 보호 ì„¤ì •",
"UseAnonymizedIpForVisitEnrichment": "ë˜í•œ, ë°©ë¬¸ì´ ë§Žì„ ë•Œ ìµëª…í™”ëœ IP 주소를 사용합니다.",
"UseAnonymizedIpForVisitEnrichmentNote": "IP 주소와 공급ìžë¥¼ 통하여 방문ìžì˜ ì§€ì— ì •ë³´ë¥¼ 알아내는 것 ê°™ì€ í”ŒëŸ¬ê·¸ì¸ì€ 방문ìžì˜ 메타ë°ì´í„°ë¥¼ í–¥ìƒì‹œí‚µë‹ˆë‹¤. 기본ì 으로 ì´ëŸ° 플러그ì¸ì€ ìµëª…í™”ëœ IP 주소를 사용합니다. 만약 '아니오'를 ì„ íƒí• 경우, ìµëª…처리ë˜ì§€ ì•Šì€ ì „ì²´ IP 주소를 ëŒ€ì‹ ì‚¬ìš©í•˜ê²Œ ë˜ì–´ 프ë¼ì´ë²„시는 낮추지만 ëŒ€ì‹ ë°ì´í„° ì •í™•ë„를 ë†’ì¼ ê²ƒìž…ë‹ˆë‹¤.",
diff --git a/plugins/PrivacyManager/lang/nb.json b/plugins/PrivacyManager/lang/nb.json
index 512319bd6684b0ee93c590d00126dbd2db5210f1..87b96e9d56ac1a3088438eb15b50036e8600349c 100644
--- a/plugins/PrivacyManager/lang/nb.json
+++ b/plugins/PrivacyManager/lang/nb.json
@@ -1,6 +1,6 @@
{
"PrivacyManager": {
- "AnonymizeIpMaskLength": "%s byte(s) – f.eks %s",
+ "AnonymizeIpMaskLength": "%1$s byte(s) – f.eks %2$s",
"ClickHereSettings": "Klikk her for å få tilgang til %s-innstillingene.",
"CurrentDBSize": "Nåværende databasestørrelse",
"DeleteDataDescription": "Du kan sette opp Piwik til å regelmessig slette gamle besøkslogger og\/eller behandlede rapporter for å holde databasen din liten.",
diff --git a/plugins/PrivacyManager/lang/nl.json b/plugins/PrivacyManager/lang/nl.json
index c4b39559a3b809258409d06499ba1a69fae718b9..2bd5aa2db4ae361c5ea6f1fff4194572f2279a58 100644
--- a/plugins/PrivacyManager/lang/nl.json
+++ b/plugins/PrivacyManager/lang/nl.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "Selecteer \"Ja\" als u wilt dat Piwik niet de volledige IP-adressen registreert.",
"AnonymizeIpInlineHelp": "Anonimiseer de laatste byte van bezoekers IP adressen om te voldoen aan lokale privacy wetten\/richtlijnen.",
- "AnonymizeIpExtendedHelp": "Als gebruikers uw website bezoeken zal Piwik niet het volledige IP adres (zoals %s) gebruiken maar ditt eerst anonimiseren (tot %s). IP adres anonimisatie is in sommige landen zoals Duitsland, een van de eisen gesteld in privacy wetten.",
+ "AnonymizeIpExtendedHelp": "Als gebruikers uw website bezoeken zal Piwik niet het volledige IP adres (zoals %1$s) gebruiken maar ditt eerst anonimiseren (tot %2$s). IP adres anonimisatie is in sommige landen zoals Duitsland, een van de eisen gesteld in privacy wetten.",
"AnonymizeIpMaskLengtDescription": "Geef aan hoeveel cijfers van het IP-adres moeten worden gemaskeerd.",
- "AnonymizeIpMaskLength": "%s byte(s) - bijvoorbeeld %s",
+ "AnonymizeIpMaskLength": "%1$s byte(s) - bijvoorbeeld %2$s",
"CannotLockSoDeleteLogActions": "De log_action tabel zal niet worden opgekuist: Wijs het 'LOCK TABLES' recht toe aan de '%s' MYSQL gebruiker.",
"ClickHereSettings": "Klik hier om de%s-instellingen te openen.",
"CurrentDBSize": "Huidige database grotte",
@@ -22,8 +22,8 @@
"DeleteMaxRows": "Maximum aantal rijen te verwijderen in een keer:",
"DeleteMaxRowsNoLimit": "onbeperkt",
"DeleteReportsConfirm": "U staat op het punt om het verwijderen van rapporten te activeren. Als de oude rapporten zijn verwijderd, dan zullen ze opnieuw aangemaakt moeten worden als u ze later wilt bekijken. Bent u er zzker van dat u de oude rapporten wilt verwijderen?",
- "DeleteReportsDetailedInfo": "Data uit de database numeric archive tabellen (%s) and blob archive tabellen (%s) zullen worden verwijderd.",
- "DeleteReportsInfo": "Indien ingeschakeld zullen oude rapporten worden verwijderd. %sWe adviseren om dit alleen te doen als de databaseruimte beperkt is.%s",
+ "DeleteReportsDetailedInfo": "Data uit de database numeric archive tabellen (%1$s) and blob archive tabellen (%2$s) zullen worden verwijderd.",
+ "DeleteReportsInfo": "Indien ingeschakeld zullen oude rapporten worden verwijderd. %1$sWe adviseren om dit alleen te doen als de databaseruimte beperkt is.%2$s",
"DeleteReportsInfo2": "Als u \"%s\" niet heeft ingeschakeld, dan zullen de oude rapporten opnieuw automatisch worden aangemaakt zodra ze worden opgevraagd.",
"DeleteReportsInfo3": "Als u \"%s\" heeft ingeschakeld, dan zal de data permanent verloren gaan.",
"DeleteReportsOlderThan": "Verwijder rapporten ouder dan",
@@ -53,7 +53,7 @@
"PurgingData": "Data opschonen",
"RecommendedForPrivacy": "Aanbevolen voor privacy",
"ReportsDataSavedEstimate": "Database omvang",
- "Teaser": "Op deze pagina kunt u Piwik zodanig instellen dat het voldoet aan de bestaande privacy wetgeving in uw regio. Door: %s anonimiseren van uw bezoekers IP %s,%s automatisch verwijderen oude bezoekerlogs uit de database %s en %s door een opt-out ondersteuning aan te bieden voor uw website%s.",
+ "Teaser": "Op deze pagina kunt u Piwik zodanig instellen dat het voldoet aan de bestaande privacy wetgeving in uw regio. Door: %1$s anonimiseren van uw bezoekers IP %2$s,%3$s automatisch verwijderen oude bezoekerlogs uit de database %4$s en %5$s door een opt-out ondersteuning aan te bieden voor uw website%6$s.",
"TeaserHeadline": "Privacy instellingen",
"UseAnonymizedIpForVisitEnrichment": "Gebruik ook de geanonimiseerde IP adressen bij het verrijken van de bezoeken.",
"UseAnonymizedIpForVisitEnrichmentNote": "Plugins zoals Geolocatie via IP en Provider verbeteren bezoekers metadata. Standaard maken deze plugins gebruik van de geanonimiseerde IP adressen. Als je 'Nee' selecteert, dan zal het volledige, niet geanonimiseerde IP adres gebruikt worden. Dat resulteert in minder privacy, maar een grotere nauwkeurigheid van data.",
diff --git a/plugins/PrivacyManager/lang/pl.json b/plugins/PrivacyManager/lang/pl.json
index f9f9540a42e44247e9a0bdc02898b1d40682c4b6..153759e82460f74943f3725823ae153eef89c16e 100644
--- a/plugins/PrivacyManager/lang/pl.json
+++ b/plugins/PrivacyManager/lang/pl.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "Wybierz \"Tak\" jeśli chcesz aby nie śledzić w pełni wykwalifikowanych adresów IP.",
"AnonymizeIpInlineHelp": "Anonimizacja ostatniego bajtu w adresie IP odwiedzających, by dostosować się do być może lokalnego prawa do prywatności\/wytycznych o prywatności.",
- "AnonymizeIpExtendedHelp": "Kiedy użytkownik odwiedzi twoją stronę. Piwik nie użyje całego adresu IP danej osoby (np %s), a zamiast tego wykona anonimizację adresu (do %s). Anonimizacja adresu IP jest wymogiem prawnym w niektórych krajach - na przykład w Niemczech.",
+ "AnonymizeIpExtendedHelp": "Kiedy użytkownik odwiedzi twoją stronę. Piwik nie użyje całego adresu IP danej osoby (np %1$s), a zamiast tego wykona anonimizację adresu (do %2$s). Anonimizacja adresu IP jest wymogiem prawnym w niektórych krajach - na przykład w Niemczech.",
"AnonymizeIpMaskLengtDescription": "Wybierz ile bajtów z odwiedzających' adresów IP powinny być zamaskowane.",
- "AnonymizeIpMaskLength": "%s bajt(ów) - np. %s",
+ "AnonymizeIpMaskLength": "%1$s bajt(ów) - np. %2$s",
"ClickHereSettings": "Kliknij tutaj, aby uzyskać dostęp do %s ustawień.",
"CurrentDBSize": "Obecny rozmiar bazy danych",
"DeleteDataInterval": "Usuń stare dane co",
@@ -13,7 +13,7 @@
"DeleteLogsOlderThan": "Usuń logi starsze niż",
"DeleteMaxRows": "Maksymalna liczba wierszy, aby usunąć w jednym przebiegu:",
"DeleteMaxRowsNoLimit": "bez limitu",
- "DeleteReportsInfo": "Jeśli opcja jest włączona, stare raporty zostaną usunięte. %s Zalecane włączyć tylko wtedy, gdy baza danych jest ma ograniczoną przestrzeń. %s",
+ "DeleteReportsInfo": "Jeśli opcja jest włączona, stare raporty zostaną usunięte. %1$s Zalecane włączyć tylko wtedy, gdy baza danych jest ma ograniczoną przestrzeń. %2$s",
"DeleteReportsInfo3": "Jeśli włączysz \"%s\", dane zostaną trwale utracone.",
"DeleteReportsOlderThan": "Usuń raporty starsze niż",
"DoNotTrack_Disable": "Wyłącz wsparcie Do Not Track",
@@ -30,7 +30,7 @@
"PurgeNow": "Oczyść bazę danych teraz",
"PurgingData": "Czyszczenie danych...",
"ReportsDataSavedEstimate": "Rozmiar bazy danych",
- "SeeAlsoOurOfficialGuidePrivacy": "Zobacz również nasz oficjalny przewodnik: : %sWeb Analytics Privacy%s",
+ "SeeAlsoOurOfficialGuidePrivacy": "Zobacz również nasz oficjalny przewodnik: : %1$sWeb Analytics Privacy%2$s",
"TeaserHeadline": "Ustawienia prywatności",
"UseAnonymizeIp": "Anonimizacja odwiedzajÄ…cych' adres IP",
"UseDeleteLog": "Regularnie usuwanie starych logów odwiedzających z bazy danych",
diff --git a/plugins/PrivacyManager/lang/pt-br.json b/plugins/PrivacyManager/lang/pt-br.json
index 2d65dfd76e0c96f27abde6e1ce3b7cb0cbaa474b..c5bfb79b63d92cc697a5d0485295187adf767849 100644
--- a/plugins/PrivacyManager/lang/pt-br.json
+++ b/plugins/PrivacyManager/lang/pt-br.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "Selecione \"Sim\" se você quer que o Piwik não restreie os endereços de IP totalmente qualificados.",
"AnonymizeIpInlineHelp": "Anonimize o último byte do endereço IP dos visitantes para obedecer suas leis\/guias locais de privacidade.",
- "AnonymizeIpExtendedHelp": "Quando usuários visitarem o seu site, Piwik não vai usar o endereço de IP completo (como %s), pelo contrário, Piwik vai anonimizá-los primeiro (para %s). Anonimização de endereço de IP é um dos requisitos estabelecidos pelas leis de privacidade em alguns paÃses como a Alemanha.",
+ "AnonymizeIpExtendedHelp": "Quando usuários visitarem o seu site, Piwik não vai usar o endereço de IP completo (como %1$s), pelo contrário, Piwik vai anonimizá-los primeiro (para %2$s). Anonimização de endereço de IP é um dos requisitos estabelecidos pelas leis de privacidade em alguns paÃses como a Alemanha.",
"AnonymizeIpMaskLengtDescription": "Selecione quantos bytes de IPs dos visitantes deve ser mascarado.",
- "AnonymizeIpMaskLength": "%s byte(s) - e.g. %s",
+ "AnonymizeIpMaskLength": "%1$s byte(s) - e.g. %2$s",
"CannotLockSoDeleteLogActions": "A tabela log_action não será purgada: por favor, conceder o privilégio LOCK TABLES para o usuário MYSQL '%s'.",
"ClickHereSettings": "Clique aqui para acessar as configurações do %s.",
"CurrentDBSize": "Tamanho atual do banco de dados",
@@ -22,8 +22,8 @@
"DeleteMaxRows": "O número máximo de linhas a serem excluÃdos em uma execução:",
"DeleteMaxRowsNoLimit": "nenhum limite",
"DeleteReportsConfirm": "Você está prestes a permitir a exclusão dos dados do relatório. Se os relatórios antigos são removidos, você vai ter que re-processar-los em ordem de visualização. Tem certeza de que quer fazer isto?",
- "DeleteReportsDetailedInfo": "Os dados das tabelas de arquivamento de banco de dados numéricos (%s) e tabelas de arquivo blob (%s) será excluÃdo.",
- "DeleteReportsInfo": "Se ativado, relatórios antigos serão apagados. %s Nós recomendamos permitir apenas quando o seu espaço de banco de dados é limitado. %s",
+ "DeleteReportsDetailedInfo": "Os dados das tabelas de arquivamento de banco de dados numéricos (%1$s) e tabelas de arquivo blob (%2$s) será excluÃdo.",
+ "DeleteReportsInfo": "Se ativado, relatórios antigos serão apagados. %1$s Nós recomendamos permitir apenas quando o seu espaço de banco de dados é limitado. %2$s",
"DeleteReportsInfo2": "Se você não tiver ativado \"%s\", os relatórios antigos serão recriados automaticamente quando solicitado.",
"DeleteReportsInfo3": "Se você tiver ativado \"%s\", os dados serão perdidos para sempre.",
"DeleteReportsOlderThan": "Apagar relatórios com mais de",
@@ -56,8 +56,8 @@
"RecommendedForPrivacy": "Recomendado para privacidade",
"ReportsDataSavedEstimate": "Tamanho do banco de dados",
"SaveSettingsBeforePurge": "Você mudou as configurações de exclusão de dados. Guarde-os antes de iniciar um expurgo.",
- "SeeAlsoOurOfficialGuidePrivacy": "Veja também nosso guia oficial: %sWeb Analytics Privacy%s",
- "Teaser": "Nesta página, você pode personalizar Piwik para torná-lo compatÃvel com as legislações de privacidade existentes, através: %s Esconder o IP do visitante %s,%s automaticamente remover registos de visitantes antigos do banco de dados%s, e, %s proporcionando um mecanismo de Opt-out para o seu site %s.",
+ "SeeAlsoOurOfficialGuidePrivacy": "Veja também nosso guia oficial: %1$sWeb Analytics Privacy%2$s",
+ "Teaser": "Nesta página, você pode personalizar Piwik para torná-lo compatÃvel com as legislações de privacidade existentes, através: %1$s Esconder o IP do visitante %2$s,%3$s automaticamente remover registos de visitantes antigos do banco de dados%4$s, e, %5$s proporcionando um mecanismo de Opt-out para o seu site %6$s.",
"TeaserHeadline": "Configurações de privacidade",
"UseAnonymizedIpForVisitEnrichment": "Utilize também o endereço de IP Anonimizado ao enriquecer visitas.",
"UseAnonymizedIpForVisitEnrichmentNote": "Plugins como o de Geo Localização via IP e o Provedor melhoraram os metadados do visitante. Por padrão, esses plugins usam endereços IP anónimos. Se você selecionar \"Não\", então o endereço IP não-anónimos completo será usado, resultando em menos privacidade, mas melhor precisão dos dados.",
diff --git a/plugins/PrivacyManager/lang/pt.json b/plugins/PrivacyManager/lang/pt.json
index d0801c7487ae84aea634acae4d60b7e14987cfd1..297fe93f103ccdadb27d28695a417fcac4ceb496 100644
--- a/plugins/PrivacyManager/lang/pt.json
+++ b/plugins/PrivacyManager/lang/pt.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "Selecione \"Sim\" para o Piwik não rastrear totalmente endereços IP qualificados.",
"AnonymizeIpInlineHelp": "Torna o último byte dos endereços IP de visitantes anónimo para obedecer às suas leis\/regulamentos de privacidade locais.",
"AnonymizeIpMaskLengtDescription": "Selecione quantos bytes dos IPs dos visitantes devem ser mascarados.",
- "AnonymizeIpMaskLength": "%s byte(s) - por exemplo %s",
+ "AnonymizeIpMaskLength": "%1$s byte(s) - por exemplo %2$s",
"ClickHereSettings": "Clique aqui para aceder às %s definições",
"DeleteLogDescription2": "Quando você activa a ​​eliminação automática de logs, você deve garantir que todos os relatórios diários anteriores tenham sido processados​​, de modo que nenhuns dados sejam perdidos.",
"DeleteLogInfo": "Logs das seguintes tabelas serão apagados: %s",
diff --git a/plugins/PrivacyManager/lang/ro.json b/plugins/PrivacyManager/lang/ro.json
index dbd3b85696b40ff981c7979c8a673973ba1e0a30..6cc21da90e4363c6ff07de86b268a64c447a3989 100644
--- a/plugins/PrivacyManager/lang/ro.json
+++ b/plugins/PrivacyManager/lang/ro.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "Selectați \"Da\" dacă doriți Piwik sa nu urmareasca pe deplin adrese IP.",
"AnonymizeIpInlineHelp": "Ascunde ultimele cifre ale IP-ului vizitatorilor pentru a fi în conformitate cu legile privind protecţia datelor personale.",
"AnonymizeIpMaskLengtDescription": "Selectați cât de multe bytes al IP-urilor de visitatori ar trebui să fie mascate.",
- "AnonymizeIpMaskLength": "%s octet(ii)- ex. %s",
+ "AnonymizeIpMaskLength": "%1$s octet(ii)- ex. %2$s",
"CannotLockSoDeleteLogActions": "Tabelul de acțiune jurnal nu va fi sters: vă rugăm să se acorde privilegiul LOCK TABLES pentru '%s' utilizatorul MySQL.",
"ClickHereSettings": "Dă click aici pentru a accesa setările %s.",
"CurrentDBSize": "Dimensiunea bazei de date curenta",
@@ -19,8 +19,8 @@
"DeleteMaxRows": "Numărul maxim de rânduri pentru a șterge într-o cursă:",
"DeleteMaxRowsNoLimit": "nelimitat",
"DeleteReportsConfirm": "Sunteți pe cale de a permite ștergerea raportului de date. Dacă rapoartele vechi sunt eliminate, va trebui să re-prelucrare a acestora, în scopul de a le vizualiza. Ești sigur că vrei să faci asta?",
- "DeleteReportsDetailedInfo": "Datele din baza de date arhiva tabele numerice (%s) și tabele de arhivă pată de cerneală (%s) vor fi șterse.",
- "DeleteReportsInfo": "Dacă este activat, rapoartele vechi vor fi șterse. %sNoi recomandam pentru a se activa numai atunci când spațiul de baze de date este limitat.%s",
+ "DeleteReportsDetailedInfo": "Datele din baza de date arhiva tabele numerice (%1$s) și tabele de arhivă pată de cerneală (%2$s) vor fi șterse.",
+ "DeleteReportsInfo": "Dacă este activat, rapoartele vechi vor fi șterse. %1$sNoi recomandam pentru a se activa numai atunci când spațiul de baze de date este limitat.%2$s",
"DeleteReportsInfo2": "Dacă nu ați activat \"%s\", rapoarte vechi vor fi recreate în mod automat atunci când sunt solicitate.",
"DeleteReportsInfo3": "Dacă ați activat \"%s\", datele vor fi pierdute definitiv.",
"DeleteReportsOlderThan": "Șterge rapoarte mai vechi de",
@@ -49,8 +49,8 @@
"PurgingData": "Purjare de date ...",
"ReportsDataSavedEstimate": "Mărimea bazei de date",
"SaveSettingsBeforePurge": "Ați schimbat setările de ștergere a datelor. Vă rugăm să le salvați înainte de a începe o curatare.",
- "SeeAlsoOurOfficialGuidePrivacy": "A se vedea, de asemenea, ghidul nostru oficial: %sWeb Analytics confidențialitate%s",
- "Teaser": "Pe această pagină, puteți personaliza Piwik pentru a face viața privată în conformitate cu legislațiile existente, prin: %s anonimizarea vizitator IP %s, %s elimina automat busteni de vizitatori vechi din baza de date %s, iar %s oferind un mecanism de opt-out pentru site-ul dvs.%s.",
+ "SeeAlsoOurOfficialGuidePrivacy": "A se vedea, de asemenea, ghidul nostru oficial: %1$sWeb Analytics confidențialitate%2$s",
+ "Teaser": "Pe această pagină, puteți personaliza Piwik pentru a face viața privată în conformitate cu legislațiile existente, prin: %1$s anonimizarea vizitator IP %2$s, %3$s elimina automat busteni de vizitatori vechi din baza de date %4$s, iar %5$s oferind un mecanism de opt-out pentru site-ul dvs.%6$s.",
"TeaserHeadline": "Setări confidenţialitate",
"UseAnonymizedIpForVisitEnrichment": "De asemenea, utilizeaza adresele IP anonimime, atunci când se cresc vizitele.",
"UseAnonymizedIpForVisitEnrichmentNote": "Plugin-uri, cum ar fi Locația geografică prin intermediul IP și furnizor îmbunătățire metadate vizitator. În mod implicit aceste plugin-uri folosesc adresele IP anonimizate. Dacă selectați \"Nu\", atunci adresa IP complet non-anonime va fi folosit în loc, careare mai puțina intimitate, dar are o mai mare acuratețe a datelor.",
diff --git a/plugins/PrivacyManager/lang/ru.json b/plugins/PrivacyManager/lang/ru.json
index 2714a75f96663c4105d502d884774dfbc97217d7..fb766962dc8f7ffa0364e6517e05dba7bd42083b 100644
--- a/plugins/PrivacyManager/lang/ru.json
+++ b/plugins/PrivacyManager/lang/ru.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "Выберите \"Да\", еÑли хотите, чтобы ÑиÑтема отÑлеживала не полный IP-Ð°Ð´Ñ€ÐµÑ Ð¿Ð¾Ñетителей.",
"AnonymizeIpInlineHelp": "Скрыть поÑледний байт IP-адреÑов ваших поÑетителей ÑоглаÑно вашим принципам конфиденциальноÑти или законодательÑтву.",
- "AnonymizeIpExtendedHelp": "Когда пользователи поÑещают ваш Ñайт, Piwik не будет иÑпользовать полный IP-Ð°Ð´Ñ€ÐµÑ (например, %s), а анонимизирует его (например, в %s). ÐÐ½Ð¾Ð½Ð¸Ð¼Ð¸Ð·Ð°Ñ†Ð¸Ñ IP-адреÑа ÑвлÑетÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из требований, уÑтановленных законами о конфиденциальноÑти в некоторых Ñтранах, таких как ГерманиÑ.",
+ "AnonymizeIpExtendedHelp": "Когда пользователи поÑещают ваш Ñайт, Piwik не будет иÑпользовать полный IP-Ð°Ð´Ñ€ÐµÑ (например, %1$s), а анонимизирует его (например, в %2$s). ÐÐ½Ð¾Ð½Ð¸Ð¼Ð¸Ð·Ð°Ñ†Ð¸Ñ IP-адреÑа ÑвлÑетÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из требований, уÑтановленных законами о конфиденциальноÑти в некоторых Ñтранах, таких как ГерманиÑ.",
"AnonymizeIpMaskLengtDescription": "Выберите, как много байтов IP-адреÑа поÑетителей должно быть Ñкрыто.",
- "AnonymizeIpMaskLength": "%s байт(ов), например, %s",
+ "AnonymizeIpMaskLength": "%1$s байт(ов), например, %2$s",
"CannotLockSoDeleteLogActions": "Таблица log_action не будет удалена: пожалуйÑта, уÑтановите привелегии LOCK TABLES Ð´Ð»Ñ â€™%s’ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ MYSQL.",
"ClickHereSettings": "Ðажмите здеÑÑŒ, чтобы перейти к наÑтройкам: %s.",
"CurrentDBSize": "Текущий размер базы данных",
@@ -20,8 +20,8 @@
"DeleteMaxRows": "МакÑимальное чиÑло Ñтрок Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð·Ð° один раз:",
"DeleteMaxRowsNoLimit": "нет ограничений",
"DeleteReportsConfirm": "Ð’Ñ‹ ÑобираетеÑÑŒ включить удаление данных по отчетам. Когда Ñтарые отчеты будут удалены, вы должны Ñнова обработать их, еÑли хотите проÑмотреть их. Ð’Ñ‹ увереныЮ что хотите Ñделать Ñто?",
- "DeleteReportsDetailedInfo": "Данные базы данных, ÑодержащиеÑÑ Ð² numeric (%s) и blob-таблицах (%s) будут удалены.",
- "DeleteReportsInfo": "ЕÑли включено, Ñтарые отчеты будут удалены. %sМы рекомендуем включать Ñто только еÑли размер вашей БД ограничен.%s",
+ "DeleteReportsDetailedInfo": "Данные базы данных, ÑодержащиеÑÑ Ð² numeric (%1$s) и blob-таблицах (%2$s) будут удалены.",
+ "DeleteReportsInfo": "ЕÑли включено, Ñтарые отчеты будут удалены. %1$sМы рекомендуем включать Ñто только еÑли размер вашей БД ограничен.%2$s",
"DeleteReportsInfo2": "ЕÑли вы не включили '%s', Ñтарые отчеты будут воÑÑоздаватьÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки по запроÑу.",
"DeleteReportsInfo3": "ЕÑли вы включили '%s', данные будут навÑегда потерÑны.",
"DeleteReportsOlderThan": "Удалить отчеты, Ñтарше чем",
@@ -50,8 +50,8 @@
"PurgingData": "ЧиÑтка данных...",
"ReportsDataSavedEstimate": "Размер базы данных",
"SaveSettingsBeforePurge": "Ð’Ñ‹ изменили наÑтройки ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…. ПожалуйÑта, Ñохраните их, перед тем как начать чиÑтку.",
- "SeeAlsoOurOfficialGuidePrivacy": "Смотрите также официальное руководÑтво: %sКонфидециальноÑÑ‚ÑŒ данных в Piwik%s",
- "Teaser": "Ðа Ñтой вкладке вы можете наÑтраивать Веб-аналитику Ð´Ð»Ñ ÐµÐµ ÑоответÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾Ð»Ð¸Ñ‚Ð¸ÐºÐµ конфиденциальноÑти дейÑтвующего законодательÑтва вашей Ñтраны. ИÑпользуйте: %s Ñкрытие IP-адреÑа поÑетителÑ%s, %s автоматичеÑкое Ñтирание Ñтарых логов из базы банных%s и %s возможноÑÑ‚ÑŒ Ð´Ð»Ñ Ð¿Ð¾Ñетителей иÑключить ÑÐµÐ±Ñ Ð¸Ð· учета в ÑиÑтеме%s.",
+ "SeeAlsoOurOfficialGuidePrivacy": "Смотрите также официальное руководÑтво: %1$sКонфидециальноÑÑ‚ÑŒ данных в Piwik%2$s",
+ "Teaser": "Ðа Ñтой вкладке вы можете наÑтраивать Веб-аналитику Ð´Ð»Ñ ÐµÐµ ÑоответÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾Ð»Ð¸Ñ‚Ð¸ÐºÐµ конфиденциальноÑти дейÑтвующего законодательÑтва вашей Ñтраны. ИÑпользуйте: %1$s Ñкрытие IP-адреÑа поÑетителÑ%2$s, %3$s автоматичеÑкое Ñтирание Ñтарых логов из базы банных%4$s и %5$s возможноÑÑ‚ÑŒ Ð´Ð»Ñ Ð¿Ð¾Ñетителей иÑключить ÑÐµÐ±Ñ Ð¸Ð· учета в ÑиÑтеме%6$s.",
"TeaserHeadline": "ÐаÑтройки конфиденциальноÑти",
"UseAnonymizeIp": "Скрыть IP-адреÑа поÑетителей",
"UseDeleteLog": "РегулÑрно удалÑÑ‚ÑŒ Ñтарые логи поÑещений из базы данных",
diff --git a/plugins/PrivacyManager/lang/sk.json b/plugins/PrivacyManager/lang/sk.json
index 6f772369023a952a4428ba112015679279a79f15..d2657f0d2b6d62479fcb02a9c6fd6091f7a20842 100644
--- a/plugins/PrivacyManager/lang/sk.json
+++ b/plugins/PrivacyManager/lang/sk.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "Vyberte \"Ãno\" ak chcete aby Piwik nesledoval plne kvalifikované IP adresy",
"AnonymizeIpInlineHelp": "AnonymnosÅ¥ posledný bajt IP adresy návÅ¡tevnÃkov v súlade s miestnymi zákonmi na ochranu súkromia.",
"AnonymizeIpMaskLengtDescription": "Vyberte koľko bajtov IP adresy návÅ¡tevnÃkov by malo byÅ¥ maskovaných.",
- "AnonymizeIpMaskLength": "%s bajt(y) - napr. %s",
+ "AnonymizeIpMaskLength": "%1$s bajt(y) - napr. %2$s",
"ClickHereSettings": "Kliknite sem pre prÃstup k %s nastaveniam.",
"CurrentDBSize": "Aktuálna veľkosť databázy",
"DBPurged": "Databáza vyÄistená."
diff --git a/plugins/PrivacyManager/lang/sq.json b/plugins/PrivacyManager/lang/sq.json
index f69cdd55cf18c23d1a5a24ec79358519d25309ad..eb6f8e6a30afca3f0b9110fcc9e24e1130f8e9fb 100644
--- a/plugins/PrivacyManager/lang/sq.json
+++ b/plugins/PrivacyManager/lang/sq.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "Përzgjidhni \"Po\" nëse doni që Piwik-u të mos gjurmojë adresa IP të përcaktuara qartë.",
"AnonymizeIpInlineHelp": "Anonimizoje bajtin e fundit të adresave IP të vizitorëve, në pajtim me ligjet\/udhëzimet vendore për vetësinë.",
"AnonymizeIpMaskLengtDescription": "Përzgjidhni sa bajte të maskohen te IP-ja e vizitorit.",
- "AnonymizeIpMaskLength": "%s bajt(e) - p.sh. %s",
+ "AnonymizeIpMaskLength": "%1$s bajt(e) - p.sh. %2$s",
"ClickHereSettings": "Klikoni këtu që të shkoni te rregullimet mbi %s.",
"DeleteLogDescription2": "Kur aktivizoni fshirjen e vetvetishme të regjistrimeve, duhet të siguroheni që janë përpunuar krejt raportet e ditës së mëparshme, që të mos humbni të dhëna.",
"DeleteLogInfo": "Regjistrimet nga tabelat vijuese do të fshihen: %s",
@@ -14,7 +14,7 @@
"LeastDaysInput": "Ju lutem, jepni një numër ditësh më të madh se %s.",
"MenuPrivacySettings": "Privatësi",
"NextDelete": "Fshirja pasuese është planifikuar më",
- "Teaser": "Në këtë faqe, mund ta përshtatni Piwik-un që privatësi në të të jetë në pajtim me legjislacionin në fuqi, duke: %s anonimizuar IP-të e vizitorëve%s, %s hequr automatikisht nga baza e të dhënave regjistrime të vjetër vizitorësh%s, dhe %s duke ofruar një mekanizëm Opt-out për site-in tuaj web%s.",
+ "Teaser": "Në këtë faqe, mund ta përshtatni Piwik-un që privatësi në të të jetë në pajtim me legjislacionin në fuqi, duke: %1$s anonimizuar IP-të e vizitorëve%2$s, %3$s hequr automatikisht nga baza e të dhënave regjistrime të vjetër vizitorësh%4$s, dhe %5$s duke ofruar një mekanizëm Opt-out për site-in tuaj web%6$s.",
"TeaserHeadline": "Rregullime Privatësie",
"UseAnonymizeIp": "Anonimizoni adresat IP të Vizitorëve",
"UseDeleteLog": "Fshiji rregullisht te baza e të dhënave regjistrimet e vjetra të përdoruesve"
diff --git a/plugins/PrivacyManager/lang/sr.json b/plugins/PrivacyManager/lang/sr.json
index cd29363ee9872cac238f2046c8aa0479a3fdb2e0..ecaf616498c9fbad809646f8971cb0d730939e3e 100644
--- a/plugins/PrivacyManager/lang/sr.json
+++ b/plugins/PrivacyManager/lang/sr.json
@@ -2,9 +2,9 @@
"PrivacyManager": {
"AnonymizeIpDescription": "Kliknite na \"Da\" ako želite da Piwik ne beleži pune IP adrese",
"AnonymizeIpInlineHelp": "Maskiranje poslednjeg bajta IP adresa posetioca kako bi sve bilo u skladu sa vašim lokalnim zakonima i preporukama o zaštiti privatnosti.",
- "AnonymizeIpExtendedHelp": "Kada korisnik poseti vaÅ¡ sajt, Piwik neće koristiti punu IP adresu (poput %s) već će je anonimizirati (u %s). Anonimizacija IP adresa je jedan od zahteva koje su postavili zakoni o zaÅ¡tit privatnosti u zemljama poput NemaÄke.",
+ "AnonymizeIpExtendedHelp": "Kada korisnik poseti vaÅ¡ sajt, Piwik neće koristiti punu IP adresu (poput %1$s) već će je anonimizirati (u %2$s). Anonimizacija IP adresa je jedan od zahteva koje su postavili zakoni o zaÅ¡tit privatnosti u zemljama poput NemaÄke.",
"AnonymizeIpMaskLengtDescription": "Izaberite koliko bajtova IP adrese treba da bude maskirano",
- "AnonymizeIpMaskLength": "%s bajt(ova) - npr. %s",
+ "AnonymizeIpMaskLength": "%1$s bajt(ova) - npr. %2$s",
"CannotLockSoDeleteLogActions": "Tabela log_action ne može biti oÄišćena. Potrebno je da MYSQL korisnik '%s' ima privilegiju LOCK TABLES",
"ClickHereSettings": "Kliknite ovde kako biste pristupili %s podešavanjima.",
"CurrentDBSize": "Trenutna veliÄina baze",
@@ -22,8 +22,8 @@
"DeleteMaxRows": "Maksimalan broj redova za brisanje odjednom:",
"DeleteMaxRowsNoLimit": "bez ograniÄenja",
"DeleteReportsConfirm": "Na putu ste da ukljuÄite brisanje izveÅ¡taja. Ukoliko obriÅ¡ete stare izveÅ¡taje, moraćete ponovo da ih kreirate ako budete želeli opet da ih vidite. Da li ste sigurni da želite to da uradite?",
- "DeleteReportsDetailedInfo": "Podaci iz numeriÄkih (%s) i binarnih (%s) arhiva će biti obrisani.",
- "DeleteReportsInfo": "Ukoliko je ukljuÄeno, stari izveÅ¡taji će biti obrisani. %sPreporuÄujemo vam da ovo ukljuÄite samo ako je prostor u vaÅ¡oj bazi ograniÄen.%s",
+ "DeleteReportsDetailedInfo": "Podaci iz numeriÄkih (%1$s) i binarnih (%2$s) arhiva će biti obrisani.",
+ "DeleteReportsInfo": "Ukoliko je ukljuÄeno, stari izveÅ¡taji će biti obrisani. %1$sPreporuÄujemo vam da ovo ukljuÄite samo ako je prostor u vaÅ¡oj bazi ograniÄen.%2$s",
"DeleteReportsInfo2": "Ukoliko niste ukljuÄili \"%s\", stari izveÅ¡taji će biti ponovo napravljeni automatski kada budu zahtevani.",
"DeleteReportsInfo3": "Ukoliko ste ukljuÄili \"%s\", podaci će biti zauvek izgubljeni.",
"DeleteReportsOlderThan": "Briši izveštaje starije od",
@@ -56,8 +56,8 @@
"RecommendedForPrivacy": "PreporuÄljivo zbog privatnosti",
"ReportsDataSavedEstimate": "VeliÄina baze",
"SaveSettingsBeforePurge": "Izmenili ste pravila oko brisanja podataka. Molimo vas da ih saÄuvate pre nego Å¡to poÄnete sa Äišćenjem podataka.",
- "SeeAlsoOurOfficialGuidePrivacy": "Pogledajte i naÅ¡ zvaniÄni vodiÄ: %sPrivatnost u analitikama%s",
- "Teaser": "Na ovoj stranici možete izvršiti Piwik podešavanja u pogledu privatnosti tako što ćete: %s anonimizirati IP adrese posetilaca%s, %s automatski ukloniti stare zapise iz baze%s, obezbediti mehanizam da %s podaci ne budu zabeleženi ako posetioc to ne želi%s",
+ "SeeAlsoOurOfficialGuidePrivacy": "Pogledajte i naÅ¡ zvaniÄni vodiÄ: %1$sPrivatnost u analitikama%2$s",
+ "Teaser": "Na ovoj stranici možete izvršiti Piwik podešavanja u pogledu privatnosti tako što ćete: %1$s anonimizirati IP adrese posetilaca%2$s, %3$s automatski ukloniti stare zapise iz baze%4$s, obezbediti mehanizam da %5$s podaci ne budu zabeleženi ako posetioc to ne želi%6$s",
"TeaserHeadline": "Podešavanja privatnosti",
"UseAnonymizedIpForVisitEnrichment": "Takođe koristi anonimne IP adrese kada obogaćuješ podete.",
"UseAnonymizedIpForVisitEnrichmentNote": "Dodaci poput Geolokacije putem IP adrese i provajdera unapreÄ‘uju podatke o posetiocima. Podrazumevano, ovi dodaci anonimiziraju IP adrese. Ukoliko izaberete 'Ne', onda će u upotrebi biti pune IP adrese Å¡to će rezultovati slabijom privatnošću ali i većom taÄnošću podataka.",
diff --git a/plugins/PrivacyManager/lang/sv.json b/plugins/PrivacyManager/lang/sv.json
index a94f171bef88c018a0d18ddb59ba3625bcf1eda3..5a8e1599f2491bfe5a43fef24a0110f4ca7d4377 100644
--- a/plugins/PrivacyManager/lang/sv.json
+++ b/plugins/PrivacyManager/lang/sv.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "Välj \"Ja\" om du vill att Piwik inte ska spåra fullständiga IP-adresser.",
"AnonymizeIpInlineHelp": "Anonymisera den sista byten av besökarnas IP-adress för att följa lokala lagar om personlig integritet\/riktlinjer.",
"AnonymizeIpMaskLengtDescription": "Välj hur många bytes av besökares IP-adresser som ska döljas.",
- "AnonymizeIpMaskLength": "%s byte(s) - t.ex. %s",
+ "AnonymizeIpMaskLength": "%1$s byte(s) - t.ex. %2$s",
"CannotLockSoDeleteLogActions": "Tabellen log_action kommer inte att rensas: vänligen lägg till behörigheten LOCK TABLES till MYSQL-användaren '%s'",
"ClickHereSettings": "Klicka här för att komma åt inställningar för %s.",
"CurrentDBSize": "Aktuell databasstorlek",
@@ -12,6 +12,8 @@
"DeleteDataDescription": "Du kan konfigurera Piwik att regelbundet ta bort gamla besöksloggar och\/eller bearbetade rapporter för att behålla din databasstorlek minimal. Om så önskas, kommer inte förbearbetade rapporter tas bort, endast besöks, sidvisnings och konverterings loggdata kommer att raderas. Alternativt kan de förbearbetade rapporterna tas bort och loggdata kan behållas.",
"DeleteDataDescription2": "Om så önskas, så kommer förbehandlade rapporter att sparas, endast logdata för besök, sidvisningar och omvandligar att raderas. Eller, så kan förbehandlade rapporter raderas och logdata sparas.",
"DeleteDataInterval": "Ta bort gamla data varje",
+ "DeleteOldVisitorLogs": "Radera gamla besöksloggar",
+ "DeleteOldArchivedReports": "Ta bort gamla arkiverade rapporter",
"DeleteLogDescription2": "När du aktiverar automatisk radering av loggar, så måste du se till att alla tidigare dagliga rapporter har behandlats så att inga data går förlorade.",
"DeleteLogInfo": "Loggar från följande tabeller kommer att tas bort: %s",
"DeleteLogsConfirm": "Du är på väg att aktivera radering av loggdata. Om gamla loggdata tas bort, och rapporter inte redan har skapats, kommer du inte kunna se historiska förflutna analysdata. Är du säker på att du vill göra detta?",
@@ -19,11 +21,12 @@
"DeleteMaxRows": "Maximalt antal rader som ska tas bort under en körning:",
"DeleteMaxRowsNoLimit": "ingen begränsning",
"DeleteReportsConfirm": "Du är på väg att aktivera radering av loggdata. Om gamla rapporter tas bort, måste du på nytt behandla dem för att visa dem. Är du säker på att du vill göra detta?",
- "DeleteReportsDetailedInfo": "Data från databasens numeriska arkiveringstabeller (%s) och BLOB arkiveringstabeller (%s) kommer att tas bort.",
- "DeleteReportsInfo": "Om aktiverat, så kommer gamla rapporter tas bort. %sVi rekommenderar att du aktiverar detta först när databasutrymmet är begränsat.%s",
+ "DeleteReportsDetailedInfo": "Data från databasens numeriska arkiveringstabeller (%1$s) och BLOB arkiveringstabeller (%2$s) kommer att tas bort.",
+ "DeleteReportsInfo": "Om aktiverat, så kommer gamla rapporter tas bort. %1$sVi rekommenderar att du aktiverar detta först när databasutrymmet är begränsat.%2$s",
"DeleteReportsInfo2": "Om du inte har aktiverat \"%s\", så kommer gamla rapporter att återskapas automatiskt när de efterfrågas.",
"DeleteReportsInfo3": "Om du har aktiverat \"%s\", så kommer uppgifterna att permanent förloras.",
"DeleteReportsOlderThan": "Ta bort rapporter äldre än",
+ "DeleteSchedulingSettings": "Schemalägg radering av gammalt data",
"DeleteDataSettings": "Radera gamla besöksloggar och rapporter från databasen",
"DoNotTrack_Description": "\"Do Not Track\" är en teknologi och policy som tillåter användare att avstå från spårning av webbplatser dom besöker, det inkluderar analystjänster, reklamnätverk och sociala plattformer.",
"DoNotTrack_Disable": "Inaktivera Do Not Track",
@@ -38,6 +41,7 @@
"GeolocationAnonymizeIpNote": "Notera: Geolocation kommer att ha ungefär samma resultat med 1 byte anonymiserad. Med 2 byte eller mer blir Geolocation vara felaktig.",
"GetPurgeEstimate": "Hämta uppskattning för rensning",
"KeepBasicMetrics": "Behåll grundläggande variabler (besök, sidvisningar, studsfrekvens, målomvandlingar, e-handelskonverteringar, etc.)",
+ "KeepDataFor": "Behåll all data för",
"KeepReportSegments": "För behållen data, spara även segmenterade rapporter",
"LastDelete": "Senast borttaget",
"LeastDaysInput": "Vänligen ange ett antal dagar som är större än %s.",
@@ -49,8 +53,8 @@
"PurgingData": "Rensar data...",
"ReportsDataSavedEstimate": "Databasstorlek",
"SaveSettingsBeforePurge": "Du har ändrat inställningarna för radering av loggdata. Spara dem innan du startar en utrensning.",
- "SeeAlsoOurOfficialGuidePrivacy": "Se också vår allmänna guide: %sWeb Analytics Privacy%s",
- "Teaser": "På denna sidan kan du anpassa Piwik så att den personliga integriteten uppfyller existerande lagstiftning, genom att: %s anonymisera besökarens IP%s, %s automatiskt ta bort gamla besöksloggar från databasen %s, och %s erbjuda exkludering av spårning för din webbplats%s.",
+ "SeeAlsoOurOfficialGuidePrivacy": "Se också vår allmänna guide: %1$sWeb Analytics Privacy%2$s",
+ "Teaser": "På denna sidan kan du anpassa Piwik så att den personliga integriteten uppfyller existerande lagstiftning, genom att: %1$s anonymisera besökarens IP%2$s, %3$s automatiskt ta bort gamla besöksloggar från databasen %4$s, och %5$s erbjuda exkludering av spårning för din webbplats%6$s.",
"TeaserHeadline": "Integritetinställningar",
"UseAnonymizedIpForVisitEnrichment": "Använd också de anonyma IP-adresserna för att berika besök.",
"UseAnonymizedIpForVisitEnrichmentNote": "Plugin som Geo Location via IP adress och leverantör förbättrar dina användares metadat. För att standardisera dessa plugins använder du en anonyma IP adresser. Om du väljer \"Nej\", kommer den icke-anonyma fullständiga IP adressen att användas istället. Det kommer göra att du är mindre privat, men du kommer få en mer exakt data",
diff --git a/plugins/PrivacyManager/lang/th.json b/plugins/PrivacyManager/lang/th.json
index e24a46ef83aee4974bd3b502064f4149e5c761fd..a6f5d06cae23875e99a10098bef5b37da54f0d4d 100644
--- a/plugins/PrivacyManager/lang/th.json
+++ b/plugins/PrivacyManager/lang/th.json
@@ -14,7 +14,7 @@
"PurgeNow": "ล้างข้à¸à¸¡à¸¹à¸¥à¹ƒà¸™à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥à¸•à¸à¸™à¸™à¸µà¹‰à¹€à¸¥à¸¢",
"PurgingData": "à¸à¸³à¸¥à¸±à¸‡à¸¥à¹‰à¸²à¸‡à¸‚้à¸à¸¡à¸¹à¸¥...",
"ReportsDataSavedEstimate": "ขนาดà¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥",
- "Teaser": "ในหน้านี้ คุณสามารถปรับà¹à¸•à¹ˆà¸‡ Piwik เพื่à¸à¹ƒà¸«à¹‰à¸ªà¸à¸”คล้à¸à¸‡à¸à¸±à¸šà¸„วามเป็นส่วนตัวตามà¸à¸Žà¸«à¸¡à¸²à¸¢à¸—ี่มีà¸à¸¢à¸¹à¹ˆà¹‚ดย: %s ผู้เข้าชมà¹à¸šà¸šà¹„ม่ระบุ IP %s, %s จะลบไฟบ์บันทึà¸à¹‚ดยà¸à¸±à¸•à¹‚นมัติขà¸à¸‡à¸à¸²à¸£à¹€à¸‚้าเยี่ยมชมเà¸à¹ˆà¸²à¸ˆà¸²à¸à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ %s à¹à¸¥à¸° %s à¸à¸²à¸£à¹ƒà¸«à¹‰à¸à¸¥à¹„à¸à¸à¸²à¸£à¸à¸à¸à¹à¸šà¸šà¸ªà¸³à¸«à¸£à¸±à¸šà¹€à¸§à¹‡à¸šà¹„ซต์ขà¸à¸‡à¸„ุณ %s",
+ "Teaser": "ในหน้านี้ คุณสามารถปรับà¹à¸•à¹ˆà¸‡ Piwik เพื่à¸à¹ƒà¸«à¹‰à¸ªà¸à¸”คล้à¸à¸‡à¸à¸±à¸šà¸„วามเป็นส่วนตัวตามà¸à¸Žà¸«à¸¡à¸²à¸¢à¸—ี่มีà¸à¸¢à¸¹à¹ˆà¹‚ดย: %1$s ผู้เข้าชมà¹à¸šà¸šà¹„ม่ระบุ IP %2$s, %3$s จะลบไฟบ์บันทึà¸à¹‚ดยà¸à¸±à¸•à¹‚นมัติขà¸à¸‡à¸à¸²à¸£à¹€à¸‚้าเยี่ยมชมเà¸à¹ˆà¸²à¸ˆà¸²à¸à¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ %4$s à¹à¸¥à¸° %5$s à¸à¸²à¸£à¹ƒà¸«à¹‰à¸à¸¥à¹„à¸à¸à¸²à¸£à¸à¸à¸à¹à¸šà¸šà¸ªà¸³à¸«à¸£à¸±à¸šà¹€à¸§à¹‡à¸šà¹„ซต์ขà¸à¸‡à¸„ุณ %6$s",
"TeaserHeadline": "à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าความเป็นส่วนตัว",
"UseAnonymizeIp": "ผู้เข้าชมà¹à¸šà¸šà¹„ม่ระบุที่à¸à¸¢à¸¹à¹ˆ IP"
}
diff --git a/plugins/PrivacyManager/lang/tl.json b/plugins/PrivacyManager/lang/tl.json
index d20109346fe8ff0196eec6c27255b9ea5990b614..96973bb979974f8fd98efba3bad803790ddcce16 100644
--- a/plugins/PrivacyManager/lang/tl.json
+++ b/plugins/PrivacyManager/lang/tl.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "Piliin ang \" Oo \" kung gusto mong hindi subaybayan ng Piwik ang ganap na kwalipikadong IP-address.",
"AnonymizeIpInlineHelp": "E-Anonymize ang huling byte ng IP address ng iyong mga bisita upang sumunod sa iyong mga alituntuning local at privacy.",
"AnonymizeIpMaskLengtDescription": "Piliin kung gaano karaming byte ng IP ng bisita ang dapat na ikubli.",
- "AnonymizeIpMaskLength": "%s (na) byte - hal %s",
+ "AnonymizeIpMaskLength": "%1$s (na) byte - hal %2$s",
"CannotLockSoDeleteLogActions": "Ang log_action table ay hindi maaring dayain: mangyaring magbigay ng pribilehiyo upang maisagawa ang LOCK TABLES sa '%s' MYSQL user.",
"ClickHereSettings": "Mag-click dito upang i-access ang mga setting sa %s.",
"CurrentDBSize": "Kasalukuyang laki ng database",
@@ -19,8 +19,8 @@
"DeleteMaxRows": "Pinakamataas na bilang ng mga hilera na tatanggalin sa isang pagtakbo:",
"DeleteMaxRowsNoLimit": "walang limitasyon",
"DeleteReportsConfirm": "Iyong papaganahin ang pag tanggal sa datus ng ulat. Kung ang matatagal ng ulat ay natanggal Kailangan mong ulitin ang mga ito upang makita. Gustomo mo bang gawin ito?",
- "DeleteReportsDetailedInfo": "Ang data mula sa database numeric archive tables (%s) at blob archive tables (%s) ay tinanggal.",
- "DeleteReportsInfo": "Kung gumagana ang mga lumang ulat ay mabubura. %s Aming inirerekomenda na itoy paganahin lamang kung ang iyong database ay may limitadong espasyo %s.",
+ "DeleteReportsDetailedInfo": "Ang data mula sa database numeric archive tables (%1$s) at blob archive tables (%2$s) ay tinanggal.",
+ "DeleteReportsInfo": "Kung gumagana ang mga lumang ulat ay mabubura. %1$s Aming inirerekomenda na itoy paganahin lamang kung ang iyong database ay may limitadong espasyo %2$s.",
"DeleteReportsInfo2": "Kung hindi mo pinagana ang \"%s\" mga lumang ulat ay awtomatikong magagawa muli kapag iyong ni-request.",
"DeleteReportsInfo3": "Kapag in-enable mo ang \"%s\" and data ay permanenteng mawawala.",
"DeleteReportsOlderThan": "Tanggalin ang mga lumang ulat na hihigit sa",
@@ -48,7 +48,8 @@
"PurgingData": "Purging data...",
"ReportsDataSavedEstimate": "Laki ng database",
"SaveSettingsBeforePurge": "Iyong binago ang mga setting ng pagtanggal ng data. Mangyaring i-save ang mga ito bago simulan ang isang pag purge.",
- "SeeAlsoOurOfficialGuidePrivacy": "Tingnan din ang aming opisyal na gabay: %s Privacy Web Analytics %s",
+ "SeeAlsoOurOfficialGuidePrivacy": "Tingnan din ang aming opisyal na gabay: %1$s Privacy Web Analytics %2$s",
+ "Teaser": "Sa pahinang ito maaari mong i-customize ang Piwik upang gawin itong privacy na sumusunod na mga legislations sa: %1$s anonymizing the visitor IP%2$s %3$s awtomatikong mga mag-alis ng lumang mga log ng bisita mula sa database %4$s at %5$s magbibigay ng isang mechanism sa Pag-opt-out para sa iyong website %6$s.",
"TeaserHeadline": "Mga setting ng privacy",
"UseAnonymizedIpForVisitEnrichment": "Gamitin rin ang hindi kilalang IP address kapag bumibisita.",
"UseAnonymizedIpForVisitEnrichmentNote": "Plugis tulad ng Geo Location sa pamamagitang ng IP at Provider ay pinagbuti ang metadata ng mga bumibisita. Sa una ang plugins na ito ay gumagamit ng anonymized IP addresses. Kapag iyong pinili ang 'No' pagkatapos ay ang non-anonymized na IP address ay syang magagamit na mag-reresulta ng may mababang privacy ngunit mas mahusay at tiyak na data.",
diff --git a/plugins/PrivacyManager/lang/vi.json b/plugins/PrivacyManager/lang/vi.json
index 8f92957a93284986fb1ca20a842496a328ed18d7..51f53b67b06eb80ee1506e2b3f7fe480e000fcc5 100644
--- a/plugins/PrivacyManager/lang/vi.json
+++ b/plugins/PrivacyManager/lang/vi.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "Chá»n \"Äồng ý\" nếu bạn muốn Piwik không theo dõi toà n bá»™ địa chỉ IP.",
"AnonymizeIpInlineHelp": "Là m ẩn danh những byte(s) cuối trên địa chỉ IP của khách để tuân thủ quy định\/luáºt ná»™i bá»™ vá» quyá»n riêng tÆ°.",
"AnonymizeIpMaskLengtDescription": "Chá»n bao nhiêu byte IPs của khách truy cáºp nên giấu.",
- "AnonymizeIpMaskLength": "%s byte(s) - và dụ %s.",
+ "AnonymizeIpMaskLength": "%1$s byte(s) - và dụ %2$s.",
"CannotLockSoDeleteLogActions": "Bảng log_action sẽ không được thanh lá»c: xin cấp đặc quyá»n LOCK TABLES cho '%s' ngÆ°á»i sá» dụng MySQL.",
"ClickHereSettings": "Click chuá»™t tại đây để truy cáºp các cà i đặt %s.",
"CurrentDBSize": "KÃch thÆ°á»›c cÆ¡ sở dữ liệu hiện tại",
@@ -19,8 +19,8 @@
"DeleteMaxRows": "Số hà ng lớn nhất phải xóa trong mỗi lần chạy:",
"DeleteMaxRowsNoLimit": "không giới hạn",
"DeleteReportsConfirm": "Bạn muốn cho phép xóa dữ liệu báo cáo. Nếu báo cáo cÅ© được loại bá», bạn sẽ phải xá» lý lại chúng theo thứ tá»± xem. Bạn có chắc bạn muốn là m Ä‘iá»u nà y?",
- "DeleteReportsDetailedInfo": "Dữ liệu từ các bảng lưu trữ cơ sở dữ liệu số(%s) và các bảng lưu trữ blob(%s) sẽ được xóa.",
- "DeleteReportsInfo": "Nếu được kÃch hoạt, các báo cáo cÅ© sẽ được xóa bá». %s Chúng tôi Ä‘á» nghị chỉ cho phép khi không gian cÆ¡ sở dữ liệu của bạn đã được hạn chế. %s",
+ "DeleteReportsDetailedInfo": "Dữ liệu từ các bảng lưu trữ cơ sở dữ liệu số(%1$s) và các bảng lưu trữ blob(%2$s) sẽ được xóa.",
+ "DeleteReportsInfo": "Nếu được kÃch hoạt, các báo cáo cÅ© sẽ được xóa bá». %1$s Chúng tôi Ä‘á» nghị chỉ cho phép khi không gian cÆ¡ sở dữ liệu của bạn đã được hạn chế. %2$s",
"DeleteReportsInfo2": "Nếu bạn không kÃch hoạt \"%s\", báo cáo cÅ© sẽ được tái tạo tá»± Ä‘á»™ng khi có yêu cầu.",
"DeleteReportsInfo3": "Nếu bạn đã kÃch hoạt \"%s\", dữ liệu sẽ bị mất vÄ©nh viá»…n.",
"DeleteReportsOlderThan": "Xóa báo cáo cũ hơn",
diff --git a/plugins/PrivacyManager/lang/zh-cn.json b/plugins/PrivacyManager/lang/zh-cn.json
index d252bfe7d7a4b23bc63989b7be3c7a8c7ff4f835..6b553c7a0c49fc6738431acfde6abf98f95b6691 100644
--- a/plugins/PrivacyManager/lang/zh-cn.json
+++ b/plugins/PrivacyManager/lang/zh-cn.json
@@ -3,7 +3,7 @@
"AnonymizeIpDescription": "如果希望 Piwik ä¸è¦ç»Ÿè®¡å®Œæ•´çš„ IP 地å€ï¼Œè¯·é€‰æ‹© \"是\"",
"AnonymizeIpInlineHelp": "éšè—访客IPä½å€æœ€åŽä¸€ä¸ªå—符以符åˆæ‚¨å½“地的éšç§æ¡ä¾‹\/政ç–。",
"AnonymizeIpMaskLengtDescription": "éšè—的访客IPçš„å—节数",
- "AnonymizeIpMaskLength": "%s å—节 - 例如 %s",
+ "AnonymizeIpMaskLength": "%1$s å—节 - 例如 %2$s",
"CannotLockSoDeleteLogActions": "log_action 表将ä¸ä¼šè¢«æ¸…空: 请设置 LOCK TABLES çš„æƒé™ç»™ '%s' MYSQL 用户。",
"ClickHereSettings": "点这里查看 %s 设置。",
"CurrentDBSize": "当å‰æ•°æ®åº“大å°",
@@ -19,8 +19,8 @@
"DeleteMaxRows": "æ¯æ¬¡è¿è¡Œæœ€å¤šåˆ 除的行数:",
"DeleteMaxRowsNoLimit": "没有é™åˆ¶",
"DeleteReportsConfirm": "您æ£è¦å¯ç”¨æŠ¥è¡¨æ•°æ®åˆ é™¤ã€‚å¦‚æžœåˆ é™¤äº†æ—§çš„æŠ¥è¡¨ï¼Œä¸‹æ¬¡æŸ¥çœ‹å‰éœ€è¦é‡æ–°ç”Ÿæˆï¼Œæ‚¨ç¡®è®¤è¦è¿™ä¹ˆåšå—？",
- "DeleteReportsDetailedInfo": "æ•°æ®åº“ numeric å˜æ¡£è¡¨ (%s) å’Œ blob å˜æ¡£è¡¨ (%s) çš„æ•°æ®å°†è¢«åˆ 除。",
- "DeleteReportsInfo": "å¯ç”¨åŽï¼Œæ—§çš„æŠ¥è¡¨å°†è¢«åˆ é™¤ã€‚%s建议仅在数æ®åº“空间有é™çš„情况下å¯ç”¨ã€‚%s",
+ "DeleteReportsDetailedInfo": "æ•°æ®åº“ numeric å˜æ¡£è¡¨ (%1$s) å’Œ blob å˜æ¡£è¡¨ (%2$s) çš„æ•°æ®å°†è¢«åˆ 除。",
+ "DeleteReportsInfo": "å¯ç”¨åŽï¼Œæ—§çš„æŠ¥è¡¨å°†è¢«åˆ é™¤ã€‚%1$s建议仅在数æ®åº“空间有é™çš„情况下å¯ç”¨ã€‚%2$s",
"DeleteReportsInfo2": "如果还没有å¯ç”¨ \"%s\", 访问旧的报表时将会自动é‡å»ºã€‚",
"DeleteReportsInfo3": "如果已å¯ç”¨ \"%s\", æ•°æ®å°†è¢«å½»åº•åˆ 除。",
"DeleteReportsOlderThan": "åˆ é™¤æŠ¥è¡¨è¶…è¿‡",
@@ -49,7 +49,7 @@
"PurgingData": "清ç†æ•°æ®...",
"ReportsDataSavedEstimate": "æ•°æ®åº“大å°",
"SaveSettingsBeforePurge": "您修改了数æ®åˆ 除选项，请ä¿å˜åŽå†å¼€å§‹åˆ 除。",
- "Teaser": "在本页é¢å¯ä»¥è®¾ç½® Piwik 符åˆçŽ°æœ‰çš„éšç§ä¿æŠ¤æ³•è§„: %s éšè—访客的 IP 地å€%s, %s 自动从数æ®åº“åˆ é™¤æ—§çš„è®¿é—®æ—¥å¿—%s, 并且 %s 在网站æ供主动退出机制%s。",
+ "Teaser": "在本页é¢å¯ä»¥è®¾ç½® Piwik 符åˆçŽ°æœ‰çš„éšç§ä¿æŠ¤æ³•è§„: %1$s éšè—访客的 IP 地å€%2$s, %3$s 自动从数æ®åº“åˆ é™¤æ—§çš„è®¿é—®æ—¥å¿—%4$s, 并且 %5$s 在网站æ供主动退出机制%6$s。",
"TeaserHeadline": "éšç§è®¾ç½®",
"UseAnonymizedIpForVisitEnrichment": "å½“ä½¿è®¿é—®æ›´åŠ ä¸°å¯Œæ—¶ä¹Ÿä½¿ç”¨åŒ¿åIP地å€ã€‚",
"UseAnonymizedIpForVisitEnrichmentNote": "例如通过IPå’Œæ供商的Geo定ä½ç‰æ’件æ供了关于访问者的更多数æ®ã€‚在默认情况下，这些æ’件都使用匿åIP地å€ã€‚å¦‚æžœä½ é€‰æ‹©â€œNOâ€ï¼Œé‚£ä¹ˆå°†ä½¿ç”¨éžåŒ¿å的整个IP地å€ï¼Œä»Žè€Œå¯ä»¥å¾—到更准确的数æ®ï¼Œä½†æ˜¯é€éœ²äº†æ›´å¤šçš„ç§æœ‰ä¿¡æ¯ã€‚",
diff --git a/plugins/Provider/lang/sv.json b/plugins/Provider/lang/sv.json
index 007c9bbf07d963f6794c58ac8e7a8870f8f6a426..3f908b1fb07b40c7bcd59344b0960b8cc2359c3d 100644
--- a/plugins/Provider/lang/sv.json
+++ b/plugins/Provider/lang/sv.json
@@ -1,6 +1,7 @@
{
"Provider": {
"ColumnProvider": "Internetleverantör",
+ "PluginDescription": "Rapporterar besökarnas Internetleverantör.",
"ProviderReportDocumentation": "Denna rapport visar vilka Internetleverantörer dina besökare använde för att få åtkomst till webbplatsen. Du kan klicka på en leverantörs namn för mer information. %s Om Piwik inte kan avgöra en besökares leverantör, så listas den som IP.",
"WidgetProviders": "Internetleverantör"
}
diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking
index 8aa8c0735c481a7355d69f99374ea7726d2f73c2..5277167591c602d88ae8f4b065a314e670e0814f 160000
--- a/plugins/QueuedTracking
+++ b/plugins/QueuedTracking
@@ -1 +1 @@
-Subproject commit 8aa8c0735c481a7355d69f99374ea7726d2f73c2
+Subproject commit 5277167591c602d88ae8f4b065a314e670e0814f
diff --git a/plugins/Referrers/API.php b/plugins/Referrers/API.php
index befd651fbee27be31c1e5fa2d005e1f9c104f310..40286cd86b7c68bbac0a83bd2d0ba2073440d5f0 100644
--- a/plugins/Referrers/API.php
+++ b/plugins/Referrers/API.php
@@ -106,6 +106,15 @@ class API extends \Piwik\Plugin\API
// set subtable IDs for each row to the label (which holds the int referrer type)
$dataTable->filter('Piwik\Plugins\Referrers\DataTable\Filter\SetGetReferrerTypeSubtables', array($idSite, $period, $date, $segment, $expanded));
+ $dataTable->filter('AddSegmentByLabelMapping', array(
+ 'referrerType',
+ array(
+ Common::REFERRER_TYPE_DIRECT_ENTRY => 'direct',
+ Common::REFERRER_TYPE_CAMPAIGN => 'campaign',
+ Common::REFERRER_TYPE_SEARCH_ENGINE => 'search',
+ Common::REFERRER_TYPE_WEBSITE => 'website',
+ )
+ ));
// set referrer type column to readable value
$dataTable->queueFilter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getReferrerTypeLabel'));
@@ -218,9 +227,12 @@ class API extends \Piwik\Plugin\API
public function getSearchEnginesFromKeywordId($idSite, $period, $date, $idSubtable, $segment = false)
{
$dataTable = $this->getDataTable(Archiver::KEYWORDS_RECORD_NAME, $idSite, $period, $date, $segment, $expanded = false, $idSubtable);
+ $keywords = $this->getKeywords($idSite, $period, $date, $segment);
+ $keyword = $keywords->getRowFromIdSubDataTable($idSubtable)->getColumn('label');
- $keywords = $this->getKeywords($idSite, $period, $date, $segment);
$dataTable->filter('Piwik\Plugins\Referrers\DataTable\Filter\SearchEnginesFromKeywordId', array($keywords, $idSubtable));
+ $dataTable->filter('AddSegmentByLabel', array('referrerName'));
+ $dataTable->queueFilter('PrependSegment', array('referrerKeyword=='.$keyword.';referrerType==search;'));
return $dataTable;
}
@@ -250,8 +262,11 @@ class API extends \Piwik\Plugin\API
// get the search engine and create the URL to the search result page
$searchEngines = $this->getSearchEngines($idSite, $period, $date, $segment);
$searchEngines->applyQueuedFilters();
+ $searchEngine = $searchEngines->getRowFromIdSubDataTable($idSubtable)->getColumn('label');
$dataTable->filter('Piwik\Plugins\Referrers\DataTable\Filter\KeywordsFromSearchEngineId', array($searchEngines, $idSubtable));
+ $dataTable->filter('AddSegmentByLabel', array('referrerKeyword'));
+ $dataTable->queueFilter('PrependSegment', array('referrerName=='.$searchEngine.';referrerType==search;'));
return $dataTable;
}
@@ -268,7 +283,13 @@ class API extends \Piwik\Plugin\API
public function getKeywordsFromCampaignId($idSite, $period, $date, $idSubtable, $segment = false)
{
+ $campaigns = $this->getCampaigns($idSite, $period, $date, $segment);
+ $campaigns->applyQueuedFilters();
+ $campaign = $campaigns->getRowFromIdSubDataTable($idSubtable)->getColumn('label');
+
$dataTable = $this->getDataTable(Archiver::CAMPAIGNS_RECORD_NAME, $idSite, $period, $date, $segment, $expanded = false, $idSubtable);
+ $dataTable->filter('AddSegmentByLabel', array('referrerKeyword'));
+ $dataTable->queueFilter('PrependSegment', array('referrerName=='.$campaign.';referrerType==campaign;'));
return $dataTable;
}
@@ -289,6 +310,7 @@ class API extends \Piwik\Plugin\API
{
$dataTable = $this->getDataTable(Archiver::WEBSITES_RECORD_NAME, $idSite, $period, $date, $segment, $expanded = false, $idSubtable);
$dataTable->filter('Piwik\Plugins\Referrers\DataTable\Filter\UrlsFromWebsiteId');
+ $dataTable->filter('AddSegmentByLabel', array('referrerUrl'));
return $dataTable;
}
@@ -369,6 +391,7 @@ class API extends \Piwik\Plugin\API
// merge the datatable's subtables which contain the individual URLs
$dataTable = $dataTable->mergeSubtables();
+ $dataTable->filter('AddSegmentByLabel', array('referrerUrl'));
$dataTable->filter('Piwik\Plugins\Referrers\DataTable\Filter\UrlsForSocial', array($expanded));
return $dataTable;
diff --git a/plugins/Referrers/lang/be.json b/plugins/Referrers/lang/be.json
index 8e16e706e64ba83340a607f0aba6d8bef3856217..d0fe396c85dc817e16cc8338a620f735483d7281 100644
--- a/plugins/Referrers/lang/be.json
+++ b/plugins/Referrers/lang/be.json
@@ -1,8 +1,8 @@
{
"Referrers": {
"Campaigns": "Кампаніі",
- "CampaignsDocumentation": "Ðаведвальнікі, ÑÐºÑ–Ñ Ð¿Ñ€Ñ‹Ð¹ÑˆÐ»Ñ– на ваш Ñайт у выніку кампаніі. %s ГлÑдзі %s Ñправаздачу Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆ падрабÑзнай інфармацыі.",
- "CampaignsReportDocumentation": "ГÑÑ‚Ð°Ñ Ñправаздача паказвае, ÑÐºÑ–Ñ ÐºÐ°Ð¼Ð¿Ð°Ð½Ñ–Ñ– ÑпаÑлалі наведвальнікаў на ваш Ñайт. %s Ð”Ð»Ñ Ð°Ñ‚Ñ€Ñ‹Ð¼Ð°Ð½Ð½Ñ Ð´Ð°Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð°Ð¹ інфармацыі аб кампаніі, чытайце %sДакументацыю па кампаніÑÑ… на piwik.org%s",
+ "CampaignsDocumentation": "Ðаведвальнікі, ÑÐºÑ–Ñ Ð¿Ñ€Ñ‹Ð¹ÑˆÐ»Ñ– на ваш Ñайт у выніку кампаніі. %1$s ГлÑдзі %2$s Ñправаздачу Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆ падрабÑзнай інфармацыі.",
+ "CampaignsReportDocumentation": "ГÑÑ‚Ð°Ñ Ñправаздача паказвае, ÑÐºÑ–Ñ ÐºÐ°Ð¼Ð¿Ð°Ð½Ñ–Ñ– ÑпаÑлалі наведвальнікаў на ваш Ñайт. %1$s Ð”Ð»Ñ Ð°Ñ‚Ñ€Ñ‹Ð¼Ð°Ð½Ð½Ñ Ð´Ð°Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð°Ð¹ інфармацыі аб кампаніі, чытайце %2$sДакументацыю па кампаніÑÑ… на piwik.org%3$s",
"ColumnCampaign": "КампаніÑ",
"ColumnSearchEngine": "ÐŸÐ¾ÑˆÑƒÐºÐ°Ð²Ð°Ñ ÑÑ–ÑÑ‚Ñма",
"ColumnWebsite": "Ð’Ñб-Ñайт",
@@ -21,7 +21,7 @@
"ReferrerName": "Ð†Ð¼Ñ ÑпаÑыльніка",
"Referrers": "СпаÑыльнікі",
"SearchEngines": "ÐŸÐ¾ÑˆÑƒÐºÐ°Ð²Ñ‹Ñ ÑÑ–ÑÑ‚Ñмы",
- "SearchEnginesDocumentation": "Ðаведвальнік ÑпаÑланы на ваш вÑб-Ñайт пошукавай ÑÑ–ÑÑ‚Ñмай. %s ГлÑдзі %s Ñправаздачу Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆ падрабÑзнай інфармацыі.",
+ "SearchEnginesDocumentation": "Ðаведвальнік ÑпаÑланы на ваш вÑб-Ñайт пошукавай ÑÑ–ÑÑ‚Ñмай. %1$s ГлÑдзі %2$s Ñправаздачу Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆ падрабÑзнай інфармацыі.",
"SearchEnginesReportDocumentation": "ГÑÑ‚Ð°Ñ Ñправаздача паказвае, ÑÐºÑ–Ñ Ð¿Ð¾ÑˆÑƒÐºÐ°Ð²Ñ‹Ñ ÑÑ–ÑÑ‚Ñмы ÑпаÑылаюць карыÑтальнікаў на ваш вÑб-Ñайт. %s Пры націÑку на радок табліцы, можна ўбачыць, ÑÐºÑ–Ñ ÐºÐ°Ñ€Ñ‹Ñтальнікі шукалі з дапамогай Ñкой пошукавай ÑÑ–ÑÑ‚Ñмы.",
"SubmenuSearchEngines": "ÐŸÐ¾ÑˆÑƒÐºÐ°Ð²Ñ‹Ñ ÑÑ–ÑÑ‚Ñмы Ñ– ключавые Ñловы",
"SubmenuWebsites": "Ð’Ñб-Ñайты",
@@ -33,7 +33,7 @@
"TypeWebsites": "%s уваходаў з вÑб-Ñайтаў",
"UsingNDistinctUrls": "(з выкарыÑтаннем %s розных URL-адраÑоў)",
"Websites": "Ð’Ñб-Ñайты",
- "WebsitesDocumentation": "Ðаведвальнік перайшоў па ÑпаÑылцы на іншы Ñайце, Ñкі прывёў да вашага Ñайту. %s ГлÑдзі %s Ñправаздачу Ð´Ð»Ñ Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆ падрабÑзнай інфармацыі.",
+ "WebsitesDocumentation": "Ðаведвальнік перайшоў па ÑпаÑылцы на іншы Ñайце, Ñкі прывёў да вашага Ñайту. %1$s ГлÑдзі %2$s Ñправаздачу Ð´Ð»Ñ Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆ падрабÑзнай інфармацыі.",
"WebsitesReportDocumentation": "У гÑтай табліцы вы можаце ўбачыць, ÑÐºÑ–Ñ Ñайты ÑпаÑылалі наведвальнікаў на ваш Ñайт. %s Пры націÑку на радок табліцы, можна ўбачыць URL Ñтаронкак, ÑÐºÑ–Ñ ÑžÑ‚Ñ€Ñ‹Ð¼Ð»Ñ–Ð²Ð°ÑŽÑ†ÑŒ ÑпаÑылкі на на ваш вÑб-Ñайт.",
"WidgetExternalWebsites": "Ð¡Ð¿Ñ–Ñ Ð²Ð¾Ð½ÐºÐ°Ð²Ñ‹Ñ… вÑбÑайтаў"
}
diff --git a/plugins/Referrers/lang/bg.json b/plugins/Referrers/lang/bg.json
index 886aaa52a30a15d062a687a21027f59e3e617001..1f370a56272bc05cc2a69a68a09291c454fc6b0f 100644
--- a/plugins/Referrers/lang/bg.json
+++ b/plugins/Referrers/lang/bg.json
@@ -1,8 +1,8 @@
{
"Referrers": {
"Campaigns": "Кампании",
- "CampaignsDocumentation": "ПоÑетители, дошли до вашиÑÑ‚ уеб Ñайт, в резултат на каманиÑ. %s Погледнете %s отчета за повече детайли.",
- "CampaignsReportDocumentation": "Този отчет показва кои кампании Ñа довели поÑетители до вашиÑÑ‚ уеб Ñайт. %s За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñно проÑледÑването на кампании, прочетете %sдокументациÑта за кампании на piwik.org%s",
+ "CampaignsDocumentation": "ПоÑетители, дошли до вашиÑÑ‚ уеб Ñайт, в резултат на каманиÑ. %1$s Погледнете %2$s отчета за повече детайли.",
+ "CampaignsReportDocumentation": "Този отчет показва кои кампании Ñа довели поÑетители до вашиÑÑ‚ уеб Ñайт. %1$s За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð½Ð¾Ñно проÑледÑването на кампании, прочетете %2$sдокументациÑта за кампании на piwik.org%3$s",
"ColumnCampaign": "Кампании",
"ColumnSearchEngine": "ТърÑещи машини",
"ColumnSocial": "Социална мрежа",
@@ -24,7 +24,7 @@
"Referrers": "Референции",
"ReferrersOverview": "Преглед на препоръчителите",
"SearchEngines": "ТърÑачки",
- "SearchEnginesDocumentation": "ПоÑетител, който е бил препратен към вашиÑÑ‚ уеб Ñайт от Ñ‚ÑŠÑ€Ñачка. %s Погледнете %s отчета за повече детайли.",
+ "SearchEnginesDocumentation": "ПоÑетител, който е бил препратен към вашиÑÑ‚ уеб Ñайт от Ñ‚ÑŠÑ€Ñачка. %1$s Погледнете %2$s отчета за повече детайли.",
"SearchEnginesReportDocumentation": "Този отчет показва кои Ñ‚ÑŠÑ€Ñачки Ñа изпратили потребители към вашиÑÑ‚ уеб Ñайт. %s Ðко кликнете върху реда в таблицата, можете да видите какво потребителите Ñа Ñ‚ÑŠÑ€Ñили в конкретната Ñ‚ÑŠÑ€Ñачка.",
"Socials": "Социални мрежи",
"SubmenuSearchEngines": "ТърÑачки & Ключови думи",
@@ -39,7 +39,7 @@
"ViewAllReferrers": "Преглед на вÑички препоръчители",
"ViewReferrersBy": "Преглед на вÑички препоръчители по %s",
"Websites": "Сайтове",
- "WebsitesDocumentation": "ПоÑетителÑÑ‚ е поÑледвал връзка в друг Ñайт, коÑто Ñочи към Ð²Ð°ÑˆÐ¸Ñ Ñайт. %s Вижте %s отчета за повече детайли.",
+ "WebsitesDocumentation": "ПоÑетителÑÑ‚ е поÑледвал връзка в друг Ñайт, коÑто Ñочи към Ð²Ð°ÑˆÐ¸Ñ Ñайт. %1$s Вижте %2$s отчета за повече детайли.",
"WebsitesReportDocumentation": "Ð’ тази таблица, можете да видите кои уеб Ñайтове Ñа препратили поÑетители към вашиÑÑ‚ Ñайт. %s Ðко кликнете върху реда в таблицата, можете да видите URL-ите, чрез които потребителите Ñа Ñтигнали до вашиÑÑ‚ Ñайт.",
"WidgetExternalWebsites": "Външни Ñайтове",
"WidgetGetAll": "Ð’Ñички препоръчители",
diff --git a/plugins/Referrers/lang/ca.json b/plugins/Referrers/lang/ca.json
index 28b8aacfec395276c0969ba658e7b024e138809a..c0782033317862b9db404c7a7215918383c9b7d9 100644
--- a/plugins/Referrers/lang/ca.json
+++ b/plugins/Referrers/lang/ca.json
@@ -1,8 +1,8 @@
{
"Referrers": {
"Campaigns": "Campanyes",
- "CampaignsDocumentation": "Visitants que visiten el vostre lloc web com a resultat d'una campanya. %s Visualitzeu l'inforrme %s per més detalls.",
- "CampaignsReportDocumentation": "Aquest informe mostra quines campanyes han portat visitants al vostre lloc web. %s Per mes informació sobre la gestió de campanyes, llegiu la %s documetnació de campanyes a piwik.org %s",
+ "CampaignsDocumentation": "Visitants que visiten el vostre lloc web com a resultat d'una campanya. %1$s Visualitzeu l'inforrme %2$s per més detalls.",
+ "CampaignsReportDocumentation": "Aquest informe mostra quines campanyes han portat visitants al vostre lloc web. %1$s Per mes informació sobre la gestió de campanyes, llegiu la %2$s documetnació de campanyes a piwik.org %3$s",
"ColumnCampaign": "Campanya",
"ColumnSearchEngine": "Cercador",
"ColumnSocial": "Xarxa social",
@@ -25,7 +25,7 @@
"ReferrersOverview": "Resum dels referents",
"ReferrerTypes": "Tipus de referent",
"SearchEngines": "Cercadors",
- "SearchEnginesDocumentation": "Un visitant ha vingut al vostre lloc web a través d'un navegador web. %s Visualitzeu l'informe %s per a més informació.",
+ "SearchEnginesDocumentation": "Un visitant ha vingut al vostre lloc web a través d'un navegador web. %1$s Visualitzeu l'informe %2$s per a més informació.",
"SearchEnginesReportDocumentation": "Aquest informa mostra quins motors de cerca han portat usuaris al vostre lloc web. %s Clicant en una fila de la tabla, pedeu veureu que han estat cercant els vostres usuris en aquest lloc web.",
"SocialFooterMessage": "Aquest és un subconjunt del l'informe de llocs web de l'esquerra. Filtra la informació d'altres llocs web aixà podeu comparar els referents de xarxes socials directament.",
"Socials": "Xarxes socials",
@@ -42,7 +42,7 @@
"ViewAllReferrers": "Veure tots els referents",
"ViewReferrersBy": "Veure els referents agrupats per %s",
"Websites": "Llocs",
- "WebsitesDocumentation": "Els visitant ha seguit un enllaç en un altre lloc web que ha portat al vostre lloc web. %s Visualitzeu l'informe %s per a més detalls.",
+ "WebsitesDocumentation": "Els visitant ha seguit un enllaç en un altre lloc web que ha portat al vostre lloc web. %1$s Visualitzeu l'informe %2$s per a més detalls.",
"WebsitesReportDocumentation": "En aquesta taula podeu observar quins llocs web han portat visitants al vostre lloc web. %s Cliqueu en una fila de la taule per veure les URL dels enllaços a les vostres pà gines.",
"WidgetExternalWebsites": "Llistat de llocs web externs",
"WidgetGetAll": "Tots els referents",
diff --git a/plugins/Referrers/lang/cs.json b/plugins/Referrers/lang/cs.json
index 052a054161bb1ede3f343ce1ad672fe4d23a865a..53188d8dafa30314bcb0583a0c29c0baafff1246 100644
--- a/plugins/Referrers/lang/cs.json
+++ b/plugins/Referrers/lang/cs.json
@@ -1,14 +1,14 @@
{
"Referrers": {
- "AllReferrersReportDocumentation": "Toto hlášenà zobrazuje vÅ¡echny referrery v jednom uceleném hlášenÃ, kde zobrazuje vÅ¡echny webové stránky, klÃÄová slova a kampanÄ›, které vaÅ¡i návÅ¡tÄ›vnÃci pÅ™i hledánà vaÅ¡ich webových stránek použili.",
+ "AllReferrersReportDocumentation": "Toto hlášenà zobrazuje vÅ¡echny odkazujÃcà stránky v jednom uceleném hlášenà s výpisem vÅ¡ech webů, klÃÄových slov a kampanà použitých návÅ¡tÄ›vnÃky k nalezenà vaÅ¡eho webu.",
"Campaigns": "KampanÄ›",
- "CampaignsDocumentation": "NávÅ¡tÄ›vnÃci, kteřà pÅ™iÅ¡li na vaÅ¡e webové stránky jako výsledek kampanÄ›. %s Pro vÃce informacà si prohlédnÄ›te hlášenà %s.",
- "CampaignsReportDocumentation": "Toto hlášenà zobrazuje, které kampanÄ› pÅ™ivedly návÅ¡tÄ›vnÃky na vaÅ¡e stránky. %s Pro vÃce informacà o sledovánà kampanà si %spÅ™eÄtÄ›te dokumentaci kampanà na piwik.org%s.",
+ "CampaignsDocumentation": "NávÅ¡tÄ›vnÃci, kteřà pÅ™iÅ¡li na váš web jako výsledek kampanÄ›. %1$s Pro vÃce informacà si prohlédnÄ›te hlášenà %2$s.",
+ "CampaignsReportDocumentation": "Toto hlášenà zobrazuje, které kampanÄ› pÅ™ivedly návÅ¡tÄ›vnÃky na vaÅ¡e stránky. %1$s Pro vÃce informacà o sledovánà kampanà si %2$spÅ™eÄtÄ›te dokumentaci kampanà na piwik.org%3$s.",
"ColumnCampaign": "Kampaň",
"ColumnSearchEngine": "VyhledávaÄ",
"ColumnSocial": "Sociálnà sÃÅ¥",
- "ColumnWebsite": "Web stránky",
- "ColumnWebsitePage": "Web stránka",
+ "ColumnWebsite": "Web",
+ "ColumnWebsitePage": "Stránka webu",
"DirectEntry": "PÅ™Ãmý vstup",
"DirectEntryDocumentation": "NávÅ¡tÄ›vnÃk zadal URL vaÅ¡ich stránek do webového prohlÞeÄe a zaÄal s procházenÃm zde - adresu zadal pÅ™Ãmo.",
"Distinct": "JedineÄnà refereÅ™i podle typu",
@@ -16,7 +16,7 @@
"DistinctKeywords": "jedineÄná klÃÄová slova",
"DistinctSearchEngines": "jedineÄné vyhledávaÄe",
"DistinctWebsites": "jedineÄné weby",
- "EvolutionDocumentation": "Toto je pÅ™ehled referrerů, které vedly návÅ¡tÄ›vnÃky na vaÅ¡e webové stránky.",
+ "EvolutionDocumentation": "Toto je pÅ™ehled odkazujÃcÃch stránek, které pÅ™ivedly návÅ¡tÄ›vnÃky na váš web.",
"EvolutionDocumentationMoreInfo": "Pro vÃce informacà o rozdÃlných typech referrerů nahlédnÄ›te do dokumentace tabulky %s.",
"Keywords": "KlÃÄová slova",
"KeywordsReportDocumentation": "Toto hlášenà zobrazuje klÃÄová slova, která uživatelé hledali, než byli odkázáni na vaÅ¡e stránky. %s KliknutÃm na řádek tabulky zobrazÃte distribuci vyhledávaÄů, které byly použity k hledánà tohoto klÃÄového slova.",
@@ -27,7 +27,7 @@
"ReferrersOverview": "Přehled referrerů",
"ReferrerTypes": "Typy referrerů",
"SearchEngines": "VyhledávaÄe",
- "SearchEnginesDocumentation": "NávÅ¡tÄ›vnÃk byl na vaÅ¡e stránky odkázán vyhledávaÄem. %s Pro vÃce informacà si prohlédnÄ›te hlášenà %s.",
+ "SearchEnginesDocumentation": "NávÅ¡tÄ›vnÃk byl na vaÅ¡e stránky odkázán vyhledávaÄem. %1$s Pro vÃce informacà si prohlédnÄ›te hlášenà %2$s.",
"SearchEnginesReportDocumentation": "Toto hlášenà zobrazuje, které vyhledávaÄe odkázali návÅ¡tÄ›vnÃky na vaÅ¡e stránky. %s KliknutÃm na řádek v tabulce zobrazÃte, co uživatelé na daném vyhledávaÄi hledali.",
"SocialFooterMessage": "Toto je podmnožina hlášenà zobrazeného vlevo. Filtruje ostatnà stránky, takže můžete pÅ™Ãmo porovnat referrery ze sociálnÃch sÃtÃ.",
"Socials": "Sociálnà sÃtÄ›",
@@ -39,14 +39,14 @@
"TypeDirectEntries": "%s pÅ™Ãmých vstupů",
"TypeReportDocumentation": "Tato tabulka obsahuje informace o distribuci typů referrerů.",
"TypeSearchEngines": "%s z vyhledavaÄů",
- "TypeWebsites": "%s z web sÃdel",
+ "TypeWebsites": "%s z webových stránek",
"UsingNDistinctUrls": "(použÃvá %s jedineÄných url)",
"ViewAllReferrers": "Zobrazit všechny referrery",
"ViewReferrersBy": "Zobrazit referrery podle %s",
"Websites": "Stránky",
- "WebsitesDocumentation": "NávÅ¡tÄ›vnÃk následoval odkaz, který na vaÅ¡e stránky vedl odjinud. %s PodÃvejte se na hlášenà %s, pokud chcete vÄ›dÄ›t vÃce.",
+ "WebsitesDocumentation": "NávÅ¡tÄ›vnÃk následoval odkaz, který na vaÅ¡e stránky vedl odjinud. %1$s PodÃvejte se na hlášenà %2$s, pokud chcete vÄ›dÄ›t vÃce.",
"WebsitesReportDocumentation": "V této tabulce můžete vidÄ›t stránky, které odkázaly návÅ¡tÄ›vnÃky na vaÅ¡e stránky. %s KliknutÃm na řádek v tabulce zobrazÃte URL, na kterých se odkazy nalézajÃ.",
- "WidgetExternalWebsites": "Seznam externÃch web sÃdel",
+ "WidgetExternalWebsites": "OdkazujÃcà weby",
"WidgetGetAll": "VÅ¡echny referrery",
"WidgetSocials": "Seznam sociálnÃch sÃtÃ",
"WidgetTopKeywordsForPages": "NejÄastÄ›jÅ¡Ã klÃÄová slova pro URL stránky",
diff --git a/plugins/Referrers/lang/da.json b/plugins/Referrers/lang/da.json
index 3701ba19422d050005142298ee921f843922fee6..15b76d633d89531c29cf80a665888146cd5db847 100644
--- a/plugins/Referrers/lang/da.json
+++ b/plugins/Referrers/lang/da.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Rapporten viser alle henvisninger i én samlet rapport, over alle hjemmesider, Søg i nøgleord og kampagner som bruges af de besøgende til at finde hjemmesiden.",
"Campaigns": "Kampagner",
- "CampaignsDocumentation": "Besøgende kom til hjemmesiden som følge af en kampagne. %s Se %s rapport for yderligere oplysninger.",
- "CampaignsReportDocumentation": "Rapporten viser, hvilke kampagner der førte besøgende til hjemmesiden. %s Finde flere oplysninger om sporing af kampagner, læs %skampagne dokumentation på piwik.org%s",
+ "CampaignsDocumentation": "Besøgende kom til hjemmesiden som følge af en kampagne. %1$s Se %2$s rapport for yderligere oplysninger.",
+ "CampaignsReportDocumentation": "Rapporten viser, hvilke kampagner der førte besøgende til hjemmesiden. %1$s Finde flere oplysninger om sporing af kampagner, læs %2$skampagne dokumentation på piwik.org%3$s",
"ColumnCampaign": "Kampagne",
"ColumnSearchEngine": "Søgemaskine",
"ColumnSocial": "Socialt netværk",
@@ -27,7 +27,7 @@
"ReferrersOverview": "Henvisningsoversigt",
"ReferrerTypes": "Henvisende typer",
"SearchEngines": "Søgemaskiner",
- "SearchEnginesDocumentation": "Besøgende blev henvist til hjemmesiden fra en søgemaskine. %s Se rapporten %s for yderligere oplysninger.",
+ "SearchEnginesDocumentation": "Besøgende blev henvist til hjemmesiden fra en søgemaskine. %1$s Se rapporten %2$s for yderligere oplysninger.",
"SearchEnginesReportDocumentation": "Rapporten viser hvilke søgemaskiner, der henviser brugere til hjemmesiden. %s Klik på en række i tabellen for at se, hvad brugerne søgte efter ved brug af en bestemt søgemaskine.",
"SocialFooterMessage": "Dette er en delmængde af hjemmesiderapporterne til venstre. Den filtrerer andre hjemmesider, så du kan sammenligne dine sociale netværk henvisningssteder direkte.",
"Socials": "Sociale netværk",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "Vis alle henvisninger",
"ViewReferrersBy": "Vis henvisninger efter %s",
"Websites": "Hjemmesider",
- "WebsitesDocumentation": "Besøgende fulgte et link fra en anden hjemmesiden, der førte til hjemmesiden. %s Se %s rapport for yderligere oplysninger.",
+ "WebsitesDocumentation": "Besøgende fulgte et link fra en anden hjemmesiden, der førte til hjemmesiden. %1$s Se %2$s rapport for yderligere oplysninger.",
"WebsitesReportDocumentation": "Tabellen viser, hvilke hjemmesider, der henviser besøgende til hjemmesiden. %s Klik på en række i tabellen, for at se, hvilke URL'er links til hjemmesiden er på.",
"WidgetExternalWebsites": "Eksterne hjemmesider",
"WidgetGetAll": "Alle henvisninger",
diff --git a/plugins/Referrers/lang/de.json b/plugins/Referrers/lang/de.json
index ea22dcfc620920092b241ec7140cc627b509242c..42b51f0711055a1b2f0495008c6471f022e2d550 100644
--- a/plugins/Referrers/lang/de.json
+++ b/plugins/Referrers/lang/de.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Dieser Bericht zeigt Ihnen all Ihre Verweise in einem einzigen Bericht. Es werden alle Websites, Suchbegriffe und Kampagnen gezeigt, die von Ihren Besuchern benutzt wurden um ihre Website zu finden.",
"Campaigns": "Kampagnen",
- "CampaignsDocumentation": "Besucher, die aufgrund einer Kampagne auf Ihre Website kamen. Weitere Details finden Sie %sim Bericht%s.",
- "CampaignsReportDocumentation": "Dieser Bericht enthält Informationen darüber, welche Kampagnen Besucher auf Ihre Website gebracht haben. %s Für mehr Informationen zum Tracken von Kampagnen, lesen Sie die %sKampagnen-Dokumentation auf piwik.org%s",
+ "CampaignsDocumentation": "Besucher, die aufgrund einer Kampagne auf Ihre Website kamen. Weitere Details finden Sie %1$sim Bericht%2$s.",
+ "CampaignsReportDocumentation": "Dieser Bericht enthält Informationen darüber, welche Kampagnen Besucher auf Ihre Website gebracht haben. %1$s Für mehr Informationen zum Tracken von Kampagnen, lesen Sie die %2$sKampagnen-Dokumentation auf piwik.org%3$s",
"ColumnCampaign": "Kampagne",
"ColumnSearchEngine": "Suchmaschine",
"ColumnSocial": "Soziales Netzwerk",
@@ -27,7 +27,7 @@
"ReferrersOverview": "Ãœbersicht Verweise",
"ReferrerTypes": "Verweistypen",
"SearchEngines": "Suchmaschinen",
- "SearchEnginesDocumentation": "Ein Besucher kam durch eine Suchmaschine auf die Website. %sDer Bericht%s enthält weitere Details.",
+ "SearchEnginesDocumentation": "Ein Besucher kam durch eine Suchmaschine auf die Website. %1$sDer Bericht%2$s enthält weitere Details.",
"SearchEnginesReportDocumentation": "Dieser Bericht zeigt Ihnen, welche Suchmaschinen Besucher auf die Website geführt haben. %s Wenn Sie auf eine Zeile der Tabelle klicken, werden die Suchbegriffe angezeigt, nach denen die Besucher gesucht haben.",
"SocialFooterMessage": "Dies ist eine Teilansicht des Berichtes auf der linken Seite. Er filtert andere Websites heraus, so dass Sie die Verweise von Sozialen Netzwerken direkt vergleichen können.",
"Socials": "Soziale Netzwerke",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "Alle Verweise ansehen",
"ViewReferrersBy": "Verweise anhand %s ansehen",
"Websites": "Websites",
- "WebsitesDocumentation": "Der Besucher folgte einem Link auf einer anderen Website, um auf Ihre Seite zu gelangen. Weitere Details finden Sie %sim Bericht%s.",
+ "WebsitesDocumentation": "Der Besucher folgte einem Link auf einer anderen Website, um auf Ihre Seite zu gelangen. Weitere Details finden Sie %1$sim Bericht%2$s.",
"WebsitesReportDocumentation": "In dieser Tabelle sehen Sie, von welchen Websites aus Besucher auf Ihre Seite verwiesen wurden. %s Wenn Sie auf eine Zeile der Tabelle klicken, sehen Sie, auf welchen URLs sich die Links zu Ihrer Website befanden.",
"WidgetExternalWebsites": "Liste externer Websites",
"WidgetGetAll": "Alle Verweise",
diff --git a/plugins/Referrers/lang/el.json b/plugins/Referrers/lang/el.json
index 555b23dd2a89788583fec489d0ae198d8fed78a5..a8c91905ea459f1e3e5dada91e8256c90c89fdc8 100644
--- a/plugins/Referrers/lang/el.json
+++ b/plugins/Referrers/lang/el.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Αυτή η Îκθεση δείχνει όλες τις συστάσεις σε μια ενιαία αναφοÏά, απαÏιθμώντας όλες τις ιστοσελίδες, τις λÎξεις-κλειδιά αναζήτησης και τις καμπάνιες που χÏησιμοποιοÏνται από τους επισκÎπτες σας για να βÏουν την ιστοσελίδα σας.",
"Campaigns": "Καμπάνιες",
- "CampaignsDocumentation": "ΕπισκÎπτες που ήÏθαν στην ιστοσελίδα ως αποτÎλεσμα εκστÏατείας. %s Δείτε την αναφοÏά %s για πεÏισσότεÏες πληÏοφοÏίες.",
- "CampaignsReportDocumentation": "Αυτή η αναφοÏά δείχνει ποιες εκστÏατείες οδήγησαν επισκÎπτες στην ιστοσελίδα. %s Για πεÏισσότεÏες πληÏοφοÏίες για την καταγÏαφή εκστÏατειών, διαβάστε την %sτεκμηÏίωση εκστÏατειών στο piwik.org%s",
+ "CampaignsDocumentation": "ΕπισκÎπτες που ήÏθαν στον ιστοτόπο σας ως αποτÎλεσμα μιας καμπάνιας. %1$s Δείτε την αναφοÏά %2$s για πεÏισσότεÏες λεπτομÎÏειες.",
+ "CampaignsReportDocumentation": "Η αναφοÏά δείχνει ποιες καμπάνιες οδήγησαν επισκÎπτες στον ιστοτόπο σας. %1$s Για πεÏισσότεÏες πληÏοφοÏίες σχετικά με την παÏακολοÏθηση των καμπανιών, δείτε την %2$sτεκμηÏίωση για τις καμπάνιες στο piwik.org%3$s",
"ColumnCampaign": "ΕκστÏατεία",
"ColumnSearchEngine": "Μηχανή Αναζήτησης",
"ColumnSocial": "Κοινωνικό δίκτυο",
@@ -27,7 +27,7 @@
"ReferrersOverview": "Επισκόπηση ΠαÏαπομπών",
"ReferrerTypes": "ΤÏποι ΑναφοÏών",
"SearchEngines": "ΜηχανÎÏ‚ αναζήτησης",
- "SearchEnginesDocumentation": "Ένας επισκÎπτης επισκÎφτηκε την ιστοσελίδα μÎσω μηχανής αναζήτησης. %s Δείτε την αναφοÏά %s για πεÏισσότεÏες πληÏοφοÏίες.",
+ "SearchEnginesDocumentation": "Ένας επισκÎπτης οδηγήθηκε στον ιστοτόπο σας από μηχανή αναζήτησης. %1$s Δείτε την αναφοÏά %2$s για πεÏισσότεÏες λεπτομÎÏειες.",
"SearchEnginesReportDocumentation": "αυτή η αναφοÏά δείχνει ποιες μηχανÎÏ‚ αναζήτησης ανάφεÏαν χÏήστες στην ιστοσελίδα. %s Πατώντας σε μια γÏαμμή στον πίνακα, μποÏείτε να δείτε τι αναζητοÏσαν οι χÏήστες χÏησιμοποιώντας μια συγκεκÏιμÎνη μηχανή αναζήτησης.",
"SocialFooterMessage": "Αυτό είναι Îνα υποσÏνολο από τις Ιστοσελίδες ΠαÏαπομπÎων Ï€Ïος τα αÏιστεÏά. ΦιλτÏάÏει άλλους δικτυακοÏÏ‚ τόπους, ώστε να μποÏείτε να συγκÏίνετε τους παÏαπομπείς κοινωνικής δικτÏωσης σας άμεσα.",
"Socials": "Κοινωνικά Δίκτυα",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "Δείτε όλες τις ΠαÏαπομπÎÏ‚",
"ViewReferrersBy": "Δείτε τις ΠαÏαπομπÎÏ‚ ανά %s",
"Websites": "Ιστοτόποι",
- "WebsitesDocumentation": "Ο επισκÎπτης ακολοÏθησε Îναν σÏνδεσμο σε μια άλλη ιστοσελίδα που οδηγοÏσε στην ιστοσελίδα σας. %s Δείτε την αναφοÏά %s για πεÏισσότεÏες πληÏοφοÏίες.",
+ "WebsitesDocumentation": "Ο επισκÎπτης ακολοÏθησε Îνα σÏνδεσμο από άλλο ιστοτόπο που οδήγησε στον δικό σας. %1$s Δείτε την αναφοÏά %2$s για πεÏισσότεÏες λεπτομÎÏειες.",
"WebsitesReportDocumentation": "Σε αυτόν τον πίνακα, μποÏείτε να δείτε ποιες ιστοσελίδες ανÎφεÏαν επισκÎπτες στην ιστοσελίδα. %s Πατώντας σε σε μια γÏαμμή στον πίνακα, μποÏείτε να δείτε ποιες διευθÏνσεις είχαν συνδÎσμους για την ιστοσελίδα.",
"WidgetExternalWebsites": "Λίστα εξωτεÏικών ιστοσελίδων",
"WidgetGetAll": "Όλες οι ΠαÏαπομπÎÏ‚",
diff --git a/plugins/Referrers/lang/en.json b/plugins/Referrers/lang/en.json
index 14f106b9d0449145529bec1af8583663e437e152..3c4885a52f6c52351e6e3ad04451a1bff70a91bd 100644
--- a/plugins/Referrers/lang/en.json
+++ b/plugins/Referrers/lang/en.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "This report shows all your Referrers in one unified report, listing all Websites, Search keywords and Campaigns used by your visitors to find your website.",
"Campaigns": "Campaigns",
- "CampaignsDocumentation": "Visitors that came to your website as the result of a campaign. %s See the %s report for more details.",
- "CampaignsReportDocumentation": "This report shows which campaigns led visitors to your website. %s For more information about tracking campaigns, read the %scampaigns documentation on piwik.org%s",
+ "CampaignsDocumentation": "Visitors that came to your website as the result of a campaign. %1$s See the %2$s report for more details.",
+ "CampaignsReportDocumentation": "This report shows which campaigns led visitors to your website. %1$s For more information about tracking campaigns, read the %2$scampaigns documentation on piwik.org%3$s",
"ColumnCampaign": "Campaign",
"ColumnSearchEngine": "Search Engine",
"ColumnSocial": "Social network",
@@ -27,7 +27,7 @@
"ReferrersOverview": "Referrers Overview",
"ReferrerTypes": "Referrer Types",
"SearchEngines": "Search Engines",
- "SearchEnginesDocumentation": "A visitor was referred to your website by a search engine. %s See the %s report for more details.",
+ "SearchEnginesDocumentation": "A visitor was referred to your website by a search engine. %1$s See the %2$s report for more details.",
"SearchEnginesReportDocumentation": "This report shows which search engines referred users to your website. %s By clicking on a row in the table, you can see what users were searching for using a specific search engine.",
"SocialFooterMessage": "This is a subset of the Websites report to the left. It filters out other websites so you can compare your social network referrers directly.",
"Socials": "Social Networks",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "View all Referrers",
"ViewReferrersBy": "View Referrers by %s",
"Websites": "Websites",
- "WebsitesDocumentation": "The visitor followed a link on another website that led to your site. %s See the %s report for more details.",
+ "WebsitesDocumentation": "The visitor followed a link on another website that led to your site. %1$s See the %2$s report for more details.",
"WebsitesReportDocumentation": "In this table, you can see which websites referred visitors to your site. %s By clicking on a row in the table, you can see which URLs the links to your website were on.",
"WidgetExternalWebsites": "Referrer Websites",
"WidgetGetAll": "All Referrers",
diff --git a/plugins/Referrers/lang/es.json b/plugins/Referrers/lang/es.json
index 9d38b45cc830a6c5cbd6f7f46b0db68f8fbadda0..2e9bcc64032a1bd55a1f7c0ae4b085dc2a4feec7 100644
--- a/plugins/Referrers/lang/es.json
+++ b/plugins/Referrers/lang/es.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Este informe muestra todas las Referencias en un solo informe enumerando todos los sitios de internet, las palabras claves y las campañas que utilizan sus visitantes para encontrar su sitio.",
"Campaigns": "Campañas",
- "CampaignsDocumentation": "Visitantes que visitan su sitio de internet como resultado de una campaña. %s Vea el %s informe para más detalles.",
- "CampaignsReportDocumentation": "Este informe muestra que campaña llevó visitantes a su sitio de internet. %s Para una mayor información acerca del rastreo de las campañas, lea la documentación %scampañas en piwik.org%s",
+ "CampaignsDocumentation": "Visitantes que visitan su sitio de internet como resultado de una campaña. %1$s Vea el %2$s informe para más detalles.",
+ "CampaignsReportDocumentation": "Este informe muestra que campaña llevó visitantes a su sitio de internet. %1$s Para una mayor información acerca del rastreo de las campañas, lea la documentación %2$scampañas en piwik.org%3$s",
"ColumnCampaign": "Campaña",
"ColumnSearchEngine": "Motor de búsqueda",
"ColumnSocial": "Red social",
@@ -27,7 +27,7 @@
"ReferrersOverview": "Compendio de referencias",
"ReferrerTypes": "Tipos de referencias",
"SearchEngines": "Motores de búsqueda",
- "SearchEnginesDocumentation": "Un visitante fue remitido a su sitio de internet por un motor de búsqueda. %s Vea el %s informe para mayores detalles.",
+ "SearchEnginesDocumentation": "Un visitante fue remitido a su sitio de internet por un motor de búsqueda. %1$s Vea el %2$s informe para mayores detalles.",
"SearchEnginesReportDocumentation": "Este reporte muestra qué motores de búsqueda enviaron usuarios a su sitio de internet. %s Haciendo clic en una fila en la tabla, puede ver lo que los usuarios estaban buscando en un motor de búsqueda especÃfico.",
"SocialFooterMessage": "A la izquierda, este es un subconjunto de los informes de los sitios de internet. Filtra respecto de otros sitios de internet, asà puede comparar sus referencias de las redes sociales directamente.",
"Socials": "Redes sociales",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "Ver todas los referencias",
"ViewReferrersBy": "Ver referencias por %s",
"Websites": "Sitios de internet",
- "WebsitesDocumentation": "El visitante siguió un enlace situado en otro sitio de internet que lo condujo a su sitio. %s Vea el %s informe para mayores detalles.",
+ "WebsitesDocumentation": "El visitante siguió un enlace situado en otro sitio de internet que lo condujo a su sitio. %1$s Vea el %2$s informe para mayores detalles.",
"WebsitesReportDocumentation": "En esta tabla, puede observar qué sitio de internet envió visitantes a su sitio. %s Cliqueando en una fila de la tabla, puede ver que dirección de internet enlaza a su sitio.",
"WidgetExternalWebsites": "Sitios de internet de las referencias",
"WidgetGetAll": "Todas las referencias",
diff --git a/plugins/Referrers/lang/fa.json b/plugins/Referrers/lang/fa.json
index 59017db10374742c8f0567a1a47de7103664541e..8d697ea7738a7e6b58bbcbed404d764371beb5c2 100644
--- a/plugins/Referrers/lang/fa.json
+++ b/plugins/Referrers/lang/fa.json
@@ -21,7 +21,7 @@
"Referrers": "ارجاع دهنده ها",
"ReferrersOverview": "نمایش معر٠ها",
"SearchEngines": "موتور های جستجو",
- "SearchEnginesDocumentation": "یک بازدیدکننده توسط موتورجستجو به وبسایت شما ارجاع داده شده است.%s برای جزئیات بیشتر %sاین گزارش را ببینید.",
+ "SearchEnginesDocumentation": "یک بازدیدکننده توسط موتورجستجو به وبسایت شما ارجاع داده شده است.%1$s برای جزئیات بیشتر %2$sاین گزارش را ببینید.",
"Socials": "شبکه های اجتماعی",
"SubmenuSearchEngines": "موتورهای جستجو و کلمات کلیدی",
"SubmenuWebsites": "وب سایت ها",
diff --git a/plugins/Referrers/lang/fi.json b/plugins/Referrers/lang/fi.json
index 7e2ac0ed16a96ea54bd400fd867960d03f8e0569..a4e985a12b4558744a246130b0055cc14dd8dc76 100644
--- a/plugins/Referrers/lang/fi.json
+++ b/plugins/Referrers/lang/fi.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Tämä raportti näyttää kaikki viittaukset yhdessä raportissa, listaten kaikki verkkosivut, hakusanat ja kampanjat, joita käyttäjäsi käyttivät löytääkseen verkkosivusi.",
"Campaigns": "Kampanjat",
- "CampaignsDocumentation": "Vierailijat, jotka tulivat sivullesi kampanjan mukana. %s Katso %s raportista lisätietoja.",
- "CampaignsReportDocumentation": "Tässä raportissa on tietoa kampanjoista, joilla käyttäjiä tuli sivuillesi. %s Lisätietoa kampanjoiden seuraamisesta löytyy %senglanninkielisestä dokumentista piwik.orgissa%s",
+ "CampaignsDocumentation": "Vierailijat, jotka tulivat sivullesi kampanjan mukana. %1$s Katso %2$s raportista lisätietoja.",
+ "CampaignsReportDocumentation": "Tässä raportissa on tietoa kampanjoista, joilla käyttäjiä tuli sivuillesi. %1$s Lisätietoa kampanjoiden seuraamisesta löytyy %2$senglanninkielisestä dokumentista piwik.orgissa%3$s",
"ColumnCampaign": "Kampanja",
"ColumnSearchEngine": "Hakukone",
"ColumnSocial": "Sosiaalinen verkosto",
@@ -25,7 +25,7 @@
"Referrers": "Viittaajat",
"ReferrersOverview": "Viittauksien yleiskatsaus",
"SearchEngines": "Hakukoneet",
- "SearchEnginesDocumentation": "Kävijä tuli sivullesi hakukoneesta. %s Katso %s raportista lisätietoja.",
+ "SearchEnginesDocumentation": "Kävijä tuli sivullesi hakukoneesta. %1$s Katso %2$s raportista lisätietoja.",
"SearchEnginesReportDocumentation": "Tämä raportti näyttää, mitkä hakukoneet viittasivat kävijöitä sivuillesi. %s Näet hakusanat klikkaamalla hakukoneen nimeä.",
"SocialFooterMessage": "Tämä on osajoukko verkkosivuraportista vasemmalla. Se suodattaa pois toiset verkkosivut, jotta voit verrata sosiaalisia verkostojasi suoraan.",
"Socials": "Sosiaaliset verkostot",
@@ -42,7 +42,7 @@
"ViewAllReferrers": "Näytä kaikki viittaukset",
"ViewReferrersBy": "Näytä viittaukset %s mukaan",
"Websites": "Sivustot",
- "WebsitesDocumentation": "Kävijä tuli sivullesi seuraamalla linkkiä toiselta sivulta. %s Katso %s raportista lisätietoja.",
+ "WebsitesDocumentation": "Kävijä tuli sivullesi seuraamalla linkkiä toiselta sivulta. %1$s Katso %2$s raportista lisätietoja.",
"WebsitesReportDocumentation": "Tässä taulussa on lista sivuista, joiden kautta käyttäjiä tuli sinun sivullesi. %s Näet lähdesivun URL:n klikkaamalla taulun riviä.",
"WidgetExternalWebsites": "Lista ulkoisista verkkosivuista",
"WidgetGetAll": "Kaikki viittaukset",
diff --git a/plugins/Referrers/lang/fr.json b/plugins/Referrers/lang/fr.json
index 864f8b31a36b8709a09b3ea9bf71d977126e3d7f..75a106ed02084b768a9d01e0d3b3426fbdfaa788 100644
--- a/plugins/Referrers/lang/fr.json
+++ b/plugins/Referrers/lang/fr.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Ce rapport affiche tous les référents en un rapport consolidé, listant tous les sites web, mots-clés de recherche et campagnes utilisés par vos visiteurs pour trouver votre site web.",
"Campaigns": "Campagnes",
- "CampaignsDocumentation": "Visiteurs venus sur votre site web grâce à une campagne. %s Affichez le rapport %s pour plus de détails.",
- "CampaignsReportDocumentation": "Ce rapport montre quelles campagnes ont conduit des visiteurs à votre site web. %s Pour plus d'informations à propos des campagnes lisez %s la documentation des campagnes sur piwik.org%s",
+ "CampaignsDocumentation": "Visiteurs venus sur votre site web grâce à une campagne. %1$s Affichez le rapport %2$s pour plus de détails.",
+ "CampaignsReportDocumentation": "Ce rapport montre quelles campagnes ont conduit des visiteurs à votre site web. %1$s Pour plus d'informations à propos des campagnes lisez %2$s la documentation des campagnes sur piwik.org%3$s",
"ColumnCampaign": "Campagne",
"ColumnSearchEngine": "Moteur de recherche",
"ColumnSocial": "Réseaux sociaux",
@@ -27,7 +27,7 @@
"ReferrersOverview": "Vue d'ensemble des référents",
"ReferrerTypes": "Types de référants",
"SearchEngines": "Moteurs de recherche",
- "SearchEnginesDocumentation": "Un visiteur a été conduit sur votre site web par un moteur de recherche. %s Affichez le rapport %s pour plus de détails.",
+ "SearchEnginesDocumentation": "Un visiteur a été conduit sur votre site web par un moteur de recherche. %1$s Affichez le rapport %2$s pour plus de détails.",
"SearchEnginesReportDocumentation": "Ce rapport vous montre quels moteurs de recherche ont envoyé vos utilisateurs vers votre site. %s en cliquant sur une ligne sur la table, vous pouvez voir ce que vos utilisateurs étaient en train de chercher avec les moteurs de recherches spécifiques.",
"SocialFooterMessage": "Ceci est un sous-ensemble du rapport de sites web à gauche. Les autres sites web sont filtrés vous permettant ainsi de comparer les réseaux sociaux référents directement.",
"Socials": "Réseaux sociaux",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "Afficher tous les référents",
"ViewReferrersBy": "Afficher les référents par %s",
"Websites": "Sites web",
- "WebsitesDocumentation": "Le visiteur a suivi un lien sur un autre site qui l'a conduit sur votre site. %s Affichez le rapport %s pour plus de détails.",
+ "WebsitesDocumentation": "Le visiteur a suivi un lien sur un autre site qui l'a conduit sur votre site. %1$s Affichez le rapport %2$s pour plus de détails.",
"WebsitesReportDocumentation": "Dans ce tableau vous pouvez voir quels sites web ont conduit des visiteurs sur votre site.. %s En cliquant sur une ligne du tableau, vous pouvez voir les URL des sites sur lesquels sont les liens.",
"WidgetExternalWebsites": "Sites Internet référents",
"WidgetGetAll": "Tous les référents",
diff --git a/plugins/Referrers/lang/hi.json b/plugins/Referrers/lang/hi.json
index 131e5bcd0586a94bb17131b181462cc62bc52a74..8f23797a7c0bab4143e91fa789f24c89719ca8c0 100644
--- a/plugins/Referrers/lang/hi.json
+++ b/plugins/Referrers/lang/hi.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "इस रिपोरà¥à¤Ÿ में अपनी वेबसाइट खोजने के लिठअपने आगंतà¥à¤•à¥‹à¤‚ दà¥à¤µà¤¾à¤°à¤¾ उपयोग किठगठसà¤à¥€ वेबसाइटों, खोज कीवरà¥à¤¡ और अà¤à¤¿à¤¯à¤¾à¤¨ को सूचीबदà¥à¤§, à¤à¤• à¤à¤•à¥€à¤•à¥ƒà¤¤ रिपोरà¥à¤Ÿ में आपके सà¤à¥€ सनà¥à¤¦à¤°à¥à¤à¤¦à¤¾à¤¤à¤¾ दिखाता है.",
"Campaigns": "अà¤à¤¿à¤¯à¤¾à¤¨",
- "CampaignsDocumentation": "आगंतà¥à¤•à¥‹à¤‚ जो à¤à¤• अà¤à¤¿à¤¯à¤¾à¤¨ के परिणाम के रूप में अपनी वेबसाइट पर आà¤. अधिक जानकारी के लिठ%sरिपोरà¥à¤Ÿ %s देखें.",
- "CampaignsReportDocumentation": "इस रिपोरà¥à¤Ÿ में आपकी वेबसाइट पर आगंतà¥à¤•à¥‹à¤‚ का नेतृतà¥à¤µ किया जो अà¤à¤¿à¤¯à¤¾à¤¨ से पता चलता है. टà¥à¤°à¥ˆà¤•à¤¿à¤‚ग अà¤à¤¿à¤¯à¤¾à¤¨ के बारे में %s अधिक जानकारी के लिà¤, piwik.org %sपर अà¤à¤¿à¤¯à¤¾à¤¨%s पà¥à¤°à¤²à¥‡à¤–न पढ़ें",
+ "CampaignsDocumentation": "आगंतà¥à¤•à¥‹à¤‚ जो à¤à¤• अà¤à¤¿à¤¯à¤¾à¤¨ के परिणाम के रूप में अपनी वेबसाइट पर आà¤. अधिक जानकारी के लिठ%1$sरिपोरà¥à¤Ÿ %2$s देखें.",
+ "CampaignsReportDocumentation": "इस रिपोरà¥à¤Ÿ में आपकी वेबसाइट पर आगंतà¥à¤•à¥‹à¤‚ का नेतृतà¥à¤µ किया जो अà¤à¤¿à¤¯à¤¾à¤¨ से पता चलता है. टà¥à¤°à¥ˆà¤•à¤¿à¤‚ग अà¤à¤¿à¤¯à¤¾à¤¨ के बारे में %1$s अधिक जानकारी के लिà¤, piwik.org %2$sपर अà¤à¤¿à¤¯à¤¾à¤¨%3$s पà¥à¤°à¤²à¥‡à¤–न पढ़ें",
"ColumnCampaign": "अà¤à¤¿à¤¯à¤¾à¤¨",
"ColumnSearchEngine": "सरà¥à¤š इंजिन",
"ColumnSocial": "सामाजिक संजाल",
@@ -25,7 +25,7 @@
"Referrers": "सनà¥à¤¦à¤°à¥à¤à¤¦à¤¾à¤¤à¤¾",
"ReferrersOverview": "सनà¥à¤¦à¤°à¥à¤à¤¦à¤¾à¤¤à¤¾ अवलोकन",
"SearchEngines": "सरà¥à¤š इंजन",
- "SearchEnginesDocumentation": "à¤à¤• आगंतà¥à¤• à¤à¤• खोज इंजन से आपकी वेबसाइट पर à¤à¥‡à¤œà¤¾ गया था. अधिक जानकारी के लिठ%sरिपोरà¥à¤Ÿ देखें%s.",
+ "SearchEnginesDocumentation": "à¤à¤• आगंतà¥à¤• à¤à¤• खोज इंजन से आपकी वेबसाइट पर à¤à¥‡à¤œà¤¾ गया था. अधिक जानकारी के लिठ%1$sरिपोरà¥à¤Ÿ देखें%2$s.",
"SearchEnginesReportDocumentation": "यह रिपोरà¥à¤Ÿ जो दरà¥à¤¶à¤¾à¤¤à¤¾ है खोज इंजन का आपकी वेबसाइट पर उपयोगकरà¥à¤¤à¤¾à¤“ं को à¤à¥‡à¤œà¤¾ जाता. तालिका में à¤à¤• पंकà¥à¤¤à¤¿ पर%s कà¥à¤²à¤¿à¤• करते हà¥à¤ आप देख सकते हैं कà¥à¤¯à¤¾ उपयोगकरà¥à¤¤à¤¾à¤“ं को à¤à¤• विशिषà¥à¤Ÿ खोज इंजन का उपयोग करने की खोज कर रहे थे",
"SocialFooterMessage": "यह à¤à¤• बाईं ओर रिपोरà¥à¤Ÿ है वेबसाइटों का à¤à¤• सबसेट है. आप सीधे अपने सामाजिक नेटवरà¥à¤• सनà¥à¤¦à¤°à¥à¤à¤¦à¤¾à¤¤à¤¾ तà¥à¤²à¤¨à¤¾ कर सकते हैं ताकि यह अनà¥à¤¯ वेबसाइटों फिलà¥à¤Ÿà¤° करे.",
"Socials": "सामाजिक संजाल",
@@ -42,7 +42,7 @@
"ViewAllReferrers": "सà¤à¥€ सनà¥à¤¦à¤°à¥à¤à¤¦à¤¾à¤¤à¤¾ देखें",
"ViewReferrersBy": "%s दà¥à¤µà¤¾à¤°à¤¾ सनà¥à¤¦à¤°à¥à¤à¤¦à¤¾à¤¤à¤¾ देखें",
"Websites": "वेबसाइटें",
- "WebsitesDocumentation": "आगंतà¥à¤• अपनी साइट का नेतृतà¥à¤µ करने के लिठà¤à¤• और वेबसाइट पर à¤à¤• लिंक का पालन किया. %s अधिक जानकारी के लिठरिपोरà¥à¤Ÿ%s देखें.",
+ "WebsitesDocumentation": "आगंतà¥à¤• अपनी साइट का नेतृतà¥à¤µ करने के लिठà¤à¤• और वेबसाइट पर à¤à¤• लिंक का पालन किया. %1$s अधिक जानकारी के लिठरिपोरà¥à¤Ÿ%2$s देखें.",
"WebsitesReportDocumentation": "इस तालिका में, आप अपनी वेबसाइट पर आगंतà¥à¤•à¥‹à¤‚ को à¤à¥‡à¤œà¤¨à¥‡ वाले वेबसाइट देख सकते हैं. तालिका में %s à¤à¤• पंकà¥à¤¤à¤¿ पर कà¥à¤²à¤¿à¤• करते हà¥à¤ आप देख सकते हैं जो यूआरà¤à¤² आपकी वेबसाइट के लिठलिंक किया गया है",
"WidgetExternalWebsites": "संदरà¥à¤ वेबसाईटें",
"WidgetGetAll": "सà¤à¥€ सनà¥à¤¦à¤°à¥à¤à¤¦à¤¾à¤¤à¤¾",
diff --git a/plugins/Referrers/lang/id.json b/plugins/Referrers/lang/id.json
index 71e6d93f81ba9c4834a8ef34b1fe3a3e7d9d6f48..707d85ce44d5af92cce19e00cd2085de3884690c 100644
--- a/plugins/Referrers/lang/id.json
+++ b/plugins/Referrers/lang/id.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Laporan ini menampilkan seluruh Pengarah Anda dalam laporan satu kompak, mendaftar seluruh Situs, dan kata kunci Pencarian serta Kampanye yang digunakan pengunjung Anda menemukan situs Anda.",
"Campaigns": "Kampanye",
- "CampaignsDocumentation": "Pengunjung yang datang ke situs Anda sebagai hasil dari kampanye. %s Lihat laporan %s untuk selengkapnya.",
- "CampaignsReportDocumentation": "Laporan ini menampilan kampanye mana yang mengarahkan pengungunjung ke situs Anda. %s Informasi selengkapnya tentang kampanye pelacakan, baca %sdokumentasi kampanye di piwik.org%s",
+ "CampaignsDocumentation": "Pengunjung yang datang ke situs Anda sebagai hasil dari kampanye. %1$s Lihat laporan %2$s untuk selengkapnya.",
+ "CampaignsReportDocumentation": "Laporan ini menampilan kampanye mana yang mengarahkan pengungunjung ke situs Anda. %1$s Informasi selengkapnya tentang kampanye pelacakan, baca %2$sdokumentasi kampanye di piwik.org%3$s",
"ColumnCampaign": "Kampanye",
"ColumnSearchEngine": "Mesin Pencari",
"ColumnSocial": "Jejaring Sosial",
@@ -25,7 +25,7 @@
"Referrers": "Pengarah",
"ReferrersOverview": "Iktisar Pengarah",
"SearchEngines": "Mesin Pencari",
- "SearchEnginesDocumentation": "Pengunjung telah diarahkan ke situs Anda oleh mesin pencari. %s Lihat laporan %s untuk selengkapnya.",
+ "SearchEnginesDocumentation": "Pengunjung telah diarahkan ke situs Anda oleh mesin pencari. %1$s Lihat laporan %2$s untuk selengkapnya.",
"SearchEnginesReportDocumentation": "Laporan ini menampilakan mesin pencari yang mengarahkan pengguna ke situs Anda. %s Dengan mengeklik baris dalam tabel, Anda dapat mengetahui pengguna mana yang menggunakan mesin pencari tertentu.",
"SocialFooterMessage": "Merupakan himpunan laporan Situs di sebelah kiri. Ini akan menapis keluar situs lain sehingga Anda dapat bandingkan dengan pengarah jejaring sosial secara langsung.",
"Socials": "Jejaring Sosial",
@@ -42,7 +42,7 @@
"ViewAllReferrers": "Lihat seluruh pengarah",
"ViewReferrersBy": "Lihat Pengarah berdasar %s",
"Websites": "Situs",
- "WebsitesDocumentation": "Pengunjung mengikuti tautan di situs lain yang mengarahkan ke situs Anda. %s Lihat laporan %s untuk selengkapnya.",
+ "WebsitesDocumentation": "Pengunjung mengikuti tautan di situs lain yang mengarahkan ke situs Anda. %1$s Lihat laporan %2$s untuk selengkapnya.",
"WebsitesReportDocumentation": "Dalam tabel ini, Anda dapat melihat situs mana yang mengarahkan pengunjung menuju situs Anda. %s Dengan mengeklik baris dalam tabel, Anda dapat mengetahui URL mana yang memiliki tautan ke situs Anda.",
"WidgetExternalWebsites": "Daftar Situs luar",
"WidgetGetAll": "Seluruh Pengarah",
diff --git a/plugins/Referrers/lang/it.json b/plugins/Referrers/lang/it.json
index 5343975d95ab959551011aede0667d5e617e14af..ac5c1ad83d0bb31e82bb1477087f126d91c18adb 100644
--- a/plugins/Referrers/lang/it.json
+++ b/plugins/Referrers/lang/it.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Questo report mostra tutti i tuoi Referenti in un unico report che elenca tutti i Siti web, le Parole chiave di ricerca e Campagne utilizzate dai visitatori per trovare il tuo sito web.",
"Campaigns": "Campagne",
- "CampaignsDocumentation": "Visitatori che sono arrivati sul tuo sito web a seguito di una campagna. %s Vedi il%s Report per maggiori dettagli.",
- "CampaignsReportDocumentation": "Questo report mostra quali campagne hanno portato i visitatori sul tuo sito web. %s Per ulteriori informazioni sulle campagne di monitoraggio, leggi la %sdocumentazione campagne su piwik.org%s",
+ "CampaignsDocumentation": "Visitatori che sono arrivati sul tuo sito web a seguito di una campagna. %1$s Vedi il%2$s Report per maggiori dettagli.",
+ "CampaignsReportDocumentation": "Questo report mostra quali campagne hanno portato i visitatori sul tuo sito web. %1$s Per ulteriori informazioni sulle campagne di monitoraggio, leggi la %2$sdocumentazione campagne su piwik.org%3$s",
"ColumnCampaign": "Campagna",
"ColumnSearchEngine": "Motore di ricerca",
"ColumnSocial": "Social network",
@@ -27,7 +27,7 @@
"ReferrersOverview": "Panoramica Referenti",
"ReferrerTypes": "Tipi di Referenti",
"SearchEngines": "Motori di ricerca",
- "SearchEnginesDocumentation": "Un visitatore è stato portato sul tuo sito da un motore di ricerca. %s Vedi il %s report per maggiori dettagli.",
+ "SearchEnginesDocumentation": "Un visitatore è stato portato sul tuo sito da un motore di ricerca. %1$s Vedi il %2$s report per maggiori dettagli.",
"SearchEnginesReportDocumentation": "Questo report mostra quali motori di ricerca hanno portato gli utenti sul tuo sito web. %s Cliccando su una riga della tabella è possibile vedere ciò che gli utenti stavano cercando utilizzando un determinato motore di ricerca.",
"SocialFooterMessage": "Questo è un sottoinsieme dei siti web riportati a sinistra. Esso filtra altri siti web in modo da poter confrontare direttamente i vostri referenti di social network.",
"Socials": "Social Networks",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "Vedi tutti i Referenti",
"ViewReferrersBy": "Vedi Referenti per %s",
"Websites": "Siti web",
- "WebsitesDocumentation": "Il visitatore ha seguito un link su un altro sito web che lo ha portato sul tuo. %s Vedi il %s report per maggiori dettagli.",
+ "WebsitesDocumentation": "Il visitatore ha seguito un link su un altro sito web che lo ha portato sul tuo. %1$s Vedi il %2$s report per maggiori dettagli.",
"WebsitesReportDocumentation": "In questa tabella è possibile vedere quali siti web hanno portato i visitatori sul tuo sito. %s Cliccando su una riga della tabella è possibile vedere su quali URL si trovavano i link al tuo sito.",
"WidgetExternalWebsites": "Elenco di Siti web esterni",
"WidgetGetAll": "Tutti i Referenti",
diff --git a/plugins/Referrers/lang/ja.json b/plugins/Referrers/lang/ja.json
index f5b1e178a432b7ae0e73b86397239a555db1ca51..ac6dc845fa309102952ea5271a223edefdd100ee 100644
--- a/plugins/Referrers/lang/ja.json
+++ b/plugins/Referrers/lang/ja.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "ã“ã®ãƒ¬ãƒãƒ¼ãƒˆã¯ã€ã™ã¹ã¦ã®å‚照元を確èªã™ã‚‹ã“ã¨ãŒã§ãã‚‹çµ±åˆãƒ¬ãƒãƒ¼ãƒˆã§ã™ã€‚ビジターãŒã‚µã‚¤ãƒˆé–²è¦§ã®éš›ã«åˆ©ç”¨ã—ãŸã™ã¹ã¦ã®ã‚¦ã‚§ãƒ–サイトã€æ¤œç´¢ã‚ーワードã€ã‚ャンペーンを一覧表示ã—ã¾ã™ã€‚",
"Campaigns": "ã‚ャンペーン",
- "CampaignsDocumentation": "ã‚ャンペーンã®çµæžœã¨ã—ã¦ã‚¦ã‚§ãƒ–サイトを訪れãŸãƒ“ジター。詳細ã®ãƒªãƒãƒ¼ãƒˆã¯ %s ã“ã¡ã‚‰ %s",
- "CampaignsReportDocumentation": "ã“ã®ãƒªãƒãƒ¼ãƒˆã¯ã€ã‚¦ã‚§ãƒ–サイトã«è¨ªå•è€…ã‚’å°Žã„ãŸã‚ャンペーンã«ã¤ã„ã¦ç¤ºã—ã¾ã™ã€‚ %s ã‚ャンペーンã®ãƒˆãƒ©ãƒƒã‚ングã®è©³ç´°ã«ã¤ã„ã¦ã¯ã€%s piwik.orgã®ã‚ャンペーンã«ã¤ã„ã¦ã®ãƒ‰ã‚ュメント %s ã‚’èªã‚“ã§ãã ã•ã„。",
+ "CampaignsDocumentation": "ã‚ャンペーンã®çµæžœã¨ã—ã¦ã‚¦ã‚§ãƒ–サイトを訪れãŸãƒ“ジター。詳細ã®ãƒªãƒãƒ¼ãƒˆã¯ %1$s ã“ã¡ã‚‰ %2$s",
+ "CampaignsReportDocumentation": "ã“ã®ãƒªãƒãƒ¼ãƒˆã¯ã€ã‚¦ã‚§ãƒ–サイトã«è¨ªå•è€…ã‚’å°Žã„ãŸã‚ャンペーンã«ã¤ã„ã¦ç¤ºã—ã¾ã™ã€‚ %1$s ã‚ャンペーンã®ãƒˆãƒ©ãƒƒã‚ングã®è©³ç´°ã«ã¤ã„ã¦ã¯ã€%2$s piwik.orgã®ã‚ャンペーンã«ã¤ã„ã¦ã®ãƒ‰ã‚ュメント %3$s ã‚’èªã‚“ã§ãã ã•ã„。",
"ColumnCampaign": "ã‚ャンペーン",
"ColumnSearchEngine": "検索エンジン",
"ColumnSocial": "ソーシャルãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯",
@@ -27,7 +27,7 @@
"ReferrersOverview": "å‚照元概観",
"ReferrerTypes": "リファラータイプ",
"SearchEngines": "検索エンジン",
- "SearchEnginesDocumentation": "検索エンジンをå‚ç…§ã—ã¦ã‚¦ã‚§ãƒ–サイトã«æ¥ãŸãƒ“ジター。詳細ã®ãƒªãƒãƒ¼ãƒˆã¯ %s ã“ã¡ã‚‰ %s",
+ "SearchEnginesDocumentation": "検索エンジンをå‚ç…§ã—ã¦ã‚¦ã‚§ãƒ–サイトã«æ¥ãŸãƒ“ジター。詳細ã®ãƒªãƒãƒ¼ãƒˆã¯ %1$s ã“ã¡ã‚‰ %2$s",
"SearchEnginesReportDocumentation": "ã“ã®ãƒªãƒãƒ¼ãƒˆã¯ã€ã©ã®æ¤œç´¢ã‚¨ãƒ³ã‚¸ãƒ³ãŒã“ã®ã‚¦ã‚§ãƒ–サイトã«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’呼ã³ã“ã‚“ã ã‹ã‚’示ã—ã¦ã„ã¾ã™ã€‚ %s テーブル内ã®è¡Œã‚’クリックã™ã‚‹ã¨ã€ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒç‰¹å®šã®æ¤œç´¢ã‚¨ãƒ³ã‚¸ãƒ³ã‚’使ã£ã¦ä½•ã‚’検索ã—ã¦ã„ãŸã‹ã‚’確èªã§ãã¾ã™ã€‚",
"SocialFooterMessage": "ã“ã‚Œã¯ã€å·¦ã®ã‚¦ã‚§ãƒ–サイトレãƒãƒ¼ãƒˆã®ã‚µãƒ–セットã§ã™ã€‚ã“ã‚Œã¯ã€ä»–ã®ã‚¦ã‚§ãƒ–サイトをãµã‚‹ã„ã«ã‹ã‘ã¦é¸åˆ¥ã™ã‚‹ãŸã‚ã€ç›´æŽ¥ã‚½ãƒ¼ã‚·ãƒ£ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®å‚照元を比較ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚",
"Socials": "ソーシャルãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "å…¨å‚照元を表示",
"ViewReferrersBy": "%s ã«ã‚ˆã‚‹å‚照元を表示",
"Websites": "ウェブサイト",
- "WebsitesDocumentation": "別ã®ã‚¦ã‚§ãƒ–サイト上ã®ãƒªãƒ³ã‚¯ã‚’クリックã—ã¦ã‚„ã£ã¦ããŸãƒ“ジター。詳細ã®ãƒªãƒãƒ¼ãƒˆã¯ %s ã“ã¡ã‚‰ %s",
+ "WebsitesDocumentation": "別ã®ã‚¦ã‚§ãƒ–サイト上ã®ãƒªãƒ³ã‚¯ã‚’クリックã—ã¦ã‚„ã£ã¦ããŸãƒ“ジター。詳細ã®ãƒªãƒãƒ¼ãƒˆã¯ %1$s ã“ã¡ã‚‰ %2$s",
"WebsitesReportDocumentation": "ã“ã®ãƒ†ãƒ¼ãƒ–ルã§ã¯ã€ã©ã®ã‚¦ã‚§ãƒ–サイトãŒãƒ“ジターã®å‚照元ã«ãªã£ã¦ã„ã‚‹ã‹ã‚’示ã—ã¾ã™ã€‚%s テーブル内ã®è¡Œã‚’クリックã™ã‚‹ã¨ã€ã‚¯ãƒªãƒƒã‚¯ã•ã‚ŒãŸURLã®ãƒªãƒ³ã‚¯ã‚’見るã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚",
"WidgetExternalWebsites": "外部ウェブサイト一覧",
"WidgetGetAll": "å…¨å‚照元",
diff --git a/plugins/Referrers/lang/ko.json b/plugins/Referrers/lang/ko.json
index 28c132386aac6bab278e4ac7cbadbdf125db003b..5a133eb72e2ed23d13b1cefd2a1d7b7407d6f9e2 100644
--- a/plugins/Referrers/lang/ko.json
+++ b/plugins/Referrers/lang/ko.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "ì´ ë³´ê³ ì„œëŠ” ëª¨ë“ ë¦¬í¼ëŸ¬ì— 대한 ë³´ê³ ì„œë¥¼ 하나로 통합한 것으로, 방문ìžê°€ ê²½ìœ í•œ 웹사ì´íŠ¸, 검색어 ê·¸ë¦¬ê³ ìº íŽ˜ì¸ì˜ 목ë¡ìž…니다.",
"Campaigns": "ìº íŽ˜ì¸",
- "CampaignsDocumentation": "ìº íŽ˜ì¸ì˜ 결과로 웹사ì´íŠ¸ë¥¼ 방문한 방문ìžìž…니다. ìƒì„¸ ë³´ê³ ì„œëŠ” %sì´ê³³%sì— ìžˆìŠµë‹ˆë‹¤.",
- "CampaignsReportDocumentation": "ì´ ë³´ê³ ì„œëŠ” 웹사ì´íŠ¸ì— 방문ìžë¥¼ ì´ëˆ ìº íŽ˜ì¸ì— 대해 설명합니다. %s ìº íŽ˜ì¸ ì¶”ì ì— ëŒ€í•œ ìžì„¸í•œ ë‚´ìš©ì€ %spiwik.orgì˜ ìº íŽ˜ì¸ì— 대한 문서%s를 ì½ì–´ 보세요.",
+ "CampaignsDocumentation": "ìº íŽ˜ì¸ì˜ 결과로 웹사ì´íŠ¸ë¥¼ 방문한 방문ìžìž…니다. ìƒì„¸ ë³´ê³ ì„œëŠ” %1$sì´ê³³%2$sì— ìžˆìŠµë‹ˆë‹¤.",
+ "CampaignsReportDocumentation": "ì´ ë³´ê³ ì„œëŠ” 웹사ì´íŠ¸ì— 방문ìžë¥¼ ì´ëˆ ìº íŽ˜ì¸ì— 대해 설명합니다. %1$s ìº íŽ˜ì¸ ì¶”ì ì— ëŒ€í•œ ìžì„¸í•œ ë‚´ìš©ì€ %2$spiwik.orgì˜ ìº íŽ˜ì¸ì— 대한 문서%3$s를 ì½ì–´ 보세요.",
"ColumnCampaign": "ìº íŽ˜ì¸",
"ColumnSearchEngine": "검색엔진",
"ColumnSocial": "소셜 네트워í¬",
@@ -27,7 +27,7 @@
"ReferrersOverview": "리í¼ëŸ¬ 개요",
"ReferrerTypes": "리í¼ëŸ¬ 타입",
"SearchEngines": "검색엔진",
- "SearchEnginesDocumentation": "검색 ì—”ì§„ì„ ì°¸ì¡°í•˜ì—¬ 웹사ì´íŠ¸ë¡œ ì ‘ì†í•œ 방문ìžìž…니다. ìƒì„¸ ë³´ê³ ì„œëŠ” %s 여기 %sì— ìžˆìŠµë‹ˆë‹¤.",
+ "SearchEnginesDocumentation": "검색 ì—”ì§„ì„ ì°¸ì¡°í•˜ì—¬ 웹사ì´íŠ¸ë¡œ ì ‘ì†í•œ 방문ìžìž…니다. ìƒì„¸ ë³´ê³ ì„œëŠ” %1$s 여기 %2$sì— ìžˆìŠµë‹ˆë‹¤.",
"SearchEnginesReportDocumentation": "ì´ ë³´ê³ ì„œëŠ” ì–´ë–¤ 검색 엔진으로 웹사ì´íŠ¸ì— 사용ìžê°€ ìœ ìž…ë˜ì—ˆëŠ” 지를 ë³´ì—¬ì¤ë‹ˆë‹¤. %s í…Œì´ë¸”ì˜ í–‰ì„ í´ë¦í•˜ë©´ 사용ìžê°€ íŠ¹ì • 검색 ì—”ì§„ì„ ì‚¬ìš©í•˜ì—¬ ë¬´ì—‡ì„ ì°¾ê³ ìžˆì—ˆëŠ”ì§€ë¥¼ 확ì¸í• 수 있습니다.",
"SocialFooterMessage": "ì´ê²ƒì€ 왼쪽 웹사ì´íŠ¸ ë³´ê³ ì„œì˜ ì§‘í•©ìž…ë‹ˆë‹¤. 다른 웹사ì´íŠ¸ë¥¼ í•„í„°ë§í•´ì„œ 소셜 ë„¤íŠ¸ì›Œí¬ ë¦¬í¼ëŸ¬ë¥¼ ì§ì ‘ 비êµí• 수 있습니다.",
"Socials": "소셜 네트워í¬",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "ëª¨ë“ ë¦¬í¼ëŸ¬ 보기",
"ViewReferrersBy": "%s별 리í¼ëŸ¬ 보기",
"Websites": "웹사ì´íŠ¸",
- "WebsitesDocumentation": "다른 웹사ì´íŠ¸ì˜ ë§í¬ë¥¼ í´ë¦í•˜ì—¬ 찾아온 방문ìžìž…니다. ìƒì„¸ ë³´ê³ ì„œëŠ” %s %s ìžì„¸ížˆ 보기",
+ "WebsitesDocumentation": "다른 웹사ì´íŠ¸ì˜ ë§í¬ë¥¼ í´ë¦í•˜ì—¬ 찾아온 방문ìžìž…니다. ìƒì„¸ ë³´ê³ ì„œëŠ” %1$s %2$s ìžì„¸ížˆ 보기",
"WebsitesReportDocumentation": "ì´ í‘œì—ì„œ ê·€í•˜ì˜ ì‚¬ì´íŠ¸ë¡œ 방문ìžë¥¼ 연결하는 추천 웹사ì´íŠ¸ë¥¼ ë³¼ 수 있습니다. %s í…Œì´ë¸”ì˜ í–‰ì„ í´ë¦í•˜ë©´ í´ë¦ëœ URL ë§í¬ë¥¼ ë³¼ 수 있습니다.",
"WidgetExternalWebsites": "외부 웹사ì´íŠ¸ 목ë¡",
"WidgetGetAll": "ëª¨ë“ ë¦¬í¼ëŸ¬",
diff --git a/plugins/Referrers/lang/lt.json b/plugins/Referrers/lang/lt.json
index fba457a0f1d470282fdd0cc14bc8b1294de27f38..19c7b187ee5d878b8a550a5cf5427c056a83d33c 100644
--- a/plugins/Referrers/lang/lt.json
+++ b/plugins/Referrers/lang/lt.json
@@ -24,6 +24,7 @@
"TypeWebsites": "%s iš svetainių",
"UsingNDistinctUrls": "(naudojant %s skirtingus URL)",
"Websites": "SvetainÄ—s",
- "WidgetExternalWebsites": "Išorinių svetainių sąrašas"
+ "WidgetExternalWebsites": "Išorinių svetainių sąrašas",
+ "WidgetSocials": "Socialinių tinklų sąrašas"
}
}
\ No newline at end of file
diff --git a/plugins/Referrers/lang/nl.json b/plugins/Referrers/lang/nl.json
index 648c1f51a13f433dadf8f9e7dc588e5f648d56a8..39be15027069bf51b2b92112d286e24ccf81fb02 100644
--- a/plugins/Referrers/lang/nl.json
+++ b/plugins/Referrers/lang/nl.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Dit samengestelde rapport laat al uw referers zien met weergave van alle websites, zoekwoorden en campagnes waarmee bezoekers uw site hebben gevonden.",
"Campaigns": "Campagnes",
- "CampaignsDocumentation": "Bezoekers die op uw website uitkwamen via een campagne. %s Bekijk het %s rapport voor meer details.",
- "CampaignsReportDocumentation": "Dit rapport toont de campagnes die bezoekers naar uw website hebben geleid. %s Voor meer informatie over Campagne Tracking, lees de %scampagne documentatie op piwik.org%s",
+ "CampaignsDocumentation": "Bezoekers die op uw website uitkwamen via een campagne. %1$s Bekijk het %2$s rapport voor meer details.",
+ "CampaignsReportDocumentation": "Dit rapport toont de campagnes die bezoekers naar uw website hebben geleid. %1$s Voor meer informatie over Campagne Tracking, lees de %2$scampagne documentatie op piwik.org%3$s",
"ColumnCampaign": "Campagne",
"ColumnSearchEngine": "Zoekmachine",
"ColumnSocial": "Sociaal netwerk",
@@ -26,7 +26,7 @@
"ReferrersOverview": "Referer Overzicht",
"ReferrerTypes": "Referrer Types",
"SearchEngines": "Zoekmachines",
- "SearchEnginesDocumentation": "Een bezoeker is doorverwezen naar uw website via een zoekmachine. %s Bekijk het %s rapport voor meer details.",
+ "SearchEnginesDocumentation": "Een bezoeker is doorverwezen naar uw website via een zoekmachine. %1$s Bekijk het %2$s rapport voor meer details.",
"SearchEnginesReportDocumentation": "Dit rapport toont de zoekmachines die bezoekers naar uw wbsite hebben verwezen. %s Door op een rij in de tabel te klikken kunt u zien naar wat men precies op zoek was in de betreffende zoekmachine.",
"Socials": "Sociale netwerken",
"SubmenuSearchEngines": "Zoekmachines & sleutelwoorden",
@@ -41,7 +41,7 @@
"ViewAllReferrers": "Toon alle referers",
"ViewReferrersBy": "Toon referers volgens %s",
"Websites": "Websites",
- "WebsitesDocumentation": "De bezoeker klikte op een link naar uw website. %s Bekijk het %s rapport voor meer details.",
+ "WebsitesDocumentation": "De bezoeker klikte op een link naar uw website. %1$s Bekijk het %2$s rapport voor meer details.",
"WebsitesReportDocumentation": "In deze tabel kunt u de websites zien die bezoekers hebben doorverwezen naar uw website. %s Door op een rij in de tabel te klikken kunt u de URL's van de bijhorende linken zien.",
"WidgetExternalWebsites": "Top websites",
"WidgetGetAll": "Alle Referers",
diff --git a/plugins/Referrers/lang/pt-br.json b/plugins/Referrers/lang/pt-br.json
index 7204ca60696bd9dfd4b2e42d0182f18fc33d4cf8..4d00d689716f27bec9ac211673315089ee3c6207 100644
--- a/plugins/Referrers/lang/pt-br.json
+++ b/plugins/Referrers/lang/pt-br.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Este relatório mostra todos os seus Referenciadores em um relatório unificado, listando todos os Websites, Palavras-Chave de Pesquisa e Campanhas utilizadas ​​por seus visitantes para encontrar seu website.",
"Campaigns": "Campanhas",
- "CampaignsDocumentation": "Os visitantes que vieram para o seu site como o resultado de uma campanha. %s Ver relatório %s para mais detalhes.",
- "CampaignsReportDocumentation": "Este relatório mostra quais as campanhas lideradas visitantes para o seu site. %s para mais informações sobre as campanhas de monitoramento, leia a documentação %s campanhas em piwik.org %s",
+ "CampaignsDocumentation": "Os visitantes que vieram para o seu site como o resultado de uma campanha. %1$s Ver relatório %2$s para mais detalhes.",
+ "CampaignsReportDocumentation": "Este relatório mostra quais as campanhas lideradas visitantes para o seu site. %1$s para mais informações sobre as campanhas de monitoramento, leia a documentação %2$s campanhas em piwik.org %3$s",
"ColumnCampaign": "campanha",
"ColumnSearchEngine": "Motor de Busca",
"ColumnSocial": "Rede social",
@@ -27,7 +27,7 @@
"ReferrersOverview": "Visão Geral dos Referenciadores",
"ReferrerTypes": "Tipos de Referenciadores",
"SearchEngines": "Motores de Busca",
- "SearchEnginesDocumentation": "Um visitante foi encaminhado para o seu site por um motor de busca. %s Ver o relatório %s para mais detalhes.",
+ "SearchEnginesDocumentation": "Um visitante foi encaminhado para o seu site por um motor de busca. %1$s Ver o relatório %2$s para mais detalhes.",
"SearchEnginesReportDocumentation": "Este relatório mostra quais motores de busca encaminhou usuários ao seu site. %s Ao clicar em uma linha na tabela, você pode ver o que os usuários estavam procurando utilizando um motor de busca especÃfico.",
"SocialFooterMessage": "Este é um subconjunto do relatório de Websites listados à esquerda. Filtra outros websites para que você possa comparar diretamente os referenciadores de suas redes sociais .",
"Socials": "Redes Sociais",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "Ver todos os Referenciadores",
"ViewReferrersBy": "Ver Referenciadores por %s",
"Websites": "Websites",
- "WebsitesDocumentation": "O visitante seguiu um link em outro site que o levou para o seu site. %s Ver relatório %s para mais detalhes.",
+ "WebsitesDocumentation": "O visitante seguiu um link em outro site que o levou para o seu site. %1$s Ver relatório %2$s para mais detalhes.",
"WebsitesReportDocumentation": "Nesta tabela, você pode ver quais website encaminharam visitantes para o seu site. %s Ao clicar em uma linha na tabela, você pode ver quais os links de URLs que seu site estava.",
"WidgetExternalWebsites": "Websites Referenciadores",
"WidgetGetAll": "Todos os Referenciadores",
diff --git a/plugins/Referrers/lang/pt.json b/plugins/Referrers/lang/pt.json
index 78080e47489d16b6d8d3bb3d6a4c2835a15138af..6138f435f1f2922e2291eed6216e75eed5b2fcb4 100644
--- a/plugins/Referrers/lang/pt.json
+++ b/plugins/Referrers/lang/pt.json
@@ -1,8 +1,8 @@
{
"Referrers": {
"Campaigns": "Campanhas",
- "CampaignsDocumentation": "Visitantes que chegaram ao seu website como resultado de uma campanha. %s Veja o relatório %s para mais detalhes.",
- "CampaignsReportDocumentation": "Este relatório mostra quais as campanhas que levaram visitantes ao seu website. %s Para mais informações sobre dados de campanhas, leia a documentação de campanhas%s em piwik.org%s.",
+ "CampaignsDocumentation": "Visitantes que chegaram ao seu website como resultado de uma campanha. %1$s Veja o relatório %2$s para mais detalhes.",
+ "CampaignsReportDocumentation": "Este relatório mostra quais as campanhas que levaram visitantes ao seu website. %1$s Para mais informações sobre dados de campanhas, leia a documentação de campanhas%2$s em piwik.org%3$s.",
"ColumnCampaign": "Campanha",
"ColumnSearchEngine": "Motor de Busca",
"ColumnWebsite": "Website",
@@ -21,7 +21,7 @@
"ReferrerName": "Nome do referente",
"Referrers": "Referentes",
"SearchEngines": "Motores de Busca",
- "SearchEnginesDocumentation": "O visitante foi referenciado para o seu website a partir de um motor de busca. %s Veja o relatório %s para mais detalhes.",
+ "SearchEnginesDocumentation": "O visitante foi referenciado para o seu website a partir de um motor de busca. %1$s Veja o relatório %2$s para mais detalhes.",
"SearchEnginesReportDocumentation": "Este relatório mostra quais os motores de pesquisa que referenciaram utilizadores para o seu website. %s Ao clicar numa linha da tabela pode ver o que os utilizadores pesquisaram num motor de pesquisa especÃfico.",
"SubmenuSearchEngines": "Motores de Buscas & Palvras Chaves",
"SubmenuWebsites": "Websites",
@@ -33,7 +33,7 @@
"TypeWebsites": "%s de websites",
"UsingNDistinctUrls": "(usando %s endereços distintos)",
"Websites": "Websites",
- "WebsitesDocumentation": "O visitante seguiu um link noutro website que apontava para o seu. %s Veja o relatório %s para mais detalhes.",
+ "WebsitesDocumentation": "O visitante seguiu um link noutro website que apontava para o seu. %1$s Veja o relatório %2$s para mais detalhes.",
"WebsitesReportDocumentation": "Nesta tabela, pode ver quais os website que levaram referentes para o seu site. %s Ao clicar numa linha da tabela pode ver quais os URLs onde os links para o seu site estavam.",
"WidgetExternalWebsites": "Lista de Websites externos"
}
diff --git a/plugins/Referrers/lang/ro.json b/plugins/Referrers/lang/ro.json
index ea2c7aec8260cd33a566e3bf70f3b88aa2fe3342..46106bb2026d6593e066cbff6db470b104d12b77 100644
--- a/plugins/Referrers/lang/ro.json
+++ b/plugins/Referrers/lang/ro.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Acest raport arată toati referali într-un singur raport unificat, care listează toate site-urile, cuvintele cheie de căutare și campanii utilizate de vizitatorii dvs. pentru a găsi site-ul dumneavoastră.",
"Campaigns": "Campanii",
- "CampaignsDocumentation": "Vizitatorii care au venit pe site-ul dvs. ca rezultat al unei campanii. %s A se vedea raportul %s pentru mai multe detalii.",
- "CampaignsReportDocumentation": "Acest raport arată care care campanii a adus vizitatori websitului.%s Pentru mai multe informații despre campaniile de urmărire, citiți documentația %scampanii pe piwik.org%s",
+ "CampaignsDocumentation": "Vizitatorii care au venit pe site-ul dvs. ca rezultat al unei campanii. %1$s A se vedea raportul %2$s pentru mai multe detalii.",
+ "CampaignsReportDocumentation": "Acest raport arată care care campanii a adus vizitatori websitului.%1$s Pentru mai multe informații despre campaniile de urmărire, citiți documentația %2$scampanii pe piwik.org%3$s",
"ColumnCampaign": "Campanie",
"ColumnSearchEngine": "Motor de căutare",
"ColumnSocial": "Reţea socială",
@@ -25,7 +25,7 @@
"Referrers": "Referenti",
"ReferrersOverview": "Referenți Prezentare generală",
"SearchEngines": "Motoare căutare",
- "SearchEnginesDocumentation": "Un vizitator a fost menționat de site-ul dvs. cu un motor de căutare. %s A se vedea raportul %s pentru mai multe detalii.",
+ "SearchEnginesDocumentation": "Un vizitator a fost menționat de site-ul dvs. cu un motor de căutare. %1$s A se vedea raportul %2$s pentru mai multe detalii.",
"SearchEnginesReportDocumentation": "Acest raport arată care motoare de căutare folosite de utilizatorilor pe site-ul dumneavoastră. %s Făcând clic pe un rând din tabel, puteți vedea ce utilizatorii au fost în căutarea pentru utilizarea unui anumit motor de căutare.",
"SocialFooterMessage": "Acesta este un subset al raportului spre stânga. Se filtrează alte site-uri astfel încât să puteți compara referenți de rețea socială în mod direct.",
"Socials": "Reţele sociale",
@@ -42,7 +42,7 @@
"ViewAllReferrers": "Vezi toti referali",
"ViewReferrersBy": "Vezi referali cu %s",
"Websites": "Siteuri",
- "WebsitesDocumentation": "Vizitatorul a urmat un link de pe alt website care la dus la website-ul dumneavoastră. %s A se vedea raportul %s pentru mai multe detalii.",
+ "WebsitesDocumentation": "Vizitatorul a urmat un link de pe alt website care la dus la website-ul dumneavoastră. %1$s A se vedea raportul %2$s pentru mai multe detalii.",
"WebsitesReportDocumentation": "În acest tabel, puteți vedea ce site-uri web au facut referire vizitatorii la site-ul dumneavoastră. %s Făcând clic pe un rând din tabel, puteți vedea care URL-uri link-uri către site-ul dvs. au fost pe.",
"WidgetExternalWebsites": "Lista siteurilor externe",
"WidgetGetAll": "Toti Referalii",
diff --git a/plugins/Referrers/lang/ru.json b/plugins/Referrers/lang/ru.json
index 1a93015fc251db68d8baf90dafcbf3c16c894399..bff83d1cf361ac14b57d89a5bfb20a71fb96b563 100644
--- a/plugins/Referrers/lang/ru.json
+++ b/plugins/Referrers/lang/ru.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Ðтот отчёт показывает вÑе Рефереры в одном Ñводном отчёте, перечиÑлÑÑ Ð²Ñе ВебÑайты, ПоиÑковые запроÑÑ‹ и Кампании, которыми пользовалиÑÑŒ поÑетители, чтобы найти ваш Ñайт.",
"Campaigns": "Кампании",
- "CampaignsDocumentation": "ПоÑетитель перешел на ваш Ñайт Ñ Ñ€ÐµÐºÐ»Ð°Ð¼Ð½Ð¾Ð¹ кампании. %s Ð”ÐµÑ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² отчете %s",
- "CampaignsReportDocumentation": "Ðтот отчет показывает, какие рекламные кампании привели поÑетителей на ваш Ñайт. %s Ð”Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆÐµÐ¹ информации об отÑлеживании кампаний читайте %sДокументацию по кампаниÑм на Ñайте piwik.org%s",
+ "CampaignsDocumentation": "ПоÑетитель перешел на ваш Ñайт Ñ Ñ€ÐµÐºÐ»Ð°Ð¼Ð½Ð¾Ð¹ кампании. %1$s Ð”ÐµÑ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² отчете %2$s",
+ "CampaignsReportDocumentation": "Ðтот отчет показывает, какие рекламные кампании привели поÑетителей на ваш Ñайт. %1$s Ð”Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆÐµÐ¹ информации об отÑлеживании кампаний читайте %2$sДокументацию по кампаниÑм на Ñайте piwik.org%3$s",
"ColumnCampaign": "КампаниÑ",
"ColumnSearchEngine": "ПоиÑковый движок",
"ColumnSocial": "Страница Ñоциальной Ñети",
@@ -26,7 +26,7 @@
"ReferrersOverview": "Обзор иÑточников",
"ReferrerTypes": "Типы иÑточника",
"SearchEngines": "ПоиÑковые движки",
- "SearchEnginesDocumentation": "ПоÑетитель перешел на ваш Ñайт Ñ Ð¿Ð¾Ð¸Ñковой ÑиÑтемы. %s Ð”ÐµÑ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² отчете %s.",
+ "SearchEnginesDocumentation": "ПоÑетитель перешел на ваш Ñайт Ñ Ð¿Ð¾Ð¸Ñковой ÑиÑтемы. %1$s Ð”ÐµÑ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² отчете %2$s.",
"SearchEnginesReportDocumentation": "Ðтот отчет показывает, Ñ ÐºÐ°ÐºÐ¸Ñ… поиÑковых ÑиÑтем пришли поÑетители. %s Кликнув на конкретный Ñ€Ñд таблицы, вы увидите, что поÑетитель иÑкал в поиÑковой ÑиÑтем и что привело его на ваш Ñайт.",
"Socials": "Социальные Ñети",
"SocialsReportDocumentation": "Ðтот отчет показывает, какие Ñоциальные Ñети привели поÑетителей на ваш Ñайт.<br \/>Кликнув на конкретную Ñтроку таблицы, вы можете увидить, Ñ ÐºÐ°ÐºÐ¸Ñ… именно Ñтраниц Ñоц. Ñетей перешли Ñти поÑетители.",
@@ -42,7 +42,7 @@
"ViewAllReferrers": "ПоÑмотреть вÑе иÑточники",
"ViewReferrersBy": "ПоÑмотреть ИÑточники по %s",
"Websites": "Сайты",
- "WebsitesDocumentation": "ПоÑетитель перешел на ваш Ñайт по ÑÑылке, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ð»Ð°ÑÑŒ на другом Ñайте. %s Ð”ÐµÑ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² отчете %s",
+ "WebsitesDocumentation": "ПоÑетитель перешел на ваш Ñайт по ÑÑылке, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ð»Ð°ÑÑŒ на другом Ñайте. %1$s Ð”ÐµÑ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² отчете %2$s",
"WebsitesReportDocumentation": "Ð’ Ñтой таблице вы можете видеть Ñайты, которые привели поÑетителей на ваш Ñайт. %s Кликнув на таблице по конкретной Ñтроке, вы увидите где была размещена ÑÑылка на ваш Ñайт.",
"WidgetExternalWebsites": "Внешние Ñайты",
"WidgetGetAll": "Ð’Ñе иÑточники трафика",
diff --git a/plugins/Referrers/lang/sq.json b/plugins/Referrers/lang/sq.json
index f23869ce6f4de60429b1e1700e3b9ecb3102585f..8ea57774b461e27c41b9cd34c7284a819e9b548d 100644
--- a/plugins/Referrers/lang/sq.json
+++ b/plugins/Referrers/lang/sq.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Ky raport shfaq krejt Sjellësit, në një raport të unifikuar, duke paraqitur krejt Sajtet, fjalëkyçe Kërkimi dhe Fushata të përdorura nga vizitorët për gjetjen e sajtit tuaj.",
"Campaigns": "Fushata",
- "CampaignsDocumentation": "Vizitorë që kanë ardhur te sajti juaj si rrjedhojë e një fushate. Për më tepër %s shihni %s raportin.",
- "CampaignsReportDocumentation": "Ky raport tregon se cilat fushata prunë vizitorë te sajti juaj. %s Për më tepër të dhëna rreth fushatave të ndjekjes, lexoni %sdokumentimin mbi fushatat, te piwik.org%s",
+ "CampaignsDocumentation": "Vizitorë që kanë ardhur te sajti juaj si rrjedhojë e një fushate. Për më tepër %1$s shihni %2$s raportin.",
+ "CampaignsReportDocumentation": "Ky raport tregon se cilat fushata prunë vizitorë te sajti juaj. %1$s Për më tepër të dhëna rreth fushatave të ndjekjes, lexoni %2$sdokumentimin mbi fushatat, te piwik.org%3$s",
"ColumnCampaign": "Fushatë",
"ColumnSearchEngine": "Motorë Kërkimesh",
"ColumnSocial": "Rrjet shoqëror",
@@ -27,7 +27,7 @@
"ReferrersOverview": "Përmbledhje Referuesish",
"ReferrerTypes": "Lloje Referuesish",
"SearchEngines": "Motorë Kërkimesh",
- "SearchEnginesDocumentation": "Një vizitori i është treguar sajti juaj nga një motor kërkimesh. Për më tepër hollësira, %s shihni %s raportin.",
+ "SearchEnginesDocumentation": "Një vizitori i është treguar sajti juaj nga një motor kërkimesh. Për më tepër hollësira, %1$s shihni %2$s raportin.",
"SearchEnginesReportDocumentation": "Ky raport shfaq cilët motorë kërkimi sollën përdorues te sajti juaj web. %s Duke klikuar mbi një rresht të tabelës, mund të shihni se për çfarë po kërkonin përdoruesit që përdorën një motor të caktuar kërkimesh.",
"SocialFooterMessage": "Ky është një nëngrup i raportit të Sajteve në të majtë. Lë jashtë sajte të tjerë, që kështu të mundeni të krahasoni drejtpërsëdrejti sjellësit tuaj nga rrjete shoqërore.",
"Socials": "Rrjete Shoqërore",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "Shihni krejt Sjellësit",
"ViewReferrersBy": "Shihini Sjellësit sipas %s",
"Websites": "Sajte",
- "WebsitesDocumentation": "Vizitori ndoqi një lidhje në një sajt tjetër, e cila të shpinte te sajti juaj. Për më tepër hollësira, %s shihni %s raportin.",
+ "WebsitesDocumentation": "Vizitori ndoqi një lidhje në një sajt tjetër, e cila të shpinte te sajti juaj. Për më tepër hollësira, %1$s shihni %2$s raportin.",
"WebsitesReportDocumentation": "Në këtë tabelë, mund të shihni cilët sajte sollën vizitorë te sajti juaj. %s Duke klikuar mbi një rresht të tabelës, mund të shihni se te cilat URL gjendeshin lidhjet për te sajti juaj.",
"WidgetExternalWebsites": "Sajte Sjellës",
"WidgetGetAll": "Krejt Sjellësit",
diff --git a/plugins/Referrers/lang/sr.json b/plugins/Referrers/lang/sr.json
index 1766549e627eef10928f65663b11177177ca8bee..c6da870b5890a621006d4f997597467aa4138e16 100644
--- a/plugins/Referrers/lang/sr.json
+++ b/plugins/Referrers/lang/sr.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Ovaj izveÅ¡taj prikazuje sve vaÅ¡e reference na unificiran naÄin preko spiska svih sajtova, traženih kljuÄnih reÄi i kampanja koje su koristili posetioci kako bi doÅ¡li do vaÅ¡eg sajta.",
"Campaigns": "Kampanje",
- "CampaignsDocumentation": "Korisnik koji je došao na vaš sajt putem kampanje. %sPogledajte%s izveštaj za više detalja.",
- "CampaignsReportDocumentation": "Ovaj izveštaj prikazuje koje kampanje su dovele posetioce na vaš sajt. %s Za više informacija o praćenju kampanja pogledajte %scampaigns na piwik.org%s",
+ "CampaignsDocumentation": "Korisnik koji je došao na vaš sajt putem kampanje. %1$sPogledajte%2$s izveštaj za više detalja.",
+ "CampaignsReportDocumentation": "Ovaj izveštaj prikazuje koje kampanje su dovele posetioce na vaš sajt. %1$s Za više informacija o praćenju kampanja pogledajte %2$scampaigns na piwik.org%3$s",
"ColumnCampaign": "Kampanja",
"ColumnSearchEngine": "PretraživaÄ",
"ColumnSocial": "Društvena mreža",
@@ -27,7 +27,7 @@
"ReferrersOverview": "Pregled referenci",
"ReferrerTypes": "Tipovi referenci",
"SearchEngines": "PretraživaÄi",
- "SearchEnginesDocumentation": "Korisnik je upućen na vaÅ¡ sajt od strane pretraživaÄa. %s Pogledajte %s izveÅ¡taj za viÅ¡e detalja.",
+ "SearchEnginesDocumentation": "Korisnik je upućen na vaÅ¡ sajt od strane pretraživaÄa. %1$s Pogledajte %2$s izveÅ¡taj za viÅ¡e detalja.",
"SearchEnginesReportDocumentation": "Ovaj izveÅ¡taj prikazuje koji pretraživaÄi upućuju posetioce na vaÅ¡ sajt. %s Klikom na red tabele možete videti Å¡ta su korisnici tražili preko pojedinih pretraživaÄa.",
"SocialFooterMessage": "Ovo je podskup izveštaja koje vidite na levoj strani. Ostali sajtovi su izostavljeni kako biste mogli direktno da uporedite vaše reference sa društvenih mreža.",
"Socials": "Društvene mreže",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "Prikaži sve reference",
"ViewReferrersBy": "Prikaži reference po %s",
"Websites": "Sajtovi",
- "WebsitesDocumentation": "Korisnik je klikom na link na drugom sajtu došao do vašeg sajta. %sPogledajte%s izveštaj za više detalja.",
+ "WebsitesDocumentation": "Korisnik je klikom na link na drugom sajtu došao do vašeg sajta. %1$sPogledajte%2$s izveštaj za više detalja.",
"WebsitesReportDocumentation": "U ovoj tabeli možete da vidite koji sajtovi su upućivali korisnike na vaš sajt. %s Klikom na red tabele možete videti koja adresa je povezana sa vašim sajtom.",
"WidgetExternalWebsites": "Lista eksternih sajtova",
"WidgetGetAll": "Sve reference",
diff --git a/plugins/Referrers/lang/sv.json b/plugins/Referrers/lang/sv.json
index 99319376dd613a56d7bf860412aff378e66b2534..771d1788b908a8bd533d2deb87d2dfad0a437748 100644
--- a/plugins/Referrers/lang/sv.json
+++ b/plugins/Referrers/lang/sv.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Den här rapporten visar all din hänvisningstrafik i en sammanslagen rapport, den listar alla webbsidor, nyckelord och kampanjer som dina besökare har använt sig av för att hitta din webbsida.",
"Campaigns": "Kampanjer",
- "CampaignsDocumentation": "Besökare som kom till din webbplats som resulterades av en kampanj. %s Se rapporten %s för mer information.",
- "CampaignsReportDocumentation": "Rapporten visar vilka kampanjer som har lett besökare till din webbplats. %s För mer information om hur du spårar kampanjer, läs %skampanjernas dokumentation på piwik.org%s",
+ "CampaignsDocumentation": "Besökare som kom till din webbplats som resulterades av en kampanj. %1$s Se rapporten %2$s för mer information.",
+ "CampaignsReportDocumentation": "Rapporten visar vilka kampanjer som har lett besökare till din webbplats. %1$s För mer information om hur du spårar kampanjer, läs %2$skampanjernas dokumentation på piwik.org%3$s",
"ColumnCampaign": "Kampanj",
"ColumnSearchEngine": "Sökmotor",
"ColumnSocial": "Sociala nätverk",
@@ -27,7 +27,7 @@
"ReferrersOverview": "Översikt för hänvisningar",
"ReferrerTypes": "Hänvisningstyper",
"SearchEngines": "Sökmotorer",
- "SearchEnginesDocumentation": "En besökare hänvisades till din webbplats genom en sökmotor. %s se %s rapport för mer detaljer.",
+ "SearchEnginesDocumentation": "En besökare hänvisades till din webbplats genom en sökmotor. %1$s se %2$s rapport för mer detaljer.",
"SearchEnginesReportDocumentation": "Rapporten visar vilka sökmotorer som hänvisat användare till din webbplats. %s Genom att klicka på en rad i tabellen så kan du se vad användarna sökte på, på en specifik sökmotor.",
"SocialFooterMessage": "Det här är en delmängd av webbplatsrapporten till vänster. Den filtrerar bort andra webbplatser så du kan jämföra hänvisningarna från sociala nätverk.",
"Socials": "Sociala Nätverk",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "Visa alla hänvisningar",
"ViewReferrersBy": "Visa hänvisningar efter %s",
"Websites": "Webbsidor",
- "WebsitesDocumentation": "Besökaren följde en länk på en annan webbplats som länkade till din webbplats. %s Se rapporten %s för mer information.",
+ "WebsitesDocumentation": "Besökaren följde en länk på en annan webbplats som länkade till din webbplats. %1$s Se rapporten %2$s för mer information.",
"WebsitesReportDocumentation": "I denna tabell kan du se vilka webbplatser som hänvisade besökare till din webbplats. %s Genom att klicka på en rad i tabellen så kan du se vilka webbadresser som länkarna till din webbplats var på.",
"WidgetExternalWebsites": "Lista på externa webbsidor",
"WidgetGetAll": "Alla hänvisningar",
diff --git a/plugins/Referrers/lang/tl.json b/plugins/Referrers/lang/tl.json
index cd2b2f5adc009ec3e0d649fe4178d15cf31b219d..9a54a489d4003fb4ffb90c33feada327ec3565e8 100644
--- a/plugins/Referrers/lang/tl.json
+++ b/plugins/Referrers/lang/tl.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Ang ulat na ito ay nagpapakita ng lahat ng referrers sa pinag-isang ulat ng nakalista ang lahat ng websites Mga keywords at campaigns na ginamit ng iyong bisita upang makita ang iyong website",
"Campaigns": "Mga Kampanya",
- "CampaignsDocumentation": "Ang iyong mga bisita na mula sa iyong website ay result ng isang campaign. %s Tignan ang %s ulat para sa karagdagang mga detalye.",
- "CampaignsReportDocumentation": "Ang ulat na ito ay nagpapakita ng campaigns kung saan galing ang iyong mga bisita sa iyong website. %s Para sa karagdagang impormasyon tungkol sa tracking campaigns. basahin ang dokumentasyon ng %s campaigns sa piwik.org %s",
+ "CampaignsDocumentation": "Ang iyong mga bisita na mula sa iyong website ay result ng isang campaign. %1$s Tignan ang %2$s ulat para sa karagdagang mga detalye.",
+ "CampaignsReportDocumentation": "Ang ulat na ito ay nagpapakita ng campaigns kung saan galing ang iyong mga bisita sa iyong website. %1$s Para sa karagdagang impormasyon tungkol sa tracking campaigns. basahin ang dokumentasyon ng %2$s campaigns sa piwik.org %3$s",
"ColumnCampaign": "Kampanya",
"ColumnSearchEngine": "Search Engine",
"ColumnSocial": "Social network",
@@ -25,7 +25,7 @@
"Referrers": "Mga Referrer",
"ReferrersOverview": "Mga Referrer ng Pangkalahatang-pananaw",
"SearchEngines": "Search Engines",
- "SearchEnginesDocumentation": "Ang isang bisita na mula sa iyong website sa ay galing sa isang search engine. %s Tingnan ang mga ulat ang %s para sa karagdagang detalye.",
+ "SearchEnginesDocumentation": "Ang isang bisita na mula sa iyong website sa ay galing sa isang search engine. %1$s Tingnan ang mga ulat ang %2$s para sa karagdagang detalye.",
"SearchEnginesReportDocumentation": "Ang ulat na ito ay mag-papakita kung saang search engines na referred ang user papunta sa iyong website. %s Sa pamamagitan ng pag-click sa hilera ng table maari mong makita kung ano-ano ang hinahanap ng user sa partikular na search engine.",
"SocialFooterMessage": "Ito ay isang subset ng mga ulat ng website mula sa kaliwa. Ito ay nagsasala ng ibat-ibang website upang e-kumpara mismo sa mga referrer social network.",
"Socials": "Social Networks",
@@ -42,7 +42,7 @@
"ViewAllReferrers": "Tingnan ang lahat ng mga Referrer",
"ViewReferrersBy": "Tingnan ang mga Referrer sa pamamagitan ng %s",
"Websites": "Websites",
- "WebsitesDocumentation": "Ang mga bisita na mula sa ibang website na nagpunta sa iyong site. %s Tignan ang %s ulat para sa karagdatang detalye.",
+ "WebsitesDocumentation": "Ang mga bisita na mula sa ibang website na nagpunta sa iyong site. %1$s Tignan ang %2$s ulat para sa karagdatang detalye.",
"WebsitesReportDocumentation": "Sa table na ito maari mong makita kung saang websites galing ang iyong mga bisita papunta sa iyong websites. %s sa pamamagitan ng pag click sa isang hilera sa table maari mong makita kung aling mga URLs ang mga naka nakalink sa iyong website.",
"WidgetExternalWebsites": "Mga website referrer",
"WidgetGetAll": "Lahat ng mga Referrer",
diff --git a/plugins/Referrers/lang/vi.json b/plugins/Referrers/lang/vi.json
index d558ea90d7354fad77eb455ea5f96d93e22ac98b..af32eac253b2adb2e070169efd3d76b804e923cf 100644
--- a/plugins/Referrers/lang/vi.json
+++ b/plugins/Referrers/lang/vi.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "Báo cáo nà y cho thấy tất cả sá»± chỉ dẫn của bạn trong má»™t báo cáo, liệt kê tất cả các trang web, từ khóa tìm kiếm và Chiến dịch được sá» dụng bởi khách truy cáºp để tìm trang web của bạn.",
"Campaigns": "Các chiến dịch",
- "CampaignsDocumentation": "Khách truy cáºp đã tá»›i trang web của bạn nhÆ° là kết quả của má»™t chiến dịch. %s Xem báo cáo %s để biết thêm chi tiết.",
- "CampaignsReportDocumentation": "Báo cáo nà y cho thấy các chiến dịch dẫn khách truy cáºp và o trang web của bạn. %s Äể biết thêm thông tin vá» các chiến dịch theo dõi, Ä‘á»c tà i liệu chiến dịch %s trên %s piwik.org",
+ "CampaignsDocumentation": "Khách truy cáºp đã tá»›i trang web của bạn nhÆ° là kết quả của má»™t chiến dịch. %1$s Xem báo cáo %2$s để biết thêm chi tiết.",
+ "CampaignsReportDocumentation": "Báo cáo nà y cho thấy các chiến dịch dẫn khách truy cáºp và o trang web của bạn. %1$s Äể biết thêm thông tin vá» các chiến dịch theo dõi, Ä‘á»c tà i liệu chiến dịch %2$s trên %3$s piwik.org",
"ColumnCampaign": "Chiến dịch",
"ColumnSearchEngine": "Công cụ tìm kiếm",
"ColumnSocial": "Mạng xã hội",
@@ -25,7 +25,7 @@
"Referrers": "giới thiệu",
"ReferrersOverview": "Tổng quan các ngÆ°á»i được giá»›i thiệu",
"SearchEngines": "Các công cụ tìm kiếm",
- "SearchEnginesDocumentation": "Một du khách được chỉ dẫn đến trang web của bạn bởi một công cụ tìm kiếm. %s Xem báo cáo %s để biết thêm chi tiết.",
+ "SearchEnginesDocumentation": "Một du khách được chỉ dẫn đến trang web của bạn bởi một công cụ tìm kiếm. %1$s Xem báo cáo %2$s để biết thêm chi tiết.",
"SearchEnginesReportDocumentation": "Báo cáo nà y cho thấy những công cụ tìm kiếm đã chỉ dẫn ngÆ°á»i dùng tá»›i website của bạn. %s bằng cách click trên má»™t hà ng trong bảng, bạn có thể thấy những ngÆ°á»i dùng đã tìm kiếm để sá» dụng má»™t công cụ tìm kiếm cụ thể.",
"SocialFooterMessage": "Äây là má»™t táºp hợp các trang web báo cáo bên trái. Nó lá»c ra các trang web khác để bạn có thể so sánh trá»±c tiếp các sá»± chỉ dẫn mạng xã há»™i của bạn.",
"Socials": "Các mạng xã hội",
@@ -42,7 +42,7 @@
"ViewAllReferrers": "Xem tất cả các Referrer",
"ViewReferrersBy": "Xem các Referrer bằng %s",
"Websites": "Websites",
- "WebsitesDocumentation": "NgÆ°á»i truy cáºp đã theo má»™t liên kết trên trang web khác dẫn đến trang web của bạn. %s Xem báo cáo %s để biết thêm chi tiết.",
+ "WebsitesDocumentation": "NgÆ°á»i truy cáºp đã theo má»™t liên kết trên trang web khác dẫn đến trang web của bạn. %1$s Xem báo cáo %2$s để biết thêm chi tiết.",
"WebsitesReportDocumentation": "Trong bảng nà y, bạn có thể thấy những website đã chỉ dẫn khách truy cáºp tá»›i trang web của bạn. %s bằng cách click trên má»™t hà ng trong bảng, bạn có thể thấy những URL mà các link tá»›i website của bạn đã dùng.",
"WidgetExternalWebsites": "Các Website Referrer",
"WidgetGetAll": "Tất cả các ngÆ°á»i được giá»›i thiệu",
diff --git a/plugins/Referrers/lang/zh-cn.json b/plugins/Referrers/lang/zh-cn.json
index 983f89210b0c4381b3bd26d11dd23ddefac240ef..8657ceda11bfbd48cb3b6bdf7ac26c8d22585e36 100644
--- a/plugins/Referrers/lang/zh-cn.json
+++ b/plugins/Referrers/lang/zh-cn.json
@@ -2,8 +2,8 @@
"Referrers": {
"AllReferrersReportDocumentation": "本报表集ä¸æ˜¾ç¤ºæ‰€æœ‰è®¿é—®æ¥æºï¼Œåˆ—出了访客用于查找您的网站而用到的所有的网站ã€æœç´¢å…³é”®è¯å’Œå¹¿å‘Šã€‚",
"Campaigns": "广告活动",
- "CampaignsDocumentation": "广告活动带æ¥çš„访客。%s 查看 %s 报表了解详情。",
- "CampaignsReportDocumentation": "本报表显示哪些广告活动带æ¥äº†è®¿å®¢ï¼Œ%s 广告跟踪的详情，请看 %s piwik.org 上的广告活动文档 %s",
+ "CampaignsDocumentation": "广告活动带æ¥çš„访客。%1$s 查看 %2$s 报表了解详情。",
+ "CampaignsReportDocumentation": "本报表显示哪些广告活动带æ¥äº†è®¿å®¢ï¼Œ%1$s 广告跟踪的详情，请看 %2$s piwik.org 上的广告活动文档 %3$s",
"ColumnCampaign": "广告活动",
"ColumnSearchEngine": "æœç´¢å¼•æ“Žå称",
"ColumnSocial": "社交网络",
@@ -27,7 +27,7 @@
"ReferrersOverview": "æ¥æºæ€»è¡¨",
"ReferrerTypes": "引è类型",
"SearchEngines": "æœç´¢å¼•æ“Ž",
- "SearchEnginesDocumentation": "访客æ¥è‡ªæœç´¢å¼•æ“Žã€‚%s 查看 %s 报表了解详情。",
+ "SearchEnginesDocumentation": "访客æ¥è‡ªæœç´¢å¼•æ“Žã€‚%1$s 查看 %2$s 报表了解详情。",
"SearchEnginesReportDocumentation": "本报表显示哪些æœç´¢å¼•æ“Žç»™æ‚¨å¸¦æ¥äº†è®¿å®¢ã€‚%s 点击表ä¸çš„一行，å¯æŸ¥çœ‹è®¿å®¢ä½¿ç”¨è¯¥æœç´¢å¼•æ“Žæœç´¢çš„内容。",
"SocialFooterMessage": "这是左边的网站报表的åé›†ï¼Œè¿‡æ»¤äº†å…¶ä»–çš„ç½‘ç«™ï¼Œè¿™æ ·æ‚¨å°±èƒ½ç›´æŽ¥æ¯”è¾ƒç¤¾äº¤ç½‘ç»œæ¥æºã€‚",
"Socials": "社交网络",
@@ -44,7 +44,7 @@
"ViewAllReferrers": "查看所有æ¥æº",
"ViewReferrersBy": "查看æ¥æº %s",
"Websites": "网站",
- "WebsitesDocumentation": "访客在å¦å¤–一个网站上点击链接æ¥åˆ°æ‚¨çš„网站。%s 查看 %s 报表了解详情。",
+ "WebsitesDocumentation": "访客在å¦å¤–一个网站上点击链接æ¥åˆ°æ‚¨çš„网站。%1$s 查看 %2$s 报表了解详情。",
"WebsitesReportDocumentation": "本报表显示哪些网站给您带æ¥äº†è®¿å®¢ï¼Œ %s 点击表ä¸çš„一行，å¯æŸ¥çœ‹æ¥æºé“¾æŽ¥çš„网å€ã€‚",
"WidgetExternalWebsites": "æ¥æºç½‘ç«™",
"WidgetGetAll": "所有æ¥æº",
diff --git a/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml b/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml
index 58601dc41be0f5aee04abb3fab8c889415910d49..52262c275a60ee66889c0298689ec771d7518826 100644
--- a/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml
+++ b/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml
@@ -875,249 +875,311 @@
<result prettyDate="Wednesday, February 3, 2010"/>
<result prettyDate="Thursday, February 4, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Friday, February 5, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Saturday, February 6, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Sunday, February 7, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Monday, February 8, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Tuesday, February 9, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Wednesday, February 10, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Thursday, February 11, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Friday, February 12, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Saturday, February 13, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Sunday, February 14, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Monday, February 15, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Tuesday, February 16, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Wednesday, February 17, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Thursday, February 18, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Friday, February 19, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Saturday, February 20, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Sunday, February 21, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Monday, February 22, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Tuesday, February 23, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Wednesday, February 24, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Thursday, February 25, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Friday, February 26, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Saturday, February 27, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Sunday, February 28, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Monday, March 1, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Tuesday, March 2, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Wednesday, March 3, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Thursday, March 4, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Friday, March 5, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
<result prettyDate="Saturday, March 6, 2010">
<row>
+ <segment>referrerType==search</segment>
<idsubdatatable>2</idsubdatatable>
</row>
<row>
+ <segment>referrerType==website</segment>
<idsubdatatable>3</idsubdatatable>
</row>
</result>
diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php
index aeef2f2ffb6beafa5f9cb4f8ab2fb370a5fee48c..3391b581c81498ab3638a208a1342ed97a91f77b 100644
--- a/plugins/ScheduledReports/API.php
+++ b/plugins/ScheduledReports/API.php
@@ -733,7 +733,7 @@ class API extends \Piwik\Plugin\API
private static function validateReportHour($hour)
{
if (!is_numeric($hour) || $hour < 0 || $hour > 23) {
- throw new Exception('Invalid hour schedule. Should be anything from 0 to 23Â inclusive.');
+ throw new Exception('Invalid hour schedule. Should be anything from 0 to 23 inclusive.');
}
}
diff --git a/plugins/ScheduledReports/lang/ar.json b/plugins/ScheduledReports/lang/ar.json
index 8929db69bc3b4f8d1972e784a7d2bd94c26ce993..175654515b4858478c331171e12d9e5aedd90821 100644
--- a/plugins/ScheduledReports/lang/ar.json
+++ b/plugins/ScheduledReports/lang/ar.json
@@ -2,7 +2,7 @@
"ScheduledReports": {
"AlsoSendReportToTheseEmails": "أرسل التقرير إلى هذه العناوين أيضاً (عنوان لكل سطر):",
"AreYouSureDeleteReport": "هل ترغب Øقاً ÙÙŠ Øذ٠هذا التقرير وجدولته الزمنية؟",
- "CancelAndReturnToReports": "إلغاء و%s رجوع إلى قائمة التقارير%s",
+ "CancelAndReturnToReports": "إلغاء و%1$s رجوع إلى قائمة التقارير%2$s",
"CreateAndScheduleReport": "أنشئ وأعد جدولاً لتقرير",
"CreateReport": "إنشاء تقرير",
"DescriptionOnFirstPage": "وص٠التقرير سيتم عرضه ÙÙŠ الصÙØØ© الأولى من التقرير.",
diff --git a/plugins/ScheduledReports/lang/be.json b/plugins/ScheduledReports/lang/be.json
index d3a488895cb75c332ec9a4421722b8be064e13be..53b6c6720a0e6d92ba8deed970b081acaa84dbfe 100644
--- a/plugins/ScheduledReports/lang/be.json
+++ b/plugins/ScheduledReports/lang/be.json
@@ -2,7 +2,7 @@
"ScheduledReports": {
"AlsoSendReportToTheseEmails": "ÐÐºÑ€Ð°Ð¼Ñ Ñ‚Ð°Ð³Ð¾, адправіць Ñправаздачу на гÑÑ‚Ñ‹Ñ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ñ‹Ñ Ð°Ð´Ñ€Ð°ÑÑ‹ (па аднаму Ñž радку):",
"AreYouSureDeleteReport": "Ð’Ñ‹ Ñапраўды жадаеце выдаліць гÑÑ‚Ñ‹ даклад Ñ– Ñго раÑклад?",
- "CancelAndReturnToReports": "ÐдмÑніць Ñ– %sвÑрнуцца да ÑпіÑу Ñправаздач %s",
+ "CancelAndReturnToReports": "ÐдмÑніць Ñ– %1$sвÑрнуцца да ÑпіÑу Ñправаздач %2$s",
"CreateAndScheduleReport": "Стварыць Ñправаздачу Ñ– зрабіць раÑклад",
"CreateReport": "Стварыць Ñправаздачу",
"DescriptionOnFirstPage": "ÐпіÑанне Ñправаздачы будзе адлюÑтроўвацца на першай Ñтаронцы Ñправаздачы.",
@@ -12,7 +12,7 @@
"FrontPage": "Ð“Ð°Ð»Ð¾ÑžÐ½Ð°Ñ Ñтаронка",
"MonthlyScheduleHelp": "ШтомеÑÑчны раÑклад: Ñправаздача будзе адпраўлена першым днём кожнага меÑÑца.",
"MustBeLoggedIn": "Ð’Ñ‹ павінны ўвайÑці Ñž ÑÑ–ÑÑ‚Ñму Ð´Ð»Ñ ÑтварÑÐ½Ð½Ñ Ñ– Ð¿Ð»Ð°Ð½Ð°Ð²Ð°Ð½Ð½Ñ ÐºÐ°Ñ€Ñ‹Ñтацкіх Ñправаздач.",
- "Pagination": "Старонка %s з %s",
+ "Pagination": "Старонка %1$s з %2$s",
"PiwikReports": "Piwik Ñправаздачы",
"PleaseFindAttachedFile": "Ð’Ñ‹ можаце знайÑці Ñž прыкладаемым файле вашу %1$s Ñправаздачу Ð´Ð»Ñ %2$s.",
"PleaseFindBelow": "ÐіжÑй вы знойдзеце вашу %1$s Ñправаздачу Ð´Ð»Ñ %2$s.",
diff --git a/plugins/ScheduledReports/lang/bg.json b/plugins/ScheduledReports/lang/bg.json
index a9a322edf4862fbcc2441e981c2ddea274c8d262..528614f8fcd67057293d8fbb7e484cb7ef6264e8 100644
--- a/plugins/ScheduledReports/lang/bg.json
+++ b/plugins/ScheduledReports/lang/bg.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(по подразбиране) Покажи таблицата Ñ Ð¾Ñ‚Ñ‡ÐµÑ‚Ð¸Ñ‚Ðµ (Графики Ñамо за ключови метрични данни)",
"AlsoSendReportToTheseEmails": "Също така изпраща доклада до тези имейли (по един на ред):",
"AreYouSureDeleteReport": "Сигурни ли Ñте че иÑкате да изтриете този доклад и разпиÑание?",
- "CancelAndReturnToReports": "Откажи и Ñе %s върни в ÑпиÑъка Ñ Ð¾Ñ‚Ñ‡ÐµÑ‚Ð¸ %s",
+ "CancelAndReturnToReports": "Откажи и Ñе %1$s върни в ÑпиÑъка Ñ Ð¾Ñ‚Ñ‡ÐµÑ‚Ð¸ %2$s",
"CreateAndScheduleReport": "Създайте доклад и разпиÑание",
"CreateReport": "Създайте доклад",
"CustomVisitorSegment": "ПерÑонализиран поÑетителÑки Ñегмент:",
@@ -20,7 +20,7 @@
"MonthlyScheduleHelp": "МеÑечен график: докладът ще бъде изпратен на Ð¿ÑŠÑ€Ð²Ð¸Ñ Ð´ÐµÐ½ от вÑеки меÑец.",
"MustBeLoggedIn": "ТрÑбва да Ñте влÑзъл, за да Ñъздавате и планирате перÑонализирани отчети.",
"NoRecipients": "Този доклад вÑе още нÑма получатели",
- "Pagination": "Страница %s от %s",
+ "Pagination": "Страница %1$s от %2$s",
"PiwikReports": "Piwik доклади",
"PleaseFindAttachedFile": "МолÑ, вижте в Ð¿Ñ€Ð¸ÐºÐ°Ñ‡ÐµÐ½Ð¸Ñ Ñи файл %1$s доклад за %2$s.",
"PleaseFindBelow": "ÐœÐ¾Ð»Ñ Ð½Ð°Ð¼ÐµÑ€ÐµÑ‚Ðµ по-долу вашиÑÑ‚ %1$s отчет за %2$s.",
diff --git a/plugins/ScheduledReports/lang/ca.json b/plugins/ScheduledReports/lang/ca.json
index 9f88b079d16ca8ee471d2892b32eedd8909a563a..3e5a3934f711df826e0af39ffff9bbbb4b505544 100644
--- a/plugins/ScheduledReports/lang/ca.json
+++ b/plugins/ScheduledReports/lang/ca.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(per defecte) Mostra les taules d'informe (Grà fiques només per les mètriques clau)",
"AlsoSendReportToTheseEmails": "EnvÃa també l'informe als seguents correus electrònics (un per lÃnia):",
"AreYouSureDeleteReport": "Esteu segurs que voleu eliminar aquest informe i la seva programació?",
- "CancelAndReturnToReports": "Cancela i %storna a la llista d'informes%s",
+ "CancelAndReturnToReports": "Cancela i %1$storna a la llista d'informes%2$s",
"CreateAndScheduleReport": "Crear i programar un informe",
"CreateReport": "Crear un informe",
"DescriptionOnFirstPage": "La descripció del informes es mostrarà a la primera pà gina del informe.",
@@ -19,7 +19,7 @@
"MonthlyScheduleHelp": "Programació mensual: L'informe s'enviarà el primer dÃa de cada més.",
"MustBeLoggedIn": "Heu d'estar identificat per crear i programar informes personalitzats",
"NoRecipients": "Aquest informe no té destinataris",
- "Pagination": "PÃ gina %s de %s",
+ "Pagination": "PÃ gina %1$s de %2$s",
"PiwikReports": "Informes Piwik",
"PleaseFindAttachedFile": "Podeu trobar al fitxer adjunt el vostre informe %1$s per a %2$s.",
"PleaseFindBelow": "A continuació podeu trobar el vostre informe %1$s per a %2$s.",
diff --git a/plugins/ScheduledReports/lang/cs.json b/plugins/ScheduledReports/lang/cs.json
index caa1cb992e4066ffef44746424f64df62ff7340c..1eea0758c136de04ba31323abb11c33393d8a5e5 100644
--- a/plugins/ScheduledReports/lang/cs.json
+++ b/plugins/ScheduledReports/lang/cs.json
@@ -4,45 +4,45 @@
"AggregateReportsFormat_GraphsOnly": "Pouze zobrazit grafy (ne tabulky hlášenÃ)",
"AggregateReportsFormat_TablesAndGraphs": "Zobrazit tabulky hlášenà a grafy pro vÅ¡echna hlášenÃ",
"AggregateReportsFormat_TablesOnly": "(VýchozÃ) zobrazit tabulky hlášenà (grafy pouze pro klÃÄová měřenÃ)",
- "AlsoSendReportToTheseEmails": "OdesÃlat hlášenà také na tyto emaily (jeden email na řádek):",
+ "AlsoSendReportToTheseEmails": "OdesÃlat hlášenà také na tyto e-maily (jeden e-mail na řádek):",
"AreYouSureDeleteReport": "Opravdu chcete odstranit toto hlášenà a jeho plán?",
- "CancelAndReturnToReports": "ZruÅ¡it a %svrátit se k seznamu hlášenÃ%s",
+ "CancelAndReturnToReports": "ZruÅ¡it a %1$svrátit se k seznamu hlášenÃ%2$s",
"CreateAndScheduleReport": "VytvoÅ™it a naplánovat hlášenÃ",
"CreateReport": "VytvoÅ™it hlášenÃ",
"CustomVisitorSegment": "Vlastnà segment návÅ¡tÄ›vnÃka",
"DescriptionOnFirstPage": "Popis hlášenà bude zobrazen na prvnà jeho straně.",
"DisplayFormat_TablesOnly": "Pouze zobrazit tabulky (žádné grafy)",
"EmailHello": "Ahoj,",
- "EmailReports": "Poslat hlášenà na email",
+ "EmailReports": "E-mailová hlášenÃ",
"EmailSchedule": "Plánovánà zasÃlánà hlášenÃ",
"EvolutionGraph": "Zobrazit historické grafy pro %s nejvyÅ¡Å¡Ãch hodnot",
"FrontPage": "Hlavnà strana",
- "PersonalEmailReports": "Osobnà emailová hlášenÃ",
+ "PersonalEmailReports": "Osobnà e-mailová hlášenÃ",
"MonthlyScheduleHelp": "MÄ›sÃÄnà plán: hlášenà bude odesláno prvnà den mÄ›sÃce",
"MustBeLoggedIn": "MusÃte být pÅ™ihlášen, abyste mohl vytvářet vlastnà hlášenÃ.",
"NoRecipients": "Toto hlášenà nemá pÅ™Ãjemce",
- "Pagination": "Stránka %s z %s",
+ "Pagination": "Stránka %1$s z %2$s",
"PiwikReports": "Hlášenà Piwiku",
"PleaseFindAttachedFile": "ProsÃm najdÄ›te v pÅ™iloženém souboru %1$s hlášenà pro %2$s",
"SentFromX": "Odesláno z %s.",
"PleaseFindBelow": "NajdÄ›te nÞe vaÅ¡e %1$s hlášenà pro %2$s.",
- "PluginDescription": "VytvoÅ™te vlastnà emailová hlášenà a naplánujte jejich zaslánà dennÄ›, týdnÄ› nebo mÄ›sÃÄnÄ› jednomu nebo vÃce lidem. Je podporováno mnoho formátů (HTML, PDF, CSV, obrázky).",
+ "PluginDescription": "VytvoÅ™te vlastnà e-mailová hlášenà a naplánujte jejich zaslánà dennÄ›, týdnÄ› nebo mÄ›sÃÄnÄ› jednomu nebo vÃce lidem. Je podporováno nÄ›kolik formátů (HTML, PDF, CSV, obrázky).",
"ReportFormat": "Formát hlášenÃ",
"ReportHour": "Odeslat hlášenà v %s hodin",
- "ReportIncludeNWebsites": "Hlášenà bude obsahovat hlavnà měřenà pro webové stránky, které majà aspoň jednnu návštěvu z %s aktuálně dostupných stránek.",
+ "ReportIncludeNWebsites": "Hlášenà bude obsahovat hlavnà měřenà pro všechny weby, které majà aspoň jednu návštěvu (z %s aktuálně dostupných webů).",
"ReportSent": "Hlášenà posláno",
"ReportsIncluded": "Zahrnuté statistiky",
"ReportType": "Odeslat hlášenà pomocÃ",
"ReportUpdated": "Hlášenà aktualizováno",
- "Segment_Deletion_Error": "Tento segment nemůže být smazán nebo zneviditelnÄ›n, protože se použÃvá k vytvářenà emailových hlášenà %s. Zkuste to znovu poté, co ho z tÄ›chto hlášenà odstranÃte.",
- "Segment_Help": "Můžete zvolit existujÃcà segment, který bude aplikován na data v tomto emailovém hlášenÃ. Segmenty můžete vytvářet a upravovat vlastnà segmenty na vaÅ¡Ã nástÄ›nce %s(kliknÄ›te zde pro otevÅ™enÃ)%s, pak kliknÄ›te na box \"%s\", pak \"%s\".",
+ "Segment_Deletion_Error": "Tento segment nemůže být smazán nebo zneviditelnÄ›n, protože se použÃvá k vytvářenà e-mailových hlášenà %s. Zkuste to znovu poté, co jej z tÄ›chto hlášenà odstranÃte.",
+ "Segment_Help": "Můžete zvolit existujÃcà segment, který bude aplikován na data v tomto e-mailovém hlášenÃ. Segmenty můžete vytvářet a upravovat vlastnà segmenty na vaÅ¡Ã nástÄ›nce %1$s(kliknÄ›te zde pro otevÅ™enÃ)%2$s, pak kliknÄ›te na box \"%3$s\", pak \"%4$s\".",
"SegmentAppliedToReports": "Segment %s je aplikován na hlášenÃ.",
"SendReportNow": "Odeslat hlášenà ihned",
"SendReportTo": "Odeslat hlášenÃ",
"SentToMe": "Odeslat hlášenà mně",
"TableOfContent": "Seznam hlášenÃ",
"ThereIsNoReportToManage": "Pro stránky %s neexistuje žádné hlášenÃ, které lze spravovat",
- "TopLinkTooltip": "Vytvářejte vlastnà hlášenÃ, která budou automaticky doruÄena na vaÅ¡i nebo zákaznÃkovu emailovou adresu.",
+ "TopLinkTooltip": "Vytvářejte vlastnà hlášenÃ, která budou automaticky doruÄena na vaÅ¡i nebo zákaznÃkovu e-mailovou adresu.",
"TopOfReport": "Zpět nahoru",
"UpdateReport": "Aktualizovat hlášenÃ",
"WeeklyScheduleHelp": "Týdennà plán: hlášenà bude odesláno každé pondÄ›lÃ"
diff --git a/plugins/ScheduledReports/lang/da.json b/plugins/ScheduledReports/lang/da.json
index 14014a1873665d24f7f114adb88267436cad26b1..6df700fd82316d1b569c2273da450df067348401 100644
--- a/plugins/ScheduledReports/lang/da.json
+++ b/plugins/ScheduledReports/lang/da.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(standard) Vis tabeller (diagrammer kun for nøglemålinger)",
"AlsoSendReportToTheseEmails": "Send også rapporten til disse e-mails (en e-mail pr linje):",
"AreYouSureDeleteReport": "Er du sikker på du vil slette rapporten og tidsplanen?",
- "CancelAndReturnToReports": "Annuller og %sretur til listen over rapporter%s",
+ "CancelAndReturnToReports": "Annuller og %1$sretur til listen over rapporter%2$s",
"CreateAndScheduleReport": "Opret og planlæg rapport",
"CreateReport": "Opret rapport",
"CustomVisitorSegment": "Brugerdefineret besøgssegment:",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "Månedlig tidsplan: Rapporten vil blive sendt den første dag i hver måned.",
"MustBeLoggedIn": "Du skal være logget på for at oprette og planlægge brugerdefinerede rapporter.",
"NoRecipients": "Denne rapport har ingen modtagere",
- "Pagination": "Side %s af %s",
+ "Pagination": "Side %1$s af %2$s",
"PiwikReports": "Piwik rapporter",
"PleaseFindAttachedFile": "Vedlagt i vedhæftede fil din %1$s rapport for %2$s.",
"PleaseFindBelow": "Find rapporten nedenfor %1$s for %2$s.",
@@ -32,7 +32,7 @@
"ReportType": "Send rapport via",
"ReportUpdated": "Rapport opdateret",
"Segment_Deletion_Error": "Dette segment kan ikke slettes eller gøres usynligt for andre, da det bruges til at generere e-mailrapporter %s. Fjern evt. dette segment fra disse rapporter og prøv igen.",
- "Segment_Help": "Du kan vælge et eksisterende brugerdefineret segment til anvendelse på oplysninger i e-mail rapporten. Du kan oprette og redigere brugerdefinerede segmenter i kontrolpanelet %s (klik her for at åbne) %s, og klik derefter på \"%s\" feltet, \"%s\".",
+ "Segment_Help": "Du kan vælge et eksisterende brugerdefineret segment til anvendelse på oplysninger i e-mail rapporten. Du kan oprette og redigere brugerdefinerede segmenter i kontrolpanelet %1$s (klik her for at åbne) %2$s, og klik derefter på \"%3$s\" feltet, \"%4$s\".",
"SegmentAppliedToReports": "Segmentet '%s' anvendes til rapporterne.",
"SendReportNow": "Send rapport nu",
"SendReportTo": "Send rapport til",
diff --git a/plugins/ScheduledReports/lang/de.json b/plugins/ScheduledReports/lang/de.json
index 7e4ed30e0bea3fe58ee06bca50f95b28eb4ec95b..05da1537f211dfaa7bb90e6c515532246bb68d88 100644
--- a/plugins/ScheduledReports/lang/de.json
+++ b/plugins/ScheduledReports/lang/de.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(Standard) Tabellenberichte anzeigen (Graphen nur für die wichtigsten Metriken)",
"AlsoSendReportToTheseEmails": "Bericht zusätzlich an folgende E-Mail-Adressen senden (eine Adresse pro Zeile):",
"AreYouSureDeleteReport": "Sind Sie sicher, dass Sie diesen Bericht und dessen Zeitplan löschen möchten?",
- "CancelAndReturnToReports": "Abbrechen und %szur Liste der Berichte zurückkehren%s",
+ "CancelAndReturnToReports": "Abbrechen und %1$szur Liste der Berichte zurückkehren%2$s",
"CreateAndScheduleReport": "Einen Bericht erstellen und planen",
"CreateReport": "Bericht erstellen",
"CustomVisitorSegment": "Benutzerdefiniertes Besuchersegment:",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "Monatlich: Bericht wird immer am ersten Tag des Monats verschickt.",
"MustBeLoggedIn": "Sie müssen angemeldet sein, um Berichte anlegen und versenden zu können.",
"NoRecipients": "Dieser Bericht hat keine Empfänger",
- "Pagination": "Seite %s von %s",
+ "Pagination": "Seite %1$s von %2$s",
"PiwikReports": "Piwik-Berichte",
"PleaseFindAttachedFile": "Sie finden in der angehängten Datei Ihren Bericht (Intervall: %1$s) für %2$s.",
"SentFromX": "Gesendet von %s",
@@ -35,7 +35,7 @@
"ReportType": "Bericht versenden via",
"ReportUpdated": "Bericht aktualisiert",
"Segment_Deletion_Error": "Dieses Segment kann nicht gelöscht oder für andere Benutzer unsichtbar gemacht werden, da es zur Generierung der E-Mail-Berichte %s verwendet wird. Bitte versuchen Sie es erneut, nachdem Sie dieses Segment aus den Berichten entfernt haben.",
- "Segment_Help": "Sie können ein Segment wählen das auf die Daten des E-Mail-Berichts angewendet werden soll. Sie können Segmente auf dem Dashboard anlegen oder bearbeiten %s(hier klicken zum öffnen)%s, klicken Sie dann auf die \"%s\" Box und dann auf \"%s\".",
+ "Segment_Help": "Sie können ein Segment wählen das auf die Daten des E-Mail-Berichts angewendet werden soll. Sie können Segmente auf dem Dashboard anlegen oder bearbeiten %1$s(hier klicken zum öffnen)%2$s, klicken Sie dann auf die \"%3$s\" Box und dann auf \"%4$s\".",
"SegmentAppliedToReports": "Das Segment '%s' wird auf die Berichte angewendet.",
"SendReportNow": "Bericht jetzt senden",
"SendReportTo": "Bericht senden an",
diff --git a/plugins/ScheduledReports/lang/el.json b/plugins/ScheduledReports/lang/el.json
index cea172536bf0b1ad75e89e79733766392e67876c..5c5ea4b5ecebf8d438dcdf15d89a05e22b0c82e3 100644
--- a/plugins/ScheduledReports/lang/el.json
+++ b/plugins/ScheduledReports/lang/el.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(Ï€Ïοεπιλογή) Î Ïοβολή Πινάκων ΑναφοÏών (ΔιαγÏάμματα μόνο για μετÏήσεις κλειδιοÏ)",
"AlsoSendReportToTheseEmails": "Îα αποσταλεί η αναφοÏά και σε αυτÎÏ‚ τις ηλεκτÏονικÎÏ‚ διευθÏνσεις (μία σε κάθε γÏαμμή):",
"AreYouSureDeleteReport": "ΘÎλετε σίγουÏα να διαγÏάψετε αυτή την αναφοÏά και τον Ï€ÏογÏαμματισμό της;",
- "CancelAndReturnToReports": "ΆκυÏο και %sεπιστÏοφή στη λίστα αναφοÏών%s",
+ "CancelAndReturnToReports": "ΆκυÏο και %1$sεπιστÏοφή στη λίστα αναφοÏών%2$s",
"CreateAndScheduleReport": "ΔημιουÏγήστε και Î ÏογÏαμματίστε μια αναφοÏά",
"CreateReport": "ΔημιουÏγία ΑναφοÏάς",
"CustomVisitorSegment": "Î ÏοσαÏμοσμÎνο Τμήμα Επισκεπτών:",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "Μηνιαίος Ï€ÏογÏαμματισμός: η αναφοÏά θα αποσταλεί την Ï€Ïώτη μÎÏα κάθε μήνα.",
"MustBeLoggedIn": "Î ÏÎπει να Îχετε συνδεθεί για να δημιουÏγήσετε και να Ï€ÏογÏαμματίσετε Ï€ÏοσαÏμοσμÎνες αναφοÏÎÏ‚.",
"NoRecipients": "Αυτή η αναφοÏά δεν Îχει παÏαλήπτες",
- "Pagination": "Σελίδα %s από %s",
+ "Pagination": "Σελίδα %1$s από %2$s",
"PiwikReports": "ΑναφοÏÎÏ‚ Piwik",
"PleaseFindAttachedFile": "Î’Ïείτε στο συνημμÎνο αÏχείο την αναφοÏά %1$s για %2$s.",
"SentFromX": "Στάλθηκε από %s.",
@@ -35,7 +35,7 @@
"ReportType": "Αποστολή αναφοÏάς μÎσω",
"ReportUpdated": "Η αναφοÏά ενημεÏώθηκε",
"Segment_Deletion_Error": "Δεν είναι δυνατό να διαγÏαφεί το τμήμα ή να γίνει αόÏατο σε άλλους χÏήστες επειδή χÏησιμοποιείται για τη δημιουÏγία των αναφοÏών ηλ. ταχυδÏομείου %s. ΠαÏακαλοÏμε δοκιμάστε πάλι Î±Ï†Î¿Ï Î±Ï†Î±Î¹ÏÎσετε το τμήμα αυτό από την αναφοÏά.",
- "Segment_Help": "ΜποÏείτε να επιλÎξετε Îνα υπάÏχον Ï€ÏοσαÏμοσμÎνο τμήμα για να χÏησιμοποιηθεί στα δεδομÎνα σε αυτή την αναφοÏά e-mail. ΜποÏείτε να δημιουÏγήσετε και να επεξεÏγαστείτε Ï€ÏοσαÏμοσμÎνα τμήματα στον πίνακα ελÎγχου σας %s(κάντε κλικ για άνοιγμα)%s, μετά να κάνετε κλικ στο κουτί \"%s\" και μετά \"%s\".",
+ "Segment_Help": "ΜποÏείτε να επιλÎξετε κάποιο υπάÏχον Ï€ÏοσαÏμοσμÎνο τμήμα που θα εφαÏμοστεί στα δεδομÎνα σε αυτή την αναφοÏά e-mail. ΜποÏείτε να δημιουÏγήσετε ή Ï„Ïοποποιήσετε Ï€ÏοσαÏμοσμÎνα τμήματα στον πίνακα ελÎγχου σας %1$s(κάντε κλικ για άνοιγμα)%2$s, μετά κλικ στο πλήκτÏο \"%3$s\" και μετά \"%4$s\".",
"SegmentAppliedToReports": "Το τμήμα '%s' εφαÏμόζεται στις αναφοÏÎÏ‚.",
"SendReportNow": "Αποστολή ΑναφοÏάς Ï„ÏŽÏα",
"SendReportTo": "Αποστολή αναφοÏάς σε",
diff --git a/plugins/ScheduledReports/lang/en.json b/plugins/ScheduledReports/lang/en.json
index f6b41cbe5141f814f81bd3c89ca7017f42a8af89..a1ef702c9a4c0ae32e46ecb84361f4bd92132c10 100644
--- a/plugins/ScheduledReports/lang/en.json
+++ b/plugins/ScheduledReports/lang/en.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(default) Display Report tables (Graphs only for key metrics)",
"AlsoSendReportToTheseEmails": "Also send the report to these emails (one email per line):",
"AreYouSureDeleteReport": "Are you sure you want to delete this report and its schedule?",
- "CancelAndReturnToReports": "Cancel and %sreturn to the list of reports%s",
+ "CancelAndReturnToReports": "Cancel and %1$sreturn to the list of reports%2$s",
"CreateAndScheduleReport": "Create and Schedule a report",
"CreateReport": "Create Report",
"CustomVisitorSegment": "Custom Visitor Segment:",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "Monthly schedule: report will be sent the first day of each month.",
"MustBeLoggedIn": "You must be logged in to create and schedule custom reports.",
"NoRecipients": "This report has no recipients",
- "Pagination": "Page %s of %s",
+ "Pagination": "Page %1$s of %2$s",
"PiwikReports": "Piwik Reports",
"PleaseFindAttachedFile": "Please find in attached file your %1$s report for %2$s.",
"SentFromX": "Sent from %s.",
@@ -35,7 +35,7 @@
"ReportType": "Send report via",
"ReportUpdated": "Report updated",
"Segment_Deletion_Error": "This segment cannot be deleted or made invisible to other users because it is used to generate email report(s) %s. Please retry after removing this segment from this report(s).",
- "Segment_Help": "You can select an existing custom segment to apply to data in this email report. You may create and edit custom segments in your dashboard %s(click here to open)%s, then click on the \"%s\" box, then \"%s\".",
+ "Segment_Help": "You can select an existing custom segment to apply to data in this email report. You may create and edit custom segments in your dashboard %1$s(click here to open)%2$s, then click on the \"%3$s\" box, then \"%4$s\".",
"SegmentAppliedToReports": "The segment '%s' is applied to the reports.",
"SendReportNow": "Send Report now",
"SendReportTo": "Send report to",
diff --git a/plugins/ScheduledReports/lang/es.json b/plugins/ScheduledReports/lang/es.json
index b2d67c4f14096b742f77b15c689d001913946ab1..451bafb8ea02f91cb104ff4406ed137458134d21 100644
--- a/plugins/ScheduledReports/lang/es.json
+++ b/plugins/ScheduledReports/lang/es.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(por defecto) Mostrar Reporte de tablas (gráficas sólo para mediciones clave)",
"AlsoSendReportToTheseEmails": "También enviar el informe a estos correos electrónicos (uno por lÃnea):",
"AreYouSureDeleteReport": "¿Está seguro que desea eliminar este informe y su envÃo programado?",
- "CancelAndReturnToReports": "Cancelar y %svolver a la lista de informes%s",
+ "CancelAndReturnToReports": "Cancelar y %1$svolver a la lista de informes%2$s",
"CreateAndScheduleReport": "Crear y programar un informe",
"CreateReport": "Crear informe",
"CustomVisitorSegment": "Segmento de visitante personalizado:",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "EnvÃo mensual: los informes serán enviados el primer dÃa de cada mes.",
"MustBeLoggedIn": "Debe haber iniciado sesión para crear y programar informes personalizados.",
"NoRecipients": "Este informe no tiene destinatarios",
- "Pagination": "Página %s de %s",
+ "Pagination": "Página %1$s de %2$s",
"PiwikReports": "Informes Piwik",
"PleaseFindAttachedFile": "Encuentre el informe en el archivo adjunto su %1$s informe por %2$s.",
"PleaseFindBelow": "Por favor encuentre debajo su %1$s informe para %2$s.",
@@ -33,7 +33,7 @@
"ReportType": "Enviar informe vÃa",
"ReportUpdated": "Informe actualizado",
"Segment_Deletion_Error": "Este segmento no puede ser eliminado o hacerse invisible para otros usuarios porque es utilizado para crear informe(s) por correo electrónico %s. Por favor elimine este segmento del informe(s) y vuelva a intentar.",
- "Segment_Help": "Puede elegir un segmento personalizado existente para aplicar a los datos de este informe por correo electrónico. Puede crear y modificar segmentos personalizados en su tablero %s (haga clic aquà para abrir)%s, haciendo clic en la casilla \"%s\" y luego en \"%s\".",
+ "Segment_Help": "Puede elegir un segmento personalizado existente para aplicar a los datos de este informe por correo electrónico. Puede crear y modificar segmentos personalizados en su tablero %1$s (haga clic aquà para abrir)%2$s, haciendo clic en la casilla \"%3$s\" y luego en \"%4$s\".",
"SegmentAppliedToReports": "El segmento '%s' está siendo aplicado a los informes.",
"SendReportNow": "Enviar informe ahora",
"SendReportTo": "Enviar informe a",
diff --git a/plugins/ScheduledReports/lang/et.json b/plugins/ScheduledReports/lang/et.json
index 826b335795d3e632c6ca9e62b5043ed24dffafbc..f3e3e743cf52f5cae6ead8160199618097aa11f1 100644
--- a/plugins/ScheduledReports/lang/et.json
+++ b/plugins/ScheduledReports/lang/et.json
@@ -5,7 +5,7 @@
"AggregateReportsFormat_TablesAndGraphs": "Kuva tabelid ja graafikud kõikidele raportitele",
"AggregateReportsFormat_TablesOnly": "(vaikimisi) Kuva raportite tabelid (ja olulistele mõõdikutele ka graafikud)",
"AlsoSendReportToTheseEmails": "Saada raport ka järgnevatele e-posti aadressitele (iga aadress eraldi real):",
- "CancelAndReturnToReports": "Katkesta ja %snaase raportite nimekirja%s",
+ "CancelAndReturnToReports": "Katkesta ja %1$snaase raportite nimekirja%2$s",
"CreateAndScheduleReport": "Loo ja ajasta raporti käivitumine",
"CreateReport": "Loo raport",
"CustomVisitorSegment": "Kohandatud külastaja segment:",
@@ -13,7 +13,7 @@
"EmailReports": "E-posti raportid",
"EmailSchedule": "E-posti ajastamine",
"FrontPage": "Esileht",
- "Pagination": "Lehekülg %s \/ %s",
+ "Pagination": "Lehekülg %1$s \/ %2$s",
"PiwikReports": "Piwiku raportid",
"PleaseFindAttachedFile": "Manusest leiad oma %1$s raporti %2$s jaoks.",
"ReportFormat": "Raporti formaat",
diff --git a/plugins/ScheduledReports/lang/fa.json b/plugins/ScheduledReports/lang/fa.json
index 75c956962d768ad58db967e880ecac27b6fd3848..5d9fb1af8e00c4eca3c99792e6ca74b2c121bc47 100644
--- a/plugins/ScheduledReports/lang/fa.json
+++ b/plugins/ScheduledReports/lang/fa.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(پیش Ùرض) نمایش جدول گزارش (نمودار Ùقط برای معیارهای کلیدی)",
"AlsoSendReportToTheseEmails": "همچنین گزارش به این ایمیل ها Ùرستاده Ù…ÛŒ شود (هر ایمیل در یک خط):",
"AreYouSureDeleteReport": "آیا شما مطمئن هستید Ú©Ù‡ میخواهید این گزارش Ùˆ زمانبندی را Øذ٠کنید؟",
- "CancelAndReturnToReports": "لغو و بازگشت%s به لیست گزارشات%s",
+ "CancelAndReturnToReports": "لغو و بازگشت%1$s به لیست گزارشات%2$s",
"CreateAndScheduleReport": "ایجاد و زمانبندی یک گزارش",
"CreateReport": "ایجاد گزارش",
"CustomVisitorSegment": "بخش سÙارشی بازدید کنندگان:",
@@ -20,7 +20,7 @@
"MonthlyScheduleHelp": "زمانبندی ماهانه: گزارش در اولین روز هر ماه Ùرستاده خواهد شد.",
"MustBeLoggedIn": "برای ساخت و زمانبندی گزارشات دلخواه باید ابتدا وارد شوید",
"NoRecipients": "این گزارش هیچ دریاÙت کننده ای ندارد.",
- "Pagination": "صÙØÙ‡ %s از %s",
+ "Pagination": "صÙØÙ‡ %1$s از %2$s",
"PiwikReports": "گزارش های Piwik",
"PleaseFindBelow": "لطÙا در زیر پیدا نمایید %1$s گزارش برای %2$s.",
"ReportFormat": "Ùرمت گزارش",
diff --git a/plugins/ScheduledReports/lang/fi.json b/plugins/ScheduledReports/lang/fi.json
index 15225c4e42f91b2dbfc346b8fd104ac7c3079bee..28cece703c1ea13a723f73d12773644050ed4257 100644
--- a/plugins/ScheduledReports/lang/fi.json
+++ b/plugins/ScheduledReports/lang/fi.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(oletus) Näytä rapottien taulukot (kuvaajat vain tärkeimmille arvoille)",
"AlsoSendReportToTheseEmails": "Lähetä raportti myös näihin osoitteisiin (yksi osoite per rivi):",
"AreYouSureDeleteReport": "Haluatko varmasti poistaa tämän raportin?",
- "CancelAndReturnToReports": "Peruuta ja %spalaa raporttilistaan%s",
+ "CancelAndReturnToReports": "Peruuta ja %1$spalaa raporttilistaan%2$s",
"CreateAndScheduleReport": "Luo ja ajasta raportti",
"CreateReport": "Luo raportti",
"CustomVisitorSegment": "Asiakasryhmä:",
@@ -20,7 +20,7 @@
"MonthlyScheduleHelp": "Kuukausittainen aikataulu: raportti lähetetään kuun ensimmäisenä päivänä.",
"MustBeLoggedIn": "Sinun täytyy olla kirjautuneena sisään ennen kustomoitujen raporttien luomista ja ajastamista.",
"NoRecipients": "Tällä raportilla ei ole vastaanottajia",
- "Pagination": "Sivu %s\/%s",
+ "Pagination": "Sivu %1$s\/%2$s",
"PiwikReports": "Piwikin raportit",
"PleaseFindAttachedFile": "Liitteenä on raporttisi %1$s sivulle %2$s.",
"PleaseFindBelow": "Alla on raporttisi %1$s sivulle %2$s.",
@@ -31,7 +31,7 @@
"ReportType": "Lähetä raportti",
"ReportUpdated": "Raportti päivitetty",
"Segment_Deletion_Error": "Tätä ryhmää ei voida poistaa tai tehdä näkymättömäksi muille käyttäjille, koska sitä käytetään sähköpostiraportin tai -raporttien %s luomiseen. Yritä uudelleen poistettuasi tämä ryhmä raport(e)ista.",
- "Segment_Help": "Voit valita olemassa olevan kävijäryhmän sovellettavaksi dataan tässä sähköpostiraportissa. Voit luoda ja muokata kävijäryhmiä ohjauspaneelista %s(klikkaa tästä avataksesi)%s, klikkaa sitten ruutua \"%s%, sen jälkeen \"%s\".",
+ "Segment_Help": "Voit valita olemassa olevan kävijäryhmän sovellettavaksi dataan tässä sähköpostiraportissa. Voit luoda ja muokata kävijäryhmiä ohjauspaneelista %1$s(klikkaa tästä avataksesi)%2$s, klikkaa sitten ruutua \"%3$s, sen jälkeen \"%4$s\".",
"SegmentAppliedToReports": "Segmentti '%s' on asetettu raportteihin.",
"SendReportNow": "Lähetä raportti nyt",
"SendReportTo": "Lähetä raportti osoitteeseen",
diff --git a/plugins/ScheduledReports/lang/fr.json b/plugins/ScheduledReports/lang/fr.json
index 97521be39a5409a4f08605443762aece83476cc2..25681b63fcb77f04cd50bbb3ef9ec7549a51b0e2 100644
--- a/plugins/ScheduledReports/lang/fr.json
+++ b/plugins/ScheduledReports/lang/fr.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(défaut) afficher les tableaux de rapport (Graphique uniquement pour les indicateurs clés)",
"AlsoSendReportToTheseEmails": "Envoyer le rapport aussi à ces adresses e-mail (une par ligne) :",
"AreYouSureDeleteReport": "Êtes-vous sûr de vouloir supprimer ce rapport et sa planification?",
- "CancelAndReturnToReports": "Annuler et %s retourner à la liste des rapports%s",
+ "CancelAndReturnToReports": "Annuler et %1$s retourner à la liste des rapports%2$s",
"CreateAndScheduleReport": "Créer et planifier un rapport",
"CreateReport": "Créer le rapport",
"CustomVisitorSegment": "Segment de visiteur personnalisé :",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "Planification mensuelle : le rapport sera envoyé le premier jour de chaque mois.",
"MustBeLoggedIn": "Vous devez être connecté pour créer et planifier des rapports personnalisés.",
"NoRecipients": "Ce rapport n'a aucun destinataire",
- "Pagination": "Page %s sur %s",
+ "Pagination": "Page %1$s sur %2$s",
"PiwikReports": "Rapports Piwik",
"PleaseFindAttachedFile": "Veuillez trouver en pièce jointe votre rapport %1$s pour %2$s.",
"SentFromX": "Envoyé depuis %s.",
@@ -35,7 +35,7 @@
"ReportType": "Envoyer le rapport via",
"ReportUpdated": "Rapport mis à jour",
"Segment_Deletion_Error": "Ce segment ne peut pas être supprimé ou rendu invisible aux autres utilisateurs car il est utilisé dans un ou plusieurs rapport(s) par courriel %s. Veuillez essayer à nouveau après avoir supprimé ce segment de ce(s) rapport(s).",
- "Segment_Help": "Vous pouvez sélectionner un segment personnalisé existant pour l'appliquer à des données dans ce rapport par courriel. Vous pouvez créer et modifier les segments personnalisés depuis votre tableau de bord %s(cliquez ici pour l'ouvrir)%s, cliquez ensuite sur la zone \"%s\", puis \"%s\".",
+ "Segment_Help": "Vous pouvez sélectionner un segment personnalisé existant pour l'appliquer à des données dans ce rapport par courriel. Vous pouvez créer et modifier les segments personnalisés depuis votre tableau de bord %1$s(cliquez ici pour l'ouvrir)%2$s, cliquez ensuite sur la zone \"%3$s\", puis \"%4$s\".",
"SegmentAppliedToReports": "Le segment '%s' est appliqué au rapport.",
"SendReportNow": "Envoyer le rapport maintenant",
"SendReportTo": "Envoyer le(s) rapport(s) Ã ",
diff --git a/plugins/ScheduledReports/lang/hi.json b/plugins/ScheduledReports/lang/hi.json
index 90a935b5eed63a887be43871217789f7ef104e1a..9edabca7fb709cfe3c0522730dd759e63a69c6cb 100644
--- a/plugins/ScheduledReports/lang/hi.json
+++ b/plugins/ScheduledReports/lang/hi.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(डिफ़ॉलà¥à¤Ÿ) पà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ की रिपोरà¥à¤Ÿ तालिकाà¤à¤(केवल पà¥à¤°à¤®à¥à¤– मैटà¥à¤°à¤¿à¤• का रेखाचितà¥à¤°)",
"AlsoSendReportToTheseEmails": "इसके अलावा इन ईमेल (पà¥à¤°à¤¤à¤¿ पंकà¥à¤¤à¤¿ à¤à¤• ईमेल) को रिपोरà¥à¤Ÿ à¤à¥‡à¤œà¤¨à¥‡ के लिà¤:",
"AreYouSureDeleteReport": "कà¥à¤¯à¤¾ आप इस रिपोरà¥à¤Ÿ को और इसके निरà¥à¤§à¤¾à¤°à¤¿à¤¤ समय को हटाना चाहते हैं?",
- "CancelAndReturnToReports": "रदà¥à¤¦ करें और %sरिपोरà¥à¤Ÿ की सूची पर वापस%s जाà¤",
+ "CancelAndReturnToReports": "रदà¥à¤¦ करें और %1$sरिपोरà¥à¤Ÿ की सूची पर वापस%2$s जाà¤",
"CreateAndScheduleReport": "à¤à¤• रिपोरà¥à¤Ÿ तैयार करें और कारà¥à¤¯à¤•à¥à¤°à¤® तय करे",
"CreateReport": "रिपोरà¥à¤Ÿ बनाà¤à¤",
"CustomVisitorSegment": "विशिषà¥à¤Ÿ आगंतà¥à¤• खंड",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "मासिक अनà¥à¤¸à¥‚ची: रिपोरà¥à¤Ÿ पà¥à¤°à¤¤à¥à¤¯à¥‡à¤• माह के पहले दिन à¤à¥‡à¤œà¥€ जाà¤à¤—ी.",
"MustBeLoggedIn": "तà¥à¤®à¥à¤¹à¥‡à¤‚ विशिषà¥à¤Ÿ पà¥à¤°à¤¤à¤¿à¤µà¥‡à¤¦à¤¨ बनाने और अनà¥à¤¸à¥‚ची करने के लिठलॉग इन होना चाहिà¤.",
"NoRecipients": "इस रिपोरà¥à¤Ÿ में कोई पà¥à¤°à¤¾à¤ªà¥à¤¤à¤•à¤°à¥à¤¤à¤¾ नहीं हैं",
- "Pagination": "%s का %s पृषà¥à¤ ",
+ "Pagination": "%1$s का %2$s पृषà¥à¤ ",
"PiwikReports": "Piwik पà¥à¤°à¤¤à¤¿à¤µà¥‡à¤¦à¤¨",
"PleaseFindAttachedFile": "संलगà¥à¤¨ फाइल में %2$s के लिठअपने %1$s रिपोरà¥à¤Ÿ मिल दें",
"PleaseFindBelow": "%2$s के लिठअपने %1$s रिपोरà¥à¤Ÿ के नीचे खोजे .",
@@ -29,7 +29,7 @@
"ReportIncludeNWebsites": "रिपोरà¥à¤Ÿ में कम से कम à¤à¤• यातà¥à¤°à¤¾ (वेबसाइटों से %sवरà¥à¤¤à¤®à¤¾à¤¨ में उपलबà¥à¤§) है कि सà¤à¥€ वेबसाइटों के मà¥à¤–à¥à¤¯ मैटà¥à¤°à¤¿à¤•à¥à¤¸ शामिल होंगे.",
"ReportsIncluded": "सांखà¥à¤¯à¤¿à¤•à¥€ शामिल",
"ReportType": "के माधà¥à¤¯à¤® से रिपोरà¥à¤Ÿ à¤à¥‡à¤œà¥‡à¤‚",
- "Segment_Help": "आप इस ईमेल रिपोरà¥à¤Ÿ में डेटा को लागू करने के लिठà¤à¤• मौजूदा विशिषà¥à¤Ÿ खंड का चयन कर सकते हैं. तà¥à¤®à¥à¤¹à¥‡à¤‚ अपने डैशबोरà¥à¤¡ में विशिषà¥à¤Ÿ खंडों %s(खोलने के लिठयहां कà¥à¤²à¤¿à¤• करें)%s बना सकते हैं और संपादित कर सकते हैं, तो \"%s\", फिर \"%s\" के बॉकà¥à¤¸ पर कà¥à¤²à¤¿à¤• करें.",
+ "Segment_Help": "आप इस ईमेल रिपोरà¥à¤Ÿ में डेटा को लागू करने के लिठà¤à¤• मौजूदा विशिषà¥à¤Ÿ खंड का चयन कर सकते हैं. तà¥à¤®à¥à¤¹à¥‡à¤‚ अपने डैशबोरà¥à¤¡ में विशिषà¥à¤Ÿ खंडों %1$s(खोलने के लिठयहां कà¥à¤²à¤¿à¤• करें)%2$s बना सकते हैं और संपादित कर सकते हैं, तो \"%3$s\", फिर \"%4$s\" के बॉकà¥à¤¸ पर कà¥à¤²à¤¿à¤• करें.",
"SegmentAppliedToReports": "खंड '%s' को रिपोरà¥à¤Ÿ करने के लिठलागू किया जाता है.",
"SendReportNow": "अब रिपोरà¥à¤Ÿ à¤à¥‡à¤œà¥‡à¤‚",
"SendReportTo": "को रिपोरà¥à¤Ÿ à¤à¥‡à¤œà¥‡à¤‚",
diff --git a/plugins/ScheduledReports/lang/id.json b/plugins/ScheduledReports/lang/id.json
index 3d589736a1716120269a3f48b06c96f794be8f43..a3a23bca06c35bd4b5b4c86abbf30d091c34e47f 100644
--- a/plugins/ScheduledReports/lang/id.json
+++ b/plugins/ScheduledReports/lang/id.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(asali) Tampilkan tabel Laporan (Grafik hanya kunci metrik)",
"AlsoSendReportToTheseEmails": "Juga kirim laporan kepada surel berikut (satu surel tiap baris):",
"AreYouSureDeleteReport": "Apakah Anda yakin menghapus laporan dan jadwal ini?",
- "CancelAndReturnToReports": "Batalkan dan %skembali ke daftar laporan%s",
+ "CancelAndReturnToReports": "Batalkan dan %1$skembali ke daftar laporan%2$s",
"CreateAndScheduleReport": "Buat dan Jadwalkan laporan",
"CreateReport": "Buat Laporan",
"CustomVisitorSegment": "pecahan pengunjung kustom:",
@@ -20,7 +20,7 @@
"MonthlyScheduleHelp": "Laporan bulanan: laporan akan dikirim satiap hari pertama tiap bulan.",
"MustBeLoggedIn": "Anda harus masuk-log untuk membuat dan mengatur jadwal laporan.",
"NoRecipients": "Laporan ini tidak memiliki penerima",
- "Pagination": "Halaman %s dari %s",
+ "Pagination": "Halaman %1$s dari %2$s",
"PiwikReports": "Laporan Piwik",
"PleaseFindAttachedFile": "Silakan temukan berkas lampiran laporan %1$s Anda untuk %2$s.",
"PleaseFindBelow": "Silakan temukan di bawah laporan %1$s Anda untuk %2$s.",
@@ -28,7 +28,7 @@
"ReportIncludeNWebsites": "Laporan akan dimasukkan dalam matriks utama untuk setiap situs dengan sekurangnya satu kunjungan (dari situs %s saat ini yang tersedia).",
"ReportsIncluded": "Sertakan Statistik",
"ReportType": "Kirim laporan melalui",
- "Segment_Help": "Anda dapat menyeleksi pecahan kustom untuk diterapkan pada laporan surel ini. Anda dapat membuat dan menyunting pecahan kustom dalam panel kendali Anda %s(klik di sini untuk membuka)%s, lalu klik di kotak \"%s\", kemudian \"%s\".",
+ "Segment_Help": "Anda dapat menyeleksi pecahan kustom untuk diterapkan pada laporan surel ini. Anda dapat membuat dan menyunting pecahan kustom dalam panel kendali Anda %1$s(klik di sini untuk membuka)%2$s, lalu klik di kotak \"%3$s\", kemudian \"%4$s\".",
"SegmentAppliedToReports": "Pecahan '%s' telah diterapkan pada laporan.",
"SendReportNow": "Kirim Laporan sekarang",
"SendReportTo": "Kirim laporan ke",
diff --git a/plugins/ScheduledReports/lang/it.json b/plugins/ScheduledReports/lang/it.json
index bf796fd1c3aa8cbd3972aa74c112701869b99f20..447e4fe26cc1df6c0ab30712081af68e910760b8 100644
--- a/plugins/ScheduledReports/lang/it.json
+++ b/plugins/ScheduledReports/lang/it.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(predefinito) Mostra tabelle (Grafici solo per le metriche chiave)",
"AlsoSendReportToTheseEmails": "Manda il report anche a questi indirizzi email (un indirizzo email per riga):",
"AreYouSureDeleteReport": "Sei sicuro di voler eliminare questo report e la sua programmazione?",
- "CancelAndReturnToReports": "Annulla e %storna alla lista dei report%s",
+ "CancelAndReturnToReports": "Annulla e %1$storna alla lista dei report%2$s",
"CreateAndScheduleReport": "Crea e programma un report",
"CreateReport": "Crea Report",
"CustomVisitorSegment": "Segento Personalizzato Visitatore:",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "Pianificazione mensile: il report verrà inviato il primo giorno di ogni mese.",
"MustBeLoggedIn": "Devi avere effettuato l'accesso per creare e pianificare i report personalizzati.",
"NoRecipients": "Questo report non ha destinatari",
- "Pagination": "Pagina %s di %s",
+ "Pagination": "Pagina %1$s di %2$s",
"PiwikReports": "Report di Piwik",
"PleaseFindAttachedFile": "Potete trovare nel file allegato il tuo %1$s report per %2$s.",
"SentFromX": "Inviato da %s",
@@ -35,7 +35,7 @@
"ReportType": "Invia report tramite",
"ReportUpdated": "Report aggiornato",
"Segment_Deletion_Error": "Questo segmento non può essere eliminato o reso invisibile agli altri utenti perchè è utilizzato per generare %s report(s) email. Si prega di riprovare dopo aver rimosso questo segmento da questo report.",
- "Segment_Help": "È possibile selezionare un segmento personalizzato esistente da applicare ai dati in questo report e-mail. È possibile creare e modificare segmenti personalizzati nella tua dashboard %s(clicca qui per aprire)%s, quindi clicca sulla casella di controllo \"%s\", quindi su \"%s\".",
+ "Segment_Help": "È possibile selezionare un segmento personalizzato esistente da applicare ai dati in questo report e-mail. È possibile creare e modificare segmenti personalizzati nella vostra dashboard%1$s (clicca qui per aprire)%2$s, quindi fare clic sulla casella di controllo \"%3$s\", quindi su \"%4$s\".",
"SegmentAppliedToReports": "Ai report è applicato il segmento'%s'.",
"SendReportNow": "Invia report adesso",
"SendReportTo": "Invia il report a",
diff --git a/plugins/ScheduledReports/lang/ja.json b/plugins/ScheduledReports/lang/ja.json
index 677a7780174b485673ed79a59e58e235e84236d2..b3231e5abb36e988c1e6c7b97dd32199796f86ff 100644
--- a/plugins/ScheduledReports/lang/ja.json
+++ b/plugins/ScheduledReports/lang/ja.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(デフォルト)リãƒãƒ¼ãƒˆè¡¨ã‚’表示(グラフã¯ã‚ーメトリックスã®ã¿)",
"AlsoSendReportToTheseEmails": "以下ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã«ã‚‚é€ä¿¡ï¼ˆ1è¡Œã”ã¨ã«1アドレス）",
"AreYouSureDeleteReport": "ã“ã®ãƒªãƒãƒ¼ãƒˆã¨ã‚¹ã‚±ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’削除ã—ã¾ã™ã‹ï¼Ÿ",
- "CancelAndReturnToReports": "ã‚ャンセルã—ã¦%sリãƒãƒ¼ãƒˆä¸€è¦§ã¸æˆ»ã‚‹%s",
+ "CancelAndReturnToReports": "ã‚ャンセルã—ã¦%1$sリãƒãƒ¼ãƒˆä¸€è¦§ã¸æˆ»ã‚‹%2$s",
"CreateAndScheduleReport": "リãƒãƒ¼ãƒˆã®ä½œæˆã¨ã‚¹ã‚±ã‚¸ãƒ¥ãƒ¼ãƒ«",
"CreateReport": "リãƒãƒ¼ãƒˆã®ä½œæˆ",
"CustomVisitorSegment": "カスタムビジターセグメント:",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "月間スケジュール： リãƒãƒ¼ãƒˆã¯æ¯Žæœˆ1æ—¥ã«é€ä¿¡ã•ã‚Œã¾ã™ã€‚",
"MustBeLoggedIn": "カスタムリãƒãƒ¼ãƒˆã®ä½œæˆã¨ã‚¹ã‚±ã‚¸ãƒ¥ãƒ¼ãƒ«ã«ã¯ãƒã‚°ã‚¤ãƒ³ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚",
"NoRecipients": "ã“ã®ãƒ¬ãƒãƒ¼ãƒˆã¯ã€å—å–人ãŒã„ã¾ã›ã‚“",
- "Pagination": "%s 㮠%s ページ",
+ "Pagination": "%1$s 㮠%2$s ページ",
"PiwikReports": "Piwik リãƒãƒ¼ãƒˆ",
"PleaseFindAttachedFile": "%2$s ã® %1$s ã®ãƒªãƒãƒ¼ãƒˆã‚’添付ã—ã¦ã„ã¾ã™ã€‚",
"SentFromX": "%s ã‹ã‚‰é€ä¿¡ã•ã‚Œã¾ã™ã€‚",
@@ -35,7 +35,7 @@
"ReportType": "経由ã§ãƒ¬ãƒãƒ¼ãƒˆã‚’é€ä¿¡",
"ReportUpdated": "アップデートã•ã‚ŒãŸãƒ¬ãƒãƒ¼ãƒˆ",
"Segment_Deletion_Error": "ã“ã®ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã¯ã€E メールレãƒãƒ¼ãƒˆ %s ã®ä½œæˆã«ä½¿ç”¨ã•ã‚Œã‚‹ãŸã‚ã€å‰Šé™¤ã—ãŸã‚Šã€ä»–ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«å¯¾ã—éžè¡¨ç¤ºã«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ã“ã®ãƒ¬ãƒãƒ¼ãƒˆã‹ã‚‰ã“ã®ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã‚’削除ã—ãŸå¾Œã€å†åº¦ãŠè©¦ã—ãã ã•ã„。",
- "Segment_Help": "ã“ã® E メールレãƒãƒ¼ãƒˆã§ãƒ‡ãƒ¼ã‚¿ã‚’é©ç”¨ã™ã‚‹ã«ã¯ã€æ—¢å˜ã®ã‚«ã‚¹ã‚¿ãƒ セグメントをé¸æŠžã—ã¦ãã ã•ã„。ダッシュボード %s (ã“ã“をクリックã—ã¦é–‹ã) %s ã§ã‚«ã‚¹ã‚¿ãƒ セグメントã®ä½œæˆã€ç·¨é›†ãŒå¯èƒ½ã§ã™ã€‚次ã«ã€\"%s\" ボックスをクリックã—ã€\"%s\"。",
+ "Segment_Help": "ã“ã® E メールレãƒãƒ¼ãƒˆã§ãƒ‡ãƒ¼ã‚¿ã‚’é©ç”¨ã™ã‚‹ã«ã¯ã€æ—¢å˜ã®ã‚«ã‚¹ã‚¿ãƒ セグメントをé¸æŠžã—ã¦ãã ã•ã„。ダッシュボード %1$s (ã“ã“をクリックã—ã¦é–‹ã) %2$s ã§ã‚«ã‚¹ã‚¿ãƒ セグメントã®ä½œæˆã€ç·¨é›†ãŒå¯èƒ½ã§ã™ã€‚次ã«ã€\"%3$s\" ボックスをクリックã—ã€\"%4$s\"。",
"SegmentAppliedToReports": "セグメント '%s' ã¯ãƒ¬ãƒãƒ¼ãƒˆã«é©ç”¨ã•ã‚Œã¾ã—ãŸã€‚",
"SendReportNow": "ãŸã ã¡ã«ãƒªãƒãƒ¼ãƒˆã‚’é€ä¿¡",
"SendReportTo": "リãƒãƒ¼ãƒˆã®é€ä¿¡å…ˆ",
diff --git a/plugins/ScheduledReports/lang/ko.json b/plugins/ScheduledReports/lang/ko.json
index cdbfd197bfc15a2594e51466816477f61b00c4df..d9976eb6e477277fc032acedb09a873d8cf88b7f 100644
--- a/plugins/ScheduledReports/lang/ko.json
+++ b/plugins/ScheduledReports/lang/ko.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(기본) ë³´ê³ í‘œ 표시 (그래프는 키 메트ë¦ìŠ¤ë§Œ)",
"AlsoSendReportToTheseEmails": "ë‹¤ìŒ ì´ë©”ì¼ ì£¼ì†Œë¡œ ì „ì†¡ (í•œ ì¤„ì— í•˜ë‚˜ì˜ ì£¼ì†Œ):",
"AreYouSureDeleteReport": "ì´ ë³´ê³ ì„œ ë° ì¼ì •ì„ ì‚ì œ í•˜ì‹œê² ìŠµë‹ˆê¹Œ?",
- "CancelAndReturnToReports": "ì·¨ì†Œí•˜ê³ %së³´ê³ ì„œ 목ë¡ìœ¼ë¡œ ì´ë™%s",
+ "CancelAndReturnToReports": "ì·¨ì†Œí•˜ê³ %1$së³´ê³ ì„œ 목ë¡ìœ¼ë¡œ ì´ë™%2$s",
"CreateAndScheduleReport": "ë³´ê³ ì„œ 작성 ë° ì¼ì •",
"CreateReport": "ë³´ê³ ì„œ ìƒì„±",
"CustomVisitorSegment": "맞춤형 ë°©ë¬¸ìž ì„¸ê·¸ë¨¼íŠ¸:",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "월간 스케줄: ë³´ê³ ì„œëŠ” 매월 1ì¼ì— 발송ë©ë‹ˆë‹¤.",
"MustBeLoggedIn": "ë³´ê³ ì„œ 작성 ë° ì¼ì •ì„ 사용ìžì •ì˜í•˜ë ¤ë©´ 로그ì¸í•´ì•¼í•©ë‹ˆë‹¤.",
"NoRecipients": "ì´ ë³´ê³ ì„œì˜ ìˆ˜ì‹ ìžê°€ ì—†ìŒ",
- "Pagination": "페ì´ì§€ %s \/ %s",
+ "Pagination": "페ì´ì§€ %1$s \/ %2$s",
"PiwikReports": "Piwik ë³´ê³ ì„œ",
"PleaseFindAttachedFile": "%2$sì˜ %1$sì˜ ë³´ê³ ì„œë¥¼ 첨부합니다.",
"SentFromX": "%sì—ì„œ 보내기",
@@ -35,7 +35,7 @@
"ReportType": "ë³´ê³ ì„œ 발송 via",
"ReportUpdated": "ë³´ê³ ì„œ ì—…ë°ì´íŠ¸",
"Segment_Deletion_Error": "ì´ ì„¸ê·¸ë©˜íŠ¸ëŠ” 다른 사용ìžë“¤ì´ ì‚ì œë‚˜ ê°ì¶”ë„ë¡ í• ìˆ˜ 없습니다. 왜ëƒí•˜ë©´ %sì˜ ì´ë©”ì¼ ë³´ê³ ì„œ(들)를 ë§Œë“œëŠ”ë° ì‚¬ìš©ë˜ê¸° 때문입니다. 해당 ë³´ê³ ì„œ(들)ì—ì„œ ì´ ì„¸ê·¸ë¨¼íŠ¸ë¥¼ ì œê±°í•˜ì‹ í›„ 다시 ì‹œë„하시길 ë°”ëžë‹ˆë‹¤.",
- "Segment_Help": "존재하는 맞춤형 세그멘트를 해당 ì´ë©”ì¼ ë³´ê³ ì„œì— ì„ íƒí•˜ì—¬ ì ìš©í• ìˆ˜ 있습니다. 대쉬보드 %s(열기)%sì—ì„œ 맞춤형 세그멘트를 만들거나 ìˆ˜ì •í•˜ì‹ í›„ \"%s\" 박스를 í´ë¦í•˜ì„¸ìš”. ê·¸ 후 \"%s\"하세요.",
+ "Segment_Help": "존재하는 맞춤형 세그멘트를 해당 ì´ë©”ì¼ ë³´ê³ ì„œì— ì„ íƒí•˜ì—¬ ì ìš©í• ìˆ˜ 있습니다. 대쉬보드 %1$s(열기)%2$sì—ì„œ 맞춤형 세그멘트를 만들거나 ìˆ˜ì •í•˜ì‹ í›„ \\\"%3$s\\\" 박스를 í´ë¦í•˜ì„¸ìš”. ê·¸ 후 \\\"%4$s\\\"하세요.",
"SegmentAppliedToReports": "세그먼트 '%s'는 ë³´ê³ ì„œì— ì ìš©ë©ë‹ˆë‹¤.",
"SendReportNow": "ë³´ê³ ì„œ 즉시 ì œì¶œ",
"SendReportTo": "ë³´ê³ ì„œë¥¼ ì „ì†¡í• ëŒ€ìƒ",
diff --git a/plugins/ScheduledReports/lang/lt.json b/plugins/ScheduledReports/lang/lt.json
index 34906945baa3ab4377569e858261ac89a538f94f..73a1536acff8bacb0bceed79f00392e523637713 100644
--- a/plugins/ScheduledReports/lang/lt.json
+++ b/plugins/ScheduledReports/lang/lt.json
@@ -8,7 +8,7 @@
"EmailSchedule": "Siuntimo tvarkaraštis",
"FrontPage": "Pirminis puslapis",
"MonthlyScheduleHelp": "Kas mėnesį: ataskaita bus išsiųsta kiekvieno mėnesio pirmąją dieną.",
- "Pagination": "Puslapis %s iš %s",
+ "Pagination": "Puslapis %1$s iš %2$s",
"PiwikReports": "Piwik ataskaitos",
"PleaseFindAttachedFile": "Prašome peržiūrėti %1$s ataskaitų failą skirtą %2$s.",
"ReportFormat": "Ataskaitos formatas",
diff --git a/plugins/ScheduledReports/lang/lv.json b/plugins/ScheduledReports/lang/lv.json
index 51fbad5cdf0b8e03551db47ccde3141d0ad390f9..9efdf00bc20bdcb4602b13d9c99d05ed0f795a07 100644
--- a/plugins/ScheduledReports/lang/lv.json
+++ b/plugins/ScheduledReports/lang/lv.json
@@ -4,7 +4,7 @@
"EmailHello": "Sveiki,",
"EmailReports": "E-pasta atskaites",
"FrontPage": "PirmÄ lapa",
- "Pagination": "%s. lapa no %s",
+ "Pagination": "%1$s. lapa no %2$s",
"PiwikReports": "Piwik atskaites",
"ReportFormat": "Atskaites formÄts",
"ReportsIncluded": "IekļautÄ statistika",
diff --git a/plugins/ScheduledReports/lang/nb.json b/plugins/ScheduledReports/lang/nb.json
index 5e9517a0d087423dfa45be2c6d8e6b0fa57f916a..8cebd44bfa57a0cb0a85c63b1ae936ca945d49c9 100644
--- a/plugins/ScheduledReports/lang/nb.json
+++ b/plugins/ScheduledReports/lang/nb.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(standard) Vis rapporttabeller (grafer kun for nøkkeltall)",
"AlsoSendReportToTheseEmails": "Send også rapporten til disse e-postadressene (en adresse per linje):",
"AreYouSureDeleteReport": "Er du sikker på at du vil slette denne rapporten og timeplanen?",
- "CancelAndReturnToReports": "Avbryt og %sreturner til listen over rapporter%s",
+ "CancelAndReturnToReports": "Avbryt og %1$sreturner til listen over rapporter%2$s",
"CreateAndScheduleReport": "Lag og planlegg en rapport",
"CreateReport": "Lag rapport",
"CustomVisitorSegment": "Tilpasset besøkssegment:",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "Månedsplan: Rapportene blir sendt første dag i hver måned.",
"MustBeLoggedIn": "Du må være logget inn for å lage og planlegge tilpassede rapporter.",
"NoRecipients": "Denne rapporten har ingen mottakere",
- "Pagination": "Side %s av %s",
+ "Pagination": "Side %1$s av %2$s",
"PiwikReports": "Piwik-rapporter",
"PleaseFindAttachedFile": "I den vedlagte filen finner du din %1$s rapport for %2$s.",
"SentFromX": "Sendt fra %s.",
@@ -35,7 +35,7 @@
"ReportType": "Send rapport via",
"ReportUpdated": "Rapport oppdatert",
"Segment_Deletion_Error": "Dette segmentet kan ikke slettes eller gjøres usynlig for andre brukere fordi det brukes for å generere e-postrapporten(e) %s. Vennligst prøv igjen etter å ha fjernet segmentet fra denne (disse) rapportene.",
- "Segment_Help": "Du kan velge et eksisterende tilpasset segment som skal brukes på dataene i denne e-postrapporten. Du kan lage og redigere tilpassede segmenter i din oversikt %s(klikk her for å åpne)%s, så klikker du på boksen «%s», så «%s».",
+ "Segment_Help": "Du kan velge et eksisterende tilpasset segment som skal brukes på dataene i denne e-postrapporten. Du kan lage og redigere tilpassede segmenter i din oversikt %1$s(klikk her for å åpne)%2$s, så klikker du på boksen «%3$s», så «%4$s».",
"SegmentAppliedToReports": "Segmentet «%s» er applisert til rapportene.",
"SendReportNow": "Send rapport nå",
"SendReportTo": "Send rapport til",
diff --git a/plugins/ScheduledReports/lang/nl.json b/plugins/ScheduledReports/lang/nl.json
index 05a9c9d4305b7f001d7cb040f56851fe676538ca..b1843bb88e68e526685eb74d21eaa14c15059058 100644
--- a/plugins/ScheduledReports/lang/nl.json
+++ b/plugins/ScheduledReports/lang/nl.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(standaard) Toon tabellen (grafieken alleen voor belangrijke gegevens)",
"AlsoSendReportToTheseEmails": "Verzend het rapport tevens naar de volgende e-mail adressen (één per lijn):",
"AreYouSureDeleteReport": "Weet u zeker dat u dit rapport en tijdsschema wilt verwijderen?",
- "CancelAndReturnToReports": "Annuleren en %s terug naar de lijst met rapporten%s",
+ "CancelAndReturnToReports": "Annuleren en %1$s terug naar de lijst met rapporten%2$s",
"CreateAndScheduleReport": "Maak en plan een rapport",
"CreateReport": "Maak een rapport",
"CustomVisitorSegment": "Aangepast bezoekers segment:",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "Maandelijks versturen: Rapport zal worden verzonden elke eerste dag van de maand.",
"MustBeLoggedIn": "U moet ingelogd zijn om aangepaste rapporten te maken en in te plannen.",
"NoRecipients": "Dit rapport heeft geen ontvangers",
- "Pagination": "Pagina %s van %s",
+ "Pagination": "Pagina %1$s van %2$s",
"PiwikReports": "Piwik rapporten",
"PleaseFindAttachedFile": "In de bijlage treft u uw %1$s rapport voor %2$s.",
"SentFromX": "Verzonden vanaf %s.",
diff --git a/plugins/ScheduledReports/lang/pl.json b/plugins/ScheduledReports/lang/pl.json
index d4406d95be4fe784ed786681d12a48ef0301dbb6..ba349d0aebf4e4c166e3f68f3b699676664b9cac 100644
--- a/plugins/ScheduledReports/lang/pl.json
+++ b/plugins/ScheduledReports/lang/pl.json
@@ -5,7 +5,7 @@
"AggregateReportsFormat_TablesAndGraphs": "Wyświetlane tabeli i wykresów dla wszystkich raportów",
"AggregateReportsFormat_TablesOnly": "(domyślny) Wyświetlane tabele raportu (wykresy tylko dla kluczowych wskaźników)",
"AlsoSendReportToTheseEmails": "Również wyślij raport na podane adresy e-mail (jeden na linię):",
- "CancelAndReturnToReports": "Anuluj i %spowróć do listy raportów%s",
+ "CancelAndReturnToReports": "Anuluj i %1$spowróć do listy raportów%2$s",
"CreateAndScheduleReport": "Utwórz i zaplanuj raport",
"CreateReport": "Utwórz raport",
"DescriptionOnFirstPage": "Opis będzie wyświetlany na pierwszej stronie raportu.",
diff --git a/plugins/ScheduledReports/lang/pt-br.json b/plugins/ScheduledReports/lang/pt-br.json
index d81731b7709a4c976a4a642e6d25541a8519c283..e12cfc3eed67232acc9d9cf6dd5099e5b8b8977a 100644
--- a/plugins/ScheduledReports/lang/pt-br.json
+++ b/plugins/ScheduledReports/lang/pt-br.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(padrão) Exibir relatório em tabelas (Gráficos apenas para as principais métricas)",
"AlsoSendReportToTheseEmails": "Também enviar o relatório para esses e-mails (um e-mail por linha):",
"AreYouSureDeleteReport": "Tem certeza de que deseja excluir este relatório e sua programação?",
- "CancelAndReturnToReports": "Cancelar e %svoltar a lista de relatórios%s",
+ "CancelAndReturnToReports": "Cancelar e %1$svoltar a lista de relatórios%2$s",
"CreateAndScheduleReport": "Criar e agendar um relatório",
"CreateReport": "Criar relatório",
"CustomVisitorSegment": "Segmento de visitantes personalizado:",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "Programação mensal: relatório será enviado no primeiro dia de cada mês.",
"MustBeLoggedIn": "Você precisa estar logado para criar e agendar relatórios personalizados.",
"NoRecipients": "Este relatório não tem destinatários",
- "Pagination": "Página %s de %s",
+ "Pagination": "Página %1$s de %2$s",
"PiwikReports": "Relatórios Piwik",
"PleaseFindAttachedFile": "Por favor, encontrar no arquivo anexo o relatório %1$s para %2$s.",
"SentFromX": "Enviado de %s.",
@@ -35,7 +35,7 @@
"ReportType": "Enviar relatório via",
"ReportUpdated": "Relatório atualizado",
"Segment_Deletion_Error": "Este segmento não pode ser apagado ou tornado invisÃvel para outros usuários por ser usado para gerar o relatório de e-mail(s) %s. Por favor, tente novamente após remover este segmento deste relatório(s).",
- "Segment_Help": "Você pode selecionar um segmento personalizado existente para aplicar aos dados deste relatório de e-mail. Você pode criar e editar segmentos personalizados em seu painel de controle %s (clique aqui para abrir) %s , em seguida, clique na caixa de \"%s\", então \"%s\".",
+ "Segment_Help": "Você pode selecionar um segmento personalizado existente para aplicar aos dados deste relatório de e-mail. Você pode criar e editar segmentos personalizados em seu painel de controle %1$s (clique aqui para abrir) %2$s , em seguida, clique na caixa de \"%3$s\", então \"%4$s\".",
"SegmentAppliedToReports": "O Segmento %s foi aplicado aos relatórios.",
"SendReportNow": "Enviar relatório agora",
"SendReportTo": "Enviar relatório para",
diff --git a/plugins/ScheduledReports/lang/pt.json b/plugins/ScheduledReports/lang/pt.json
index 3c2e889c4df4b56cd847cdcdac9bb92a3bef950c..18c1db9140f181b4dbf99731c24ec27835fe24f3 100644
--- a/plugins/ScheduledReports/lang/pt.json
+++ b/plugins/ScheduledReports/lang/pt.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(por omissão) Visualização de tabelas de relatórios (gráficos apenas para métricas chave)",
"AlsoSendReportToTheseEmails": "Também enviar o relatório para estes emails (um email por linha):",
"AreYouSureDeleteReport": "Tem certeza de que deseja excluir este relatório e o seu agendamento?",
- "CancelAndReturnToReports": "Cancelar e %sretornar para a lista de relatórios %s",
+ "CancelAndReturnToReports": "Cancelar e %1$sretornar para a lista de relatórios %2$s",
"CreateAndScheduleReport": "Criar e agendar um relatório",
"CreateReport": "Criar um relatório",
"DescriptionOnFirstPage": "A descrição do relatório será exibido na primeira página do relatório.",
@@ -16,7 +16,7 @@
"FrontPage": "Primeira Página",
"MonthlyScheduleHelp": "Agenda mensal: o relatório será enviado no primeiro dia de cada mês.",
"MustBeLoggedIn": "Deve estar autenticado para criar e agendar relatórios personalizados.",
- "Pagination": "Página %s de %s",
+ "Pagination": "Página %1$s de %2$s",
"PiwikReports": "Relatórios Piwik",
"PleaseFindAttachedFile": "Por favor encontre anexado o seu %1$s relatório para %2$s.",
"PleaseFindBelow": "Veja abaixo o relatório %1$s para %2$s.",
diff --git a/plugins/ScheduledReports/lang/ro.json b/plugins/ScheduledReports/lang/ro.json
index ecb7b824514bd0149fb47cfc8db25e57c3cb5d34..5fb7404789c78a4267775b66f9c3d2903d3f8a64 100644
--- a/plugins/ScheduledReports/lang/ro.json
+++ b/plugins/ScheduledReports/lang/ro.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(implicit) Raport tabele de afișare (Diagramele numai pentru indicatorii cheie)",
"AlsoSendReportToTheseEmails": "De asemenea, trimite raportul la aceste e-mailuri (un e-mail pe linie):",
"AreYouSureDeleteReport": "Sigur doriți să ștergeți acest raport și programul său?",
- "CancelAndReturnToReports": "Anuleaza și %sreveni-o la lista de rapoarte%s",
+ "CancelAndReturnToReports": "Anuleaza și %1$sreveni-o la lista de rapoarte%2$s",
"CreateAndScheduleReport": "Creați și Programați un raport",
"CreateReport": "Creare raport",
"CustomVisitorSegment": "Segment personalizat de vizitatori",
@@ -20,7 +20,7 @@
"MonthlyScheduleHelp": "Program lunar: Raportul va fi trimis în prima zi a fiecărei luni.",
"MustBeLoggedIn": "Trebuie să fii logat pentru a crea și programa rapoarte personalizate.",
"NoRecipients": "Acest raport nu are destinatari",
- "Pagination": "Pagina %s din %s",
+ "Pagination": "Pagina %1$s din %2$s",
"PiwikReports": "Rapoarte Piwik",
"PleaseFindAttachedFile": "Vă rugăm să găsiți în fișierul tau atașat %1$s raportul pentru %2$s.",
"PleaseFindBelow": "Va rugam sa gasiti mai jos raport ul tau de %1$s pentru %2$s.",
@@ -31,7 +31,7 @@
"ReportType": "Expediază raportul prin",
"ReportUpdated": "Raport actualizat",
"Segment_Deletion_Error": "Acest segment nu poate fi șters sau făcut invizibil pentru alți utilizatori, deoarece este folosit pentru a genera un raport de e-mail (e)%s. Vă rugăm să încercați din nou după eliminarea acestui segment din acest raport .",
- "Segment_Help": "Puteți selecta un segment personalizat existent pentru a aplica la datele din acest email raport . Puteți crea și edita segmente personalizate în tabloul de bord %s(click aici pentru a deschide)%s, apoi faceți clic pe caseta \"%s\", apoi \"%s\".",
+ "Segment_Help": "Puteți selecta un segment personalizat existent pentru a aplica la datele din acest email raport . Puteți crea și edita segmente personalizate în tabloul de bord %1$s(click aici pentru a deschide)%2$s, apoi faceți clic pe caseta \"%3$s\", apoi \"%4$s\".",
"SegmentAppliedToReports": "Segmentul '%s' este aplicat la rapoarte.",
"SendReportNow": "Expediază raportul imediat",
"SendReportTo": "Exediază raportul către",
diff --git a/plugins/ScheduledReports/lang/ru.json b/plugins/ScheduledReports/lang/ru.json
index 081d34710dc14ba55f1fadd447a836438029ff4a..d29d3b263ed8969c01ebc3d650ec078b5695c5f2 100644
--- a/plugins/ScheduledReports/lang/ru.json
+++ b/plugins/ScheduledReports/lang/ru.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(по умолчанию) Отображать таблицы отчетов (графики только Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡ÐµÐ²Ñ‹Ñ… показетелей)",
"AlsoSendReportToTheseEmails": "Также отправлÑÑ‚ÑŒ отчеты на Ñлудующие e-mail адреÑа (по одному в каждой Ñтроке):",
"AreYouSureDeleteReport": "Ð’Ñ‹ уверены, что хотите удалить отчет и его раÑпиÑание?",
- "CancelAndReturnToReports": "Отменить и %sвернутьÑÑ Ðº ÑпиÑку отчетов%s",
+ "CancelAndReturnToReports": "Отменить и %1$sвернутьÑÑ Ðº ÑпиÑку отчетов%2$s",
"CreateAndScheduleReport": "Создать и наÑтроить раÑпиÑание отчетов",
"CreateReport": "Создать отчетноÑÑ‚ÑŒ",
"DescriptionOnFirstPage": "ОпиÑание отчета будет отображено на первой Ñтрание отчета.",
@@ -20,7 +20,7 @@
"MonthlyScheduleHelp": "ЕжемеÑÑчное раÑпиÑание: отчеты будут раÑÑылатьÑÑ ÐºÐ°Ð¶Ð´Ñ‹Ð¹ первый день меÑÑца.",
"MustBeLoggedIn": "Ð’Ñ‹ должны быть авторизованы Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ€Ð°ÑпиÑÐ°Ð½Ð¸Ñ Ð¾Ñ‚Ñ‡ÐµÑ‚Ð¾Ð².",
"NoRecipients": "У Ñтого отчета нет получателей",
- "Pagination": "Страница %s из %s",
+ "Pagination": "Страница %1$s из %2$s",
"PiwikReports": "Отчеты Веб-аналитики",
"PleaseFindAttachedFile": "К Ñтому пиÑьму прикреплен файл %1$s, ÑвлÑющийÑÑ Ð¾Ñ‚Ñ‡ÐµÑ‚Ð¾Ð¼ Ð´Ð»Ñ %2$s.",
"PleaseFindBelow": "ПожалуйÑта, ниже вашего %1$s отчет за %2$s.",
@@ -31,7 +31,7 @@
"ReportsIncluded": "Данные, включенные в отчет",
"ReportType": "Отправить отчет Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ",
"ReportUpdated": "Отчёт обновлён",
- "Segment_Help": "Ð’Ñ‹ можете выбрать ÑущеÑтвующий пользовательÑкий Ñегмент Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ðº данным Ð´Ð»Ñ Ñтого отчёта. Ð’Ñ‹ можете Ñоздавать и редактировать пользовательÑкие Ñегменты на панели инÑтрументов %s(нажмите здеÑÑŒ, чтобы открыть)%s, далее нажмите на \"%s\", затем \"%s\".",
+ "Segment_Help": "Ð’Ñ‹ можете выбрать ÑущеÑтвующий пользовательÑкий Ñегмент Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ðº данным Ð´Ð»Ñ Ñтого отчёта. Ð’Ñ‹ можете Ñоздавать и редактировать пользовательÑкие Ñегменты на панели инÑтрументов %1$s(нажмите здеÑÑŒ, чтобы открыть)%2$s, далее нажмите на \"%3$s\", затем \"%4$s\".",
"SendReportNow": "Отправить отчет ÑейчаÑ",
"SendReportTo": "Получатели",
"SentToMe": "Отправить мне",
diff --git a/plugins/ScheduledReports/lang/sl.json b/plugins/ScheduledReports/lang/sl.json
index 6867ebf308cf08f0f495fb32209125b300bdffe4..6d88992f8cc94fe4d5ab8299c47363bd4697b1d7 100644
--- a/plugins/ScheduledReports/lang/sl.json
+++ b/plugins/ScheduledReports/lang/sl.json
@@ -9,7 +9,7 @@
"EmailSchedule": "Urnik Emailov",
"FrontPage": "Prva Stran",
"MonthlyScheduleHelp": "MeseÄno poroÄilo: poroÄilo bo poslano vsak prvi dan v mesecu.",
- "Pagination": "Stran %s od %s",
+ "Pagination": "Stran %1$s od %2$s",
"PiwikReports": "Piwik PoroÄila",
"ReportFormat": "Format poroÄila",
"ReportsIncluded": "Statistika vkljuÄena",
diff --git a/plugins/ScheduledReports/lang/sq.json b/plugins/ScheduledReports/lang/sq.json
index c6e658cd139d0d1a0743fc3243b1f56d7fcace4e..2adc7d6ab301d4a2aed6da93a9fb2aafff31faae 100644
--- a/plugins/ScheduledReports/lang/sq.json
+++ b/plugins/ScheduledReports/lang/sq.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(parazgjedhje) Shfaq tabela Raporti (Grafikë vetëm për matjet kyçe)",
"AlsoSendReportToTheseEmails": "Dërgoje raportin edhe te këto email-e (një email për rresht):",
"AreYouSureDeleteReport": "Jeni i sigurt se doni të fshihet ky raport dhe planifikimi për të?",
- "CancelAndReturnToReports": "Anuloje dhe %skthehu te lista e raporteve%s",
+ "CancelAndReturnToReports": "Anuloje dhe %1$skthehu te lista e raporteve%2$s",
"CreateAndScheduleReport": "Krijoni dhe Planifikoni një raport",
"CreateReport": "Krijoje Raportin",
"DescriptionOnFirstPage": "Përshkrimi i raportit do të shfaqet te faqja e parë e raportit.",
@@ -16,7 +16,7 @@
"FrontPage": "Faqja Ballore",
"MonthlyScheduleHelp": "Planifikim mujor: raporti do të dërgohet ditën e parë të çdo muaji.",
"MustBeLoggedIn": "Duhet të jeni i futur që të krijoni dhe të planifikoni raporte të personalizuar.",
- "Pagination": "Faqja %s nga %s",
+ "Pagination": "Faqja %1$s nga %2$s",
"PiwikReports": "Raporte Piwik",
"PleaseFindAttachedFile": "Ju lutem, shihni te kartela bashkangjitur %1$s raportin tuaj për %2$s.",
"PleaseFindBelow": "Ju lutem, shihni më poshtë raportin tuaj %1$s për %2$s.",
diff --git a/plugins/ScheduledReports/lang/sr.json b/plugins/ScheduledReports/lang/sr.json
index e3666b4c53cad34c0eee77a19a28339bcc29af3e..4361ff7d96640681a0b292b54570cdd5ff4ac480 100644
--- a/plugins/ScheduledReports/lang/sr.json
+++ b/plugins/ScheduledReports/lang/sr.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "Prikaži tabele izveÅ¡taja i grafikone za kljuÄne metrike (podrazumevano)",
"AlsoSendReportToTheseEmails": "Izveštaje pošalji i na sledeće adrese (jedna elektronska adresa po liniji):",
"AreYouSureDeleteReport": "Da li ste sigurni da želite da obrišete ovaj izveštaj i njegovu zakazanu dinamiku slanja?",
- "CancelAndReturnToReports": "Prekini i %svrati se na spisak izveštaja%s",
+ "CancelAndReturnToReports": "Prekini i %1$svrati se na spisak izveštaja%2$s",
"CreateAndScheduleReport": "Kreiraj i zakaži izveštaj",
"CreateReport": "Kreiraj izveštaj",
"CustomVisitorSegment": "KorisniÄki definisan segment posetilaca:",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "MeseÄno zakazivanje: izveÅ¡taj će biti poslat svakog prvog u mesecu.",
"MustBeLoggedIn": "Morate biti prijavljeni na sistem kako biste kreirali i zakazivali izveštaje.",
"NoRecipients": "Nije definisan primaoc",
- "Pagination": "Strana %s od %s",
+ "Pagination": "Strana %1$s od %2$s",
"PiwikReports": "Piwik izveštaji",
"PleaseFindAttachedFile": "u prilogu se nalazi vaš %1$s izveštaj za %2$s.",
"SentFromX": "Poslato od strane %s.",
@@ -35,7 +35,7 @@
"ReportType": "Pošalji izveštaj preko",
"ReportUpdated": "Izveštaj je ažuriran",
"Segment_Deletion_Error": "Ovaj segment nije moguće obrisati ili uÄiniti nevidljivim ostalim korisnicima poÅ¡to se on koristi za generisanje elektronskih izveÅ¡taja %s. PokuÅ¡ajte ponovo nakon Å¡to ga uklonite iz izveÅ¡taja.",
- "Segment_Help": "Možete da izaberete postojeći segment kako biste ga primenili na podatke u ovom elektronskom izveštaju. Segmente možete kreirati i menjati preko konzole %s(kliknite ovde)%s, a zatim kliknite na \"%s\", pa na \"%s\".",
+ "Segment_Help": "Možete da izaberete postojeći segment kako biste ga primenili na podatke u ovom elektronskom izveštaju. Segmente možete kreirati i menjati preko konzole %1$s(kliknite ovde)%2$s, a zatim kliknite na \"%3$s\", pa na \"%4$s\".",
"SegmentAppliedToReports": "Segment '%s' je primenjen na izveštaje.",
"SendReportNow": "Pošalji sad",
"SendReportTo": "Pošalji na",
diff --git a/plugins/ScheduledReports/lang/sv.json b/plugins/ScheduledReports/lang/sv.json
index fe6835f27c2f6702dc6cca53c6b93600dc1acc17..f454b002aa1e69c7152ee2943b3acb44f90e2c39 100644
--- a/plugins/ScheduledReports/lang/sv.json
+++ b/plugins/ScheduledReports/lang/sv.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(standard) Visa rapporttabeller (Diagram endast för nyckeltal)",
"AlsoSendReportToTheseEmails": "Skicka också rapporterna till dessa e-postadresser (en e-postadress per rad):",
"AreYouSureDeleteReport": "Är du säker på att du vill ta bort denna rapport och dess schemaläggning?",
- "CancelAndReturnToReports": "Avbryt och %såtergå till listan över rapporter%s",
+ "CancelAndReturnToReports": "Avbryt och %1$såtergå till listan över rapporter%2$s",
"CreateAndScheduleReport": "Skapa och schemalägg en rapport",
"CreateReport": "Skapa rapport",
"CustomVisitorSegment": "Kundbesökssegment:",
@@ -20,9 +20,10 @@
"MonthlyScheduleHelp": "Månatligt schema: Rapporten kommer att skickas ut den första dagen i varje månad.",
"MustBeLoggedIn": "Du måste vara inloggad för att skapa och schemalägga anpassade rapporter.",
"NoRecipients": "Rapporten har ingen mottagare",
- "Pagination": "Sida %s av %s",
+ "Pagination": "Sida %1$s av %2$s",
"PiwikReports": "Piwik Rapporter",
"PleaseFindAttachedFile": "Du finner din rapport %1$s i den bifogade filen för %2$s.",
+ "SentFromX": "Skickat från %s.",
"PleaseFindBelow": "Nedan hittar du din %1$s rapport för %2$s.",
"ReportFormat": "Rapportformat",
"ReportIncludeNWebsites": "Rapporten kommer att innehålla viktiga mättal för alla webbplatser som har minst ett besök (från %s webbsidorna som för tillfället är tillgängliga).",
@@ -31,7 +32,7 @@
"ReportType": "Skicka rapport via",
"ReportUpdated": "Rapporten har uppdaterats",
"Segment_Deletion_Error": "Det här segmentet kan inte raderas eller göras osynligt för andra användare eftersom det genererar mailrapporter (s) %s. Pröva igen efter att du har tagit bort det här segmentet från rapporten (s).",
- "Segment_Help": "Du kan välja ett befintligt kundsegment för att applicera data i den här mailrapporten. Du kan skapa och redigera kundsegment på ditt skrivbord %s (klicka här för att öppna)%s, efter det klickar du på \"%s\" lådan, efter det \"%s\".",
+ "Segment_Help": "Du kan välja ett befintligt kundsegment för att applicera data i den här mailrapporten. Du kan skapa och redigera kundsegment på ditt skrivbord %1$s (klicka här för att öppna)%2$s, efter det klickar du på \"%3$s\" lådan, efter det \"%4$s\".",
"SegmentAppliedToReports": "Segmentet '%s' har applicerats till rapporterna.",
"SendReportNow": "Skicka rapport nu",
"SendReportTo": "Skicka rapport till",
diff --git a/plugins/ScheduledReports/lang/th.json b/plugins/ScheduledReports/lang/th.json
index d502575ee33dc94d04aa12d1dea0d1b022878d6e..fca3ca7734dd566a705a6c66bdb271afcd64bc16 100644
--- a/plugins/ScheduledReports/lang/th.json
+++ b/plugins/ScheduledReports/lang/th.json
@@ -6,7 +6,7 @@
"EmailReports": "รายงานà¸à¸µà¹€à¸¡à¸¥à¹Œ",
"EmailSchedule": "ตารางà¸à¸²à¸£à¸—ำงานขà¸à¸‡à¸à¸µà¹€à¸¡à¸¥à¹Œ",
"MonthlyScheduleHelp": "ตารางเวลารายเดืà¸à¸™: รายงานจะถูà¸à¸ªà¹ˆà¸‡à¹„ปวันà¹à¸£à¸à¸‚à¸à¸‡à¹à¸•à¹ˆà¸¥à¸°à¹€à¸”ืà¸à¸™",
- "Pagination": "หน้า %s จาภ%s",
+ "Pagination": "หน้า %1$s จาภ%2$s",
"PiwikReports": "รายงาน Piwik",
"PleaseFindAttachedFile": "à¸à¸£à¸¸à¸“าหาในไฟล์à¹à¸™à¸šà¸‚à¸à¸‡à¸„ุณ %1$s รายงานสำหรับ %2$s",
"ReportFormat": "รูปà¹à¸šà¸šà¸£à¸²à¸¢à¸‡à¸²à¸™",
diff --git a/plugins/ScheduledReports/lang/tl.json b/plugins/ScheduledReports/lang/tl.json
index ffefbac8abbdd2802b5d2bcbd4f652f250f763a8..8cb29c4914f87af1133c00368548505d4b1e2cc6 100644
--- a/plugins/ScheduledReports/lang/tl.json
+++ b/plugins/ScheduledReports/lang/tl.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(default) Ipakita ang mga table ng Report(mga graph lamang para sa mga key metric)",
"AlsoSendReportToTheseEmails": "Magpadala rin ng mga ulat sa mga email na ito (isang email sa bawat linya).",
"AreYouSureDeleteReport": "Sigurado ka bang gusto mong burahin ang ulat at ang iskedyul nito?",
- "CancelAndReturnToReports": "Ikansela at ibalik ang %s sa listahan ng mga ulat %s",
+ "CancelAndReturnToReports": "Ikansela at ibalik ang %1$s sa listahan ng mga ulat %2$s",
"CreateAndScheduleReport": "Lumikha at Mag-iskedyul ng ulat",
"CreateReport": "Lumikha ng ulat",
"CustomVisitorSegment": "Custom na segment ng pagbisita:",
@@ -20,7 +20,7 @@
"MonthlyScheduleHelp": "Buwanang iskedyul: ang ulat ay ipapadala sa unang araw ng bawat buwan.",
"MustBeLoggedIn": "Kailangang naka-log in upang gumawa at mag-iskedyul ng mga pasadyang ulat",
"NoRecipients": "Wala pang makakatanggap sa ulat na ito",
- "Pagination": "Pahina %s ng %s",
+ "Pagination": "Pahina %1$s ng %2$s",
"PiwikReports": "Mga ulat ng Piwik",
"PleaseFindAttachedFile": "Pakihanap sa naka-attach na file ang iyong %1$s ulat para sa %2$s.",
"PleaseFindBelow": "Mangyaring hanapin sa ibaba ang iyong %1$s ulat para sa %2$s.",
@@ -31,7 +31,7 @@
"ReportType": "Magpadala ng ulat sa pamamagitan ng",
"ReportUpdated": "update ng Ulat",
"Segment_Deletion_Error": "Ang segment na ito ay hindi matatanggal o makikita ng ibang user dahil ito ay ginagamit para bumuo ng ulat sa email %s. Mangyaring subukan ulit pagkatapos itong alisin sa segment na mula sa ulat na ito.",
- "Segment_Help": "Maari kang pumili ng nakatakdang custom segments upang ilagay sa data sa email report na ito. Maari kang gumawa at mag edit ng custom segments sa iyong dashboard %s(click here to open)%s pagkatapos ay i-click ang \"%s\" na box pagktapos \"%s\".",
+ "Segment_Help": "Maari kang pumili ng nakatakdang custom segments upang ilagay sa data sa email report na ito. Maari kang gumawa at mag edit ng custom segments sa iyong dashboard %1$s(click here to open)%2$s pagkatapos ay i-click ang \"%3$s\" na box pagktapos \"%4$s\".",
"SegmentAppliedToReports": "Ang bahagi ng '%s' ay ginamit sa mga ulat.",
"SendReportNow": "Magpadala ng Ulat ngayon",
"SendReportTo": "Ipadala ang ulat upang",
diff --git a/plugins/ScheduledReports/lang/tr.json b/plugins/ScheduledReports/lang/tr.json
index 04e359c5a458b091b7855508b19b7a8363e2c37b..fbe69ab8da0bd3e87851da76385e790d98198028 100644
--- a/plugins/ScheduledReports/lang/tr.json
+++ b/plugins/ScheduledReports/lang/tr.json
@@ -1,14 +1,48 @@
{
"ScheduledReports": {
"AggregateReportsFormat": "Ekran seçenekleri (isteğe bağlı)",
+ "AggregateReportsFormat_GraphsOnly": "Sadece Grafikleri Göster (tabloları gösterme)",
+ "AggregateReportsFormat_TablesAndGraphs": "Rapor Tabloları ve Grafileri tüm raporlar için göster",
+ "AggregateReportsFormat_TablesOnly": "(varsayılan) Rapor Tablolarını Göster (Grafikler için sadece anahtar metrikler)",
+ "AlsoSendReportToTheseEmails": "Ayrıca raporu şu maillere gönder (her satır için bir mail)",
+ "AreYouSureDeleteReport": "Raporu ve Zamanlayıcıyı silmek istediğinizden emin misiniz?",
+ "CancelAndReturnToReports": "İptal ve %1$s rapor listesine geri dön%2$s",
+ "CreateAndScheduleReport": "Raporu Yarat ve Zamanla",
"CreateReport": "Rapor OluÅŸtur",
+ "CustomVisitorSegment": "Özelleşmiş Ziyaretçi Dilimi",
+ "DescriptionOnFirstPage": "Rapor tanımı raporun ilk sayfasında gösterilecektir.",
+ "DisplayFormat_TablesOnly": "Yanlızca Tabloları Göster (grafikler yok)",
"EmailHello": "Merhaba,",
"EmailReports": "Raporları epostala",
+ "EmailSchedule": "E-Mail Zamanla",
+ "EvolutionGraph": "En yüksek %s değerleri için tarih bazlı grafikler gönder",
+ "FrontPage": "Ön Sayfa",
+ "PersonalEmailReports": "Kişisel E-Mail Raporları",
+ "MonthlyScheduleHelp": "Aylık Plan: rapor her haftanın ilk günü gönderilecektir",
+ "MustBeLoggedIn": "Rapor yaratmak ve zamanlaymak için giriş yapmış olmalısınız.",
+ "NoRecipients": "Bu raporun hiç alıcısı yok",
+ "Pagination": "%1$s sayfa içerisnde %2$s",
+ "PiwikReports": "Piwik Raporları",
+ "PleaseFindAttachedFile": "Lütfen %2$s için %1$s de eklenen dosyayı bul",
+ "SentFromX": "%s'den gönder",
+ "PluginDescription": "Özelleşmiş rapor yarat ve onları günlük, aylık veya yıllık olarak bir veya daha fazla kişiye gönderilmek üzere zamanla. Birçok rapor formatı desteklenmektedir (html, pdf, csv, images)",
"ReportFormat": "Rapor Formatı",
+ "ReportHour": "Raporu %s'de gönder",
+ "ReportIncludeNWebsites": "Bu rapor en az 1 kere ziyaret edilmiş tüm websitelerni ana metriklerini içerecektir( şuan itibari ile %s websitesi uygundur)",
+ "ReportSent": "Rapor gönderildi",
+ "ReportsIncluded": "Ä°statistikler dahil",
+ "ReportType": "Raporu aracılığı ile gönder",
"ReportUpdated": "Rapor güncellendi",
+ "Segment_Deletion_Error": "Bu segment silinemez veya görünmez hale getirilemez çünkü %s raporu(lar) üretimi için kullanılmaktadır. Lütfen rapor(lar) dan bu segmenti çıkartıkdan sonra tekrar deneyin.",
+ "SegmentAppliedToReports": "Rapor sadece '%s' bölümü için hazırlanacaktır.",
"SendReportNow": "Raporu şimdi gönder",
+ "SendReportTo": "Raporu gönder",
+ "SentToMe": "Bana da Gönder",
"TableOfContent": "Rapor listesi",
+ "ThereIsNoReportToManage": "%s websitesi için hiç rapor yok",
+ "TopLinkTooltip": "E-mail'ine veya müşteri email adresine otomatik gönderilmek üzere E-Mail Raporları yarat!",
"TopOfReport": "Başa dön",
- "UpdateReport": "Raporu Güncelle"
+ "UpdateReport": "Raporu Güncelle",
+ "WeeklyScheduleHelp": "Haftalık Plan: rapor her haftanın pazartesi günü gönderilecektir."
}
}
\ No newline at end of file
diff --git a/plugins/ScheduledReports/lang/vi.json b/plugins/ScheduledReports/lang/vi.json
index 4839fa56450007dd1e961531cf0c8ff954190d18..1ea0d5984fddb61ec129fca27ff1041437722248 100644
--- a/plugins/ScheduledReports/lang/vi.json
+++ b/plugins/ScheduledReports/lang/vi.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(mặc định) Hiển thị các bảng báo cáo (Các đồ thị chỉ dà nh cho các số liệu chÃnh)",
"AlsoSendReportToTheseEmails": "CÅ©ng có thể gá»i báo cáo cho những email nà y (má»™t email cho má»—i dòng):",
"AreYouSureDeleteReport": "Bạn có chắc chắn muốn xóa báo cáo nà y và lịch trình của nó?",
- "CancelAndReturnToReports": "Hủy và %s trả lại danh sách báo cáo %s",
+ "CancelAndReturnToReports": "Hủy và %1$s trả lại danh sách báo cáo %2$s",
"CreateAndScheduleReport": "Tạo và láºp lịch má»™t báo cáo",
"CreateReport": "Tạo một báo cáo",
"CustomVisitorSegment": "Tùy chỉnh phân Ä‘oạn khách truy cáºp:",
@@ -20,7 +20,7 @@
"MonthlyScheduleHelp": "Lịch trình hà ng tháng: báo cáo sẽ được gá»i và o ngà y đầu tiên của má»—i tháng.",
"MustBeLoggedIn": "Bạn phải đăng nháºp để tạo và láºp lịch các báo cáo tùy chỉnh.",
"NoRecipients": "Báo cáo nà y không có ngÆ°á»i nháºn",
- "Pagination": "Trang %s của %s",
+ "Pagination": "Trang %1$s của %2$s",
"PiwikReports": "Các báo cáo Piwik",
"PleaseFindAttachedFile": "Hãy tìm trong táºp tin Ä‘Ãnh kèm %1$s báo cáo của bạn cho %2$s.",
"PleaseFindBelow": "Hãy tìm dưới đây %1$s báo cáo của bạn cho %2$s.",
@@ -31,7 +31,7 @@
"ReportType": "Gá»i báo cáo qua",
"ReportUpdated": "Báo cáo cáºp nháºt",
"Segment_Deletion_Error": "Phân Ä‘oạn nà y không thể bị xóa hoặc là m ẩn Ä‘i đối vá»›i những ngÆ°á»i dùng khác bởi vì nó được sá» dụng để tạo ra các %s báo cáo(s) email. Vui lòng thá» lại sau khi gỡ bá» phân Ä‘oạn nà y từ báo cáo(s) nà y.",
- "Segment_Help": "Bạn có thể chá»n má»™t phân Ä‘oạn tùy chỉnh hiện có để áp dụng cho dữ liệu trong báo cáo email nà y. Bạn có thể tạo và chỉnh sá»a phân Ä‘oạn tuỳ chỉnh trong %s bảng Ä‘iá»u khiển của bạn (click và o đây để mở) %s, sau đó click và o há»™p \"%s\", sau đó \"%s\".",
+ "Segment_Help": "Bạn có thể chá»n má»™t phân Ä‘oạn tùy chỉnh hiện có để áp dụng cho dữ liệu trong báo cáo email nà y. Bạn có thể tạo và chỉnh sá»a phân Ä‘oạn tuỳ chỉnh trong %1$s bảng Ä‘iá»u khiển của bạn (click và o đây để mở) %2$s, sau đó click và o há»™p \"%3$s\", sau đó \"%4$s\".",
"SegmentAppliedToReports": "Phân đoạn '%s' được áp dụng cho các báo cáo.",
"SendReportNow": "Gá»i báo cáo ngay",
"SendReportTo": "Gá»i báo cáo tá»›i",
diff --git a/plugins/ScheduledReports/lang/zh-cn.json b/plugins/ScheduledReports/lang/zh-cn.json
index f9b79ebf690a86dc0bc911f0a861d251cc13778c..4966be70e14874d2c25d72f7ee3bbe44712fe11d 100644
--- a/plugins/ScheduledReports/lang/zh-cn.json
+++ b/plugins/ScheduledReports/lang/zh-cn.json
@@ -6,7 +6,7 @@
"AggregateReportsFormat_TablesOnly": "(默认) 显示报表 (å›¾å½¢ä»…æ˜¾ç¤ºå…³é”®æŒ‡æ ‡)",
"AlsoSendReportToTheseEmails": "抄é€æŠ¥è¡¨åˆ°è¿™äº›é‚®ç®± (æ¯è¡Œä¸€ä¸ªé‚®ç®±):",
"AreYouSureDeleteReport": "您确认è¦åˆ 除这个报表和定时任务å—?",
- "CancelAndReturnToReports": "å–消 %s 并返回报表列表 %s",
+ "CancelAndReturnToReports": "å–消 %1$s 并返回报表列表 %2$s",
"CreateAndScheduleReport": "创建报表和定时任务",
"CreateReport": "生æˆæŠ¥è¡¨",
"CustomVisitorSegment": "自定义访客分段",
@@ -21,7 +21,7 @@
"MonthlyScheduleHelp": "æ¯æœˆè®¡åˆ’: 报表将会在æ¯æœˆçš„第一天寄出。",
"MustBeLoggedIn": "登录åŽæ‰èƒ½åˆ›å»ºå’Œè‡ªå®šä¹‰æŠ¥è¡¨ã€‚",
"NoRecipients": "这个报表没有收件人",
- "Pagination": "第 %s 页，共 %s 页",
+ "Pagination": "第 %1$s 页，共 %2$s 页",
"PiwikReports": "Piwik 报表",
"PleaseFindAttachedFile": "您的 %2$s çš„ %1$s 报表在附件ä¸ã€‚",
"SentFromX": "æ¥è‡ª%så‘é€ã€‚",
@@ -35,7 +35,7 @@
"ReportType": "å‘é€æŠ¥è¡¨é€šè¿‡",
"ReportUpdated": "报告已更新",
"Segment_Deletion_Error": "这个分段ä¸èƒ½åˆ 除，也ä¸èƒ½å¯¹å…¶ä»–用户éšè—ï¼Œå› ä¸ºå®ƒç”¨åœ¨é€šç”¨é‚®ä»¶æŠ¥è¡¨ %s。请从这个报表ä¸åˆ 除这个分段åŽé‡è¯•ã€‚",
- "Segment_Help": "您å¯ä»¥é€‰æ‹©å·²æœ‰çš„自定义分段用在这个邮件报表的数æ®ä¸ã€‚创建和修改自定义分段在报表é¢æ¿%s(点这里打开)%s，然åŽç‚¹ \"%s\" æ–¹æ¡†ï¼ŒæŽ¥ç€ \"%s\"。",
+ "Segment_Help": "您å¯ä»¥é€‰æ‹©å·²æœ‰çš„自定义分段用在这个邮件报表的数æ®ä¸ã€‚创建和修改自定义分段在报表é¢æ¿%1$s(点这里打开)%2$s，然åŽç‚¹ \"%3$s\" æ–¹æ¡†ï¼ŒæŽ¥ç€ \"%4$s\"。",
"SegmentAppliedToReports": "分段 '%s' 已应用到报表。",
"SendReportNow": "现在å‘é€æŠ¥è¡¨",
"SendReportTo": "报表收件人",
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
index 6a977f29c06633bb0e188f172b212aee5eae43c9..8647523ae5de07f5dbfc9f50476c9bb661a51b33 160000
--- a/plugins/SecurityInfo
+++ b/plugins/SecurityInfo
@@ -1 +1 @@
-Subproject commit 6a977f29c06633bb0e188f172b212aee5eae43c9
+Subproject commit 8647523ae5de07f5dbfc9f50476c9bb661a51b33
diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php
index 358f0d2b3e25d83ec91e5924a8efe65d9b103fb5..ad4098775ccd5f4bad4cd552bb1dea816de11447 100644
--- a/plugins/SegmentEditor/API.php
+++ b/plugins/SegmentEditor/API.php
@@ -351,15 +351,52 @@ class API extends \Piwik\Plugin\API
$userLogin = Piwik::getCurrentUserLogin();
$model = $this->getModel();
- if (empty($idSite)) {
- $segments = $model->getAllSegments($userLogin);
+ if(Piwik::hasUserSuperUserAccess()) {
+ $segments = $model->getAllSegmentsForAllUsers($idSite);
} else {
- $segments = $model->getAllSegmentsForSite($idSite, $userLogin);
+ if (empty($idSite)) {
+ $segments = $model->getAllSegments($userLogin);
+ } else {
+ $segments = $model->getAllSegmentsForSite($idSite, $userLogin);
+ }
}
+ $segments = $this->sortSegmentsCreatedByUserFirst($segments);
+
return $segments;
}
+ /**
+ * Sorts segment in a particular order:
+ *
+ * 1) my segments
+ * 2) segments created by the super user that were shared with all users
+ * 3) segments created by other users (which are visible to all super users)
+ *
+ * @param $segments
+ * @return array
+ */
+ private function sortSegmentsCreatedByUserFirst($segments)
+ {
+ $orderedSegments = array();
+ foreach($segments as $id => &$segment) {
+ if($segment['login'] == Piwik::getCurrentUserLogin()) {
+ $orderedSegments[] = $segment;
+ unset($segments[$id]);
+ }
+ }
+ foreach($segments as $id => &$segment) {
+ if($segment['enable_all_users'] == 1) {
+ $orderedSegments[] = $segment;
+ unset($segments[$id]);
+ }
+ }
+ foreach($segments as $id => &$segment) {
+ $orderedSegments[] = $segment;
+ }
+ return $orderedSegments;
+ }
+
/**
* @return string
*/
diff --git a/plugins/SegmentEditor/Model.php b/plugins/SegmentEditor/Model.php
index 7f312557f97b4a378d0c143d8ae8fe06ab58abb4..7e73b6a1ab7c1b0b1d9bd02669a41075b190aaf7 100644
--- a/plugins/SegmentEditor/Model.php
+++ b/plugins/SegmentEditor/Model.php
@@ -98,6 +98,27 @@ class Model
return $segments;
}
+ /**
+ * This should be used _only_ by Super Users
+ * @param $idSite
+ * @return array
+ */
+ public function getAllSegmentsForAllUsers($idSite = false)
+ {
+ $bind = array();
+ $sqlWhereCondition = '';
+
+ if(!empty($idSite)) {
+ $bind = array($idSite);
+ $sqlWhereCondition = '(enable_only_idsite = ? OR enable_only_idsite = 0) AND';
+ }
+
+ $sqlWhereCondition = $this->buildQuerySortedByName($sqlWhereCondition . ' deleted = 0');
+ $segments = $this->getDb()->fetchAll($sqlWhereCondition, $bind);
+
+ return $segments;
+ }
+
public function deleteSegment($idSegment)
{
$db = $this->getDb();
diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php
index 0d7c84ed7a1768a30d8bd741bfc0fe5777c35542..1e6e4d3ec7f7beef3a3d84cba8ed75d891136957 100644
--- a/plugins/SegmentEditor/SegmentEditor.php
+++ b/plugins/SegmentEditor/SegmentEditor.php
@@ -88,5 +88,7 @@ class SegmentEditor extends \Piwik\Plugin
public function getClientSideTranslationKeys(&$translationKeys)
{
$translationKeys[] = 'SegmentEditor_CustomSegment';
+ $translationKeys[] = 'SegmentEditor_VisibleToSuperUser';
+ $translationKeys[] = 'SegmentEditor_SharedWithYou';
}
}
diff --git a/plugins/SegmentEditor/images/edit_segment.png b/plugins/SegmentEditor/images/edit_segment.png
index dba29e188bf2f2b9c0789cf9ebe21aa028d533aa..6eb039254da67e3e2de83ffdda96d53653d43da9 100644
Binary files a/plugins/SegmentEditor/images/edit_segment.png and b/plugins/SegmentEditor/images/edit_segment.png differ
diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
index 2ffd7dac57b062d00d24029bbe42aabf6bf659a7..ce3c166cf12948a7643b135fb8685f55fb00a6ef 100644
--- a/plugins/SegmentEditor/javascripts/Segmentation.js
+++ b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -80,14 +80,14 @@ Segmentation = (function($) {
var currentDecoded = piwikHelper.htmlDecode(current);
var selector = 'div.segmentList ul li[data-definition="'+currentDecoded+'"]';
var foundItems = $(selector, this.target);
- var title = $('<strong></strong>');
+
if( foundItems.length > 0) {
- var name = $(foundItems).first().find("span.segname").text();
- title.text(name);
+ var idSegment = $(foundItems).first().attr('data-idsegment');
+ var title = getSegmentName( getSegmentFromId(idSegment));
} else {
- title.text(_pk_translate('SegmentEditor_CustomSegment'));
+ title = _pk_translate('SegmentEditor_CustomSegment');
}
- segmentationTitle.html(title);
+ segmentationTitle.addClass('segment-clicked').html( title );
}
else {
$(this.content).find(".segmentationTitle").text(this.translations['SegmentEditor_DefaultAllVisits']);
@@ -199,14 +199,42 @@ Segmentation = (function($) {
var html = self.editorTemplate.find("> .listHtml").clone();
var segment, injClass;
var listHtml = '<li data-idsegment="" ' +
- (self.currentSegmentStr == "" ? " class='segmentSelected' " : "")
- + ' data-definition=""><span class="segname">' + self.translations['SegmentEditor_DefaultAllVisits']
- + ' ' + self.translations['General_DefaultAppended']
- + '</span></li> ';
+ (self.currentSegmentStr == "" ? " class='segmentSelected' " : "")
+ + ' data-definition=""><span class="segname">' + self.translations['SegmentEditor_DefaultAllVisits']
+ + ' ' + self.translations['General_DefaultAppended']
+ + '</span></li> ';
+
+ var isVisibleToSuperUserNoticeAlreadyDisplayedOnce = false;
+ var isVisibleToSuperUserNoticeShouldBeClosed = false;
+
+ var isSharedWithMeBySuperUserNoticeAlreadyDisplayedOnce = false;
+ var isSharedWithMeBySuperUserNoticeShouldBeClosed = false;
+
if(self.availableSegments.length > 0) {
+
for(var i = 0; i < self.availableSegments.length; i++)
{
segment = self.availableSegments[i];
+
+ if(isSegmentSharedWithMeBySuperUser(segment) && !isSharedWithMeBySuperUserNoticeAlreadyDisplayedOnce) {
+ isSharedWithMeBySuperUserNoticeAlreadyDisplayedOnce = true;
+ isSharedWithMeBySuperUserNoticeShouldBeClosed = true;
+ listHtml += '<span class="segmentsSharedWithMeBySuperUser"><hr> ' + _pk_translate('SegmentEditor_SharedWithYou') + ':<br/><br/>';
+ }
+
+ if(isSegmentVisibleToSuperUserOnly(segment) && !isVisibleToSuperUserNoticeAlreadyDisplayedOnce) {
+ // close <span class="segmentsSharedWithMeBySuperUser">
+ if(isSharedWithMeBySuperUserNoticeShouldBeClosed) {
+ isSharedWithMeBySuperUserNoticeShouldBeClosed = false;
+ listHtml += '</span>';
+ }
+
+ isVisibleToSuperUserNoticeAlreadyDisplayedOnce = true;
+ isVisibleToSuperUserNoticeShouldBeClosed = true;
+ listHtml += '<span class="segmentsVisibleToSuperUser"><hr> ' + _pk_translate('SegmentEditor_VisibleToSuperUser') + ':<br/><br/>';
+ }
+
+
injClass = "";
var checkSelected = segment.definition;
if(!$.browser.mozilla) {
@@ -217,12 +245,21 @@ Segmentation = (function($) {
injClass = 'class="segmentSelected"';
}
listHtml += '<li data-idsegment="'+segment.idsegment+'" data-definition="'+ (segment.definition).replace(/"/g, '"') +'" '
- +injClass+' title="'+segment.name+'"><span class="segname">'+segment.name+'</span>';
+ +injClass+' title="'+ getSegmentTooltipEnrichedWithUsername(segment) +'"><span class="segname">'+getSegmentName(segment)+'</span>';
if(self.segmentAccess == "write") {
listHtml += '<span class="editSegment" title="'+ self.translations['General_Edit'].toLocaleLowerCase() +'"></span>';
}
listHtml += '</li>';
}
+
+ if(isVisibleToSuperUserNoticeShouldBeClosed) {
+ listHtml += '</span>';
+ }
+
+ if(isSharedWithMeBySuperUserNoticeShouldBeClosed) {
+ listHtml += '</span>';
+ }
+
$(html).find(".segmentList > ul").append(listHtml);
if(self.segmentAccess === "write"){
$(html).find(".add_new_segment").html(self.translations['SegmentEditor_AddNewSegment']);
@@ -238,20 +275,58 @@ Segmentation = (function($) {
return html;
};
+ var isSegmentVisibleToSuperUserOnly = function(segment) {
+ return hasSuperUserAccessAndSegmentCreatedByAnotherUser(segment)
+ && segment.enable_all_users == 0;
+ };
+
+ var isSegmentSharedWithMeBySuperUser = function(segment) {
+ return segment.login != piwik.userLogin
+ && segment.enable_all_users == 1;
+ };
+
+ var hasSuperUserAccessAndSegmentCreatedByAnotherUser = function(segment) {
+ return piwik.hasSuperUserAccess && segment.login != piwik.userLogin;
+ };
+
+ var getSegmentTooltipEnrichedWithUsername = function(segment) {
+ var segmentName = segment.name;
+ if(hasSuperUserAccessAndSegmentCreatedByAnotherUser(segment)) {
+ segmentName += ' (';
+ segmentName += _pk_translate('General_CreatedByUser', [segment.login]);
+
+ if(segment.enable_all_users == 0) {
+ segmentName += ', ' + _pk_translate('SegmentEditor_VisibleToSuperUser');
+ }
+
+ segmentName += ')';
+ }
+ return sanitiseSegmentName(segmentName);
+ };
+
+ var getSegmentName = function(segment) {
+ return sanitiseSegmentName(segment.name);
+ };
+
+ var sanitiseSegmentName = function(segment) {
+ segment = piwikHelper.escape(segment);
+ return segment;
+ }
+
var getFormHtml = function() {
var html = self.editorTemplate.find("> .segment-element").clone();
// set left margin to center form
var segmentsDropdown = $(html).find(".available_segments_select");
var segment, newOption;
newOption = '<option data-idsegment="" data-definition="" title="'
- + self.translations['SegmentEditor_AddNewSegment']
- + '">' + self.translations['SegmentEditor_AddNewSegment']
- + '</option>';
+ + self.translations['SegmentEditor_AddNewSegment']
+ + '">' + self.translations['SegmentEditor_AddNewSegment']
+ + '</option>';
segmentsDropdown.append(newOption);
for(var i = 0; i < self.availableSegments.length; i++)
{
segment = self.availableSegments[i];
- newOption = '<option data-idsegment="'+segment.idsegment+'" data-definition="'+(segment.definition).replace(/"/g, '"')+'" title="'+segment.name+'">'+segment.name+'</option>';
+ newOption = '<option data-idsegment="'+segment.idsegment+'" data-definition="'+(segment.definition).replace(/"/g, '"')+'" title="'+getSegmentTooltipEnrichedWithUsername(segment)+'">'+getSegmentName(segment)+'</option>';
segmentsDropdown.append(newOption);
}
$(html).find(".segment-content > h3").after(getInitialStateRowsHtml()).show();
@@ -324,10 +399,15 @@ Segmentation = (function($) {
var openEditForm = function(segment){
addForm("edit", segment);
- $(self.form).find(".segment-content > h3 > span").text(segment.name);
+ $(self.form).find(".segment-content > h3 > span")
+ .html( getSegmentName(segment) )
+ .prop('title', getSegmentTooltipEnrichedWithUsername(segment));
+
$(self.form).find('.available_segments_select > option[data-idsegment="'+segment.idsegment+'"]').prop("selected",true);
- $(self.form).find('.available_segments a.dropList').text(segment.name);
+ $(self.form).find('.available_segments a.dropList')
+ .html( getSegmentName(segment) )
+ .prop( 'title', getSegmentTooltipEnrichedWithUsername(segment));
if(segment.definition != ""){
revokeInitialStateRows();
@@ -343,6 +423,12 @@ Segmentation = (function($) {
doDragDropBindings();
};
+ var displayFormAddNewSegment = function (e) {
+ closeAllOpenLists();
+ addForm("new");
+ doDragDropBindings();
+ };
+
var filterSegmentList = function (keyword) {
var curTitle;
clearFilterSegmentList();
@@ -360,6 +446,13 @@ Segmentation = (function($) {
$(self.target).find(".segmentList li:first")
.before("<li class=\"filterNoResults grayed\">" + self.translations['General_SearchNoResults'] + "</li>");
}
+
+ if ($(self.target).find(".segmentList .segmentsVisibleToSuperUser li:visible").length == 0) {
+ $(self.target).find(".segmentList .segmentsVisibleToSuperUser").hide();
+ }
+ if ($(self.target).find(".segmentList .segmentsSharedWithMeBySuperUser li:visible").length == 0) {
+ $(self.target).find(".segmentList .segmentsSharedWithMeBySuperUser").hide();
+ }
}
var clearFilterSegmentList = function () {
@@ -367,6 +460,8 @@ Segmentation = (function($) {
$(self.target).find(".segmentList li").each(function () {
$(this).show();
});
+ $(self.target).find(".segmentList .segmentsVisibleToSuperUser").show();
+ $(self.target).find(".segmentList .segmentsSharedWithMeBySuperUser").show();
}
var bindEvents = function () {
@@ -407,23 +502,19 @@ Segmentation = (function($) {
self.target.on("click", ".segmentList li", function (e) {
if ($(e.currentTarget).hasClass("grayed") !== true) {
- var segment = {};
- segment.idsegment = $(this).attr("data-idsegment");
- segment.definition = $(this).data("definition");
- segment.name = $(this).attr("title");
+ var idsegment = $(this).attr("data-idsegment");
+ segmentDefinition = $(this).data("definition");
- self.setSegment(segment.definition);
+ self.setSegment(segmentDefinition);
self.markCurrentSegment();
- self.segmentSelectMethod( segment.definition );
- toggleLoadingMessage(segment.definition.length);
+ self.segmentSelectMethod( segmentDefinition );
+ toggleLoadingMessage(segmentDefinition.length);
}
});
self.target.on('click', '.add_new_segment', function (e) {
e.stopPropagation();
- closeAllOpenLists();
- addForm("new");
- doDragDropBindings();
+ displayFormAddNewSegment(e);
});
self.target.on('change', "select.metricList", function (e, persist) {
@@ -748,20 +839,15 @@ Segmentation = (function($) {
};
function openEditFormGivenSegment(option) {
- var segment = {};
- segment.idsegment = option.attr("data-idsegment");
+ var idsegment = option.attr("data-idsegment");
- var segmentExtra = getSegmentFromId(segment.idsegment);
- for(var item in segmentExtra)
- {
- segment[item] = segmentExtra[item];
+ if(idsegment.length == 0) {
+ displayFormAddNewSegment();
+ } else {
+ var segment = getSegmentFromId(idsegment);
+ segment.definition = option.data("definition");
+ openEditForm(segment);
}
-
- segment.name = option.attr("title");
-
- segment.definition = option.data("definition");
-
- openEditForm(segment);
}
var doDragDropBindings = function(){
@@ -815,7 +901,7 @@ Segmentation = (function($) {
// 1 - do most obvious selection -> mark whole categories matching search string
// also expand whole category
$(self.form).find('.segment-nav div > ul > li').each( function(){
- curStr = normalizeSearchString($(this).find("a.metric_category").text());
+ curStr = normalizeSearchString($(this).find("a.metric_category").text());
if(curStr.indexOf(search) > -1) {
$(this).addClass("searchFound");
$(this).find("ul").show();
@@ -823,7 +909,7 @@ Segmentation = (function($) {
$(this).show();
}
}
- );
+ );
// 2 - among all unselected categories find metrics which match and mark parent as search result
$(self.form).find(".segment-nav div > ul > li:not(.searchFound)").each(function(){
@@ -872,8 +958,8 @@ Segmentation = (function($) {
}
search = search.replace(/[^a-z0-9 -]/g, '') // remove invalid chars
- .replace(/\s+/g, '_') // collapse whitespace and replace by underscore
- .replace(/-+/g, '-'); // collapse dashes
+ .replace(/\s+/g, '_') // collapse whitespace and replace by underscore
+ .replace(/-+/g, '-'); // collapse dashes
return search;
};
@@ -900,7 +986,12 @@ Segmentation = (function($) {
placeSegmentationFormControls();
if(mode == "edit") {
- $(self.form).find('.enable_all_users_select > option[value="'+segment.enable_all_users+'"]').prop("selected",true);
+ var userSelector = $(self.form).find('.enable_all_users_select > option[value="' + segment.enable_all_users + '"]').prop("selected",true);
+
+ // Replace "Visible to me" by "Visible to $login" when user is super user
+ if(hasSuperUserAccessAndSegmentCreatedByAnotherUser(segment)) {
+ $(self.form).find('.enable_all_users_select > option[value="' + 0 + '"]').text(segment.login);
+ }
$(self.form).find('.visible_to_website_select > option[value="'+segment.enable_only_idsite+'"]').prop("selected",true);
$(self.form).find('.auto_archive_select > option[value="'+segment.auto_archive+'"]').prop("selected",true);
@@ -991,43 +1082,43 @@ Segmentation = (function($) {
var makeDropList = function(spanId, selectId){
var select = $(self.form).find(selectId).hide();
var dropList = $( '<a class="dropList dropdown">' )
- .insertAfter( select )
- .text( select.children(':selected').text() )
- .autocomplete({
- delay: 0,
- minLength: 0,
- appendTo: "body",
- source: function( request, response ) {
- response( select.children( "option" ).map(function() {
- var text = $( this ).text();
- return {
- label: text,
- value: this.value,
- option: this
- };
- }) );
- },
- select: function( event, ui ) {
- event.preventDefault();
- ui.item.option.selected = true;
- // Mark original select>option
- $(spanId + ' option[value="' + ui.item.value + '"]', self.editorTemplate).prop('selected', true);
- dropList.text(ui.item.label);
- $(self.form).find(selectId).trigger("change");
- }
- })
- .click(function() {
- // close all other droplists made by this form
- $("a.dropList").autocomplete("close");
- // close if already visible
- if ( $(this).autocomplete( "widget" ).is(":visible") ) {
- $(this).autocomplete("close");
- return;
- }
- // pass empty string as value to search for, displaying all results
- $(this).autocomplete( "search", "" );
+ .insertAfter( select )
+ .text( select.children(':selected').text() )
+ .autocomplete({
+ delay: 0,
+ minLength: 0,
+ appendTo: "body",
+ source: function( request, response ) {
+ response( select.children( "option" ).map(function() {
+ var text = $( this ).text();
+ return {
+ label: text,
+ value: this.value,
+ option: this
+ };
+ }) );
+ },
+ select: function( event, ui ) {
+ event.preventDefault();
+ ui.item.option.selected = true;
+ // Mark original select>option
+ $(spanId + ' option[value="' + ui.item.value + '"]', self.editorTemplate).prop('selected', true);
+ dropList.text(ui.item.label);
+ $(self.form).find(selectId).trigger("change");
+ }
+ })
+ .click(function() {
+ // close all other droplists made by this form
+ $("a.dropList").autocomplete("close");
+ // close if already visible
+ if ( $(this).autocomplete( "widget" ).is(":visible") ) {
+ $(this).autocomplete("close");
+ return;
+ }
+ // pass empty string as value to search for, displaying all results
+ $(this).autocomplete( "search", "" );
- });
+ });
$('body').on('mouseup',function (e) {
if (!$(e.target).parents(spanId).length
&& !$(e.target).is(spanId)
@@ -1166,7 +1257,7 @@ $(document).ready(function() {
}
}
- self.props.availableSegments[idx] = params;
+ $.extend( self.props.availableSegments[idx], params);
self.rebuild();
self.impl.setSegment(params.definition);
@@ -1222,8 +1313,8 @@ $(document).ready(function() {
};
var segmentFromRequest = encodeURIComponent(self.props.selectedSegment)
- || broadcast.getValueFromHash('segment')
- || broadcast.getValueFromUrl('segment');
+ || broadcast.getValueFromHash('segment')
+ || broadcast.getValueFromUrl('segment');
if($.browser.mozilla) {
segmentFromRequest = decodeURIComponent(segmentFromRequest);
}
diff --git a/plugins/SegmentEditor/lang/bg.json b/plugins/SegmentEditor/lang/bg.json
index ec6793cdeea84b71b02d1bf9f2a10cd0fe643800..12a7871a3ee3e8ca894c646f22fda1b85d3e446d 100644
--- a/plugins/SegmentEditor/lang/bg.json
+++ b/plugins/SegmentEditor/lang/bg.json
@@ -16,7 +16,6 @@
"SegmentDisplayedThisWebsiteOnly": "Ñамо този уебÑайт",
"SegmentIsDisplayedForWebsite": "и Ñе показва за",
"SegmentNotApplied": "Сегмент '%s' не е приложен",
- "SelectSegmentOfVisitors": "Изберете Ñегмент на поÑетителите:",
"ThisSegmentIsVisibleTo": "Този Ñегмент е видим за:",
"VisibleToAllUsers": "вÑички потребители",
"VisibleToMe": "аз",
diff --git a/plugins/SegmentEditor/lang/cs.json b/plugins/SegmentEditor/lang/cs.json
index c5752de9e29ac7646a8b3780b925f240b5268d97..20a1dccf7f4d292ccfaad6305b2191fb12529724 100644
--- a/plugins/SegmentEditor/lang/cs.json
+++ b/plugins/SegmentEditor/lang/cs.json
@@ -15,16 +15,18 @@
"OperatorAND": "AND",
"OperatorOR": "OR",
"SaveAndApply": "Uložit a použÃt",
- "SegmentDisplayedAllWebsites": "Všechny webové stránky",
- "SegmentDisplayedThisWebsiteOnly": "Pouze tyto webové stránky",
+ "SegmentDisplayedAllWebsites": "všechny weby",
+ "SegmentDisplayedThisWebsiteOnly": "pouze tento web",
"SegmentIsDisplayedForWebsite": "A zobrazený po",
"SegmentNotApplied": "Segment %s nenà aplikován",
"SegmentNotAppliedMessage": "Požadujete data pro vlastnà segment %s, ale konfigurace Piwiku aktuálnÄ› nedovoluje z důvodů výkonu zpracovánà hlášenà v reálném Äase.",
- "SelectSegmentOfVisitors": "Vyberte segment návÅ¡tÄ›vnÃků",
+ "SelectSegmentOfVisits": "Vyberte segment návštěv:",
"ThisSegmentIsVisibleTo": "Tento segment je viditelný",
"VisibleToAllUsers": "Všem uživatelům",
"VisibleToMe": "MnÄ›",
- "YouMayChangeSetting": "Jinak můžete nastavenà změnit v souboru %s, nebo můžete upravit tento segment a zvolit %s.",
+ "YouMayChangeSetting": "Jinak můžete nastavenà změnit v souboru %1$s, nebo můžete upravit tento segment a zvolit %2$s.",
+ "VisibleToSuperUser": "Viditelný, protože máte super-uživatelský pÅ™Ãstup",
+ "SharedWithYou": "SdÃleno s vámi",
"YouMustBeLoggedInToCreateSegments": "Pro vytvářenà a úpravu vlastnÃch segmentů návÅ¡tÄ›vnÃků musÃte být pÅ™ihlášen.",
"YouDontHaveAccessToCreateSegments": "Pro vytvářenà a úpravu segmentů nemáte požadovanou pÅ™Ãstupovou úroveň.",
"AddingSegmentForAllWebsitesDisabled": "Přidávánà segmentů pro všechny stránky bylo zakázáno.",
diff --git a/plugins/SegmentEditor/lang/da.json b/plugins/SegmentEditor/lang/da.json
index 7d35c3b7cb8f8ee8f8dd1b0bec7af6b3a4b48712..6420bc5ebf9a8872a358ff9f46c252de422de0cd 100644
--- a/plugins/SegmentEditor/lang/da.json
+++ b/plugins/SegmentEditor/lang/da.json
@@ -18,11 +18,10 @@
"SegmentIsDisplayedForWebsite": "og vises for",
"SegmentNotApplied": "Segment '%s' anvendes ikke",
"SegmentNotAppliedMessage": "Du beder om data til brugerdefineret segment '%s', Piwik konfigurationen forhindrer tidstro behandling af rapporter pga ydeevne grunde.",
- "SelectSegmentOfVisitors": "Vælg et segment af besøgende:",
"ThisSegmentIsVisibleTo": "Segmentet er synligt for:",
"VisibleToAllUsers": "Alle brugere",
"VisibleToMe": "mig",
- "YouMayChangeSetting": "Alternativt kan du ændre indstillingen i konfigurationsfilen (%s), eller redigere dette segment og vælg '%s'.",
+ "YouMayChangeSetting": "Alternativt kan du ændre indstillingen i konfigurationsfilen (%1$s), eller redigere dette segment og vælg '%2$s'.",
"YouMustBeLoggedInToCreateSegments": "Du skal være logget ind for at oprette og anvende brugerdefinerede besøgssegmenter.",
"YouDontHaveAccessToCreateSegments": "Du har ikke det nødvendige adgangsniveau til at oprette og redigere segmenter.",
"AddingSegmentForAllWebsitesDisabled": "Tilføjelse af segmenter for alle websteder er blevet deaktiveret."
diff --git a/plugins/SegmentEditor/lang/de.json b/plugins/SegmentEditor/lang/de.json
index 05ec7674bbb2300aff0b2302e1c83a83d6e40f71..ffd8bf232175a17a1f886aff1935dd46bddb1896 100644
--- a/plugins/SegmentEditor/lang/de.json
+++ b/plugins/SegmentEditor/lang/de.json
@@ -20,13 +20,17 @@
"SegmentIsDisplayedForWebsite": "und wird angezeigt für",
"SegmentNotApplied": "Segment '%s' nicht angewendet",
"SegmentNotAppliedMessage": "Sie fragen Daten für das benutzerdefinierte Segment '%s' an, die Piwik-Konfiguration verhindert jedoch aktuell Echtzeit-Verarbeitung von Berichten aus Performance-Gründen.",
- "SelectSegmentOfVisitors": "Wählen Sie ein Segment an Besuchern aus:",
"ThisSegmentIsVisibleTo": "Dieses Segment ist sichtbar für:",
"VisibleToAllUsers": "alle Benutzer",
"VisibleToMe": "mich",
- "YouMayChangeSetting": "Alternativ können Sie die Einstellung in der Konfigurationsdatei (%s) ändern, oder ändern Sie dieses Segment und wählen '%s'.",
+ "YouMayChangeSetting": "Alternativ können Sie die Einstellung in der Konfigurationsdatei (%1$s) ändern, oder ändern Sie dieses Segment und wählen '%2$s'.",
+ "SharedWithYou": "Mit dir geteilt",
"YouMustBeLoggedInToCreateSegments": "Sie müssen sich anmelden um eigene Besuchersegmente anzulegen oder zu bearbeiten.",
"YouDontHaveAccessToCreateSegments": "Sie haben nicht die benötigten Berechtigungen um Segmente anzulegen und zu bearbeiten.",
- "AddingSegmentForAllWebsitesDisabled": "Das Hinzufügen von Segmenten wurde für alle Websites deaktiviert."
+ "AddingSegmentForAllWebsitesDisabled": "Das Hinzufügen von Segmenten wurde für alle Websites deaktiviert.",
+ "SegmentXIsAUnionOf": "%s ist eine Vereinigung dieser Segmente:",
+ "CustomSegment": "Benutzerdefiniertes Segment",
+ "SegmentOperatorIsNullOrEmpty": "Ist NULL oder leer",
+ "SegmentOperatorIsNotNullNorEmpty": "Ist weder NULL noch leer"
}
}
\ No newline at end of file
diff --git a/plugins/SegmentEditor/lang/el.json b/plugins/SegmentEditor/lang/el.json
index 72d3659543724b6542a37bf5992e6ca8031dd1d2..d4ed54b97798ad704bad61651b8f724df0dd920d 100644
--- a/plugins/SegmentEditor/lang/el.json
+++ b/plugins/SegmentEditor/lang/el.json
@@ -20,11 +20,13 @@
"SegmentIsDisplayedForWebsite": "και εμφανίζεται για",
"SegmentNotApplied": "Το τμήμα '%s' δεν εφαÏμόζεται",
"SegmentNotAppliedMessage": "Ζητάτε δεδομÎνα για το Î ÏοσαÏμοσμÎνο Τμήμα '%s', ωστόσο η Ï„ÏÎχουσα παÏαμετÏοποίηση του Piwik εμποδίζει την σε Ï€Ïαγματικό χÏόνο επεξεÏγασία των αναφοÏών για λόγους απόδοσης.",
- "SelectSegmentOfVisitors": "ΕπιλÎξτε Îνα τμήμα επισκεπτών:",
+ "SelectSegmentOfVisits": "ΕπιλÎξτε Îνα τμήμα επισκÎψεων:",
"ThisSegmentIsVisibleTo": "Το τμήμα αυτό είναι οÏατό σε:",
"VisibleToAllUsers": "όλους τους χÏήστες",
"VisibleToMe": "εμÎνα",
- "YouMayChangeSetting": "Εναλλακτικά, μποÏείτε να αλλάξετε τη ÏÏθμιση στο αÏχείο Ïυθμίσεων (%s), ή να Ï„Ïοποποιήσετε το Τμήμα αυτό και να επιλÎξετε '%s'.",
+ "YouMayChangeSetting": "Εναλλακτικά, μποÏείτε να αλλάξετε τη ÏÏθμιση στο αÏχείο Ïυθμίσεων (%1$s), ή να Ï„Ïοποποιήσετε το Τμήμα αυτό και να επιλÎξετε '%2$s'.",
+ "VisibleToSuperUser": "ΟÏατό σε εσάς επειδή Îχετε Ï€Ïόσβαση Î¥Ï€ÎµÏ Î§Ïήστη",
+ "SharedWithYou": "ΚοινόχÏηστο για εσάς",
"YouMustBeLoggedInToCreateSegments": "Θα Ï€ÏÎπει να Îχετε κάνει είσοδο για να δημιουÏγήσετε και να επεξεÏγαστείτε Ï€ÏοσαÏμοσμÎνα τμήματα επισκεπτών.",
"YouDontHaveAccessToCreateSegments": "Δεν διαθÎτετε την απαιτοÏμενη Ï€Ïόσβαση ασφαλείας για να δημιουÏγείτε και να Ï„Ïοποποιείτε τμήματα.",
"AddingSegmentForAllWebsitesDisabled": "Η Ï€Ïοσθήκη τμημάτων Îχει απενεÏγοποιηθεί για όλους τους ιστοτόπους.",
diff --git a/plugins/SegmentEditor/lang/en.json b/plugins/SegmentEditor/lang/en.json
index 8651afeecd041ca1d6b2fb16831199028ac8341b..e847e3ed4b66e1c6e4df3c70c7225220f1a786da 100644
--- a/plugins/SegmentEditor/lang/en.json
+++ b/plugins/SegmentEditor/lang/en.json
@@ -20,11 +20,13 @@
"SegmentIsDisplayedForWebsite": "and displayed for",
"SegmentNotApplied": "Segment '%s' not applied",
"SegmentNotAppliedMessage": "You are requesting data for the Custom Segment '%s', this Piwik configuration currently prevents real time processing of reports for performance reasons.",
- "SelectSegmentOfVisitors": "Select a segment of visitors:",
+ "SelectSegmentOfVisits": "Select a segment of visits:",
"ThisSegmentIsVisibleTo": "This segment is visible to:",
"VisibleToAllUsers": "all users",
"VisibleToMe": "me",
- "YouMayChangeSetting": "Alternatively you may change the setting in the config file (%s), or edit this Segment and choose '%s'.",
+ "YouMayChangeSetting": "Alternatively you may change the setting in the config file (%1$s), or edit this Segment and choose '%2$s'.",
+ "VisibleToSuperUser": "Visible to you because you have Super User access",
+ "SharedWithYou": "Shared with you",
"YouMustBeLoggedInToCreateSegments": "You must be logged in to create and edit custom visitor segments.",
"YouDontHaveAccessToCreateSegments": "You don't have the required access level to create and edit segments.",
"AddingSegmentForAllWebsitesDisabled": "Adding segments for all websites has been disabled.",
diff --git a/plugins/SegmentEditor/lang/es.json b/plugins/SegmentEditor/lang/es.json
index ab3c7a8a4e6d3bb3f3da668b98a784f7b544e6f0..fc050c4710606e4d442418950796d18b16150e60 100644
--- a/plugins/SegmentEditor/lang/es.json
+++ b/plugins/SegmentEditor/lang/es.json
@@ -19,11 +19,10 @@
"SegmentIsDisplayedForWebsite": "y mostrado para",
"SegmentNotApplied": "Segmento '%s' no aplicado",
"SegmentNotAppliedMessage": "Está solicitando datos para el segmento personalizado '%s', esta configuración de Piwik actualmente impide el proceso en tiempo real de informes por razones de rendimiento.",
- "SelectSegmentOfVisitors": "Seleccione un segmento de visitantes:",
"ThisSegmentIsVisibleTo": "Este segmento es visible para:",
"VisibleToAllUsers": "todos los usuarios",
"VisibleToMe": "yo",
- "YouMayChangeSetting": "Alternativamente puede cambiar la configuración en el archivo config (%s) o modificar este segmento y elegir '%s'.",
+ "YouMayChangeSetting": "Alternativamente puede cambiar la configuración en el archivo config (%1$s) o modificar este segmento y elegir '%2$s'.",
"YouMustBeLoggedInToCreateSegments": "Debe estar conectado para crear y editar segmentos de usuario personalizados.",
"YouDontHaveAccessToCreateSegments": "No posee el nivel de acceso requerido para crear y editar segmentos.",
"AddingSegmentForAllWebsitesDisabled": "Añadir segmentos para todos los sitios de internet se ha deshabilitado."
diff --git a/plugins/SegmentEditor/lang/et.json b/plugins/SegmentEditor/lang/et.json
index abc05305a944d0cf5e2cbabc7b41ad51402ce6ad..da1876cfd72eb8788ebbfa5711b7715ee6b9669d 100644
--- a/plugins/SegmentEditor/lang/et.json
+++ b/plugins/SegmentEditor/lang/et.json
@@ -13,7 +13,6 @@
"SegmentDisplayedAllWebsites": "kõik veebilehed",
"SegmentDisplayedThisWebsiteOnly": "ainult see veebileht",
"SegmentIsDisplayedForWebsite": "ja kuvatakse veebilehele",
- "SelectSegmentOfVisitors": "Vali külastajate segment:",
"ThisSegmentIsVisibleTo": "Antud segment on nähtav:",
"VisibleToAllUsers": "kõik kasutajad",
"VisibleToMe": "mina"
diff --git a/plugins/SegmentEditor/lang/fa.json b/plugins/SegmentEditor/lang/fa.json
index 9805a6e585149010654c1eb8a283335ec1158298..b81b7bd0605cfbb184637554c1a285263ec42ff2 100644
--- a/plugins/SegmentEditor/lang/fa.json
+++ b/plugins/SegmentEditor/lang/fa.json
@@ -15,7 +15,6 @@
"SegmentDisplayedAllWebsites": "تمام وب سایت ها",
"SegmentDisplayedThisWebsiteOnly": "این وب سایت Ùقط",
"SegmentIsDisplayedForWebsite": "و برای نمایش داده",
- "SelectSegmentOfVisitors": "انتخاب بخشی از بازدید کنندگان:",
"ThisSegmentIsVisibleTo": "این بخش قابل رؤیت است:",
"VisibleToAllUsers": "تمام کاربران",
"VisibleToMe": "من",
diff --git a/plugins/SegmentEditor/lang/fi.json b/plugins/SegmentEditor/lang/fi.json
index 3e5767df272b26f81122ba166ddc673fec0d120a..2f0f64fa5fd4cc24fe7f9f4a78528a615b9542e1 100644
--- a/plugins/SegmentEditor/lang/fi.json
+++ b/plugins/SegmentEditor/lang/fi.json
@@ -17,11 +17,10 @@
"SegmentDisplayedThisWebsiteOnly": "vain tällä verkkosivulla",
"SegmentIsDisplayedForWebsite": "näytetään vain",
"SegmentNotApplied": "Segmenttiä '%s' ei sovelleta",
- "SelectSegmentOfVisitors": "Valitse kävijäsegmentti:",
"ThisSegmentIsVisibleTo": "Tämä segmentti näytetään seuraaville:",
"VisibleToAllUsers": "kaikki käyttäjät",
"VisibleToMe": "minä",
- "YouMayChangeSetting": "Vaihtoehtoisesti voit vaihtaa asetuksen tiedostosta %s, tai muuttaa tätä segmenttiä ja valita '%s'.",
+ "YouMayChangeSetting": "Vaihtoehtoisesti voit vaihtaa asetuksen tiedostosta %1$s, tai muuttaa tätä segmenttiä ja valita '%2$s'.",
"YouMustBeLoggedInToCreateSegments": "Sinun täytyy olla sisäänkirjautuneena voidaksesi luoda tai muokata kävijäsegmenttejä."
}
}
\ No newline at end of file
diff --git a/plugins/SegmentEditor/lang/fr.json b/plugins/SegmentEditor/lang/fr.json
index f7e407b0c9b03f9085d636d061e314c4aca01809..52ea2941dfd623f7ea173f4143b33124e8fb42d3 100644
--- a/plugins/SegmentEditor/lang/fr.json
+++ b/plugins/SegmentEditor/lang/fr.json
@@ -20,11 +20,13 @@
"SegmentIsDisplayedForWebsite": "et affiché pour",
"SegmentNotApplied": "Segment \"%s\" non appliqué",
"SegmentNotAppliedMessage": "Vous êtes en train de demander des données for le segment personnalisé '%s', la configuration actuelle de Piwik empêche la génération en temps réelle de rapport pour des raisons de performance.",
- "SelectSegmentOfVisitors": "Choisir un segment de visiteurs :",
+ "SelectSegmentOfVisits": "Sélectionnez un segment de visites :",
"ThisSegmentIsVisibleTo": "Ce segment est visible pour :",
"VisibleToAllUsers": "tous les utilisateurs",
"VisibleToMe": "moi",
- "YouMayChangeSetting": "Vous pouvez ou changer le paramètre depuis le fichier de configuration (%s) ou bien modifier ce segment et choisir '%s'.",
+ "YouMayChangeSetting": "Vous pouvez ou changer le paramètre depuis le fichier de configuration (%1$s) ou bien modifier ce segment et choisir '%2$s'.",
+ "VisibleToSuperUser": "Vous est visible car vous avez un accès Super Utilisateur",
+ "SharedWithYou": "Partagé avec vous",
"YouMustBeLoggedInToCreateSegments": "Vous devez être identifié(e) pour créer et modifier des segments de visiteurs personnalisés.",
"YouDontHaveAccessToCreateSegments": "Vous n'avez pas les permissions requises pour créer et modifier des segments.",
"AddingSegmentForAllWebsitesDisabled": "Ajouter des segments pour tous les sites a été désactivé.",
diff --git a/plugins/SegmentEditor/lang/hi.json b/plugins/SegmentEditor/lang/hi.json
index b2570eb098159777378188275e38889c360702b2..f293d5017d97a624b42c469a384a97375dc4f8d4 100644
--- a/plugins/SegmentEditor/lang/hi.json
+++ b/plugins/SegmentEditor/lang/hi.json
@@ -18,7 +18,6 @@
"SegmentDisplayedThisWebsiteOnly": "यह वेबसाइट केवल",
"SegmentIsDisplayedForWebsite": "और के लिठपà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤",
"SegmentNotApplied": "खंड '%s' को लागू नहीं",
- "SelectSegmentOfVisitors": "दरà¥à¤¶à¤•à¥‹à¤‚ के à¤à¤• वरà¥à¤— का चयन करें:",
"ThisSegmentIsVisibleTo": "इस खंड के लिठदिख रहा है:",
"VisibleToAllUsers": "सà¤à¥€ उपयोगकरà¥à¤¤à¤¾à¤“ं",
"VisibleToMe": "मà¥à¤à¥‡",
diff --git a/plugins/SegmentEditor/lang/id.json b/plugins/SegmentEditor/lang/id.json
index 7b48c501b5ade431bae425ca98c37d617074cdd2..13a73eedfb40c0467c525c022294145e96a0143d 100644
--- a/plugins/SegmentEditor/lang/id.json
+++ b/plugins/SegmentEditor/lang/id.json
@@ -15,7 +15,6 @@
"SegmentDisplayedAllWebsites": "seluruh situs",
"SegmentDisplayedThisWebsiteOnly": "hanya situs ini",
"SegmentIsDisplayedForWebsite": "dan ditampilkan untuk",
- "SelectSegmentOfVisitors": "Pilih sebuah pecahan pengunjung:",
"ThisSegmentIsVisibleTo": "Pecahan ini tampak untuk:",
"VisibleToAllUsers": "seluruh pengunjung",
"VisibleToMe": "saya",
diff --git a/plugins/SegmentEditor/lang/it.json b/plugins/SegmentEditor/lang/it.json
index 28b4b9f3ed34f0c78fc2d607a70d6d7408a3c773..ef05248b2d0b84bc7e37635c3c6ec27dbeef56f9 100644
--- a/plugins/SegmentEditor/lang/it.json
+++ b/plugins/SegmentEditor/lang/it.json
@@ -20,11 +20,13 @@
"SegmentIsDisplayedForWebsite": "e mostrato per",
"SegmentNotApplied": "Segmento '%s' non applicato",
"SegmentNotAppliedMessage": "Stai richiedendo i dati per il Segmento Personalizzato '%s', questa configurazione di Piwik attualmente esclude l'elaborazione in tempo reale dei report per ragioni di velocità .",
- "SelectSegmentOfVisitors": "Seleziona un segmento di visitatori:",
+ "SelectSegmentOfVisits": "Seleziona un segmento di visite:",
"ThisSegmentIsVisibleTo": "Questo segmento è visibile a:",
"VisibleToAllUsers": "tutti gli utenti",
"VisibleToMe": "me",
- "YouMayChangeSetting": "In alternativa, puoi cambiare le impostazioni nel file di configurazione (%s) o modificare questo Segmento e scegliere '%s'.",
+ "YouMayChangeSetting": "In alternativa, puoi cambiare le impostazioni nel file di configurazione (%1$s) o modificare questo Segmento e scegliere '%2$s'.",
+ "VisibleToSuperUser": "Visibile a te perché hai un accesso da Super User",
+ "SharedWithYou": "Condiviso con te",
"YouMustBeLoggedInToCreateSegments": "Devi avere effettuato l'accesso per creare e modificare i segmenti personalizzati dei visitatori.",
"YouDontHaveAccessToCreateSegments": "Non hai un livello d'accesso adeguato per creare e modificare i segmenti.",
"AddingSegmentForAllWebsitesDisabled": "L'aggiunta di segmenti per tutti i siti è stata disabilitata.",
diff --git a/plugins/SegmentEditor/lang/ja.json b/plugins/SegmentEditor/lang/ja.json
index 0156de56ab1bcd6d7081d8b6859fb237162ab4da..d612e9594c602e15c57c959cc1de7ad46b87cd1d 100644
--- a/plugins/SegmentEditor/lang/ja.json
+++ b/plugins/SegmentEditor/lang/ja.json
@@ -19,11 +19,10 @@
"SegmentIsDisplayedForWebsite": "表示対象ã®é¸æŠžï¼š",
"SegmentNotApplied": "セグメント '%s' ãŒé©ç”¨ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ",
"SegmentNotAppliedMessage": "カスタムセグメント '%s' ã®ãƒ‡ãƒ¼ã‚¿ã‚’リクエストã—ã¾ã—ãŸã€‚ã“ã® Piwik ã®æ§‹æˆã¯ç¾åœ¨ã€ãƒ‘フォーマンス上ã®ç†ç”±ã‹ã‚‰ãƒ¬ãƒãƒ¼ãƒˆã®ãƒªã‚¢ãƒ«ã‚¿ã‚¤ãƒ 処ç†ã‚’ãŠã“ãªã„ã¾ã›ã‚“。",
- "SelectSegmentOfVisitors": "ビジターã®ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã‚’é¸æŠž:",
"ThisSegmentIsVisibleTo": "ã“ã®ã‚»ã‚°ãƒ¡ãƒ³ãƒˆè¨å®šã®è¡¨ç¤ºï¼š",
"VisibleToAllUsers": "ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼",
"VisibleToMe": "自分",
- "YouMayChangeSetting": "別ã®æ–¹æ³•ã¨ã—ã¦ã¯è¨å®šãƒ•ã‚¡ã‚¤ãƒ« (%s) ã§è¨å®šã‚’変更ã™ã‚‹ã‹ã€ã“ã®ã‚»ã‚°ãƒ¡ãƒ³ãƒˆ '%s' ã‚’é¸æŠžã—編集ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚",
+ "YouMayChangeSetting": "別ã®æ–¹æ³•ã¨ã—ã¦ã¯è¨å®šãƒ•ã‚¡ã‚¤ãƒ« (%1$s) ã§è¨å®šã‚’変更ã™ã‚‹ã‹ã€ã“ã®ã‚»ã‚°ãƒ¡ãƒ³ãƒˆ '%2$s' ã‚’é¸æŠžã—編集ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚",
"YouMustBeLoggedInToCreateSegments": "ビジターã®ã‚«ã‚¹ã‚¿ãƒ セグメントã®ä½œæˆã¨ç·¨é›†ã«ã¯ãƒã‚°ã‚¤ãƒ³ãŒå¿…è¦ã§ã™ã€‚",
"YouDontHaveAccessToCreateSegments": "セグメントã®ä½œæˆãŠã‚ˆã³ç·¨é›†ã«å¿…è¦ãªãƒ¬ãƒ™ãƒ«ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©é™ã‚’æŒã£ã¦ã„ã¾ã›ã‚“。",
"AddingSegmentForAllWebsitesDisabled": "全ウェブサイトã«å¯¾ã™ã‚‹ã‚»ã‚°ãƒ¡ãƒ³ãƒˆã¯è¿½åŠ ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚",
diff --git a/plugins/SegmentEditor/lang/lt.json b/plugins/SegmentEditor/lang/lt.json
new file mode 100644
index 0000000000000000000000000000000000000000..bd373755e1092ef41fa98c44efea3d8539c2b12f
--- /dev/null
+++ b/plugins/SegmentEditor/lang/lt.json
@@ -0,0 +1,5 @@
+{
+ "SegmentEditor": {
+ "OperatorAND": "IR"
+ }
+}
\ No newline at end of file
diff --git a/plugins/SegmentEditor/lang/nb.json b/plugins/SegmentEditor/lang/nb.json
index 79c00349402cc65f8d5c8d92624349df9ef7c8af..00e9c985ce1e01e4be891a4c7225101192cbbdae 100644
--- a/plugins/SegmentEditor/lang/nb.json
+++ b/plugins/SegmentEditor/lang/nb.json
@@ -9,7 +9,6 @@
"SegmentDisplayedAllWebsites": "alle nettsteder",
"SegmentDisplayedThisWebsiteOnly": "kun dette nettstedet",
"SegmentIsDisplayedForWebsite": "og vises for",
- "SelectSegmentOfVisitors": "Velg et segment av besøkende:",
"ThisSegmentIsVisibleTo": "Dette segmentet er synlig for:",
"VisibleToAllUsers": "alle brukere",
"VisibleToMe": "meg"
diff --git a/plugins/SegmentEditor/lang/nl.json b/plugins/SegmentEditor/lang/nl.json
index 32ca610e783e69fc612c7c99689e12b23e3468a4..50f8c52718b554cb1e1cb58934d8cc4a053b0615 100644
--- a/plugins/SegmentEditor/lang/nl.json
+++ b/plugins/SegmentEditor/lang/nl.json
@@ -19,11 +19,10 @@
"SegmentIsDisplayedForWebsite": "en getoond voor",
"SegmentNotApplied": "Segment '%s' niet toegepast",
"SegmentNotAppliedMessage": "Je probeert data op te vragen voor aangepast segment '%s', deze Piwik omgeving is op dit moment, vanwege performance redenen, ingericht om geen rapporten in realtime te verwerken.",
- "SelectSegmentOfVisitors": "Selecteer een segment van bezoekers:",
"ThisSegmentIsVisibleTo": "Dit segment is zichtbaar voor:",
"VisibleToAllUsers": "alle gebruikers",
"VisibleToMe": "mij",
- "YouMayChangeSetting": "Als alternatief kun je er voor kiezen om de instelling binnen het configuratie bestand (%s) aan te passen, of wijzig dit Segment en kies '%s'.",
+ "YouMayChangeSetting": "Als alternatief kun je er voor kiezen om de instelling binnen het configuratie bestand (%1$s) aan te passen, of wijzig dit Segment en kies '%2$s'.",
"YouMustBeLoggedInToCreateSegments": "Je moet ingelogd zijn om Bezoekers segmenten te bewerken of aan te maken.",
"YouDontHaveAccessToCreateSegments": "U heeft niet het benodigde toegangsniveau om segmenten te maken en bewerken.",
"AddingSegmentForAllWebsitesDisabled": "Het toevoegen van segmenten voor alle websites is uitgeschakeld."
diff --git a/plugins/SegmentEditor/lang/pt-br.json b/plugins/SegmentEditor/lang/pt-br.json
index eb7a8919d2eb3f514210ca927fd90ce86758f591..96efec50fe2aed412bf93a893ebb66e385f90f79 100644
--- a/plugins/SegmentEditor/lang/pt-br.json
+++ b/plugins/SegmentEditor/lang/pt-br.json
@@ -20,11 +20,13 @@
"SegmentIsDisplayedForWebsite": "e exibidos para",
"SegmentNotApplied": "Segmento '%s' não aplicado",
"SegmentNotAppliedMessage": "Você está solicitando dados para o Segmento Personalizado '%s', e esta configuração Piwik atualmente impede o processamento em tempo real de relatórios por motivos de desempenho.",
- "SelectSegmentOfVisitors": "Selecione um segmento de visitantes:",
+ "SelectSegmentOfVisits": "Selecione um segmento de visitas:",
"ThisSegmentIsVisibleTo": "Este segmento é visÃvel para:",
"VisibleToAllUsers": "Todos os Usuários",
"VisibleToMe": "mim",
- "YouMayChangeSetting": "Alternativamente, você pode alterar a configuração no arquivo de configuração (%s), ou editar este Segmento e escolher %s.",
+ "YouMayChangeSetting": "Alternativamente, você pode alterar a configuração no arquivo de configuração (%1$s), ou editar este Segmento e escolher %2$s.",
+ "VisibleToSuperUser": "VisÃvel pra você porque você tem acesso Super Usuário",
+ "SharedWithYou": "Compartilhado com você",
"YouMustBeLoggedInToCreateSegments": "Você precisa estar logado para criar e editar segmentos personalizados de visitantes.",
"YouDontHaveAccessToCreateSegments": "Você não tem o nÃvel de acesso necessário para criar e editar segmentos.",
"AddingSegmentForAllWebsitesDisabled": "Adicionar segmentos para todos os sites foi desativado.",
diff --git a/plugins/SegmentEditor/lang/ro.json b/plugins/SegmentEditor/lang/ro.json
index b59f7357ef34deeeee8691ac6b349e91930c7465..af9fd478dbb6c589a9177565cb9966c01b23ae98 100644
--- a/plugins/SegmentEditor/lang/ro.json
+++ b/plugins/SegmentEditor/lang/ro.json
@@ -18,11 +18,10 @@
"SegmentIsDisplayedForWebsite": "și afișate pentru",
"SegmentNotApplied": "Segmentul '%s' nu se aplica",
"SegmentNotAppliedMessage": "Vi se solicită date pentru segmentul personalizat '%s', această configurație Piwik împiedică în prezent prelucrarea în timp real a rapoartelor pentru motive de performanță.",
- "SelectSegmentOfVisitors": "Selecteaza un segment de vizitatori:",
"ThisSegmentIsVisibleTo": "Acest segment este vizibil către:",
"VisibleToAllUsers": "tuturor utilizatorilor",
"VisibleToMe": "mie",
- "YouMayChangeSetting": "Alternativ, puteți schimba setările în fișierul de configurare (%s), sau pentru a edita acest segment și alegeți '%s'.",
+ "YouMayChangeSetting": "Alternativ, puteți schimba setările în fișierul de configurare (%1$s), sau pentru a edita acest segment și alegeți '%2$s'.",
"YouMustBeLoggedInToCreateSegments": "Trebuie să fii logat pentru a crea și edita segmente de vizitatori personalizate.",
"YouDontHaveAccessToCreateSegments": "Nu ai nivelul de acces necesar pentru a crea și edita segmente."
}
diff --git a/plugins/SegmentEditor/lang/ru.json b/plugins/SegmentEditor/lang/ru.json
index 939b09e1f65783f10908666b716a89e3476056a4..eb0f9c3c05de3612546a9f20f52499c47ec9f15f 100644
--- a/plugins/SegmentEditor/lang/ru.json
+++ b/plugins/SegmentEditor/lang/ru.json
@@ -14,7 +14,6 @@
"SegmentDisplayedThisWebsiteOnly": "только Ñтот Ñайт",
"SegmentIsDisplayedForWebsite": "и отображаетÑÑ Ð´Ð»Ñ",
"SegmentNotAppliedMessage": "Ð’Ñ‹ запрашиваете данные Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑкого Ñегмента '%s', Ñта ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Piwik в данный момент препÑÑ‚Ñтвует обработке отчетов в реальном времени по ÑоображениÑм производительноÑти.",
- "SelectSegmentOfVisitors": "Выберите Ñегмент поÑетителей:",
"ThisSegmentIsVisibleTo": "Ðтот Ñегмент видим длÑ:",
"VisibleToAllUsers": "вÑе пользователи",
"VisibleToMe": "менÑ",
diff --git a/plugins/SegmentEditor/lang/sr.json b/plugins/SegmentEditor/lang/sr.json
index 82102c610e1473c2c49d170348bdae21e625e62c..2be5a7457c17776778533e87a1106c2c95152e31 100644
--- a/plugins/SegmentEditor/lang/sr.json
+++ b/plugins/SegmentEditor/lang/sr.json
@@ -19,11 +19,10 @@
"SegmentIsDisplayedForWebsite": "i prikazan za",
"SegmentNotApplied": "Segment '%s' nije primenjen.",
"SegmentNotAppliedMessage": "Zahtevali ste podatke za korisniÄki definisani segment '%s' a trenutne postavke Piwik-a spreÄavaju procesiranje izveÅ¡taja u realnom vremenu zbog oÄuvanja nivoa performansi.",
- "SelectSegmentOfVisitors": "Izaberite segment posetilaca:",
"ThisSegmentIsVisibleTo": "Ovaj segment je vidljiv:",
"VisibleToAllUsers": "svi korisnici",
"VisibleToMe": "meni",
- "YouMayChangeSetting": "Takođe možete promeniti podešavanja i u datoteci %s ili izmenom segmenta i izborom '%s'.",
+ "YouMayChangeSetting": "Takođe možete promeniti podešavanja i u datoteci %1$s ili izmenom segmenta i izborom '%2$s'.",
"YouMustBeLoggedInToCreateSegments": "Morate biti prijavljeni kako biste mogli da kreirate i menjate segmente.",
"YouDontHaveAccessToCreateSegments": "Nemate odgovarajući nivo pristupa da biste kreirali i menjali segmente.",
"AddingSegmentForAllWebsitesDisabled": "Dodavanje segmenata za sve sajtove je onemogućeno."
diff --git a/plugins/SegmentEditor/lang/sv.json b/plugins/SegmentEditor/lang/sv.json
index d88071b3747bee7b34d55b3938980535557ce5ec..9e81fa099593afe88ca67814a6c7d95ec9e807f2 100644
--- a/plugins/SegmentEditor/lang/sv.json
+++ b/plugins/SegmentEditor/lang/sv.json
@@ -18,12 +18,14 @@
"SegmentIsDisplayedForWebsite": "och visas för",
"SegmentNotApplied": "Segment '%s' tillämpas inte",
"SegmentNotAppliedMessage": "Du begär data för det Anpassade Segmentet '%s', denna Piwik konfiguration förhindrar realtidsbearbetning av rapporter pga prestandaskäl.",
- "SelectSegmentOfVisitors": "Välj ett besökarsegment",
"ThisSegmentIsVisibleTo": "Det här segmentet är synligt för:",
"VisibleToAllUsers": "alla användare",
"VisibleToMe": "jag",
- "YouMayChangeSetting": "Alternativt kan du ändra inställningarna i konfigurationsfilen (%s), eller redigera detta Segment och välj '%s'.",
+ "YouMayChangeSetting": "Alternativt kan du ändra inställningarna i konfigurationsfilen (%1$s), eller redigera detta Segment och välj '%2$s'.",
"YouMustBeLoggedInToCreateSegments": "Du måste vara inloggad för att skapa och redigera besökssegment.",
- "YouDontHaveAccessToCreateSegments": "Du har inte rättigheter för att skapa och redigera segment."
+ "YouDontHaveAccessToCreateSegments": "Du har inte rättigheter för att skapa och redigera segment.",
+ "CustomSegment": "Anpassat segment",
+ "SegmentOperatorIsNullOrEmpty": "är null eller tom",
+ "SegmentOperatorIsNotNullNorEmpty": "är inte null och inte tom"
}
}
\ No newline at end of file
diff --git a/plugins/SegmentEditor/lang/tl.json b/plugins/SegmentEditor/lang/tl.json
index 2919911036bad92f8893255bba984de436cf22f4..7e3b4a8f79aab1b6e491b88c05771c51ec0bda85 100644
--- a/plugins/SegmentEditor/lang/tl.json
+++ b/plugins/SegmentEditor/lang/tl.json
@@ -16,11 +16,10 @@
"SegmentDisplayedThisWebsiteOnly": "ang website na ito lamang",
"SegmentIsDisplayedForWebsite": "at ipinapakita para sa",
"SegmentNotApplied": "Hindi nai-apply ang Segment '%s'",
- "SelectSegmentOfVisitors": "Pumili ng isang segment sa mga bisita:",
"ThisSegmentIsVisibleTo": "Ang segment na ito ay makikita sa:",
"VisibleToAllUsers": "lahat ng mga user",
"VisibleToMe": "ako",
- "YouMayChangeSetting": "Maaari mo ring baguhin ang settings sa config file (%s) o i-edit ang mga Segment at piliin ang '%s'.",
+ "YouMayChangeSetting": "Maaari mo ring baguhin ang settings sa config file (%1$s) o i-edit ang mga Segment at piliin ang '%2$s'.",
"YouMustBeLoggedInToCreateSegments": "Kailangan mong mag log-in upang gumawa at mag-edit ng custom visitor segments.",
"YouDontHaveAccessToCreateSegments": "Wala kang mga kinakailangang access level upang lumikha at mag edit ng mga segment.",
"AddingSegmentForAllWebsitesDisabled": "Ang pagdagdag ng bahagi para sa lahat ng website ay hindi na pinagana."
diff --git a/plugins/SegmentEditor/lang/vi.json b/plugins/SegmentEditor/lang/vi.json
index b6630be6c9fb6e6c4e450e5a794ed04a0cc99c35..78a7a6dc809cfd2f56b5c1c0bb9203a275ba0010 100644
--- a/plugins/SegmentEditor/lang/vi.json
+++ b/plugins/SegmentEditor/lang/vi.json
@@ -15,7 +15,6 @@
"SegmentDisplayedAllWebsites": "Tất cả các website",
"SegmentDisplayedThisWebsiteOnly": "Chỉ website nà y",
"SegmentIsDisplayedForWebsite": "và hiển thị cho",
- "SelectSegmentOfVisitors": "Chá»n má»™t phân Ä‘oạn của khách truy cáºp:",
"ThisSegmentIsVisibleTo": "Phân đoạn nà y có thể nhìn thấy:",
"VisibleToAllUsers": "Tất cả ngÆ°á»i dùng",
"VisibleToMe": "Tôi",
diff --git a/plugins/SegmentEditor/lang/zh-cn.json b/plugins/SegmentEditor/lang/zh-cn.json
index 4f5e3b5d0b9fea37178a2d7bfb742b591837a256..ff6c9f1c3dbfb572a59374e29595d0b4e3f43237 100644
--- a/plugins/SegmentEditor/lang/zh-cn.json
+++ b/plugins/SegmentEditor/lang/zh-cn.json
@@ -15,7 +15,6 @@
"SegmentDisplayedAllWebsites": "所有网站",
"SegmentDisplayedThisWebsiteOnly": "仅这个网站",
"SegmentIsDisplayedForWebsite": "显示",
- "SelectSegmentOfVisitors": "选择一个访客分段",
"ThisSegmentIsVisibleTo": "这个分段对其å¯è§:",
"VisibleToAllUsers": "所有用户",
"VisibleToMe": "我",
diff --git a/plugins/SegmentEditor/stylesheets/segmentation.less b/plugins/SegmentEditor/stylesheets/segmentation.less
index 125a0c9f5639a22819afcd412ddd28de719adf2f..afc79b3a9bfa15cc0dc0f068f8bf7016d0e8dd4d 100644
--- a/plugins/SegmentEditor/stylesheets/segmentation.less
+++ b/plugins/SegmentEditor/stylesheets/segmentation.less
@@ -174,7 +174,7 @@ div.scrollable {
}
.segment-element .segment-nav div > ul > li a {
- color: #5d5342;
+ color: @theme-color-text-light;
font-size: 11px;
font-weight: bold;
text-decoration: none;
@@ -454,7 +454,7 @@ div.scrollable {
}
.segmentationContainer .submenu ul {
- color: #5D5342;
+ color: @theme-color-text-light;
float: none;
font-size: 11px;
font-weight: normal;
@@ -466,19 +466,14 @@ div.scrollable {
}
.segmentationContainer .submenu ul li {
- padding: 2px 0px 1px 6px;
+ padding: 2px 0 1px 6px;
margin: 3px 0 0 0;
cursor: pointer;
}
.segmentationContainer .submenu ul li:hover {
color: #255792;
- margin: 0;
- margin-left: -3px;
- border: 1px solid #d5d2c6;
- border-bottom: 2px solid #918f88;
- border-radius: 4px;
- background: #eae8e3;
+ background: @color-silver-l95;
}
.segmentationContainer ul.submenu {
@@ -496,6 +491,11 @@ div.scrollable {
background: url(plugins/SegmentEditor/images/edit_segment.png) no-repeat;
width: 16px;
height: 16px;
+ .opacity(0.5);
+
+ &:hover {
+ .opacity(1);
+ }
}
.segmentEditorPanel.expanded .segmentationContainer {
@@ -572,7 +572,7 @@ body > a.ddmetric {
cursor: move;
padding: 1px 0 2px 18px;
background: #eae8e3 url(plugins/SegmentEditor/images/segment-move.png) 100% 50% no-repeat;
- color: #5d5342;
+ color: @theme-color-text-light;
font-weight: normal;
font-size: 11px;
text-decoration: none;
@@ -723,6 +723,10 @@ a.metric_category {
max-width: 170px;
}
+.segment-clicked {
+ font-weight: bold;
+}
+
.segmentEditorPanel a.title {
padding-bottom: 8px;
}
@@ -759,3 +763,11 @@ a.metric_category {
display: inline-block;
vertical-align: sub;
}
+
+.segmentsVisibleToSuperUser, .segmentsSharedWithMeBySuperUser {
+ font-style: italic;
+
+ li {
+ font-style: normal;
+ }
+}
diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig
index dc269dc8b9096c4e25b4fa04caa35152de55efc1..8d03b6d5bd3760bbe6850bbae5a6a8c4778e9760 100644
--- a/plugins/SegmentEditor/templates/_segmentSelector.twig
+++ b/plugins/SegmentEditor/templates/_segmentSelector.twig
@@ -1,13 +1,13 @@
<div class="SegmentEditor" style="display:none;">
<div class="segmentationContainer listHtml" title="{{ 'SegmentEditor_ChooseASegment'|translate|e('html_attr') }}. {{ 'SegmentEditor_CurrentlySelectedSegment'|translate(segmentDescription)|e('html_attr') }}">
- <a class="title"><span class="icon icon-segment"></span><span class="segmentationTitle"></span></a>
+ <a class="title" tabindex="4"><span class="icon icon-segment"></span><span class="segmentationTitle"></span></a>
<div class="dropdown dropdown-body">
<div class="segmentFilterContainer">
<input class="segmentFilter" type="text" value="{{ 'General_Search'|translate }}"/>
<span/>
</div>
<ul class="submenu">
- <li>{{ 'SegmentEditor_SelectSegmentOfVisitors'|translate }}
+ <li>{{ 'SegmentEditor_SelectSegmentOfVisits'|translate }}
<div class="segmentList">
<ul>
</ul>
@@ -18,6 +18,7 @@
{% if authorizedToCreateSegments %}
<a class="add_new_segment btn">{{ 'SegmentEditor_AddNewSegment'|translate }}</a>
{% else %}
+ <hr/>
<ul class="submenu">
<li>
{% if isUserAnonymous %}
@@ -26,6 +27,7 @@
{% endif %}
</li>
</ul>
+ <br/><br/>
{% endif %}
</div>
</div>
diff --git a/plugins/SegmentEditor/tests/Integration/ApiTest.php b/plugins/SegmentEditor/tests/Integration/ApiTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..c58ec7a8cd6e3d224a2afae2969556ae1687b703
--- /dev/null
+++ b/plugins/SegmentEditor/tests/Integration/ApiTest.php
@@ -0,0 +1,221 @@
+<?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\SegmentEditor\tests\Integration;
+
+use Piwik\Plugins\SegmentEditor\API;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\Mock\FakeAccess;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+
+/**
+ * @group SegmentEditor
+ * @group ApiTest
+ * @group Plugins
+ */
+class ApiTest extends IntegrationTestCase
+{
+ /**
+ * @var API
+ */
+ private $api;
+
+ public function setUp()
+ {
+ parent::setUp();
+
+ $this->api = API::getInstance();
+
+ Fixture::createSuperUser();
+ if (!Fixture::siteCreated(1)) {
+ Fixture::createWebsite('2012-01-01 00:00:00');
+ }
+ if (!Fixture::siteCreated(2)) {
+ Fixture::createWebsite('2012-01-01 00:00:00');
+ }
+
+ }
+
+ public function test_getAll_forOneWebsite_returnsSortedSegments()
+ {
+ $this->createAdminUser();
+ $this->createSegments();
+ $this->setAdminUser();
+
+ $expectedOrder = array(
+ // 1) my segments
+ 'segment 1',
+ 'segment 3',
+ 'segment 7',
+
+ // 2) segments created by a super user that were shared with all users
+ 'segment 5',
+ 'segment 9',
+
+ // 3) segments created by other users (which are visible to all super users)
+ // not a super user, so can't see those
+ );
+
+ $segments = $this->api->getAll($idSite = 1);
+ $segmentNames = $this->getNamesFromSegments($segments);
+ $this->assertSame($expectedOrder, $segmentNames);
+ }
+
+ public function test_getAll_forAllWebsites_returnsSortedSegments()
+ {
+ $this->createAdminUser();
+ $this->createSegments();
+ $this->setAdminUser();
+
+ $expectedOrder = array(
+ // 1) my segments
+ 'segment 1',
+ 'segment 2',
+ 'segment 3',
+ 'segment 7',
+
+ // 2) segments created by a super user that were shared with all users
+ 'segment 5',
+ 'segment 6',
+ 'segment 9',
+
+ // 3) segments created by other users (which are visible to all super users)
+ // not a super user, so can't see those
+ );
+
+ $segments = $this->api->getAll();
+ $segmentNames = $this->getNamesFromSegments($segments);
+ $this->assertSame($expectedOrder, $segmentNames);
+ }
+
+ public function test_getAll_forAllWebsites_returnsSortedSegments_asSuperUser()
+ {
+ $this->createAdminUser();
+ $this->createSegments();
+ $this->setAnotherSuperUser();
+
+ $expectedOrder = array(
+ // 1) my segments
+ 'segment 9',
+
+ // 2) segments created by a super user that were shared with all users
+ 'segment 5',
+ 'segment 6',
+
+ // 3) segments created by other users (which are visible to all super users)
+ 'segment 1',
+ 'segment 2',
+ 'segment 3',
+ 'segment 4',
+ 'segment 7',
+ 'segment 8',
+ );
+
+ $segments = $this->api->getAll();
+ $segmentNames = $this->getNamesFromSegments($segments);
+ $this->assertSame($expectedOrder, $segmentNames);
+ }
+
+ public function test_getAll_forOneWebsite_returnsSortedSegments_asSuperUser()
+ {
+ $this->createAdminUser();
+ $this->createSegments();
+ $this->setAnotherSuperUser();
+
+ $expectedOrder = array(
+ // 1) my segments
+ 'segment 9',
+
+ // 2) segments created by a super user that were shared with all users
+ 'segment 5',
+
+ // 3) segments created by other users (which are visible to all super users)
+ 'segment 1',
+ 'segment 3',
+ 'segment 4',
+ 'segment 7',
+ 'segment 8',
+ );
+
+ $segments = $this->api->getAll($idSite = 1);
+ $segmentNames = $this->getNamesFromSegments($segments);
+ $this->assertSame($expectedOrder, $segmentNames);
+ }
+
+ /**
+ * @return bool|int
+ */
+ protected function createSegments()
+ {
+ $this->setAdminUser();
+ $this->api->add('segment 1', 'visitCount<2', $idSite = 1, $autoArchive = true, $enableAllUsers = false);
+ $this->api->add('segment 2', 'countryCode==fr', $idSite = 2, $autoArchive = false, $enableAllUsers = false);
+ $this->api->add('segment 3', 'visitCount<2', $idSite = 1, $autoArchive = true, $enableAllUsers = false);
+
+ $this->setSuperUser();
+ $this->api->add('segment 4', 'countryCode!=fr', $idSite = false, $autoArchive = false, $enableAllUsers = false);
+ $this->api->add('segment 5', 'countryCode!=fr', $idSite = 1, $autoArchive = false, $enableAllUsers = true);
+ $this->api->add('segment 6', 'visitCount<2', $idSite = 2, $autoArchive = true, $enableAllUsers = true);
+
+ $this->setAdminUser();
+ $this->api->add('segment 7', 'visitCount<2', $idSite = 1, $autoArchive = true, $enableAllUsers = false);
+
+ $this->setAnotherAdminUser();
+ $this->api->add('segment 8', 'visitCount<2', $idSite = 1, $autoArchive = true, $enableAllUsers = false);
+
+ $this->setAnotherSuperUser();
+ $this->api->add('segment 9', 'countryCode!=fr', $idSite = false, $autoArchive = false, $enableAllUsers = true);
+
+ }
+
+ protected function setSuperUser($userName = 'superUserLogin')
+ {
+ FakeAccess::clearAccess($superUser = true, $idSitesAdmin = array(), $idSitesView = array(), $userName);
+ }
+
+ protected function setAnotherSuperUser()
+ {
+ $this->setSuperUser('anotherSuperUser');
+ }
+
+ protected function setAdminUser($userName = 'myUserLogin')
+ {
+ FakeAccess::clearAccess($superUser = false, $idSitesAdmin = array(1,2), $idSitesView = array(1,2), $userName);
+ }
+
+ protected function setAnotherAdminUser()
+ {
+ $this->setAdminUser('anotherUserWithAdmin');
+ }
+
+ public function provideContainerConfig()
+ {
+ return array(
+ 'Piwik\Access' => new FakeAccess()
+ );
+ }
+
+ protected function createAdminUser()
+ {
+ \Piwik\Plugins\UsersManager\API::getInstance()->addUser('myUserLogin', 'password', 'test@test.com');
+ }
+
+ /**
+ * @param $segments
+ * @return array
+ */
+ protected function getNamesFromSegments($segments)
+ {
+ $segmentNames = array();
+ foreach ($segments as $segment) {
+ $segmentNames[] = $segment['name'];
+ }
+ return $segmentNames;
+ }
+
+}
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index ca3f2757b93cf1305a7966cb0df570e987dacf83..5ebc5898f6df3152c17a07af64d944005cad9bc3 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -293,6 +293,7 @@ class SitesManager extends \Piwik\Plugin
$translationKeys[] = "SitesManager_AliasUrlHelp";
$translationKeys[] = "SitesManager_OnlyMatchedUrlsAllowed";
$translationKeys[] = "SitesManager_OnlyMatchedUrlsAllowedHelp";
+ $translationKeys[] = "SitesManager_OnlyMatchedUrlsAllowedHelpExamples";
$translationKeys[] = "SitesManager_KeepURLFragmentsLong";
$translationKeys[] = "SitesManager_HelpExcludedIps";
$translationKeys[] = "SitesManager_ListOfQueryParametersToExclude";
diff --git a/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js b/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js
index 5e0fcbb6e29537053236ae25ef86bd015cac0e89..b5d7ec0213e5ee0159fc3d44bcf952600baa346a 100644
--- a/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js
+++ b/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js
@@ -159,7 +159,7 @@
$scope.timezones.push({
group: timezoneGroup,
code: code,
- label:Â label
+ label: label
});
});
});
diff --git a/plugins/SitesManager/lang/ar.json b/plugins/SitesManager/lang/ar.json
index e2f60cbdd89a95fcd4f641a2531a2ddffef15337..362c0bb945c2a064bbcd7f56845db1cd2f7f5b09 100644
--- a/plugins/SitesManager/lang/ar.json
+++ b/plugins/SitesManager/lang/ar.json
@@ -12,8 +12,8 @@
"DeleteConfirm": "هل ترغب Øقاً ÙÙŠ Øذ٠هذا الموقع %sØŸ",
"ExceptionDeleteSite": "لا يمكنك Øذ٠هذا الموقع، Ùهو الوØيد المسجل لديك. أض٠موقعاً جديداً ثم قم بØذ٠هذا الموقع.",
"ExceptionEmptyName": "لا يمكن ترك Øقل اسم الموقع Ùارغاً.",
- "ExceptionInvalidCurrency": "العملة \"%s\" غير صالØØ©. الرجاء إدخال رمز عملة ØµØ§Ù„Ø (مثل %s).",
- "ExceptionInvalidIPFormat": "عنوان IP المستثنى \"%s\" لا يواÙÙ‚ صيغة عنوان IP صØÙŠØØ© (مثل %s).",
+ "ExceptionInvalidCurrency": "العملة \"%1$s\" غير صالØØ©. الرجاء إدخال رمز عملة ØµØ§Ù„Ø (مثل %2$s).",
+ "ExceptionInvalidIPFormat": "عنوان IP المستثنى \"%1$s\" لا يواÙÙ‚ صيغة عنوان IP صØÙŠØØ© (مثل %2$s).",
"ExceptionInvalidTimezone": "المنقطة الزمنية \"%s\" غير صالØØ©. الرجاء إدخال منطقة زمنية صالØØ©.",
"ExceptionInvalidUrl": "الرابط \"%s\" غير صالØ.",
"ExceptionNoUrl": "يجب عليك أن تØدد رابط ويب ÙˆØيد على الأقل للموقع.",
diff --git a/plugins/SitesManager/lang/be.json b/plugins/SitesManager/lang/be.json
index 0ce685219b988deff8fc78313d5cecd01fb1d285..327f5f635eade3958141c6678b8b4bb0c7d5735a 100644
--- a/plugins/SitesManager/lang/be.json
+++ b/plugins/SitesManager/lang/be.json
@@ -14,8 +14,8 @@
"EnableEcommerce": "ÐÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ñ†Ñ‹Ñ ÑƒÐºÐ»ÑŽÑ‡Ð°Ð½Ð°",
"ExceptionDeleteSite": "Ðемагчыма выдаліць, бо гÑта адзіны Ñайт у вашым ÑпіÑе. Дадайце ÑÑˆÑ‡Ñ Ñкі-небудзь Ñайт Ð´Ð»Ñ Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð´Ð°Ð´Ð·ÐµÐ½Ð°Ð³Ð°.",
"ExceptionEmptyName": "Ðазва Ñайта не можа быць пуÑтое.",
- "ExceptionInvalidCurrency": "Валюта \"%s\" з'ÑўлÑецца недапушчальнай. Калі лаÑка, увÑдзіце правільны Ñімвал валюты (напр., %s)",
- "ExceptionInvalidIPFormat": "IP-Ð°Ð´Ñ€Ð°Ñ Ð´Ð»Ñ Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÑÐ½Ð½Ñ \"%s\" не мае правільны фармат IP-адраÑа (напр., %s).",
+ "ExceptionInvalidCurrency": "Валюта \"%1$s\" з'ÑўлÑецца недапушчальнай. Калі лаÑка, увÑдзіце правільны Ñімвал валюты (напр., %2$s)",
+ "ExceptionInvalidIPFormat": "IP-Ð°Ð´Ñ€Ð°Ñ Ð´Ð»Ñ Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÑÐ½Ð½Ñ \"%1$s\" не мае правільны фармат IP-адраÑа (напр., %2$s).",
"ExceptionInvalidTimezone": "Гадзінны поÑÑ \"%s\" з'ÑўлÑецца недапушчальным. Калі лаÑка, увÑдзіце правільны гадзінны поÑÑ.",
"ExceptionInvalidUrl": "URL '%s' не дакладны.",
"ExceptionNoUrl": "Ð’Ñ‹ павінны паказаць хоць бы адзін URL Ð´Ð»Ñ Ð³Ñтага Ñайта.",
@@ -34,7 +34,7 @@
"NotFound": "ÐÑма знойдзеных Ñайтаў",
"NoWebsites": "Ð’Ñ‹ не маеце ніводнага Ñайта на ўліку.",
"OnlyOneSiteAtTime": "Ð’Ñ‹ можаце Ñ€Ñдагаваць толькі адзін вÑб-Ñайт за адзін раз. Калі лаÑка, захаваце ці адмÑніце змены Ñž бÑгучым Ñайце %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik прапаноўвае пашыранае адÑочванне Ñ– Ñ€Ñпартаванне Ð´Ð»Ñ ÐºÐ°Ð¼ÐµÑ€Ñ†Ñ‹Ð¹Ð½Ñ‹Ñ… вÑб-Ñайтаў. ДаведайцеÑÑ Ð±Ð¾Ð»ÑŒÑˆ пра %s Ðналітыку Ðлектронна-камерцыйных Ñайтаў%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik прапаноўвае пашыранае адÑочванне Ñ– Ñ€Ñпартаванне Ð´Ð»Ñ ÐºÐ°Ð¼ÐµÑ€Ñ†Ñ‹Ð¹Ð½Ñ‹Ñ… вÑб-Ñайтаў. ДаведайцеÑÑ Ð±Ð¾Ð»ÑŒÑˆ пра %1$s Ðналітыку Ðлектронна-камерцыйных Ñайтаў%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik аўтаматычна выключае Ð°Ð³ÑƒÐ»ÑŒÐ½Ñ‹Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ ÑеÑÑ–Ñ– (%s).",
"SelectACity": "ÐбÑрыце горад",
"SelectDefaultCurrency": "Ð’Ñ‹ можаце выбраць валюту Ð´Ð»Ñ ÑžÑтаноўкі па змаўчанні Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… вÑб-Ñайтаў.",
diff --git a/plugins/SitesManager/lang/bg.json b/plugins/SitesManager/lang/bg.json
index 7c7c3e381094aa875b7eff13fc727c4cfe36cdb6..45f35a7fbcfc935d0babd53abaacf7a74eff998d 100644
--- a/plugins/SitesManager/lang/bg.json
+++ b/plugins/SitesManager/lang/bg.json
@@ -16,8 +16,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Ðко има нужда, могат да Ñе изключат различни потребителÑки агенти, за различни Ñайтове. За целта активирайте тази отметка, щракнете „Запази“ и %1$sдобави потребителÑките агенти по-горе%2$s.",
"ExceptionDeleteSite": "Ðе е възможно да изтриете този Ñайт, защото той е единÑÑ‚Ð²ÐµÐ½Ð¸Ñ Ñ€ÐµÐ³Ð¸Ñтриран в ÑиÑтемата. Преди да изтриете този Ñайт е нужно да добавите нов Ñайт.",
"ExceptionEmptyName": "Полето за име на Ñайт не може да бъде празно.",
- "ExceptionInvalidCurrency": "Валутата \"%s\" не е валидна. МолÑ, въведете валиден Ñимвол за валутата (например %s)",
- "ExceptionInvalidIPFormat": "IP адреÑÑŠÑ‚ за изключване \"%s\" не е във валиден IP формат (например %s)",
+ "ExceptionInvalidCurrency": "Валутата \"%1$s\" не е валидна. МолÑ, въведете валиден Ñимвол за валутата (например %2$s)",
+ "ExceptionInvalidIPFormat": "IP адреÑÑŠÑ‚ за изключване \"%1$s\" не е във валиден IP формат (например %2$s)",
"ExceptionInvalidTimezone": "Времевата зона \"%s\" не е валидна. МолÑ, въведете валидна времева зона.",
"ExceptionInvalidUrl": "ÐдреÑа '%s' не е валиден.",
"ExceptionNoUrl": "Ðеобходимо е да въведете поне един Ð°Ð´Ñ€ÐµÑ (URL) за Ñайта.",
@@ -37,7 +37,7 @@
"NotFound": "Ðе Ñа намерени уеб Ñайтове",
"NoWebsites": "Вие нÑмате Ñайт, който да админиÑтрирате.",
"OnlyOneSiteAtTime": "Ðе можете да променÑте едновременно два Ñайта. ÐœÐ¾Ð»Ñ Ð—Ð°Ð¿Ð°Ð·ÐµÑ‚Ðµ или Откажете вашата текуща Ð¼Ð¾Ð´Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð½Ð° този уеб Ñайт %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik позволÑва задълбочено проÑледÑване и анализ на Електронна търговиÑ. Ðаучете повече отноÑно %s Електронна Ñ‚ÑŠÑ€Ð³Ð¾Ð²Ð¸Ñ Ð°Ð½Ð°Ð»Ð¸Ð· %s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik позволÑва задълбочено проÑледÑване и анализ на Електронна търговиÑ. Ðаучете повече отноÑно %1$s Електронна Ñ‚ÑŠÑ€Ð³Ð¾Ð²Ð¸Ñ Ð°Ð½Ð°Ð»Ð¸Ð· %2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik автоматично ще изключи общите параметри на ÑеÑиÑта (%s).",
"SearchKeywordLabel": "Параметър за заÑвката",
"SearchKeywordParametersDesc": "Въведете ÑпиÑък, разделен ÑÑŠÑ Ð·Ð°Ð¿ÐµÑ‚Ð°Ð¸, за имената на вÑички заÑвки Ñъдържащи Ñ‚ÑŠÑ€Ñени ключови думи в Ñайта.",
@@ -47,7 +47,7 @@
"ShowTrackingTag": "покажи кода за вмъкване",
"Sites": "Сайтове",
"SiteSearchUse": "Можете да използвате Piwik да Ñледи и докладва това, което поÑетителите Ñ‚ÑŠÑ€ÑÑÑ‚, поÑредÑтвом Ñ‚ÑŠÑ€Ñачката на Ñайта.",
- "SuperUserAccessCan": "Потребител Ñ Ð¿Ñ€Ð°Ð²Ð° „привилигирован потребител“ може да доÑтъпва Ñъщо %sзадаване на глобални наÑтройки%s за новите Ñайтове.",
+ "SuperUserAccessCan": "Потребител Ñ Ð¿Ñ€Ð°Ð²Ð° „привилигирован потребител“ може да доÑтъпва Ñъщо %1$sзадаване на глобални наÑтройки%2$s за новите Ñайтове.",
"Timezone": "ЧаÑова зона",
"TrackingTags": "ПроÑледÑване на етикети за %s",
"Urls": "ÐдреÑи",
diff --git a/plugins/SitesManager/lang/ca.json b/plugins/SitesManager/lang/ca.json
index 29b228a40d0e9509c3992854cb5cd2dadfa05616..37d076ed7237c02dfaab8b237f662785a21b9b52 100644
--- a/plugins/SitesManager/lang/ca.json
+++ b/plugins/SitesManager/lang/ca.json
@@ -18,8 +18,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Si necessiteu excluïr diferents user-agent per a diferents llocs webs, marque aquesta opció, guardeu les opcions i %1$s afegiu user-agents a continuaicó %2$s.",
"ExceptionDeleteSite": "No és possible eliminar aquest lloc ja que és l'únic configurat. Afegiu un altre lloc primer i, llavors, ja esborrareu aquest.",
"ExceptionEmptyName": "El nom del lloc no pot estar buit.",
- "ExceptionInvalidCurrency": "La moneda \"%s\" no es và lida. Sisplau, introduïu un sÃmbol de moneda và lid (p.e. %s)",
- "ExceptionInvalidIPFormat": "La IP a excloure \"%s\" no te un format IP và lid (p.e. %s).",
+ "ExceptionInvalidCurrency": "La moneda \"%1$s\" no es và lida. Sisplau, introduïu un sÃmbol de moneda và lid (p.e. %2$s)",
+ "ExceptionInvalidIPFormat": "La IP a excloure \"%1$s\" no te un format IP và lid (p.e. %2$s).",
"ExceptionInvalidTimezone": "La zona horà ria \"%s\" no es và lida. Sisplau introduïu una zona horà ria và lida.",
"ExceptionInvalidUrl": "L'adreça '%s' no és và lida.",
"ExceptionNoUrl": "Heu d'especificar una URL com a mÃnim.",
@@ -43,7 +43,7 @@
"NotFound": "No s'han trobat llocs web per",
"NoWebsites": "No teniu cap lloc que pugueu administrar",
"OnlyOneSiteAtTime": "Només podeu editar un lloc web a la vegada. Sisplau, Guardeu o Canceleu les modificacions al lloc web %s.",
- "PiwikOffersEcommerceAnalytics": "EL Piwik permet analÃtiques avançades per a Eccomerce. Sabeu més de les %s AnalÃtiques per a Ecommerce %s.",
+ "PiwikOffersEcommerceAnalytics": "EL Piwik permet analÃtiques avançades per a Eccomerce. Sabeu més de les %1$s AnalÃtiques per a Ecommerce %2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik exclourà automà ticament els parà metres de sessió comuns (%s).",
"SearchCategoryDesc": "El Piwik també pot gestionar la categoria de Cerca per cada una de les paraules clau de la carca interna.",
"SearchCategoryLabel": "Parà metre de la categoria",
@@ -52,7 +52,7 @@
"SearchKeywordParametersDesc": "Introduïu una llista separada per comes de parà metres que conte la paraula clau de cerca al lloc web.",
"SearchParametersNote": "Nota: Els parametres de cerca i categoria de cerca només s'utilitzaran per llocs webs que tenen la Cerca al lloc activada pero que tenen aquest parà metres en blanc.",
"SearchParametersNote2": "Per deshabilitar la Cerca al lloc per als nous llocs web, deixeu aquest dos camps en blanc.",
- "SearchUseDefault": "Utilitzar els parà metres de Cerca al Lloc %s per defecte %s",
+ "SearchUseDefault": "Utilitzar els parà metres de Cerca al Lloc %1$s per defecte %2$s",
"SelectACity": "Seleccioneu una ciutat",
"SelectDefaultCurrency": "Podeu seleccionar la moneda per defecte dels nous llocs web.",
"SelectDefaultTimezone": "Podeu seleccionar la zona horà ria per defecte dels nous llocs web.",
diff --git a/plugins/SitesManager/lang/cs.json b/plugins/SitesManager/lang/cs.json
index 6854eadf75669889558a1afcf2592ee895cb7f31..3edb945e2413c89992301cfc82ba323caddcece5 100644
--- a/plugins/SitesManager/lang/cs.json
+++ b/plugins/SitesManager/lang/cs.json
@@ -16,11 +16,11 @@
"EnableEcommerce": "Obchod zapnutý",
"EnableSiteSearch": "Sledovánà vyhledávánà na stránkách je povoleno",
"EnableSiteSpecificUserAgentExclude": "Povolit vynechánà user agentů specifické pro stránky.",
- "EnableSiteSpecificUserAgentExclude_Help": "Pokud pro různé webové stránky potÅ™ebujete vylouÄit různé uživatelské agenty, zaÅ¡krtnÄ›te toto pole, kliknÄ›te na uložit a pak %1$spÅ™idejte uživatelské agenty výše%2$s.",
+ "EnableSiteSpecificUserAgentExclude_Help": "Pokud potÅ™ebujete pro různé weby vylouÄit různé uživatelské agenty, zaÅ¡krtnÄ›te toto pole, kliknÄ›te na uložit a pak %1$spÅ™idejte uživatelské agenty výše%2$s.",
"ExceptionDeleteSite": "Nenà možné vymazat toto Web, protože je jediné registrované. Nejprve přidejte nový web, poté jej vymažte.",
"ExceptionEmptyName": "Jméno Webu nemůže zůstat prázdné.",
- "ExceptionInvalidCurrency": "MÄ›na %s je neplatná. ProsÃm zadejte platný symbol mÄ›ny. (napÅ™.: %s)",
- "ExceptionInvalidIPFormat": "IP adresa k vynechánà \"%s\" nenà v platném formátu (např.: %s)",
+ "ExceptionInvalidCurrency": "MÄ›na %1$s je neplatná. ProsÃm zadejte platný symbol mÄ›ny. (napÅ™.: %2$s)",
+ "ExceptionInvalidIPFormat": "IP adresa k vynechánà \"%1$s\" nenà v platném formátu (např.: %2$s)",
"ExceptionInvalidTimezone": "ÄŒasová zóna %s je neplatná. ProzÃm zadejte platnou zónu.",
"ExceptionInvalidUrl": "URL '%s' nenà platné URL.",
"ExceptionNoUrl": "MusÃte zadat alespoň jednu URL pro web.",
@@ -33,7 +33,7 @@
"GlobalListExcludedQueryParameters": "Globálnà seznam vynechaných URL parametrů",
"GlobalListExcludedUserAgents": "Globálnà seznam uživatelských agentů k vylouÄenÃ",
"GlobalListExcludedUserAgents_Desc": "Pokud Å™etÄ›zec uživatelského agenta obsahuje nÄ›který ze zadaných Å™etÄ›zců, tento návÅ¡tÄ›vnÃk bude vylouÄen z Piwiku.",
- "GlobalWebsitesSettings": "Globálnà nastavenà sÃdel",
+ "GlobalWebsitesSettings": "Nastavenà globálnÃch webových stránek",
"HelpExcludedIps": "Zatejte seznam IP adrese, jednu na řádek, které chcete vynechat ze záznamů Piwiku. Můžete použÃt zástupné znaky napÅ™. %1$s nebo %2$s",
"JsTrackingTagHelp": "Zde je JavaScriptový zaznamenávacà tag pro vloženà na všechny vaše stránky",
"KeepURLFragments": "Sledovánà URL fragmentů stránek",
@@ -48,17 +48,17 @@
"NotFound": "Žádné www nenalezený pro",
"NoWebsites": "Nemáte žádný Weby k administraci.",
"OnlyOneSiteAtTime": "Můžete upravit zároveň pouze jednu stránku. Uložte nebo zruÅ¡te souÄasné úpravy stránky %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik povolen pro rozÅ¡ÃÅ™enou analytiku a měřenà stránek typu Obchod. ÄŒÃst o %s analytice %s vÃce.",
+ "PiwikOffersEcommerceAnalytics": "Piwik povolen pro rozÅ¡ÃÅ™enou analytiku a měřenà stránek typu Obchod. ÄŒÃst o %1$s analytice %2$s vÃce.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik automaticky vynechá běžné parametry sezenà (%s)",
- "PluginDescription": "Správa webových stránek vám umožňuje pÅ™idat novou webovou stránku a upravit již existujÃcÃ.",
+ "PluginDescription": "Správa webů vám umožňuje pÅ™idat nový web a upravit již existujÃcà weby.",
"SearchCategoryDesc": "Piwik může také sledovat kategorii vyhledávánÃpro každé klÃÄové slovo internÃho vyhledávánÃ.",
"SearchCategoryLabel": "Parametr kategorie",
"SearchCategoryParametersDesc": "Můžete zadat seznam parametrů dotazu oddÄ›lených Äárkou, které urÄujà kategorii.",
"SearchKeywordLabel": "Parametr dotazu",
"SearchKeywordParametersDesc": "Vložte seznam vÅ¡ech parametrů dotazu oddÄ›lených Äárkou, které obsahujà klÃÄové slovo stránek.",
- "SearchParametersNote": "Poznámka: Parametry dotazu a kategorie budou pouze pro webové stránky, které majà vyhledávánà na stránkách povolené, ale tyto parametry jsou prázdné.",
+ "SearchParametersNote": "Poznámka: Parametry dotazu a kategorie budou použity pouze pro weby, které majà povolené vyhledávánà na stránkách, ale tyto parametry jsou prázdné.",
"SearchParametersNote2": "Pokud chcete zakázat vyhledávánà na stránkách pro nové stránky, nechte tato dvě pole prázdná.",
- "SearchUseDefault": "PoužÃt %svýchozÃ%s parametry vyhledávánà na stránkách",
+ "SearchUseDefault": "PoužÃt %1$svýchozÃ%2$s parametry vyhledávánà na stránkách",
"SelectACity": "Zvolte město",
"SelectDefaultCurrency": "Můžete zvolit výchozà měnu pro nové weby",
"SelectDefaultTimezone": "Můžete zvolit výchozà Äasovou zónu pro nové weby",
@@ -67,16 +67,19 @@
"SiteSearchUse": "Piwik můžete použÃt ke sledovánà a hlášenà toho, co návÅ¡tÄ›vnÃci hledajà pomocà internÃho vyhledávaÄe.",
"SiteWithoutDataTitle": "ZatÃm nebyla zaznamenána žádná data",
"SiteWithoutDataDescription": "Pro tuto stránku nebyla zatÃm zaznamenána žádná analytická data.",
- "SiteWithoutDataSetupTracking": "ProsÃm, nastavte %1$ssledovacà javascriptový kód %2$s na vaÅ¡ich webových stránkách, a pak stránku obnovte.",
- "SuperUserAccessCan": "Uživatel se super uživatelským pÅ™Ãstupem může také %sspecifikovat globálnà nastavenÃ%s pro nové webové stránky.",
+ "SiteWithoutDataSetupTracking": "Nastavte prosÃm %1$sJavaScript sledovacà kód%2$s na svém webu, pokud jste tak již neuÄinili.",
+ "SiteWithoutDataMessageDisappears": "Tato zpráva zmizà jakmile dojde k nahránà nějakých dat pro tento web.",
+ "SiteWithoutDataSetupGoals": "MezitÃm byste možná chtÄ›li %1$snastavit nÄ›jaké cÃle%2$s.",
+ "SuperUserAccessCan": "Uživatel se super-uživatelským pÅ™Ãstupem může také %1$sspecifikovat globálnà nastavenÃ%2$s pro nové weby.",
"Timezone": "Časová zóna",
"TrackingSiteSearch": "Sledovánà internÃho vyhledávánà na stránkách",
"TrackingTags": "Zaznamenávacà tagy pro %s",
"Urls": "URL",
"UTCTimeIs": "UTC Äas je %s",
"OnlyMatchedUrlsAllowed": "Sledovat návÅ¡tÄ›vy a akce pouze tehdy, pokud URL akce zaÄÃná jednou z výše uvedených URL.",
- "OnlyMatchedUrlsAllowedHelp": "Pokud je povoleno, Piwik bude sledovat internà akce pouze tehdy, když je URL stránky jednou ze známých URL vašich webových stránek. To zabránà lidem, aby zahltili analýzu URL jiných stránek.",
- "WebsitesManagement": "Nastavenà Web sÃdel",
+ "OnlyMatchedUrlsAllowedHelp": "Pokud je povoleno, Piwik bude sledovat internà akce pouze tehdy, když je URL stránky jednou ze známých URL vašeho webu. To zabránà lidem, aby zahltili analýzu URL jiných stránek.",
+ "OnlyMatchedUrlsAllowedHelpExamples": "Doména a cesta se musà pÅ™esnÄ› shodovat a každou platnou subdoménu je tÅ™eba urÄit oddÄ›lenÄ›. Pokud jsou napÅ™Ãklad známé URL 'http:\/\/domena.cz\/cesta' a 'http:\/\/dobra.domena.cz', požadavky na sledovánà z 'http:\/\/domena.cz\/jinacesta' nebo 'http:\/\/zla.domena.cz' budou ignorovány.",
+ "WebsitesManagement": "Nastavenà webových stránek",
"XManagement": "Spravovat %s",
"ChooseMeasurableTypeHeadline": "Co byste chtěl měřit?",
"YouCurrentlyHaveAccessToNWebsites": "MomentálnÄ› máte pÅ™Ãstup k %s stránce\/stránkám.",
diff --git a/plugins/SitesManager/lang/da.json b/plugins/SitesManager/lang/da.json
index 665295c1a5627f465ee9b3e0f4ed540f7c5bd435..688c93caac059955e1393ee9c2ae19f8d177e63f 100644
--- a/plugins/SitesManager/lang/da.json
+++ b/plugins/SitesManager/lang/da.json
@@ -18,8 +18,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Hvis du har brug at udelukke forskellige brugeragenter for forskellige hjemmesider, Marker dette felt, Klik på Gem og %1$stilføj brugeragenterne ovenfor%2$s.",
"ExceptionDeleteSite": "Det er ikke muligt at slette hjemmesiden. Det er den eneste oprettede. Tilføj en ny hjemmeside, og slet så denne.",
"ExceptionEmptyName": "Hjemmesidens navn kan ikke være tomt.",
- "ExceptionInvalidCurrency": "Valutaen \"%s\" er ikke gyldig. Angiv et gyldigt valutasymbol (f.eks. %s)",
- "ExceptionInvalidIPFormat": "IP-adressen der skal udelukkes \"%s\" har ikke et gyldigt IP-format (f.eks. %s).",
+ "ExceptionInvalidCurrency": "Valutaen \"%1$s\" er ikke gyldig. Angiv et gyldigt valutasymbol (f.eks. %2$s)",
+ "ExceptionInvalidIPFormat": "IP-adressen der skal udelukkes \"%1$s\" har ikke et gyldigt IP-format (f.eks. %2$s).",
"ExceptionInvalidTimezone": "Tidszonen \"%s\" er ikke gyldig. Angiv en gyldig tidszone.",
"ExceptionInvalidUrl": "URL'en '%s' er ikke gyldig.",
"ExceptionNoUrl": "Angiv mindst én URL til hjemmesiden.",
@@ -47,7 +47,7 @@
"NotFound": "Ingen hjemmesider for",
"NoWebsites": "Du har ingen hjemmesider at administrere.",
"OnlyOneSiteAtTime": "Du kan kun redigere en hjemmesider ad gangen. Gem eller Annullér de aktuelle ændringer på hjemmesiden %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik giver mulighed for avancerede e-handel analysesporing og rapportering. Lær mere om %s E-handel analyse%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik giver mulighed for avancerede e-handel analysesporing og rapportering. Lær mere om %1$s E-handel analyse%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik vil automatisk udelukke den fælles session parametre (%s).",
"PluginDescription": "Hjemmeside administration kan tilføje en ny hjemmeside og redigere eksisterende hjemmesider.",
"SearchCategoryDesc": "Piwik kan også spore søgekategori for hver interne hjemmeside søgeord.",
@@ -57,14 +57,14 @@
"SearchKeywordParametersDesc": "Indtast en kommasepareret liste over alle søgeparameter navne, der indeholdende webstedet søgeord.",
"SearchParametersNote": "Bemærk: søge- og kategoriparametre vil kun blive anvendt på hjemmesider, som har søg aktiveret, men lod disse parametre være tomme.",
"SearchParametersNote2": "For at deaktivere webstedssøgning for nye hjemmesider, efterlad disse to felter tomme.",
- "SearchUseDefault": "Brug %sstandard%s websteds søgeparametre",
+ "SearchUseDefault": "Brug %1$sstandard%2$s websteds søgeparametre",
"SelectACity": "Vælg en by",
"SelectDefaultCurrency": "Vælg standard valuta for nye hjemmesider.",
"SelectDefaultTimezone": "Vælg standard tidszone for nye hjemmesider.",
"ShowTrackingTag": "Vis sporingskode",
"Sites": "Hjemmesider",
"SiteSearchUse": "Du kan bruge Piwik til at spore og rapportere hvad besøgende søger efter i hjemmesidens interne søgemaskine.",
- "SuperUserAccessCan": "En bruger med superbruger adgang kan også %s angive globale indstillinger %s for nye hjemmesider.",
+ "SuperUserAccessCan": "En bruger med superbruger adgang kan også %1$s angive globale indstillinger %2$s for nye hjemmesider.",
"Timezone": "Tidszone",
"TrackingSiteSearch": "Sporing af intern webstedssøgning",
"TrackingTags": "Sporingskode for %s",
diff --git a/plugins/SitesManager/lang/de.json b/plugins/SitesManager/lang/de.json
index 159a7a74b24031686b1b8b88c471865a85fb8efb..e5248d2e60e89bbad7e2644960d5bab98c4df3fb 100644
--- a/plugins/SitesManager/lang/de.json
+++ b/plugins/SitesManager/lang/de.json
@@ -19,8 +19,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Falls Sie unterschiedliche User-Agents bei unterschiedlichen Websites ausschließen wollen, aktivieren und Speichern Sie diese Option und %1$sfügen Sie User-Agents oben hinzu%2$s.",
"ExceptionDeleteSite": "Diese Website kann nicht gelöscht werden, da sie die einzige registrierte Website ist. Bitte fügen Sie zunächst eine weitere Website hinzu, erst dann kann diese gelöscht werden.",
"ExceptionEmptyName": "Der Name der Website darf nicht leer sein.",
- "ExceptionInvalidCurrency": "Die Währung \"%s\" ist nicht gültig. Bitte geben Sie ein gültiges Währungssymbol ein (z.B. %s)",
- "ExceptionInvalidIPFormat": "Die auszuschließende IP \"%s\" hat kein gültiges IP-Format (z.B. %s).",
+ "ExceptionInvalidCurrency": "Die Währung \"%1$s\" ist nicht gültig. Bitte geben Sie ein gültiges Währungssymbol ein (z.B. %2$s)",
+ "ExceptionInvalidIPFormat": "Die auszuschließende IP \"%1$s\" hat kein gültiges IP-Format (z.B. %2$s).",
"ExceptionInvalidTimezone": "Die Zeitzone \"%s\" ist nicht gültig. Bitte geben Sie eine gültige Zeitzone ein.",
"ExceptionInvalidUrl": "Die Adresse '%s' ist keine gültige URL.",
"ExceptionNoUrl": "Sie müssen mindestens eine URL für diese Website angeben.",
@@ -48,7 +48,7 @@
"NotFound": "Keine Websites gefunden für",
"NoWebsites": "Es ist noch keine Website zum administrieren vorhanden.",
"OnlyOneSiteAtTime": "Sie können immer nur eine Website zur gleichen Zeit bearbeiten. Zunächst müssen Sie die aktuellen Änderungen an der Website %s speichern oder verwerfen.",
- "PiwikOffersEcommerceAnalytics": "Mit Piwik können Sie Ihre Ecommerce Website tracken und erhalten spezielle Ecommerce Berichte. Weitere Informationen %sfinden Sie hier%s.",
+ "PiwikOffersEcommerceAnalytics": "Mit Piwik können Sie Ihre Ecommerce Website tracken und erhalten spezielle Ecommerce Berichte. Weitere Informationen %1$sfinden Sie hier%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik wird automatisch typische Session-Parameter ignorieren (%s).",
"PluginDescription": "Websites management lässt Sie eine neue Website hinzufügen und bestehende Websites ändern.",
"SearchCategoryDesc": "Piwik kann auch die Kategorie auswerten, die in der internen Suche gewählt wird.",
@@ -58,7 +58,7 @@
"SearchKeywordParametersDesc": "Geben Sie eine durch Komma getrennte Liste der Namen aller URL-Parameter ein, welche den Suchbegriff enthalten können.",
"SearchParametersNote": "Hinweis: Die URL-Parameter für Suchbegriffe und -kategorien werden nur auf Websites verwendet, bei denen die interne Suche aktiviert ist aber die Parameter leergelassen wurden.",
"SearchParametersNote2": "Um die interne Suche für neue Websites nicht auszuwerten, lassen Sie diese beiden Felder leer.",
- "SearchUseDefault": "Die %sStandard Parameter%s für die interne Suche verwenden",
+ "SearchUseDefault": "Die %1$sStandard Parameter%2$s für die interne Suche verwenden",
"SelectACity": "Wählen Sie eine Stadt",
"SelectDefaultCurrency": "Sie können eine Währung auswählen, die standardmäßig für neue Websites ausgewählt wird.",
"SelectDefaultTimezone": "Sie können eine Zeitzone auswählen, die standardmäßig für neue Websites ausgewählt wird.",
@@ -67,8 +67,10 @@
"SiteSearchUse": "Piwik kann auswerten, wonach Besucher in der internen Suche der Website suchen.",
"SiteWithoutDataTitle": "Bisher wurden keine Daten aufgezeichnet",
"SiteWithoutDataDescription": "Für diese Website wurden bisher noch keine Analysedaten aufgezeichnet.",
- "SiteWithoutDataSetupTracking": "Bitte den %1$sJavaScript Tracking Code%2$s auf Ihrer Website einrichten und die Seite neu laden.",
- "SuperUserAccessCan": "Ein Nutzer mit Hauptadministrator-Berechtigung kann ebenfalls %sglobale Einstellungen%s für neue Websites vornehmen.",
+ "SiteWithoutDataSetupTracking": "Bitte fügen Sie den %1$sJavaScript Tracking Code%2$s auf ihrer Website ein, insofern Sie dies noch nicht getan haben.",
+ "SiteWithoutDataMessageDisappears": "Diese Nachricht wird verschwinden sobald die ersten Daten für diese Website aufgezeichnet wurden.",
+ "SiteWithoutDataSetupGoals": "In den Zwischenzeit können Sie bereits %1$sZiele aufsetzen%2$s.",
+ "SuperUserAccessCan": "Ein Nutzer mit Hauptadministrator-Berechtigung kann ebenfalls %1$sglobale Einstellungen%2$s für neue Websites vornehmen.",
"Timezone": "Zeitzone",
"TrackingSiteSearch": "Die interne Suche auswerten",
"TrackingTags": "Tracking-Code für %s",
@@ -76,6 +78,7 @@
"UTCTimeIs": "UTC-Zeit ist %s.",
"OnlyMatchedUrlsAllowed": "Zeichne Besuche und Aktionen nur auf wenn die Aktions-URL mit einer der oben genannten URLs beginnt.",
"OnlyMatchedUrlsAllowedHelp": "Wenn aktiviert zeichnet Piwik nur noch interne Aktionen auf bei denen die Seiten-URL eine der bekannten URLs der Website ist. Dies hindert andere daran Ihre Analyse mit URLs von anderen Websites zu verfälschen.",
+ "OnlyMatchedUrlsAllowedHelpExamples": "Die Domain und Pfadangabe muss exakt übereinstimmen und jede gültige Subdomain muss separat definiert werden. Sind die bekannten URLs beispielsweise 'http:\/\/example.com\/path' und 'http:\/\/good.example.com', werden Tracking-Anfragen von 'http:\/\/example.com\/otherpath' oder 'http:\/\/bad.example.com' ignoriert.",
"WebsitesManagement": "Websiteverwaltung",
"XManagement": "%s verwalten",
"ChooseMeasurableTypeHeadline": "Was möchten Sie messen?",
diff --git a/plugins/SitesManager/lang/el.json b/plugins/SitesManager/lang/el.json
index 2670247d2798e33731dc97ba1587e638e401b432..bac074df01add771489471441db5ac9abb5e751b 100644
--- a/plugins/SitesManager/lang/el.json
+++ b/plugins/SitesManager/lang/el.json
@@ -3,7 +3,7 @@
"AddSite": "Î Ïοσθήκη ιστοσελίδας",
"AddMeasurable": "Î Ïοσθήκη νÎου μετÏοÏμενου",
"AdvancedTimezoneSupportNotFound": "Η Ï€ÏοηγμÎνη υποστήÏιξη για ζώνες ÏŽÏας δεν βÏÎθηκε στην PHP σας (υποστηÏίζεται από την Îκδοση 5.2 ή νεότεÏη). ΜποÏείτε να επιλÎξετε διαφοÏά ÏŽÏας χειÏοκίνητα.",
- "AliasUrlHelp": "Î Ïοτείνεται, αλλά δεν απαιτείται, να οÏίσετε τα διάφοÏα URLs που χÏησιμοποιοÏν οι επισκÎπτες σας στη συγκεκÏιμÎνη ιστοσελίδα.nΤα URLs με μάσκα για μια ιστοσελίδα δεν θα εμφανίζονται στο Î¼ÎµÎ½Î¿Ï Î‘Î½Î±Ï†Î¿Ïείς > ΑναφοÏά ιστοσελίδων.nΣημειώστε ότι δεν είναι απαÏαίτητο να οÏίσετε τα URLs με και χωÏίς «www» καθώς το Piwik τα θεωÏεί και τα δÏο ως δεδομÎνα.",
+ "AliasUrlHelp": "Î Ïοτείνεται, αλλά δεν απαιτείται, να οÏίσετε τα διάφοÏα URLs που χÏησιμοποιοÏν οι επισκÎπτες σας στη συγκεκÏιμÎνη ιστοσελίδα.nΤα URLs με μάσκα για μια ιστοσελίδα δεν θα εμφανίζονται στο Î¼ÎµÎ½Î¿Ï Î‘Î½Î±Ï†Î¿Ïείς > ΑναφοÏά ιστοσελίδων. Σημειώστε ότι δεν είναι απαÏαίτητο να οÏίσετε τα URLs με και χωÏίς «www» καθώς το Piwik τα θεωÏεί και τα δÏο ως δεδομÎνα.",
"ChangingYourTimezoneWillOnlyAffectDataForward": "Αλλάζοντας τη ζώνη ÏŽÏας σας θα επηÏεάσει μόνο τα δεδομÎνα που θα ακολουθήσουν και δεν θα εφαÏμοστεί αναδÏομικά.",
"ChooseCityInSameTimezoneAsYou": "ΕπιλÎξτε μια πόλη στην ίδια ζώνη ÏŽÏας όπως εσείς.",
"Currency": "Îόμισμα",
@@ -19,8 +19,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Αν χÏειαστεί να αποκλείσετε διάφοÏους user agents για διάφοÏες ιστοσελίδες, επιλÎξτε αυτό το πλαίσιο, κάντε κλικ στο Αποθήκευση και %1$sÏ€ÏοσθÎσετε τους user agents παÏαπάνω%2$s.",
"ExceptionDeleteSite": "Δεν είναι δυνατό να διαγÏάψετε αυτή την ιστοσελίδα διότι είναι η μοναδική εγγεγÏαμμÎνη. Î ÏοσθÎστε Ï€Ïώτα μια νÎα ιστοσελίδα και μετά διαγÏάψτε την Ï€Ïώτη.",
"ExceptionEmptyName": "Το όνομα της ιστοσελίδας δεν Ï€ÏÎπει να είναι κενό.",
- "ExceptionInvalidCurrency": "Το νόμισμα «%s» δεν είναι ÎγκυÏο. Εισάγετε Îνα ÎγκυÏο σÏμβολο νομίσματος (Ï€.χ. %s)",
- "ExceptionInvalidIPFormat": "Η IP που είναι να αποκλειστεί «%s» δεν Îχει ÎγκυÏη μοÏφή (Ï€.χ. %s).",
+ "ExceptionInvalidCurrency": "Η τιμή για το νόμισμα \"%1$s\" δεν είναι ÎγκυÏη. ΠαÏακαλώ εισάγετε μια ÎγκυÏη τιμή νομίσματος (πχ. %2$s)",
+ "ExceptionInvalidIPFormat": "Η διεÏθυνση IP για αποκλεισμό \"%1$s\" δεν είναι ÎγκυÏη διεÏθυνση (πχ. %2$s).",
"ExceptionInvalidTimezone": "Η ζώνη ÏŽÏας «%s» δεν είναι ÎγκυÏη. Εισάγετε μια ÎγκυÏη ζώνη ÏŽÏας.",
"ExceptionInvalidUrl": "Το url «%s» δεν είναι Îνα ÎγκυÏο URL.",
"ExceptionNoUrl": "Î ÏÎπει να συμπληÏώσετε τουλάχιστον Îνα URL για την ιστοσελίδα σας.",
@@ -48,7 +48,7 @@
"NotFound": "Δεν βÏÎθηκαν ιστοσελίδες για",
"NoWebsites": "Δεν Îχετε κάποια ιστοσελίδα για να διαχειÏιστείτε.",
"OnlyOneSiteAtTime": "ΜποÏείτε να επεξεÏγαστείτε μόνο μια ιστοσελίδα τη φοÏά. ΑποθηκεÏστε ή ΑκυÏώστε τις Ï„ÏÎχουσες αλλαγÎÏ‚ για την ιστοσελίδα %s.",
- "PiwikOffersEcommerceAnalytics": "Το Piwik επιτÏÎπει την καταγÏαφή και αναφοÏά Ï€ÏοηγμÎνων Στατιστικών ΗλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Î•Î¼Ï€Î¿Ïίου. Μάθετε πεÏισσότεÏα για τα %sΣτατιστικά ΗλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Î•Î¼Ï€Î¿Ïίου%s.",
+ "PiwikOffersEcommerceAnalytics": "Το Piwik επιτÏÎπει την παÏακολοÏθηση για Αναλυτικά ΕμποÏίου & αναφοÏÎÏ‚. Δείτε πεÏισσότεÏα σχετικά με τα %1$s Αναλυτικά ΕμποÏίου%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Το Piwik θα αποκλείσει αυτόματα τις παÏαμÎÏ„Ïους κοινής συνεδÏίας (%s).",
"PluginDescription": "Η διαχείÏιση ιστοτόπων επιτÏÎπει την Ï€Ïοσθήκη νÎου ιστοτόπου και την επεξεÏγασία υπαÏχόντων.",
"SearchCategoryDesc": "Το Piwik μποÏεί να παÏακολουθεί επίσης την κατηγοÏία αναζήτησης για κάθε λÎξη-κλειδί εσωτεÏικής αναζήτησης στην ιστοσελίδα.",
@@ -58,7 +58,7 @@
"SearchKeywordParametersDesc": "Εισάγετε λίστα διαχωÏισμÎνη με κόμμα, με τα ονόματα των παÏαμÎÏ„Ïων εÏωτημάτων που πεÏιÎχουν τη λÎξη-κλειδί αναζήτησης του site.",
"SearchParametersNote": "Σημείωση: οι παÏάμετÏοι ΕÏωτημάτων και οι παÏάμετÏοι ΚατηγοÏιών θα χÏησιμοποιηθοÏν μόνο για ιστοσελίδες που Îχουν τη δυνατότητα Αναζήτησης Ιστότοπου, αλλά είχανε αυτÎÏ‚ τις παÏαμÎÏ„Ïους του κενÎÏ‚.",
"SearchParametersNote2": "Για να απενεÏγοποιήσετε την Αναζήτηση στον ιστότοπο για νÎες ιστοσελίδες, αφήστε αυτά τα δÏο πεδία κενά.",
- "SearchUseDefault": "ΧÏήση %sÏ€ÏοεπιλεγμÎνων%s παÏαμÎÏ„Ïων Αναζήτησης Ιστοσελίδας",
+ "SearchUseDefault": "ΧÏήση των %1$sÏ€ÏοκαθοÏισμÎνων%2$s παÏαμÎÏ„Ïων Αναζήτησης Ιστοτόπου",
"SelectACity": "ΕπιλÎξτε πόλη",
"SelectDefaultCurrency": "ΜποÏείτε να επιλÎξετε το νόμισμα το οποίο θα είναι Ï€Ïοεπιλογή για τις νÎες ιστοσελίδες.",
"SelectDefaultTimezone": "ΜποÏείτε να επιλÎξετε τη ζώνη ÏŽÏας η οποία θα είναι Ï€Ïοεπιλογή για τις νÎες ιστοσελίδες.",
@@ -67,15 +67,18 @@
"SiteSearchUse": "ΜποÏείτε να χÏησιμοποιήσετε το Piwik για να παÏακολουθείτε και να Îχετε αναφοÏÎÏ‚ για το τι ψάχνουν οι επισκÎπτες στην εσωτεÏική μηχανή αναζήτησης της ιστοσελίδας σας.",
"SiteWithoutDataTitle": "Δεν Îχουν καταγÏαφεί ακόμη δεδομÎνα",
"SiteWithoutDataDescription": "Δεν Îχουν ακόμη καταγÏαφεί δεδομÎνα αναλυτικών για τον ιστοτόπο αυτόν ακόμη.",
- "SiteWithoutDataSetupTracking": "ΠαÏακαλοÏμε εισάγετε τον %1$sκώδικα παÏακολοÏθησης JavaScript%2$s στον ιστοτόπο σας και ανανεώστε την ιστοσελίδα.",
- "SuperUserAccessCan": "Ένας χÏήστης με δικαίωμα ΥπεÏ-ΧÏήστη μποÏεί επίσης να %sÏ€ÏοσαÏμόζει τις γενικÎÏ‚ Ïυθμίσεις%s για νÎους ιστοτόπους.",
+ "SiteWithoutDataSetupTracking": "ΠαÏακαλώ εισάγετε τον %1$sκώδικα παÏακολοÏθησης JavaScript%2$s για τον ιστοτόπο σας αν δεν το Îχετε ήδη κάνει.",
+ "SiteWithoutDataMessageDisappears": "Το μήνυμα θα εξαφανιστεί με το που θα καταχωÏηθοÏν δεδομÎνα παÏακολοÏθησης για τον ιστοτόπο αυτό.",
+ "SiteWithoutDataSetupGoals": "Στο μεταξÏ, μποÏεί να θÎλετε να %1$sοÏίσετε μεÏικοÏÏ‚ στόχους%2$s.",
+ "SuperUserAccessCan": "Ένας χÏήστης με Ï€Ïόσβαση Î¥Ï€ÎµÏ Î§Ïήστη μποÏεί επίσης να %1$s οÏίσει τις καθολικÎÏ‚ παÏαμÎÏ„Ïους%2$s για νÎους ιστοτόπους.",
"Timezone": "Ζώνη ÏŽÏας",
"TrackingSiteSearch": "ΚαταγÏαφή ΕσωτεÏικής Αναζήτησης Ιστοσελίδας",
"TrackingTags": "Κώδικας εποπτείας για %s",
"Urls": "ΔιευθÏνσεις URL",
"UTCTimeIs": "Ο Παγκόσμιος χÏόνος είναι %s.",
- "OnlyMatchedUrlsAllowed": "Îα παÏακολυθοÏνται επισκÎψεις και οι ενÎÏγειες μόνο όταν η διεÏθυνση URL ξεκινάει με μία από τις παÏαπάνω διευθÏνσεις URL.",
+ "OnlyMatchedUrlsAllowed": "Îα παÏακολουθοÏνται οι επισκÎψεις και οι ενÎÏγειες μόνο όταν η διεÏθυνση URL ξεκινάει με μία από τις παÏαπάνω διευθÏνσεις URL.",
"OnlyMatchedUrlsAllowedHelp": "Όταν είναι ενεÏγοποιημÎνο, το Piwik θα παÏακολουθεί εσωτεÏικÎÏ‚ ενÎÏγειες όταν η διεÏθυνση URL είναι μία από τις γνωστÎÏ‚ διευθÏνσεις URL για τον ιστοτόπο σας. Αυτό αποτÏÎπει Ï„Ïίτους από ανεπιθÏμητη κίνηση στα αναλυτικά σας με διευθÏνσεις URL από Ï„Ïίτους ιστοτόπους.",
+ "OnlyMatchedUrlsAllowedHelpExamples": "Το όνομα και η διαδÏομή Ï€ÏÎπει να ταιÏιάζουν και κάθε υπο-όνομα χώÏου Ï€ÏÎπει να οÏίζεται ξεχωÏιστά. Για παÏάδειγμα, όταν οι γνωστÎÏ‚ διευθÏνσεις URL είναι 'http:\/\/example.com\/path' και 'http:\/\/good.example.com', οι αιτήσεις για παÏακολοÏθηση για τα 'http:\/\/example.com\/otherpath' ή 'http:\/\/bad.example.com' αγνοοÏνται.",
"WebsitesManagement": "ΔιαχείÏιση ιστοσελίδων",
"XManagement": "ΔιαχείÏιση του %s",
"ChooseMeasurableTypeHeadline": "Τι θÎλετε να μετÏήσετε;",
diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json
index 0916869ce0181d5fb60fa0afd59710dd92ac0738..a7ea1da8c9c0806366ca3055be8417101ef80d81 100644
--- a/plugins/SitesManager/lang/en.json
+++ b/plugins/SitesManager/lang/en.json
@@ -19,8 +19,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "If you need to exclude different user agents for different websites, check this box, click save and %1$sadd the user agents above%2$s.",
"ExceptionDeleteSite": "It is not possible to delete this website as it is the only registered website. Add a new website first, then delete this one.",
"ExceptionEmptyName": "The website name can't be empty.",
- "ExceptionInvalidCurrency": "The currency \"%s\" is not valid. Please enter a valid currency symbol (eg. %s)",
- "ExceptionInvalidIPFormat": "The IP to exclude \"%s\" does not have a valid IP format (eg. %s).",
+ "ExceptionInvalidCurrency": "The currency \"%1$s\" is not valid. Please enter a valid currency symbol (eg. %2$s)",
+ "ExceptionInvalidIPFormat": "The IP to exclude \"%1$s\" does not have a valid IP format (eg. %2$s).",
"ExceptionInvalidTimezone": "The timezone \"%s\" is not valid. Please enter a valid timezone.",
"ExceptionInvalidUrl": "The url '%s' is not a valid URL.",
"ExceptionNoUrl": "You must specify at least one URL for the website.",
@@ -48,7 +48,7 @@
"NotFound": "No websites found for",
"NoWebsites": "You don't have any website to administrate.",
"OnlyOneSiteAtTime": "You can only edit one website at a time. Please Save or Cancel your current modifications to the website %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about %s Ecommerce Analytics%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about %1$s Ecommerce Analytics%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik will automatically exclude the common session parameters (%s).",
"PluginDescription": "Websites management lets you add a new website and edit existing websites. ",
"SearchCategoryDesc": "Piwik can also track the Search category for each internal site search keyword.",
@@ -58,7 +58,7 @@
"SearchKeywordParametersDesc": "Enter a comma separated list of all query parameter names containing the site search keyword.",
"SearchParametersNote": "Note: the Query parameters and Category parameters will be used only for websites which have Site Search enabled but left these parameters empty.",
"SearchParametersNote2": "To disable Site Search for new websites, leave these two fields empty.",
- "SearchUseDefault": "Use %sdefault%s Site Search parameters",
+ "SearchUseDefault": "Use %1$sdefault%2$s Site Search parameters",
"SelectACity": "Select a city",
"SelectDefaultCurrency": "You can select the currency to set by default for new websites.",
"SelectDefaultTimezone": "You can select the time zone to select by default for new websites.",
@@ -70,7 +70,7 @@
"SiteWithoutDataSetupTracking": "Please set up the %1$sJavaScript tracking code%2$s on your website if you haven't done that already.",
"SiteWithoutDataMessageDisappears": "This message will disappear as soon as some data was tracked for this website.",
"SiteWithoutDataSetupGoals": "In the meantime, maybe you would like to %1$sset up some goals%2$s.",
- "SuperUserAccessCan": "A user with Super User access can also %s specify global settings%s for new websites.",
+ "SuperUserAccessCan": "A user with Super User access can also %1$s specify global settings%2$s for new websites.",
"Timezone": "Time zone",
"TrackingSiteSearch": "Tracking Internal Site Search",
"TrackingTags": "Tracking code for %s",
@@ -78,10 +78,11 @@
"UTCTimeIs": "UTC time is %s.",
"OnlyMatchedUrlsAllowed": "Only track visits and actions when the action URL starts with one of the above URLs.",
"OnlyMatchedUrlsAllowedHelp": "When enabled, Piwik will only track internal actions when the Page URL is one of the known URLs for your website. This prevents people from spamming your analytics with URLs for other websites.",
+ "OnlyMatchedUrlsAllowedHelpExamples": "The domain and the path has to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http:\/\/example.com\/path' and 'http:\/\/good.example.com', tracking requests for 'http:\/\/example.com\/otherpath' or 'http:\/\/bad.example.com' are ignored.",
"WebsitesManagement": "Websites Management",
"XManagement": "Manage %s",
"ChooseMeasurableTypeHeadline": "What would you like to measure?",
"YouCurrentlyHaveAccessToNWebsites": "You currently have access to %s websites.",
"YourCurrentIpAddressIs": "Your current IP address is %s"
}
-}
+}
\ No newline at end of file
diff --git a/plugins/SitesManager/lang/es.json b/plugins/SitesManager/lang/es.json
index aea11a2cb8cdaf51fae3f770d465e16592df19c9..434f0d5815b314ddaad975c0b94846c78f7c41b9 100644
--- a/plugins/SitesManager/lang/es.json
+++ b/plugins/SitesManager/lang/es.json
@@ -19,8 +19,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Si necesita excluir diferentes agentes de usuario para diferentes sitios de internet, marque esta casilla, clic en guardar y %1$sagregue los agentes de usuario de arriba%2$s.",
"ExceptionDeleteSite": "No es posible eliminar este sitio ya que es el único que tiene registrado. Primero agregue un nuevo sitio, luego elimine éste.",
"ExceptionEmptyName": "El nombre del sitio no puede estar vacÃo.",
- "ExceptionInvalidCurrency": "La moneda \"%s\" no es válida. Por favor ingrese un sÃmbolo de moneda válido (ej. %s)",
- "ExceptionInvalidIPFormat": "La IP a excluir \"%s\" no tiene un formato válido de IP (por ejemplo, %s).",
+ "ExceptionInvalidCurrency": "La moneda \"%1$s\" no es válida. Por favor ingrese un sÃmbolo de moneda válido (ej. %2$s)",
+ "ExceptionInvalidIPFormat": "La IP a excluir \"%1$s\" no tiene un formato válido de IP (por ejemplo, %2$s).",
"ExceptionInvalidTimezone": "La zona horaria \"%s\" no es válida Por favor ingrese una zona horaria válida.",
"ExceptionInvalidUrl": "La URL '%s' no es una URL válida.",
"ExceptionNoUrl": "Debe especificar al menos una URL para el sitio de internet.",
@@ -48,7 +48,7 @@
"NotFound": "Ningún sitio de internet encontrado",
"NoWebsites": "No posee ningún sitio de internet para administrar.",
"OnlyOneSiteAtTime": "Puede editar un sitio de internet a la vez. Por favor guarde o cancele sus modificaciones actuales para el sitio de internet %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik permite el rastreo avanzado de análisis de comercio electrónico e Informes. Aprenda más acerca de %s Análisis de comercio electrónico%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik permite el rastreo avanzado de análisis de comercio electrónico e Informes. Aprenda más acerca de %1$s Análisis de comercio electrónico%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik automáticamente excluirá los parámetros de sesión (%s).",
"PluginDescription": "La administración de sitios de internet le permite agregar un nuevo sitio de y editar los existentes.",
"SearchCategoryDesc": "Piwik puede rastrear la categorÃa Buscar y cada palabra clave del buscador interno del sitio.",
@@ -58,7 +58,7 @@
"SearchKeywordParametersDesc": "Ingrese una lista en un formato del tipo separado por comas de todos los nombres de los parámetros de consulta conteniendo las palabras clave del buscador interno del sitio.",
"SearchParametersNote": "Nota: los parámetros de consulta y de categorÃa serán utilizados solo en aquellos sitios de internet que habilitaron Buscar en el sitio pero dejaron estos parámetros vacÃos.",
"SearchParametersNote2": "Para deshabilitar Búsqueda interna en sitio para los nuevos sitios, deje estos dos campos vacÃos.",
- "SearchUseDefault": "Utilizar parámetros de Buscar en el sitio %spredeterminados%s",
+ "SearchUseDefault": "Utilizar parámetros de Buscar en el sitio %1$spredeterminados%2$s",
"SelectACity": "Seleccione una ciudad",
"SelectDefaultCurrency": "Puede seleccionar la moneda predeterminada para los nuevos sitios de internet",
"SelectDefaultTimezone": "Puede seleccionar la zona horaria predeterminada para los nuevos sitios de internet.",
@@ -67,8 +67,7 @@
"SiteSearchUse": "Puede utilizar Piwik para rastrear y obtener un informe que es lo que están buscando sus visitantes en el motor de búsqueda interno de su sitio de internet.",
"SiteWithoutDataTitle": "Aun no se han grabado datos",
"SiteWithoutDataDescription": "Aun no se han registrado datos analÃticos para este sitio de internet.",
- "SiteWithoutDataSetupTracking": "Por favor configure el %1$scódigo de seguimiento JavaScript%2$s para su sitio de internet y actualice la página.",
- "SuperUserAccessCan": "Un usuario con acceso Super Usuario también puede %s especificar la configuración global%s para nuevos sitios de internet.",
+ "SuperUserAccessCan": "Un usuario con acceso Super Usuario también puede %1$s especificar la configuración global%2$s para nuevos sitios de internet.",
"Timezone": "Zona Horaria",
"TrackingSiteSearch": "Seguimiento en el Buscador interno del sitio",
"TrackingTags": "Código de seguimiento para %s",
diff --git a/plugins/SitesManager/lang/et.json b/plugins/SitesManager/lang/et.json
index f1d495190a117a234be4b2b8240bbac080df8ef6..6926245b40906e45e10828635f941286681dd312 100644
--- a/plugins/SitesManager/lang/et.json
+++ b/plugins/SitesManager/lang/et.json
@@ -18,7 +18,7 @@
"MainDescription": "Sinu veebianalüütika vajab veebilehti, mida hallata! Lisa, uuenda, kustuta veebilehti, ja näita Javascript koodi mida lisada veebilehtedele.",
"NotAnEcommerceSite": "Ei ole e-äri lehekülg",
"NoWebsites": "Sul pole veebilehti, mida administreerida.",
- "PiwikOffersEcommerceAnalytics": "Piwik võimaldab detailsemat e-äri analüüsi ja raporteid. Loe rohkem %s e-äri analüüsist%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik võimaldab detailsemat e-äri analüüsi ja raporteid. Loe rohkem %1$s e-äri analüüsist%2$s.",
"SearchCategoryLabel": "Kategooria parameeter",
"SearchKeywordLabel": "Päringu parameeter",
"SelectACity": "Vali linn",
diff --git a/plugins/SitesManager/lang/fa.json b/plugins/SitesManager/lang/fa.json
index b2951a59e7757a88e339ea33f3822fa7bf6e9469..8bc0eb2cd5e35746d1d2f3e78333bf5941cefb0e 100644
--- a/plugins/SitesManager/lang/fa.json
+++ b/plugins/SitesManager/lang/fa.json
@@ -17,7 +17,7 @@
"EnableSiteSpecificUserAgentExclude": "Ùعال کردن وب سایت کاربر Ù…Øرومیت عامل خاص.",
"ExceptionDeleteSite": "ممکن است به Øذ٠این وب سایت، آن را به عنوان تنها وب سایت ثبت نام است. اضاÙÙ‡ کردن یک وب سایت جدید برای اولین بار، پس این یکی را Øذ٠کنید.",
"ExceptionEmptyName": "نام سایت نمی تواند خالی باشد.",
- "ExceptionInvalidCurrency": "واØد پولی \"%s\" درست نیست. لطÙا یک واØد پول صØÛŒØ Ø±Ø§ وارد نمایید. (مانند. %s)",
+ "ExceptionInvalidCurrency": "واØد پولی \"%1$s\" درست نیست. لطÙا یک واØد پول صØÛŒØ Ø±Ø§ وارد نمایید. (مانند. %2$s)",
"ExceptionInvalidUrl": "آدرس %s معتبر نمی باشد.",
"ExceptionNoUrl": "شما Øداقل باید یک لینک برای سایت مشخص کنید",
"ExcludedIps": "به غیر از آی پی های",
@@ -43,7 +43,7 @@
"SearchKeywordLabel": "پارامتر پرس و جو",
"SearchParametersNote": "توجه: پارامترهای پرس Ùˆ جو Ùˆ پارامترهای مجموعه Ùقط برای وبسایت هایی استÙاده خواهند شد Ú©Ù‡ جستجوی سایت را Ùعال کرده اند ولی این پارامترها را خالی باقی گذاشته اند.",
"SearchParametersNote2": "برای غیر Ùعال کردن جستجوی وبسایت های جدید , این دو Ùیلد را خالی رها کنید.",
- "SearchUseDefault": "پارامترهای %sپیشÙرض%s جستجوی سایت را به کار ببرید",
+ "SearchUseDefault": "پارامترهای %1$sپیشÙرض%2$s جستجوی سایت را به کار ببرید",
"SelectACity": "انتخاب یک شهر",
"SelectDefaultCurrency": "شما Ù…ÛŒ توانید نرخ ارز را به طور پیش Ùرض برای وب سایت های جدید را انتخاب کنید.",
"SelectDefaultTimezone": "شما Ù…ÛŒ توانید منطقه زمانی به طور پیش Ùرض برای وب سایت جدید را انتخاب کنید را انتخاب کنید.",
diff --git a/plugins/SitesManager/lang/fi.json b/plugins/SitesManager/lang/fi.json
index 0dd331e8ebfdb9a53e4697f0f9894853f174db21..5043dc99b6a4109db96c904b9310878c532457e1 100644
--- a/plugins/SitesManager/lang/fi.json
+++ b/plugins/SitesManager/lang/fi.json
@@ -18,8 +18,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Jos haluat sulkea pois eri käyttäjäagentteja eri verkkosivuilla, rastita tämä ruutu, klikkaa tallenna ja %1$slisää käyttäjäagentit yläpuolelle%2$s.",
"ExceptionDeleteSite": "Sivua ei voi poistaa, sillä se on ainoa rekisteröity sivu. Lisää ensin uusi sivu.",
"ExceptionEmptyName": "Sivun nimi ei voi olla tyhjä.",
- "ExceptionInvalidCurrency": "Valuutta \"%s\" ei kelpaa. Valitse oikea valuutan symboli (esim. %s)",
- "ExceptionInvalidIPFormat": "IP \"%s\" ei ole hyväksyttävässä muodossa (esim. %s).",
+ "ExceptionInvalidCurrency": "Valuutta \"%1$s\" ei kelpaa. Valitse oikea valuutan symboli (esim. %2$s)",
+ "ExceptionInvalidIPFormat": "IP \"%1$s\" ei ole hyväksyttävässä muodossa (esim. %2$s).",
"ExceptionInvalidTimezone": "Aikavyöhyke '%s' ei kelpaa. Valitse uusi aikavyöhyke.",
"ExceptionInvalidUrl": "Sivun url '%s' ei ole oikein muotoiltu URL.",
"ExceptionNoUrl": "Sivuilla täytyy olla vähintään yksi verkkosivu.",
@@ -47,7 +47,7 @@
"NotFound": "Sivuja ei löydy",
"NoWebsites": "Sinulla ei ole yhtään verkkosivua hallinnoitavana.",
"OnlyOneSiteAtTime": "Voit muokata vain yhtä verkkosivua kerrallaan. Tallenna tai peru muutoksesi sivuun %s.",
- "PiwikOffersEcommerceAnalytics": "Piwikillä voi seurata verkkokauppaa tarkasti. Lue lisää %s verkkokauppa-analytiikasta%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwikillä voi seurata verkkokauppaa tarkasti. Lue lisää %1$s verkkokauppa-analytiikasta%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik jättää automaattisesti huomiotta yleiset istuntoparametrit (%s).",
"SearchCategoryDesc": "Piwik voi myös seurata haun kategoriaa jokaiselle sivun sisäiselle hakusanalle.",
"SearchCategoryLabel": "Kategoriaparametri",
@@ -56,14 +56,14 @@
"SearchKeywordParametersDesc": "Ilmoita pilkuilla erotettu lista kaikista parametrinimistä sisältäen verkkosivuhaun avainsana.",
"SearchParametersNote": "Huom: kysymysparametrejä ja kategoriaparametrejä käytetään ainoastaan verkkkosivuilla, joilla verkkosivuhaku on aktivoitu mutta nämä parametrit on jätetty tyhjiksi.",
"SearchParametersNote2": "Jätä nämä kaksi kenttää tyhjäksi poistaaksesi verkkosivuhaun käytöstä uusilla verkkosivuilla.",
- "SearchUseDefault": "Käytä %soletusparametrejä%s verkkohaussa",
+ "SearchUseDefault": "Käytä %1$soletusparametrejä%2$s verkkohaussa",
"SelectACity": "Valitse kaupunki",
"SelectDefaultCurrency": "Voit valita oletusvaluutan uusille verkkosivuille.",
"SelectDefaultTimezone": "Voit valita oletusaikavyöhykkeen uusille verkkosivuille.",
"ShowTrackingTag": "näytä seurantakoodi",
"Sites": "Sivustot",
"SiteSearchUse": "Voit käyttää Piwikiä seurataksesi ja raportoidaksesi, mitä kävijät etsivät verkkosivusi sisäisellä hakukoneella.",
- "SuperUserAccessCan": "Superkäyttäjän oikeudet omaava käyttäjä voi myös %s määritellä globaaleja asetuksia%s uusille verkkosivuille.",
+ "SuperUserAccessCan": "Superkäyttäjän oikeudet omaava käyttäjä voi myös %1$s määritellä globaaleja asetuksia%2$s uusille verkkosivuille.",
"Timezone": "Aikavyöhyke",
"TrackingSiteSearch": "Verkkosivun sisäisen haun seuranta",
"TrackingTags": "Seurantatagit %s:lle",
diff --git a/plugins/SitesManager/lang/fr.json b/plugins/SitesManager/lang/fr.json
index 2372187f6ca73e231cb2871cebbbe6c1cc45a3ca..b4157d71b127f6cccb48da1c624749b6ace979a4 100644
--- a/plugins/SitesManager/lang/fr.json
+++ b/plugins/SitesManager/lang/fr.json
@@ -19,8 +19,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Si vous avez besoin d'exclure différents navigateurs pour différents sites web, cochez cette case, cliquez sur enregistrer et %1$sajoutez les navigateurs (user agents) ci-dessous%2$s.",
"ExceptionDeleteSite": "Impossible de supprimer le site car c'est le seul site enregistré dans Piwik. Vous pouvez d'abord en ajouter un nouveau, puis supprimez celui-ci.",
"ExceptionEmptyName": "Le nom du site ne peut être vide.",
- "ExceptionInvalidCurrency": "La monnaie '%s' n'est pas valide. Veuillez entrer un symbole monétaire valide (ex. %s)",
- "ExceptionInvalidIPFormat": "L'IP Ã exclure '%s' n'a pas un format valide (ex. %s).",
+ "ExceptionInvalidCurrency": "La monnaie '%1$s' n'est pas valide. Veuillez entrer un symbole monétaire valide (ex. %2$s)",
+ "ExceptionInvalidIPFormat": "L'IP Ã exclure \"%1$s\" n'a pas un format valide (ex: %2$s).",
"ExceptionInvalidTimezone": "Le fuseau horaire '%s' n'est pas valide. Veuillez entrer un fuseau horaire valide.",
"ExceptionInvalidUrl": "L'url '%s' n'est pas une URL valide.",
"ExceptionNoUrl": "Vous devez spécifier au moins une URL pour le site.",
@@ -48,7 +48,7 @@
"NotFound": "Aucun site trouvé pour",
"NoWebsites": "Vous n'avez aucun site Internet à administrer.",
"OnlyOneSiteAtTime": "Vous pouvez éditer un site web à la fois. Veuillez Enregistrer ou Annuler vos modifications courantes sur le site web %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik permet un suivi et un rapport avancé des statistiques E-commerce. Apprenez-en plus à propos %s des statistiques E-commerce%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik permet un suivi et un rapport avancé des statistiques E-commerce. Apprenez-en plus à propos %1$s des statistiques E-commerce%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik exclura automatiquement les paramètres de session communs (%s).",
"PluginDescription": "La gestion des sites web vous permet d'ajouter des nouveaux sites web et d'en modifier des existants.",
"SearchCategoryDesc": "Piwik peut aussi effectuer le suivi de la catégorie de recherche pour chaque mot-clé de recherche interne.",
@@ -58,7 +58,7 @@
"SearchKeywordParametersDesc": "Entrez une liste séparée par des virgules de tous les paramètres de requête contenant des mots-clés de recherche.",
"SearchParametersNote": "Note : les paramètres de requête et de catégorie seront utilisés uniquement pour les sites web qui ont la recherche activée et ces paramètres laissés vides.",
"SearchParametersNote2": "Pour désactiver la recherche sur les nouveaux sites web, laissez ces deux champs vides.",
- "SearchUseDefault": "Utiliser les paramètres de recherche par %sdéfaut%s",
+ "SearchUseDefault": "Utiliser les paramètres de recherche par %1$sdéfaut%2$s",
"SelectACity": "Sélectionnez une ville",
"SelectDefaultCurrency": "Vous pouvez sélectionner la devise par défaut pour les nouveaux sites web.",
"SelectDefaultTimezone": "Vous pouvez sélectionner le fuseau horaire par défaut pour les nouveaux sites web.",
@@ -67,8 +67,10 @@
"SiteSearchUse": "Vous pouvez utiliser Piwik pour suivre et effectuer un rapport sur ce que vos visiteurs cherchent sur le moteur de recherche interne de votre site web.",
"SiteWithoutDataTitle": "Aucune donnée enregistrée pour le moment",
"SiteWithoutDataDescription": "Aucune donnée d'analyse n'a été enregistrée pour ce site pour le moment.",
- "SiteWithoutDataSetupTracking": "Veuillez mettre en place le %1$sCode de suivi JavaScript%2$s sur votre site web et rafraîchir la page.",
- "SuperUserAccessCan": "Un utilisateur avec un accès super utilisateur peut aussi %sconfigurer les paramètres globaux%s pour les nouveaux sites web.",
+ "SiteWithoutDataSetupTracking": "Veuillez configurer le %1$scode de suivit JavaScript%2$s sur votre site web si vous ne l'avez pas déjà fait.",
+ "SiteWithoutDataMessageDisappears": "Ce message disparaitra dès lors que certaines données auront été enregistrées pour ce site web.",
+ "SiteWithoutDataSetupGoals": "Pendant ce temps, peut être voudriez vous %1$sdéfinir des objectifs%2$s.",
+ "SuperUserAccessCan": "Un utilisateur avec un accès super utilisateur peut aussi %1$sconfigurer les paramètres globaux%2$s pour les nouveaux sites web.",
"Timezone": "Fuseau horaire",
"TrackingSiteSearch": "Suivi de la recherche interne sur le site",
"TrackingTags": "Code de suivi pour %s",
diff --git a/plugins/SitesManager/lang/hi.json b/plugins/SitesManager/lang/hi.json
index c408da6fc5ec77fd1ffcf82a1ade69ce56e7dcb1..d51a19037b8a1f362d7bb5b08e823129c695c4dc 100644
--- a/plugins/SitesManager/lang/hi.json
+++ b/plugins/SitesManager/lang/hi.json
@@ -19,8 +19,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "अगर आप की जरूरत है अलग वेबसाइटों के लिठअलग अलग उपयोगकरà¥à¤¤à¤¾ à¤à¤œà¥‡à¤‚टों को बाहर करने की, इस बॉकà¥à¤¸ की जाà¤à¤š करें, सहेजें कà¥à¤²à¤¿à¤• करें और %1$sइसके बाद संसà¥à¤•à¤°à¤£ उपयोगकरà¥à¤¤à¤¾ à¤à¤œà¥‡à¤‚ट%2$s जोड़ें।",
"ExceptionDeleteSite": "यह केवल पंजीकृत वेबसाइट है जैसा कि इस वेबसाइट को हटाना संà¤à¤µ नहीं है. पहले à¤à¤• नई वेबसाइट जोड़ें, तो यह नषà¥à¤Ÿ करे.",
"ExceptionEmptyName": "वेबसाइट का नाम खाली नहीं हो सकता.",
- "ExceptionInvalidCurrency": "मà¥à¤¦à¥à¤°à¤¾ मानà¥à¤¯ \"%s\" नहीं है. à¤à¤• वैध मà¥à¤¦à¥à¤°à¤¾ पà¥à¤°à¤¤à¥€à¤• (जैसे %s) दरà¥à¤œ करें",
- "ExceptionInvalidIPFormat": "\"%s\" को बाहर करने के लिठआईपी à¤à¤• वैध आईपी पà¥à¤°à¤¾à¤°à¥‚प (जैसे %s) नहीं है.",
+ "ExceptionInvalidCurrency": "मà¥à¤¦à¥à¤°à¤¾ मानà¥à¤¯ \"%1$s\" नहीं है. à¤à¤• वैध मà¥à¤¦à¥à¤°à¤¾ पà¥à¤°à¤¤à¥€à¤• (जैसे %2$s) दरà¥à¤œ करें",
+ "ExceptionInvalidIPFormat": "\"%1$s\" को बाहर करने के लिठआईपी à¤à¤• वैध आईपी पà¥à¤°à¤¾à¤°à¥‚प (जैसे %2$s) नहीं है.",
"ExceptionInvalidTimezone": "समय कà¥à¤·à¥‡à¤¤à¥à¤° \"%s\" मानà¥à¤¯ नहीं है. à¤à¤• वैध समयकà¥à¤·à¥‡à¤¤à¥à¤° दरà¥à¤œ करें.",
"ExceptionInvalidUrl": "यूआरà¤à¤² '%s' à¤à¤• मानà¥à¤¯ URL नहीं है.",
"ExceptionNoUrl": "आपको वेबसाइट के लिठकम से कम à¤à¤• URL निरà¥à¤¦à¤¿à¤·à¥à¤Ÿ करना होगा.",
@@ -48,7 +48,7 @@
"NotFound": "वेबसाइटों के लिठनहीं मिला",
"NoWebsites": "आपके पास पà¥à¤°à¤¬à¤‚धन के लिठकोई à¤à¥€ वेबसाइट नहीं है.",
"OnlyOneSiteAtTime": "आप केवल à¤à¤• समय में à¤à¤• वेबसाइट को संपादित कर सकते हैं. वेबसाइट %sके लिठअपने मौजूदा संशोधनों सहेजें या रदà¥à¤¦ करें.",
- "PiwikOffersEcommerceAnalytics": "Piwik टà¥à¤°à¥ˆà¤•à¤¿à¤‚ग और रिपोरà¥à¤Ÿà¤¿à¤‚ग उनà¥à¤¨à¤¤ ईकॉमरà¥à¤¸ à¤à¤¨à¤¾à¤²à¤¿à¤Ÿà¤¿à¤•à¥à¤¸ के लिठअनà¥à¤®à¤¤à¤¿ देता है. %sईकॉमरà¥à¤¸ à¤à¤¨à¤¾à¤²à¤¿à¤Ÿà¤¿à¤•à¥à¤¸%s के बारे में अधिक जानें.",
+ "PiwikOffersEcommerceAnalytics": "Piwik टà¥à¤°à¥ˆà¤•à¤¿à¤‚ग और रिपोरà¥à¤Ÿà¤¿à¤‚ग उनà¥à¤¨à¤¤ ईकॉमरà¥à¤¸ à¤à¤¨à¤¾à¤²à¤¿à¤Ÿà¤¿à¤•à¥à¤¸ के लिठअनà¥à¤®à¤¤à¤¿ देता है. %1$sईकॉमरà¥à¤¸ à¤à¤¨à¤¾à¤²à¤¿à¤Ÿà¤¿à¤•à¥à¤¸%2$s के बारे में अधिक जानें.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik सà¥à¤µà¤¤à¤ƒ सामानà¥à¤¯ सतà¥à¤° के मापदंडों(%s) से अलग रहेगा",
"SearchCategoryDesc": "Piwik à¤à¥€ à¤à¤• आंतरिक साइट खोज कीवरà¥à¤¡ के लिठखोज शà¥à¤°à¥‡à¤£à¥€ टà¥à¤°à¥ˆà¤• कर सकता हैं.",
"SearchCategoryLabel": "शà¥à¤°à¥‡à¤£à¥€ पैरामीटर",
@@ -57,7 +57,7 @@
"SearchKeywordParametersDesc": "साइट खोज कीवरà¥à¤¡ वाली सà¤à¥€ पà¥à¤°à¤¶à¥à¤¨ को पैरामीटर नाम की à¤à¤• अलà¥à¤ªà¤µà¤¿à¤°à¤¾à¤® से अलग सूची दरà¥à¤œ करें.",
"SearchParametersNote": "नोट: कà¥à¤µà¥‡à¤°à¥€ पैरामीटर और शà¥à¤°à¥‡à¤£à¥€ मापदंडों वेबसाइटों के लिठही इसà¥à¤¤à¥‡à¤®à¤¾à¤² किया जाà¤à¤—ा जो साइट खोज सकà¥à¤·à¤® लेकिन इन मानकों को खाली छोड़ दिया है.",
"SearchParametersNote2": "नई वेबसाइटों के लिठसाइट खोज को निषà¥à¤•à¥à¤°à¤¿à¤¯ करने के लिà¤, इन दो कà¥à¤·à¥‡à¤¤à¥à¤°à¥‹à¤‚ को खाली छोड़ दें.",
- "SearchUseDefault": "%sडिफ़ॉलà¥à¤Ÿ%s साइट खोज मापदंडों का उपयोग करें",
+ "SearchUseDefault": "%1$sडिफ़ॉलà¥à¤Ÿ%2$s साइट खोज मापदंडों का उपयोग करें",
"SelectACity": "कोई नगर चà¥à¤¨à¥‡à¤‚",
"SelectDefaultCurrency": "आप नई वेबसाइट को डिफ़ॉलà¥à¤Ÿ रूप से सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ करने के लिठमà¥à¤¦à¥à¤°à¤¾ का चयन कर सकते हैं.",
"SelectDefaultTimezone": "आप नई वेबसाइट के लिठडिफ़ॉलà¥à¤Ÿ रूप से चयन करने के लिठसमय कà¥à¤·à¥‡à¤¤à¥à¤° का चयन कर सकते हैं.",
diff --git a/plugins/SitesManager/lang/hu.json b/plugins/SitesManager/lang/hu.json
index 585d1fad32f528893ae3da1de23217a0564f95a5..e946294898e71741237199aed650fddcd38cc8c7 100644
--- a/plugins/SitesManager/lang/hu.json
+++ b/plugins/SitesManager/lang/hu.json
@@ -12,8 +12,8 @@
"DeleteConfirm": "Biztosan törölni akarod a következő weboldalt: %s?",
"ExceptionDeleteSite": "Nem lehetséges a weboldal törlése mindaddig, amÃg ez az egyetlen regisztrált weboldal. ElÅ‘bb adj meg egy újat, és csak aztán törölheted ezt.",
"ExceptionEmptyName": "A weboldal neve nem lehet üres.",
- "ExceptionInvalidCurrency": "A pénznem: \"%s\" nem létezik. Kérjük, adja meg egy létezÅ‘ pénznem rövidÃtését (pl. %s)",
- "ExceptionInvalidIPFormat": "A kizárni kÃvánt IP-cÃm: \"%s\" nem megfelelÅ‘ formátumú (pl. %s)",
+ "ExceptionInvalidCurrency": "A pénznem: \"%1$s\" nem létezik. Kérjük, adja meg egy létezÅ‘ pénznem rövidÃtését (pl. %2$s)",
+ "ExceptionInvalidIPFormat": "A kizárni kÃvánt IP-cÃm: \"%1$s\" nem megfelelÅ‘ formátumú (pl. %2$s)",
"ExceptionInvalidTimezone": "Az időzóna: \"%s\" nem létezik.",
"ExceptionInvalidUrl": "Az URL: \"%s\" nem megfelelő.",
"ExceptionNoUrl": "Meg kell adnod legalább egy URL-t a weboldalhoz.",
diff --git a/plugins/SitesManager/lang/id.json b/plugins/SitesManager/lang/id.json
index af4ce5c6ef6730ddb6b2abbb677b5bf8468e7c3e..825b84de17dfe257aec5d077160bbb6ef0cdd69f 100644
--- a/plugins/SitesManager/lang/id.json
+++ b/plugins/SitesManager/lang/id.json
@@ -18,8 +18,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Bila Anda ingin mengecualikan agen pengguna tertentu untuk situs berbeda, centang kotak ini, klik simpan dan %1$stambah agen pengguna di atas%2$s.",
"ExceptionDeleteSite": "Tak mungkin menghapus situs yang tidak terdaftar. Tambahkan situs baru telebih dahulu, lalu hapus situs tersebut.",
"ExceptionEmptyName": "Nama Situs tidak boleh kosong.",
- "ExceptionInvalidCurrency": "Mata uang \"%s\" tidak sahih. Silakan masukkan mata uang yang sesuai (misalnya %s)",
- "ExceptionInvalidIPFormat": "IP yang dikecualikan \"%s\" bukan merupakan bentuk IP yang sahih (misalnya %s).",
+ "ExceptionInvalidCurrency": "Mata uang \"%1$s\" tidak sahih. Silakan masukkan mata uang yang sesuai (misalnya %2$s)",
+ "ExceptionInvalidIPFormat": "IP yang dikecualikan \"%1$s\" bukan merupakan bentuk IP yang sahih (misalnya %2$s).",
"ExceptionInvalidTimezone": "Wilayah waktu \"%s\" tidak sahih. Silakan masukkkam wilayah waktu yang sesuai.",
"ExceptionInvalidUrl": "URL '%s' merupakan URL tak sahih.",
"ExceptionNoUrl": "Anda harus menentukan setidaknya satu URL untuk situs.",
@@ -47,7 +47,7 @@
"NotFound": "Tak ada situs yang ditemukan",
"NoWebsites": "Anda tidak memiliki situs untuk dikelola.",
"OnlyOneSiteAtTime": "Anda hanya dapat menyunting satu situs dalam sekali waktu. Silakan Simpam atau Batalkan perubahan terhadap situs %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik mungkinkan pelaporan dan pelacakan Analisis Niaga-E. Pelajari tentang %s Analisis Niaga-E%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik mungkinkan pelaporan dan pelacakan Analisis Niaga-E. Pelajari tentang %1$s Analisis Niaga-E%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik akan otomatis kecualikan parameter sesi umum (%s).",
"SearchCategoryDesc": "Piwik juga dapat melacak kategori Pencarian untuk setiap kata kunci pencarian situs dalam.",
"SearchCategoryLabel": "Parameter kategori",
@@ -56,7 +56,7 @@
"SearchKeywordParametersDesc": "Masukkan daftar dipisah koma seluruh daftar nama parameter kueri yang mengandung kata kunci pencarian situs.",
"SearchParametersNote": "Catatan: Parameter Kueri dan parameter Kategori akan digunakan hanya untuk situs dengan Pencarian Situs diaktifkan tapi hanya meninggalkan parameter tersebut kosong.",
"SearchParametersNote2": "Untuk mematikan Pencarian Situs untuk situs baru, biarkan dua isian itu kosong.",
- "SearchUseDefault": "Gunakan parameter Pencarian Situs %sasali%s",
+ "SearchUseDefault": "Gunakan parameter Pencarian Situs %1$sasali%2$s",
"SelectACity": "Pilih kota",
"SelectDefaultCurrency": "Anda dapat Mata Uang yang diatur secara asali untuk situs baru.",
"SelectDefaultTimezone": "Anda dapat memilih yang dipilih secara asali untuk situs baru.",
diff --git a/plugins/SitesManager/lang/it.json b/plugins/SitesManager/lang/it.json
index 6456771c7d927f210d2fcc147fd819db2a06cc9f..6a986279817ca271cbc76526d25e510213babedf 100644
--- a/plugins/SitesManager/lang/it.json
+++ b/plugins/SitesManager/lang/it.json
@@ -19,8 +19,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Se è necessario escludere diversi user agent per diversi siti web, seleziona questa casella, clicca su Salva e%1$saggiungi qui sopra gli user agent%2$s.",
"ExceptionDeleteSite": "Non è possibile cancellare questo sito web perché è l'unico registrato. Aggiungi prima un nuovo sito, quindi puoi cancellare questo.",
"ExceptionEmptyName": "Il nome del sito non può essere vuoto.",
- "ExceptionInvalidCurrency": "La valuta \"%s\" non è valida. Inserisci un simbolo di valuta valido (es. %s)",
- "ExceptionInvalidIPFormat": "L'indirizzo IP da escludere \"%s\" non ha un formato IP valido (per esempio %s).",
+ "ExceptionInvalidCurrency": "La valuta \"%1$s\" non è valida. Inserisci un simbolo di valuta valido (es. %2$s)",
+ "ExceptionInvalidIPFormat": "L'indirizzo IP da escludere \"%1$s\" non ha un formato IP valido (per esempio %2$s).",
"ExceptionInvalidTimezone": "Il fuso orario \"%s\" non è valido. Per favore inseriscine uno valido.",
"ExceptionInvalidUrl": "L'indirizzo \"%s\" non è un URL valido.",
"ExceptionNoUrl": "Devi specificare almeno un URL per questo sito.",
@@ -48,7 +48,7 @@
"NotFound": "Nessun sito trovato per",
"NoWebsites": "Non hai configurato alcun sito web da amministrare.",
"OnlyOneSiteAtTime": "Puoi modificare solo un sito per volta. Per favore Salva o Annulla le attuali modifiche al sito %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik permette statistiche Ecommerce avanzate di monitoraggio e reporting. Vai, per saperne di più, su%s Statistiche Ecommerce%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik permette statistiche Ecommerce avanzate di monitoraggio e reporting. Vai, per saperne di più, su %1$sStatistiche Ecommerce%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik escluderà automaticamente i parametri di sessioni comuni (%s).",
"PluginDescription": "La Gestione dei Siti ti permette di aggiungere e modificare i siti web esistenti.",
"SearchCategoryDesc": "Piwik può anche monitorare la categoria Ricerca per ogni parola chiave di ricerca interna al sito.",
@@ -58,7 +58,7 @@
"SearchKeywordParametersDesc": "Immetti un elenco separato da virgola di tutti i nomi dei parametri di ricerca che contengono la parola chiave di ricerca del sito.",
"SearchParametersNote": "Nota: parametri di ricerca e parametri di categoria saranno utilizzati solo per i siti web che hanno la Ricerca nel Sito abilitata ma hanno lasciato questi parametri vuoti.",
"SearchParametersNote2": "Per disabilitare la Ricerca nel Sito per i nuovi siti web, lascia vuoti questi due campi.",
- "SearchUseDefault": "Usa i parametri %spredefiniti%s di Ricerca nel Sito",
+ "SearchUseDefault": "Usa i parametri %1$spredefiniti%2$s di Ricerca nel Sito",
"SelectACity": "Seleziona una città ",
"SelectDefaultCurrency": "È possibile selezionare la valuta predefinita da impostare per i nuovi siti web.",
"SelectDefaultTimezone": "Puoi selezionare il fuso orario predefinito da caricare per i nuovi siti.",
@@ -67,8 +67,10 @@
"SiteSearchUse": "È possibile utilizzare Piwik per monitorare e creare dei report su ciò che i visitatori stanno cercando nel motore di ricerca interno del tuo sito web.",
"SiteWithoutDataTitle": "Non è stato ancora registrato alcun dato",
"SiteWithoutDataDescription": "Per questo sito non sono ancora stati tracciati dati statistici.",
- "SiteWithoutDataSetupTracking": "Imposta il %1$scodice di tracciamento JavaScript%2$s nel sito e ricarica la pagina.",
- "SuperUserAccessCan": "Un utente con accesso Super User può anche %sspecificare le impostazioni globali%s per i nuovi siti.",
+ "SiteWithoutDataSetupTracking": "Si prega di impostare il %1$sCodice di Tracciamento JavaScript%2$s sul tuo sito, se già non lo hai fatto.",
+ "SiteWithoutDataMessageDisappears": "Questo messaggio scomparirà non appena dei dati di questo sito saranno raccolti.",
+ "SiteWithoutDataSetupGoals": "Nel frattempo, può essere che tu voglia %1$simpostare alcuni goal%2$s.",
+ "SuperUserAccessCan": "Un utente con accesso Super User può anche %1$sspecificare le impostazioni globali%2$s per i nuovi siti.",
"Timezone": "Fuso orario",
"TrackingSiteSearch": "Tracciamento Ricerca Interna Sito",
"TrackingTags": "Codice traking per %s",
@@ -76,6 +78,7 @@
"UTCTimeIs": "Tempo UTC è %s.",
"OnlyMatchedUrlsAllowed": "Traccia visite e azioni solo quando l'URL del visitatore comincia con uno degli URL qui sopra.",
"OnlyMatchedUrlsAllowedHelp": "Quando abilitato, Piwik traccerà le azioni interne solo quando l'URL Pagina è una delle URL conosciute del sito. Questo evita che la gente spammi le tue statistiche con URL di altri siti web.",
+ "OnlyMatchedUrlsAllowedHelpExamples": "Il dominio e il percorso devono essere in perfetta corrispondenza e ciascun sottodominio valido deve essere specificato separatamente. Per esempio quando le URL conosciute sono 'http:\/\/example.com\/path' e 'http:\/\/good.example.com', le richieste di tracking per 'http:\/\/example.com\/otherpath' o 'http:\/\/bad.example.com' verranno ignorate.",
"WebsitesManagement": "Gestisci siti web",
"XManagement": "Gestione %s",
"ChooseMeasurableTypeHeadline": "Cosa intendi misurare",
diff --git a/plugins/SitesManager/lang/ja.json b/plugins/SitesManager/lang/ja.json
index b1d3a73a83d7b292b0ecbacbaa676e0d8d1efc18..d1c82342b1991502816ef3828ffa3709df1afc1f 100644
--- a/plugins/SitesManager/lang/ja.json
+++ b/plugins/SitesManager/lang/ja.json
@@ -19,8 +19,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "ç•°ãªã‚‹ã‚¦ã‚§ãƒ–サイトã®ç•°ãªã‚‹ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚¨ãƒ¼ã‚¸ã‚§ãƒ³ãƒˆã‚’除外ã™ã‚‹å¿…è¦ãŒã‚ã‚‹å ´åˆã€ã“ã®ãƒœãƒƒã‚¯ã‚¹ã«ãƒã‚§ãƒƒã‚¯ã‚’ã—ã€[ ä¿å˜ ] をクリックã—ã¦ãã ã•ã„。次㫠%1$sadd the user agents above%2$s ã—ã¦ãã ã•ã„。",
"ExceptionDeleteSite": "登録ã•ã‚ŒãŸå”¯ä¸€ã®ã‚¦ã‚§ãƒ–サイトã§ã‚ã‚‹ãŸã‚ã€ã“ã®ã‚¦ã‚§ãƒ–サイトを削除ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 ã¯ã˜ã‚ã«æ–°ã—ã„ã‚¦ã‚§ãƒ–ã‚µã‚¤ãƒˆã‚’è¿½åŠ ã—ã€ãã®å¾Œã§ã“れを削除ã—ã¦ãã ã•ã„。",
"ExceptionEmptyName": "サイトåを空欄ã«ã¯ã§ãã¾ã›ã‚“。",
- "ExceptionInvalidCurrency": "通貨 \"%s\" ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 有効ãªé€šè²¨æ–‡å—（例：%s）を入力ã—ã¦ãã ã•ã„。",
- "ExceptionInvalidIPFormat": "除外ã™ã‚‹ IP \"%s\" ã¯æœ‰åŠ¹ãª IP å½¢å¼ï¼ˆä¾‹ï¼š%s）ã§ã¯ã‚ã‚Šã¾ã›ã‚“。",
+ "ExceptionInvalidCurrency": "通貨 \"%1$s\" ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 有効ãªé€šè²¨æ–‡å—（例：%2$s）を入力ã—ã¦ãã ã•ã„。",
+ "ExceptionInvalidIPFormat": "除外ã™ã‚‹ IP \"%1$s\" ã¯æœ‰åŠ¹ãª IP å½¢å¼ï¼ˆä¾‹ï¼š%2$s）ã§ã¯ã‚ã‚Šã¾ã›ã‚“。",
"ExceptionInvalidTimezone": "タイムゾーン \"%s\" ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 有効ãªã‚¿ã‚¤ãƒ ゾーンを入力ã—ã¦ãã ã•ã„。",
"ExceptionInvalidUrl": "URL '%s' ã¯æœ‰åŠ¹ãªURLã§ã¯ã‚ã‚Šã¾ã›ã‚“。",
"ExceptionNoUrl": "サイト用ã®URLを最低ã§ã‚‚1ã¤æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚",
@@ -48,7 +48,7 @@
"NotFound": "ウェブサイトãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸï¼š",
"NoWebsites": "管ç†ã§ãるウェブサイトãŒã‚ã‚Šã¾ã›ã‚“。",
"OnlyOneSiteAtTime": "一度ã«ã‚¦ã‚§ãƒ–サイトã¯ä¸€ã¤ã ã‘編集ã§ãã¾ã™ã€‚ウェブサイト %s ã¸ã®å¤‰æ›´ã‚’ä¿å˜ã™ã‚‹ã‹ã€ã‚ャンセルã—ã¦ãã ã•ã„。",
- "PiwikOffersEcommerceAnalytics": "Piwikã¯ã€é«˜åº¦ãªeコマース分æžã€ãƒˆãƒ©ãƒƒã‚ング＆リãƒãƒ¼ãƒ†ã‚£ãƒ³ã‚°ã€ãŒå¯èƒ½ã«ãªã‚Šã¾ã™ã€‚%s eã‚³ãƒžãƒ¼ã‚¹åˆ†æž %s ã«ã¤ã„ã¦è©³ã—ã知る。",
+ "PiwikOffersEcommerceAnalytics": "Piwikã¯ã€é«˜åº¦ãªeコマース分æžã€ãƒˆãƒ©ãƒƒã‚ング＆リãƒãƒ¼ãƒ†ã‚£ãƒ³ã‚°ã€ãŒå¯èƒ½ã«ãªã‚Šã¾ã™ã€‚%1$s eã‚³ãƒžãƒ¼ã‚¹åˆ†æž %2$s ã«ã¤ã„ã¦è©³ã—ã知る。",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "一般的ãªã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒ‘ラメータ(%s)ã¯ã€Piwik ãŒè‡ªå‹•çš„ã«é™¤å¤–ã—ã¾ã™ã€‚",
"PluginDescription": "Web サイト管ç†ã§ã¯ã€æ–°ã—ã„ web ã‚µã‚¤ãƒˆã‚’è¿½åŠ ã—ã€æ—¢å˜ã® web サイトを編集ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚",
"SearchCategoryDesc": "Piwik ã¯ã€å„内部サイト内検索ã‚ーワードã«å¯¾ã™ã‚‹æ¤œç´¢ã‚«ãƒ†ã‚´ãƒªã‚’追跡ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚",
@@ -58,7 +58,7 @@
"SearchKeywordParametersDesc": "サイト内検索ã‚ーワードをå«ã‚€ã™ã¹ã¦ã®ã‚¯ã‚¨ãƒªãƒ‘ラメーターåリストをコンマ区切りã§å…¥åŠ›ã—ã¦ãã ã•ã„。",
"SearchParametersNote": "注) クエリパラメーターã¨ã‚«ãƒ†ã‚´ãƒªãƒ¼ãƒ‘ラメーターã¯ã€ã‚µã‚¤ãƒˆå†…検索ãŒæœ‰åŠ¹ã§ã‚ã‚Šã€ã‹ã¤å„パラメーターãŒç©ºã®çŠ¶æ…‹ã®ã‚¦ã‚§ãƒ–サイトã«å¯¾ã—ã¦ã®ã¿ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚",
"SearchParametersNote2": "æ–°ã—ã„ウェブサイトã®ã‚µã‚¤ãƒˆå†…検索を無効ã«ã™ã‚‹ã«ã¯ã€ã“れら 2 ã¤ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’空ã®ã¾ã¾ã«ã—ã¦ãŠã„ã¦ãã ã•ã„。",
- "SearchUseDefault": "%sdefault%s サイト内検索パラメーターを使用ã—ã¦ãã ã•ã„",
+ "SearchUseDefault": "%1$sdefault%2$s サイト内検索パラメーターを使用ã—ã¦ãã ã•ã„",
"SelectACity": "都市をé¸æŠž",
"SelectDefaultCurrency": "æ–°ã—ã„ウェブサイトã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¨ã—ã¦è¨å®šã•ã‚Œã‚‹ã€é€šè²¨ã‚’é¸æŠžã—ã¾ã™ã€‚",
"SelectDefaultTimezone": "æ–°ã—ã„ウェブサイトã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¨ã—ã¦é¸æŠžã•ã‚Œã‚‹ã€ã‚¿ã‚¤ãƒ ゾーンをé¸æŠžã—ã¾ã™ã€‚",
@@ -67,8 +67,7 @@
"SiteSearchUse": "Piwik を利用ã—ã¦ã€ãƒ“ジターãŒã‚¦ã‚§ãƒ–サイトã®å†…部検索エンジンã§æ¤œç´¢ã—ã¦ã„ã‚‹ã‚‚ã®ã‚’追跡ãŠã‚ˆã³ãƒ¬ãƒãƒ¼ãƒˆã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚",
"SiteWithoutDataTitle": "ã¾ã データã¯è¨˜éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“",
"SiteWithoutDataDescription": "ã¾ã ã“ã®ã‚¦ã‚¨ãƒ–サイトã®åˆ†æžãƒ‡ãƒ¼ã‚¿ã¯è¿½è·¡ã•ã‚Œã¦ã„ã¾ã›ã‚“。",
- "SiteWithoutDataSetupTracking": "ã‚ãªãŸã®ã‚¦ã‚§ãƒ–サイト㫠%1$s JavaScrip トラッã‚ング コード %2$s ã‚’è¨å®šã—ã¦ã€ãƒšãƒ¼ã‚¸ã‚’æ›´æ–°ã—ã¦ãã ã•ã„。",
- "SuperUserAccessCan": "スーパーユーザーアクセス権é™ã‚’æŒã¤ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ã€æ–°ã—ã„ウェブサイトã«å¯¾ã— %s ã‚°ãƒãƒ¼ãƒãƒ«ãƒªã‚¹ãƒˆã‚’指定 %s ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚",
+ "SuperUserAccessCan": "スーパーユーザーアクセス権é™ã‚’æŒã¤ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ã€æ–°ã—ã„ウェブサイトã«å¯¾ã— %1$s ã‚°ãƒãƒ¼ãƒãƒ«ãƒªã‚¹ãƒˆã‚’指定 %2$s ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚",
"Timezone": "タイムゾーン",
"TrackingSiteSearch": "サイト内検索ã®ãƒˆãƒ©ãƒƒã‚ング",
"TrackingTags": "%s 用トラッã‚ングタグ",
diff --git a/plugins/SitesManager/lang/ko.json b/plugins/SitesManager/lang/ko.json
index dc44ef9dfbd77c69005c45ec352c7e068ae6ef13..ece14f44c03e06b17f850619975b3d686baaff64 100644
--- a/plugins/SitesManager/lang/ko.json
+++ b/plugins/SitesManager/lang/ko.json
@@ -19,8 +19,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "다른 웹사ì´íŠ¸ì— 대해 서로 다른 ì‚¬ìš©ìž ì—ì´ì „트를 ì œì™¸í•´ì•¼í•˜ëŠ” 경우, ì´ í™•ì¸ëž€ì„ ì„ íƒí•˜ì—¬ ì €ìž¥í•˜ê³ %1$sì‚¬ìš©ìž ì—ì´ì „트를 추가%2$s합니다.",
"ExceptionDeleteSite": "ì´ ì›¹ì‚¬ì´íŠ¸ë§Œ 등ë¡ë˜ìžˆê¸°ì— ì´ ì›¹ì‚¬ì´íŠ¸ë¥¼ ì‚ì œí• ìˆ˜ 없습니다. 새 웹사ì´íŠ¸ë¥¼ ë¨¼ì € ì¶”ê°€í•˜ì‹œê³ ì´ ì›¹ì‚¬ì´íŠ¸ë¥¼ ì‚ì œí•˜ì„¸ìš”.",
"ExceptionEmptyName": "웹사ì´íŠ¸ëª…ì€ ë¹ˆì¹¸ìœ¼ë¡œ 둘 수 없습니다.",
- "ExceptionInvalidCurrency": "통화 \"%s\"는 ìœ íš¨í•˜ì§€ 않습니다. ìœ íš¨í•œ 통화 ë¬¸ìž (예: %s)를 ìž…ë ¥í•˜ì„¸ìš”.",
- "ExceptionInvalidIPFormat": "ì œì™¸ IP \"%s\"는 ìœ íš¨í•œ IP í˜•ì‹ (예: %s)ê°€ 없습니다.",
+ "ExceptionInvalidCurrency": "통화 \"%1$s\"는 ìœ íš¨í•˜ì§€ 않습니다. ìœ íš¨í•œ 통화 ë¬¸ìž (예: %2$s)를 ìž…ë ¥í•˜ì„¸ìš”.",
+ "ExceptionInvalidIPFormat": "ì œì™¸ IP \"%1$s\"는 ìœ íš¨í•œ IP í˜•ì‹ (예: %2$s)ê°€ 없습니다.",
"ExceptionInvalidTimezone": "시간대 \"%s\"는 ìœ íš¨í•˜ì§€ 않습니다. ìœ íš¨í•œ 표준 시간대를 ìž…ë ¥í•˜ì„¸ìš”.",
"ExceptionInvalidUrl": "URL '%s' ì€(는) ìœ íš¨í•œ URLì´ ì•„ë‹™ë‹ˆë‹¤.",
"ExceptionNoUrl": "최소한 í•˜ë‚˜ì˜ ì›¹ì‚¬ì´íŠ¸ URLì„ ë„£ì–´ì£¼ì…”ì•¼ 합니다.",
@@ -48,7 +48,7 @@
"NotFound": "웹사ì´íŠ¸ë¥¼ ì°¾ì„ ìˆ˜ 없습니다:",
"NoWebsites": "ê´€ë¦¬í• ì›¹ì‚¬ì´íŠ¸ë¥¼ ê°€ì§€ê³ ìžˆì§€ 않습니다.",
"OnlyOneSiteAtTime": "ì¼ë‹¨ 웹사ì´íŠ¸ëŠ” 하나만 íŽ¸ì§‘í• ìˆ˜ 있습니다. 웹사ì´íŠ¸ %sì˜ ë³€ê²½ 사í•ì„ ì €ìž¥í•˜ê±°ë‚˜ 취소하세요.",
- "PiwikOffersEcommerceAnalytics": "Piwikì€ ê³ ê¸‰ ì „ìžìƒê±°ëž˜ ë¶„ì„ ë° ì¶”ì ê·¸ë¦¬ê³ ë¦¬í¬íŒ…í• ìˆ˜ 있습니다. %sì „ìžìƒê±°ëž˜ 분ì„%sì— ëŒ€í•˜ì—¬ ë” ì•Œì•„ë³´ì„¸ìš”.",
+ "PiwikOffersEcommerceAnalytics": "Piwikì€ ê³ ê¸‰ ì „ìžìƒê±°ëž˜ ë¶„ì„ ë° ì¶”ì ê·¸ë¦¬ê³ ë¦¬í¬íŒ…í• ìˆ˜ 있습니다. %1$sì „ìžìƒê±°ëž˜ 분ì„%2$sì— ëŒ€í•˜ì—¬ ë” ì•Œì•„ë³´ì„¸ìš”.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "ì¼ë°˜ì ì¸ ì„¸ì…˜ 매개 변수 (%s)는 Piwikê°€ ìžë™ìœ¼ë¡œ ì œì™¸í•©ë‹ˆë‹¤.",
"PluginDescription": "웹사ì´íŠ¸ 관리ì—ì„œ 새로운 웹사ì´íŠ¸ë¥¼ ì¶”ê°€í•˜ê³ ê¸°ì¡´ì˜ ì›¹ì‚¬ì´íŠ¸ë¥¼ ìˆ˜ì •í• ìˆ˜ 있습니다.",
"SearchCategoryDesc": "Piwik는 내부 사ì´íŠ¸ ê²€ìƒ‰ì–´ì— ëŒ€í•œ 검색 ì¹´í…Œê³ ë¦¬ë¥¼ 추ì í• ìˆ˜ 있습니다.",
@@ -58,7 +58,7 @@
"SearchKeywordParametersDesc": "사ì´íŠ¸ 검색 키워드를 ì§€ì •í•˜ëŠ” ëª¨ë“ ì¿¼ë¦¬ 매개변수 ì´ë¦„ì„ ì‰¼í‘œë¡œ 구분하여 ëª¨ë‘ ìž…ë ¥í•©ë‹ˆë‹¤.",
"SearchParametersNote": "ì°¸ê³ : 사ì´íŠ¸ ê²€ìƒ‰ì„ ì¶”ì 하ë„ë¡ ì„¤ì •í•œ 웹사ì´íŠ¸ëŠ” 쿼리 매개변수 ë° ì¹´í…Œê³ ë¦¬ 매개변수가 사용ë˜ì–´ì•¼ 하지만 매개변수가 비어있습니다.",
"SearchParametersNote2": "새로운 웹사ì´íŠ¸ì— 대한 사ì´íŠ¸ ê²€ìƒ‰ì„ ì‚¬ìš©í•˜ì§€ ì•Šë„ë¡ ì„¤ì •í•˜ë ¤ë©´ ë‹¤ìŒ ë‘ í•„ë“œë¥¼ 비워 둡니다.",
- "SearchUseDefault": "사ì´íŠ¸ ê²€ìƒ‰ì˜ %s기본%s 매개변수 사용",
+ "SearchUseDefault": "사ì´íŠ¸ ê²€ìƒ‰ì˜ %1$s기본%2$s 매개변수 사용",
"SelectACity": "ë„ì‹œ ì„ íƒ",
"SelectDefaultCurrency": "새로운 웹사ì´íŠ¸ì˜ 기본으로 ì„¤ì •ë˜ëŠ” 통화를 ì„ íƒí•©ë‹ˆë‹¤.",
"SelectDefaultTimezone": "새로운 웹사ì´íŠ¸ì—ì„œ 기본으로 사용ë˜ëŠ” 시간대를 ì„ íƒí•©ë‹ˆë‹¤â€‹â€‹.",
@@ -67,8 +67,10 @@
"SiteSearchUse": "ë‹¹ì‹ ì€ Piwik를 사용하여 웹사ì´íŠ¸ì˜ 내부검색 엔진ì—ì„œ 방문ìžê°€ ì–´ë–¤ ê²€ìƒ‰ì„ í–ˆëŠ”ì§€ 추ì í•˜ê³ ë³´ê³ ë°›ì„ ìˆ˜ 있습니다.",
"SiteWithoutDataTitle": "ì•„ì§ ì•„ë¬´ëŸ° ë°ì´í„°ê°€ 기ë¡ë˜ì§€ 않았습니다.",
"SiteWithoutDataDescription": "ì•„ì§ í•´ë‹¹ 사ì´íŠ¸ë¥¼ 추ì 하여 분ì„í•œ ë°ì´í„°ê°€ 없습니다.",
- "SiteWithoutDataSetupTracking": "%1$sìžë°”스í¬ë¦½íŠ¸ 트래킹 코드%2$s를 ë‹¹ì‹ ì˜ ì›¹ì‚¬ì´íŠ¸ì— ì¶”ê°€í•˜ì‹œê³ , 페ì´ì§€ë¥¼ ìƒˆë¡œê³ ì¹¨í•´ 주세요.",
- "SuperUserAccessCan": "ìŠˆí¼ ìœ ì €ëŠ” 새로운 사ì´íŠ¸ì— 대해서 %sì¼ë°˜ 웹사ì´íŠ¸ ì„¤ì •%sì„ í†µí•´ ê´€ë¦¬í• ìˆ˜ 있습니다.",
+ "SiteWithoutDataSetupTracking": "만약 %1$sìžë°”스í¬ë¦½íŠ¸ 추ì 코드%2$s를 ë‹¹ì‹ ì˜ ì›¹ì‚¬ì´íŠ¸ì— ì„¤ì •í•˜ì§€ 않았다면 ì´ë¥¼ 수행해주세요.",
+ "SiteWithoutDataMessageDisappears": "ì´ ê¸€ê·€ëŠ” 해당 웹사ì´íŠ¸ì—ì„œ ë°ì´í„°ê°€ 추ì ë˜ì–´ì§€ëŠ” 즉시 사ë¼ì§ˆ 것ì´ë‹¤.",
+ "SiteWithoutDataSetupGoals": "한편, ë‹¹ì‹ ì€ %1$s목표 ì„¤ì •%2$sì„ í•˜ê³ ì‹¶ì„ ê²ƒì´ë‹¤.",
+ "SuperUserAccessCan": "ìŠˆí¼ ìœ ì €ëŠ” 새로운 사ì´íŠ¸ì— 대해서 %1$sì¼ë°˜ 웹사ì´íŠ¸ ì„¤ì •%2$sì„ í†µí•´ ê´€ë¦¬í• ìˆ˜ 있습니다.",
"Timezone": "시간대",
"TrackingSiteSearch": "사ì´íŠ¸ 내부 검색 추ì ",
"TrackingTags": "%sì˜ ì¶”ì 코드",
diff --git a/plugins/SitesManager/lang/lt.json b/plugins/SitesManager/lang/lt.json
index e6060fdd146d7f018b92da89391ff6446d78ce95..6f9cffbcac5d0892b8d0ec0b8a6f0dd3c3438522 100644
--- a/plugins/SitesManager/lang/lt.json
+++ b/plugins/SitesManager/lang/lt.json
@@ -13,8 +13,8 @@
"EnableEcommerce": "KomercinÄ— svetainÄ—",
"ExceptionDeleteSite": "Neįmanoma pašalinti svetainės, nes tai yra vienintelė registruota svetainė. Pirmiausia pridėkite naują svetainę, o vėliau ištrinkite šią.",
"ExceptionEmptyName": "SvetainÄ—s pavadinimas negali bÅ«ti tuÅ¡Äias.",
- "ExceptionInvalidCurrency": "\"%s\" valiuta nurodyta neteisingai. prašome teisingai nurodyti valiutą (pvz. %s)",
- "ExceptionInvalidIPFormat": "IÅ¡imtinis IP \"%s\" nurodytas netinkamu IP formatu (pvz.. %s).",
+ "ExceptionInvalidCurrency": "\"%1$s\" valiuta nurodyta neteisingai. prašome teisingai nurodyti valiutą (pvz. %2$s)",
+ "ExceptionInvalidIPFormat": "IÅ¡imtinis IP \"%1$s\" nurodytas netinkamu IP formatu (pvz.. %2$s).",
"ExceptionInvalidTimezone": "\"%s\" laiko juosta nurodyta neteisingai. Prašome nurodyti laiko juostą teisingai.",
"ExceptionInvalidUrl": "Adresas (URL) '%s' netinkamas.",
"ExceptionNoUrl": "Turite nurodyti bent vienÄ… adresÄ… (URL) svetainei.",
diff --git a/plugins/SitesManager/lang/lv.json b/plugins/SitesManager/lang/lv.json
index 494eb54b8b90955504d85897852b4b1b0a4810ab..b827d7a835bdf57404287093e5c453e8a5c3dcf2 100644
--- a/plugins/SitesManager/lang/lv.json
+++ b/plugins/SitesManager/lang/lv.json
@@ -9,8 +9,8 @@
"DeleteConfirm": "Vai tieÅ¡Äm vÄ“laties dzÄ“st vietni %s?",
"EnableEcommerce": "E-komercija ieslēgta",
"ExceptionEmptyName": "Vietnes nosaukums nedrīkst būt tukšs.",
- "ExceptionInvalidCurrency": "Valūta \"%s\" nav pareizi ievadīta. Lūdzu ievadiet pareizu valūtas simbolu (piem., %s)",
- "ExceptionInvalidIPFormat": "Izlaižamajai IP \"%s\" nav pareizs IP formÄts (piem., %s).",
+ "ExceptionInvalidCurrency": "Valūta \"%1$s\" nav pareizi ievadīta. Lūdzu ievadiet pareizu valūtas simbolu (piem., %2$s)",
+ "ExceptionInvalidIPFormat": "Izlaižamajai IP \"%1$s\" nav pareizs IP formÄts (piem., %2$s).",
"ExceptionInvalidTimezone": "Laika zona \"%s\" nav pareizi ievadīta. Lūdzu izvēlieties pareizu laika zonu.",
"ExceptionInvalidUrl": "URL '%s' nav pareizs URL.",
"ExceptionNoUrl": "Jums jÄnorÄda vismaz viens vietnes URL.",
diff --git a/plugins/SitesManager/lang/nb.json b/plugins/SitesManager/lang/nb.json
index d0ba30edaf5914b949da06a1699df09952987324..14a065fd9af9713e07a496d0287a9babd3ddbb84 100644
--- a/plugins/SitesManager/lang/nb.json
+++ b/plugins/SitesManager/lang/nb.json
@@ -19,8 +19,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Hvis du må ekskludere ulike brukeragenter for ulike nettsteder, huk av denne boksen, klikk lagre og %1$slegg til brukeragentene over%2$s.",
"ExceptionDeleteSite": "Det er ikke mulig å slette dette nettstedet, da det er det eneste registrerte nettstedet. Legg til et nytt nettsted, og slett deretter dette.",
"ExceptionEmptyName": "Nettstedets navn kan ikke være tomt.",
- "ExceptionInvalidCurrency": "Valutaen «%s» er ikke gyldig. Vennligst skriv inn et gyldig valutasymbol (f.eks %s)",
- "ExceptionInvalidIPFormat": "IP-en for å ekskludere «%s» virker ikke å ha et gyldig IP-format (f.eks. %s).",
+ "ExceptionInvalidCurrency": "Valutaen «%1$s» er ikke gyldig. Vennligst skriv inn et gyldig valutasymbol (f.eks %2$s)",
+ "ExceptionInvalidIPFormat": "IP-en for å ekskludere «%1$s» virker ikke å ha et gyldig IP-format (f.eks. %2$s).",
"ExceptionInvalidTimezone": "Tidssonen «%s» er ugyldig. Vennligst skriv inn en gyldig tidssone.",
"ExceptionInvalidUrl": "URL-en «%s» er ikke en gyldig URL.",
"ExceptionNoUrl": "Du må spesifisere minst én URL til nettstedet.",
@@ -48,7 +48,7 @@
"NotFound": "Ingen nettsteder funnet for",
"NoWebsites": "Du har ingen nettsteder å administrere.",
"OnlyOneSiteAtTime": "Du kan bare redigere ett nettsted av gangen. Vennligst lagre eller avbryt dine gjeldende modifikasjoner for nettstedet %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik legger til rette for avansert e-handelssporing og rapportering. Lær mer om %s Ecommerce Analytics%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik legger til rette for avansert e-handelssporing og rapportering. Lær mer om %1$s Ecommerce Analytics%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik vil automatisk ekskludere vanlige sesjonsparametere (%s).",
"PluginDescription": "Nettstedsadministrasjon lar deg legge til et nytt nettsted og redigere eksisterende nettsteder.",
"SearchCategoryDesc": "Piwik kan også spore søkekategorier for alle interne nettstedssøk.",
@@ -58,7 +58,7 @@
"SearchKeywordParametersDesc": "Skriv inn en kommaseparert liste med alle spørreparameternavn som inneholder nettstedssøkeord.",
"SearchParametersNote": "Merk: Spørreparametere og kategoriparametere vil kun brukes for nettsteder som har nettstedssøk aktivert, men som har latt disse parameterne være tomme.",
"SearchParametersNote2": "For å deaktivere nettstedssøk for nye nettsteder, la disse to feltene være tomme.",
- "SearchUseDefault": "Bruk %sstandard%s nettstedssøkeparametere",
+ "SearchUseDefault": "Bruk %1$sstandard%2$s nettstedssøkeparametere",
"SelectACity": "Velg en by",
"SelectDefaultCurrency": "Du kan velge standard valuta for nye nettsteder.",
"SelectDefaultTimezone": "Du kan velge standard tidssone for nye nettsteder.",
@@ -67,8 +67,10 @@
"SiteSearchUse": "Du kan bruke Piwik for å spore og rapportere hva besøkere søker etter i ditt nettsteds interne søkemotor.",
"SiteWithoutDataTitle": "Ingen data har blitt samlet inn ennå",
"SiteWithoutDataDescription": "Ingen analysedata har blitt sporet for dette nettstedet ennå.",
- "SiteWithoutDataSetupTracking": "Vennligst sett opp %1$sJavaScript-sporingskoden%2$s på ditt nettsted og last inn siden på nytt.",
- "SuperUserAccessCan": "En bruker med superbrukertilgang kan også %s spesifisere globale innstillinger%s for nye nettster.",
+ "SiteWithoutDataSetupTracking": "Vennligst sett opp %1$sJavaScript-sporingskoden%2$s på ditt nettsted hvis du ikke har gjort det allerede.",
+ "SiteWithoutDataMessageDisappears": "Denne meldingen vil forsvinne så snart noe data har blitt registrert for dette nettstedet.",
+ "SiteWithoutDataSetupGoals": "I mellomtiden vil du kanskje %1$ssette opp noen mål%2$s.",
+ "SuperUserAccessCan": "En bruker med superbrukertilgang kan også %1$s spesifisere globale innstillinger%2$s for nye nettsteder.",
"Timezone": "Tidssone",
"TrackingSiteSearch": "Sporer interne nettstedssøk",
"TrackingTags": "Sporingskode for %s",
@@ -76,6 +78,7 @@
"UTCTimeIs": "UTC-tid er %s.",
"OnlyMatchedUrlsAllowed": "Spor kun besøk og handlinger når URL-en starter med en av URL-ene over.",
"OnlyMatchedUrlsAllowedHelp": "Når dette er aktivert vil Piwik kun spore interne handlinger når side-URL-en er en av de kjente URL-ene for ditt nettsted. Dette forhindrer folk fra å spamme dine analyser med URL-er for andre nettsteder.",
+ "OnlyMatchedUrlsAllowedHelpExamples": "Domenen og stien må være en eksakt match og hvert gyldig subdomene må være spesifisert individuelt. For eksempel, når de kjente URL-ene er « http:\/\/example.com\/path» og « http:\/\/good.example.com», vil sporingsspørringer for « http:\/\/example.com\/otherpath» eller « http:\/\/bad.example.com» bli ignorert.",
"WebsitesManagement": "Administrasjon av nettsteder",
"XManagement": "Administrer %s",
"ChooseMeasurableTypeHeadline": "Hva vil du måle?",
diff --git a/plugins/SitesManager/lang/nl.json b/plugins/SitesManager/lang/nl.json
index 8acbfa3042923c77319cd5f6096addb58885d07f..b8a5df4e16912f1360c7c517178dd98b5440774d 100644
--- a/plugins/SitesManager/lang/nl.json
+++ b/plugins/SitesManager/lang/nl.json
@@ -18,8 +18,8 @@
"EnableSiteSpecificUserAgentExclude": "Maak per website uitgesloten user agents mogelijk",
"ExceptionDeleteSite": "Het is niet mogelijk deze website te verwijderen aangezien het de enige geregistreerde website is. Voeg eerst een nieuwe website toe alvorens deze te verwijderen.",
"ExceptionEmptyName": "De website dient een naam te hebben.",
- "ExceptionInvalidCurrency": "De munteenheid \"%s\" is niet geldig. Voer een geldig valuta symbool in (bijv. %s)",
- "ExceptionInvalidIPFormat": "Het IP om \"%s\" uit te sluiten heeft geen geldig IP-formaat (bijv. %s).",
+ "ExceptionInvalidCurrency": "De munteenheid \"%1$s\" is niet geldig. Voer een geldig valuta symbool in (bijv. %2$s)",
+ "ExceptionInvalidIPFormat": "Het IP om \"%1$s\" uit te sluiten heeft geen geldig IP-formaat (bijv. %2$s).",
"ExceptionInvalidTimezone": "De tijdzone \"%s\" is ongeldig. Voer een geldige tijdzone in.",
"ExceptionInvalidUrl": "De url '%s' is niet geldig.",
"ExceptionNoUrl": "U moet minimaal één url bepalen voor deze website.",
@@ -45,7 +45,7 @@
"NotFound": "Geen websites gevonden voor",
"NoWebsites": "U heeft geen enkele websites in beheer.",
"OnlyOneSiteAtTime": "U kunt slechts één website tegelijkertijd bewerken. Sla uw wijzigingen voor website %s op of annuleer de wijzigingen.",
- "PiwikOffersEcommerceAnalytics": "In Piwik is een geavanceerde Ecommerce Analytics tracking & rapportage mogelijk. Leer meer over %s Ecommerce Analytics%s.",
+ "PiwikOffersEcommerceAnalytics": "In Piwik is een geavanceerde Ecommerce Analytics tracking & rapportage mogelijk. Leer meer over %1$s Ecommerce Analytics%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik sluit automatisch veelvoorkomende sessie parameters uit (%s).",
"PluginDescription": "Website beheer laat je toe nieuwe",
"SearchCategoryDesc": "Piwik kan ook de zoekcategorieën bijhouden voor elk zoekwoord gebruikt op de lokale zoekmachine.",
diff --git a/plugins/SitesManager/lang/pl.json b/plugins/SitesManager/lang/pl.json
index 24e8b1f376ab6ab2b5ca3634c57f4760084e576d..860504911722b4da18df209c956fa72db6a265b0 100644
--- a/plugins/SitesManager/lang/pl.json
+++ b/plugins/SitesManager/lang/pl.json
@@ -12,8 +12,8 @@
"DeleteConfirm": "Czy jesteś pewien, że chcesz skasować stronę %s?",
"ExceptionDeleteSite": "Nie jest możliwe skasowanie tej strony jako takiej tylko zarejestrowanej strony. Najpierw dodaj nową stronę, a wtedy dopiero skasuj tę jedną.",
"ExceptionEmptyName": "Nazwa strony internetowej nie może być pusta.",
- "ExceptionInvalidCurrency": "Podana waluta \"%s\" jest nieprawidłowa. Proszę wprowadzić poprawny symbol waluty (np. %s)",
- "ExceptionInvalidIPFormat": "Adres IP do wykluczenia \"%s\" nie ma prawidłowego formatu IP (np. %s).",
+ "ExceptionInvalidCurrency": "Podana waluta \"%1$s\" jest nieprawidłowa. Proszę wprowadzić poprawny symbol waluty (np. %2$s)",
+ "ExceptionInvalidIPFormat": "Adres IP do wykluczenia \"%1$s\" nie ma prawidłowego formatu IP (np. %2$s).",
"ExceptionInvalidTimezone": "Strefa czasowa \"%s\" jest niepoprawna. Proszę wprowadzić poprawną strefę czasową.",
"ExceptionInvalidUrl": "Adres url '%s' nie jest poprawnym adresem URL.",
"ExceptionNoUrl": "Musisz określić przynajmniej jeden adres URL dla strony serwisu.",
diff --git a/plugins/SitesManager/lang/pt-br.json b/plugins/SitesManager/lang/pt-br.json
index 8a369406ffe43cac3f191b06cd3368fbfe7dc2eb..db3421b966fab87e1214553f9e69e2359f118fa0 100644
--- a/plugins/SitesManager/lang/pt-br.json
+++ b/plugins/SitesManager/lang/pt-br.json
@@ -19,8 +19,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Se você precisa excluir diferentes user agents para websites distintos, marque esta caixa, clique em salvar e %1$sadicione os user agents acima%2$s.",
"ExceptionDeleteSite": "Não é possÃvel excluir este website já que ele é o único website registrado. Adiicone um novo website primeiro, depois exclua este.",
"ExceptionEmptyName": "O nome do site não pode ficar vazio.",
- "ExceptionInvalidCurrency": "A moeda \"%s\" não é válida. Por favor inserir um sÃmbolo monetário válido (ex. %s)",
- "ExceptionInvalidIPFormat": "O IP para excluir \"%s\" não tem um formatio de IP válido (ex. %s)",
+ "ExceptionInvalidCurrency": "A moeda \"%1$s\" não é válida. Por favor inserir um sÃmbolo monetário válido (ex. %2$s)",
+ "ExceptionInvalidIPFormat": "O IP para excluir \"%1$s\" não tem um formatio de IP válido (ex. %2$s)",
"ExceptionInvalidTimezone": "O fuso-horário \"%s\" não é válido. Por favor inserir um fuso-horário válido.",
"ExceptionInvalidUrl": "A URL '%s' não é uma URL válida.",
"ExceptionNoUrl": "Você precisa especificar no mÃnimo uma URL para o site.",
@@ -48,7 +48,7 @@
"NotFound": "Nenhum site encontrado para",
"NoWebsites": "Você não tem nenhum site para administrar.",
"OnlyOneSiteAtTime": "Você pode editar um website por vez. Por favor salve ou cancele as modificações do website atual %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik permite análises avançadas de rastreamento e relatórios de comércio eletrônico. Saiba mais sobre %s Análise de E-comerce%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik permite análises avançadas de rastreamento e relatórios de comércio eletrônico. Saiba mais sobre %1$s Análise de E-comerce%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik excluirá automaticamente a sessão comum de parâmetros (%s).",
"PluginDescription": "Gerenciamento de sites permite que você adicione um novo site e edite sites existentes.",
"SearchCategoryDesc": "Piwik também pode acompanhar a categoria de Busca para cada Palavra-chave de busca interna no site.",
@@ -58,7 +58,7 @@
"SearchKeywordParametersDesc": "Insira uma lista separada por vÃrgulas de todos os nomes de parâmetro de consulta que contenham a palavra-chave de busca do site.",
"SearchParametersNote": "Nota: os parâmetros de consulta e parâmetros Categoria serão usados apenas para sites que possuem Site Search ativado, mas deixou esses parâmetros vazio.",
"SearchParametersNote2": "Para desativar Site Search para novos sites, deixe esses dois campos vazios.",
- "SearchUseDefault": "Usar parâmetros de pesquisa %spadrão%s",
+ "SearchUseDefault": "Usar parâmetros de pesquisa %1$spadrão%2$s",
"SelectACity": "Selecione uma cidade",
"SelectDefaultCurrency": "Você pode selecionar a moeda corrente para ser setada como padrão para novos websites",
"SelectDefaultTimezone": "Você pode selecionar o fuso-horário para ser selecionado como padrão pra novos websites.",
@@ -67,8 +67,10 @@
"SiteSearchUse": "Você pode utilizar o Piwik para acompanhar e informar o que os visitantes estão procurando no motor de pesquisa interna do seu site.",
"SiteWithoutDataTitle": "Ainda não há dados gravados",
"SiteWithoutDataDescription": "Ainda não há dados de análises de rastreamentos para este website",
- "SiteWithoutDataSetupTracking": "Por favor configure o %1$scódigo de rastreamento JavaScript%2$s no seu website e recarregue a página.",
- "SuperUserAccessCan": "Um usuário com privilégio de Super Usuário também pode %s especificar configurações globais%s para novos sites.",
+ "SiteWithoutDataSetupTracking": "Por favor, configure o %1$scódigo de rastreamento JavaScript%2$s em seu website, caso ainda não tenha feito.",
+ "SiteWithoutDataMessageDisappears": "Esta mensagem vai desaparecer assim que alguns dados foram rastreados para este site.",
+ "SiteWithoutDataSetupGoals": "Por enquanto, talvez você queira %1$sdefinir algumas metas%2$s.",
+ "SuperUserAccessCan": "Um usuário com privilégio de Super Usuário também pode %1$s especificar configurações globais%2$s para novos sites.",
"Timezone": "Fuso horário",
"TrackingSiteSearch": "Acompanhamento de pesquisa interna do site",
"TrackingTags": "Rastreando tags para %s",
@@ -76,6 +78,7 @@
"UTCTimeIs": "UTC tempo é %s.",
"OnlyMatchedUrlsAllowed": "Rastreia visitas e ações apenas quando a URL da ação começa com uma das URLs acima.",
"OnlyMatchedUrlsAllowedHelp": "Quando ativado, Piwik só irá rastrear ações internas quando a URL da página for uma das URLs reconhecidas para o seu website. Isso impede que pessoas enviem spams para a sua análise com URLs de outros websites.",
+ "OnlyMatchedUrlsAllowedHelpExamples": "O domÃnio e o caminho têm que corresponder exatamente e cada subdomÃnio válido tem de ser especificado separadamente. Por exemplo, quando as URLs são 'http:\/\/example.com\/path' e 'http:\/\/good.example.com', solicitações de rastreamento para http:\/\/example.com\/otherpath' ou 'http:\/\/bad.example.com' são ignoradas.",
"WebsitesManagement": "Gerenciamento de Sites",
"XManagement": "Gerenciar %s",
"ChooseMeasurableTypeHeadline": "O que você gostaria de medir?",
diff --git a/plugins/SitesManager/lang/pt.json b/plugins/SitesManager/lang/pt.json
index 02634e1c226daa771b850edfdb7709fc7f40c0d0..9beb152bfdd8569c43900745c2ddb1569de076d7 100644
--- a/plugins/SitesManager/lang/pt.json
+++ b/plugins/SitesManager/lang/pt.json
@@ -14,8 +14,8 @@
"EnableEcommerce": "Comércio Electrónico activado",
"ExceptionDeleteSite": "Não é possÃvel eliminar este website visto ser o único website registado. Adicione um novo website primeiro, depois elimine este.",
"ExceptionEmptyName": "O nome do website não pode ficar vazio.",
- "ExceptionInvalidCurrency": "A moeda \"%s\" não é válida. Por favor introduza um sÃmbolo de moeda válido (por ex. %s).",
- "ExceptionInvalidIPFormat": "O IP para excluir \"%s\" não tem um formato de IP válido (por ex. %s).",
+ "ExceptionInvalidCurrency": "A moeda \"%1$s\" não é válida. Por favor introduza um sÃmbolo de moeda válido (por ex. %2$s).",
+ "ExceptionInvalidIPFormat": "O IP para excluir \"%1$s\" não tem um formato de IP válido (por ex. %2$s).",
"ExceptionInvalidTimezone": "O fuso horário \"%s\" não é válido. Por favor introduza um fuso horário válido.",
"ExceptionInvalidUrl": "O endereço '%s' não é válido.",
"ExceptionNoUrl": "Tem de especificar no mÃnimo um endereço para o website.",
@@ -34,7 +34,7 @@
"NotFound": "Nenhum website encontrado para",
"NoWebsites": "Não tem nenhum website para administrar.",
"OnlyOneSiteAtTime": "Você só pode editar um site de cada vez. Por favor, Salvar ou Cancelar as modificações atuais para o website %s.",
- "PiwikOffersEcommerceAnalytics": "O Piwik permite a análise e relatórios avançados de rastreamento de Comércio Electrónico . Saiba mais sobre %s Rastreamento de Comércio Electrónico %s.",
+ "PiwikOffersEcommerceAnalytics": "O Piwik permite a análise e relatórios avançados de rastreamento de Comércio Electrónico . Saiba mais sobre %1$s Rastreamento de Comércio Electrónico %2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik exclui automaticamente parâmetros comuns de sessões (%s).",
"SelectACity": "Seleccione uma cidade",
"SelectDefaultCurrency": "Pode seleccionar a moeda para ser pré-definida em websites novos.",
diff --git a/plugins/SitesManager/lang/ro.json b/plugins/SitesManager/lang/ro.json
index 7ebe9f0be2dbfcb483343f009bab91317444bfec..17d34f7ba664677b59335e77ec65a0b21f64b1f5 100644
--- a/plugins/SitesManager/lang/ro.json
+++ b/plugins/SitesManager/lang/ro.json
@@ -18,8 +18,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Dacă aveți nevoie să excludeți diferiti agentii utilizator d pentru diferite site-uri, bifați această casetă, faceți clic pe Salvare și % %1$s adaugati agenții de utilizator de mai sus %2$s.",
"ExceptionDeleteSite": "Nu este posibil să ștergeți acest site, acesta este singurul website-ul înregistrat. Adauga un nou site web în primul rând, apoi ștergel pe asta.",
"ExceptionEmptyName": "The site name can't be empty.",
- "ExceptionInvalidCurrency": "Moneda \"%s\" nu este valida. Vă rugăm să introduceți un simbol monetar valabil (de exemplu %s)",
- "ExceptionInvalidIPFormat": "IP de a exclude \"%s\" nu are un format valid de IP (de exemplu %s).",
+ "ExceptionInvalidCurrency": "Moneda \"%1$s\" nu este valida. Vă rugăm să introduceți un simbol monetar valabil (de exemplu %2$s)",
+ "ExceptionInvalidIPFormat": "IP de a exclude \"%1$s\" nu are un format valid de IP (de exemplu %2$s).",
"ExceptionInvalidTimezone": "Fusul orar \"%s\" nu este valid. Vă rugăm să introduceți un fus orar valid.",
"ExceptionInvalidUrl": "Url-ul '%s' nu este o adresă URL validă.",
"ExceptionNoUrl": "You must specify at least one URL for the site.",
@@ -47,7 +47,7 @@
"NotFound": "Nu sunt website-uri găsite pentru",
"NoWebsites": "Nu aveți nici un site web pentru a administra.",
"OnlyOneSiteAtTime": "Puteți edita un singur site-ul la un moment dat. Vă rugăm să salvați sau anulati modificările dvs. curente de pe site-ul %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik permite pentru comerț electronic analiza de urmărire și de raportare. Aflați mai multe despre %s comerț electronic %s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik permite pentru comerț electronic analiza de urmărire și de raportare. Aflați mai multe despre %1$s comerț electronic %2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik va exclude în mod automat parametrii comuni de sesiune (%s).",
"SearchCategoryDesc": "Piwik poate urmări, de asemenea, categoria de căutare pentru fiecare website cuvânt cheie din cautarea interna.",
"SearchCategoryLabel": "Parametru categorie",
@@ -56,14 +56,14 @@
"SearchKeywordParametersDesc": "Introduceți o virgula pentru a separa lista de toti parametrilor de interogare care conțin cuvantul cheie cautat te website.",
"SearchParametersNote": "Notă: parametrii de interogare și parametrii Categorie vor fi folosite numai pentru site-urile care au functia de Cautare activata dar a lăsat acești parametri goli.",
"SearchParametersNote2": "Pentru a dezactiva cautare Site pentru site-uri noi, lăsați aceste două câmpuri goale.",
- "SearchUseDefault": "Utiliza %simplicite%s parametri site cautare",
+ "SearchUseDefault": "Utiliza %1$simplicite%2$s parametri site cautare",
"SelectACity": "Selectează un oraş",
"SelectDefaultCurrency": "Puteți selecta moneda în mod implicit pentru site-uri noi",
"SelectDefaultTimezone": "Puteți selecta fusul orar pentru a selecta în mod implicit pentru noul site.",
"ShowTrackingTag": "Vizionare cod de urmarire",
"Sites": "Siteuri",
"SiteSearchUse": "Puteți utiliza Piwik pentru a urmări și raporta ceea ce vizitatorii cauta în motorul de căutare intern al site-ul dvs..",
- "SuperUserAccessCan": "Un utilizator cu acces la Super Utilizatorul poate, de asemenea,%s specifica setări globale%s pentru site-uri noi.",
+ "SuperUserAccessCan": "Un utilizator cu acces la Super Utilizatorul poate, de asemenea,%1$s specifica setări globale%2$s pentru site-uri noi.",
"Timezone": "Fus orar",
"TrackingSiteSearch": "Urmărire cautare interna a site-lui",
"TrackingTags": "Codul de urmărire pentru %s",
diff --git a/plugins/SitesManager/lang/ru.json b/plugins/SitesManager/lang/ru.json
index d266cb457effdd83cf1aa11c19487aae97de133c..db55be9cfcea130d546f717982329d5fe12ce868 100644
--- a/plugins/SitesManager/lang/ru.json
+++ b/plugins/SitesManager/lang/ru.json
@@ -18,8 +18,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "ЕÑли нужно иÑключить разные агенты пользователей (user agents) Ð´Ð»Ñ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ñ‹Ñ… веб-Ñайтов, уÑтановите Ñтот флажок, нажмите кнопку Ñохранить и %1$sдобавьте пользовательÑкие агенты Ñверху%2$s.",
"ExceptionDeleteSite": "Ðевозможно удалить, так как Ñто единÑтвенный Ñайт в вашем ÑпиÑке. Добавьте еще какой-нибудь Ñайт Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾.",
"ExceptionEmptyName": "Ðазвание Ñайта не может быть пуÑтое.",
- "ExceptionInvalidCurrency": "Валюта \"%s\" не верна. ПожалуйÑта, введите правильный Ñимвол валюты (напр., %s)",
- "ExceptionInvalidIPFormat": "IP Ð´Ð»Ñ ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ \"%s\" не имеет правильный IP формат (напр., %s).",
+ "ExceptionInvalidCurrency": "Валюта \"%1$s\" не верна. ПожалуйÑта, введите правильный Ñимвол валюты (напр., %2$s)",
+ "ExceptionInvalidIPFormat": "IP Ð´Ð»Ñ ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ \"%1$s\" не имеет правильный IP формат (напр., %2$s).",
"ExceptionInvalidTimezone": "ЧаÑовой поÑÑ \"%s\" не верен. ПожалуйÑта, введите правильный.",
"ExceptionInvalidUrl": "URL '%s' не верен.",
"ExceptionNoUrl": "Ð’Ñ‹ должны указать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ один URL Ð´Ð»Ñ Ñтого Ñайта.",
@@ -47,7 +47,7 @@
"NotFound": "Ðе найдено Ñайтов длÑ",
"NoWebsites": "Ð’Ñ‹ не имеете ни одного Ñайта на учете.",
"OnlyOneSiteAtTime": "Ð’Ñ‹ можете только редактировать один Ñайт в одно и то же времÑ. ПожалуйÑта, Ñохраните или отмените ваши текущие Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ðº Ñайту %s.",
- "PiwikOffersEcommerceAnalytics": "Ðта Ð¾Ð¿Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть иÑпользована Ð´Ð»Ñ Ð°Ð½Ð°Ð»Ð¸Ñ‚Ð¸ÐºÐ¸ интернет-магазинов и Ñлектронных заказов. Больше информации – здеÑÑŒ: %s Ðналитика Ñл. коммерции%s.",
+ "PiwikOffersEcommerceAnalytics": "Ðта Ð¾Ð¿Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть иÑпользована Ð´Ð»Ñ Ð°Ð½Ð°Ð»Ð¸Ñ‚Ð¸ÐºÐ¸ интернет-магазинов и Ñлектронных заказов. Больше информации – здеÑÑŒ: %1$s Ðналитика Ñл. коммерции%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Веб-аналитика будет автоматичеÑки изымать необходимые параметры ÑеÑÑии (%s).",
"PluginDescription": "Управление вебÑайтами позволÑет добавлÑÑ‚ÑŒ и редактировать их.",
"SearchCategoryDesc": "Piwik также может отÑлеживать категорию поиÑка Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ Ñлова, которое ищут на вашем Ñайте в поиÑке.",
@@ -57,14 +57,14 @@
"SearchKeywordParametersDesc": "Введите ÑпиÑок параметров, которые Ñодержат ключевые Ñлова поиÑка по Ñайту (через запÑтую).",
"SearchParametersNote": "ПодÑказка: параметры запроÑа и категории будут иÑпользованы только Ð´Ð»Ñ Ñайтов, которые имеют внутренний поиÑк и включили отÑлеживание поиÑка, но оÑтавили Ñти параметры пуÑтыми (нетронутыми).",
"SearchParametersNote2": "Чтобы отключить функции отÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð¸Ñка по Ñайту Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… Ñайтов, оÑтавьте Ñти два Ð¿Ð¾Ð»Ñ Ð¿ÑƒÑтыми.",
- "SearchUseDefault": "ИÑпользовать %sдефолтные%s параметры поиÑка по Ñайту",
+ "SearchUseDefault": "ИÑпользовать %1$sдефолтные%2$s параметры поиÑка по Ñайту",
"SelectACity": "Выбрать город",
"SelectDefaultCurrency": "Ð’Ñ‹ можете уÑтановить валюту по умолчанию Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… Ñайтов.",
"SelectDefaultTimezone": "Ð’Ñ‹ можете уÑтановить чаÑовой поÑÑ Ð¿Ð¾ умолчанию Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… Ñайтов.",
"ShowTrackingTag": "Показать код",
"Sites": "Сайты",
"SiteSearchUse": "Ð’Ñ‹ можете иÑпользовать Piwik Ð´Ð»Ñ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¸ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð°Ð½Ð°Ð»Ð¸Ñ‚Ð¸ÐºÐ¸ по тому, что ищут поÑетители на вашем Ñайте иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¾Ð½Ð°Ð» Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ³Ð¾ поиÑка по Ñайту.",
- "SuperUserAccessCan": "Пользователь Ñ Ð¿Ñ€Ð°Ð²Ð°Ð¼Ð¸ ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¼Ð¾Ð¶ÐµÑ‚ также %sуказать общие наÑтройки%s Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… веб-Ñайтов.",
+ "SuperUserAccessCan": "Пользователь Ñ Ð¿Ñ€Ð°Ð²Ð°Ð¼Ð¸ ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¼Ð¾Ð¶ÐµÑ‚ также %1$sуказать общие наÑтройки%2$s Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… веб-Ñайтов.",
"Timezone": "ЧаÑовой поÑÑ",
"TrackingSiteSearch": "ОтÑлеживать внутренний поиÑк по Ñайту",
"TrackingTags": "Код отÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ %s",
diff --git a/plugins/SitesManager/lang/sq.json b/plugins/SitesManager/lang/sq.json
index f13986480da96957f74e1f41aff6acf33788430a..cef6614882c9dc249eea189d01d7361288d71cc2 100644
--- a/plugins/SitesManager/lang/sq.json
+++ b/plugins/SitesManager/lang/sq.json
@@ -17,8 +17,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Nëse ju duhet të përjashtoni agjentë të ndryshëm përdoruesi për sajte të ndryshëm, i vini shenjë kësaj kutize, klikoni mbi Ruaje dhe %1$sshtojeni agjentin e përdoruesi më sipër%2$s.",
"ExceptionDeleteSite": "Heqja e këtij sajti s’është e mundur, ngaqë është i vetmi sajt i regjistruar. Së pari, shtoni një sajt të ri, mandej hiqni këtë këtu.",
"ExceptionEmptyName": "Sajti s’mund të jetë i zbrazët.",
- "ExceptionInvalidCurrency": "Monedha \"%s\" nuk është një nga të vlefshmet. Ju lutemi, jepni një simbol monedhe të vlefshme (p.sh. %s).",
- "ExceptionInvalidIPFormat": "IP-ja që duhet përjashtuar \"%s\" s’ka format të vlefshëm IP-sh (p.sh. %s).",
+ "ExceptionInvalidCurrency": "Monedha \"%1$s\" nuk është një nga të vlefshmet. Ju lutemi, jepni një simbol monedhe të vlefshme (p.sh. %2$s).",
+ "ExceptionInvalidIPFormat": "IP-ja që duhet përjashtuar \"%1$s\" s’ka format të vlefshëm IP-sh (p.sh. %2$s).",
"ExceptionInvalidTimezone": "Zona kohore \"%s\" s’është një nga të vlefshmet. Ju lutemi, jepni një zonë kohore të vlefshme.",
"ExceptionInvalidUrl": "Url-ja '%s' s’është URL e vlefshme.",
"ExceptionNoUrl": "Duhet të tregoni të paktën një URL për sajtin.",
@@ -43,7 +43,7 @@
"NotFound": "S’u gjetën sajte për",
"NoWebsites": "S’keni ndonjë sajt për ta administruar.",
"OnlyOneSiteAtTime": "Mund të përpunoni vetëm një sajt në herë. Ju lutemt, Ruani ose Anuloni ndryshimet tuaja të tanishme te sajti %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik-u ju mundëson ndjekje & raportim të thelluar Analizash E-tregtie. Mësoni më tepër rreth %s Analizash E-tregtie%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik-u ju mundëson ndjekje & raportim të thelluar Analizash E-tregtie. Mësoni më tepër rreth %1$s Analizash E-tregtie%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik-u do t’i përjashtojë vetvetiu parametrat e zakonshëm të sesioneve (%s).",
"PluginDescription": "Administrimi i sajteve ju lejon të shtoni sajt të ri dhe të përpunoni sajte ekzistues.",
"SearchCategoryLabel": "Parametër kategorie",
@@ -51,7 +51,7 @@
"SearchKeywordLabel": "Parametër kërkese",
"SearchKeywordParametersDesc": "Jepni një listë emrash parametrash kërkese fjalëkyçesh kërkimi në sajt, ndarë me presje.",
"SearchParametersNote2": "Për ta çaktivizuar për sajtet e reja Kërkimin te Sajti, lërini të zbrazëta këto dy fusha.",
- "SearchUseDefault": "Përdor parametra %sparazgjedhje%s Kërkimi në Sajt",
+ "SearchUseDefault": "Përdor parametra %1$sparazgjedhje%2$s Kërkimi në Sajt",
"SelectACity": "Përzgjidhni një qytet",
"SelectDefaultCurrency": "Mund të përzgjidhni monedhën parazgjedhje për sajtet e rinj.",
"SelectDefaultTimezone": "Mund të përzgjidhni zonën kohore parazgjedhje për sajtet e rinj.",
diff --git a/plugins/SitesManager/lang/sr.json b/plugins/SitesManager/lang/sr.json
index 5d6605c4aa76074e624f49bb0ff2c6e8cff7662e..06529fa19c5b7fc86b1cc62c75f31d647db9bde0 100644
--- a/plugins/SitesManager/lang/sr.json
+++ b/plugins/SitesManager/lang/sr.json
@@ -19,8 +19,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Ukoliko želite da iskljuÄite razliÄite korisniÄke agente za razliÄite sajtove, kliknite ovde, kliknite na SaÄuvaj i %1$sdodajte korisniÄke agente%2$s.",
"ExceptionDeleteSite": "Nije moguće obrisati ovaj sajt pošto je to jedini prijavljeni sajt. Najpre dodajte novi sajt pa tek onda obrišite ovaj.",
"ExceptionEmptyName": "Naziv sajta ne može biti prazan.",
- "ExceptionInvalidCurrency": "Valuta '%s' nije validna. Molimo vas da upišete validan simbol za valutu (npr. %s)",
- "ExceptionInvalidIPFormat": "IP adresa \"%s\" nije u validnom obliku (npr. %s).",
+ "ExceptionInvalidCurrency": "Valuta '%1$s' nije validna. Molimo vas da upišete validan simbol za valutu (npr. %2$s)",
+ "ExceptionInvalidIPFormat": "IP adresa \"%1$s\" nije u validnom obliku (npr. %2$s).",
"ExceptionInvalidTimezone": "Vremenska zona '%s' nije validna. Molimo vas da upišete validnu vremensku zonu.",
"ExceptionInvalidUrl": "Adresa '%s' nije validna.",
"ExceptionNoUrl": "Morate navesti barem jednu adresu po sajtu.",
@@ -48,7 +48,7 @@
"NotFound": "Nije nađen nijedan sajt za",
"NoWebsites": "Nemate nijedan sajt",
"OnlyOneSiteAtTime": "U jednom trenutku možete raditi samo sa jednim sajtom. Molimo vas da snimite ili poništite izmene vezane za sajt %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik omogućuje napredno praćenje i izveštavanje u pogledu elektronskih porudžbina. Saznajte više na %s Ecommerce Analytics%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik omogućuje napredno praćenje i izveštavanje u pogledu elektronskih porudžbina. Saznajte više na %1$s Ecommerce Analytics%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik će automatski izuzeti uobiÄajene parametre sesije (%s)",
"PluginDescription": "Upravljanje sajtovima vam omogućuje da dodajete nove sajtove i menjate postojeće,",
"SearchCategoryDesc": "Piwik takoÄ‘e može i da prati kategorije pretrage za svaku kljuÄnu reÄ.",
@@ -58,7 +58,7 @@
"SearchKeywordParametersDesc": "UpiÅ¡ite sve parametre upita koji sadrže kljuÄne reÄi pretrage razdvojene zarezima.",
"SearchParametersNote": "Pažnja: parametri upita i kategorija će biti korišćeni samo za sajtove koji imaju ukljuÄeno pretraživanje-",
"SearchParametersNote2": "Ukoliko želite da iskljuÄite pretraživanje za nove sajtove, ostavite ova dva polja prazna.",
- "SearchUseDefault": "Koristi %spodrazumevana%s podešavanja za pretraživanje",
+ "SearchUseDefault": "Koristi %1$spodrazumevana%2$s podešavanja za pretraživanje",
"SelectACity": "Izaberite grad",
"SelectDefaultCurrency": "Možete izabrati koja će biti podrazumevana valuta za nove sajtove.",
"SelectDefaultTimezone": "Možete izabrati koja će biti podrazumevana vremenska zona za nove sajtove.",
@@ -67,8 +67,7 @@
"SiteSearchUse": "Možete koristiti Piwik za praćenje i kreiranje izveštaja o tome šta posetioci traže na vašem sajtu koristeći polje za pretragu.",
"SiteWithoutDataTitle": "Nikakvi podaci do sad nisu zabeleženi",
"SiteWithoutDataDescription": "JoÅ¡ uvek nema analitiÄkih podataka za ova sajt.",
- "SiteWithoutDataSetupTracking": "Molimo vas da podesite %1$sJavaScript kod za praćenje%2$s na vaÅ¡em sajtu i da ponovo uÄitate stranicu.",
- "SuperUserAccessCan": "Korisnik sa superkorisniÄkim nivoom pristupa može i da %spostavi globalna podeÅ¡avanja%s za nove sajtove.",
+ "SuperUserAccessCan": "Korisnik sa superkorisniÄkim nivoom pristupa može i da %1$spostavi globalna podeÅ¡avanja%2$s za nove sajtove.",
"Timezone": "Vremenska zona",
"TrackingSiteSearch": "Praćenje pretraživanja sajta",
"TrackingTags": "Kod za praćenje za %s",
diff --git a/plugins/SitesManager/lang/sv.json b/plugins/SitesManager/lang/sv.json
index 90f8f357fbcccd10038b15392fa0f7db7c56e1ba..556eb2f3acb8be4ae76859a88d33a75048172559 100644
--- a/plugins/SitesManager/lang/sv.json
+++ b/plugins/SitesManager/lang/sv.json
@@ -19,8 +19,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Kryssa i den här rutan om du vill utesluta olika användaraganter (user agents) för olika webbplatser, klicka sen på spara och %1$slägg till användaragenterna här ovanför%2$s.",
"ExceptionDeleteSite": "Det är inte möjligt att radera denna webbplats eftersom det är det enda registrerade webbplatsen. Lägg till en ny webbplats först och ta sedan bort den här.",
"ExceptionEmptyName": "Webbplatsens namn kan inte vara tomt.",
- "ExceptionInvalidCurrency": "Valutan \"%s\" är inte giltig. Vänligen ange en giltig valutasymbol (t.ex. %s)",
- "ExceptionInvalidIPFormat": "IP-adresser som ska exkluderas \"%s\" har inte ett giltig format (t.ex. %s).",
+ "ExceptionInvalidCurrency": "Valutan \"%1$s\" är inte giltig. Vänligen ange en giltig valutasymbol (t.ex. %2$s)",
+ "ExceptionInvalidIPFormat": "IP-adresser som ska exkluderas \"%1$s\" har inte ett giltig format (t.ex. %2$s).",
"ExceptionInvalidTimezone": "Tidszonen \"%s\" är inte giltig. Vänligen ange en giltig tidszon.",
"ExceptionInvalidUrl": "Den angivna URL'n är inte giltig: '%s'.",
"ExceptionNoUrl": "Du måste åtminstone specifiera en URL för denna webbplats.",
@@ -48,7 +48,7 @@
"NotFound": "Inga webbplatser funna",
"NoWebsites": "Du har inga webbplatser att administrera.",
"OnlyOneSiteAtTime": "Du kan endast redigera en webbplats åt gången. Vänligen spara eller avbryt dina ändringar för denna webbplats (%s).",
- "PiwikOffersEcommerceAnalytics": "Piwik möjliggör för avancerad e-handelsspårning och rapportering. Läs mer om %s E-handelsspårning%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik möjliggör för avancerad e-handelsspårning och rapportering. Läs mer om %1$s E-handelsspårning%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik kommer automatiskt att exkludera de vanligaste sessions parametrarna (%s).",
"PluginDescription": "Webbplatsadministration låter dig skapa nya webbplatser och redigera befintliga.",
"SearchCategoryDesc": "Piwik kan även spåra kategorierna för varje nyckelord i webbplatssökningar.",
@@ -58,7 +58,7 @@
"SearchKeywordParametersDesc": "Ange en kommaseparerad lista med alla parameternamn som innehåller webbplatssökningens nyckelord.",
"SearchParametersNote": "Notera: Parametrar för frågor och kategori kommer endast användas för webbplatser som har webbplatssökning aktiverat men lämnade dessa parametrar tomma.",
"SearchParametersNote2": "Lämna dom här två fälten tomma för att avaktivera webbplatssökning för nya webbplatser.",
- "SearchUseDefault": "Använd %sstandardparametrar%s för webbplatssökning",
+ "SearchUseDefault": "Använd %1$sstandardparametrar%2$s för webbplatssökning",
"SelectACity": "Välj en stad",
"SelectDefaultCurrency": "Du kan välja standardvaluta för nya webbplatser.",
"SelectDefaultTimezone": "Du kan välja standard tidszon för nya webbplatser.",
@@ -67,8 +67,8 @@
"SiteSearchUse": "Du kan använda Piwik för att spåra och rapportera om vad besökarna söker efter med din webbplats interna sökmotor.",
"SiteWithoutDataTitle": "Inga data har samlats in än",
"SiteWithoutDataDescription": "Inga data har samlats in för denna webbplats än.",
- "SiteWithoutDataSetupTracking": "Lägg till %1$sJavaScript spårningskod%2$s i din webbplats och ladda om sidan.",
- "SuperUserAccessCan": "En användare med Superbehörighet kan också %s specificera globala inställningar%s för nya webbsidor.",
+ "SiteWithoutDataMessageDisappears": "Detta meddelande kommer visas tills data samlats in för denna webbsida.",
+ "SuperUserAccessCan": "En användare med Superbehörighet kan också %1$s specificera globala inställningar%2$s för nya webbsidor.",
"Timezone": "Tidszon",
"TrackingSiteSearch": "Spåra webbplatsens interna sökfunktion",
"TrackingTags": "Spårningskod för %s",
diff --git a/plugins/SitesManager/lang/th.json b/plugins/SitesManager/lang/th.json
index 1dd6f91257be5370969e23f03c5faf22524b49fa..6fd7767c4a72c768a5864b4d19da073faf8e5a04 100644
--- a/plugins/SitesManager/lang/th.json
+++ b/plugins/SitesManager/lang/th.json
@@ -12,8 +12,8 @@
"DeleteConfirm": "คุณà¹à¸™à¹ˆà¹ƒà¸ˆà¸—ี่จะลบเว็บไซต์ %s หรืà¸à¹„ม่?",
"ExceptionDeleteSite": "ไม่สามารถลบได้ หาà¸à¸„ุณมีเว็บไซต์ที่ลงทะเบียนไว้เพียงเว็บเดียว เพิ่มเว็บไซต์ใหม่à¸à¹ˆà¸à¸™à¸—ี่จะทำà¸à¸²à¸£à¸¥à¸šà¹€à¸§à¹‡à¸šà¹„ซต์นี้",
"ExceptionEmptyName": "ชื่à¸à¸‚à¸à¸‡à¹„ซต์ไม่สามารถเว้นว่างไว้ได้",
- "ExceptionInvalidCurrency": "สà¸à¸¸à¸¥à¹€à¸‡à¸´à¸™à¸—ี่ \"%s\" ไม่ถูà¸à¸•à¹‰à¸à¸‡ à¸à¸£à¸¸à¸“าป้à¸à¸™à¸ªà¸±à¸à¸¥à¸±à¸à¸©à¸“์สà¸à¸¸à¸¥à¹€à¸‡à¸´à¸™à¸—ี่ถูà¸à¸•à¹‰à¸à¸‡ (เช่น %s)",
- "ExceptionInvalidIPFormat": "IP เพื่à¸à¹à¸¢à¸ \"%s\" ไม่มีรูปà¹à¸šà¸š IP ที่ถูà¸à¸•à¹‰à¸à¸‡ (เช่น %s)",
+ "ExceptionInvalidCurrency": "สà¸à¸¸à¸¥à¹€à¸‡à¸´à¸™à¸—ี่ \"%1$s\" ไม่ถูà¸à¸•à¹‰à¸à¸‡ à¸à¸£à¸¸à¸“าป้à¸à¸™à¸ªà¸±à¸à¸¥à¸±à¸à¸©à¸“์สà¸à¸¸à¸¥à¹€à¸‡à¸´à¸™à¸—ี่ถูà¸à¸•à¹‰à¸à¸‡ (เช่น %2$s)",
+ "ExceptionInvalidIPFormat": "IP เพื่à¸à¹à¸¢à¸ \"%1$s\" ไม่มีรูปà¹à¸šà¸š IP ที่ถูà¸à¸•à¹‰à¸à¸‡ (เช่น %2$s)",
"ExceptionInvalidTimezone": "โซนเวลา \"%s\" นั้นไม่ถูà¸à¸•à¹‰à¸à¸‡ à¸à¸£à¸¸à¸“าà¸à¸£à¸à¸à¹ƒà¸«à¹‰à¸–ูà¸à¸•à¹‰à¸à¸‡à¸”้วย",
"ExceptionInvalidUrl": "URL ดังà¸à¸¥à¹ˆà¸²à¸§ '%s' ไม่สามารถใช้ได้",
"ExceptionNoUrl": "คุณต้à¸à¸‡à¸£à¸°à¸šà¸¸ URL เว็บไซต์à¸à¸¢à¹ˆà¸²à¸‡à¸™à¹‰à¸à¸¢ 1 URL",
diff --git a/plugins/SitesManager/lang/tl.json b/plugins/SitesManager/lang/tl.json
index 77d782e4b57fa6d37d917ebf1af2a935071d7cdd..ba3f5ee3d6662f68c1c2a9e2a0dda9b059a14e43 100644
--- a/plugins/SitesManager/lang/tl.json
+++ b/plugins/SitesManager/lang/tl.json
@@ -18,8 +18,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Kung kailangan mo upang ibukod ang iba't ibang mga user agent na gumagamit para sa iba't ibang mga website e-check ang box na ito i-click ang save at %1$sidagdag ang user agents sa itaas%2$s",
"ExceptionDeleteSite": "Ito ay hindi pwedeng tanggalin sa website dahil ito ay ang tanging kaisa-isahang rehistradong wesbite. Mag-dagdag muna ng isang bagong website pagkatapos tanggalin na ang isang ito.",
"ExceptionEmptyName": "Ang pangalan ng website ay hindi maaring walang laman.",
- "ExceptionInvalidCurrency": "Ang currency \"%s\" ay hindi tama. Mangyarin ilagay ang tamang currency symbol (hal. %s).",
- "ExceptionInvalidIPFormat": "Ang IP upang ibukod ang \"%s\" ay walang wastong format ng IP (hal. %s).",
+ "ExceptionInvalidCurrency": "Ang currency \"%1$s\" ay hindi tama. Mangyarin ilagay ang tamang currency symbol (hal. %2$s).",
+ "ExceptionInvalidIPFormat": "Ang IP upang ibukod ang \"%1$s\" ay walang wastong format ng IP (hal. %2$s).",
"ExceptionInvalidTimezone": "Ang timezone \"%s\" ay hindi wasto. Mangyaring magpasok ng wastong timezone.",
"ExceptionInvalidUrl": "Ang url '%s' ay hindi isang tamang URL.",
"ExceptionNoUrl": "Dapat mong tukuyin kahit isang URL para sa website.",
@@ -46,7 +46,7 @@
"NotFound": "Walang nahanap para sa mga website",
"NoWebsites": "Wala kang anumang website na pamamahalaan.",
"OnlyOneSiteAtTime": "Maaari mo lamang i-edit ang isang website ng isang beses. Mangyaring I-save o Kanselahin iyong kasalukuyang mga pagbabago sa website %s.",
- "PiwikOffersEcommerceAnalytics": "Ang Piwik ay mayroon rin para sa advanced na Ecommerce Analytics tracking & pag-uulat. Matuto nang higit pa tungkol sa %s Ecommerce Analytics%s.",
+ "PiwikOffersEcommerceAnalytics": "Ang Piwik ay mayroon rin para sa advanced na Ecommerce Analytics tracking & pag-uulat. Matuto nang higit pa tungkol sa %1$s Ecommerce Analytics%2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Awtomatikong ibubukod ng Piwik ang mga karaniwang mga session parameter (%s).",
"SearchCategoryDesc": "Ang Piwik ay maaari ring masubaybayan ang mga kategorya ng Paghahanap para sa bawat keyword sa loob na paghahanap sa site.",
"SearchCategoryLabel": "Kategorya ng parameter",
@@ -55,14 +55,14 @@
"SearchKeywordParametersDesc": "Magpasok ng isang comma separated list ng mga pangalan ng lahat ng parameter ng query na naglalaman ng mga keyword sa paghahanap sa site.",
"SearchParametersNote": "Tandaan: ang mga Query parameters at kategorya ng paremeters ay maaari lamang gamitin sa website na may Site Search enabled ngunit hayaang walang mga nakalagay sa mga parameters na ito.",
"SearchParametersNote2": "Upang i-disable ang Site Search para sa mga bagong website iwanan ang dalawang field na ito ng walang laman",
- "SearchUseDefault": "Gamitin ang %sdefault%s na Site Search parameters.",
+ "SearchUseDefault": "Gamitin ang %1$sdefault%2$s na Site Search parameters.",
"SelectACity": "Pumili ng lungsod",
"SelectDefaultCurrency": "Maaari mong piliin ang currency upang i-set ng default para sa mga bagong website.",
"SelectDefaultTimezone": "Maaari mong piliin ang time zone upang piliin ng default para sa mga bagong website.",
"ShowTrackingTag": "Tingnan code ang tracking code",
"Sites": "Websites",
"SiteSearchUse": "Maaari mong gamitin ang Piwik upang sumubay-bay at mag ulat kung ano ang hinahanap ng iyong bisita sa iyong website.",
- "SuperUserAccessCan": "Ang user na may Super User access ay maaari rin na %s mag specify ng global settings%s para sa bagong website.",
+ "SuperUserAccessCan": "Ang user na may Super User access ay maaari rin na %1$s mag specify ng global settings%2$s para sa bagong website.",
"Timezone": "Time zone",
"TrackingSiteSearch": "Pag track sa panloob na paghahanap sa site",
"TrackingTags": "Ang tracking code para sa %s",
diff --git a/plugins/SitesManager/lang/uk.json b/plugins/SitesManager/lang/uk.json
index 9eac2a6812b757444249316d796112eb4e8fec7b..3557821ede537fbd77431554f8ec410ac245bd63 100644
--- a/plugins/SitesManager/lang/uk.json
+++ b/plugins/SitesManager/lang/uk.json
@@ -12,8 +12,8 @@
"DeleteConfirm": "Видалити веб-Ñайт %s?",
"ExceptionDeleteSite": "Ðеможливо видалити цей Ñайт, так Ñк це єдиний зареєÑтрований Ñайт. Додайте новий Ñайт, Ñ– піÑÐ»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ ви отримаєте можливіÑÑ‚ÑŒ видалити цей.",
"ExceptionEmptyName": "Ðазва Ñайту не може бути порожною.",
- "ExceptionInvalidCurrency": "Валюта \"%s\" не вірна. Введіть вірне Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ð°Ð»ÑŽÑ‚ (напр. %s)",
- "ExceptionInvalidIPFormat": "IP-адреÑа Ð´Ð»Ñ Ð²Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ \"%s\" має неправильний формат IP адреÑи (напр. %s).",
+ "ExceptionInvalidCurrency": "Валюта \"%1$s\" не вірна. Введіть вірне Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ð°Ð»ÑŽÑ‚ (напр. %2$s)",
+ "ExceptionInvalidIPFormat": "IP-адреÑа Ð´Ð»Ñ Ð²Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ \"%1$s\" має неправильний формат IP адреÑи (напр. %2$s).",
"ExceptionInvalidTimezone": "ЧаÑовий поÑÑ \"%s\" невірний. Введіть правильний чаÑовий поÑÑ.",
"ExceptionInvalidUrl": "URL-адреÑа невірна: \"%s\".",
"ExceptionNoUrl": "Ви маєте вказати хоча б одину URL-адреÑу Ð´Ð»Ñ Ñайту.",
diff --git a/plugins/SitesManager/lang/vi.json b/plugins/SitesManager/lang/vi.json
index 59516d369e252cb6edbc9375ba27d732f30632d4..3734423888298329939de952264084c508ec9dcf 100644
--- a/plugins/SitesManager/lang/vi.json
+++ b/plugins/SitesManager/lang/vi.json
@@ -18,8 +18,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "Nếu bạn cần phải loại bá» các đại lý khác nhau cho các trang web khác nhau, kiểm tra ô nà y, bấm lÆ°u và %1$s thêm các đại lý ngÆ°á»i dùng %2$s trên .",
"ExceptionDeleteSite": "Nó không thể xóa trang web nà y vì nó là trang web chỉ đăng ký. Thêm một trang web mới đầu tiên, sau đó xóa nó.",
"ExceptionEmptyName": "Tên trang web không thể để trống.",
- "ExceptionInvalidCurrency": "Loại tiá»n tệ \"%s\" không hợp lệ. Xin vui lòng nháºp má»™t biểu tượng tiá»n tệ hợp lệ (và dụ: %s)",
- "ExceptionInvalidIPFormat": "IP để loại trừ \"%s\" không có một định dạng IP hợp lệ (và dụ: %s).",
+ "ExceptionInvalidCurrency": "Loại tiá»n tệ \"%1$s\" không hợp lệ. Xin vui lòng nháºp má»™t biểu tượng tiá»n tệ hợp lệ (và dụ: %2$s)",
+ "ExceptionInvalidIPFormat": "IP để loại trừ \"%1$s\" không có một định dạng IP hợp lệ (và dụ: %2$s).",
"ExceptionInvalidTimezone": "Múi giá» \"%s\" không hợp lệ. Hãy nháºp múi giá» hợp lệ.",
"ExceptionInvalidUrl": "Url '%s' không phải là một URL hợp lệ.",
"ExceptionNoUrl": "Bạn phải chỉ định Ãt nhất má»™t URL cho trang web.",
@@ -47,7 +47,7 @@
"NotFound": "Không có website được tìm thấy cho",
"NoWebsites": "Bạn không có trang web nà o để quản trị",
"OnlyOneSiteAtTime": "Bạn chỉ có thể sá»a má»™t website tại má»™t thá»i Ä‘iểm. Hãy lÆ°u hoặc hủy thay đổi hiện tại của bạn đến trang web %s.",
- "PiwikOffersEcommerceAnalytics": "Piwik cho phép theo dõi và báo cáo chi tiết vá»›i phân tÃch thÆ°Æ¡ng mại Ä‘iện tá». Tìm hiểu thêm vá» phân tÃch thÆ°Æ¡ng mại Ä‘iện tá» %s%s.",
+ "PiwikOffersEcommerceAnalytics": "Piwik cho phép theo dõi và báo cáo chi tiết vá»›i phân tÃch thÆ°Æ¡ng mại Ä‘iện tá». Tìm hiểu thêm vá» %1$sphân tÃch thÆ°Æ¡ng mại Ä‘iện tá» %2$s.",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik sẽ tự động loại bỠcác tham số phiên chung (%s).",
"SearchCategoryDesc": "Piwik cũng có thể theo dõi các danh mục tìm kiếm cho mỗi từ khóa tìm kiếm trang nội bộ.",
"SearchCategoryLabel": "Tham số Mục",
@@ -56,7 +56,7 @@
"SearchKeywordParametersDesc": "Nháºp má»™t danh sách ngăn bởi dấu phẩy của tất cả tên tham số truy vấn có chứa từ khóa trang web tìm kiếm.",
"SearchParametersNote": "LÆ°u ý: các tham số truy vấn và tham số Danh mục nà y sẽ chỉ được sá» dụng cho các website có trang web tìm kiếm được kÃch hoạt nhÆ°ng đã để lại các tham số trống nà y.",
"SearchParametersNote2": "Äể vô hiêu hóa trang web tìm kiếm cho trang web má»›i, để 2 trÆ°á»ng nà y trống.",
- "SearchUseDefault": "SỠdụng %s mặc định %s các tham số trang tim kiếm",
+ "SearchUseDefault": "SỠdụng %1$s mặc định %2$s các tham số trang tim kiếm",
"SelectACity": "Chá»n má»™t thà nh phố",
"SelectDefaultCurrency": "Bạn có thể chá»n tiá»n tệ để thiết láºp mặc định cho má»™t trang web má»›i.",
"SelectDefaultTimezone": "Bạn có thể chá»n múi giỠđể mặc định cho má»™t trang web má»›i.",
diff --git a/plugins/SitesManager/lang/zh-cn.json b/plugins/SitesManager/lang/zh-cn.json
index 7f91fe76aa44478b846650ffe44c17bdec21c295..131854fe47c20198a73498ef9bc1a17ad8cf1bb6 100644
--- a/plugins/SitesManager/lang/zh-cn.json
+++ b/plugins/SitesManager/lang/zh-cn.json
@@ -18,8 +18,8 @@
"EnableSiteSpecificUserAgentExclude_Help": "如果ä¸åŒçš„网站è¦æŽ’除ä¸åŒçš„用户代ç†ï¼Œé€‰ä¸è¿™ä¸ªå¤é€‰æ¡†ï¼Œç‚¹å‡»ä¿å˜å¹¶ %1$så¢žåŠ ä¸Šé¢çš„用户代ç†%2$s。",
"ExceptionDeleteSite": "ä¸å¯èƒ½åˆ é™¤è¿™ä¸ªç½‘ç«™ï¼Œå› ä¸ºå®ƒæ˜¯å”¯ä¸€æ³¨å†Œçš„ç½‘ç«™ï¼",
"ExceptionEmptyName": "网站å称ä¸å¯ä¸ºç©ºï¼",
- "ExceptionInvalidCurrency": "è´§å¸ \"%s\" ä¸æ£ç¡®ã€‚请输入æ£ç¡®çš„è´§å¸ç¬¦å·(例如 %s)",
- "ExceptionInvalidIPFormat": "欲排除的 IP \"%s\" 地å€æ ¼å¼ä¸æ£ç¡®(例如 %s)。",
+ "ExceptionInvalidCurrency": "è´§å¸ \"%1$s\" ä¸æ£ç¡®ã€‚请输入æ£ç¡®çš„è´§å¸ç¬¦å·(例如 %2$s)",
+ "ExceptionInvalidIPFormat": "欲排除的 IP \"%1$s\" 地å€æ ¼å¼ä¸æ£ç¡®(例如 %2$s)。",
"ExceptionInvalidTimezone": "时区 \"%s\" ä¸æ£ç¡®ã€‚请输入æ£ç¡®çš„时区。",
"ExceptionInvalidUrl": "ç½‘å€ '%s' ä¸æ£ç¡®ï¼",
"ExceptionNoUrl": "您必须为æ¤ç½‘站指定至少一个网å€ï¼",
@@ -47,7 +47,7 @@
"NotFound": "找ä¸åˆ°ç½‘ç«™",
"NoWebsites": "您没有任何网站å¯ç®¡ç†ï¼",
"OnlyOneSiteAtTime": "æ¯æ¬¡åªèƒ½ä¿®æ”¹ä¸€ä¸ªç½‘站，请ä¿æŒæˆ–å–消当å‰å¯¹ç½‘ç«™ %s 的修改。",
- "PiwikOffersEcommerceAnalytics": "Piwik å¯ä»¥ä½¿ç”¨é«˜çº§ç”µå•†åˆ†æžå’ŒæŠ¥è¡¨ï¼Œäº†è§£æ›´å¤šçš„ %s 电商分æž%s。",
+ "PiwikOffersEcommerceAnalytics": "Piwik å¯ä»¥ä½¿ç”¨é«˜çº§ç”µå•†åˆ†æžå’ŒæŠ¥è¡¨ï¼Œäº†è§£æ›´å¤šçš„ %1$s 电商分æž%2$s。",
"PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik 会自动排除常è§çš„会è¯å‚æ•°(%s)",
"SearchCategoryDesc": "Piwik 也å¯ä»¥ç»Ÿè®¡æ¯ä¸ªç«™å†…æœç´¢å…³é”®å—çš„æœç´¢åˆ†ç±»ã€‚",
"SearchCategoryLabel": "分类å‚æ•°",
@@ -56,7 +56,7 @@
"SearchKeywordParametersDesc": "输入用逗å·åˆ†å¼€çš„包å«ç«™å†…æœç´¢å…³é”®å—的所有æœç´¢å‚æ•°å称的列表。",
"SearchParametersNote": "æ示: æœç´¢å‚数和分类å‚数仅用于å¯ç”¨äº†ç«™å†…æœç´¢ä½†è¿™äº›å‚数为空的网站。",
"SearchParametersNote2": "è¦ç¦ç”¨æ–°ç«™çš„站内æœç´¢ï¼Œè¿™ä¸¤ä¸ªå—段留空。",
- "SearchUseDefault": "使用 %s默认%s 的站内æœç´¢å‚æ•°",
+ "SearchUseDefault": "使用 %1$s默认%2$s 的站内æœç´¢å‚æ•°",
"SelectACity": "选择一个城市",
"SelectDefaultCurrency": "新网站å¯ä»¥é€‰æ‹©é»˜è®¤çš„è´§å¸ã€‚",
"SelectDefaultTimezone": "新网站å¯ä»¥é€‰æ‹©é»˜è®¤çš„时区。",
diff --git a/plugins/SitesManager/lang/zh-tw.json b/plugins/SitesManager/lang/zh-tw.json
index 6a4cd32d52e78f6f4e4fe918a5e81b606f0f409a..bdb8e17ef0565ff73eeca865ef1e355de72f01d8 100644
--- a/plugins/SitesManager/lang/zh-tw.json
+++ b/plugins/SitesManager/lang/zh-tw.json
@@ -12,8 +12,8 @@
"DeleteConfirm": "ä½ ç¢ºå®šè¦åˆªé™¤ç¶²ç«™ %s 嗎？",
"ExceptionDeleteSite": "ä¸å¯èƒ½åˆªé™¤é€™å€‹ç¶²ç«™ï¼Œå› ç‚ºå®ƒæ˜¯å”¯ä¸€è¨»å†Šçš„ç¶²ç«™ã€‚è«‹å…ˆå¢žåŠ æ–°çš„ç¶²ç«™ï¼Œç„¶å¾Œåœ¨åˆªé™¤å®ƒã€‚",
"ExceptionEmptyName": "網站å稱ä¸å¯ç‚ºç©ºã€‚",
- "ExceptionInvalidCurrency": "貨幣 \"%s\" 無效。請輸入æ£ç¢ºçš„貨幣符號（例如 %s）",
- "ExceptionInvalidIPFormat": "欲排除的 IP \"%s\" ä¸ç¬¦åˆæœ‰æ•ˆçš„ IP æ ¼å¼ï¼ˆä¾‹å¦‚ %s）。",
+ "ExceptionInvalidCurrency": "貨幣 \"%1$s\" 無效。請輸入æ£ç¢ºçš„貨幣符號（例如 %2$s）",
+ "ExceptionInvalidIPFormat": "欲排除的 IP \"%1$s\" ä¸ç¬¦åˆæœ‰æ•ˆçš„ IP æ ¼å¼ï¼ˆä¾‹å¦‚ %2$s）。",
"ExceptionInvalidTimezone": "æ™‚å€ \"%s\" 無效。請輸入æ£ç¢ºçš„時å€ã€‚",
"ExceptionInvalidUrl": "æ¤ URL ä½å€ '%s' 並éžä¸€å€‹æœ‰æ•ˆçš„ URL ä½å€ã€‚",
"ExceptionNoUrl": "ä½ å¿…é ˆç‚ºæ¤ç¶²ç«™æŒ‡å®šè‡³å°‘一個 URL ä½å€ã€‚",
diff --git a/plugins/SitesManager/templates/help/timezone-help.html b/plugins/SitesManager/templates/help/timezone-help.html
index a0fd96d099b0112babfe4cb09553c0dd0e8673f2..0308b783b53dae5b6660c56aa517346141c3e29f 100644
--- a/plugins/SitesManager/templates/help/timezone-help.html
+++ b/plugins/SitesManager/templates/help/timezone-help.html
@@ -10,7 +10,7 @@
<br/>
- {{ 'SitesManager_UTCTimeIs'| translate : (utcTime | date :Â 'yyyy-MM-dd HH:mm:ss') }}
+ {{ 'SitesManager_UTCTimeIs'| translate : (utcTime | date : 'yyyy-MM-dd HH:mm:ss') }}
<br/>
diff --git a/plugins/SitesManager/templates/sites-list/site-fields.html b/plugins/SitesManager/templates/sites-list/site-fields.html
index dada85cc225cb49be691ba4123e3205adb31482b..200e935e270d3379a03b993565f33271acba436a 100644
--- a/plugins/SitesManager/templates/sites-list/site-fields.html
+++ b/plugins/SitesManager/templates/sites-list/site-fields.html
@@ -85,6 +85,7 @@
<div class="form-help">
{{ 'SitesManager_OnlyMatchedUrlsAllowedHelp' | translate }}
+ {{ 'SitesManager_OnlyMatchedUrlsAllowedHelpExamples' | translate }}
</div>
<label class="checkbox">
<input type="checkbox" ng-model="site.exclude_unknown_urls" ng-true-value="1" ng-false-value="0"> {{ 'SitesManager_OnlyMatchedUrlsAllowed' | translate:'':'' }}
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
index 5ea1e7ab52db8f33782b297bf1386f2d86fbee5a..813a8e3dc65c3c6cca088d7f3f358ebc71a0d4c8 160000
--- a/plugins/TasksTimetable
+++ b/plugins/TasksTimetable
@@ -1 +1 @@
-Subproject commit 5ea1e7ab52db8f33782b297bf1386f2d86fbee5a
+Subproject commit 813a8e3dc65c3c6cca088d7f3f358ebc71a0d4c8
diff --git a/plugins/Transitions/lang/bg.json b/plugins/Transitions/lang/bg.json
index cac4559b09c78da9bbca05f68c3ff54ac7a51043..494bfbf44512290fb82e65fad28749ffdc22ca91 100644
--- a/plugins/Transitions/lang/bg.json
+++ b/plugins/Transitions/lang/bg.json
@@ -15,12 +15,12 @@
"LoopsInline": "%s Ñтраница Ñе презарежда",
"NoDataForAction": "ÐÑма Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° %s",
"OutgoingTraffic": "ИзходÑщ трафик",
- "ShareOfAllPageviews": "Тази Ñтраница има %s Ñ€Ð°Ð·Ð³Ð»ÐµÐ¶Ð´Ð°Ð½Ð¸Ñ (от вÑички %s разглежданиÑ)",
+ "ShareOfAllPageviews": "Тази Ñтраница има %1$s Ñ€Ð°Ð·Ð³Ð»ÐµÐ¶Ð´Ð°Ð½Ð¸Ñ (от вÑички %2$s разглежданиÑ)",
"ToFollowingPages": "Към вътрешни Ñтраници",
"ToFollowingPagesInline": "%s за вътрешни Ñтраници",
"ToFollowingSiteSearches": "Външни Ñ‚ÑŠÑ€ÑениÑ",
"ToFollowingSiteSearchesInline": "%s вътрешни Ñ‚ÑŠÑ€ÑениÑ",
"XOfAllPageviews": "%s на вÑички Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð·Ð° тази Ñтраница",
- "XOutOfYVisits": "%s (от %s)"
+ "XOutOfYVisits": "%1$s (от %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/ca.json b/plugins/Transitions/lang/ca.json
index 0f70fa5fc7bf88142f2249d6f2e8dc9ed6b8422e..ba5c04c55c8d46d5e7902144ecc2f236e8bedf3f 100644
--- a/plugins/Transitions/lang/ca.json
+++ b/plugins/Transitions/lang/ca.json
@@ -16,12 +16,12 @@
"NoDataForAction": "No hi ha informació per %s",
"NoDataForActionDetails": "O l'acció no ha estat vista cap vegada durant el perÃode %s o és invà lida.",
"OutgoingTraffic": "Trà fic surtint",
- "ShareOfAllPageviews": "Aquesta pà gina ha tingut %s visites (%s de totes les visites)",
+ "ShareOfAllPageviews": "Aquesta pà gina ha tingut %1$s visites (%2$s de totes les visites)",
"ToFollowingPages": "A pà gines internes",
"ToFollowingPagesInline": "%s a pà gines internes",
"ToFollowingSiteSearches": "Cerques internes",
"ToFollowingSiteSearchesInline": "%s cerques internes",
"XOfAllPageviews": "%s de totes les visualitzacions d'aquesta pà gina",
- "XOutOfYVisits": "%s (de %s)"
+ "XOutOfYVisits": "%1$s (de %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/cs.json b/plugins/Transitions/lang/cs.json
index 30790aff23c8189e444d56bf74052ae47a776c1c..3f23cbf3ab7c4057a81f9c1725de5e8a863e0db6 100644
--- a/plugins/Transitions/lang/cs.json
+++ b/plugins/Transitions/lang/cs.json
@@ -17,12 +17,12 @@
"NoDataForActionDetails": "BuÄ akce nemÄ›la za obdobà %s žádné zobrazenà stránky, nebo je neplatná.",
"OutgoingTraffic": "Odchozà provoz",
"PluginDescription": "V novém hlášenà pÅ™echodů hlásà pÅ™edchozà a následujÃcà akci pro každou URL, je dostupný pÅ™es novou ikonu v hlášenà akcÃ.",
- "ShareOfAllPageviews": "Tato stránka mÄ›la %s zobrazenà (%s vÅ¡ech zobrazenÃ)",
+ "ShareOfAllPageviews": "Tato stránka mÄ›la %1$s zobrazenà (%2$s vÅ¡ech zobrazenÃ)",
"ToFollowingPages": "Na internà stránky",
"ToFollowingPagesInline": "%s na internà stránky",
"ToFollowingSiteSearches": "Internà vyhledávánÃ",
"ToFollowingSiteSearchesInline": "%s internÃch vyhledávánÃ",
"XOfAllPageviews": "%s ze všech zobrazenà této stránky",
- "XOutOfYVisits": "%s (z %s)"
+ "XOutOfYVisits": "%1$s (z %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/da.json b/plugins/Transitions/lang/da.json
index 53ceb6c2d8b2c42dcdbf12c374e99f6e990d6c82..2bae9b5e0c47f8d9df8d00def2482b335b3c810d 100644
--- a/plugins/Transitions/lang/da.json
+++ b/plugins/Transitions/lang/da.json
@@ -16,12 +16,12 @@
"NoDataForAction": "Der er ingen data for %s",
"NoDataForActionDetails": "Enten havde handlingen ingen sidevisninger i perioden %s eller den er ugyldig.",
"OutgoingTraffic": "Udgående trafik",
- "ShareOfAllPageviews": "Denne side havde %s sidevisninger (%s af alle sidevisninger)",
+ "ShareOfAllPageviews": "Denne side havde %1$s sidevisninger (%2$s af alle sidevisninger)",
"ToFollowingPages": "Til interne sider",
"ToFollowingPagesInline": "%s til interne sider",
"ToFollowingSiteSearches": "Interne søgninger",
"ToFollowingSiteSearchesInline": "%s interne søgninger",
"XOfAllPageviews": "%s af alle visninger af denne side",
- "XOutOfYVisits": "%s (ud af %s)"
+ "XOutOfYVisits": "%1$s (ud af %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/de.json b/plugins/Transitions/lang/de.json
index e0f27788eabc828fded259189e316d494f0c4182..a14d88fd169790376d767c627b637570c4321a2c 100644
--- a/plugins/Transitions/lang/de.json
+++ b/plugins/Transitions/lang/de.json
@@ -17,12 +17,12 @@
"NoDataForActionDetails": "Entweder hatte diese Aktion während des Zeitraums %s keine Seitenansichten oder sie ist ungültig.",
"OutgoingTraffic": "Ausgehender Traffic",
"PluginDescription": "Berichte über vergangene und zukünftige Aktionen für jede Seiten-URL in einem neuen Transitions-Bericht, aufrufbar im Aktionen-Bericht über ein neues Icon.",
- "ShareOfAllPageviews": "Diese Seite wurde %s mal angesehen (%s aller Seitenansichten)",
+ "ShareOfAllPageviews": "Diese Seite wurde %1$s mal angesehen (%2$s aller Seitenansichten)",
"ToFollowingPages": "Zu internen Seiten",
"ToFollowingPagesInline": "%s zu internen Seiten",
"ToFollowingSiteSearches": "Interne Suchen",
"ToFollowingSiteSearchesInline": "%s interne Suchen",
"XOfAllPageviews": "%s von allen Seitenansichten",
- "XOutOfYVisits": "%s (von insgesamt %s)"
+ "XOutOfYVisits": "%1$s (von insgesamt %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/el.json b/plugins/Transitions/lang/el.json
index 86409350c270ba08530797139c4cf1dc417ef424..f30597667d28fb785f184b1d1e8541eb0856e50c 100644
--- a/plugins/Transitions/lang/el.json
+++ b/plugins/Transitions/lang/el.json
@@ -17,12 +17,12 @@
"NoDataForActionDetails": "Είτε η ενÎÏγεια δεν είχε Ï€ÏοβολÎÏ‚ σελίδας (pageviews) κατά τη διάÏκεια της πεÏιόδου %s ή δεν είναι ÎγκυÏη.",
"OutgoingTraffic": "ΕξεÏχόμενη κίνηση",
"PluginDescription": "ΑναφÎÏει Ï€ÏοηγοÏμενες και επόμενες ενÎÏγειες για κάθε σελίδα στην αναφοÏά για νÎες Μεταβάσεις, διαθÎσιμη στις αναφοÏÎÏ‚ ΕνεÏγειών από Îνα νÎο εικονίδιο.",
- "ShareOfAllPageviews": "Αυτή η σελίδα είχε %s Ï€ÏοβολÎÏ‚ σελίδων (%s από όλες τις Ï€ÏοβολÎÏ‚ σελίδων)",
+ "ShareOfAllPageviews": "Η σελίδα είχε %1$s αναγνώσεις (%2$s από όλες τις αναγνώσεις σελίδων)",
"ToFollowingPages": "Î Ïος ΕσωτεÏικÎÏ‚ Σελίδες",
"ToFollowingPagesInline": "%s Ï€Ïος εσωτεÏικÎÏ‚ σελίδες",
"ToFollowingSiteSearches": "ΕσωτεÏικÎÏ‚ Αναζητήσεις",
"ToFollowingSiteSearchesInline": "%s εσωτεÏικÎÏ‚ αναζητήσεις",
"XOfAllPageviews": "%s από όλες τις Ï€ÏοβολÎÏ‚ αυτής της σελίδας",
- "XOutOfYVisits": "%s (από %s)"
+ "XOutOfYVisits": "%1$s (από %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/en.json b/plugins/Transitions/lang/en.json
index af453340719201870388039beb206b1880be19f0..1b0c7fc9ba2091d92eddf429c542df213f0a699b 100644
--- a/plugins/Transitions/lang/en.json
+++ b/plugins/Transitions/lang/en.json
@@ -20,12 +20,12 @@
"NoDataForActionDetails": "Either the action had no pageviews during the period %s or it is invalid.",
"OutgoingTraffic": "Outgoing traffic",
"PluginDescription": "Reports previous and following actions for each page URL in a new Transitions report, available in the Actions reports via a new icon.",
- "ShareOfAllPageviews": "This page had %s pageviews (%s of all pageviews)",
+ "ShareOfAllPageviews": "This page had %1$s pageviews (%2$s of all pageviews)",
"ToFollowingPages": "To Internal Pages",
"ToFollowingPagesInline": "%s to internal pages",
"ToFollowingSiteSearches": "Internal Searches",
"ToFollowingSiteSearchesInline": "%s internal searches",
"XOfAllPageviews": "%s of all views of this page",
- "XOutOfYVisits": "%s (out of %s)"
+ "XOutOfYVisits": "%1$s (out of %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/es.json b/plugins/Transitions/lang/es.json
index 65c02dbdb07b630e0721fcef93b20adcc8ca6ce2..c8c2722c3e0b10b983362b96550540b620f29a94 100644
--- a/plugins/Transitions/lang/es.json
+++ b/plugins/Transitions/lang/es.json
@@ -17,12 +17,12 @@
"NoDataForActionDetails": "O la acción no tuvo vistas de páginas durante el perÃodo %s o es inválida.",
"OutgoingTraffic": "Tráfico saliente",
"PluginDescription": "Anteriores informes y las siguientes acciones para cada URL de página en un nuevo informe Transiciones, disponible en los informes Acciones vÃa un nuevo Ãcono.",
- "ShareOfAllPageviews": "Esta página tuvo %s vistas de página (%s de todas las vistas de páginas)",
+ "ShareOfAllPageviews": "Esta página tuvo %1$s vistas de página (%2$s de todas las vistas de páginas)",
"ToFollowingPages": "A páginas internas",
"ToFollowingPagesInline": "%s a páginas internas",
"ToFollowingSiteSearches": "Búsquedas internas",
"ToFollowingSiteSearchesInline": "%s búsquedas internas",
"XOfAllPageviews": "%s de todas las vistas de esta página",
- "XOutOfYVisits": "%s (de %s)"
+ "XOutOfYVisits": "%1$s (de %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/et.json b/plugins/Transitions/lang/et.json
index 5f125d47989fbc4e1f470eabf5292f963b69873f..f67589adf8736bf6143afb70c26c05526fd96bdc 100644
--- a/plugins/Transitions/lang/et.json
+++ b/plugins/Transitions/lang/et.json
@@ -14,12 +14,12 @@
"LoopsInline": "%s lehe korduvat laadimist",
"NoDataForAction": "Tegevuse %s kohta puuduvad andmed",
"OutgoingTraffic": "Väljuv liiklus",
- "ShareOfAllPageviews": "See leht sai %s vaatamist (%s kõigist vaatamistest)",
+ "ShareOfAllPageviews": "See leht sai %1$s vaatamist (%2$s kõigist vaatamistest)",
"ToFollowingPages": "Sisemistele lehtedele",
"ToFollowingPagesInline": "%s läks sisemistele lehtedele",
"ToFollowingSiteSearches": "Sisemised otsingud",
"ToFollowingSiteSearchesInline": "%s sisemist otsingut",
"XOfAllPageviews": "%s kõigist antud lehe vaatamistest",
- "XOutOfYVisits": "%s (%s kõigist)"
+ "XOutOfYVisits": "%1$s (%2$s kõigist)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/fa.json b/plugins/Transitions/lang/fa.json
index df91ccd169e5071702c0d08bcae653caa84c9112..cb2db896bb49fd6da6880dd539d068d70a627cd1 100644
--- a/plugins/Transitions/lang/fa.json
+++ b/plugins/Transitions/lang/fa.json
@@ -15,12 +15,12 @@
"LoopsInline": "%s بارگذاری مجدد صÙØÙ‡",
"NoDataForAction": "هیچ داده ای وجود ندارد برای %s",
"OutgoingTraffic": "تراÙیک خروجی",
- "ShareOfAllPageviews": "این صÙØÙ‡ %s بازدیدازصÙØÙ‡ دارد(%s از تمام بازدیدازصÙØÙ‡ ها)",
+ "ShareOfAllPageviews": "این صÙØÙ‡ %1$s بازدیدازصÙØÙ‡ دارد(%2$s از تمام بازدیدازصÙØÙ‡ ها)",
"ToFollowingPages": "به صÙØÙ‡ های داخلی",
"ToFollowingPagesInline": "%s به صÙØÙ‡ های داخلی",
"ToFollowingSiteSearches": "جستجوهای داخلی",
"ToFollowingSiteSearchesInline": "%s جستجوهای داخلی",
"XOfAllPageviews": "%s از همه ÛŒ بازدیدهای این صÙØÙ‡",
- "XOutOfYVisits": "%s (از %s)"
+ "XOutOfYVisits": "%1$s (از %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/fi.json b/plugins/Transitions/lang/fi.json
index 01fa2d4235bbe745f4424c14d18b4a582de5d775..246303c4dfcfef763fec6fc80c117110c872a29e 100644
--- a/plugins/Transitions/lang/fi.json
+++ b/plugins/Transitions/lang/fi.json
@@ -16,12 +16,12 @@
"NoDataForAction": "%s:lle ei ole tietoja",
"NoDataForActionDetails": "Joko toiminnolle ei ole tietoja aikavälille %s tai toiminto on virheellinen.",
"OutgoingTraffic": "Lähtevä liikenne",
- "ShareOfAllPageviews": "Tällä sivulla on %s sivunavausta (%s kaikista)",
+ "ShareOfAllPageviews": "Tällä sivulla on %1$s sivunavausta (%2$s kaikista)",
"ToFollowingPages": "Sisäisille sivuille",
"ToFollowingPagesInline": "%s sisäisille sivuille",
"ToFollowingSiteSearches": "Sisäisiä hakuja",
"ToFollowingSiteSearchesInline": "%s sisäistä hakua",
"XOfAllPageviews": "%s kaikista tämän sivun katseluista",
- "XOutOfYVisits": "%s (%s:stä)"
+ "XOutOfYVisits": "%1$s (%2$s:stä)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/fr.json b/plugins/Transitions/lang/fr.json
index e0028e3265161648d119fadb862d238056a9c8bb..40144865d8e8c5f564db0d2dea7857edc61a3bf2 100644
--- a/plugins/Transitions/lang/fr.json
+++ b/plugins/Transitions/lang/fr.json
@@ -17,12 +17,12 @@
"NoDataForActionDetails": "L'action n'a eu aucune visite de page durant la période %s ou bien elle est invalide.",
"OutgoingTraffic": "Trafic sortant",
"PluginDescription": "Rapporte les actions précédentes et suivantes pour chacune des URL's de page dans un nouveau rapport de Transitions, disponible depuis le rapports des Actions via un nouvel icône.",
- "ShareOfAllPageviews": "Cette page a eu %s affichages (%s de tous les affichages)",
+ "ShareOfAllPageviews": "Cette page a eu %1$s affichages (%2$s de tous les affichages)",
"ToFollowingPages": "Vers des pages internes",
"ToFollowingPagesInline": "%s vers des pages internes",
"ToFollowingSiteSearches": "Recherches internes",
"ToFollowingSiteSearchesInline": "%s recherches internes",
"XOfAllPageviews": "%s de toutes les pages vues",
- "XOutOfYVisits": "%s (de %s)"
+ "XOutOfYVisits": "%1$s (de %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/hi.json b/plugins/Transitions/lang/hi.json
index c38be90fc524aed46c444c6e015bddc50e2bc117..90d226d07ee52922140d10d4ac82047a56a9e8a2 100644
--- a/plugins/Transitions/lang/hi.json
+++ b/plugins/Transitions/lang/hi.json
@@ -16,12 +16,12 @@
"NoDataForAction": "%s के लिठकोई डेटा नहीं है",
"NoDataForActionDetails": "या तो कारà¥à¤°à¤µà¤¾à¤ˆ की अवधि %s के दौरान कोई पेज देखा गया था या यह अवैध है.",
"OutgoingTraffic": "निवरà¥à¤¤à¤®à¤¾à¤¨ यातायात",
- "ShareOfAllPageviews": "यह पृषà¥à¤ का %s पृषà¥à¤ दृशà¥à¤¯ (सà¤à¥€ पृषà¥à¤ दृशà¥à¤¯ का %s)किया था",
+ "ShareOfAllPageviews": "यह पृषà¥à¤ का %1$s पृषà¥à¤ दृशà¥à¤¯ (सà¤à¥€ पृषà¥à¤ दृशà¥à¤¯ का %2$s)किया था",
"ToFollowingPages": "आंतरिक पृषà¥à¤ ",
"ToFollowingPagesInline": "%s आंतरिक पृषà¥à¤ ",
"ToFollowingSiteSearches": "आंतरिक खोजें",
"ToFollowingSiteSearchesInline": "%s आंतरिक खोजें",
"XOfAllPageviews": "इस पृषà¥à¤ के सà¤à¥€ दृशà¥à¤¯à¥‹à¤‚ का %s",
- "XOutOfYVisits": "%s (बाहर %s)"
+ "XOutOfYVisits": "%1$s (बाहर %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/id.json b/plugins/Transitions/lang/id.json
index 8a0c64ea4517dcd02d5806a136e2c3e4a01642fe..c9a2860398ddc35caebd1fa846e4485c78047dd4 100644
--- a/plugins/Transitions/lang/id.json
+++ b/plugins/Transitions/lang/id.json
@@ -16,12 +16,12 @@
"NoDataForAction": "Tidak tersedia data untuk %s",
"NoDataForActionDetails": "Tidak ada tindakan memiliki tampilan halaman selama periode %s atau ini tidak sahih.",
"OutgoingTraffic": "Lalu lintas keluar",
- "ShareOfAllPageviews": "Halaman ini memiliki %s tampilan halaman (%s dari semua tampilan halaman)",
+ "ShareOfAllPageviews": "Halaman ini memiliki %1$s tampilan halaman (%2$s dari semua tampilan halaman)",
"ToFollowingPages": "Menuju Halaman Dalam",
"ToFollowingPagesInline": "%s menuju halaman dalam",
"ToFollowingSiteSearches": "Pencarian Dalam",
"ToFollowingSiteSearchesInline": "%s pencarian dalam",
"XOfAllPageviews": "%s dari selruh tanpilan dari halaman ini",
- "XOutOfYVisits": "%s (di luar dari %s)"
+ "XOutOfYVisits": "%1$s (di luar dari %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/it.json b/plugins/Transitions/lang/it.json
index c1c76543b137d4a2cb67878a73e7ce2fdc3c3f67..39961913f60f25563664e464e300a794b1918461 100644
--- a/plugins/Transitions/lang/it.json
+++ b/plugins/Transitions/lang/it.json
@@ -17,12 +17,12 @@
"NoDataForActionDetails": "O l'azione non ha avuto pagine viste durante il periodo di %s o non è valida.",
"OutgoingTraffic": "Traffico uscente",
"PluginDescription": "Restituisce le azioni precedenti e seguenti per ciascun URL di pagina in un nuovo report Transizioni, disponibile tra i report Azioni con una nuova icona.",
- "ShareOfAllPageviews": "Questa pagina ha %s visualizzazioni (%s di tutte le visualizzazioni)",
+ "ShareOfAllPageviews": "Questa pagina ha %1$s visualizzazioni (%2$s di tutte le visualizzazioni)",
"ToFollowingPages": "A Pagine Interne",
"ToFollowingPagesInline": "%s a pagine interne",
"ToFollowingSiteSearches": "Ricerche Interne",
"ToFollowingSiteSearchesInline": "%s ricerche interne",
"XOfAllPageviews": "%s di tutte le visualizzazioni di questa pagina",
- "XOutOfYVisits": "%s (su %s)"
+ "XOutOfYVisits": "%1$s (su %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/ja.json b/plugins/Transitions/lang/ja.json
index 90e2c11528bb080eaecbb147f671f7abbcf5ec3e..aad51e6ba8a45c825e30a2bddd575f869d4cb1f5 100644
--- a/plugins/Transitions/lang/ja.json
+++ b/plugins/Transitions/lang/ja.json
@@ -17,12 +17,12 @@
"NoDataForActionDetails": "アクション㌠%s ã®æœŸé–“ページビューãŒç„¡ã‹ã£ãŸã‹ã€ç„¡åŠ¹ã§ã™ã€‚",
"OutgoingTraffic": "é€ä¿¡ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯",
"PluginDescription": "æ–°ã—ã„アイコンを通ã—㦠Actions レãƒãƒ¼ãƒˆã§åˆ©ç”¨å¯èƒ½ãªã€æ–°ã—ã„ Transitions レãƒãƒ¼ãƒˆã®ãã‚Œãžã‚Œã®ãƒšãƒ¼ã‚¸URL ã«å¯¾ã™ã‚‹é·ç§»ã‚’レãƒãƒ¼ãƒˆã—ã¾ã™ã€‚",
- "ShareOfAllPageviews": "ã“ã®ãƒšãƒ¼ã‚¸ã¯ã€%s ページビューã§ã—㟠( 全ページビュー㮠%s )",
+ "ShareOfAllPageviews": "ã“ã®ãƒšãƒ¼ã‚¸ã¯ã€%1$s ページビューã§ã—㟠( 全ページビュー㮠%2$s )",
"ToFollowingPages": "内部ページã¸",
"ToFollowingPagesInline": "内部ページã¸ã® %s",
"ToFollowingSiteSearches": "内部検索",
"ToFollowingSiteSearchesInline": "%s 内部検索",
"XOfAllPageviews": "ã“ã®ãƒšãƒ¼ã‚¸ã®å…¨ãƒ“ュー㮠%s",
- "XOutOfYVisits": "(%s ã®å†…ã®) %s"
+ "XOutOfYVisits": "(%2$s ã®å†…ã®) %1$s"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/ko.json b/plugins/Transitions/lang/ko.json
index 1acc59cff6c8de161ebae967afe74cd0c9828c33..77229645bb71f3813592384b83bd31e93755bac7 100644
--- a/plugins/Transitions/lang/ko.json
+++ b/plugins/Transitions/lang/ko.json
@@ -17,12 +17,12 @@
"NoDataForActionDetails": "íŠ¹ì • ë™ìž‘ì€ %sì„ í•˜ëŠ” 기간 ë™ì•ˆ 페ì´ì§€ë·°ê°€ ì¼ì–´ë‚˜ì§€ 않거나 ìœ íš¨í•˜ì§€ 않습니다.",
"OutgoingTraffic": "나가는 트래픽",
"PluginDescription": "새로운 ë³€í™”ì— ëŒ€í•œ ë³´ê³ ì„œ ë‚´ ê° íŽ˜ì´ì§€ URLì— ëŒ€í•œ ì´ì „ ë° ë‹¤ìŒì˜ ë³´ê³ ì„œëŠ” 새 ì•„ì´ì½˜ì„ 통한 ë™ìž‘ ë³´ê³ ì„œì—ì„œ 확ì¸í• 수 있습니다.",
- "ShareOfAllPageviews": "ì´ íŽ˜ì´ì§€ì˜ 페ì´ì§€ë·° %s (ì „ì²´ 페ì´ì§€ë·° 수 %s)",
+ "ShareOfAllPageviews": "ì´ íŽ˜ì´ì§€ì˜ 페ì´ì§€ë·° %1$s (ì „ì²´ 페ì´ì§€ë·° 수 %2$s)",
"ToFollowingPages": "내부 페ì´ì§€ë¡œ",
"ToFollowingPagesInline": "%s 내부 페ì´ì§€",
"ToFollowingSiteSearches": "내부 검색",
"ToFollowingSiteSearchesInline": "%s 내부 검색",
"XOfAllPageviews": "ì´ íŽ˜ì´ì§€ì˜ ëª¨ë“ ë³´ê¸° 중 %s",
- "XOutOfYVisits": "%s (%s 나ê°)"
+ "XOutOfYVisits": "%1$s (%2$s 나ê°)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/lt.json b/plugins/Transitions/lang/lt.json
new file mode 100644
index 0000000000000000000000000000000000000000..ca4035da6c55c75e5ddfec7c0002a925bbd4b552
--- /dev/null
+++ b/plugins/Transitions/lang/lt.json
@@ -0,0 +1,5 @@
+{
+ "Transitions": {
+ "FromPreviousSiteSearches": "Iš vidinės paieškos"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/nb.json b/plugins/Transitions/lang/nb.json
index 67a4f32b493f4ec395d4dac3ace9759e8e8b6cd9..984f4c32ed2efbe38363efbd348c9a2e07906403 100644
--- a/plugins/Transitions/lang/nb.json
+++ b/plugins/Transitions/lang/nb.json
@@ -17,12 +17,12 @@
"NoDataForActionDetails": "Enten har handlingen ingen sidevisninger i perioden %s eller så er den ugyldig.",
"OutgoingTraffic": "Utgående trafikk",
"PluginDescription": "Rapporterer forrige og neste handlinger for hver URL i en ny Overganger-rapport, tilgjengelig i Handlinger-rapporten og via et nytt ikon.",
- "ShareOfAllPageviews": "Denne siden hadde %s sidevisninger (%s av alle sidevisninger)",
+ "ShareOfAllPageviews": "Denne siden hadde %1$s sidevisninger (%2$s av alle sidevisninger)",
"ToFollowingPages": "Til interne sider",
"ToFollowingPagesInline": "%s til interne sider",
"ToFollowingSiteSearches": "Interne søk",
"ToFollowingSiteSearchesInline": "%s interne søk",
"XOfAllPageviews": "%s av alle besøk på denne siden",
- "XOutOfYVisits": "%s (av %s)"
+ "XOutOfYVisits": "%1$s (av %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/nl.json b/plugins/Transitions/lang/nl.json
index cb0b01e80fa612bd0c443621d3b961aee95d20f7..621e66d06e40f13a36eafaf342b729bf74aa470d 100644
--- a/plugins/Transitions/lang/nl.json
+++ b/plugins/Transitions/lang/nl.json
@@ -17,12 +17,12 @@
"NoDataForActionDetails": "Deze actie had geen paginaweergaves gedurende de periode %s, of is ongeldig.",
"OutgoingTraffic": "Uitgaand verkeer",
"PluginDescription": "Voor elke pagina URL in het Transities rapport zijn de voorgaande en volgende acties beschikbaar in de Acties rapportage met een nieuw icoontje.",
- "ShareOfAllPageviews": "Deze pagina had %s paginaweergaves (%s van alle paginaweergaves)",
+ "ShareOfAllPageviews": "Deze pagina had %1$s paginaweergaves (%2$s van alle paginaweergaves)",
"ToFollowingPages": "Naar Interne Pagina's",
"ToFollowingPagesInline": "%s naar interne pagina's",
"ToFollowingSiteSearches": "Interne Zoekopdrachten",
"ToFollowingSiteSearchesInline": "%s interne zoekopdrachten",
"XOfAllPageviews": "%s van alle weergaves van deze pagina",
- "XOutOfYVisits": "%s (van de %s)"
+ "XOutOfYVisits": "%1$s (van de %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/pl.json b/plugins/Transitions/lang/pl.json
index 07eb95002b7bd6847c22e1e5e2e0e3f0fde46883..91a1aa43d171886a941738dd601cbf053080894b 100644
--- a/plugins/Transitions/lang/pl.json
+++ b/plugins/Transitions/lang/pl.json
@@ -11,6 +11,6 @@
"OutgoingTraffic": "Ruch wychodzÄ…cy",
"ToFollowingSiteSearches": "Wyszukania Wewnętrzne",
"ToFollowingSiteSearchesInline": "%s wewnętrzne wyszukiwania",
- "XOutOfYVisits": "%s (z %s)"
+ "XOutOfYVisits": "%1$s (z %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/pt-br.json b/plugins/Transitions/lang/pt-br.json
index 6397a2899c57b78aebe13f8f6e0183a6b790c278..1337a9abf904e2d88350d9acd0dc4d847c3a5f5a 100644
--- a/plugins/Transitions/lang/pt-br.json
+++ b/plugins/Transitions/lang/pt-br.json
@@ -17,12 +17,12 @@
"NoDataForActionDetails": "Ou a ação não tinha visualizações de página durante o perÃodo de %s ou é inválido.",
"OutgoingTraffic": "O tráfego de saÃda",
"PluginDescription": "Informa ações anteriores e seguintes para cada URL da página em um novo relatório de Transições, disponÃvel nos relatórios de Ações através de um novo Ãcone.",
- "ShareOfAllPageviews": "Esta página teve %s exibições (%s de todos as exibições)",
+ "ShareOfAllPageviews": "Esta página teve %1$s exibições (%2$s de todos as exibições)",
"ToFollowingPages": "Para páginas internas",
"ToFollowingPagesInline": "%s para páginas internas",
"ToFollowingSiteSearches": "Pesquisas internas",
"ToFollowingSiteSearchesInline": "%s pesquisas internas",
"XOfAllPageviews": "%s de todas as visualizações desta página",
- "XOutOfYVisits": "%s (fora de %s)"
+ "XOutOfYVisits": "%1$s (fora de %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/ro.json b/plugins/Transitions/lang/ro.json
index 1a8f4d00cb03f391c82100a04b4f01cb3b8f4d8b..83ec73f8891dc530506136001e41130152180b34 100644
--- a/plugins/Transitions/lang/ro.json
+++ b/plugins/Transitions/lang/ro.json
@@ -16,12 +16,12 @@
"NoDataForAction": "Nu este nici o data pentru %s",
"NoDataForActionDetails": "Fie acțiunea nu a avut nici o afișări de pagină în timpul perioadei%s sau este invalida.",
"OutgoingTraffic": "traficul de ieșire",
- "ShareOfAllPageviews": "Această pagină a avut vizualizări de %s pagini (%s din toate vizualizări de pagini)",
+ "ShareOfAllPageviews": "Această pagină a avut vizualizări de %1$s pagini (%2$s din toate vizualizări de pagini)",
"ToFollowingPages": "Catre paginile interne",
"ToFollowingPagesInline": "%s la pagini interne",
"ToFollowingSiteSearches": "Cautari interne",
"ToFollowingSiteSearchesInline": "%s căutări interne",
"XOfAllPageviews": "%s toate vizualizarile de pe aceasta pagina",
- "XOutOfYVisits": "%s (din %s)"
+ "XOutOfYVisits": "%1$s (din %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/ru.json b/plugins/Transitions/lang/ru.json
index 75ce05c05266990b6243c1d3291460e2120bf4b3..a5cd6f62f2ccda89078bb01fada42702aacbb424 100644
--- a/plugins/Transitions/lang/ru.json
+++ b/plugins/Transitions/lang/ru.json
@@ -16,12 +16,12 @@
"NoDataForAction": "Ðет данныз Ð´Ð»Ñ %s",
"NoDataForActionDetails": "Ðе было Ñовершено таких дейÑтвий %s или они неправильны.",
"OutgoingTraffic": "ИÑходÑщий трафик",
- "ShareOfAllPageviews": "У Ñтой Ñтраницы %s проÑмотров (%s из проÑмотров вÑех Ñтраниц)",
+ "ShareOfAllPageviews": "У Ñтой Ñтраницы %1$s проÑмотров (%2$s из проÑмотров вÑех Ñтраниц)",
"ToFollowingPages": "на внутренние Ñтраницы",
"ToFollowingPagesInline": "%s на внутренние Ñтраницы",
"ToFollowingSiteSearches": "внутренних поиÑков по Ñайту",
"ToFollowingSiteSearchesInline": "%s внутренних поиÑков по Ñайту",
"XOfAllPageviews": "%s из вÑех проÑмотров Ñтраницы",
- "XOutOfYVisits": "%s (из %s)"
+ "XOutOfYVisits": "%1$s (из %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/sl.json b/plugins/Transitions/lang/sl.json
index 2fb5767b8a13a5296cd2e3cf3bc61df36f7e46f2..1169266cc7186a12be4bbc1142e766bbae7e7e1f 100644
--- a/plugins/Transitions/lang/sl.json
+++ b/plugins/Transitions/lang/sl.json
@@ -8,11 +8,11 @@
"FromSearchEngines": "S spletnih iskalnikov",
"NoDataForAction": "Ni podatkov za %s",
"OutgoingTraffic": "Izhodni promet",
- "ShareOfAllPageviews": "Ta stran je imela %s ogledov strani (%s od vseh ogledov strani)",
+ "ShareOfAllPageviews": "Ta stran je imela %1$s ogledov strani (%2$s od vseh ogledov strani)",
"ToFollowingPages": "Na notranje strani",
"ToFollowingPagesInline": "%s na notranje strani",
"ToFollowingSiteSearches": "Notranja iskanja",
"ToFollowingSiteSearchesInline": "%s notranjih iskanj",
- "XOutOfYVisits": "%s (od %s)"
+ "XOutOfYVisits": "%1$s (od %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/sr.json b/plugins/Transitions/lang/sr.json
index 51b1d55e2f5f757761cb39c894f0e6f128e1a3c2..e5f227c4b120473436b5580d29917909b4bdd36f 100644
--- a/plugins/Transitions/lang/sr.json
+++ b/plugins/Transitions/lang/sr.json
@@ -17,12 +17,12 @@
"NoDataForActionDetails": "Ili akcija nema nijedan pregled stranica za dati period %s ili ona nije validna.",
"OutgoingTraffic": "Odlazni saobraćaj",
"PluginDescription": "Izveštaj o prethodnoj i sledećoj akciji za svaki URL",
- "ShareOfAllPageviews": "Ova stranica ima %s pregleda (%s od svih pregleda)",
+ "ShareOfAllPageviews": "Ova stranica ima %1$s pregleda (%2$s od svih pregleda)",
"ToFollowingPages": "Ka internim stranicama",
"ToFollowingPagesInline": "%s ka drugim stranicama",
"ToFollowingSiteSearches": "Pretraživanja sajta",
"ToFollowingSiteSearchesInline": "%s pretraživanja sajta",
"XOfAllPageviews": "%s od svih pregleda ove strane",
- "XOutOfYVisits": "%s (od %s)"
+ "XOutOfYVisits": "%1$s (od %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/sv.json b/plugins/Transitions/lang/sv.json
index dc33d2e808203a920737d3f51ad423a13c4e41f6..7e318dfdac3c0adf6d5a166dce8c057accbadd66 100644
--- a/plugins/Transitions/lang/sv.json
+++ b/plugins/Transitions/lang/sv.json
@@ -16,12 +16,12 @@
"NoDataForAction": "Det finns inga data för %s",
"NoDataForActionDetails": "Antingen har händelsen inte haft några sidvisningar under perioden %s eller så är den ogiltig.",
"OutgoingTraffic": "Utgående trafik",
- "ShareOfAllPageviews": "Den här sidan hade %s sidvisningar (%s av alla sidvisningar)",
+ "ShareOfAllPageviews": "Den här sidan hade %1$s sidvisningar (%2$s av alla sidvisningar)",
"ToFollowingPages": "Till interna sidor",
"ToFollowingPagesInline": "%s till interna sidor",
"ToFollowingSiteSearches": "Interna Sökningar",
"ToFollowingSiteSearchesInline": "%s interna sökningar",
"XOfAllPageviews": "%s av alla sidvisningar",
- "XOutOfYVisits": "%s (av %s)"
+ "XOutOfYVisits": "%1$s (av %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/tl.json b/plugins/Transitions/lang/tl.json
index de57b8ea32b1cec4d7266f571ea639aa7aebb84b..1da24d18da53611bb64a723104ae7c4f55e33e82 100644
--- a/plugins/Transitions/lang/tl.json
+++ b/plugins/Transitions/lang/tl.json
@@ -16,12 +16,12 @@
"NoDataForAction": "Walang data para sa %s",
"NoDataForActionDetails": "Maaaring ang aksyon ay walang pageview sa panahon ng %s o ito ay hindi wasto.",
"OutgoingTraffic": "Mga outgoing na traffic",
- "ShareOfAllPageviews": "Ang pahinang ito ay may %s na pageview (%s ng lahat ng mga pageview)",
+ "ShareOfAllPageviews": "Ang pahinang ito ay may %1$s na pageview (%2$s ng lahat ng mga pageview)",
"ToFollowingPages": "Sa mga panloob na mga pahina",
"ToFollowingPagesInline": "%s panloob na mga pahina",
"ToFollowingSiteSearches": "Panloob na paghahanap",
"ToFollowingSiteSearchesInline": "panloob na paghahanap %s",
"XOfAllPageviews": "%s ng lahat ng mga tanawin ng pahinang ito",
- "XOutOfYVisits": "%s (mula sa %s)"
+ "XOutOfYVisits": "%1$s (mula sa %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/vi.json b/plugins/Transitions/lang/vi.json
index 484c864088a8bedaf6457d8ee324c0ea798e0fda..cfa74fecffc51fbd3523218890e1d59fda867890 100644
--- a/plugins/Transitions/lang/vi.json
+++ b/plugins/Transitions/lang/vi.json
@@ -16,12 +16,12 @@
"NoDataForAction": "Không có dữ liệu cho %s",
"NoDataForActionDetails": "Hay là hà nh Ä‘á»™ng không có lượt xem trang trong thá»i gian %s hoặc không hợp lệ.",
"OutgoingTraffic": "LÆ°u lượng truy cáºp Ä‘i",
- "ShareOfAllPageviews": "Trang nà y đã có %s lượt xem trang (%s của tất cả các lượt xem trang)",
+ "ShareOfAllPageviews": "Trang nà y đã có %1$s lượt xem trang (%2$s của tất cả các lượt xem trang)",
"ToFollowingPages": "Tới các trang nội bộ",
"ToFollowingPagesInline": "%s tới các trang nội bộ",
"ToFollowingSiteSearches": "Các tìm kiếm nội bộ",
"ToFollowingSiteSearchesInline": "%s Các tìm kiếm nội bộ",
"XOfAllPageviews": "%s của tất cả các lượt xem của trang nà y",
- "XOutOfYVisits": "%s (trong số %s)"
+ "XOutOfYVisits": "%1$s (trong số %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/Transitions/lang/zh-cn.json b/plugins/Transitions/lang/zh-cn.json
index 61a7bc5e298e15b6ef98e5b319b01a3781acf37d..a0aa96af783747d2905b6ceca6f61a13252453d8 100644
--- a/plugins/Transitions/lang/zh-cn.json
+++ b/plugins/Transitions/lang/zh-cn.json
@@ -17,12 +17,12 @@
"NoDataForActionDetails": "本活动在 %s 期间没有被访问过或者ä¸æ£ç¡®ã€‚",
"OutgoingTraffic": "出å£æµé‡",
"PluginDescription": "以å‰çš„报告并为æ¯ä¸ªé¡µé¢çš„URL在一个新的过渡报告，在æ“作报告ä¸æä¾›ä¸€ä¸ªæ–°çš„å›¾æ ‡æ¥é€šè¿‡æ“作。",
- "ShareOfAllPageviews": "本页é¢è¢«è®¿é—® %s 次 (总访问é‡çš„ %s)",
+ "ShareOfAllPageviews": "本页é¢è¢«è®¿é—® %1$s 次 (总访问é‡çš„ %2$s)",
"ToFollowingPages": "转å‘站内页é¢",
"ToFollowingPagesInline": "%s 次转å‘站内页é¢",
"ToFollowingSiteSearches": "站内æœç´¢",
"ToFollowingSiteSearchesInline": "%s 次站内æœç´¢",
"XOfAllPageviews": "%s 的本页æµè§ˆé‡",
- "XOutOfYVisits": "%s (å…± %s)"
+ "XOutOfYVisits": "%1$s (å…± %2$s)"
}
}
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/cs.json b/plugins/UserCountry/lang/cs.json
index 821069f8d49e56237ee94899bc9aa6c4b50ea635..1cb446b3c04beebd9743f75939ee66620cf621e2 100644
--- a/plugins/UserCountry/lang/cs.json
+++ b/plugins/UserCountry/lang/cs.json
@@ -35,7 +35,7 @@
"GeoIpLocationProviderDesc_Pecl1": "Tento poskytovatel umÃstÄ›nà použÃvá GeoIP databázi a PECl modul k pÅ™esnému a efektivnÃmu nalezenà umÃstÄ›nà vaÅ¡ich návÅ¡tÄ›vnÃků.",
"GeoIpLocationProviderDesc_Pecl2": "Tento poskytovatel nemá žádná omezenÃ, takže to je ten, kterého doporuÄujeme použÃvat.",
"GeoIpLocationProviderDesc_Php1": "Tento poskytovatel umÃstÄ›nà je nejjednoduÅ¡Å¡Ã na instalaci, protože nevyžaduje žádnou konfiguraci serveru (ideálnà pro sdÃlené hostingy). K pÅ™esnému urÄenà umÃstÄ›nà návÅ¡tÄ›vnÃků použÃvá GeoIP databázi a MaxMind php API.",
- "GeoIpLocationProviderDesc_Php2": "Pokud majà vaÅ¡e webové stránky velký provoz, můžete zjistit, že je tento poskytovatel polohy pomalý. V takovém pÅ™ÃpadÄ› nainstalujte %1$srozÅ¡ÃÅ™enà PECl%2$s nebo %3$sserverový modul%4$s.",
+ "GeoIpLocationProviderDesc_Php2": "Pokud má váš web velký provoz, můžete zjistit, že je tento poskytovatel polohy pomalý. V takovém pÅ™ÃpadÄ› nainstalujte %1$srozÅ¡ÃÅ™enà PECl%2$s nebo %3$sserverový modul%4$s.",
"GeoIpLocationProviderDesc_ServerBased1": "Tento poskytovatel umÃstÄ›nà využÃvá GeoIP modul, který byl instalován ve vaÅ¡em HTTP serveru. Tento poskytovatel je pÅ™esný a rychlý, ale může být použit pouze s %1$snormálnÃm sledovánà prohlÞeÄů.%2$s",
"GeoIpLocationProviderDesc_ServerBased2": "Pokud musÃte importovat logy nebo dÄ›lat nÄ›co jiného, co vyžaduje nastavovánà IP adres, použijte %1$sPECl implementaci GeoIP (doporuÄeno%2$s nebo %3$sPHP implementaci GeoIP.%4$s",
"GeoIpLocationProviderDesc_ServerBasedAnonWarn": "Poznámka: Anonimizace IP adres nemá vliv na umÃstÄ›nà hlášené tÃmto poskytovatelem. PÅ™ed jeho použÃvánÃm ověřte, že to neodporuje žádným zákonům.",
diff --git a/plugins/UserCountry/lang/en.json b/plugins/UserCountry/lang/en.json
index b859e89af7687ea9761f28cd49da2424041163ac..772342fa36c3e04b67e2a4895cca246b54b1592d 100644
--- a/plugins/UserCountry/lang/en.json
+++ b/plugins/UserCountry/lang/en.json
@@ -95,4 +95,4 @@
"UpdaterWillRunNext": "It is next scheduled to run on %s.",
"WidgetLocation": "Visitor Location"
}
-}
+}
\ No newline at end of file
diff --git a/plugins/UserCountry/lang/lt.json b/plugins/UserCountry/lang/lt.json
index 2a39977d59d7a17b30ba4ee018ddbabf0bc641f7..569e72fa91eb3b8e460badc1332161342fe121fe 100644
--- a/plugins/UserCountry/lang/lt.json
+++ b/plugins/UserCountry/lang/lt.json
@@ -9,6 +9,9 @@
"country_o1": "Kita Å¡alis",
"DistinctCountries": "%s atskirti Å¡alis",
"DownloadingDb": "AtsiunÄiama %s",
+ "GeoIPDatabases": "GeoIP duomenų bazės",
+ "HowToInstallApacheModule": "Kaip man įdiegti Apache skirtą GeoIP modulį?",
+ "IWantToDownloadFreeGeoIP": "Aš noriu atsisiųsti nemokamą GeoIP duomenų bazę...",
"Latitude": "Platuma",
"Location": "VietovÄ—",
"Longitude": "Ilguma",
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php
index a93a9622f59f4ae9a6aa26b9322ffd2e6ef1b272..b86d45f1f87d4bcc8f13aff83602c277db809c19 100644
--- a/plugins/UserCountryMap/Controller.php
+++ b/plugins/UserCountryMap/Controller.php
@@ -225,15 +225,20 @@ class Controller extends \Piwik\Plugin\Controller
$params['format'] = 'json';
$params['showRawMetrics'] = 1;
if (empty($params['segment'])) {
- $segment = \Piwik\API\Request::getRawSegmentFromRequest();
+ $segment = Request::getRawSegmentFromRequest();
if (!empty($segment)) {
- $params['segment'] = urldecode($segment);
+ $params['segment'] = $segment;
}
}
+ if (!empty($params['segment'])) {
+ $params['segment'] = urldecode($params['segment']);
+ }
+
if ($encode) {
$params = json_encode($params);
}
+
return $params;
}
diff --git a/plugins/UserCountryMap/lang/el.json b/plugins/UserCountryMap/lang/el.json
index a9a442b8becb3e7e57619a6ebf3850a0dc0e2657..ae8c0413321c07529695ddc3a55d68c538f5e2c2 100644
--- a/plugins/UserCountryMap/lang/el.json
+++ b/plugins/UserCountryMap/lang/el.json
@@ -15,7 +15,7 @@
"Regions": "ΠεÏιοχÎÏ‚",
"Searches": "%s αναζητήσεις",
"SecondsAgo": "Ï€Ïιν %s δευτεÏόλεπτα",
- "ShowingVisits": "ΕπισκÎψεις με γεωτοποθεσία από τις τελευταίες",
+ "ShowingVisits": "ΕπισκÎψεις με γεωτοποθεσία στα τελευταία",
"Unlocated": "<b>%s<\/b> %p από τις επισκÎψεις από %c δεν ήταν δυνατόν να χαÏακτηÏιστοÏν με γεωτοποθεσία.",
"VisitorMap": "ΧάÏτης Επισκεπτών",
"WorldWide": "Παγκοσμίως",
diff --git a/plugins/UserCountryMap/lang/sv.json b/plugins/UserCountryMap/lang/sv.json
index 9896f51c71cb9003cc2bd2ae63e076209e7eb1f4..7ce29ed627eab54c125dc0101bdec2366e465522 100644
--- a/plugins/UserCountryMap/lang/sv.json
+++ b/plugins/UserCountryMap/lang/sv.json
@@ -1,5 +1,6 @@
{
"UserCountryMap": {
+ "PluginDescription": "Denna plugin ger dig widgetarna besökskarta och realtidskarta. Notera: Kräver aktiverad UserCountry-plugin.",
"AndNOthers": "och %s andra",
"Cities": "Städer",
"Countries": "Länder",
@@ -17,6 +18,7 @@
"ShowingVisits": "Geolokaliserade besök de senaste",
"Unlocated": "<b>%s<\/b> %p av besöken från %c kunde inte geolokaliseras.",
"VisitorMap": "Besökskarta",
- "WorldWide": "Hela världen"
+ "WorldWide": "Hela världen",
+ "WithUnknownCity": "%s med okänd stad"
}
}
\ No newline at end of file
diff --git a/plugins/UserLanguage/lang/lt.json b/plugins/UserLanguage/lang/lt.json
index ca65af2cc172d19c6dfe73b2198524e22a783f92..43fc797cb258a2cc0a13dd45e481c17515075df8 100644
--- a/plugins/UserLanguage/lang/lt.json
+++ b/plugins/UserLanguage/lang/lt.json
@@ -1,5 +1,6 @@
{
"UserLanguage": {
+ "BrowserLanguage": "Naršyklės kalba",
"LanguageCode": "Kalbos kodas"
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
index ec900ff65dc0ccdb9234c634e6fdbe9565094bbe..c1f5965f96ed9c32d0bfd2fbb1ac274330c6ec3c 100644
--- a/plugins/UsersManager/API.php
+++ b/plugins/UsersManager/API.php
@@ -342,7 +342,7 @@ class API extends \Piwik\Plugin\API
}
/**
- * Returns the user information (login, password md5, alias, email, date_registered, etc.)
+ * Returns the user information (login, password hash, alias, email, date_registered, etc.)
*
* @param string $userLogin the user login
*
@@ -359,7 +359,7 @@ class API extends \Piwik\Plugin\API
}
/**
- * Returns the user information (login, password md5, alias, email, date_registered, etc.)
+ * Returns the user information (login, password hash, alias, email, date_registered, etc.)
*
* @param string $userEmail the user email
*
@@ -783,15 +783,12 @@ class API extends \Piwik\Plugin\API
* Generates a unique MD5 for the given login & password
*
* @param string $userLogin Login
- * @param string $md5Password MD5ied string of the password
- * @throws Exception
+ * @param string $md5Password hashed string of the password (using current hash function; MD5-named for historical reasons)
* @return string
*/
public function getTokenAuth($userLogin, $md5Password)
{
- if (strlen($md5Password) != 32) {
- throw new Exception(Piwik::translate('UsersManager_ExceptionPasswordMD5HashExpected'));
- }
+ UsersManager::checkPasswordHash($md5Password, Piwik::translate('UsersManager_ExceptionPasswordMD5HashExpected'));
return md5($userLogin . $md5Password);
}
diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php
index 344faf107a25cb6ef3f670882c169d7817bcb4ef..d8a038eb56d23586956520c239612003c0ccaced 100644
--- a/plugins/UsersManager/UsersManager.php
+++ b/plugins/UsersManager/UsersManager.php
@@ -157,6 +157,20 @@ class UsersManager extends \Piwik\Plugin
return md5($password);
}
+ /**
+ * Checks the password hash length. Used as a sanity check.
+ *
+ * @param string $passwordHash The password hash to check.
+ * @param string $exceptionMessage Message of the exception thrown.
+ * @throws Exception if the password hash length is incorrect.
+ */
+ public static function checkPasswordHash($passwordHash, $exceptionMessage)
+ {
+ if (strlen($passwordHash) != 32) { // MD5 hash length
+ throw new Exception($exceptionMessage);
+ }
+ }
+
public function getClientSideTranslationKeys(&$translationKeys)
{
$translationKeys[] = "General_OrCancel";
diff --git a/plugins/UsersManager/javascripts/usersManager.js b/plugins/UsersManager/javascripts/usersManager.js
index eb0452013cfbeb338e7253bbf590272bfacc2833..a05e602c35d2705f2133f485f5ee8c7860c8b671 100644
--- a/plugins/UsersManager/javascripts/usersManager.js
+++ b/plugins/UsersManager/javascripts/usersManager.js
@@ -272,7 +272,7 @@ $(document).ready(function () {
newRowId = 'row' + newRowId;
$($.parseHTML(' <tr id="' + newRowId + '">\
- <td><input id="useradd_login" placeholder="login" size="10" /></td>\
+ <td><input id="useradd_login" placeholder="username" size="10" /></td>\
<td><input id="useradd_password" placeholder="password" size="10" /></td>\
<td><input id="useradd_email" placeholder="email@domain.com" size="15" /></td>\
<td><input id="useradd_alias" placeholder="alias" size="15" /></td>\
diff --git a/plugins/UsersManager/lang/am.json b/plugins/UsersManager/lang/am.json
index cc061ae06da1bb7e77c46015f269563bda75adfb..e2ce9981a80588af52413d179ba7629d3e0a617c 100644
--- a/plugins/UsersManager/lang/am.json
+++ b/plugins/UsersManager/lang/am.json
@@ -4,7 +4,6 @@
"Alias": "ተለዋጠስáˆ",
"AllWebsites": "áˆáˆ‰áŠ•áˆ ድሠጣቢያዎች",
"ApplyToAllWebsites": "በáˆáˆ‰áˆ ድሠጣቢያዎች ላዠተáŒá‰¥áˆ",
- "ChangeAllConfirm": "እáˆáŒáŒ ኛ áŠáˆ… '%s' የáˆáˆ‰áŠ•áˆ ድሠጣቢያዎች áˆá‰ƒá‹µ መቀየሠትáˆáˆáŒ‹áˆˆáˆ…?",
"DeleteConfirm": "እáˆáŒáŒ ኛ áŠáˆ… ተጠቃሚዎቹን መሰረዠትáˆáˆáŒ‹áˆˆáˆ… %s?",
"Email": "ኢ-ሜá‹áˆ",
"ExceptionAccessValues": "የáŒá‰¤á‰µ መድረሻ ከሚከተሉት አንዱ እሴት ሊኖረዠá‹áŒˆá‰£áˆ: [ %s ]",
@@ -13,9 +12,6 @@
"ExceptionEditAnonymous": "á‹«áˆá‰³á‹ˆá‰€á‹ ተጠቃሚን መሰረዠወá‹áˆ አáˆá‰µáŠ¥ አá‹á‰»áˆáˆá¢ በá’ዊአያáˆáŒˆá‰£áŠ• ተጤቃሚ ለመáŒáˆˆá… á‹áŒ ቅማáˆá¢ ለáˆáˆ³áˆŒ የáˆáˆµá‹ŽáŠ• ስታቲስቲአ'የትá‹á‰³' áˆá‰ƒá‹µ 'ላáˆá‰³á‹ˆá‰€' ተጠቃሚ በመስጠት áŒáˆá… ማድረጠትችላለህá¢",
"ExceptionEmailExists": "በዚህ ኢ-ሜá‹áˆ ተጠቃሚ '%s'አለ.",
"ExceptionInvalidEmail": "ኢ-ሜá‹áˆ‰ ትáŠáŠáˆˆáŠ› ቅáˆá€á‰µ የለá‹áˆ",
- "ExceptionInvalidLoginFormat": "ገባ በ%1$s እና %2$s በá‰áˆáŠ መካከሠመሆን አለበት እንዲáˆáˆ áŠá‹°áˆ‹á‰µá£á‰áŒ¥áˆ®á‰½ ወá‹áˆ á‰áˆáŠ ብቻ መያዠአለበት '_' ወá‹áˆ '-' ወá‹áˆ '.'",
- "ExceptionLoginExists": "áŒá‰£ '%s' አስቀድሞ ማለት.",
- "MainDescription": "የትኞቹ ተጠቃሚዎች የትኛዠበድሠጣቢያህ ላዠየá’ዊአመድረሻ እንዳላቸዠወስንᢠበáˆáˆ‰áˆ ድሠጣቢያዎች ላዠáˆá‰ƒá‹³á‰¸á‹áŠ• በአንድ ጊዜ ማዘጋጀት á‹á‰»áˆ‹áˆá¢",
"ManageAccess": "መድረሻ መንጅ",
"MenuUsers": "ተጠቃሚዎች",
"PrivAdmin": "አስተዳዳሪ",
diff --git a/plugins/UsersManager/lang/ar.json b/plugins/UsersManager/lang/ar.json
index dbf2d4f92328f0c77baf29bf41fcb46ade0a7133..9ccbc9fb4dbb66beb35939c8a2e0c473ac19b6dc 100644
--- a/plugins/UsersManager/lang/ar.json
+++ b/plugins/UsersManager/lang/ar.json
@@ -4,7 +4,6 @@
"Alias": "اللقب",
"AllWebsites": "كاÙØ© المواقع",
"ApplyToAllWebsites": "تطبيق على كاÙØ© المواقع",
- "ChangeAllConfirm": "هل ترغب Øقاً ÙÙŠ تعديل صلاØيات '%s' ÙÙŠ كاÙØ© المواقع؟",
"ClickHereToDeleteTheCookie": "انقر هنا Ù„Øذ٠الكوكيز وليتتبع Piwik زياراتك",
"DeleteConfirm": "هل ترغب Øقاً ÙÙŠ Øذ٠المستخدم %sØŸ",
"Email": "البريد الإلكتروني",
@@ -14,15 +13,12 @@
"ExceptionEditAnonymous": "لا يمكن تØرير أو Øذ٠المستخدم \"مجهول\"ØŒ Ùهو يستخدم من قبل Piwik لتعري٠المستخدم الذي لم يقم بتسجيل الدخول بعد. على سبيل المثال، يمكنك جعل صÙØØ© الإØصائيات عامة من خلال Ù…Ù†Ø Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… \"مجهول\" صلاØيات \"المشاهدة\".",
"ExceptionEmailExists": "المستخدم بعنوان البريد '%s' موجود مسبقاً.",
"ExceptionInvalidEmail": "صيغة البريد الإلكتروني غير صØÙŠØØ©",
- "ExceptionInvalidLoginFormat": "اسم المستخدم يجب أن يكون بين %1$s Ùˆ %2$s رمزاً ويتضمن الØروÙØŒ الأرقام والرموز \"_\" أو \"-\" أو \".\" أو \"@\" أو \"+\" Ùقط.",
"ExceptionInvalidPassword": "يجب أن يكون طول كلمة المرور بين %1$s و %2$s رمزاً.",
- "ExceptionLoginExists": "اسم المستخدم '%s' موجود مسبقاً.",
"ExceptionPasswordMD5HashExpected": "يتوقع UsersManager.getTokenAuth كلمة مرور مشÙرة باستخدام MD5 (طولها 32 رمزاً). الرجاء استدعاء الدالة md5() لكلمة المرور قبل استدعاء هذه الدالة.",
"ExceptionUserDoesNotExist": "المستخدم '%s' غير موجود.",
"ExcludeVisitsViaCookie": "استثني زياراتك باستخدام Cookies",
"ForAnonymousUsersReportDateToLoadByDefault": "للمستخدمين المجهولين، Øدد تاريخ التقرير",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "إذا كنت ترغب ÙÙŠ تغيير كلمة المرور، اكتب واØدة جديدة، أو اتركها Ùارغة لعدم تغييرها.",
- "MainDescription": "قرر أي المستخدمين لديه أي صلاØيات ÙÙŠ Piwik. يمكنك أيضاً إعداد الصلاØيات لكل موقع على Øدة أو لكل المواقع دÙعة واØدة.",
"ManageAccess": "إدارة صلاØيات الوصول",
"MenuAnonymousUserSettings": "إعدادات المستخدمين المجهولين",
"MenuUsers": "المستخدمون",
@@ -40,7 +36,7 @@
"UsersManagementMainDescription": "أنشئ متسخدم جديد أو قم بتØديث مستخدم قائم. يمكنك أن تضبط صلاØياتهم بالأعلى.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "عندما لا يسجل المستخدمون دخولهم ويزورون PiwikØŒÙسيمكنهم الوصول إلى",
"YourUsernameCannotBeChanged": "لا يمكن تغيير اسم المستخدم الخاص بك.",
- "YourVisitsAreIgnoredOnDomain": "%s زياراتك يتم تجاهلها ÙÙŠ Piwik%s %s(تم العثور على كوكيز التجاهل ÙÙŠ متصÙØÙƒ).",
- "YourVisitsAreNotIgnored": "%s لا يتم تجاهل زياراتك ÙÙŠ Piwik%s (كوكيز التجاهل غير موجودة ÙÙŠ متصÙØÙƒ)."
+ "YourVisitsAreIgnoredOnDomain": "%1$s زياراتك يتم تجاهلها ÙÙŠ Piwik%2$s %3$s(تم العثور على كوكيز التجاهل ÙÙŠ متصÙØÙƒ).",
+ "YourVisitsAreNotIgnored": "%1$s لا يتم تجاهل زياراتك ÙÙŠ Piwik%2$s (كوكيز التجاهل غير موجودة ÙÙŠ متصÙØÙƒ)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/be.json b/plugins/UsersManager/lang/be.json
index 46ff5f96ff43e4a1f3eb1401ebf61e64e637b2bf..717bab0ab36220c1bb2bf1dbb89a1ac26623620d 100644
--- a/plugins/UsersManager/lang/be.json
+++ b/plugins/UsersManager/lang/be.json
@@ -4,7 +4,6 @@
"Alias": "ÐліаÑ",
"AllWebsites": "УÑе Ñайты",
"ApplyToAllWebsites": "Ужыць да ÑžÑÑ–Ñ… Ñайтаў",
- "ChangeAllConfirm": "Ð’Ñ‹ Ñапраўды жадаеце змÑніць правы '%s' на ÑžÑе вÑбÑайты?",
"ChangePasswordConfirm": "ЗменÑючы парол, вы такÑама зменÑеце token_auth карыÑтальніка. Ð’Ñ‹ Ñапраўды жадаеце працÑгнуць?",
"ClickHereToDeleteTheCookie": "ÐаціÑніце тут, каб выдаліць cookie Ñ– пачаць адÑочванне вашых наведваннÑÑž Piwik",
"ClickHereToSetTheCookieOnDomain": "ÐаціÑніце тут, каб уÑталÑваць cookie, Ñкі выключыць адÑочванне вашых наведваннÑÑž на вÑб-Ñайтах з Piwik на %s",
@@ -15,15 +14,12 @@
"ExceptionEditAnonymous": "Ðнанімны карыÑтач не можа быць выдалены. Ðн неабходзен Piwik Ð´Ð»Ñ Ñ–Ð´Ñнтыфікацыі карыÑтачоў, ÑÐºÑ–Ñ Ð½Ðµ ўвайшлі Ñž ÑÑ–ÑÑ‚Ñму. Дапушчальна, вы можаце зрабіць ÑтатыÑтыку публічнай, падаючы права 'ПраглÑд' ананімнаму карыÑтачу.",
"ExceptionEmailExists": "КарыÑтач з Email '%s' ужо Ñ–Ñнуе.",
"ExceptionInvalidEmail": "Email нÑправільнага фармату",
- "ExceptionInvalidLoginFormat": "Лагін павінен быць даўжынёй ад %1$s да %2$s знакаў, а такÑама ўтрымоўваць толькі літары, лічбы ці знакі '_', '-', '.'",
"ExceptionInvalidPassword": "Ð”Ð°ÑžÐ¶Ñ‹Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¿Ð°Ð²Ñ–Ð½Ð½Ð° быць паміж %1$s Ñ– %2$s знакаў.",
- "ExceptionLoginExists": "Лагін '%s' ужо Ñ–Ñнуе.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth партабуе MD5-Ñ…Ñшаваны пароль ( даужыней Ñž 32 знака). Калі лаÑка, запытайце md5() функцыю перад выклікам гÑтага метаду.",
"ExceptionUserDoesNotExist": "КарыÑтач '%s' не Ñ–Ñнуе.",
"ExcludeVisitsViaCookie": "Сключыць Ð²Ð°ÑˆÑ‹Ñ Ð½Ð°Ð²ÐµÐ´Ð²Ð°Ð½Ð½Ñ– выкарыÑтоўваючы cookie",
"ForAnonymousUsersReportDateToLoadByDefault": "Дата Ñправаздачы Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÑ– па змаўчанні, Ð´Ð»Ñ Ð°Ð½Ð°Ð½Ñ–Ð¼Ð½Ñ‹Ñ… карыÑтальнікаў",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Калі вы жадаеце змÑніць пароль, то ўвÑдзіце новы. У адваротным выпадку пакіньце поле пуÑтым.",
- "MainDescription": "Пакажыце, ÑÐºÑ–Ñ ÐºÐ°Ñ€Ñ‹Ñтачы маюць доÑтуп да Piwik на Вашым Ñайце. ТакÑама Ð’Ñ‹ можаце задаць правы доÑтупу на ÑžÑе Ñайты.",
"ManageAccess": "Кіраванне правамі дазволу",
"MenuAnonymousUserSettings": "ÐÐ½Ð°Ð½Ñ–Ð¼Ð½Ñ‹Ñ ÐºÐ°Ñ€Ñ‹ÑÑ‚Ð°Ñ†ÐºÑ–Ñ Ð½Ð°Ð»Ð°Ð´ÐºÑ–",
"MenuUsers": "КарыÑтачы",
@@ -41,7 +37,7 @@
"UsersManagementMainDescription": "СтварÑнне новых карыÑтачоў ці Ñ€Ñдагаванне Ñ–Ñнуючых. ТакÑама Ð’Ñ‹ можаце задаць правы дазволу Ð´Ð»Ñ ÐºÐ°Ñ€Ñ‹Ñтача.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Калі карыÑтальнікі не аўтарызаваны Ñ– наведваюць Piwik, Ñны павінны атрымліваць доÑтуп да",
"YourUsernameCannotBeChanged": "Ваша Ñ–Ð¼Ñ ÐºÐ°Ñ€Ñ‹Ñтальніка не можа быць зменена.",
- "YourVisitsAreIgnoredOnDomain": "%sВашы наведванні ігнаруюцца Piwik на %s %s (Piwik знайшоў Ñž вашым браўзÑры Ñ–Ð³Ð½Ð°Ñ€ÑƒÑŽÑ‡Ñ‹Ñ cookie).",
- "YourVisitsAreNotIgnored": "%sВашы наведванні не ігнаруюцца Piwik%s (Piwik не знайшоў Ñž вашым браўзÑры Ñ–Ð³Ð½Ð°Ñ€ÑƒÑŽÑ‡Ñ‹Ñ cookie)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sВашы наведванні ігнаруюцца Piwik на %2$s %3$s (Piwik знайшоў Ñž вашым браўзÑры Ñ–Ð³Ð½Ð°Ñ€ÑƒÑŽÑ‡Ñ‹Ñ cookie).",
+ "YourVisitsAreNotIgnored": "%1$sВашы наведванні не ігнаруюцца Piwik%2$s (Piwik не знайшоў Ñž вашым браўзÑры Ñ–Ð³Ð½Ð°Ñ€ÑƒÑŽÑ‡Ñ‹Ñ cookie)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/bg.json b/plugins/UsersManager/lang/bg.json
index 1cd539b54c7d55da519771fc3f601c260eb59869..855b45c501871b3be971e7104fca085a9796f0ed 100644
--- a/plugins/UsersManager/lang/bg.json
+++ b/plugins/UsersManager/lang/bg.json
@@ -6,7 +6,6 @@
"AnonymousUserHasViewAccess": "Забележка: потребител %1$s има %2$s доÑтъп до този Ñайт.",
"AnonymousUserHasViewAccess2": "Ðналитичните доклади и информациÑта за поÑетителите, Ñа публично видими.",
"ApplyToAllWebsites": "Запомни за вÑички Ñайтове",
- "ChangeAllConfirm": "Сигурен ли Ñте, че иÑкате да промените на '%s' правата за вÑички Ñайтове?",
"ChangePasswordConfirm": "ПромÑната на паролата ще промени и токена за Ð²ÐµÑ€Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð½Ð° потребителÑ. Желаете ли да продължите?",
"ClickHereToDeleteTheCookie": "ÐатиÑнете тук, за да изтриете биÑквитката и Piwik да отчита Вашите поÑещениÑ",
"ClickHereToSetTheCookieOnDomain": "ÐатиÑнете тук, за да зададете биÑквитка, коÑто ще Ви гарантира, че Вашите поÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð½Ñма да Ñе отчитат от Piwik в %s",
@@ -20,9 +19,7 @@
"ExceptionEditAnonymous": "ÐнонимниÑÑ‚ потребител не може да бъде редактиран или изтрит. Piwik по този начин дефинира в ÑиÑтема потребители, които не Ñа влезли. Ðапример можете да направите данните на броÑча ви публични, като зададете 'преглед' права на 'анонимен' потребител.",
"ExceptionEmailExists": "Потребител Ñ Ð¸Ð¼ÐµÐ¹Ð» '%s' вече ÑъщеÑтвува.",
"ExceptionInvalidEmail": "Е-пощата, който Ñте въвели не е валиден.",
- "ExceptionInvalidLoginFormat": "ПотребителÑкото име Ñ‚Ñ€Ñбва да бъде между %1$s и %2$s Ñимвола дълго и може да Ñъдържа Ñамо букви, цифри и\/или Ñимволите '_' и\/или '-' и\/или '.'",
"ExceptionInvalidPassword": "Дължината на паролата Ñ‚Ñ€Ñбва да бъде между %1$s и %2$s Ñимвола.",
- "ExceptionLoginExists": "Потребител Ñ Ð¸Ð¼Ðµ '%s' вече ÑъщеÑтвува.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth очаква MD5-хеширана парола (32 Ñимвола дълъг низ). МолÑ, извикайте md5() функциÑта на паролата преди да извикате този метод.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Премахването на права на привилигирован потребител за потребител '%s' не е възможно.",
"ExceptionUserDoesNotExist": "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ '%s' не ÑъщеÑтвува.",
@@ -32,7 +29,6 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Ðко желаете да промените паролата Ñи, въведете нова. Ð’ противен Ñлучай оÑтавете полето празно.",
"InjectedHostCannotChangePwd": "Ð’ момента вие поÑещавате Ñтраница от неизвеÑтен хоÑÑ‚(%1$s). Ðе можете да Ñмените паролата, преди да отÑтраните този проблем.",
"LastSeen": "ПоÑледно видÑно",
- "MainDescription": "Можете да управлÑвате правата на потребителите в Piwik, които да имат доÑтъп до ÑтатиÑтиките на Ð²Ð°ÑˆÐ¸Ñ Ñайт. Също така можете да зададете права над вÑички Ñайтове.",
"ManageAccess": "Управление на правата",
"MenuAnonymousUserSettings": "ÐаÑтройки на анонимните потребители",
"MenuUsers": "Потребители",
@@ -55,7 +51,7 @@
"UsersManagementMainDescription": "Създайте нови потребители или управлÑвайте вече ÑъщеÑтвуващи. Също така и можете да задавате правата за доÑтъп.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Когато потребителите не Ñа влезли и поÑетÑÑ‚ Piwik, те Ñе нуждаÑÑ‚ от доÑтъп",
"YourUsernameCannotBeChanged": "ПотребителÑкото име не може да Ñе променÑ.",
- "YourVisitsAreIgnoredOnDomain": "%sВашите поÑÐµÑ‰ÐµÐ½Ð¸Ñ Ñа игнорирани от Piwik в %s %s (Piwik игнорира биÑквитката, намерена във ВашиÑÑ‚ браузър).",
- "YourVisitsAreNotIgnored": "%sВашите поÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð½Ðµ Ñе игнорират от Piwik %s(БиÑквитката за игнориране на Вашите поÑещениÑ, не е открита във ВашиÑÑ‚ браузър)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sВашите поÑÐµÑ‰ÐµÐ½Ð¸Ñ Ñа игнорирани от Piwik в %2$s %3$s (Piwik игнорира биÑквитката, намерена във ВашиÑÑ‚ браузър).",
+ "YourVisitsAreNotIgnored": "%1$sВашите поÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð½Ðµ Ñе игнорират от Piwik %2$s(БиÑквитката за игнориране на Вашите поÑещениÑ, не е открита във ВашиÑÑ‚ браузър)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/ca.json b/plugins/UsersManager/lang/ca.json
index 8ed17dd8c40d2e51b23c7c6f39882d39c2f67b4d..9b0ec65585d3dad1f1fb4f14c2160deaf2d7cb01 100644
--- a/plugins/UsersManager/lang/ca.json
+++ b/plugins/UsersManager/lang/ca.json
@@ -4,7 +4,6 @@
"Alias": "Àlies",
"AllWebsites": "Tots els llocs",
"ApplyToAllWebsites": "Aplica a tots els llocs",
- "ChangeAllConfirm": "Realment voleu canviar els permisos de '%s' a tots els llocs web?",
"ChangePasswordConfirm": "Canviar la contrasenya implica canviar el toquen d'autenticació del 'usuari. Esteu segurs que voleu continuar?",
"ClickHereToDeleteTheCookie": "Feu click aquà per eliminar la galeta i permetre al Piwik rastrejar les vostres visites.",
"ClickHereToSetTheCookieOnDomain": "Feu click aquà per guardar una galeta que exclourà les vostres visitis al Piwik de %s",
@@ -17,15 +16,12 @@
"ExceptionEditAnonymous": "L'usuari anònim no es pot editar o esborrar. El Piwik el fa servir per als usuaris que no han iniciat encara la sessió. Per exemple, podeu fer públiques les vostres estadÃstiques garantint el permÃs 'vista' a l'usuari 'anonymous' (anònim).",
"ExceptionEmailExists": "La direcció de correu-e '%s' ja està en un altre compte.",
"ExceptionInvalidEmail": "La direcció de correu-e no té un format và lid.",
- "ExceptionInvalidLoginFormat": "El nom d'usuari ha de tenir una longitud d'entre %1$s i %2$s carà cters i estar format únicament per lletres, xifres o els carà cters '_', '-' o '.'",
"ExceptionInvalidPassword": "La longitud de la contrasenya ha de estar entre %1$s i %2$s carà cters.",
- "ExceptionLoginExists": "L'usuari '%s' ja existeix.",
"ExceptionUserDoesNotExist": "L'usuari '%s' no existeix.",
"ExcludeVisitsViaCookie": "Exclou les teues visites utilitzant cookies",
"ForAnonymousUsersReportDateToLoadByDefault": "Pels usuaris anònims, introduïu la data dels informes per defecte",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Si voleu canviar la contrasenya teclegeu-n'hi una de nova, sinó deixeu-ho en blanc.",
"InjectedHostCannotChangePwd": "Actualment esteu visitan amb un host desconegut (%1$s). No podeu canviar la vostra contrasenya fins que corregiu aquest problema.",
- "MainDescription": "Decidiu quin tipus d'accés té cada usuari al Piwik. També podeu configurar tots els llocs web de cop.",
"ManageAccess": "Gestiona els permisos",
"MenuAnonymousUserSettings": "Preferències de l'usuari anònim",
"MenuUsers": "Usuaris",
@@ -44,7 +40,7 @@
"UsersManagementMainDescription": "Creeu nous usuaris o actualitzeu els existents. Podeu configurar els seus permisos a dalt.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Quan un usuari no esta identificat i visita el Piwik, han d'accedir",
"YourUsernameCannotBeChanged": "No es pot canviar el vostre nom d'usuari",
- "YourVisitsAreIgnoredOnDomain": "%sLes vostres visites són ignorades pel Piwik %s %s (la galeta d'ignorà ncia del Piwik s'ha trobat al vostre navegador).",
- "YourVisitsAreNotIgnored": "%sLes vostres visites no són ignorades pel Piwik%s (la galeta d'ignorà ncia del Piwik no s'ha trobat al vostre navegador)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sLes vostres visites són ignorades pel Piwik %2$s %3$s (la galeta d'ignorà ncia del Piwik s'ha trobat al vostre navegador).",
+ "YourVisitsAreNotIgnored": "%1$sLes vostres visites no són ignorades pel Piwik%2$s (la galeta d'ignorà ncia del Piwik no s'ha trobat al vostre navegador)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/cs.json b/plugins/UsersManager/lang/cs.json
index 80aab2ca4cb94ee7bb666cd68c84e318dbb302c2..8cae69b171216d984d268d8fd62f0b68429977f0 100644
--- a/plugins/UsersManager/lang/cs.json
+++ b/plugins/UsersManager/lang/cs.json
@@ -7,37 +7,43 @@
"AnonymousUserHasViewAccess": "Poznámka: %1$s uživatel má právo k pÅ™Ãstupu k %2$s",
"AnonymousUserHasViewAccess2": "VaÅ¡e analytická hlášenà a informace o návÅ¡tÄ›vnÃcÃch jsou veÅ™ejnÄ› dostupná.",
"ApplyToAllWebsites": "PoužÃt na vÅ¡echny weby",
- "ChangeAllConfirm": "Jste si jistÃ, že chcete zmÄ›nit '%s' oprávnÄ›nà pro vÅ¡echny weby?",
+ "ChangeAllConfirm": "Opravdu chcete uživateli '%s' povolit pÅ™Ãstup ke vÅ¡em webům?",
"ChangePasswordConfirm": "ZmÄ›na hesla také zmÄ›nà uživatelův token_auth. Opravdu chcete pokraÄovat?",
"ClickHereToDeleteTheCookie": "KlinÄ›tÄ› zde pro vymazánà cookie a zaznamenávánà vaÅ¡Ãch návÅ¡tÄ›v",
"ClickHereToSetTheCookieOnDomain": "Klikněte zde pro nastavenà cookie, která vynechá vaše návštěvy na webech monitorováných Piwikem na %s",
- "ConfirmGrantSuperUserAccess": "Opravdu chcete uživateli %s povolit super uživatelský pÅ™Ãstup?",
- "ConfirmProhibitMySuperUserAccess": "%s, opravdu chcete odstranit svůjvlastn à super uživatelský pÅ™Ãstup? PÅ™ijdete o vÅ¡echna oprávnÄ›nà a o pÅ™Ãstup k datům stránek a budete odhlášen z Piwiku.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Opravdu chcete odstranit super uživatelský pÅ™Ãstup pro %s? Tento uživatel pÅ™ijde o vÅ¡echna práva a o pÅ™Ãstup ke vÅ¡em stránkám. Nezapomeňte mu povolit pÅ™Ãstup k tÄ›m, které potÅ™ebuje, je-li to nutné.",
+ "ConfirmGrantSuperUserAccess": "Opravdu chcete uživateli %s povolit super-uživatelský pÅ™Ãstup?",
+ "ConfirmProhibitMySuperUserAccess": "%s, opravdu chcete odstranit svůjvlastn à super-uživatelský pÅ™Ãstup? PÅ™ijdete o vÅ¡echna oprávnÄ›nà a o pÅ™Ãstup k datům stránek a budete odhlášen z Piwiku.",
+ "ConfirmProhibitOtherUsersSuperUserAccess": "Opravdu chcete odstranit super-uživatelský pÅ™Ãstup pro '%s'? Tento uživatel pÅ™ijde o vÅ¡echna práva a o pÅ™Ãstup ke vÅ¡em stránkám. Nezapomeňte mu poté povolit pÅ™Ãstup k tÄ›m které potÅ™ebuje, je-li to nutné.",
"DeleteConfirm": "Jste si jistÃ, že chcete vymazat uživatele %s?",
- "Email": "Email",
- "EmailYourAdministrator": "%1$sPošlete administrátorovi email o tomto problému%2$s.",
+ "Email": "E-mail",
+ "EmailYourAdministrator": "%1$sPošlete administrátorovi e-mail o tomto problému%2$s.",
+ "EnterUsernameOrEmail": "Zadejte uživatelské jméno nebo e-mailovou adresu",
"ExceptionAccessValues": "Parametr pÅ™Ãstupu musà mÃt jednu z následujÃcÃch hodnot: [ %s ]",
"ExceptionAdminAnonymous": "Nemůžete dát 'admin' pÅ™Ãstup 'anonymous' uživateli.",
"ExceptionDeleteDoesNotExist": "Uživatel '%s' neexistuje a proto nemůže být vymazán.",
"ExceptionDeleteOnlyUserWithSuperUserAccess": "Smazánà uživatele %s nenà možné.",
"ExceptionEditAnonymous": "'Anonymous' uživatel nemůže být upraven, nebo vymazán. Je použit Piwikem k definici uživatele, který jeÅ¡tÄ› nenà pÅ™ihlášen. NapÅ™Ãklad můžete zveÅ™ejnit vaÅ¡e statistiky udÄ›lenÃm oprávnÄ›nà 'view' uživateli 'anonymous'.",
- "ExceptionEmailExists": "Uživatel s emailem '%s' již existuje.",
- "ExceptionInvalidEmail": "Email nemá platný formát.",
- "ExceptionInvalidLoginFormat": "PÅ™ihlaÅ¡ovacà jméno musà obsahovat mezi %1$s a %2$s znaky a obsahovat pouze pÃsmena, ÄÃsla, nebo znaky '_' nebo '-' nebo '.'",
+ "ExceptionEmailExists": "Uživatel s e-mailem '%s' již existuje.",
+ "ExceptionInvalidEmail": "E-mail nemá platný formát.",
+ "ExceptionInvalidLoginFormat": "Uživatelské jméno musà být v rozmezà %1$s až %2$s znaků a obsahovat pouze pÃsmena, ÄÃsla, Äi následujÃcà znaky '_' '-' '.' '@' '+'",
"ExceptionInvalidPassword": "Délka hesla musà být mezi %1$s a %2$s znaky.",
- "ExceptionLoginExists": "Uživatelské jméno '%s' již existuje.",
+ "ExceptionLoginExists": "Uživatel '%s' již existuje.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth oÄekává heslo v podobÄ› MD5 hashe (32 znaků dlouhého Å™etÄ›zce). ProsÃm nejprve zavoltejte metodu md5() na tomto hesle.",
- "ExceptionRemoveSuperUserAccessOnlySuperUser": "OdstranÄ›nà super uživatelského pÅ™Ãstupu uživateli %s nenà možné.",
- "ExceptionSuperUserAccess": "Tento uživatel již má super uživatelský pÅ™Ãstup, takže má pÅ™Ãstup k datům vÅ¡ech stránek. Můžete super uživatelský pÅ™Ãstup odstranit a zkusit to znovu.",
+ "ExceptionRemoveSuperUserAccessOnlySuperUser": "Odebránà super-uživatelského pÅ™Ãstupu uživateli %s nenà možné.",
+ "ExceptionSuperUserAccess": "Tento uživatel již má super-uživatelský pÅ™Ãstup, takže má pÅ™Ãstup k datům vÅ¡ech stránek. Můžete super uživatelský pÅ™Ãstup odstranit a zkusit to znovu.",
"ExceptionUserDoesNotExist": "Uživatel '%s' neexistuje.",
- "ExceptionYouMustGrantSuperUserAccessFirst": "Musà zůstat alespoň jeden uživatel se super uživatelským pÅ™Ãstupem. NejdÅ™Ãve ho nÄ›komu pÅ™idÄ›lte.",
+ "ExceptionYouMustGrantSuperUserAccessFirst": "Musà zůstat alespoň jeden uživatel se super-uživatelským pÅ™Ãstupem. NejdÅ™Ãve ho nÄ›komu pÅ™idÄ›lte.",
+ "ExceptionUserHasViewAccessAlready": "Tento uživatel má již pÅ™Ãstup k této webové stránce.",
+ "ExceptionNoValueForUsernameOrEmail": "Zadejte prosÃm uživatelské jméno nebo e-mailovou adresu.",
"ExcludeVisitsViaCookie": "Vynechat vaše navštěvy pomocà cookie",
"ForAnonymousUsersReportDateToLoadByDefault": "Datum hlášenÃ, které se má naÄÃst jako výchozà pro anonymnà uživatele",
+ "GiveViewAccess": "Povolit pÅ™Ãstup pro ÄtenÃ",
+ "GiveViewAccessTitle": "Povolà existujÃcÃmu uživateli zobrazovánà hlášenà pro %s",
+ "GiveViewAccessInstructions": "Pro pÅ™iÅ™azenà práv k zobrazenà %s existujÃcÃmu uživateli, zadejte jeho uživatelské jméno nebo e-mailovou adresu",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Pokud chcete změnit heslo, zapiště jej. Jinak jej nevyplňujte.",
"InjectedHostCannotChangePwd": "AktuálnÄ› navÅ¡tÄ›vujete Piwik s neznámým hostitelem %1$s. Dokud tento problém nevyÅ™eÅ¡Ãte, nemůžete zmÄ›nit heslo.",
"LastSeen": "Naposledy spatřen",
- "MainDescription": "NastavenÃ, kteřà uživatelé majà pÅ™Ãstup k Piwik statistikám na vaÅ¡Ãch stránkách. Můžete také nastavit oprávnÄ›nà ke vÅ¡em stránkám najednou.",
+ "MainDescription": "RozhodnÄ›te, kteřà uživatelé majà pÅ™Ãstup k vaÅ¡im webům. Můžete také povolit pÅ™Ãstup ke vÅ¡em webům najednou volbou \"PoužÃt na vÅ¡echny weby\" z výbÄ›ru webů.",
"ManageAccess": "Správa pÅ™Ãstupu",
"MenuAnonymousUserSettings": "Nastavenà anonymnÃho uživatele",
"MenuUsers": "Uživatelé",
@@ -46,15 +52,15 @@
"PersonalSettings": "Osobnà nastavenÃ",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Poznámka: Nemůžete mÄ›nit nastavenà v této sekci, protože žádná z vaÅ¡ich stránek nemůže být zobrazena anonymnÃm uživatelem.",
"NoUsersExist": "ZatÃm nejsou žádnà uživatelé.",
- "PluginDescription": "Správa uživatelů vám umožňuje pÅ™idávat nové uživatele, upravovat existujÃcà a pÅ™iÅ™azovat práva ke správÄ› nebo zobrazenà webových stránek.",
+ "PluginDescription": "Správa uživatelů vám umožňuje pÅ™idávat nové uživatele, upravovat existujÃcà a pÅ™idávat oprávnÄ›nà k zobrazovánà nebo správÄ› webových stránek.",
"PrivAdmin": "Administrátor",
"PrivNone": "Žádné oprávnÄ›nÃ",
"PrivView": "Zobrazit",
"ReportDateToLoadByDefault": "Datum hlášenÃ, které se má naÄÃst jako výchozÃ",
"ReportToLoadByDefault": "HlášenÃ, které se má naÄÃst jako výchozÃ",
- "SuperUserAccessManagement": "Spravovat super uživatelský pÅ™Ãstup",
- "SuperUserAccessManagementGrantMore": "Zde můžete pÅ™idÄ›lit super uživatelský pÅ™Ãstup jiným uživatelům Piwiku. PoužÃvejte tuto funkci opatrnÄ›.",
- "SuperUserAccessManagementMainDescription": "Super uživatelé majà nejvyÅ¡Å¡Ã oprávnÄ›nÃ. Mohou vykonávat vÅ¡echny administrativnà operace, jako je pÅ™idávánà stránek k monitorovánÃ, pÅ™idávánà uživatelů, zmÄ›na uživatelských oprávnÄ›nÃ, povolovánà a zakazovánà zásuvných modulů, dokonce jejich instalace z obchodu.",
+ "SuperUserAccessManagement": "Spravovat super-uživatelský pÅ™Ãstup",
+ "SuperUserAccessManagementGrantMore": "Zde můžete pÅ™idÄ›lovat super-uživatelský pÅ™Ãstup jiným uživatelům Piwiku. PoužÃvejte tuto funkci opatrnÄ›.",
+ "SuperUserAccessManagementMainDescription": "Super-uživatelé majà nejvyÅ¡Å¡Ã oprávnÄ›nÃ. Mohou vykonávat vÅ¡echny administrativnà operace, jako je pÅ™idávánà stránek k monitorovánÃ, pÅ™idávánà uživatelů, zmÄ›na uživatelských oprávnÄ›nÃ, povolovánà a zakazovánà zásuvných modulů a dokonce jejich instalace z obchodu.",
"TheLoginScreen": "Přihlašovacà obrazovka",
"ThereAreCurrentlyNRegisteredUsers": "Aktuálně je %s registrovaných uživatelů.",
"TypeYourPasswordAgain": "Zapiště vaše nové heslo znova",
@@ -63,7 +69,7 @@
"UsersManagementMainDescription": "VytvoÅ™te nové uživatele, nebo aktualizujte existujÃcÃ. NÞe můžete nastavit jejich oprávnÄ›nÃ.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Když uživatelé nejsou přihlášeni do Piwiku, mohou přistupovat k",
"YourUsernameCannotBeChanged": "Vaše uživatelské jméno nemůže být změněno",
- "YourVisitsAreIgnoredOnDomain": "%sVaÅ¡e návÅ¡tÄ›vy jsou vynechávány Piwikem na %s %s (cookie pro vynechánà byla nalezena ve vaÅ¡em prohlÞeÄi).",
- "YourVisitsAreNotIgnored": "%sVaÅ¡e návÅ¡tÄ›vy nejsou vynechávány Piwikem%s (cookie pro vynechánà nebyla nalezena ve vaÅ¡em prohlÞeÄi)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sVaÅ¡e návÅ¡tÄ›vy jsou vynechávány Piwikem na %2$s %3$s (cookie pro vynechánà byla nalezena ve vaÅ¡em prohlÞeÄi).",
+ "YourVisitsAreNotIgnored": "%1$sVaÅ¡e návÅ¡tÄ›vy nejsou vynechávány Piwikem%2$s (cookie pro vynechánà nebyla nalezena ve vaÅ¡em prohlÞeÄi)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/da.json b/plugins/UsersManager/lang/da.json
index 428a8998fa3c8243052413bf78d959b2cd0eaf21..3cac5ca9ea3cbbb9eae56aa532a61313d436bb1c 100644
--- a/plugins/UsersManager/lang/da.json
+++ b/plugins/UsersManager/lang/da.json
@@ -7,13 +7,11 @@
"AnonymousUserHasViewAccess": "Bemærk: %1$s bruger har %2$s adgang til hjemmesiden.",
"AnonymousUserHasViewAccess2": "Analyserapporter og besøgendes oplysninger er offentligt tilgængelige.",
"ApplyToAllWebsites": "Tilføj til alle hjemmesider",
- "ChangeAllConfirm": "Bekræft ændring af '%s' tilladelse på alle hjemmesiderne?",
"ChangePasswordConfirm": "Ændring af adgangskoden vil også ændre brugerens token_auth. Vil du fortsætte?",
"ClickHereToDeleteTheCookie": "Klik her for at slette cookie og få Piwik til at spore dine besøg",
"ClickHereToSetTheCookieOnDomain": "Klik her for at sætte en cookie og udeluk egne besøg på hjemmesider der spores af Piwik på %s",
"ConfirmGrantSuperUserAccess": "Vil du at give '%s' Superbruger adgang? Advarsel: brugeren vil have adgang til alle hjemmesider og vil være i stand til at udføre administrative opgaver.",
"ConfirmProhibitMySuperUserAccess": "%s, vil du virkelig fjerne din egen superbruger adgang? Du mister alle tilladelser og adgang til alle hjemmesider og vil blive logget ud af Piwik.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Vil du fjerne superbruger adgang fra '%s'? Brugeren vil miste alle tilladelser og adgang til alle hjemmesider. Sørg for at indstille tilladelser til nødvendige hjemmesider bagefter, hvis det er nødvendigt.",
"DeleteConfirm": "Bekræft sletning af bruger %s?",
"Email": "E-mail",
"EmailYourAdministrator": "%1$sE-mail din administrator om dette problem%2$s.",
@@ -24,9 +22,7 @@
"ExceptionEditAnonymous": "Anonyme brugere kan ikke redigeres eller slettet. Anvendes af Piwik til at definere en bruger, som ikke er blevet logget på endnu. F. eks. kan du gøre statistikken offentlig ved at give 'se' adgang til 'anonym' bruger",
"ExceptionEmailExists": "Bruger med e-mail '%s' findes allerede.",
"ExceptionInvalidEmail": "E-mailadressen er ikke i gyldigt format.",
- "ExceptionInvalidLoginFormat": "Brugernavn skal være mellem %1$s og %2$s tegn og kan kun indeholde bogstaver, tal og tegnene '_' eller '-' eller '.' eller '@' eller '+'",
"ExceptionInvalidPassword": "Længden på adgangskoden skal være mellem %1$s og %2$s tegn.",
- "ExceptionLoginExists": "Brugernavn '%s' eksisterer allerede.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth forventer et MD5-hashet kodeord (32 tegn lang streng). Kald md5() funktionen på kodeordet, før denne metode kaldes.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Det er ikke muligt at fjerne superbruger adgang f0r brugeren '%s'.",
"ExceptionSuperUserAccess": "Brugeren har superbrugeradgang og har allerede tilladelse til at få adgang til og ændre alle hjemmesider i Piwik. Du kan fjerne superbrugeradgang fra brugeren, og prøve igen.",
@@ -37,7 +33,6 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Hvis du ønsker at ændre adgangskode skriv en ny. Ellers lad være blank.",
"InjectedHostCannotChangePwd": "Du besøger med en ukendt vært (%1$s). Du kan ikke ændre din adgangskode, før problemet er løst.",
"LastSeen": "Sidst set",
- "MainDescription": "Bestem hvilke brugere der har hvilken Piwik adgang til hjemmesiderne. Adgang kan også sættes på alle hjemmesider på en gang.",
"ManageAccess": "Administrer adgang",
"MenuAnonymousUserSettings": "Anonym bruger indstilling",
"MenuUsers": "Brugere",
@@ -46,7 +41,6 @@
"PersonalSettings": "Personlige indstillinger",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Bemærk: Indstillingerne kan ikke ændres i denne del, fordi der ikke er en hjemmeside, der kan tilgås af den anonyme bruger.",
"NoUsersExist": "Der er endnu ingen brugere.",
- "PluginDescription": "Brugeradministration kan tilføje nye brugere, redigere eksisterende brugere og tildele dem rettigheder til at få vist eller administrere hjemmesider.",
"PrivAdmin": "Administration",
"PrivNone": "Ingen adgang",
"PrivView": "Vis",
@@ -63,7 +57,7 @@
"UsersManagementMainDescription": "Opret nye brugere eller opdater eksisterende. Efterfølgende kan tilladelser ændres.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Når ingen brugere er logget på Piwik bør de tilgå",
"YourUsernameCannotBeChanged": "Brugernavnet kan ikke ændres.",
- "YourVisitsAreIgnoredOnDomain": "%sDine besøg ignoreres af Piwik på %s %s (Piwik ignorer cookie blev fundet i netlæseren).",
- "YourVisitsAreNotIgnored": "%sDine besøg bliver ikke ignoreret af Piwik%s (Piwik ignorer cookie blev ikke fundet i netlæseren)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sDine besøg ignoreres af Piwik på %2$s %3$s (Piwik ignorer cookie blev fundet i netlæseren).",
+ "YourVisitsAreNotIgnored": "%1$sDine besøg bliver ikke ignoreret af Piwik%2$s (Piwik ignorer cookie blev ikke fundet i netlæseren)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/de.json b/plugins/UsersManager/lang/de.json
index 7f5ef268618dfe4b1f37a81df3c412a266616ed3..e1ce9fd356355a218b3190a2d6f111fd0d9a5bcf 100644
--- a/plugins/UsersManager/lang/de.json
+++ b/plugins/UsersManager/lang/de.json
@@ -7,16 +7,15 @@
"AnonymousUserHasViewAccess": "Hinweis: Der Benutzer %1$s hat %2$s Zugriff auf diese Website.",
"AnonymousUserHasViewAccess2": "Ihre Analytiks-Berichte und Besucherinformationen sind öffentlich einsehbar.",
"ApplyToAllWebsites": "Für alle Websites anwenden",
- "ChangeAllConfirm": "Sollen '%s' Berechtigungen für alle Websites wirklich geändert werden?",
"ChangePasswordConfirm": "Das Ändern des Kennworts ändert ebenso das token_auth des Benutzers. Wirklich fortfahren?",
"ClickHereToDeleteTheCookie": "Klicken Sie hier, um das Cookie zu löschen und Ihre Besuche wieder zu zählen",
"ClickHereToSetTheCookieOnDomain": "Klicken Sie hier, um ein Cookie zu setzen, damit Ihre Besuche auf Websites ignoriert werden, die Piwik auf %s trackt.",
"ConfirmGrantSuperUserAccess": "Wollen Sie wirklich '%s' Hauptadministrator-Berechtigungen gewähren? Warnung: Der Nutzer wird Zugriff zu allen Websites haben und in der Lage sein, administrative Tätigkeiten durchzuführen.",
"ConfirmProhibitMySuperUserAccess": "%s, wollen Sie wirklich ihre eigenen Hauptadministrator-Berechtigungen entfernen? Sie werden alle Berechtigungen und Zugriff zu allen Websites verlieren und von Piwik abgemeldet werden.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Wollen Sie wirklich dem Nutzer '%s' Hauptadministrator-Berechtigungen entziehen? Der Nutzer wird alle Berechtigungen und Zugriff zu allen Websites verlieren. Bitte vergeben Sie danach, wenn notwendig, die Berechtigungen zu benötigten Websites.",
"DeleteConfirm": "Soll der Benutzer %s wirklich gelöscht werden?",
"Email": "E-Mail",
"EmailYourAdministrator": "%1$sBitte berichten Sie diesen Fehler ihrem Administrator via E-Mail%2$s.",
+ "EnterUsernameOrEmail": "Geben Sie einen Benutzernamen oder eine E-Mail-Adresse ein",
"ExceptionAccessValues": "Der Parameter access muss einen der folgenden Werte enthalten: [ %s ]",
"ExceptionAdminAnonymous": "Das 'admin'-Recht kann nicht an 'anonymous' Benutzer vergeben werden.",
"ExceptionDeleteDoesNotExist": "Der Benutzer '%s' existiert nicht und kann daher auch nicht gelöscht werden.",
@@ -24,7 +23,7 @@
"ExceptionEditAnonymous": "Der anonyme Benutzer kann nicht bearbeitet oder gelöscht werden. Er wird von Piwik benutzt, um einen Benutzer zu definieren, der sich noch nicht angemeldet hat. Zum Beispiel können Sie Ihre Statistiken öffentlich machen, indem Sie dem Benutzer 'anonymous' das Recht 'view' geben.",
"ExceptionEmailExists": "Ein Benutzer mit der E-Mail-Adresse '%s' existiert bereits.",
"ExceptionInvalidEmail": "Die E-Mail-Adresse hat ein ungültiges Format.",
- "ExceptionInvalidLoginFormat": "Das Login muss zwischen %1$s und %2$s Zeichen lang sein und darf nur Buchstaben, Zahlen oder die Zeichen '_' oder '-' oder '.' enthalten.",
+ "ExceptionInvalidLoginFormat": "Der Benutzername muss zwischen %1$s und %2$s Zeichen lang sein und darf nur Buchstaben, Zahlen oder die Zeichen '_', '-', '.', '@' oder '+' enthalten.",
"ExceptionInvalidPassword": "Das Passwort muss zwischen %1$s und %2$s Zeichen lang sein.",
"ExceptionLoginExists": "Der Benutzername '%s' existiert bereits.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth erwartet ein MD5-verschlüsseltes Passwort (32 Zeichen). Bitte wenden Sie die md5()-Funktion auf das Passwort an, bevor Sie diese Methode aufrufen.",
@@ -32,12 +31,13 @@
"ExceptionSuperUserAccess": "Dieser Nutzer hat bereits Hauptadministrator-Berechtigungen und Erlaubnis, alle Websites in Piwik aufzurufen und zu bearbeiten. Sie können den Super User Zugriff von diesem Nutzer entfernen und es im Anschluss noch einmal versuchen.",
"ExceptionUserDoesNotExist": "Der Benutzer '%s' existiert nicht.",
"ExceptionYouMustGrantSuperUserAccessFirst": "Es muss mindestens ein Hauptadministrator existieren. Bitte geben Sie zuerst einem anderen Nutzer Hauptadministrator-Berechtigungen.",
+ "ExceptionUserHasViewAccessAlready": "Dieser Benutzer hat bereits Zugriff auf diese Website.",
+ "ExceptionNoValueForUsernameOrEmail": "Bitte geben Sie einen Benutzernamen oder eine E-Mail-Adresse ein.",
"ExcludeVisitsViaCookie": "Ihre Besuche von der Erfassung via Cookie ausschließen",
"ForAnonymousUsersReportDateToLoadByDefault": "Bericht, der für Gast-Besucher (\"anonymous\") standardmäßig geladen wird",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Wenn Sie Ihr Passwort ändern möchten, geben Sie ein neues ein. Ansonsten lassen Sie dieses Feld frei.",
"InjectedHostCannotChangePwd": "Ihr Besuch erfolgt aktuell durch einen unbekannten Hostnamen (%1$s). Es ist somit nicht möglich Ihr Kennwort zu ändert bis dieser Umstand behoben ist.",
"LastSeen": "Zuletzt gesehen",
- "MainDescription": "Hier kann Zugriff auf bestimmte Websites innerhalb von Piwik erteilt werden. Es ist auch möglich, Zugriff für alle Websites auf einmal zu erlauben.",
"ManageAccess": "Zugriffsverwaltung",
"MenuAnonymousUserSettings": "Gast-Besucher (\"anonymous\") Einstellungen",
"MenuUsers": "Benutzer",
@@ -46,7 +46,6 @@
"PersonalSettings": "Persönliche Einstellungen",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Hinweis: Sie können die Einstellungen in diesem Bereich nicht ändern, weil Sie keine Website eingerichtet haben, die vom anonymen Benutzer angezeigt werden kann.",
"NoUsersExist": "Bisher keine Benutzer vorhanden.",
- "PluginDescription": "Benutzermanagement lässt Sie neue Benutzer hinzufügen, bestehende ändern und die Rechte für die Ansicht oder die Administration von Websites definieren.",
"PrivAdmin": "Administrator",
"PrivNone": "Kein Zugriff",
"PrivView": "Ansicht",
@@ -63,7 +62,7 @@
"UsersManagementMainDescription": "Erstellen Sie neue Benutzer oder aktualisieren Sie bereits existierende Benutzer. Die Berechtigungen können dann oben gesetzt werden.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Wenn Benutzer nicht angemeldet sind und Piwik besuchen, sollten sie Zugriff haben auf",
"YourUsernameCannotBeChanged": "Ihr Benutzername kann nicht geändert werden.",
- "YourVisitsAreIgnoredOnDomain": "%sIhre Besuche auf %s werden von Piwik ignoriert %s (das Piwik-Cookie zum Ignorieren von Besuchen wurde in Ihrem Browser gefunden).",
- "YourVisitsAreNotIgnored": "%sIhre Besuche werden von Piwik nicht ignoriert %s (das Piwik-Cookie zum Ignorieren von Besuchen wurde nicht in Ihrem Browser gefunden)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sIhre Besuche auf %2$s werden von Piwik ignoriert %3$s (das Piwik-Cookie zum Ignorieren von Besuchen wurde in Ihrem Browser gefunden).",
+ "YourVisitsAreNotIgnored": "%1$sIhre Besuche werden von Piwik nicht ignoriert %2$s (das Piwik-Cookie zum Ignorieren von Besuchen wurde nicht in Ihrem Browser gefunden)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/el.json b/plugins/UsersManager/lang/el.json
index 74f4ff144730f3dc3bddd84b82a7ac32d4ab9f63..b4430f85ee712f0ca9eaf71df1107ebc1ff35845 100644
--- a/plugins/UsersManager/lang/el.json
+++ b/plugins/UsersManager/lang/el.json
@@ -7,16 +7,17 @@
"AnonymousUserHasViewAccess": "Σημείωση: ο %1$s χÏήστης Îχει %2$s Ï€Ïόσβαση στον ιστοτόπο.",
"AnonymousUserHasViewAccess2": "Οι αναφοÏÎÏ‚ στατιστικών σας και οι πληÏοφοÏίες για τους επισκÎπτες είναι δημόσια Ï€Ïοσπελάσιμες.",
"ApplyToAllWebsites": "ΕφαÏμογή σε όλες τις ιστοσελίδες",
- "ChangeAllConfirm": "Είστε σίγουÏος ότι θÎλετε να αλλάξετε «%s» δικαιώματα σε όλες τις ιστοσελίδες;",
+ "ChangeAllConfirm": "Είστε σίγουÏοι ότι θÎλετε να δώσετε Ï€Ïόσβαση σε όλους τους ιστοτόπους στο '%s';",
"ChangePasswordConfirm": "Η αλλαγή του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης συνεπάγεται αλλαγή του πειστηÏίου πιστοποίησης των χÏηστών (token_auth). ΘÎλετε να συνεχίσετε;",
"ClickHereToDeleteTheCookie": "Πατήστε εδώ για να διαγÏάψετε το cookie και αφήστε το Piwik να καταγÏάφει τις επισκÎψεις σας",
"ClickHereToSetTheCookieOnDomain": "Πατήστε εδώ για να οÏίσετε Îνα cookie που θα αποκλείει τις επισκÎψεις σας στις ιστοσελίδες που ανιχνεÏονται από το Piwik στο %s",
"ConfirmGrantSuperUserAccess": "Είστε σίγουÏοι ότι θÎλετε να δώσετε δικαίωμα ΥπεÏ-ΧÏήστη στον '%s'; Î Ïοσοχή: ο χÏήστης θα Îχει δικαίωμα Ï€Ïόσβασης σε όλους τους ιστοτόπους και θα μποÏεί να εκτελεί διαχειÏιστικÎÏ‚ εÏγασίες.",
"ConfirmProhibitMySuperUserAccess": "%s, είστε σίγουÏοι ότι θÎλετε να αφαιÏÎσετε το δικαίωμα ΥπεÏ-ΧÏήστη από τον εαυτό σας; Θα χάσετε για πάντα όλα τα δικαιώματα και την Ï€Ïόσβαση σε όλους τους ιστοτόπους και θα σας γίνει αυτόματα Îξοδος από το Piwik.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Είστε σίγουÏοι ότι θÎλετε να αφαιÏÎσετε το δικαίωμα ΥπεÏ-ΧÏήστη από τον '%s'; Ο χÏήστης θα χάσει όλα τα δικαιώματα και την Ï€Ïόσβαση σε όλους τους ιστοτόπους. Βεβαιωθείτε στη συνÎχεια να οÏίσετε τα απαιτοÏμενα δικαιώματα στους ιστοτόπους που χÏειάζεται.",
+ "ConfirmProhibitOtherUsersSuperUserAccess": "Είστε σίγουÏοι ότι θÎλετε να αφαιÏÎσετε την Ï€Ïόσβαση ΥπεÏ-ΧÏήστη από τον '%s'; Ο χÏήστης θα χάσει όλα τα δικαιώματα και την Ï€Ïόσβαση σε όλους τους ιστοτόπους. Βεβαιωθείτε μετά ότι δώσατε Ï€Ïόσβαση στους απαÏαίτητους ιστοτόπους αν αυτό απατείται.",
"DeleteConfirm": "Είστε σίγουÏος ότι θÎλετε να διαγÏάψετε τον\/ην χÏήστη %s;",
"Email": "ΗλεκτÏονική ΔιεÏθυνση",
"EmailYourAdministrator": "%1$sΣτείλτε e-mail στον διαχειÏιστή σχετικά με το Ï€Ïόβλημα %2$s.",
+ "EnterUsernameOrEmail": "Εισάγετε Îνα όνομα χÏήστη ή διεÏθυνση ηλ. ταχυδÏομείου",
"ExceptionAccessValues": "Η Ï€Ïόσβαση παÏαμÎÏ„Ïου Ï€ÏÎπει να Îχει τις ακόλουθες τιμÎÏ‚: [ %s ]",
"ExceptionAdminAnonymous": "Δεν μποÏείτε να δώσετε δικαιώματα διαχειÏιστή στον «ανώνυμο» χÏήστη.",
"ExceptionDeleteDoesNotExist": "Ο χÏήστης «%s» δεν υπάÏχει και άÏα δεν μποÏεί να διαγÏαφεί.",
@@ -24,20 +25,25 @@
"ExceptionEditAnonymous": "Ο ανώνυμος χÏήστης δεν μποÏεί να διαγÏαφεί ή να δεχθεί Ï„Ïοποποίηση. ΧÏησιμοποιείται από το Piwik για τον οÏισμό του χÏήστη που δεν Îχει συνδεθεί ακόμα. Για παÏάδειγμα, μποÏείτε να κάνετε τα στατιστικά σας δημόσια δίνοντας δικαίωμα «πÏοβολής» στον «ανώνυμο» χÏήστη.",
"ExceptionEmailExists": "ΧÏήστης με την ηλεκτÏονική διεÏθυνση «%s» υπάÏχει ήδη.",
"ExceptionInvalidEmail": "Η ηλεκτÏονική διεÏθυνση δεν φαίνεται να είναι σωστή.",
- "ExceptionInvalidLoginFormat": "Η σÏνδεση Ï€ÏÎπει να είναι Î¼ÎµÏ„Î±Î¾Ï %1$s και %2$s χαÏακτήÏες και να πεÏιÎχει μόνο γÏάμματα, αÏιθμοÏÏ‚ ή τους χαÏακτήÏες «_» ή «-» ή «.»",
+ "ExceptionInvalidLoginFormat": "Το όνομα χÏήστη Ï€ÏÎπει να Îχει αÏιθμό χαÏακτήÏων από %1$s Îως %2$s και να πεÏιÎχει μόνο γÏάμματα, αÏιθμοÏÏ‚, ή τους χαÏακτήÏες '_' ή '-' ή '.' ή '@' ή '+'",
"ExceptionInvalidPassword": "Το μήκος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης Ï€ÏÎπει να είναι Î¼ÎµÏ„Î±Î¾Ï %1$s και %2$s χαÏακτήÏες.",
- "ExceptionLoginExists": "Ο χÏήστης «%s» υπάÏχει ήδη.",
+ "ExceptionLoginExists": "Το όνομα χÏήστη '%s' υπάÏχει ήδη.",
"ExceptionPasswordMD5HashExpected": "Το UsersManager.getTokenAuth αναμÎνει Îναν κωδικό Ï€Ïόσβασης ως αÏιθμό MD5 (μήκος 32 χαÏακτήÏων). ΑνακαλÎστε τη συνάÏτηση md5() στον κωδικό Ï€Ïόσβασης Ï€Ïιν ανακαλÎσετε τη μÎθοδο.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Η αφαίÏεση του δικαιώματος ΥπεÏ-ΧÏήστη από το χÏήστη '%s' δεν είναι δυνατή.",
"ExceptionSuperUserAccess": "Ο χÏήστης Îχει το δικαίωμα ΥπεÏ-ΧÏήστη και Îχει ήδη Ï€Ïόσβαση για να Ï„Ïοποποιεί όλους τους ιστοτόπους στο Piwik. ΜποÏείτε να αφαιÏÎσετε το δικαίωμα ΥπεÏ-ΧÏήστη από το χÏήστη και να ξαναδοκιμάσετε.",
"ExceptionUserDoesNotExist": "Ο χÏήστης «%s» δεν υπάÏχει.",
"ExceptionYouMustGrantSuperUserAccessFirst": "Î ÏÎπει να υπάÏχει τουλάχιστον Îνας χÏήστης με το δικαίωμα ΥπεÏ-ΧÏήστη. ΠαÏακαλοÏμε δώστε Ï€Ïώτα το δικαίωμα ΥπεÏ-ΧÏήστη σε κάποιον άλλο χÏήστη.",
+ "ExceptionUserHasViewAccessAlready": "Ο χÏήστης Îχει ήδη Ï€Ïόσβαση στον ιστοτόπο.",
+ "ExceptionNoValueForUsernameOrEmail": "ΠαÏακαλώ εισάγετε Îνα όνομα χÏήστη ή διεÏθυνση ηλ. ταχυδÏομείου.",
"ExcludeVisitsViaCookie": "Αποκλείστε τις επισκÎψεις σας με χÏήση cookie",
"ForAnonymousUsersReportDateToLoadByDefault": "Για ανώνυμους χÏήστες, αναφοÏά ημεÏομηνίας που θα φοÏτώνεται ως Ï€Ïοεπιλογή",
+ "GiveViewAccess": "Îα δοθεί δικαίωμα εμφάνισης",
+ "GiveViewAccessTitle": "Îα δοθεί σε υπάÏχοντα χÏήστη δικαίωμα να βλÎπει τις αναφοÏÎÏ‚ για το %s",
+ "GiveViewAccessInstructions": "Για να δώσετε σε υπάÏχοντα χÏήστη δικαίωμα Ï€Ïόσβασης στο %s εισάγετε το όνομα χÏήστη ή την διεÏθυνση ηλ. ταχυδÏομείου του χÏήστη",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Αν θÎλετε να αλλάξετε τον κωδικό Ï€Ïόσβασης εισάγετε Îνα νÎο. ΔιαφοÏετικά αφήστε το κενό.",
"InjectedHostCannotChangePwd": "Αυτή τη στιγμή είστε επισκÎπτης από Îνα άγνωστο υπολογιστή (%1$s). Δεν μποÏείτε να αλλάξετε το συνθηματικό σας μÎχÏι να διοÏθωθεί αυτό το Ï€Ïόβλημα.",
"LastSeen": "Τελευταία ειδώθηκε",
- "MainDescription": "Ρυθμίστε ποιοι χÏήστες θα Îχουν Ï€Ïόσβαση σε ποιες ιστοσελίδες. ΜποÏείτε επίσης να Ïυθμίσετε τα δικαιώματα για όλες τις ιστοσελίδες με μία κίνηση.",
+ "MainDescription": "Αποφασίστε ποιοι χÏήστες θα Îχουν Ï€Ïόσβαση σε όλους τους ιστοτόπους. ΜποÏείτε επίσης να δώσετε Ï€Ïόσβαση σε όλους τους ιστοτόπους με τη μία επιλÎγοντας \"ΕφαÏμογή σε όλους τους ιστοτόπους\" στον επιλογÎα ιστοτόπων.",
"ManageAccess": "ΔιαχείÏιση Ï€Ïόσβασης",
"MenuAnonymousUserSettings": "Ρυθμίσεις ανώνυμου χÏήστη",
"MenuUsers": "ΧÏήστες",
@@ -46,7 +52,7 @@
"PersonalSettings": "Î ÏοσωπικÎÏ‚ Ïυθμίσεις",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Σημείωση: Δεν μποÏείτε να αλλάξετε τις Ïυθμίσεις σε αυτό τον τομÎα γιατί δεν Îχετε κάποια ιστοσελίδα που μποÏείτε να Îχετε Ï€Ïόσβαση ως ανώνυμος χÏήστης.",
"NoUsersExist": "Δεν υπάÏχουν ακόμη χÏήστες.",
- "PluginDescription": "Η ΔιαχείÏιση ΧÏηστών επιτÏÎπει την Ï€Ïοσθήκη νÎων χÏηστών, την επεξεÏγασία υπάÏχοντων και τον οÏισμό αδειών Ï€Ïόσβασης για ανάγνωση ή διαχείÏιση των ιστοτόπων.",
+ "PluginDescription": "Η ΔιαχείÏιση χÏηστών επιτÏÎπει την Ï€Ïοσθήκη νÎων χÏηστών, την επεξεÏγασία υπαÏχόντων και η Ï€Ïόσβαση για εμφάνιση ή διαχείÏιση των ιστοτόπων.",
"PrivAdmin": "ΔιαχείÏιση",
"PrivNone": "ΧωÏίς Ï€Ïόσβαση",
"PrivView": "Î Ïοβολή",
@@ -63,7 +69,7 @@
"UsersManagementMainDescription": "ΔημιουÏγήστε νÎους χÏήστες ή ενημεÏώστε τους υπάÏχοντες. ΜποÏείτε επίσης να αλλάξετε τα δικαιώματά τους (παÏαπάνω).",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Όταν οι χÏήστες δεν Îχουν συνδεθεί και επισκÎπτονται το Piwik, θα Îχουν Ï€Ïόσβαση",
"YourUsernameCannotBeChanged": "Το όνομα χÏήστη δεν μποÏεί να αλλαχτεί.",
- "YourVisitsAreIgnoredOnDomain": "%sΟι επισκÎψεις σας παÏαβλÎπονται από το Piwik στο %s %s (το Piwik παÏαβλÎπει το cookie που βÏÎθηκε στον φυλλομετÏητή σας).",
- "YourVisitsAreNotIgnored": "%sΟι επισκÎψεις δεν αγνοοÏνται από το Piwik%s (δεν βÏÎθηκε cookie αγνόησης του Piwik στον φυλλομετÏητή σας)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sΟι επισκÎψεις σας παÏαβλÎπονται από το Piwik στο %2$s %3$s (το Piwik παÏαβλÎπει το cookie που βÏÎθηκε στον φυλλομετÏητή σας).",
+ "YourVisitsAreNotIgnored": "%1$sΟι επισκÎψεις δεν αγνοοÏνται από το Piwik%2$s (δεν βÏÎθηκε το cookie αγνόησης του Piwik στον φυλλομετÏητή σας)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json
index 144b66ec03a59bf89192a029a3271c00c85a9ace..a4a07421c0bd1eb4f61edbf31f6e5098671f73b8 100644
--- a/plugins/UsersManager/lang/en.json
+++ b/plugins/UsersManager/lang/en.json
@@ -7,13 +7,13 @@
"AnonymousUserHasViewAccess": "Note: the %1$s user has %2$s access to this website.",
"AnonymousUserHasViewAccess2": "Your analytics reports and your visitors information are publicly viewable.",
"ApplyToAllWebsites": "Apply to all websites",
- "ChangeAllConfirm": "Are you sure you want to change '%s' permissions on all the 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.",
"ConfirmProhibitMySuperUserAccess": "%s, do you really want to remove your own Super User access? You will lose all permissions and access to all websites and will be logged out from Piwik.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Do you really want to remove Super User access from '%s'? The user will lose all permissions and access to all websites. Make sure to set permissions to needed websites afterwards if necessary.",
+ "ConfirmProhibitOtherUsersSuperUserAccess": "Do you really want to remove Super User access from '%s'? The user will lose all permissions and access to all websites. Make sure to give access to needed websites afterwards if necessary.",
"DeleteConfirm": "Are you sure you want to delete the user %s?",
"Email": "Email",
"EmailYourAdministrator": "%1$sE-mail your administrator about this problem%2$s.",
@@ -25,9 +25,9 @@
"ExceptionEditAnonymous": "The anonymous user cannot be edited or deleted. It is used by Piwik to define a user that has not logged in yet. For example, you can make your statistics public by granting the 'view' access to the 'anonymous' user.",
"ExceptionEmailExists": "User with email '%s' already exists.",
"ExceptionInvalidEmail": "The email doesn't have a valid format.",
- "ExceptionInvalidLoginFormat": "The login must be between %1$s and %2$s characters long and contain only letters, numbers, or the characters '_' or '-' or '.' or '@' or '+'",
+ "ExceptionInvalidLoginFormat": "The username must be between %1$s and %2$s characters long and contain only letters, numbers, or the characters '_' or '-' or '.' or '@' or '+'",
"ExceptionInvalidPassword": "The password length must be between %1$s and %2$s characters.",
- "ExceptionLoginExists": "Login '%s' already exists.",
+ "ExceptionLoginExists": "Username '%s' already exists.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth is expecting a MD5-hashed password (32 chars long string). Please call the md5() function on the password before calling this method.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Removing the Super User access from user '%s' is not possible.",
"ExceptionSuperUserAccess": "This user has Super User access and has already permission to access and modify all websites in Piwik. You may remove the Super User access from this user and try again.",
@@ -43,7 +43,7 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "If you would like to change the password type a new one. Otherwise leave this blank.",
"InjectedHostCannotChangePwd": "You are currently visiting with an unknown host (%1$s). You cannot change your password until this problem is fixed.",
"LastSeen": "Last seen",
- "MainDescription": "Decide which users have which Piwik access on your Websites. You can also set the permissions on all the Websites at once.",
+ "MainDescription": "Decide which users have access to your websites. You can also give access to all the websites at once by choosing \"Apply to all websites\" in the website selector.",
"ManageAccess": "Manage access",
"MenuAnonymousUserSettings": "Anonymous user settings",
"MenuUsers": "Users",
@@ -52,7 +52,7 @@
"PersonalSettings": "Personal settings",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Note: You cannot change the settings in this section, because you do not have any website that can be accessed by the anonymous user.",
"NoUsersExist": "There are no users yet.",
- "PluginDescription": "Users Management lets you add new users, edit existing users and assign them permissions to view or administrate websites. ",
+ "PluginDescription": "Users Management lets you add new users, edit existing users and give them access to view or administrate websites. ",
"PrivAdmin": "Admin",
"PrivNone": "No access",
"PrivView": "View",
@@ -69,7 +69,7 @@
"UsersManagementMainDescription": "Create new users or update the existing users. You can then set their permissions above.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "When users are not logged in and visit Piwik, they should access",
"YourUsernameCannotBeChanged": "Your username cannot be changed.",
- "YourVisitsAreIgnoredOnDomain": "%sYour visits are ignored by Piwik on %s %s (the Piwik ignore cookie was found in your browser).",
- "YourVisitsAreNotIgnored": "%sYour visits are not ignored by Piwik%s (the Piwik ignore cookie was not found in your browser)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sYour visits are ignored by Piwik on %2$s %3$s (the Piwik ignore cookie was found in your browser).",
+ "YourVisitsAreNotIgnored": "%1$sYour visits are not ignored by Piwik%2$s (the Piwik ignore cookie was not found in your browser)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/es.json b/plugins/UsersManager/lang/es.json
index 9ec8323ffc3ae35d5b389fe4226bce302ade320d..99a253b94244af43a15158f11c77d2e9b8c3742f 100644
--- a/plugins/UsersManager/lang/es.json
+++ b/plugins/UsersManager/lang/es.json
@@ -7,13 +7,11 @@
"AnonymousUserHasViewAccess": "Nota: el usuario %1$s tiene acceso para %2$s en este sitio de internet.",
"AnonymousUserHasViewAccess2": "Sus informes de análisis y la información de sus visitantes son vistos públicamente.",
"ApplyToAllWebsites": "Aplicar a todos los sitios",
- "ChangeAllConfirm": "¿Está seguro que desea cambiar '%s' permisos en todos los sitios de internet?",
"ChangePasswordConfirm": "Cambiar la contraseña también cambiará el token_auth del usuario. ¿Desea continuar?",
"ClickHereToDeleteTheCookie": "Haga clic aquà para borrar la cookie y permitir que Piwik realice un seguimiento de sus visitas",
"ClickHereToSetTheCookieOnDomain": "Haga clic aquà para configurar la cookie que excluirá sus visitas a los sitios de internet a los que Piwik realiza seguimiento en %s",
"ConfirmGrantSuperUserAccess": "¿Estás seguro que desea conceder acceso 'Super User' a '%s'? Atención: el usuario tendrá acceso a todos los sitios de internet y podrá realizar tareas administrativas.",
"ConfirmProhibitMySuperUserAccess": "¿%s, está seguro que desea eliminar su acceso Super Usuario? Perderá todos los permisos y accesos a todos los sitios de internet y será desconectado de Piwik.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "¿Está seguro que desea eliminar el acceso Super Usuario a '%s'? El usuario perderá todos los permisos y accesos a todos los sitios de internet. Asegúrese de configurar los permisos a sitios si asà fuese necesario.",
"DeleteConfirm": "¿Está seguro que desea eliminar al usuario %s?",
"Email": "Correo electrónico",
"EmailYourAdministrator": "%1$sEnviar un correo electrónico a su administrador acerca de este problema%2$s.",
@@ -24,9 +22,7 @@
"ExceptionEditAnonymous": "El usuario anónimo no puede ser borrado o editado. Piwik lo utiliza para definir un usuario que no se ha conectado todavÃa. Por ejemplo, puede hacer públicas sus estadÃsticas mediante el acceso 'ver' al usuario 'anónimo'.",
"ExceptionEmailExists": "Ya existe un usuario con el correo electrónico '%s'.",
"ExceptionInvalidEmail": "El correo electrónico no tiene un formato válido.",
- "ExceptionInvalidLoginFormat": "El inicio de sesión debe estar entre %1$s y %2$s caracteres de longitud y contener solo letras, números o los caracteres '_' o '-' o '.' o '@' or '+'",
"ExceptionInvalidPassword": "La extensión de la contraseña debe ser entre %1$s y %2$s caracteres.",
- "ExceptionLoginExists": "El usuario '%s' ya existe.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth está a la espera de una contraseña con algoritmo hash MD5 (32 caracteres de longitud). Por favor demande la función md5() en la contraseña antes de reclamar a este método.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Eliminar el acceso Super Usuario del usuario '%s' no es posible.",
"ExceptionSuperUserAccess": "Este usuario tiene acceso Super Usuario y ya posee permiso para acceder y modificar todos los sitios de internet de Piwik. Puede eliminar el acceso Super Usuario a este usuario y volver a probar.",
@@ -37,7 +33,6 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Si desea cambiar la contraseña ingrese una nueva. Si no, déjelo vacÃo.",
"InjectedHostCannotChangePwd": "Está actualmente visitando con un medio desconocido (%1$s). No puede cambiar su contraseña hasta que el problema esté soluionado.",
"LastSeen": "Última visita",
- "MainDescription": "Decida que usuarios de Piwik tienen acceso a sus sitios de internet. También puede configurar los permisos en todos los sitios de una vez.",
"ManageAccess": "Administrar el acceso",
"MenuAnonymousUserSettings": "Configuración de usuario anónimo",
"MenuUsers": "Usuarios",
@@ -46,7 +41,6 @@
"PersonalSettings": "Ajustes personales",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Nota: No puede modificar la configuración en esta sección, debido a que no posee ningún sitio de internet que pueda ser contactado por un usuario anónimo.",
"NoUsersExist": "TodavÃa no hay usuarios.",
- "PluginDescription": "Administración de usuarios le permite añadir nuevos usuarios, modificar actuales usuarios y asignarles permisos de visualización o administrar sitios de internet.",
"PrivAdmin": "Administrador",
"PrivNone": "Sin acceso",
"PrivView": "Ver",
@@ -63,7 +57,7 @@
"UsersManagementMainDescription": "Cree nuevos usuarios o actualice los actuales. Luego puede configurar sus permisos.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Cuando los usuarios no están identificados y visitan Piwik, deberÃan poder acceder",
"YourUsernameCannotBeChanged": "Su nombre de usuario no puede ser cambiado.",
- "YourVisitsAreIgnoredOnDomain": "%sSus visitas son ignoradas por Piwik en %s %s (la cookie de ignorar a Piwik fue encontrada en su navegador).",
- "YourVisitsAreNotIgnored": "%sSus visitas no son ignoradas por Piwik%s (la cookie de ignorar a Piwik no fue encontrada en su navegador)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sSus visitas son ignoradas por Piwik en %2$s %3$s (la cookie de ignorar a Piwik fue encontrada en su navegador).",
+ "YourVisitsAreNotIgnored": "%1$sSus visitas no son ignoradas por Piwik%2$s (la cookie de ignorar a Piwik no fue encontrada en su navegador)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/et.json b/plugins/UsersManager/lang/et.json
index 56b94db5b06280ab058a3408f10fc14c7799c388..dfad50ee8ea2b2e04b97daa68ff836ac15be44f1 100644
--- a/plugins/UsersManager/lang/et.json
+++ b/plugins/UsersManager/lang/et.json
@@ -4,7 +4,6 @@
"Alias": "Alias",
"AllWebsites": "Kõik veebilehed",
"ApplyToAllWebsites": "Laienda kõigile veebilehtedele",
- "ChangeAllConfirm": "Kas sa oled kindel soovis anda '%s' õigused kõigile veebilehtedele?",
"ClickHereToSetTheCookieOnDomain": "Vajuta siia, et käesolevasse veebisirvikusse tekitada küpsis, mis ei lase sinu külastusi arvestada veebilehel %s",
"DeleteConfirm": "Kas oled kindel, et soovid %s kustutada?",
"Email": "E-post",
@@ -13,11 +12,9 @@
"ExceptionEditAnonymous": "Anonüümset kasutajat ei saa muuta ega kustutada. Piwik kasutab seda määratlemaks kasutajat, kes ei ole veel sisse loginud. Näiteks, saad teha statistika lubada 'view' statistikat õigused 'anonymous' kasutajale.",
"ExceptionEmailExists": "Sellise e-mailiga '%s' kasutaja on olemas.",
"ExceptionInvalidEmail": "Emaili aadress ei ole õiges formaadis.",
- "ExceptionLoginExists": "Kasutajanimi '%s' on kasutusel.",
"ExceptionUserDoesNotExist": "Kasutaja '%s' puudub.",
"ExcludeVisitsViaCookie": "Arva ennast külastajate hulgast välja kasutades küpsist",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Kui soovid salasõna vahetada, siis sisesta siia uus. Vastasel korral jäta tühjaks.",
- "MainDescription": "Otsusta millistel kasutajatel on ligipääs analüütikale. Saad seada õigused kõigile veebilehtedele korraga.",
"ManageAccess": "Halda ligipääsu",
"MenuAnonymousUserSettings": "Tundmatu kasutaja seaded",
"MenuUsers": "Kasutajaid",
@@ -37,6 +34,6 @@
"UsersManagement": "Kasutajate haldamine",
"UsersManagementMainDescription": "Loo uusi kasutajakontosid või uuenda olemasolevaid. Saad seada nende õigused ülalpool.",
"YourUsernameCannotBeChanged": "Sinu kasutajanime ei saa muuta.",
- "YourVisitsAreNotIgnored": "%sPiwik ei arva sinu külastusi statistikast välja%s (ignoreerimiseks vajalikku küpsist ei leitud sirvikust)."
+ "YourVisitsAreNotIgnored": "%1$sPiwik ei arva sinu külastusi statistikast välja%2$s (ignoreerimiseks vajalikku küpsist ei leitud sirvikust)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/eu.json b/plugins/UsersManager/lang/eu.json
index 37a285675fa4341a3902a1344d35926b4e500896..1d1a76f05a55c5751192f5575bc71138e8605989 100644
--- a/plugins/UsersManager/lang/eu.json
+++ b/plugins/UsersManager/lang/eu.json
@@ -4,7 +4,6 @@
"Alias": "Alias",
"AllWebsites": "Webgune guztiak",
"ApplyToAllWebsites": "Aplikatu webgune guztiei",
- "ChangeAllConfirm": "Ziur zaude '%s'(r)en baimenak aldatu nahi dituzula webgune guztietan?",
"DeleteConfirm": "Ziur zaude %s erabiltzailea ezabatu nahi duzula?",
"Email": "E-posta",
"ExceptionAccessValues": "access parametroak ondorengo balioetako bat izan behar du: [ %s ]",
@@ -13,10 +12,7 @@
"ExceptionEditAnonymous": "anonymous erabiltzailea ezin da editatu edo ezabatu. Saioa hasi gabeko erabiltzaileak definitzeko erabiltzen du Piwik-ek. Adibidez, estatistikak publiko egiteko 'ikusi' atzipena eman besterik ez duzu 'anonymous' erabiltzailearentzat.",
"ExceptionEmailExists": "'%s' helbide elektronikoa duen erabiltzailea badago.",
"ExceptionInvalidEmail": "Helbide elektronikoaren formatua baliogabea da.",
- "ExceptionInvalidLoginFormat": "Erabiltzaile-izenak %1$s eta %2$s karaktere artekoa izan behar du luzeran eta letrak, zenbakiak edo '_' edo '-' edo '.' karaktereak izan ditzake soilik.",
- "ExceptionLoginExists": "'%s' erabiltzaile-izena badago.",
"ExceptionUserDoesNotExist": "'%s' erabiltzailea ez dago.",
- "MainDescription": "Erabaki zein erabiltzailek atzi dezaketen Piwik zure webguneetan. Webgune guztietarako baimenak ere ezar ditzakezu ekintza bakarrean.",
"ManageAccess": "Kudeatu atzipena",
"MenuUsers": "Erabiltzaileak",
"PrivAdmin": "Kudeatu",
diff --git a/plugins/UsersManager/lang/fa.json b/plugins/UsersManager/lang/fa.json
index 97d3bc09bbba3ca44083a444f7706ea24a3ae2bb..199137d4112bd3b2cfdc75795515073a6256e8a7 100644
--- a/plugins/UsersManager/lang/fa.json
+++ b/plugins/UsersManager/lang/fa.json
@@ -5,7 +5,6 @@
"AllWebsites": "همه وب سایت ها",
"AnonymousUserHasViewAccess2": "گزارش تجزیه Ùˆ تØلیل Ùˆ اطلاعات بازدید کنندگان خود را علنی قابل مشاهده است.",
"ApplyToAllWebsites": "اعمال بر روی تمام وبسایت ها",
- "ChangeAllConfirm": "آیا شما مطمئن هستید که می خواهید دسترسی های \"%s\" را در تمام وبسایت ها تغییر دهید؟",
"ChangePasswordConfirm": "تغییر رمز عبور به نیز token_auth کاربر را تغییر دهید. آیا شما واقعا میخواهید ادامه دهید؟",
"ClickHereToDeleteTheCookie": "اینجا را کلیک کنید Ú©ÙˆÚ©ÛŒ را برای ØØ°Ù Ùˆ Piwik پیگیری بازدیدکننده داشته است خود را",
"ClickHereToSetTheCookieOnDomain": "اینجا کلیک کنید تا یک کوکی تنظیم شود که مانع ردیابی بازدیدهای شما از سایت هایی شود که توسط پیویک ردیابی می شوند روی %s",
@@ -18,9 +17,7 @@
"ExceptionEditAnonymous": "کاربر گمنامی را نمی توان به ویرایش Ùˆ یا Øذ٠شده است. توسط Piwik مورد استÙاده قرار Ù…ÛŒ گیرد برای تعری٠یک کاربر است Ú©Ù‡ هنوز وارد سایت نشده هنوز. به عنوان مثال، شما Ù…ÛŒ توانید آمار خود را عمومی Ùˆ با اعطای 'مشاهده' دسترسی به \"کاربر ناشناس.",
"ExceptionEmailExists": "کاربر با ایمیل \"%s\" هم اکنون وجود دارد.",
"ExceptionInvalidEmail": "ایمیل به Ùرمت معتبر نیست.",
- "ExceptionInvalidLoginFormat": "نام کاربری باید بین %1$s Ùˆ %2$s کاراکتر باشد Ùˆ Ùقط شامل Øرو٠، اعداد یا کاراکترهای '_' یا '-' یا '.' یا '@' یا'+' باشد.",
"ExceptionInvalidPassword": "اندازه رمزعبور باید بین %1$s و %2$s کاراکتر باشد.",
- "ExceptionLoginExists": "نام کاربری '%s' هم اکنون وجود دارد.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth انتظار رمز عبور MD5-hashed (32 کاراکتر رشته طولانی). لطÙا تماس بگیرید تابع md5 () از رمز عبور را قبل از Ùراخوانی این روش.",
"ExceptionUserDoesNotExist": "کاربر \"%s\" وجود ندارد.",
"ExcludeVisitsViaCookie": "Ù…Øروم بازدیدکننده داشته است خود را با استÙاده از Ú©ÙˆÚ©ÛŒ برای نگهداری اطلاعات استÙاده Ù…ÛŒ",
@@ -28,7 +25,6 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "اگر می خواهید از نوع رمز عبور را تغییر جدید است. در غیر این صورت این قسمت را خالی بگذارید.",
"InjectedHostCannotChangePwd": "شما هم اکنون در Øال بازدید توسط یک میزبان ناشناخته هستید(%1$s). شما نمی توانید رمز عبورتان را تغییر دهید تا زمانی Ú©Ù‡ این مشکل را ØÙ„ نکرده اید.",
"LastSeen": "آخرین بازدید",
- "MainDescription": "تصمیم بگیرید که کاربران که دسترسی Piwik را روی وب سایت خود را دارند. شما همچنین می توانید مجوز در تمام وب سایت در یک بار تنظیم شده است.",
"ManageAccess": "مدیریت دسترسی",
"MenuAnonymousUserSettings": "تنظیمات کاربران ناشناس",
"MenuUsers": "کاربران",
diff --git a/plugins/UsersManager/lang/fi.json b/plugins/UsersManager/lang/fi.json
index d5a2c941df509048630a7c325cbfd8c63dc8af6f..8a39276cae136adc603f5a20de2b2a88afeca750 100644
--- a/plugins/UsersManager/lang/fi.json
+++ b/plugins/UsersManager/lang/fi.json
@@ -6,13 +6,11 @@
"AnonymousUserHasViewAccess": "Huom: käyttäjällä %1$s on %2$s pääsy tälle verkkosivulle.",
"AnonymousUserHasViewAccess2": "Analyysiraporttisi ja kävijätietosi ovat julkisia.",
"ApplyToAllWebsites": "Päivitä kaikille sivuille",
- "ChangeAllConfirm": "Haluatko varmasti vaihtaa käyttäjän \"%s\" oikeudet kaikille sivuille?",
"ChangePasswordConfirm": "Salasanan vaihtaminen vaihtaa myös käyttäjän token_auth:n. Haluatko varmasti jatkaa?",
"ClickHereToDeleteTheCookie": "Paina tästä poistaaksesi cookie",
"ClickHereToSetTheCookieOnDomain": "Paina tästä luodaksesi cookie sivulle %s",
"ConfirmGrantSuperUserAccess": "Haluatko varmasti antaa käyttäjälle '%s' Superkäyttäjäoikeudet? Varoitus: käyttäjä saa pääsyn kaikille verkkosivuille ja voi suorittaa hallinnollisia toimenpiteitä.",
"ConfirmProhibitMySuperUserAccess": "%s, haluatko varmasti poistaa omat Superkäyttäjäoikeutesi? Menetät kaikki oikeudet ja pääsyn kaikille verkkosivuille sekä kirjaudut ulos Piwikistä.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Haluatko varmasti poistaa Superkäyttäjäoikeudet käyttäjältä '%s'? Käyttäjä menettää kaikki oikeudet ja pääsyn kaikille verkkosivuille. Muista asettaa oikeudet tarvittaville verkkosivuille jälkikäteen, mikäli tarpeellista.",
"DeleteConfirm": "Haluatko varmasti poistaa käyttäjän %s?",
"Email": "Sähköposti",
"EmailYourAdministrator": "%1$sLähetä ylläpitäjällesi sähköpostia ongelmasta%2$s.",
@@ -23,9 +21,7 @@
"ExceptionEditAnonymous": "Anonyymikäyttäjää ei voi muokata tai poistaa. Se on Piwikin sisäinen tunnus käyttäjälle, joka ei ole kirjautunut sisään. Voit esimerkiksi julkaista tilastoja kaikille sallimalla anonyymikäyttäjälle katsomisoikeuden.",
"ExceptionEmailExists": "Käyttäjä sähköpostilla '%s' on jo olemassa.",
"ExceptionInvalidEmail": "Sähköposti ei ole kelvollinen.",
- "ExceptionInvalidLoginFormat": "Tunnus täytyy olla %1$s-%2$s merkkiä pitkä ja saa siältää vain kirjaimia, numeroita ja merkkejä '_', '-' ja '.'",
"ExceptionInvalidPassword": "Salasanan pituuden täytyy olla %1$s ja %2$s välillä.",
- "ExceptionLoginExists": "Tunnus '%s' on jo olemassa.",
"ExceptionPasswordMD5HashExpected": "UserManager.getTokenAuth haluaa MD5-tiivisteen salasanastasi (32 merkkiä pitkä merkkijono). Kutsu md5()-funktiota salasanallesi ennen kutsumista.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Superkäyttäjäoikeuksien poistaminen käyttäjältä '%s' ei ole mahdollista.",
"ExceptionSuperUserAccess": "Tällä käyttäjällä on jo Superkäyttäjäoikeudet ja oikeudet muokata kaikkia verkkosivuja Piwikissä. Voit poistaa Superkäyttäjäoikeudet tältä käyttäjältä ja yrittää uudelleen.",
@@ -36,7 +32,6 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Jos haluat vaihtaa salasanan, kirjoita uusi. Muuten jätä tyhjäksi.",
"InjectedHostCannotChangePwd": "Olet sivulla tällä hetkellä tuntemattoman isännän kautta (%1$s). Et voi vaihtaa salasanaasi ennen kuin tämä ongelma on korjattu.",
"LastSeen": "Nähty viimeeksi",
- "MainDescription": "Määrittele, millä käyttäjillä on oikeus verkkosivulle. Voit asettaa oikeuksia kaikille sivuille yhdellä kertaa.",
"ManageAccess": "Hallitse oikeuksia",
"MenuAnonymousUserSettings": "Anonyymin käyttäjän asetukset",
"MenuUsers": "Käyttäjät",
@@ -59,7 +54,7 @@
"UsersManagementMainDescription": "Lisää uusia käyttäjiä tai päivitä olemassaolevia. Voit asettaa oikeudet alla.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Kun käyttäjä ei ole kirjautunut sisään ja käy Piwikissä, heillä on pääsy",
"YourUsernameCannotBeChanged": "Käyttäjätunnusta ei voi vaihtaa.",
- "YourVisitsAreIgnoredOnDomain": "%sPiwik ei seuraa käyntejäsi sivulla %s %s (Piwikin cookie löytyi selaimestasi).",
- "YourVisitsAreNotIgnored": "%sPiwik seuraa käyntejäsi%s (Piwikin cookieta ei löytynyt selaimestasi)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sPiwik ei seuraa käyntejäsi sivulla %2$s %3$s (Piwikin cookie löytyi selaimestasi).",
+ "YourVisitsAreNotIgnored": "%1$sPiwik seuraa käyntejäsi%2$s (Piwikin cookieta ei löytynyt selaimestasi)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/fr.json b/plugins/UsersManager/lang/fr.json
index 4be4e7e10f489d57f5e8eda81c994b6d3395d49d..d0f0719220f84ebd824005564e9f10bb65c2dd0a 100644
--- a/plugins/UsersManager/lang/fr.json
+++ b/plugins/UsersManager/lang/fr.json
@@ -7,16 +7,15 @@
"AnonymousUserHasViewAccess": "Note : l'utilisateur %1$s a un accès en %2$s à ce site web.",
"AnonymousUserHasViewAccess2": "Vos rapports d'analyse et les informations de vos visiteurs sont visibles publiquement.",
"ApplyToAllWebsites": "Appliquer à tous les sites",
- "ChangeAllConfirm": "Êtes-vous sûr de vouloir changer les permissions de '%s' sur tous les sites Internet?",
"ChangePasswordConfirm": "Modifier le mot de passe modifiera aussi la clef d'authentification des utilisateurs. Voulez-vous vraiment continuer?",
"ClickHereToDeleteTheCookie": "Cliquez ici pour supprimer le cookie et pour que Piwik prenne en compte vos visites",
"ClickHereToSetTheCookieOnDomain": "Cliquez ici pour mettre en place un cookie qui exclura vos visites sur ceux de vos sites web qui sont analysés par Piwik sur %s",
"ConfirmGrantSuperUserAccess": "Voulez vous vraiment donner un accès super utilisateur à '%s'? Attention : cet utilisateur va avoir accès à tous les sites web et sera capable d'effectuer des tâches administratives.",
"ConfirmProhibitMySuperUserAccess": "%s, voulez-vous vraiment supprimer votre accès super utilisateur? Vous allez perdre toutes les permissions et accès aux sites web et serez déconnecté(e) de Piwik.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Souhaitez vous réellement retirer l'accès super utilisateur à \"%s\"? L'utilisateur va perdre toutes les permissions d'accès à l'ensemble des sites web. Assurez vous de lui accorder les permissions requises après si nécessaire.",
"DeleteConfirm": "Êtes-vous sûr de vouloir supprimer l'utilisateur %s?",
"Email": "Courriel",
"EmailYourAdministrator": "%1$sEnvoyez un courriel à votre administrateur à propos de ce problème%2$s.",
+ "EnterUsernameOrEmail": "Entrez un nom d'usager ou une adresse courriel",
"ExceptionAccessValues": "Le paramètre access doit contenir une des valeurs suivantes: [ %s ]",
"ExceptionAdminAnonymous": "Vous ne pouvez pas autoriser l'accès administrateur à l'utilisateur Anonyme.",
"ExceptionDeleteDoesNotExist": "L'utilisateur '%s' est inexistant, il n'a pu être supprimé.",
@@ -24,20 +23,23 @@
"ExceptionEditAnonymous": "L'utilisateur Anonyme ne peut être édité ou supprimé. Il est utilisé pour identifier un utilisateur qui ne s'est pas encore connecté. Par exemple vous pouvez rendre vos statistiques publiques en accordant l'accès 'vue' à l'utilisateur 'anonyme'.",
"ExceptionEmailExists": "L'utilisateur avec l'e-mail '%s' existe déjà .",
"ExceptionInvalidEmail": "L'adresse courriel est invalide.",
- "ExceptionInvalidLoginFormat": "Le login doit contenir entre %1$s et %2$s caractères et être composé uniquement de lettres, chiffres, ou les caractères '_' ou '-' ou '.' ou '@' ou '+'",
"ExceptionInvalidPassword": "La longueur du mot de passe doit être entre %1$s et %2$s caractères.",
- "ExceptionLoginExists": "Le login '%s' existe déjà .",
+ "ExceptionLoginExists": "Le nom d'usager \"%s\" existe déjà .",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth attend un mot de passe haché en MD5 (chaine de 32 caractères). Veuillez appeler la fonction md5() sur le mot de passe avant d'appeler cette méthode.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Retirer l'accès Super Utilisateur à l'utilisateur \"%s\" est impossible.",
"ExceptionSuperUserAccess": "Cet utilisateur possède un accès super utilisateur et a déjà la permission d'accéder et de modifier tous les sites au sein de Piwik. Vous devez supprimer l'accès super utilisateur de cet utilisateur et essayer à nouveau.",
"ExceptionUserDoesNotExist": "L'utilisateur '%s' est inexistant.",
"ExceptionYouMustGrantSuperUserAccessFirst": "Il doit y avoir au moins un utilisateur avec l'accès Super Utilisateur. Veuillez accorder l'accès super utilisateur à un autre utilisateur d'abord.",
+ "ExceptionUserHasViewAccessAlready": "Cet utilisateur a déjà accès à ce site web.",
+ "ExceptionNoValueForUsernameOrEmail": "Veuillez entrer un nom d'usager ou une adresse courriel.",
"ExcludeVisitsViaCookie": "Excluez vos visites en utilisant un cookie",
"ForAnonymousUsersReportDateToLoadByDefault": "Pour les utilisateurs anonymes, date du rapport à charger par défaut",
+ "GiveViewAccess": "Donner un accès de visualisation",
+ "GiveViewAccessTitle": "Donner un accès à un utilisateur existant pour afficher les rapports de %s",
+ "GiveViewAccessInstructions": "Pour donner un accès en visualisation à utilisateur existant à %s entrez son nom d'utilisateur ou adresse courriel",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Si vous souhaitez modifier votre mot de passe tapez en un nouveau. Sinon laissez le champ vide.",
"InjectedHostCannotChangePwd": "Vous êtes actuellement connecté depuis un hôte inconnu (%1$s). Vous ne pourrez modifier votre mot de passe tant que ce problème ne sera pas corrigé.",
"LastSeen": "Vu pour la dernière fois",
- "MainDescription": "Décidez quels utilisateurs ont accès à quels sites. Vous pouvez aussi changer les permissions de tous les sites d'un seul coup.",
"ManageAccess": "Gestion des accès utilisateurs",
"MenuAnonymousUserSettings": "Paramètres utilisateurs anonymes",
"MenuUsers": "Utilisateurs",
@@ -46,7 +48,7 @@
"PersonalSettings": "Paramètres Personnels",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Note : Vous ne pouvez pas modifier les paramètres dans cette section, ce parce que vous n'avez aucun site web accessible par des utilisateurs anonymes.",
"NoUsersExist": "Il n'y a pas encore d'utilisateurs.",
- "PluginDescription": "La Gestion des utilisateurs vous permet d'ajouter des nouveaux utilisateurs, de modifier des existants et de leur assigner des persmissions pour voir ou administrer les sites web.",
+ "PluginDescription": "La gestion des utilisateurs vous permet d'ajouter de nouveaux utilisateurs, de modifier les existants et leur donner accès pour afficher ou administrer des sites web.",
"PrivAdmin": "Administration",
"PrivNone": "Pas d'accès",
"PrivView": "Vue",
@@ -63,7 +65,7 @@
"UsersManagementMainDescription": "Créez de nouveaux utilisateurs ou modifiez-les. Vous pourrez ensuite changer leurs permissions ci-dessus.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Quand les utilisateurs ne sont pas connectés et accèdent à Piwik, ils verront",
"YourUsernameCannotBeChanged": "Votre nom d'utilisateur ne peut pas être modifié.",
- "YourVisitsAreIgnoredOnDomain": "%sVos visites sont ignorées par Piwik sur %s %s(Le cookie d'exclusion de Piwik est présent sur votre navigateur)",
- "YourVisitsAreNotIgnored": "%sVos visites sont prises en compte par Piwik%s (le cookie d'exclusion de Piwik n'a pas été trouvé sur votre navigateur)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sVos visites sont ignorées par Piwik sur %2$s %3$s(Le cookie d'exclusion de Piwik est présent sur votre navigateur)",
+ "YourVisitsAreNotIgnored": "%1$sVos visites sont prises en compte par Piwik%2$s (le cookie d'exclusion de Piwik n'a pas été trouvé sur votre navigateur)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/gl.json b/plugins/UsersManager/lang/gl.json
index 361e2a63766f27c8c6baecbaeb3e8c08858e2d86..e9d99ac7d87b172677ffd558fa5f15ea41189cbf 100644
--- a/plugins/UsersManager/lang/gl.json
+++ b/plugins/UsersManager/lang/gl.json
@@ -4,7 +4,6 @@
"Alias": "Alias",
"AllWebsites": "Todas as webs",
"ApplyToAllWebsites": "Aplicar a todos os sitios",
- "ChangeAllConfirm": "Está seguro que quere cambiar '%s' permisos en todas as páxinas web?",
"DeleteConfirm": "Está seguro de que desexa eliminar ao usuario %s?",
"Email": "Enderezo electrónico",
"ExceptionAccessValues": "O parámetro debe ter acceso a un dos seguintes valores: [%s]",
@@ -12,7 +11,6 @@
"ExceptionDeleteDoesNotExist": "O usuario '%s' non existe, polo que non pode ser eliminado.",
"ExceptionEditAnonymous": "O usuario anónimo non pode ser eliminado ou modificado, xa que é empregado por Piwik para identificar a usuarios non conectados. Por exemplo, pode facer as súas estatÃsticas públicas dando acceso á 'visión' aos visitantes 'anónimos'.",
"ExceptionInvalidEmail": "O enderezo electrónico non ten un formato correcto.",
- "ExceptionLoginExists": "O nome de usuario '%s' xa existe.",
"ExceptionUserDoesNotExist": "O usuario '%s' non existe.",
"ManageAccess": "Administrar o acceso",
"MenuUsers": "Usuario",
diff --git a/plugins/UsersManager/lang/hr.json b/plugins/UsersManager/lang/hr.json
index 5cd41ddfdb4d4223acb5fb04a00964d20cedadbb..a26e5057711f575ff3e77ca94cf64d72ed113549 100644
--- a/plugins/UsersManager/lang/hr.json
+++ b/plugins/UsersManager/lang/hr.json
@@ -2,7 +2,6 @@
"UsersManager": {
"ExceptionEmailExists": "Korisnik sa istim emailom '%s' već postoji.",
"ExceptionInvalidEmail": "Nije dobar format emaila.",
- "ExceptionLoginExists": "Korisnik '%s' već postoji.",
"MenuUsers": "Korisnici",
"MenuUserSettings": "KorisniÄke postavke",
"TypeYourPasswordAgain": "Ponovi novu lozinku.",
diff --git a/plugins/UsersManager/lang/hu.json b/plugins/UsersManager/lang/hu.json
index 0d5e19acf75409791023218de95bb9758e73614c..6e69ddd97e7ab3730207b5a11da54bed2a8f17f4 100644
--- a/plugins/UsersManager/lang/hu.json
+++ b/plugins/UsersManager/lang/hu.json
@@ -4,7 +4,6 @@
"Alias": "Felhasználói név",
"AllWebsites": "Összes weboldal",
"ApplyToAllWebsites": "Alkalmazás minden weboldalra",
- "ChangeAllConfirm": "Biztosan meg akarod változtatni a(z) '%s' jogosultságot az összes weboldalon?",
"ClickHereToDeleteTheCookie": "Kattints ide a szűrés érdekében lementett süti törléséhez, hogy a továbbiakban a Piwik regisztrálja látogatásaid.",
"ClickHereToSetTheCookieOnDomain": "Kattints ide egy, a %s weboldalon történő látogatásaid kiszűréséhez szükséges süti böngésződben történő elmentéséhez.",
"DeleteConfirm": "Biztosan törölni akarod a következő felhasználót: %s?",
@@ -15,14 +14,11 @@
"ExceptionEditAnonymous": "'Névtelen' felhasználó nem szerkeszthetÅ‘ vagy törölhetÅ‘. Ezt a Piwik használja a be nem lépett felhasználók azonosÃtására. Nyilvánossá teheted például statisztikáidat, ha 'megtekintési' jogosultságot adsz a 'névtelen' felhasználók számára.",
"ExceptionEmailExists": "'%s' e-mail cÃmmel már létezik felhasználó.",
"ExceptionInvalidEmail": "Az e-mail cÃm nem megfelelÅ‘ formátumú",
- "ExceptionInvalidLoginFormat": "A felhasználói név csak %1$s-%2$s karakter hosszúságú lehet, és csak betűket, számokat, aláhúzás, kötőjel és pont karaktereket tartalmazhat.",
- "ExceptionLoginExists": "'%s' nevű felhasználó már létezik.",
"ExceptionPasswordMD5HashExpected": "Az UsersManager.getTokenAuth funkció MD5-hashed jelszót vár (32 karakter hosszúságban). Kérjük, alkalmazd a md5() funkciót a jelszón, mielÅ‘tt meghÃvod ezt a metódust.",
"ExceptionUserDoesNotExist": "'%s' nevű felhasználó nem létezik.",
"ExcludeVisitsViaCookie": "Saját látogatások kiszűrése süti segÃtségével",
"ForAnonymousUsersReportDateToLoadByDefault": "A névtelen felhasználók számára alkalmazott alapértelmezett időintervallum",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Ha szeretnéd megváltoztatni a jelszót, Ãrd ide be az újat. Egyéb esetben hagyd üresen ezt a mezÅ‘t.",
- "MainDescription": "Döntsd el, melyik felhasználónak milyen Piwik jogosultságokat biztosÃtasz a weboldaladon. BeállÃthatod a jogosultságokat akár az összes weboldalhoz is egyszerre.",
"ManageAccess": "Hozzáférési jogosultságok kezelése",
"MenuAnonymousUserSettings": "Névtelen felhasználók beállÃtásai",
"MenuUsers": "Felhasználók",
@@ -39,7 +35,7 @@
"UsersManagementMainDescription": "Új felhasználó hozzáadása, vagy a meglévÅ‘k beállÃtása. Feljebb beállÃthatod a jogosultságaikat.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Amikor a felhasználók nincsenek belépve a Piwik-be és Ãgy keresik fel a Piwik-et, akkor a következÅ‘höz férjenek hozzá:",
"YourUsernameCannotBeChanged": "Felhasználói nevedet nem lehet megváltoztatni",
- "YourVisitsAreIgnoredOnDomain": "%sLátogatásaidat nem veszi figyelembe a Piwik itt: %s %s (a Piwik megfelelő sütijét megtaláltuk a böngésződben lementve).",
- "YourVisitsAreNotIgnored": "%sLátogatásaid nem kerültek ignorálásra a Piwik által%s (Az ehhez szükséges süti nem volt megtalálható a böngésződben.)"
+ "YourVisitsAreIgnoredOnDomain": "%1$sLátogatásaidat nem veszi figyelembe a Piwik itt: %2$s %3$s (a Piwik megfelelő sütijét megtaláltuk a böngésződben lementve).",
+ "YourVisitsAreNotIgnored": "%1$sLátogatásaid nem kerültek ignorálásra a Piwik által%2$s (Az ehhez szükséges süti nem volt megtalálható a böngésződben.)"
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/id.json b/plugins/UsersManager/lang/id.json
index 9f65524a42793f6ddd76eeb558ae29938bd14bcd..f7d1755dd0962d96a44eed3e4ed1525d034ce161 100644
--- a/plugins/UsersManager/lang/id.json
+++ b/plugins/UsersManager/lang/id.json
@@ -6,7 +6,6 @@
"AnonymousUserHasViewAccess": "Catatan: pengguna %1$s memiliki akses %2$s di situs ini.",
"AnonymousUserHasViewAccess2": "Laporan analitis dan informasi pengunjung Anda dapat dilihat secara terbuka.",
"ApplyToAllWebsites": "Terapkan ke seluruh situs",
- "ChangeAllConfirm": "Apakah Anda yakin mengubah perizinan '%s' seluruh situs?",
"ChangePasswordConfirm": "Mengubah sandi juga mengubah token_auth pengguba. Yakin melanjutkan?",
"ClickHereToDeleteTheCookie": "Klik di sini untuk menghapus kuki dan mengizinkan Piwik melacak kunjungan Anda",
"ClickHereToSetTheCookieOnDomain": "Klik di sini untuk mengatur kuki yang akan mengecualikan kunjungan Anda ke situs yang dilacak oleh Piwik %s",
@@ -19,16 +18,13 @@
"ExceptionEditAnonymous": "Pengguna anonim tidak dapat dihapus atau disunting. Piwik menggunakan pengguna ini untuk menjelaskan pengguna yang belum masuk. Misalnya, Anda dapat membuat statistik publik Anda dengan memberi hak `Tampil` untuk pengguna 'anonim'.",
"ExceptionEmailExists": "Pengguna dengan surel '%s' telah tersedia.",
"ExceptionInvalidEmail": "Surel tidak memiliki bentuk sahih.",
- "ExceptionInvalidLoginFormat": "Nama-id harus memiliki panjang antara %1$s dan %2$s karakter dan mengandung hanya huruf, angka, atau karakter '_' atau '-' atau '.' atau '@' atau '+'",
"ExceptionInvalidPassword": "Panjang sandi harus antara %1$s dan %2$s karakter.",
- "ExceptionLoginExists": "Nama-id '%s' telah tersedia.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth membutuhkan sandi acak MD5 (32 karakter larik panjang). Silakan panggil fungsi md5() dalam sandi sebelum memanggil metode ini.",
"ExceptionUserDoesNotExist": "Pengguan '%s' tida ada.",
"ExcludeVisitsViaCookie": "Kecualikan kunjungan Anda menggunakan kuki",
"ForAnonymousUsersReportDateToLoadByDefault": "Tanggal laporan yang dimuat secara asali untuk pengguna anonim",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Bila Anda ingin mengganti sandi, ketik sandi baru. Bila tidak, biarkan ini kosong.",
"InjectedHostCannotChangePwd": "Sekarang Anda berkunjung dengan inang yang tidak dikenal (%1$s). Anda tidak dapat mengubah sandi Anda hingga masalah ini diperbaiki.",
- "MainDescription": "Tentukan pengguna yang memilik akses Piwik ke situs Anda. Anda juga dapat mengatur perizinan seluruh Situs dalam satu kali.",
"ManageAccess": "Atur akses",
"MenuAnonymousUserSettings": "Pengaturan pengguna anonim",
"MenuUsers": "Pengguna",
@@ -47,7 +43,7 @@
"UsersManagementMainDescription": "Menciptakan pengguna baru atau memperbarui pengguna yang telah ada. Anda dapat mengatur perizinan di atas.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Bila pengguna tidak masuk-log dan mengunjungi Piwik, mereka harus mengakses",
"YourUsernameCannotBeChanged": "Nama-id Anda tidak dapat diubah.",
- "YourVisitsAreIgnoredOnDomain": "%sKunjungan Anda diabaikan oleh Piwik dalam %s %s (kuki pengecualian ditemukan dalam peramban Anda).",
- "YourVisitsAreNotIgnored": "%sKunjungan Anda tidak diabaikan oleh Piwik%s (kuki pengecualian tidak ditemukan dalam peramban Anda)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sKunjungan Anda diabaikan oleh Piwik dalam %2$s %3$s (kuki pengecualian ditemukan dalam peramban Anda).",
+ "YourVisitsAreNotIgnored": "%1$sKunjungan Anda tidak diabaikan oleh Piwik%2$s (kuki pengecualian tidak ditemukan dalam peramban Anda)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/it.json b/plugins/UsersManager/lang/it.json
index 0b657894166571846655fc7bc703f68cd153385e..aad1358da80b60d1a79f750847c9212738e8d921 100644
--- a/plugins/UsersManager/lang/it.json
+++ b/plugins/UsersManager/lang/it.json
@@ -7,16 +7,17 @@
"AnonymousUserHasViewAccess": "Nota: l'utente %1$s ha un accesso %2$s a questo sito.",
"AnonymousUserHasViewAccess2": "I tuoi report statistici e le informazioni sui tuoi visitatori sono visibili pubblicamente.",
"ApplyToAllWebsites": "Applica a tutti i siti",
- "ChangeAllConfirm": "Sei sicuro di voler cambiare i permessi di '%s' in tutti i siti?",
+ "ChangeAllConfirm": "Sei sicuro di voler dare accesso '%s' a tutti i siti web?",
"ChangePasswordConfirm": "Il cambio password cambierà anche il token_auth dell'utente. Vuoi veramente continuare?",
"ClickHereToDeleteTheCookie": "Cancella il cookie affinché Piwik tracci nuovamente le tue visite",
"ClickHereToSetTheCookieOnDomain": "Crea un cookie che escluderà le tue visite dai siti monitorati con Piwik %s",
"ConfirmGrantSuperUserAccess": "Vuoi veramente dare a '%s' l'accesso Super User? Attenzione: l'utente avrà accesso a tutti i siti web e potrà eseguire attività amministrative.",
"ConfirmProhibitMySuperUserAccess": "%s, vuoi veramente rimuovere il tuo accesso Super User? Perderai tutti i permessi e l'accesso a tutti i siti web e verrai escluso da Piwik.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Vuoi veramente togliere l'accesso Super User a '%s'? L'utente perderà tutti i permessi e l'accesso a tutti i siti web. Assicurati di impostare, se necessario, i permessi in seguito.",
+ "ConfirmProhibitOtherUsersSuperUserAccess": "Vuoi veramente togliere l'accesso Super User a '%s'? L'utente perderà tutti i permessi e l'accesso a tutti i siti web. Assicurati di dare successivamente l'accesso ai siti richiesti, se necessario.",
"DeleteConfirm": "Sei sicuro di voler cancellare l'utente '%s'?",
"Email": "Email",
"EmailYourAdministrator": "%1$sManda un'email al tuo amministratore su questo problema%2$s.",
+ "EnterUsernameOrEmail": "Inserisci nome utente o indirizzo email",
"ExceptionAccessValues": "Il parametro per l'accesso deve avere uno dei seguenti valori: [ %s ]",
"ExceptionAdminAnonymous": "Non puoi dare privilegi da amministratore agli utenti anonimi.",
"ExceptionDeleteDoesNotExist": "L'utente '%s' non esiste, di conseguenza non può essere eliminato.",
@@ -26,18 +27,23 @@
"ExceptionInvalidEmail": "L'e-mail inserita non è valida.",
"ExceptionInvalidLoginFormat": "Il nome utente deve essere lungo tra %1$s e %2$s caratteri e contenere solo lettere, numeri o i caratteri '_' o '-' o '.' o '@' o '+'",
"ExceptionInvalidPassword": "La lunghezza della password deve essere tra %1$s e %2$s caratteri.",
- "ExceptionLoginExists": "L'utente '%s' già esiste.",
+ "ExceptionLoginExists": "Il nome utente '%s' esiste già .",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth si aspetta una password MD5 hash (stringa lunga 32 caratteri). Si prega di richiamare la funzione md5() sulla password prima di richiamare questo metodo.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "È impossibile togliere l'accesso Super User all'utente '%s'.",
"ExceptionSuperUserAccess": "Questo utente ha l'accesso Super User e ha già i permessi per accedere e modificare tutti i siti web in Piwik. Puoi togliere l'accesso Super User a questo utente e provare di nuovo.",
"ExceptionUserDoesNotExist": "L'utente '%s' non esiste.",
"ExceptionYouMustGrantSuperUserAccessFirst": "Ci deve essere almeno un utente con l'accesso Super User. Si prega di dare prima l'accesso Super User a un altro utente.",
+ "ExceptionUserHasViewAccessAlready": "Questo utente ha già accesso a questo sito.",
+ "ExceptionNoValueForUsernameOrEmail": "Per favore inserisci un nome utente o un indirizzo email.",
"ExcludeVisitsViaCookie": "Escludi le tue visite usando un cookie",
"ForAnonymousUsersReportDateToLoadByDefault": "Per utenti anonimi, data report da caricare di default",
+ "GiveViewAccess": "Dai l'accesso in lettura",
+ "GiveViewAccessTitle": "Dai a un utente esistente l'accesso per vedere i report per %s",
+ "GiveViewAccessInstructions": "Per dare a un utente esistente l'accesso in visione per %s inserisci il nome utente o l'indirizzo email di un utente esistente",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Se vuoi cambiare la password scrivine qui una nuova. Altrimenti lascia pure in bianco.",
"InjectedHostCannotChangePwd": "Al momento stai navigando da un host sconosciuto (%1$s). Non è possibile modificare la password fino a quando questo problema non verrà risolto.",
"LastSeen": "Visto l'ultima volta",
- "MainDescription": "Decidi quali utenti possono accedere alle statistiche Piwik dei siti web. Puoi anche impostare i permessi di tutti i siti in una volta sola.",
+ "MainDescription": "Decidi quali utenti devono avere accesso ai tuoi siti web. Puoi anche dare l'accesso a tutti i siti web in una volta sola scegliendo \"Applica a tutti i siti web\" nel selettore dei siti web.",
"ManageAccess": "Amministra l'accesso",
"MenuAnonymousUserSettings": "Impostazioni utente anonimo",
"MenuUsers": "Utenti",
@@ -46,7 +52,7 @@
"PersonalSettings": "Impostazioni personali",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Nota: Non puoi cambiare le impostazioni in questa sezione perché nessun sito è accessibile dagli utenti anonimi.",
"NoUsersExist": "Non ci sono ancora utenti.",
- "PluginDescription": "La Gestione Utenti ti permette di aggiungere nuovi utenti, modificare quelli esistenti e assegnare loro i permessi per vedere o amministrare i siti web.",
+ "PluginDescription": "La Gestione Utenti ti permette di aggiungere nuovi utenti, modificare utenti esistenti e dare loro l'accesso per vedere o amministrare i siti web.",
"PrivAdmin": "Amministra Piwik",
"PrivNone": "Nessun accesso",
"PrivView": "Vista",
@@ -63,7 +69,7 @@
"UsersManagementMainDescription": "Crea nuovi utenti o aggiorna quelli esistenti. Puoi anche scegliere quali operazioni permettere tramite la tabella qui sopra.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Quando gli utenti non si sono autenticati in Piwik, possono accedere a",
"YourUsernameCannotBeChanged": "Il tuo nome utente non può essere cambiato.",
- "YourVisitsAreIgnoredOnDomain": "%sLe tue visite sono ignorate da Piwik su %s %s (il cookie 'ignora visite' è stato trovato nel tuo browser).",
- "YourVisitsAreNotIgnored": "%sLe tue visite non sono ignorate da Piwik%s (il cookie 'ignora visite' non è stato trovato nel tuo browser)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sLe tue visite sono ignorate da Piwik %2$s %3$s (il cookie 'ignora visite' di Piwik è stato trovato nel tuo browser).",
+ "YourVisitsAreNotIgnored": "%1$sLe tue visite non sono ignorate da Piwik%2$s (il cookie 'ignora visite' di Piwik non è stato trovato nel tuo browser)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/ja.json b/plugins/UsersManager/lang/ja.json
index 2d1bf2acb5b435e938d8863b2b4fe5543ba2f7da..a6943e10e9235c28f04406bddb458c4acc044141 100644
--- a/plugins/UsersManager/lang/ja.json
+++ b/plugins/UsersManager/lang/ja.json
@@ -7,13 +7,11 @@
"AnonymousUserHasViewAccess": "注) %1$s ユーザーã¯ã‚¦ã‚§ãƒ–サイトã¸ã® %2$s アクセス権をæŒã£ã¦ã„ã¾ã™ã€‚",
"AnonymousUserHasViewAccess2": "ã‚ãªãŸã®è§£æžãƒ¬ãƒãƒ¼ãƒˆã¨ãƒ“ã‚¸ã‚¿ãƒ¼æƒ…å ±ã¯ã€èª°ã§ã‚‚閲覧å¯èƒ½ã§ã™ã€‚",
"ApplyToAllWebsites": "全ウェブサイトã«é©ç”¨",
- "ChangeAllConfirm": "本当ã«å…¨ã‚¦ã‚§ãƒ–サイトã§ã® '%s' ã®ãƒ‘ーミッションを変更ã—ã¾ã™ã‹ï¼Ÿ",
"ChangePasswordConfirm": "パスワードを変更ã™ã‚‹ã¨ã€ãƒˆãƒ¼ã‚¯ãƒ³ã‚‚変更ã•ã‚Œã¾ã™ã€‚本当ã«ç¶šã‘ã¾ã™ã‹ï¼Ÿ",
"ClickHereToDeleteTheCookie": "Cookie を削除ã—ã€Piwik ãŒã‚ãªãŸè‡ªèº«ã®ãƒ“ジットもトラッã‚ングã™ã‚‹ã‚ˆã†ã«ã™ã‚‹ã«ã¯ã€ã“ã“をクリックã—ã¾ã™ã€‚",
"ClickHereToSetTheCookieOnDomain": "%s ã® Piwik ã«ãƒˆãƒ©ãƒƒã‚ングã•ã‚Œã‚‹ã‚¦ã‚§ãƒ–サイトã§ã®ã€ã‚ãªãŸè‡ªèº«ã®ãƒ“ジットを除外ã™ã‚‹ãŸã‚ã® Cookie をセットã™ã‚‹ã«ã¯ã€ã“ã“をクリックã—ã¾ã™ã€‚",
"ConfirmGrantSuperUserAccess": "'%s' ã«å¯¾ã—ã€ã‚¹ãƒ¼ãƒ‘ーユーザーアクセス権を本当ã«ä»˜ä¸Žã—ã¦ã‚ˆã‚ã—ã„ã§ã™ã‹? è¦å‘Š:スーパーユーザーアクセス権を付与ã•ã‚ŒãŸãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ã€ã™ã¹ã¦ã®ã‚¦ã‚§ãƒ–サイトã¸ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ã‚’æŒã¡ã€ã‚らゆる管ç†ã‚¿ã‚¹ã‚¯ã‚’実行ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚",
"ConfirmProhibitMySuperUserAccess": "%sã€ã‚ãªãŸè‡ªèº«ã®ã‚¹ãƒ¼ãƒ‘ーユーザーアクセス権を本当ã«å‰Šé™¤ã—ã¦ã‚ˆã‚ã—ã„ã§ã™ã‹? 削除後ã€ã™ã¹ã¦ã®ã‚¦ã‚§ãƒ–サイトã¸ã®å…¨æ¨©é™ã¨ã‚¢ã‚¯ã‚»ã‚¹ã‚’失ã„ã€Piwik ã‹ã‚‰ãƒã‚°ã‚¢ã‚¦ãƒˆã•ã‚Œã¾ã™ã€‚",
- "ConfirmProhibitOtherUsersSuperUserAccess": "スーパーユーザーアクセス権を '%s' ã‹ã‚‰æœ¬å½“ã«å‰Šé™¤ã—ã¦ã‚ˆã‚ã—ã„ã§ã™ã‹? スーパーユーザーアクセス権を削除ã•ã‚ŒãŸãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ã€ã™ã¹ã¦ã®ã‚¦ã‚§ãƒ–サイトã¸ã®å…¨æ¨©é™ã¨ã‚¢ã‚¯ã‚»ã‚¹ã‚’失ã„ã¾ã™ã€‚削除後ã¯ã€å¿…è¦ã«å¿œã˜ã¦å„ウェブサイトã¸ã®æ¨©é™ã‚’è¨å®šã—ã¦ãã ã•ã„。",
"DeleteConfirm": "本当ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼ %s を削除ã—ã¾ã™ã‹ï¼Ÿ",
"Email": "メール",
"EmailYourAdministrator": "%1$sE-mail your administrator about this problem%2$s 。",
@@ -24,9 +22,7 @@
"ExceptionEditAnonymous": "anonymous ユーザーã¯ã€Piwik ãŒãƒã‚°ã‚¤ãƒ³ã—ã¦ã„ãªã„ユーザーを定義ã™ã‚‹ãŸã‚ã«ä½¿ç”¨ã™ã‚‹ãŸã‚ã€ç·¨é›†ã‚„削除ã¯ã§ãã¾ã›ã‚“。 例ãˆã°ã€'anonymous' ユーザー㫠'表示' 権é™ã‚’与ãˆã‚‹ã“ã¨ã«ã‚ˆã£ã¦ã€çµ±è¨ˆã‚’パブリックã«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚",
"ExceptionEmailExists": "メールアドレス㌠'%s' ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚",
"ExceptionInvalidEmail": "メールアドレスãŒæœ‰åŠ¹ãªå½¢å¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。",
- "ExceptionInvalidLoginFormat": "ユーザーåã¯ã€è‹±æ•°å—ã€'_'（アンダーãƒãƒ¼ï¼‰ã€'-'（ãƒã‚¤ãƒ•ãƒ³ï¼‰ã€'@'（アットマーク）ã®ã¿ã‚’å«ã‚€ã€%1$s～%2$s æ–‡å—ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚",
"ExceptionInvalidPassword": "パスワードã®é•·ã•ã¯ %1$s〜%2$s æ–‡å—ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚",
- "ExceptionLoginExists": "ユーザーå '%s' ã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth ã¯ã€MD5 ãƒãƒƒã‚·ãƒ¥å€¤ã®ãƒ‘スワード（32æ–‡å—é•·ã®æ–‡å—列）を想定ã—ã¦ã„ã¾ã™ã€‚ ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã‚’コールã™ã‚‹å‰ã«ã€ãƒ‘スワードã«å¯¾ã—㦠md5() 関数をコールã—ã¦ãã ã•ã„。",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "スーパーユーザーアクセスをユーザー '%s' ã‹ã‚‰å‰Šé™¤ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。",
"ExceptionSuperUserAccess": "ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ã‚¹ãƒ¼ãƒ‘ーユーザーアクセス権をæŒã¡ã€æ—¢ã« Piwik ã®å…¨ã‚¦ã‚§ãƒ–サイトã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ãŠã‚ˆã³ä¿®æ£ã®æ¨©é™ã‚’æŒã£ã¦ã„ã¾ã™ã€‚ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‹ã‚‰ã‚¹ãƒ¼ãƒ‘ーユーザーアクセス権を削除ã—ã€å†åº¦è©¦ã™ã“ã¨ãŒã§ãã¾ã™ã€‚",
@@ -37,7 +33,6 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "パスワードを変更ã—ãŸã„å ´åˆã¯ã€æ–°ã—ã„パスワードを入力ã—ã¾ã™ã€‚ 変更ã—ãªã„å ´åˆã¯ã€ç©ºæ¬„ã®ã¾ã¾ã«ã—ã¾ã™ã€‚",
"InjectedHostCannotChangePwd": "ç¾åœ¨æœªçŸ¥ã®ãƒ›ã‚¹ãƒˆ (%1$s) ã§è¨ªå•ã—ã¦ã„ã¾ã™ã€‚ã“ã®å•é¡ŒãŒè§£æ±ºã™ã‚‹ã¾ã§ã€ãƒ‘スワードã®å¤‰æ›´ãŒã§ãã¾ã›ã‚“。",
"LastSeen": "最終表示",
- "MainDescription": "å„ユーザーã®ã‚¦ã‚§ãƒ–サイト上ã§ã® Piwik 権é™ã‚’決定ã—ã¾ã™ã€‚ ã¾ãŸã€å…¨ã‚¦ã‚§ãƒ–サイトã®ãƒ‘ーミッションを一度ã«è¨å®šã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚",
"ManageAccess": "権é™ã®ç®¡ç†",
"MenuAnonymousUserSettings": "anonymous ユーザーã®è¨å®š",
"MenuUsers": "ユーザー",
@@ -46,7 +41,6 @@
"PersonalSettings": "個人è¨å®š",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "注) 匿åユーザーãŒã‚¢ã‚¯ã‚»ã‚¹ã§ãるウェブサイトをãŠæŒã¡ã§ãªã„ãŸã‚ã€ã“ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã§ã¯è¨å®šã®å¤‰æ›´ãŒã§ãã¾ã›ã‚“。",
"NoUsersExist": "ã¾ã ユーザーãŒã„ã¾ã›ã‚“。",
- "PluginDescription": "ユーザー管ç†ã§ã¯ã€æ–°ã—ã„ユーザーã®è¿½åŠ ã€æ—¢å˜ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ç·¨é›†ã€ãŠã‚ˆã³ web サイトã®ç®¡ç†ã‚„閲覧ã®æ¨©é™ã‚’è¨å®šã§ãã¾ã™ã€‚",
"PrivAdmin": "管ç†",
"PrivNone": "権é™ãªã—",
"PrivView": "ビュー",
@@ -63,7 +57,7 @@
"UsersManagementMainDescription": "æ–°è¦ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ä½œæˆã‚„ã€æ—¢å˜ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’æ›´æ–°ã—ã¾ã™ã€‚ ãã®å¾Œã€ä¸Šã§ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒ‘ーミッションã®è¨å®šãŒã§ãã¾ã™ã€‚",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "未ãƒã‚°ã‚¤ãƒ³ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒ Piwik ã«ã‚¢ã‚¯ã‚»ã‚¹ã—ãŸéš›ã«è¡¨ç¤ºã™ã‚‹ç”»é¢",
"YourUsernameCannotBeChanged": "ã‚ãªãŸã®ãƒ¦ãƒ¼ã‚¶ãƒ¼åを変更ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。",
- "YourVisitsAreIgnoredOnDomain": "%sã‚ãªãŸè‡ªèº«ã®ãƒ“ジットã¯ã€%s ã® Piwik ã«ç„¡è¦–ã•ã‚Œã¦ã„ã¾ã™%s（ブラウザ㧠Piwik 無視用㮠Cookie ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸï¼‰ã€‚",
- "YourVisitsAreNotIgnored": "%sã‚ãªãŸè‡ªèº«ã®ãƒ“ジットã¯ã€Piwik ã«ç„¡è¦–ã•ã‚Œã¦ã„ã¾ã›ã‚“%s（ブラウザ㧠Piwik 無視用㮠Cookie ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸï¼‰ã€‚"
+ "YourVisitsAreIgnoredOnDomain": "%1$sã‚ãªãŸè‡ªèº«ã®ãƒ“ジットã¯ã€%2$s ã® Piwik ã«ç„¡è¦–ã•ã‚Œã¦ã„ã¾ã™%3$s（ブラウザ㧠Piwik 無視用㮠Cookie ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸï¼‰ã€‚",
+ "YourVisitsAreNotIgnored": "%1$sã‚ãªãŸè‡ªèº«ã®ãƒ“ジットã¯ã€Piwik ã«ç„¡è¦–ã•ã‚Œã¦ã„ã¾ã›ã‚“%2$s（ブラウザ㧠Piwik 無視用㮠Cookie ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸï¼‰ã€‚"
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/ko.json b/plugins/UsersManager/lang/ko.json
index 98522e9e373ce9b91293d8d131c64fb9b698ffe9..1826f9914e7e959c99d2bb73c95e38ef58565808 100644
--- a/plugins/UsersManager/lang/ko.json
+++ b/plugins/UsersManager/lang/ko.json
@@ -3,49 +3,66 @@
"AddUser": "새 ì‚¬ìš©ìž ì¶”ê°€",
"Alias": "별명",
"AllWebsites": "ëª¨ë“ ì›¹ì‚¬ì´íŠ¸",
+ "AnonymousUser": "ìµëª… 사용ìž",
+ "AnonymousUserHasViewAccess": "ì°¸ê³ : %1$s 사용ìžëŠ” ì´ ì›¹ì‚¬ì´íŠ¸ì˜ %2$s ì ‘ê·¼ì„ ê°€ì§‘ë‹ˆë‹¤.",
+ "AnonymousUserHasViewAccess2": "ë‹¹ì‹ ì˜ ë¶„ì„ ë³´ê³ ì„œì™€ ë°©ë¬¸ìž ì •ë³´ê°€ 공개ë©ë‹ˆë‹¤.",
"ApplyToAllWebsites": "ëª¨ë“ ì›¹ì‚¬ì´íŠ¸ì— ì ìš©",
- "ChangeAllConfirm": "ëª¨ë“ ì›¹ì‚¬ì´íŠ¸ì— 대한 '%s' ê¶Œí•œì„ ë³€ê²½í•˜ì‹œê² ìŠµë‹ˆê¹Œ?",
"ChangePasswordConfirm": "비밀번호를 변경하면 í† í°ë„ 변경ë©ë‹ˆë‹¤. ì •ë§ ê³„ì† í•˜ì‹œê² ìŠµë‹ˆê¹Œ?",
"ClickHereToDeleteTheCookie": "Cookie를 ì‚ì œí•˜ê³ Piwikì´ ë‹¹ì‹ ì˜ ë°©ë¬¸ë„ ì¶”ì í•˜ë ¤ë©´ 여기를 í´ë¦í•©ë‹ˆë‹¤.",
"ClickHereToSetTheCookieOnDomain": "%sì˜ Piwikì— ì¶”ì 하는 웹사ì´íŠ¸ì—ì„œ ìžì‹ ì˜ ë°©ë¬¸ì„ ì œì™¸í•˜ëŠ” Cookie를 ì„¤ì •í•˜ë ¤ë©´ 여기를 í´ë¦í•©ë‹ˆë‹¤.",
+ "ConfirmGrantSuperUserAccess": "ì •ë§ '%s'ì—게 ìŠˆí¼ ìœ ì € ê¶Œí•œì„ ë¶€ì—¬í•˜ì‹œê² ìŠµë‹ˆê¹Œ? ê²½ê³ : 해당 사용ìžëŠ” ëª¨ë“ ì›¹ì‚¬ì´íŠ¸ì— 대해 ì ‘ê·¼ì´ ê°€ëŠ¥í•˜ë©° 관리ìžê°€ í• ìˆ˜ 있는 ì¼ì„ í• ìˆ˜ 있습니다.",
+ "ConfirmProhibitMySuperUserAccess": "%s, ì •ë§ ë‹¹ì‹ ì˜ ìŠˆí¼ ìœ ì € ê¶Œí•œì„ ì œê±°í•˜ì‹œê² ìŠµë‹ˆê¹Œ? ë‹¹ì‹ ì€ ëª¨ë“ ì‚¬ì´íŠ¸ì— 대한 ëª¨ë“ ê¶Œí•œê³¼ ì ‘ê·¼ì´ ì œê±°ë˜ê³ Piwikì—ì„œ ë¡œê·¸ì•„ì›ƒì´ ì§„í–‰ë©ë‹ˆë‹¤.",
"DeleteConfirm": "ì‚¬ìš©ìž %s ë‹˜ì„ ì‚ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?",
"Email": "ì´ë©”ì¼",
"EmailYourAdministrator": "%1$sì´ ë¬¸ì œë¥¼ 관리ìžì—게 ì´ë©”ì¼ë¡œ 보내기%2$s.",
+ "EnterUsernameOrEmail": "ì‚¬ìš©ìž ì´ë¦„ í˜¹ì€ ì´ë©”ì¼ ì£¼ì†Œë¥¼ 넣어주세요.",
"ExceptionAccessValues": "파ë¼ë¯¸í„° ì ‘ê·¼ì€ ë‹¤ìŒê³¼ ê°™ì€ ê°’ì¤‘ì— í•˜ë‚˜ì—¬ì•¼ 합니다: [ %s ]",
"ExceptionAdminAnonymous": "'관리ìž' ê¶Œí•œì„ 'ìµëª…' 사용ìžì—게 줄 수 없습니다.",
"ExceptionDeleteDoesNotExist": "ì‚¬ìš©ìž '%s' ë‹˜ì€ ì¡´ìž¬í•˜ì§€ ì•Šì•„ì„œ ì‚ì œê°€ 불가능합니다.",
+ "ExceptionDeleteOnlyUserWithSuperUserAccess": "ì‚¬ìš©ìž '%s'를 ì œê±°í• ìˆ˜ 없습니다.",
"ExceptionEditAnonymous": "ìµëª… 사용ìžëŠ” 편집ì´ë‚˜ ì‚ì œë¥¼ í• ìˆ˜ 없습니다. Piwikì—ì„œ ì•„ì§ ë¡œê·¸ì¸í•˜ì§€ ì•Šì€ ì‚¬ìš©ìžë¥¼ 골ë¼ë‚¼ ë•Œ 사용하기 때문입니다. 예를 들어, '보기' ì ‘ê·¼ì„ 'ìµëª…' 사용ìžì—게 주어서 ë‹¹ì‹ ì˜ ìƒíƒœë¥¼ ê³µê°œí• ìˆ˜ 있습니다.",
"ExceptionEmailExists": "'%s' ì˜ ì´ë©”ì¼ì„ 가진 사용ìžëŠ” ì´ë¯¸ 존재합니다.",
"ExceptionInvalidEmail": "ì´ë©”ì¼ì´ ìœ íš¨í•œ 형ì‹ì´ 아닙니다.",
- "ExceptionInvalidLoginFormat": "ì•„ì´ë””는 %1$s ì—ì„œ %2$s 사ì´ì˜ ê¸€ìž ìˆ˜ì—¬ì•¼ í•˜ê³ ì˜¤ì§ ë¬¸ìž,숫ìž, ë˜ëŠ” '_' 나 '-' ë˜ëŠ” '.'만 í¬í•¨í•´ì•¼ 합니다.",
"ExceptionInvalidPassword": "비밀번호 길ì´ëŠ” %1$s〜%2$s 문ìžì´ì–´ì•¼í•©ë‹ˆë‹¤.",
- "ExceptionLoginExists": "'%s' ë‹˜ì€ ì´ë¯¸ 존재합니다.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth는 MD5 í•´ì‹œ ê°’ì˜ ë¹„ë°€ë²ˆí˜¸ (32ìž ê¸¸ì´ì˜ 문ìžì—´)ì„ ì‚¬ìš©í•˜ê³ ìžˆìŠµë‹ˆë‹¤. ì´ ë©”ì†Œë“œë¥¼ 호출하기 ì „ì— ì•”í˜¸ì— md5() 함수를 호출합니다.",
+ "ExceptionRemoveSuperUserAccessOnlySuperUser": "ì‚¬ìš©ìž '%s'ì˜ ìŠˆí¼ ìœ ì € 권한 ì œê±°ê°€ 가능하지 않습니다.",
+ "ExceptionSuperUserAccess": "해당 사용ìžëŠ” ìŠˆí¼ ìœ ì € ê¶Œí•œì„ ê°€ì§€ê³ ìžˆê¸°ì— Piwik ë‚´ ëª¨ë“ ì›¹ì‚¬ì´íŠ¸ì— 대해서 ì ‘ê·¼ ê°€ëŠ¥í•˜ê³ ìˆ˜ì • ì—ì‹œ 가능합니다. 해당 ìœ ì €ì˜ ìŠˆí¼ ìœ ì € ê¶Œí•œì„ ì œê±°í•œ 후 다시 ì‹œë„해보세요.",
"ExceptionUserDoesNotExist": "ì‚¬ìš©ìž '%s' ë‹˜ì€ ì¡´ìž¬í•˜ì§€ 않습니다.",
+ "ExceptionYouMustGrantSuperUserAccessFirst": "최소 í•œ ëª…ì˜ ì‚¬ìš©ìžê°€ ìŠˆí¼ ìœ ì € ê¶Œí•œì„ ê°€ì ¸ì•¼ 합니다. 다른 사용ìžì—게 ë¨¼ì € ìŠˆí¼ ìœ ì € ê¶Œí•œì„ ë¶€ì—¬í•´ì£¼ì„¸ìš”.",
+ "ExceptionUserHasViewAccessAlready": "ì´ë¯¸ 해당 사용ìžëŠ” 해당 웹사ì´íŠ¸ì— ì ‘ê·¼ì´ ê°€ëŠ¥í•©ë‹ˆë‹¤.",
+ "ExceptionNoValueForUsernameOrEmail": "ì‚¬ìš©ìž ì´ë¦„ í˜¹ì€ ì´ë©”ì¼ ì£¼ì†Œë¥¼ 넣어주세요.",
"ExcludeVisitsViaCookie": "ìžì‹ ì˜ ë°©ë¬¸ ì œì™¸ (Cookie 사용)",
"ForAnonymousUsersReportDateToLoadByDefault": "anonymous 사용ìžë¥¼ 위한 기본 ë³´ê³ ì„œ ë‚ ì§œ",
+ "GiveViewAccess": "보기 권한 주기",
+ "GiveViewAccessTitle": "%s ë³´ê³ ì„œë¥¼ ë³¼ 수 있는 ê¶Œí•œì„ í˜„ 사용ìžì—게 부여",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "비밀번호를 ë³€ê²½í•˜ë ¤ë©´ 새 비밀번호를 ìž…ë ¥í•©ë‹ˆë‹¤. 변경하지 않으면 비워 둡니다.",
"InjectedHostCannotChangePwd": "현재 ì•Œ 수 없는 호스트 (%1$s)ë¡œ 방문했습니다. ì´ ë¬¸ì œê°€ í•´ê²°ë 때까지 사용ìžëŠ” ìžì‹ ì˜ ë¹„ë°€ë²ˆí˜¸ë¥¼ ë³€ê²½í• ìˆ˜ 없습니다.",
- "MainDescription": "ì–´ë–¤ 사용ìžê°€ ì–´ë–¤ Piwik ì ‘ê·¼ì„ í• ì§€ ê²°ì •í• ìˆ˜ 있습니다. ëª¨ë“ ì›¹ì‚¬ì´íŠ¸ì˜ ê¶Œí•œì„ í•œë²ˆì— ì„¤ì •í• ìˆ˜ 있습니다.",
+ "LastSeen": "최근 본",
"ManageAccess": "관리 ì ‘ê·¼",
"MenuAnonymousUserSettings": "anonymous ì‚¬ìš©ìž ì„¤ì •",
"MenuUsers": "사용ìž",
"MenuUserSettings": "ì‚¬ìš©ìž ì„¤ì •",
+ "MenuPersonal": "ê°œì¸",
+ "PersonalSettings": "ê°œì¸ ì„¤ì •",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "ì°¸ê³ : ìµëª… 사용ìžê°€ ì ‘ê·¼í• ìˆ˜ìžˆëŠ” 웹사ì´íŠ¸ê°€ 없기 ë•Œë¬¸ì— ë‹¹ì‹ ì€ ì´ ì„¹ì…˜ì˜ ì„¤ì •ì„ ë³€ê²½í• ìˆ˜ 없습니다.",
+ "NoUsersExist": "ì•„ì§ ì‚¬ìš©ìžê°€ 없습니다.",
"PrivAdmin": "관리ìž",
"PrivNone": "ì ‘ê·¼í• ìˆ˜ ì—†ìŒ",
"PrivView": "보기",
"ReportDateToLoadByDefault": "기본 ë³´ê³ ì„œ ë‚ ì§œ",
"ReportToLoadByDefault": "기본 ë³´ê³ ì„œ",
+ "SuperUserAccessManagement": "ìŠˆí¼ ìœ ì € 권한 관리",
+ "SuperUserAccessManagementGrantMore": "Piwik ë‚´ 다른 사용ìžì—게 ìŠˆí¼ ìœ ì € ê¶Œí•œì„ ì¤„ 수 있습니다. ì´ ê¸°ëŠ¥ì„ ì¡°ì‹¬ížˆ 사용해주세요.",
+ "SuperUserAccessManagementMainDescription": "ìŠˆí¼ ìœ ì €ëŠ” 가장 ë†’ì€ ê¶Œí•œì„ ê°€ì§‘ë‹ˆë‹¤. ê·¸ë“¤ì€ ëª¨ë“ ê´€ë¦¬ 업무를 ìˆ˜í–‰í• ìˆ˜ 있습니다. 여기ì—는 ê°ì‹œí• 새로운 웹사ì´íŠ¸ 추가, 새로운 ì‚¬ìš©ìž ì¶”ê°€, ì‚¬ìš©ìž ê¶Œí•œ 변경, í”ŒëŸ¬ê·¸ì¸ í™œì„±í™” ë° ë¹„í™œì„±í™”, ë§ˆì¼“í”Œë ˆì´ìŠ¤ì—ì„œ 새로운 í”ŒëŸ¬ê·¸ì¸ ì„¤ì¹˜ê¹Œì§€ 가능합니다.",
"TheLoginScreen": "ë¡œê·¸ì¸ í™”ë©´",
"ThereAreCurrentlyNRegisteredUsers": "현재 %sëª…ì˜ ì‚¬ìš©ìžê°€ 등ë¡ë˜ì–´ 있습니다.",
"TypeYourPasswordAgain": "새 비밀번호를 다시 ìž…ë ¥í•©ë‹ˆë‹¤.",
"User": "사용ìž",
"UsersManagement": "ì‚¬ìš©ìž ê´€ë¦¬",
"UsersManagementMainDescription": "새로운 사용ìžë¥¼ ìƒì„±í•˜ê±°ë‚˜ ë˜ëŠ” 존재하는 사용ìžë¥¼ ì—…ë°ì´íŠ¸í• 수 있습니다. ê·¸ë¦¬ê³ ìœ„ì—ì„œ ê·¸ë“¤ì˜ ê¶Œí•œì„ ì„¤ì •í• ìˆ˜ 있습니다.",
- "WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "ë¡œê·¸ì¸ ì•Ší•œ 사용ìžê°€ Piwikì— ì ‘ê·¼í• ë•Œ 표시하는 화면",
+ "WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "ë¡œê·¸ì¸ í•˜ì§€ ì•Šì€ ì‚¬ìš©ìžê°€ Piwikì— ì ‘ê·¼í• ë•Œ 표시하는 화면",
"YourUsernameCannotBeChanged": "ë‹¹ì‹ ì˜ ì‚¬ìš©ìž ì´ë¦„ì„ ë³€ê²½í• ìˆ˜ 없습니다.",
- "YourVisitsAreIgnoredOnDomain": "%së‹¹ì‹ ì˜ ë°©ë¬¸ì€%s Piwikì— ë¬´ì‹œë©ë‹ˆë‹¤%s (브ë¼ìš°ì €ì—ì„œ Piwik 무시 ìš© Cookie 발견).",
- "YourVisitsAreNotIgnored": "%së‹¹ì‹ ì˜ ë°©ë¬¸ì€ Piwikì— ë¬´ì‹œí•˜ì§€ 않습니다%s (브ë¼ìš°ì €ì—ì„œ Piwik ë¬´ì‹œì˜ Cookie를 ì°¾ì„ ìˆ˜ 없습니다)."
+ "YourVisitsAreIgnoredOnDomain": "%1$së‹¹ì‹ ì˜ ë°©ë¬¸ì€%2$s Piwikì— ë¬´ì‹œë©ë‹ˆë‹¤%3$s (브ë¼ìš°ì €ì—ì„œ Piwik 무시 ìš© Cookie 발견).",
+ "YourVisitsAreNotIgnored": "%1$së‹¹ì‹ ì˜ ë°©ë¬¸ì€ Piwikì— ë¬´ì‹œí•˜ì§€ 않습니다%2$s (브ë¼ìš°ì €ì—ì„œ Piwik ë¬´ì‹œì˜ Cookie를 ì°¾ì„ ìˆ˜ 없습니다)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/lt.json b/plugins/UsersManager/lang/lt.json
index 6a869a00ec4a249e2c2747eed9ec1f8cc21cca0c..a16a9f5f9acc719b2248390efc5867227e340aa4 100644
--- a/plugins/UsersManager/lang/lt.json
+++ b/plugins/UsersManager/lang/lt.json
@@ -3,38 +3,49 @@
"AddUser": "PridÄ—ti naujÄ… naudotojÄ…",
"Alias": "Alternatyvus vardas",
"AllWebsites": "Visos svetainÄ—s",
+ "AnonymousUser": "Anoniminis naudotojas",
+ "AnonymousUserHasViewAccess2": "Jūsų analitikos ataskaitos ir jūsų naudotojų informacija yra viešai matoma.",
"ApplyToAllWebsites": "Taikyti visoms svetainÄ—ms",
- "ChangeAllConfirm": "Ar tikrai norite pakeisti '%s' leidimus visoms svetainÄ—ms?",
+ "ChangeAllConfirm": "Ar tikrai norite suteikti \"%s\" prieigą prie visų svetainių?",
+ "ChangePasswordConfirm": "Slaptažodžio pakeitimas taip pat pakeis naudotojo token_auth. Ar tikrai norite tęsti?",
"ClickHereToDeleteTheCookie": "Spauskite Äia, kad iÅ¡trintumÄ—te slapukÄ… ir Piwik stebÄ—tų JÅ«sų apsilankymus",
"ClickHereToSetTheCookieOnDomain": "Spauskite Äia, kad sukurtumÄ—te slapukÄ…, kuris neleis Piwik sekti JÅ«sų apsilankymų %s",
+ "ConfirmGrantSuperUserAccess": "Ar tikrai norite suteikti \"%s\" Super naudotojo prieigą? Įspėjimas: naudotojoas turės prieigą prie visų svetainių ir galės atlikti valdymo užduotis.",
+ "ConfirmProhibitMySuperUserAccess": "%s, ar tikrai norite pašalinti savo paties Super naudotojo prieigą? Jūs prarasite visus leidimus ir prieigą prie visų svetainių bei būsite atjungti nuo Piwik.",
"DeleteConfirm": "Ar tikrai norite pašalinti naudotoją %s?",
"Email": "El. paštas",
"ExceptionAccessValues": "Parametras access privalo turėti vieną iš šių reikšmių: [ %s ]",
"ExceptionAdminAnonymous": "Negalite priskirti 'administratorius' teisių 'anonimas' naudotojui.",
"ExceptionDeleteDoesNotExist": "Naudotojas '%s' neegzistuoja, todėl negali būti ištrintas.",
+ "ExceptionDeleteOnlyUserWithSuperUserAccess": "Naudotojo \"%s\" ištrynimas yra negalimas.",
"ExceptionEditAnonymous": "Naudotojas 'anonimas' negali bÅ«ti keiÄiamas ar Å¡alinamas. Jis naudojamas nustatyti naudotojÄ…, kuris dar neprisijungÄ™s. Pavyzdžiui, JÅ«s galite padaryti savo statistinius duomenis vieÅ¡ais suteikdami 'matyti' teises naudotojui 'anonimas'.",
"ExceptionEmailExists": "Naudotojas su tokiu el. paštu '%s' jau yra.",
"ExceptionInvalidEmail": "Netinkamas el. pašto formatas.",
- "ExceptionInvalidLoginFormat": "Registracijos vardas turi bÅ«ti sudarytas iÅ¡ %1$s - %2$s simbolių ir gali turÄ—ti raides, skaiÄius, arba simbolius '_', '-', '.'",
- "ExceptionLoginExists": "Registracijos vardas '%s' jau yra.",
+ "ExceptionInvalidPassword": "Slaptažodžio ilgis privalo būti tarp %1$s ir %2$s simbolių.",
+ "ExceptionLoginExists": "Naudotojo vardas \"%s\" jau yra.",
+ "ExceptionRemoveSuperUserAccessOnlySuperUser": "Super naudotojo prieigos teisių pašalinimas iš naudotojo \"%s\" yra negalimas.",
"ExceptionUserDoesNotExist": "Naudotojas '%s' neegzistuoja.",
+ "ExceptionUserHasViewAccessAlready": "Å is naudotojas jau turi prieigÄ… prie Å¡ios svetainÄ—s.",
"ExcludeVisitsViaCookie": "Neįtraukite savo apsilankymų pasinaudoję slapuku",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Jei norite pakeisti slaptažodį, įraÅ¡ykite naujÄ…. Jei ne, palikite laukelį tuÅ¡ÄiÄ….",
- "MainDescription": "Nuspręskite kuris naudotojas kokias Piwik teises turės Jūsų svetainei. Taip pat galite sukurti leidimus visoms svetainėms iš karto.",
"ManageAccess": "Administruoti teises",
"MenuAnonymousUserSettings": "Anonimo nustatymai",
"MenuUsers": "Naudotojai",
"MenuUserSettings": "Naudotojo nustatymai",
+ "PersonalSettings": "Asmeniniai nustatymai",
+ "NoUsersExist": "Naudotojų kol kas nėra.",
"PrivAdmin": "Administruoti",
"PrivNone": "Neleidžiama",
"PrivView": "Matyti",
"TheLoginScreen": "Prisijungimo langas",
+ "ThereAreCurrentlyNRegisteredUsers": "Šiuo metu yra %s registruotų naudotojų.",
"TypeYourPasswordAgain": "Pakartokite savo naują slaptažodį.",
"User": "Naudotojas",
"UsersManagement": "Naudotojų valdymas",
"UsersManagementMainDescription": "Kurkite naujus naudotojus arba keiskite jau esanÄius. Po to aukÅ¡Äiau galite parinkti jiems leidimus.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Kai naudotojai neprisijungÄ™ apsilanko Piwik, jie turi pasiekti",
"YourUsernameCannotBeChanged": "Jūsų naudotojo vardas negali būti pakeistas.",
- "YourVisitsAreIgnoredOnDomain": "%sJūsų apsilankymai yra ignoruojami Piwik %s %s (Piwik ignoravimo slapukas buvo aptiktas Jūsų naršyklėje)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sJūsų apsilankymai yra ignoruojami Piwik %2$s %3$s (Piwik ignoravimo slapukas buvo aptiktas Jūsų naršyklėje).",
+ "YourVisitsAreNotIgnored": "%1$sJūsų apsilankymai nėra ignoruojami Piwik%2$s (Piwik ignoravimo slapukas jūsų naršyklėje nebuvo aptiktas)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/lv.json b/plugins/UsersManager/lang/lv.json
index 782a6bd555a725454d0fd80738e9e8c36ab4e862..4e21dca9b0076daa3475252e5b6a2b6de1f72205 100644
--- a/plugins/UsersManager/lang/lv.json
+++ b/plugins/UsersManager/lang/lv.json
@@ -4,7 +4,6 @@
"Alias": "AizstÄjÄ“jvÄrds",
"AllWebsites": "Visas vietnes",
"ApplyToAllWebsites": "Apstipriniet visÄm vietnÄ“m",
- "ChangeAllConfirm": "Vai tieÅ¡Äm vÄ“laties mainÄ«t '%s' pieejas atļaujas visÄm vietnÄ“m?",
"ChangePasswordConfirm": "Mainot lietotÄja paroli, tiks izmainÄ«ts arÄ« lietotÄja token_auth. Vai tieÅ¡Äm vÄ“laties turpinÄt?",
"ClickHereToDeleteTheCookie": "Klikšķiniet šeit, lai dzēstu sīkdatni un atļautu Piwik izsekot Jūsu pašu apmeklējumus",
"ClickHereToSetTheCookieOnDomain": "Klikšķiniet šeit, lai iestatītu sīkdatni, kas aizliegs izsekot Jūsu pašu apmeklējumus %s",
@@ -16,15 +15,12 @@
"ExceptionEditAnonymous": "AnonÄ«mo lietotÄju nav iespÄ“jams labot vai dzÄ“st. Tas tiek izmantots, lai definÄ“tu lietotÄju, kurÅ¡ vÄ“l nav pieteicies. PiemÄ“ram, JÅ«s varat publiskot statistiku atļaujot apskates pieeju anonÄ«majam lietotÄjam.",
"ExceptionEmailExists": "LietotÄjs ar e-pasta adresi '%s' jau eksistÄ“.",
"ExceptionInvalidEmail": "E-pasta adresei nav pareizs formÄts",
- "ExceptionInvalidLoginFormat": "LietotÄjvÄrdam jÄbÅ«t garumÄ no %1$s lÄ«dz %2$s simboliem un jÄsatur tikai cipari, burti vai simboli '_', '-', '.', '@', '+'",
"ExceptionInvalidPassword": "Parolei jÄbÅ«t garumÄ no %1$s lÄ«dz %2$s simboliem.",
- "ExceptionLoginExists": "LietotÄjvÄrds '%s' jau eksistÄ“.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth sagaida MD5 kodētu paroli (32 simbolu garu tekstu). Lūdzu pielietojiet md5() metodi parolei pirms izsaucat šo metodi.",
"ExceptionUserDoesNotExist": "LietotÄjs '%s' neeksistÄ“.",
"ExcludeVisitsViaCookie": "Neiekļaut Jūsu pašu apmeklējumus izmantojot sīkdatni",
"ForAnonymousUsersReportDateToLoadByDefault": "Atskaite, kuru ielÄdÄ“t pÄ“c noklusÄ“juma anonÄ«miem lietotÄjiem",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Ja vÄ“laties mainÄ«t paroli, ievadiet jauno. PretÄ“jÄ gadÄ«jumÄ atstÄjiet tukÅ¡u.",
- "MainDescription": "Izlemjiet kuriem lietotÄjiem ir kÄdas Piwik pieejas atļaujas JÅ«su vietnÄ“m. JÅ«s varat arÄ« uzstÄdÄ«t pieejas atļaujas visÄm vietnÄ“m vienlaicÄ«gi.",
"ManageAccess": "PÄrvaldiet pieejas",
"MenuAnonymousUserSettings": "AnonÄ«mu lietotÄju iestatÄ«jumi",
"MenuUsers": "LietotÄji",
@@ -42,6 +38,6 @@
"UsersManagementMainDescription": "Izveidojiet jaunus vai labojiet esoÅ¡u lietotÄju iestatÄ«jumus. AugstÄk JÅ«s varat uzstÄdÄ«t Å¡o lietotÄju pieejas atļaujas.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Kad lietotÄji nav pieteikuÅ¡ies un apmeklÄ“ Piwik, tiem rÄdam",
"YourUsernameCannotBeChanged": "JÅ«su lietotÄjvÄrdu nav iespÄ“jams izmainÄ«t.",
- "YourVisitsAreIgnoredOnDomain": "%sJÅ«su apmeklÄ“jumi tiek ignorÄ“ti %s %s (pÄrlÅ«kÄ tika atrasta Piwik ignorÄ“Å¡anas sÄ«kdatne)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sJÅ«su apmeklÄ“jumi tiek ignorÄ“ti %2$s %3$s (pÄrlÅ«kÄ tika atrasta Piwik ignorÄ“Å¡anas sÄ«kdatne)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/nb.json b/plugins/UsersManager/lang/nb.json
index a73b5ee55f2c4e5a55fb93f682df287a9715f75e..718a8855e5e4f1c2d0f8ae8873e6f05799b6a7ca 100644
--- a/plugins/UsersManager/lang/nb.json
+++ b/plugins/UsersManager/lang/nb.json
@@ -7,13 +7,12 @@
"AnonymousUserHasViewAccess": "Merk: brukeren %1$s har %2$s tilgang til dette nettstedet.",
"AnonymousUserHasViewAccess2": "Dine analyserapporter og informasjon om dine besøkere er offentlig tilgjengelig.",
"ApplyToAllWebsites": "Legg til alle nettsteder",
- "ChangeAllConfirm": "Er du sikker på at du vil endre «%s» rettigheter på alle nettstedene?",
+ "ChangeAllConfirm": "Er du sikker på at du vil gi «%s» tilgang til alle nettsteder?",
"ChangePasswordConfirm": "Endrer du passordet vil du også endre brukerens token_auth. Vil du virkelig fortsette?",
"ClickHereToDeleteTheCookie": "Klikk her for å slette informasjonskapselen og la Piwik spore dine besøk",
"ClickHereToSetTheCookieOnDomain": "Klikk her for å sette en informasjonskapsel som vil ekskludere dine besøk på nettsteder som spores av Piwik på %s",
"ConfirmGrantSuperUserAccess": "Vil du virkelig gi «%s» superbrukertilgang? Advarsel: brukeren vil ha tilgang til alle nettsteder og være i stand til å utføre administrative oppgaver.",
"ConfirmProhibitMySuperUserAccess": "%s, vil du virkelig fjerne din egen superbrukertilgang? Du vil miste alle rettigheter og tilgang til alle nettsteder og bli logget ut av Piwik.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Vil du virkelig fjerne superbrukertilgangen til «%s»? Brukeren vil miste alle rettigheter og tilgang til alle nettsteder. Forsikre deg om at du setter rettigheter som nødvendig til ulike nettsteder etterpå.",
"DeleteConfirm": "Er du sikker på at du vil slette brukeren %s?",
"Email": "E-post",
"EmailYourAdministrator": "%1$sSend e-post til din administrator om dette problemet%2$s.",
@@ -24,9 +23,7 @@
"ExceptionEditAnonymous": "Den anonyme brukeren kan ikke bli redigert eller slettet. Den blir brukt av Piwik for å definere en bruker som ikke har blitt logget inn ennå. Du kan for eksempel gjøre statistikken din offentlig ved å gi 'view'-tilgang til 'anonymous'-brukeren.",
"ExceptionEmailExists": "Bruker med e-post «%s» eksisterer allerede.",
"ExceptionInvalidEmail": "Epost-adressen er ikke i gyldig format.",
- "ExceptionInvalidLoginFormat": "Brukernavnet må være mellom %1$s og %2$s tegn langt og inneholde kun bokstaver, tall eller tegnene _ - . @ +",
"ExceptionInvalidPassword": "Passordet må være mellom %1$s og %2$s tegn.",
- "ExceptionLoginExists": "Brukernavnet «%s» eksisterer allerede.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth forventer et MD5-hashet passord (32 tegn lang streng). Vennligst kall md5()-funksjonen på passordet før du kaller denne metoden.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Det er ikke mulig å fjerne superbrukertilgang fra brukeren «%s».",
"ExceptionSuperUserAccess": "Denne brukeren har superbrukertilgang og har allerede tilgang til å se og modifisere alle nettsteder i Piwik. Du kan også fjerne superbrukertilgangen fra denne brukeren og prøve igjen.",
@@ -37,7 +34,6 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Hvis du vil endre passordet, skriv inn et nytt. Hvis ikke, lar du feltet være tomt.",
"InjectedHostCannotChangePwd": "Du besøker nå med et ukjent vertsnavn (%1$s). Du kan ikke endre passord før problemet er rettet opp.",
"LastSeen": "Sist sett",
- "MainDescription": "Bestem hvilke brukere som har tilgang til Piwik på dine nettsteder. Du kan også sette rettighetene på alle dine nettsteder på en gang.",
"ManageAccess": "Administrer tilgang",
"MenuAnonymousUserSettings": "Innstillinger for anonym bruker",
"MenuUsers": "Brukere",
@@ -46,7 +42,6 @@
"PersonalSettings": "Personlige innstillinger",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Merk: Du kan ikke endre innstillingene i denne seksjonen fordi du ikke har noen nettsteder som kan nås av en anonym bruker.",
"NoUsersExist": "Det er ingen brukere ennå.",
- "PluginDescription": "Brukerhåndtering lar deg legge til nye brukere, redigere eksisterende brukere og gi dem tilganger til å se eller administrere nettsteder.",
"PrivAdmin": "Admin",
"PrivNone": "Ingen tilgang",
"PrivView": "Vis",
@@ -63,7 +58,7 @@
"UsersManagementMainDescription": "Opprett nye brukere eller oppdater eksisterende. Du kan sette deres rettigheter over.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Brukere som ikke er logget og besøker Piwik, skal sendes til",
"YourUsernameCannotBeChanged": "Brukernavnet ditt kan ikke endres.",
- "YourVisitsAreIgnoredOnDomain": "%sDine besøk blir ignorert av Piwik på %s %s (informasjonskapselen for ekskludering fra Piwik ble funnet i din nettleser).",
- "YourVisitsAreNotIgnored": "%sDine besøk blir ikke ignorert av Piwik%s (informasjonskapselen for ekskludering fra Piwik ble ikke funnet i din nettleser)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sDine besøk blir ignorert av Piwik på %2$s %3$s (informasjonskapselen for ekskludering fra Piwik ble funnet i din nettleser).",
+ "YourVisitsAreNotIgnored": "%1$sDine besøk blir ikke ignorert av Piwik%2$s (informasjonskapselen for ekskludering fra Piwik ble ikke funnet i din nettleser)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/nl.json b/plugins/UsersManager/lang/nl.json
index e46b9d6dd96300b808c4a95f34d866c0c1bbae34..a34f2600aaf8f57904d8d8379d1a22ea5cf020a4 100644
--- a/plugins/UsersManager/lang/nl.json
+++ b/plugins/UsersManager/lang/nl.json
@@ -7,13 +7,11 @@
"AnonymousUserHasViewAccess": "Opmerking: de %1$s gebruiker heeft %2$s toegang tot deze website.",
"AnonymousUserHasViewAccess2": "Je Analyse rapporten en je bezoekers informatie zijn publiek beschikbaar.",
"ApplyToAllWebsites": "Pas toe op elke website",
- "ChangeAllConfirm": "Weet u zeker dat u de rechten van '%s' voor alle websites wilt wijzigen?",
"ChangePasswordConfirm": "Als het wachtwoord wordt gewijzigd, zal ook de gebruikers token_auth wijzigen. Wilt u echt doorgaan?",
"ClickHereToDeleteTheCookie": "Klik hier om de cookie te verwijderen en laat Piwik uw bezoeken volgen.",
"ClickHereToSetTheCookieOnDomain": "Klik hier om een cookie te plaatsen dat uw bezoeken uitsluit van Piwik op %s",
"ConfirmGrantSuperUserAccess": "Weet u zeker dat u '%s' Super Gebruiker toegang wilt geven? Waarschuwing: deze gebruiker heeft toegang tot alle websites en kan administratieve taken uitvoeren.",
"ConfirmProhibitMySuperUserAccess": "%s, wilt u echt uw eigen Super gebruiker rechten wegnemen? U verliest alle rechten en toegang tot alle websites en wordt bij Piwik uitgelogd.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Wilt u echt alle Super Gebruiker rechten voor %s wegnemen? Deze gebruiker zal alle rechten en toegang tot alle websites verliezen. U dient achteraf, rechten voor benodigde websites toe te kennen.",
"DeleteConfirm": "Weet u zeker dat u de volgende gebruiker wilt verwijderen: %s?",
"Email": "E-mail",
"EmailYourAdministrator": "%1$sE-mail de beheerder over dit probleem%2$s.",
@@ -24,9 +22,7 @@
"ExceptionEditAnonymous": "De anonieme gebruiker kan niet gewijzigd of verwijderd worden. Deze wordt door Piwik gebruikt voor gebruikers die nog niet zijn ingelogd. U kunt bijvoorbeeld uw statistieken publiekelijk maken door de 'anonieme' gebruiker 'kijkers rechten' te geven.",
"ExceptionEmailExists": "Er is reeds een gebruiker met '%s' als e-mail adres.",
"ExceptionInvalidEmail": "Het e-mail adres is ongeldig.",
- "ExceptionInvalidLoginFormat": "De gebruikersnaam moet tussen de %1$s en %2$s karakters lang zijn en mag alleen letters, cijfers of de karaketers _ , - , . bevatten",
"ExceptionInvalidPassword": "De lengte van het wachtwoord moet tussen %1$s en %2$s tekens lang zijn.",
- "ExceptionLoginExists": "Login '%s' bestaat reeds.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth verwacht een MD5-hash wachtwoord (32 tekens lange reeks). Vraag de md5()functie op het wachtwoord op alvorens deze methode aan te roepen.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Het verwijderen van de Super User rechten van gebruiker '%s' is niet toegestaan.",
"ExceptionUserDoesNotExist": "Gebruiker '%s' bestaat niet.",
@@ -35,7 +31,6 @@
"ForAnonymousUsersReportDateToLoadByDefault": "Voor anonieme gebruikers, Standaard rapport datum bij laden pagina.",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Als u het wachtwoord wilt wijzigen, geef dan een nieuwe op. Laat het anders leeg.",
"LastSeen": "Laatst gezien",
- "MainDescription": "Stel in welke gebruikers toegang hebben tot de Piwik rapporten van deze website. U kan de toegangsrechten voor alle websites tegelijk bepalen door deze optie te kiezen in de dropdown.",
"ManageAccess": "Toegangsbeheer",
"MenuAnonymousUserSettings": "Anonieme gebruikers instellingen",
"MenuUsers": "Gebruikers",
@@ -57,7 +52,7 @@
"UsersManagementMainDescription": "Creëer nieuwe of actualiseer bestaande gebruikers",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Wanneer gebruikers niet ingelogd zijn en Piwik bezoeken, moeten ze toegang krijgen",
"YourUsernameCannotBeChanged": "Uw gebruikersnaam kan niet worden gewijzigd.",
- "YourVisitsAreIgnoredOnDomain": "%s Uw Piwik bezoeken worden genegeerd door Piwik op %s %s (Piwik negeer cookie is gevonden in uw browser).",
- "YourVisitsAreNotIgnored": "%sUw bezoeken worden niet genegeerd door Piwik%s (de Piwik negeer cookie is niet gevonden in uw browser)."
+ "YourVisitsAreIgnoredOnDomain": "%1$s Uw Piwik bezoeken worden genegeerd door Piwik op %2$s %3$s (Piwik negeer cookie is gevonden in uw browser).",
+ "YourVisitsAreNotIgnored": "%1$sUw bezoeken worden niet genegeerd door Piwik%2$s (de Piwik negeer cookie is niet gevonden in uw browser)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/nn.json b/plugins/UsersManager/lang/nn.json
index 626080a8236f18d18239e968737b486206746c62..4f44c6ec9a4d8d495dba673aee225ee967187ba0 100644
--- a/plugins/UsersManager/lang/nn.json
+++ b/plugins/UsersManager/lang/nn.json
@@ -4,7 +4,6 @@
"Alias": "Alias",
"AllWebsites": "Alle nettstader",
"ApplyToAllWebsites": "Gjer gjeldande for alle nettstader",
- "ChangeAllConfirm": "Er du sikker på at du vil endra '%s' tilgangar på alle nettstadene?",
"ClickHereToDeleteTheCookie": "Klikk her for å sletta informasjonskapselen slik at Piwik loggar dine vitjingar",
"DeleteConfirm": "Er du sikker på at du vil fjerna brukar %s?",
"Email": "Epost",
@@ -14,12 +13,10 @@
"ExceptionEditAnonymous": "Den anonyme brukaren kan ikkje bli endra eller sletta. Den er brukt av Piwik for å definera ein brukar som ikkje hev logga inn. Til døme kan du gjera statistikken offentleg tilgjengeleg ved å gjeva lesetilgang til den anonyme brukaren.",
"ExceptionEmailExists": "Ein bukar med eposten '%s' finst allereie.",
"ExceptionInvalidEmail": "Eposten hev eit ugyldig format.",
- "ExceptionLoginExists": "Brukar '%s' finst allereie.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth forventar eit MD5-hasja passord (ein 32 teikn lang streng). Nytt md5()-funksjonen på passord før du kallar denne metoden.",
"ExceptionUserDoesNotExist": "Brukar '%s' finst ikkje.",
"ExcludeVisitsViaCookie": "Utelukk dine vitjingar frå Piwik med ein informasjonskapsel.",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Om du ønskjer å bytte passordet, skriv inn eit nytt et. Ellers skriv du ingenting.",
- "MainDescription": "Bestem kven av brukarane som hev korleis tilgang til dine nettstader. Du kan òg setja tilgang til alle nettstadene på ein gong.",
"ManageAccess": "Bestem tilgang",
"MenuAnonymousUserSettings": "Innstillingar for anonyme brukarar",
"MenuUsers": "Brukarar",
@@ -34,7 +31,7 @@
"UsersManagementMainDescription": "Lag nye brukarar eller oppdater eksisterande brukarar. Du kan deretter setta deira tilgangar ovanfor.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Når brukarar vitjar Piwik uten å vera innlogga, skal dei ha tilgang til",
"YourUsernameCannotBeChanged": "Brukarnamnet ditt kan ikkje endrast.",
- "YourVisitsAreIgnoredOnDomain": "%sDine vitjingar blir ignorert av Piwik på %s %s (Informasjonskapselen frå Piwik vart funnen i din nettlesar).",
- "YourVisitsAreNotIgnored": "%sDine vitjingar blir ikkje ignorert av Piwik%s (Informasjonskapselen frå Piwik vart ikkje funnen i din nettlesar)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sDine vitjingar blir ignorert av Piwik på %2$s %3$s (Informasjonskapselen frå Piwik vart funnen i din nettlesar).",
+ "YourVisitsAreNotIgnored": "%1$sDine vitjingar blir ikkje ignorert av Piwik%2$s (Informasjonskapselen frå Piwik vart ikkje funnen i din nettlesar)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/pl.json b/plugins/UsersManager/lang/pl.json
index b60c6ecc83c3aba0e1b4c0d644748ebb44b18538..57bbaea3e040fb15ce76b44ad0ed02d6902e8c0c 100644
--- a/plugins/UsersManager/lang/pl.json
+++ b/plugins/UsersManager/lang/pl.json
@@ -4,7 +4,6 @@
"Alias": "Alias",
"AllWebsites": "Wszystkie strony",
"ApplyToAllWebsites": "Zastosuj dla wszystkich stron",
- "ChangeAllConfirm": "Czy masz pewność, że chcesz zmienić '%s' prawa dostępu do wszystkich stron?",
"ClickHereToDeleteTheCookie": "kliknij tutaj by skasować ciasteczko cookie i umożliwić dla Piwik śledzenie twoich wizyt na stronie",
"ClickHereToSetTheCookieOnDomain": "Kliknij tutaj by ustawić ciasteczko cookie, które będzie wykluczało zliczanie twoich wizyt na stronie, gdy Piwik będzie je śledził na %s",
"DeleteConfirm": "Czy masz pewność, że chcesz skasować konto użytkownika %s?",
@@ -16,16 +15,13 @@
"ExceptionEditAnonymous": "Konto użytkownika anonimowego nie może być zmienione czy skasowane. Jest stosowane przez Piwik by zdefiniować użytkownika, który się nie loguje. Dla przykładu, możesz uczynić swoje statystyki powszechnie publiczne, udzielając prawa 'podglądu' dla 'anonimowego' użytkownika.",
"ExceptionEmailExists": "Użytkownik z takim adresem e-mail '%s' już istnieje.",
"ExceptionInvalidEmail": "Adres e-mail nie posiada poprawnego formatu.",
- "ExceptionInvalidLoginFormat": "Login powinien zawierać od %1$s do %2$s znaków długości i składać się wyłącznie z liter, numerów liczb, lub znaków: '_' '-' '.' '@' '+'",
"ExceptionInvalidPassword": "Długość hasła powinien zawierać od %1$s do %2$s znaków.",
- "ExceptionLoginExists": "Podany login '%s' już istnieje.",
"ExceptionPasswordMD5HashExpected": "Metoda UsersManager.getTokenAuth oczekuje hasła z hashem MD5 (łańcuch o długości 32 znaków). Wywołaj funkcję md5() z parametrem hasła, by wygenerować hash przed wywołaniem tej metody.",
"ExceptionUserDoesNotExist": "Użytkownik '%s' nie istnieje.",
"ExcludeVisitsViaCookie": "Wyklucz swoje wizyty stosujÄ…c ciasteczka cookie",
"ForAnonymousUsersReportDateToLoadByDefault": "Dla użytkowników anonimowych, data raportu jako domyślna do wczytania",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Jeśli chcesz zmienić hasło, wpisz nowe. W innym przypadku pozostaw puste pole.",
"LastSeen": "Ostatnio widziany",
- "MainDescription": "Możesz zadecydować, którzy użytkownicy będą mieć dostęp do Piwik w twoim serwisie internetowym. Możesz także ustawić prawa dostępu do całości serwisu od razu.",
"ManageAccess": "Zarządzanie uprawnieniami dostępu",
"MenuAnonymousUserSettings": "Konfiguracja użytkownika anonimowego",
"MenuUsers": "Użytkownicy",
@@ -47,7 +43,7 @@
"UsersManagementMainDescription": "Utworzenie nowych użytkowników lub aktualizacja istniejących. Ponadto możesz ustawić im poziom uprawnień.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Kiedy użytkownicy nie są zalogowani i odwiedzają Piwik, powinny wyświetlić się",
"YourUsernameCannotBeChanged": "Twoja nazwa użytkownika nie może być zmieniona.",
- "YourVisitsAreIgnoredOnDomain": "%sTwoje odwiedziny są ignorowane przez Piwik na %s %s (Piwik zignoruje ciasteczka cookie które znajdzie w twojej przeglądarce).",
- "YourVisitsAreNotIgnored": "%sTwoje odwiedziny nie będą ignorowane przez Piwik%s (Piwik nie odnalazł właściwego dla wykluczenia ciasteczka cookie w twojej przeglądarce)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sTwoje odwiedziny są ignorowane przez Piwik na %2$s %3$s (Piwik zignoruje ciasteczka cookie które znajdzie w twojej przeglądarce).",
+ "YourVisitsAreNotIgnored": "%1$sTwoje odwiedziny nie będą ignorowane przez Piwik%2$s (Piwik nie odnalazł właściwego dla wykluczenia ciasteczka cookie w twojej przeglądarce)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/pt-br.json b/plugins/UsersManager/lang/pt-br.json
index e446c320ed5c5f7806edb273d716e961052b8af0..7baf55be4853dc07ed0b8233135a4db4d87c38c4 100644
--- a/plugins/UsersManager/lang/pt-br.json
+++ b/plugins/UsersManager/lang/pt-br.json
@@ -7,16 +7,17 @@
"AnonymousUserHasViewAccess": "Nota: o usuário %1$s tem acesso %2$s para este site.",
"AnonymousUserHasViewAccess2": "Seus relatórios de análise e suas informações de visitantes são visÃveis publicamente.",
"ApplyToAllWebsites": "Aplicar a todos os websites",
- "ChangeAllConfirm": "Você tem certeza que deseja alterar as permissões de %s em todos os websites?",
+ "ChangeAllConfirm": "Você tem certeza que quer dar acesso a '%s' para todos os websites?",
"ChangePasswordConfirm": "Alterando a senha também vai mudar token_auth do usuário. Você realmente quer continuar?",
"ClickHereToDeleteTheCookie": "Clique aqui para deletar o cookie e deixar o Piwik rastrear suas visitas",
"ClickHereToSetTheCookieOnDomain": "Clique aqui para setar um cookie que excluirá suas visitas em websites rastrados pelo Piwik em %s",
"ConfirmGrantSuperUserAccess": "Você realmente deseja conceder a '%s' o acesso de Super Usuário? Aviso: o usuário terá acesso a todos os sites e será capaz de executar tarefas administrativas.",
"ConfirmProhibitMySuperUserAccess": "%s, você realmente deseja remover o seu próprio acesso de Super Usuário? Você perderá todas as permissões e acessos a todos os sites e será desconectado do Piwik.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Você realmente deseja remover o acesso de Super Usuário do usuário '%s'? O usuário perderá todas as permissões e acesso a todos os websites. Certifique-se de definir as permissões para os websites necessários depois, se necessário.",
+ "ConfirmProhibitOtherUsersSuperUserAccess": "Você realmente deseja remover o acesso de Super Usuário de '%s'? O usuário perderá todas as permissões e acesso a todos os sites. Certifique-se de dar acesso a sites necessários mais tarde, se for preciso.",
"DeleteConfirm": "Tem certeza que deseja apagar o usuário %s?",
"Email": "E-mail",
"EmailYourAdministrator": "%1$s E-mail a seu administrador sobre este problema %2$s.",
+ "EnterUsernameOrEmail": "Digite um nome de usuário ou endereço de e-mail",
"ExceptionAccessValues": "O parâmetro de acesso deve conter os seguintes valores: [ %s ]",
"ExceptionAdminAnonymous": "Você não pode conceder acesso 'admin' para o usuário 'anonymous' .",
"ExceptionDeleteDoesNotExist": "O usuário '%s' não existe assim não é possÃvel excluÃ-lo.",
@@ -24,20 +25,25 @@
"ExceptionEditAnonymous": "O usuário anonymous não pode ser editado ou apagado. Ele é usado pelo sistema para definir um usuário que ainda não não entrou. Por examplo, você pode tornar as estatÃsticas públicas concedendo acesso 'view' para o usuário 'anonymous'.",
"ExceptionEmailExists": "Usuário com o e-mail '%s' já existe.",
"ExceptionInvalidEmail": "O e-mail não tem um formato válido.",
- "ExceptionInvalidLoginFormat": "O login deve conter entre %1$s e %2$s caracteres e conter apenas letras, números ou os caracteres '_' ou'.'",
+ "ExceptionInvalidLoginFormat": "O nome de usuário deve ter entre %1$s e %2$s caracteres e conter apenas letras, números ou os caracteres '_' or '-' or '.' or '@' or '+'",
"ExceptionInvalidPassword": "A senha deve conter entre %1$s e %2$s caracteres.",
- "ExceptionLoginExists": "Usuário '%s' já existe.",
+ "ExceptionLoginExists": "O nome de usuário '%s' já existe.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth está esperando por uma senha MD5-hashed (32 caracteres). Por favor, chame a função md5() na senha antes de chamar este método.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Não é possÃvel remover o acesso de Super Usuário do usuário '%s'",
"ExceptionSuperUserAccess": "Este usuário tem acesso Super Usuário e já tem permissão para acessar e modificar todos os websites no Piwik. Você pode remover o acesso de Super Usuário deste usuário e tentar novamente.",
"ExceptionUserDoesNotExist": "Usuário '%s' não existe.",
"ExceptionYouMustGrantSuperUserAccessFirst": "É preciso haver pelo menos um usuário com acesso de Super Usuário. Por favor, conceda acesso de Super Usuário para outro usuário primeiro.",
+ "ExceptionUserHasViewAccessAlready": "Esse usuário já tem acesso a este website.",
+ "ExceptionNoValueForUsernameOrEmail": "Por favor, digite um nome de usuário ou endereço de e-mail.",
"ExcludeVisitsViaCookie": "Excluir suas visitas usando cookie",
"ForAnonymousUsersReportDateToLoadByDefault": "Para usuários anônimos, reportar dara para carregar por padrão",
+ "GiveViewAccess": "Permitir acesso de visualização",
+ "GiveViewAccessTitle": "Dar a usuário existente acesso para visualizar relatórios de %s",
+ "GiveViewAccessInstructions": "Para dar acesso a um usuário existente para %s digite o nome de usuário ou endereço de e-mail de um usuário existente",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Se você quiser mudar a senha, digite uma nova. Caso contrário, deixe em branco.",
"InjectedHostCannotChangePwd": "Você está visitando com um host desconhecido (%1$s). Você não pode mudar sua senha até que este problema seja resolvido.",
"LastSeen": "Último visto",
- "MainDescription": "Decida quais usuários terão acesso ao Piwik nos seus websites. Você pode também ajustar as permissões em todos os websites de uma só vez.",
+ "MainDescription": "Decida quais usuários têm acesso a seus sites. Você também pode dar acesso a todos os sites de uma só vez, escolhendo \"Aplicar a todos os websites\" no seletor de website.",
"ManageAccess": "Gerenciar acesso",
"MenuAnonymousUserSettings": "Configurações de usuário anônimo",
"MenuUsers": "Usuários",
@@ -46,7 +52,7 @@
"PersonalSettings": "Configurações pessoais",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Nota: Você não pode alterar as configurações nesta seção, porque você não tem nenhum site que pode ser acessado pelo usuário anônimo.",
"NoUsersExist": "Não há usúarios ainda.",
- "PluginDescription": "Gerenciamento de Usuários permite adicionar novos usuários, editar usuários existentes e atribuir-lhes permissões para visualizar ou administrar websites.",
+ "PluginDescription": "O Gerenciamento de Usuários permite que você adicione novos usuários, edite usuários existentes e dá-lhes acesso para visualizar ou administrar websites.",
"PrivAdmin": "Administrador",
"PrivNone": "Sem acesso",
"PrivView": "Visualização",
@@ -63,7 +69,7 @@
"UsersManagementMainDescription": "Crie novos usuários ou atualize os usuários existentes. Você poderá então ajustar as permissões deles acima.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Quando usuários não estão logados e visitam o Piwik, eles deveriam acessar",
"YourUsernameCannotBeChanged": "Seu nome de usuário não pode ser alterado.",
- "YourVisitsAreIgnoredOnDomain": "%s Suas visitas são ignoradas pelo Piwik em %s %s (o Piwik ignora o cookie encontrado em seu navegador).",
- "YourVisitsAreNotIgnored": "%sSuas visitas não são ignoradas pelo Piwik%s (o Piwik ignora o cookie não encotrado em seu navegador)"
+ "YourVisitsAreIgnoredOnDomain": "%1$s Suas visitas são ignoradas pelo Piwik em %2$s %3$s (o Piwik ignora o cookie encontrado em seu navegador).",
+ "YourVisitsAreNotIgnored": "%1$sSuas visitas não são ignoradas pelo Piwik%2$s (o Piwik ignora o cookie não encotrado em seu navegador)"
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/pt.json b/plugins/UsersManager/lang/pt.json
index 4be271b257c31607b47a340388b5565ecb6931c5..fa8097d1eddb0bc99de3aa0d9b3cde30769fe4c3 100644
--- a/plugins/UsersManager/lang/pt.json
+++ b/plugins/UsersManager/lang/pt.json
@@ -6,7 +6,6 @@
"AnonymousUser": "Utilizador anónimo",
"AnonymousUserHasViewAccess": "Nota: o utilizador %1$s tem %2$s acessos a este website.",
"ApplyToAllWebsites": "Aplicar a todos os websites",
- "ChangeAllConfirm": "Tem a certeza que deseja alterar '%s' permissões em todos os websites?",
"ChangePasswordConfirm": "Alterar a senha também mudará o token_auth do utilizador. Você deseja continuar?",
"ClickHereToDeleteTheCookie": "Clique aqui para eliminar o cookie e permitir a Piwik monitorizar as suas visitas.",
"ClickHereToSetTheCookieOnDomain": "Clique aqui para definir um cookie que excluirá todas as suas visitas de serem monitorizadas por Piwik em %s",
@@ -18,16 +17,13 @@
"ExceptionEditAnonymous": "O utilizador anónimo não pode ser editado ou apagado. Ele é usado pelo sistema para definir um utilizador que ainda não entrou. Por examplo, pode tornar as suas estatÃsticas públicas concedendo acesso 'ver' ao utilizador 'anónimo'.",
"ExceptionEmailExists": "Um utilizador com o e-mail '%s' já existe.",
"ExceptionInvalidEmail": "O e-mail não tem um formato válido.",
- "ExceptionInvalidLoginFormat": "O nome de utilizador deve conter entre %1$s e %2$s caracteres e conter apenas letras, números ou os caracteres '_' ou '-' ou '.'",
"ExceptionInvalidPassword": "O senha deve ter entre %1$s e %2$s caracteres.",
- "ExceptionLoginExists": "O nome de utilizador '%s' já existe.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth está à espera de uma palavra-passe codificada em MD5 (cadeia de 32 caracteres). Por favor chame a função md5() sobre a palavra-passe antes de chamar este método.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "A remoção do acesso Super Utilizador do utilizador '%s' não é possÃvel.",
"ExceptionUserDoesNotExist": "Utilizador '%s' não existe.",
"ExcludeVisitsViaCookie": "Exclua as suas visitas com um cookie",
"ForAnonymousUsersReportDateToLoadByDefault": "Para utilizadores anónimos, data de relatório pré-definida para carregar",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Se deseja alterar a sua palavra-passe, introduza uma nova. Caso contrário deixe isto em branco.",
- "MainDescription": "Decidir quais utilizadores têm acesso a Piwik nos seus Websites. Também pode definir permissões para todos os Websites duma só vez.",
"ManageAccess": "Gerir acesso",
"MenuAnonymousUserSettings": "Definições de utilizadores anónimos",
"MenuUsers": "Utilizadores",
@@ -46,7 +42,7 @@
"UsersManagementMainDescription": "Criar novos utilizadores ou actualizar utilizadores existentes. Depois pode definir as permissões deles acima.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Quando utilizadores não entraram e visitam Piwik, devem poder aceder a",
"YourUsernameCannotBeChanged": "O seu nome de utilizador não pode ser alterado.",
- "YourVisitsAreIgnoredOnDomain": "%sAs suas visitas são ignoradas por Piwik em %s %s (o cookie Piwik de ignorar foi encontrado no seu navegador).",
- "YourVisitsAreNotIgnored": "%sAs suas visitas não são ignoradas por Piwik%s (o cookie Piwik de ignorar não foi encontrado no seu navegador)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sAs suas visitas são ignoradas por Piwik em %2$s %3$s (o cookie Piwik de ignorar foi encontrado no seu navegador).",
+ "YourVisitsAreNotIgnored": "%1$sAs suas visitas não são ignoradas por Piwik%2$s (o cookie Piwik de ignorar não foi encontrado no seu navegador)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/ro.json b/plugins/UsersManager/lang/ro.json
index 9c01402606f84c8cf2ba39b66d75aeffb2e11ec8..cad0f073bf67eca45a80eb578ba8bd46be2310c1 100644
--- a/plugins/UsersManager/lang/ro.json
+++ b/plugins/UsersManager/lang/ro.json
@@ -6,13 +6,11 @@
"AnonymousUserHasViewAccess": "Notă: utilizatorul %1$s are acces %2$s la acest website.",
"AnonymousUserHasViewAccess2": "Rapoartele de analiză și informațiile dvs. despre vizitatori sunt facute publice.",
"ApplyToAllWebsites": "Aplica tuturor siteurilor",
- "ChangeAllConfirm": "Esti sigur ca vrei sa scimbi '%s' permisiunile tuturor siteurilor?",
"ChangePasswordConfirm": "Schimbarea parolei va modifica token_auth al utilizatorului. Într-adevăr doreşti să continui?",
"ClickHereToDeleteTheCookie": "Click aici pentru a șterge cookie-ul și puenti-l pe Piwik sa urmăreasca vizitele",
"ClickHereToSetTheCookieOnDomain": "Click aici pentru a stabili un cookie care va exclude vizitele dvs. de pe site-urile urmărite cu Piwik pe %s",
"ConfirmGrantSuperUserAccess": "Chiar vrei să se acorde '%s' acces de Super utilizator? Avertisment: utilizatorul va avea acces la toate site-urile și va fi capabil de a efectua sarcini administrative.",
"ConfirmProhibitMySuperUserAccess": "%s, chiar vrei să eliminați propriul Super acces utilizator? Veți pierde toate permisiunile și acces la toate site-urile și vei fi deconectat de la Piwik.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Chiar doriți să eliminați accesul Super utilizator de la \"%s\"? Utilizatorul va pierde toate permisiunile și acces la toate site-urile. Asigurați-vă că pentru a seta permisiuni la site-urile necesare , dacă este necesar.",
"DeleteConfirm": "Eşti sigur că vrei să ştergi utilizatorul %s?",
"Email": "Email",
"EmailYourAdministrator": "%1$sTrimite email administratorului despre aceasta problema%2$s.",
@@ -23,9 +21,7 @@
"ExceptionEditAnonymous": "Userul anonim nu poate fi editat sau sters.De exemplu poti face ca statisticile tale sa fie publice autorizand 'view' accesul la 'anonymous' user.",
"ExceptionEmailExists": "Deja există un utilizator cu adresa '%s'.",
"ExceptionInvalidEmail": "Emailul nu are un format valid.",
- "ExceptionInvalidLoginFormat": "The login must be between %1$s and %2$s characters long and contain only letters, numbers, or the characters '_' or '-' or '.'",
"ExceptionInvalidPassword": "Lungimea parolei trebuie să fie între %1$s şi %2$s simboluri.",
- "ExceptionLoginExists": "Login '%s' există deja.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth se așteaptă la o parolă distribuita-MD5 (32 de caractere șir lung). Vă rugăm să apelati la funcția md5 () la parola înainte de a apela această metodă.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Scoaterea accesul utilizatorului Super de la utilizator '%s' nu este posibil.",
"ExceptionSuperUserAccess": "Acest utilizator are acces la Super utilizator și are deja permisiunea de a accesa și modifica toate site-urile din Piwik. Puteți scoate Super accesul utilizatorului la acest utilizator și încercați din nou.",
@@ -36,7 +32,6 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Dacă doriți să modificați parolă taastati una noua. În caz contrar, lăsați spatiul gol.",
"InjectedHostCannotChangePwd": "Daca în prezent vizitati o gazdă necunoscuta (%1$s). Nu puteți schimba parola până când această problemă nu este rezolvata.",
"LastSeen": "Ultima data vazut",
- "MainDescription": "Decide userul ce are acces la propriul website . Poti de asemenea seta permisiunile la toate siteurile in acelasi timp.",
"ManageAccess": "Manageriaza accesul",
"MenuAnonymousUserSettings": "Setările utilizatorului anonim",
"MenuUsers": "Utilizatori",
@@ -59,7 +54,7 @@
"UsersManagementMainDescription": "Creaza user nou sau actualizeaza userul existent. Poti seta permisiunile lor.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Atunci când utilizatorii nu sunt logati și viziteaza Piwik, acestea ar trebui să acceseze",
"YourUsernameCannotBeChanged": "Numele tău de utilizator nu poate fi schimbat.",
- "YourVisitsAreIgnoredOnDomain": "%svizitele tale sunt ignorate de Piwik pe %s%s (piwik ignora cookie care a fost găsit în browser-ul dvs.).",
- "YourVisitsAreNotIgnored": "%s Vizitele tale nu sunt ignorate de Piwik%s (piwik ignora cookie care nu au fost găsite în browser-ul dvs.)."
+ "YourVisitsAreIgnoredOnDomain": "%1$svizitele tale sunt ignorate de Piwik pe %2$s%3$s (piwik ignora cookie care a fost găsit în browser-ul dvs.).",
+ "YourVisitsAreNotIgnored": "%1$s Vizitele tale nu sunt ignorate de Piwik%2$s (piwik ignora cookie care nu au fost găsite în browser-ul dvs.)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/ru.json b/plugins/UsersManager/lang/ru.json
index 0be6eaac52f0153e8714e0321cdf1eb35bfa70b7..965f2ae904893215e0a9ac4a044a729c3e89601b 100644
--- a/plugins/UsersManager/lang/ru.json
+++ b/plugins/UsersManager/lang/ru.json
@@ -7,13 +7,11 @@
"AnonymousUserHasViewAccess": "Примечание: пользователь %1$s имеет %2$s доÑтуп к Ñтому Ñайту.",
"AnonymousUserHasViewAccess2": "Отчеты и данные о поÑетителÑÑ… общедоÑтупны.",
"ApplyToAllWebsites": "Применить ко вÑем Ñайтам",
- "ChangeAllConfirm": "Ð’Ñ‹ дейÑтвительно желаете изменить права '%s' на вÑе Ñайты?",
"ChangePasswordConfirm": "Смена Ð¿Ð°Ñ€Ð¾Ð»Ñ Ñ‚Ð°ÐºÐ¶Ðµ изменит пользовательÑкий token_auth. Ð’Ñ‹ дейÑтвительно хотите продолжить?",
"ClickHereToDeleteTheCookie": "Ðажмите здеÑÑŒ, чтобы удалить cookie игнорированиÑ, и разрешить ÑиÑтеме Веб-аналитики отÑлеживать ваши поÑещениÑ",
"ClickHereToSetTheCookieOnDomain": "Ðажмите здеÑÑŒ, чтобы уÑтановить cookie Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð’ÐµÐ±-аналитики, поÑле уÑтановки которого ÑиÑтема Ð’Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ игнорировать при поÑещении %s",
"ConfirmGrantSuperUserAccess": "Ð’Ñ‹ дейÑтвительно хотите Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Â«%s» повыÑить до ÑуперпользователÑ? Внимание: пользователь будет иметь доÑтуп ко вÑем веб-Ñайтам и Ñможет выполнÑÑ‚ÑŒ админиÑтративные задачи.",
"ConfirmProhibitMySuperUserAccess": "%s, Ð’Ñ‹ дейÑтвительно хотите удалить у ÑÐµÐ±Ñ Ð¿Ñ€Ð°Ð²Ð° ÑуперпользователÑ? Ð’Ñ‹ потерÑете вÑе Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð¸ доÑтуп ко вÑем Ñайтам и будете разлогинены из Piwik.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Ð’Ñ‹ дейÑтвительно хотите понизить ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Â«%s» до обычного пользователÑ? Он потерÑет вÑе права и доÑтуп ко вÑем Ñайтам. УбедитеÑÑŒ в том, что не забыли добавить Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ñ… ему веб-Ñайтов, еÑли Ñто необходимо.",
"DeleteConfirm": "Ð’Ñ‹ уверены, что хотите удалить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s?",
"Email": "Email",
"EmailYourAdministrator": "%1$sÐапишите вашему админиÑтратору об Ñтой проблеме%2$s.",
@@ -24,9 +22,7 @@
"ExceptionEditAnonymous": "Ðнонимный пользователь не может быть удален. Он необходим ÑиÑтеме Веб-аналитики Ð´Ð»Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ пользователей, которые не вошли в ÑиÑтему. ДопуÑтим, вы можете Ñделать ÑтатиÑтику публичной, предоÑтавлÑÑ Ð¿Ñ€Ð°Ð²Ð¾ 'ПроÑмотр' анонимному пользователю.",
"ExceptionEmailExists": "Пользователь Ñ Email '%s' уже ÑущеÑтвует.",
"ExceptionInvalidEmail": "Email неправильного формата",
- "ExceptionInvalidLoginFormat": "Логин должен быть длиной от %1$s до %2$s Ñимволов, а также Ñодержать только буквы, цифры или Ñимволы '_', '-', '.'",
"ExceptionInvalidPassword": "Длина Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° быть от %1$s до %2$s Ñимволов.",
- "ExceptionLoginExists": "Логин '%s' уже ÑущеÑтвует.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth ожидает MD5-Ñ…Ñшированный пароль (Ñтрока в 32 Ñимвола). ПожалуйÑта, вызовите функцию md5() к паролю перед вызовом Ñтого метода.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Удаление прав ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñƒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Â«%s» не предÑтавлÑетÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ð¼.",
"ExceptionSuperUserAccess": "Ðтот пользователь уже имеет ÑÑ‚Ð°Ñ‚ÑƒÑ ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ разрешение на изменение вÑех веб-Ñайты в Piwik. Ð’Ñ‹ можете удалить права ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñƒ Ñтого пользователÑ, и попробовать Ñнова.",
@@ -37,7 +33,6 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "ЕÑли вы хотите Ñменить пароль, введите новый. Иначе оÑтавьте поле пуÑтым.",
"InjectedHostCannotChangePwd": "Ð’ данный момент вы находитеÑÑŒ в Piwik Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтного хоÑта (%1$s). Ð’Ñ‹ не можете изменить пароль, пока Ñта проблема не будет решена.",
"LastSeen": "ПоÑледнее поÑещение",
- "MainDescription": "Укажите, какие пользователи имеют доÑтуп к Piwik на вашем Ñайте. Также Ð’Ñ‹ можете задать права доÑтупа на вÑе Ñайты.",
"ManageAccess": "Управление правами доÑтупа",
"MenuAnonymousUserSettings": "ÐаÑтройки анонимноÑти",
"MenuUsers": "Пользователи",
@@ -46,7 +41,6 @@
"PersonalSettings": "ПерÑональные наÑтройки",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "ПодÑказка: Ð’Ñ‹ не можете Ñменить Ñти наÑтройки, потому что у Ð²Ð°Ñ Ð½ÐµÑ‚ ни одного веб-Ñайта, к которому бы имел доÑтуп анонимный пользователь.",
"NoUsersExist": "Пока нет пользователей.",
- "PluginDescription": "Управление пользователÑми позволÑет Вам добавить нового пользователÑ, редактировать ÑущеÑтвующего Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ разрешить ему право на проÑмотр или админиÑтрирование веб-Ñайта.",
"PrivAdmin": "Ðдмин",
"PrivNone": "Ðет доÑтупа",
"PrivView": "ПроÑмотр",
@@ -63,7 +57,7 @@
"UsersManagementMainDescription": "Создание новых пользователей или редактирование ÑущеÑтвующих. Также Ð’Ñ‹ можете задать права доÑтупа Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Когда незарегиÑтрированные пользователи поÑещают ÑиÑтему Piwik, они должны видеть",
"YourUsernameCannotBeChanged": "Ð˜Ð¼Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ðµ может быть изменено.",
- "YourVisitsAreIgnoredOnDomain": "%sВаши поÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€ÑƒÑŽÑ‚ÑÑ Piwik на %s %s (cookie Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð’ÐµÐ±-аналитики обнаружен в браузере).",
- "YourVisitsAreNotIgnored": "%sВаши поÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð½Ðµ игнорируютÑÑ Piwik%s (cookie Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð’ÐµÐ±-аналитики не обнаружен в браузере)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sВаші Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñ–Ð³Ð½Ð¾Ñ€ÑƒÑŽÑ‚ÑŒÑÑ ÑиÑтемою Piwik в %2$s %3$s (Piwik знашов cookie у вашому браузері з вказівкою ігнорувати).",
+ "YourVisitsAreNotIgnored": "%1$sВаші Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´ÑлідковуютьÑÑ ÑиÑтемою Piwik %2$s (Piwik не знашов cookie у вашому браузері)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/sk.json b/plugins/UsersManager/lang/sk.json
index 3e711a2719820de44c507c51a62478f34b943463..1c153c47a580d1ba2b2497bae958bcb45f445145 100644
--- a/plugins/UsersManager/lang/sk.json
+++ b/plugins/UsersManager/lang/sk.json
@@ -5,7 +5,6 @@
"AllWebsites": "Všetky webstránky",
"AnonymousUser": "Anonymný použÃvateľ",
"ApplyToAllWebsites": "Použiť na všetky webstránky",
- "ChangeAllConfirm": "Ste si istý, že chcete zmeniť '%s' práva pre všetky webstránky?",
"DeleteConfirm": "Ste si istý, že chcete odstrániÅ¥ použÃvateľa %s?",
"Email": "E-mail",
"ExceptionAccessValues": "Parameter prÃstupu musà maÅ¥ jednu z nasledujúcich hodnôt: [ %s ]",
@@ -14,10 +13,7 @@
"ExceptionEditAnonymous": "Anonymný použÃvateľ nemôže byÅ¥ odstránený alebo upravený. Piwik ho použÃva na definovanie použÃvateľa, ktorý sa eÅ¡te prihlásil. Anonymného použÃvateľa môžete použiÅ¥ na zverejnenie svojich Å¡tatistÃk, a to priradeným mu práv na prezeranie.",
"ExceptionEmailExists": "PoužÃvateľ s e-mailom '%s' už existuje.",
"ExceptionInvalidEmail": "E-mailová adresa nemá platný formát.",
- "ExceptionInvalidLoginFormat": "PoÄet znakov pre PoužÃvateľ (login) musà byÅ¥ medzi %1$s a %2$s a obsahovaÅ¥ iba pÃsmená, ÄÃslice alebo znaky '_', '-', a '.'",
- "ExceptionLoginExists": "PoužÃvateľ (login) '%s' už existuje.",
"ExceptionUserDoesNotExist": "PoužÃvateľ '%s' neexistuje.",
- "MainDescription": "Rozhodnite sa, ktorà použÃvatelia budú môcÅ¥ pristupovaÅ¥ k jednotlivým stránkam. Tiež im môžete umožniÅ¥ prÃstup na vÅ¡etky vaÅ¡e stránky.",
"ManageAccess": "Správa prÃstupov",
"MenuAnonymousUserSettings": "Nastavenie pre anonymného užÃvateľa",
"MenuUsers": "PoužÃvatelia",
diff --git a/plugins/UsersManager/lang/sl.json b/plugins/UsersManager/lang/sl.json
index 9151bf5d86d086bd1d7ac4b5ebac59a3bc38dce9..fe88be3be924410b0340819dd87eddd21e9b1ba1 100644
--- a/plugins/UsersManager/lang/sl.json
+++ b/plugins/UsersManager/lang/sl.json
@@ -11,7 +11,6 @@
"ExceptionEmailExists": "Uporabnik z emailom \"%s\" že obstaja.",
"ExceptionInvalidEmail": "Email ni veljavnega formata.",
"ExceptionInvalidPassword": "Dolžina gesla mora biti med %1$s in %2$s znaki.",
- "ExceptionLoginExists": "Vpis '%s' že obstaja.",
"ExceptionUserDoesNotExist": "Uporabnik \"%s\" ne obstaja.",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Če bi radi spremenili geslo, vpišite novega. Če ne, to pustite prazno.",
"ManageAccess": "Upravljaj dostop",
diff --git a/plugins/UsersManager/lang/sq.json b/plugins/UsersManager/lang/sq.json
index 677865b33be72625b2755f942b76c7e3936f43ac..78301c8d1c0e3a09ea2abfcc02feaa8e51ea9ebb 100644
--- a/plugins/UsersManager/lang/sq.json
+++ b/plugins/UsersManager/lang/sq.json
@@ -7,13 +7,11 @@
"AnonymousUserHasViewAccess": "Shënim: përdoruesi %1$s ka hyrje %2$s te ky sajt.",
"AnonymousUserHasViewAccess2": "Raportet analitike dhe të dhënat e vizitorëve tuaj janë të dukshme publikisht.",
"ApplyToAllWebsites": "Zbatoje për tërë sajtet",
- "ChangeAllConfirm": "Jeni i sigurt se doni të ndryshoni lejet e '%s' në tërë sajtet?",
"ChangePasswordConfirm": "Ndryshimi i fjalëkalimit do të sjellë gjithashtu ndryshimin e “token_auth†të përdoruesit. Doni vërtet të vazhdohet?",
"ClickHereToDeleteTheCookie": "Klikoni këtu që të fshihet \"cookie\" dhe që ta bëni Piwik-un të gjurmojë vizitat tuaja",
"ClickHereToSetTheCookieOnDomain": "Klikoni këtu që të vendoset një \"cookie\" që do të përjashtojë vizitat tuaja në sajte të gjurmuar nga Piwik-u %s",
"ConfirmGrantSuperUserAccess": "Doni t’i akordoni '%s' hyrje Supepërdoruesi? Kujdes: përdoruesi do të ketë hyrje në krejt sajtet dhe do të jetë në gjendje të kryejë veprime administratori.",
"ConfirmProhibitMySuperUserAccess": "%s, doni vërtet t’i hiqni vetes të drejta Superpërdoruesi? Do të humbni krejt lejet dhe hyrjen në krejt sajtet dhe do të dilni nga Piwik-u.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Doni vërtet t’i hiqni të drejtat e Superpërdoruesit prej '%s'? Përdoruesi do të humbë krejt lejet dhe hyrjet në krejt sajtet. Sigurohuni t’i jepni më pas leje për sajtet e nevojshëm, nëse duhet.",
"DeleteConfirm": "Jeni i sigurt se doni të fshihet përdoruesi %s?",
"Email": "Email",
"EmailYourAdministrator": "%1$sDërgojini përgjegjësit tuaj email rreth këtij problemi%2$s.",
@@ -24,9 +22,7 @@
"ExceptionEditAnonymous": "Përdoruesi anonim nuk mund të fshihet apo përpunohet të dhënat e tij. Përdoret nga Piwik-u për të përkufizuar një përdorues që nuk ka bërë ende hyrjen. Për shembull, mund t'i bëni statistikat tuaja publike duke lejuar hyrje për 'parje' për përdoruesin 'anonim'.",
"ExceptionEmailExists": "Ka tashmë një përdorues me email-in '%s'.",
"ExceptionInvalidEmail": "Email-i s'është në format të vlefshëm.",
- "ExceptionInvalidLoginFormat": "Hyrja duhet të jetë ndërmjet %1$s dhe %2$s shenjash e gjatë, dhe duhet të përmbajë vetëm shkronja, numra, ose shenjat '_' or '-' or '.' or '@' or '+'",
"ExceptionInvalidPassword": "Fjalëkalimi duhet të jetë nga %1$s deri në %2$s shenja i gjatë.",
- "ExceptionLoginExists": "Ka tashmë një hyrje për '%s'.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth pret një fjalëkalim hash MD5 (varg 32 shenja të gjatë). Ju lutemi, zbatojeni funksionin md5() mbi fjalëkalimin përpara zbatimit të kësaj metode",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Heqja e lejeve Superpërdoruesi për përdoruesin '%s' s’është e mundur.",
"ExceptionSuperUserAccess": "Ky përdorues ka hyrje Superpërdoruesi dhe ka tashmë leje të hyjë dhe modifikojë krejt sajtet në këtë instalim Piwik-u. Mund t’ia hiqni të drejtat e Superpërdoruesit këtij përdoruesi dhe të riprovoni.",
@@ -37,7 +33,6 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Nëse dëshironi të ndryshoni fjalëkalimin, shtypni një të ri. Përndryshe lëreni të zbrazët.",
"InjectedHostCannotChangePwd": "Po e vizitoni me një strehë të panjohur (%1$s). S’mund ta ndryshoni fjalëkaliminm, pa ndrequr këtë problem.",
"LastSeen": "Këndej pari së fundi më",
- "MainDescription": "Vendosni cilët përdorues kanë hyrje Piwik në sajtet tuaj. Mundet edhe të caktoni njëherazi lejet mbi tërë sajtet.",
"ManageAccess": "Administroni hyrjet",
"MenuAnonymousUserSettings": "Rregullime përdoruesi anonim",
"MenuUsers": "Përdorues",
@@ -46,7 +41,6 @@
"PersonalSettings": "Rregullime personale",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Shënim: Nuk mund të ndryshoni rregullimet në këtë ndarje, ngaqë s’keni ndonjë sajt ku mund të hyhet si përdorues anonim.",
"NoUsersExist": "Ende nuk ka përdorues",
- "PluginDescription": "Administrimi i Përdoruesve ju lejon të shtoni përdorues të rinj, të përpunoni të dhëna përdoruesish ekzistues dhe t’u caktoni leje për parje apo administrim sajtesh.",
"PrivAdmin": "Admin",
"PrivNone": "Pa hyrje",
"PrivView": "Pamje",
@@ -63,7 +57,7 @@
"UsersManagementMainDescription": "Krijoni përdoruesa të rinj ose përditësoni përdoruesit ekzistues. Mandej mund t’u caktoni lejet më sipër.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Kur përdoruesit nuk janë të futur dhe vizitojnë Piwik-un, do të duhej të hynin",
"YourUsernameCannotBeChanged": "Emri juaj i përdoruesit s’mund të ndryshohet.",
- "YourVisitsAreIgnoredOnDomain": "%sVizitat tuaja te %s %s janë shpërfillur nga Piwik-u (te shfletuesi juaj u gjet \"cookie\" për shpërfillje nga Piwik-u).",
- "YourVisitsAreNotIgnored": "%sVizitat tuaja s’janë shpërfillur nga Piwik-u%s (te shfletuesi juaj s’u gjet \"cookie\" për shpërfillje nga Piwik-u)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sVizitat tuaja te %2$s %3$s janë shpërfillur nga Piwik-u (te shfletuesi juaj u gjet \"cookie\" për shpërfillje nga Piwik-u).",
+ "YourVisitsAreNotIgnored": "%1$sVizitat tuaja nuk janë shpërfillur nga Piwik-u%2$s (te shfletuesi juaj nuk u gjet \"cookie\" për shpërfillje nga Piwik-u)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/sr.json b/plugins/UsersManager/lang/sr.json
index b5bbdb9d2bfe7cb28f1209d7394bed55a41edc73..b0dfca35b4152e40b6d0f00979701dcdee6a93c1 100644
--- a/plugins/UsersManager/lang/sr.json
+++ b/plugins/UsersManager/lang/sr.json
@@ -7,13 +7,11 @@
"AnonymousUserHasViewAccess": "Pažnja: korisnik %1$s ima %2$s nivo pristupa ovom sajtu.",
"AnonymousUserHasViewAccess2": "VaÅ¡i analitiÄki podaci i informacije o vaÅ¡im posetiocima su javno vidljivi.",
"ApplyToAllWebsites": "Primeni na sve sajtove",
- "ChangeAllConfirm": "Da li ste sigurni da želite da promenite '%s' privilegije na svim sajtovima?",
"ChangePasswordConfirm": "Promena lozinke će prouzrokovati i promenu korisnikovog token_auth. Da li ste sigurni da želite da nastavite?",
"ClickHereToDeleteTheCookie": "Kliknite ovde kako biste obrisali kolaÄić i time omogućili Piwik da prati i vaÅ¡e posete",
"ClickHereToSetTheCookieOnDomain": "Kliknite ovde kako biste postavili kolaÄić i time onemogućili Piwik da prati i vaÅ¡e posete %s",
"ConfirmGrantSuperUserAccess": "Da li zaista želite da '%s' dodelite superkorisniÄki nivo pristupa? Pažnja: korisnik će dobiti pristup svim sajtovima i moći će da vrÅ¡i administrativne zadatke.",
"ConfirmProhibitMySuperUserAccess": "%s, da li zaista želite sebi da uklonite superkorisniÄki nivo pristupa? Izgubićete sva prava i pristup svim sajtovima i bićete odjavljeni sa Piwik-a.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Da li zaista želite da uklonite superkorisniÄki nivo pristupa korisniku '%s'? Ovaj korisnik će izgubiti sva prava i pristup sajtovima. Postarajte se da psole toga dodelite prava pristupa sajtovima ukoliko je to potrebno.",
"DeleteConfirm": "Da li ste sigurni da želite da obrišete korisnika %s?",
"Email": "Elektronska adresa",
"EmailYourAdministrator": "%1$sObavestite administratora o ovom problemu%2$s.",
@@ -24,9 +22,7 @@
"ExceptionEditAnonymous": "Podaci o anonimnom korisniku ne mogu biti menjani ili obrisani. Anonimni korisnik služi da bi Piwik mogao da razlikuje korisnika koji se joÅ¡ nije prijavio na sistem. Primera radi, svoju statistiku možete uÄiniti javnom tako Å¡to ćete anonimnom korisniku dozvoliti 'prikaz' pristup.",
"ExceptionEmailExists": "Korisnik sa elektronskom adresom '%s' već postoji.",
"ExceptionInvalidEmail": "Elektronska adresa nije validna.",
- "ExceptionInvalidLoginFormat": "KorisniÄko ime mora biti dugaÄko izmeÄ‘u %1$s i %2$s znakova i mora da sadrži samo slova, brojeve ili znkove '_' ili '-' ili '.' ili '@'",
"ExceptionInvalidPassword": "Dužina lozinke mora biti između %1$s i %2$s znakova.",
- "ExceptionLoginExists": "KorisniÄko ime '%s' već postoji.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth oÄekuje MD5 hash lozinku (niz od 32 znaka). Molimo vas da primenite funkciju md5() nad lozinkom pre poziva ovog metoda. Hvala.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Uklanjanje superkorisniÄkog nivoa pristupa korisniku '%s' nije moguće.",
"ExceptionSuperUserAccess": "Ovaj korisnik već ima superkorisniÄki nivo pristupa. Možete mu ukloniti taj nivo i pokuÅ¡ati ponovo.",
@@ -37,7 +33,6 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Ukoliko želite da promenite lozinku, upišite novu. U suprotnom ostavite polje prazno",
"InjectedHostCannotChangePwd": "Trenutno pristupate sa nepoznatog hosta (%1$s). Lozinku ne možete promeniti dok ovo ne ispravite.",
"LastSeen": "Poslednji put viđen",
- "MainDescription": "Određivanje koji korisnici imaju pristup sajtovima.",
"ManageAccess": "Kontrola pristupa",
"MenuAnonymousUserSettings": "Podešavanja anonimnih korisnika",
"MenuUsers": "Korisnici",
@@ -46,7 +41,6 @@
"PersonalSettings": "LiÄna podeÅ¡avanja",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Ne možete menjati podešavanja u ovoj sekciji zato što nemate nijedan sajt kojem se može pristupiti kao anonimni korisnik.",
"NoUsersExist": "Još uvek nema korisnika.",
- "PluginDescription": "Upravljanje korisnicima vam omogućuje dodavanje novih korisnika, menjanje postojećih kao i dodelu privilegija za pregled i administriranje sajtova.",
"PrivAdmin": "Administracija",
"PrivNone": "Nema pristup",
"PrivView": "Prikaz",
@@ -63,7 +57,7 @@
"UsersManagementMainDescription": "Dodavanje novih i promena postojećih korisniÄkih naloga, dodeljivanje privilegija.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Kada korisnik koji nije prijavljen pokuša da otvori Piwik, trebalo bi da se otvori:",
"YourUsernameCannotBeChanged": "VaÅ¡e korisniÄko ime ne može biti promenjeno.",
- "YourVisitsAreIgnoredOnDomain": "%s Piwik ignoriÅ¡e vaÅ¡e posete %s %s (pronaÄ‘en je specijalni kolaÄić u vaÅ¡em brauzeru).",
- "YourVisitsAreNotIgnored": "%s Piwik ne ignoriÅ¡e vaÅ¡e posete%s (nije pronaÄ‘en kolaÄić u vaÅ¡em brauzeru)."
+ "YourVisitsAreIgnoredOnDomain": "%1$s Piwik ignoriÅ¡e vaÅ¡e posete %2$s %3$s (pronaÄ‘en je specijalni kolaÄić u vaÅ¡em brauzeru).",
+ "YourVisitsAreNotIgnored": "%1$s Piwik ne ignoriÅ¡e vaÅ¡e posete%2$s (nije pronaÄ‘en kolaÄić u vaÅ¡em brauzeru)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/sv.json b/plugins/UsersManager/lang/sv.json
index 89d48068639aed8c87bb52a1bc14c77401e9e3f3..51bb38f20d48664b5384695837616d42a0b4b793 100644
--- a/plugins/UsersManager/lang/sv.json
+++ b/plugins/UsersManager/lang/sv.json
@@ -7,16 +7,16 @@
"AnonymousUserHasViewAccess": "Observera: Användare %1$s och användare %2$s har nu tillgång till den här webbsidan.",
"AnonymousUserHasViewAccess2": "Dina analysrapporter och informationen om dina besökare är publika.",
"ApplyToAllWebsites": "Använd för alla webbplatser",
- "ChangeAllConfirm": "Är du säker på att du vill ändra '%s' behörigheterna på alla webbplatser?",
"ChangePasswordConfirm": "Vid byte av lösenord kommer också användarens token_auth att ändras. Vill du verkligen fortsätta?",
"ClickHereToDeleteTheCookie": "Klicka här för att ta bort kakan så att Piwik börjar spåra dina besök igen",
"ClickHereToSetTheCookieOnDomain": "Klicka här för att sätta kakan som exkluderar dina besök spårade av Piwik för webbplatsen %s",
"ConfirmGrantSuperUserAccess": "Vill du verkligen bevilja '%s' Superanvändarbehörighet? Varning: Användaren kommer ha tillgång till alla dina webbsidor och ha möjlighet att utföra administrativa uppdrag.",
"ConfirmProhibitMySuperUserAccess": "%s, vill du verkligen ta bort din egen Superanvändarbehörighet? Du kommer att förlora behörigheten till alla dina webbsidor och loggas ut från Piwik.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Vill du verkligen ta bort Superanvändarbehörigheten från '%s'? Användaren kommer inte längre ha åtkomst till alla webbsidor. Kom ihåg att ställa in tillåtelse till alla webbsidor efteråt om det är nödvändigt.",
+ "ConfirmProhibitOtherUsersSuperUserAccess": "Vill du verkligen radera Super User behörigheten från '%s'? Användaren kommer förlora alla behörigheter till alla webbsidor. Säkerställ att eventuell behörighet ges till valda webbsidor efteråt.",
"DeleteConfirm": "Är du säker på att du vill ta bort användaren %s?",
"Email": "E-post",
"EmailYourAdministrator": "%1$sE-posta din administratör om det här problemet%2$s.",
+ "EnterUsernameOrEmail": "Ange ett användarnamn eller en e-postadress.",
"ExceptionAccessValues": "Parameter-tillgången måste ha ett av följande värden: [ %s ]",
"ExceptionAdminAnonymous": "Du kan inte bevilja 'admin' tillgång för \"anonyma\" användare.",
"ExceptionDeleteDoesNotExist": "Användaren '%s' finns inte och kan därför inte tas bort.",
@@ -24,20 +24,23 @@
"ExceptionEditAnonymous": "Den anonyma användaren kan inte redigeras eller tas bort. Den används av Piwik för att definiera en användare som inte har loggat in ännu. Till exempel kan du göra din statistik publik genom att bevilja \"Visa\" tillgång till \"anonyma\" användare.",
"ExceptionEmailExists": "Användaren med e-postadressen '%s' finns redan.",
"ExceptionInvalidEmail": "E-postadressen har inte ett giltigt format.",
- "ExceptionInvalidLoginFormat": "Inloggningen måste vara mellan %1$s och %2$s tecken långt och får endast innehålla bokstäver, siffror eller tecknen '_', '-', '.' eller \"@\"",
+ "ExceptionInvalidLoginFormat": "Användarnamnet måste vara mellan %1$s och %2$s tecken långt och får endast innehålla bokstäver, siffror och tecknen _ - . @ +",
"ExceptionInvalidPassword": "Lösenordets längd måste vara mellan %1$s och %2$s tecken.",
- "ExceptionLoginExists": "Inloggningen '%s' finns redan.",
+ "ExceptionLoginExists": "Användaren '%s' finns redan.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth förväntar sig MD5-hashar av lösenorden (32 tecken lång sträng). Anropa gärna md5() funktionen på lösenord innan du anropar den här metoden.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Att ta bort Superanvändarbehörigheten från användare '%s' är inte möjligt.",
"ExceptionSuperUserAccess": "Den här användaren har redan Superanvändarbehörighet och tillåtelse att ändra alla sidor i Piwik. Du kan ta bort Superanvändarbehörigheten från den här användaren och försöka igen.",
"ExceptionUserDoesNotExist": "Användaren '%s' finns inte.",
"ExceptionYouMustGrantSuperUserAccessFirst": "Det måste finnas minst en användare med Superanvändarbehörighet. Var vänlig och bevilja Superanvändarbehörighet till en annan användare först.",
+ "ExceptionUserHasViewAccessAlready": "Denna användare har redan behörighet till denna webbsida.",
+ "ExceptionNoValueForUsernameOrEmail": "Ange ett användarnamn eller en e-postadress.",
"ExcludeVisitsViaCookie": "Exkludera spårning av dina besök",
"ForAnonymousUsersReportDateToLoadByDefault": "Rapport som laddas som standard för anonyma användare.",
+ "GiveViewAccess": "Ge visningsbehörighet",
+ "GiveViewAccessTitle": "Ge en existerande användare behörighet att visa rapporter för %s",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Om du vill ändra ditt lösenord så skriver du in det nya, annars lämnar du fältet tomt.",
"InjectedHostCannotChangePwd": "Du besöker för närvarande sidan genom ett okänt värdnamn (%1$s). Du kan inte ändra ditt lösenord innan det här prblemet är åtgärdat.",
"LastSeen": "Senast sedd",
- "MainDescription": "Välj vilka användare som ska ha vilken åtkomst till dina webbplatser. Du kan sätta rättigheter på samtliga webbplatser samtidigt.",
"ManageAccess": "Hantera rättigheter",
"MenuAnonymousUserSettings": "Inställningar för anonyma användare",
"MenuUsers": "Användare",
@@ -46,7 +49,6 @@
"PersonalSettings": "Personliga inställningar",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Notera: Eftersom att inga webbplaster tillåter anonym åtkomst till analysdata, så kan inga ändringar göras i den här sektionen.",
"NoUsersExist": "Det finns inga användare än.",
- "PluginDescription": "Användarhanteringen låter dig skapa nya användare, redigera befintliga användare och tilldela dem rättigheter till webbplatser.",
"PrivAdmin": "Administratör",
"PrivNone": "Inga rättigheter",
"PrivView": "Visa",
@@ -63,7 +65,7 @@
"UsersManagementMainDescription": "Skapa eller ändra befintliga användare. Du kan sedan ändra deras rättigheter ovan.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "När användare inte är inloggade och besöker Piwik, ska de komma åt",
"YourUsernameCannotBeChanged": "Ditt användarnamn kan inte ändras.",
- "YourVisitsAreIgnoredOnDomain": "%sDina besök ignoreras av Piwik för webbplatsen %s %s (Piwiks kaka hittades i din webbläsare).",
- "YourVisitsAreNotIgnored": "%sDina besök ignoreras inte av Piwik för webbplatsen %s (Piwiks kaka hittades inte i din webbläsare)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sDina besök ignoreras av Piwik för webbplatsen %2$s %3$s (Piwiks kaka hittades i din webbläsare).",
+ "YourVisitsAreNotIgnored": "%1$sSus visitas no son ignoradas por Piwik%2$s (la cookie de ignorar a Piwik no fue encontrada en su navegador)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/te.json b/plugins/UsersManager/lang/te.json
index d799f6092ff814cb539bf35bf7fecf05f70de3f3..3b2dff2b9d0d672628fca919c11261d0d7f884b3 100644
--- a/plugins/UsersManager/lang/te.json
+++ b/plugins/UsersManager/lang/te.json
@@ -6,7 +6,6 @@
"Email": "ఈమెయిలà±",
"ExceptionEmailExists": "'%s' అనే ఈమెయిలà±à°¤à±‹ వాడà±à°•à°°à°¿ ఇపà±à°ªà°Ÿà°¿à°•à±‡ ఉనà±à°¨à°¾à°°à±.",
"ExceptionInvalidEmail": "à°ˆ ఈమెయిలౠసరైన రీతిలో లేదà±.",
- "ExceptionLoginExists": "'%s' వాడà±à°•à°°à°¿ ఇపà±à°ªà°Ÿà°¿à°•à±‡ ఉనà±à°¨à°¾à°°à±.",
"ExceptionUserDoesNotExist": "'%s' వాడà±à°•à°°à°¿ లేనే లేరà±.",
"MenuAnonymousUserSettings": "ఆజà±à°žà°¾à°¤ వాడà±à°•à°°à±à°² అమరికలà±",
"MenuUsers": "వాడà±à°•à°°à±à°²à±",
diff --git a/plugins/UsersManager/lang/th.json b/plugins/UsersManager/lang/th.json
index 10033d8bc865fcae7d4e2b6df2b08adbb70ba2ff..fd46913e7b80a1c7277b230df0832ac9ddf52757 100644
--- a/plugins/UsersManager/lang/th.json
+++ b/plugins/UsersManager/lang/th.json
@@ -4,7 +4,6 @@
"Alias": "นามà¹à¸à¸‡",
"AllWebsites": "เว็บไซต์ทั้งหมด",
"ApplyToAllWebsites": "à¸à¸£à¸°à¸—ำà¸à¸±à¸šà¹€à¸§à¹‡à¸šà¹„ซต์ทั้งหมด",
- "ChangeAllConfirm": "คุณà¹à¸™à¹ˆà¹ƒà¸ˆà¸«à¸£à¸·à¸à¹„ม่ว่าคุณต้à¸à¸‡à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¸ªà¸´à¸—ธิ์ '%s' บนเว็บไซต์ทั้งหมด",
"ClickHereToDeleteTheCookie": "คลิà¸à¸—ี่นี่เพื่à¸à¸¥à¸šà¸„ุà¸à¸à¸µà¹‰ à¹à¸¥à¸°à¸¡à¸µ Piwik ติดตามเข้าชมขà¸à¸‡à¸„ุณ",
"ClickHereToSetTheCookieOnDomain": "คลิà¸à¸—ี่นี่เพื่à¸à¸•à¸±à¹‰à¸‡à¸„่าคุà¸à¸à¸µà¹‰ ที่จะไม่รวมà¸à¸²à¸£à¹€à¸‚้าชมขà¸à¸‡à¸„ุณบนเว็บไซต์ที่ถูà¸à¸•à¸´à¸”ตาม โดย Piwik บน %s",
"DeleteConfirm": "คุณà¹à¸™à¹ˆà¹ƒà¸ˆà¸«à¸£à¸·à¸à¹„ม่ที่จะลบผู้ใช้ %s ?",
@@ -15,14 +14,11 @@
"ExceptionEditAnonymous": "ผู้ใช้งานที่ไม่ระบุชื่à¸à¹„ม่สามารถà¹à¸à¹‰à¹„ขหรืà¸à¸¥à¸šà¹„ด้ มันถูà¸à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹‚ดย Piwik เพื่à¸à¸£à¸°à¸šà¸¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸—ี่ไม่ได้เข้าสู่ระบบยัง ตัวà¸à¸¢à¹ˆà¸²à¸‡à¹€à¸Šà¹ˆà¸™ คุณสามารถà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ั่วไปสามารถดูสถิติขà¸à¸‡à¹€à¸§à¹‡à¸šà¸„ุณได้",
"ExceptionEmailExists": "ผู้ใช้มีà¸à¸µà¹€à¸¡à¸¥à¹Œ '%s' à¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§",
"ExceptionInvalidEmail": "รูปà¹à¸šà¸šà¸‚à¸à¸‡à¸à¸µà¹€à¸¡à¸¥à¹Œà¹„ม่ถูà¸à¸•à¹‰à¸à¸‡",
- "ExceptionInvalidLoginFormat": "ชืà¸à¹€à¸‚้าระบบจะต้à¸à¸‡à¸¢à¸²à¸§ %1$s à¹à¸¥à¸° %2$s ซึ่งจะประà¸à¸à¸šà¹„ปด้วยตัวà¸à¸±à¸à¸©à¸£, ตัวเลขหรืà¸à¹€à¸„รื่à¸à¸‡à¸«à¸¡à¸²à¸¢ '_' หรืภ'-' หรืภ'.' เป็นต้น",
- "ExceptionLoginExists": "ชื่à¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ '%s' มีà¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth คืà¸à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹à¸šà¸š MD5-hashed (มีความยาว 32 à¸à¸±à¸à¸‚ระ) à¸à¸£à¸¸à¸“าเรียà¸à¹ƒà¸Šà¹‰à¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¸™ md5() ซึ่งจะมีรหัสผ่านà¸à¹ˆà¸à¸™à¸—ี่จะเรียà¸à¸§à¸´à¸˜à¸µà¸à¸²à¸£à¸™à¸µà¹‰",
"ExceptionUserDoesNotExist": "ผู้ใช้ '%s' ไม่มีในระบบ",
"ExcludeVisitsViaCookie": "ไม่รวมà¸à¸²à¸£à¹€à¸‚้าชมขà¸à¸‡à¸„ุณโดยใช้คุà¸à¸à¸µà¹‰",
"ForAnonymousUsersReportDateToLoadByDefault": "สำหรับผู้ใช้ที่ไม่ระบุชื่ภรายงานวันที่โหลด โดยค่าเริ่มต้น",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "ถ้าคุณต้à¸à¸‡à¸à¸²à¸£à¸—ี่จะเปลี่ยนชนิดขà¸à¸‡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸«à¸¡à¹ˆ มิฉะนั้นให้ปล่à¸à¸¢à¸™à¸µà¹‰à¸§à¹ˆà¸²à¸‡à¹„ว้",
- "MainDescription": "à¸à¸²à¸£à¸•à¸±à¸”สินใจว่าผู้ใช้รายใดที่ Piwik เข้าถึงเว็บไซต์ขà¸à¸‡à¸„ุณ นà¸à¸à¸ˆà¸²à¸à¸™à¸µà¹‰à¸„ุณยังสามารถà¸à¸³à¸«à¸™à¸”สิทธิในเว็บไซต์ทั้งหมดในครั้งเดียว",
"ManageAccess": "จัดà¸à¸²à¸£à¸à¸²à¸£à¹€à¸‚้าถึง",
"MenuAnonymousUserSettings": "à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าผู้ใช้ที่ไม่ระบุชื่à¸",
"MenuUsers": "ผู้ใช้",
@@ -39,7 +35,7 @@
"UsersManagementMainDescription": "สร้างผู้ใช้ใหม่หรืà¸à¸à¸±à¸žà¹€à¸”ตผู้ใช้ที่มีà¸à¸¢à¸¹à¹ˆ จาà¸à¸™à¸±à¹‰à¸™à¸„ุณสามารถà¸à¸³à¸«à¸™à¸”สิทธิ์ขà¸à¸‡à¸žà¸§à¸à¹€à¸‚าได้",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "เมื่à¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¹€à¸‚้าสู่ระบบà¹à¸¥à¸°à¹€à¸‚้าชม Piwik พวà¸à¹€à¸‚าควรจะเข้าถึงได้",
"YourUsernameCannotBeChanged": "ชื่à¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‚à¸à¸‡à¸„ุณไม่สามารถเปลี่ยนà¹à¸›à¸¥à¸‡à¹„ด้",
- "YourVisitsAreIgnoredOnDomain": "%s ผู้เข้าชมขà¸à¸‡à¸„ุณจะถูà¸à¸¥à¸°à¹€à¸§à¹‰à¸™ โดย Piwik บน %s %s (Piwik ละเว้นà¸à¸²à¸£à¸—ี่พบคุà¸à¸à¸µà¹‰à¹ƒà¸™à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œà¸‚à¸à¸‡à¸„ุณ)",
- "YourVisitsAreNotIgnored": "%s ผู้เข้าชมขà¸à¸‡à¸„ุณจะถูà¸à¸¥à¸°à¹€à¸§à¹‰à¸™à¹‚ดย Piwik %s (Piwik ละเว้นไม่พบคุà¸à¸à¸µà¹‰à¹ƒà¸™à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œà¸‚à¸à¸‡à¸„ุณ)"
+ "YourVisitsAreIgnoredOnDomain": "%1$s ผู้เข้าชมขà¸à¸‡à¸„ุณจะถูà¸à¸¥à¸°à¹€à¸§à¹‰à¸™ โดย Piwik บน %2$s %3$s (Piwik ละเว้นà¸à¸²à¸£à¸—ี่พบคุà¸à¸à¸µà¹‰à¹ƒà¸™à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œà¸‚à¸à¸‡à¸„ุณ)",
+ "YourVisitsAreNotIgnored": "%1$s ผู้เข้าชมขà¸à¸‡à¸„ุณจะถูà¸à¸¥à¸°à¹€à¸§à¹‰à¸™à¹‚ดย Piwik %2$s (Piwik ละเว้นไม่พบคุà¸à¸à¸µà¹‰à¹ƒà¸™à¹€à¸šà¸£à¸²à¸§à¹Œà¹€à¸‹à¸à¸£à¹Œà¸‚à¸à¸‡à¸„ุณ)"
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/tl.json b/plugins/UsersManager/lang/tl.json
index c137ea1b1b8c351723c4a58eaa4dcbb01651c5b7..e36ce6ab3fac69cbac59d109577f8da85ea6ae66 100644
--- a/plugins/UsersManager/lang/tl.json
+++ b/plugins/UsersManager/lang/tl.json
@@ -6,13 +6,11 @@
"AnonymousUserHasViewAccess": "Tandaan: ang %1$s user ay may %2$s na access sa website na ito",
"AnonymousUserHasViewAccess2": "Ang iyong ulat na pang analytics at ang mga impormasyon ng iyong mga bisita ay makikita ng publiko.",
"ApplyToAllWebsites": "Mai-aapply sa lahat ng mga website",
- "ChangeAllConfirm": "Sigurado ka bang gusto mong baguhin ang mga permission sa '%s' sa lahat ng website?",
"ChangePasswordConfirm": "Kasamang ring mapapalitan ang user's token_auth kapag ikaw ay nagpalita ng password. Gusto mo ba talang ituloy ito?",
"ClickHereToDeleteTheCookie": "Pindutin dito upang burahin ang cookie at matala ng Piwik ang iyong pagbisita.",
"ClickHereToSetTheCookieOnDomain": "I-click dito upang magtakda ng cookie na mag buibukod sa iyong mga pagbisita sa mga website na sinusubaybayan ng Piwik sa %s.",
"ConfirmGrantSuperUserAccess": "Nais mo bang bigyan '%s' Super User access? Babala: ang user ay mag kakaroon ng access sa lahat ng websites at makakagawa ng pang administratibong gawain.",
"ConfirmProhibitMySuperUserAccess": "%s gusto mo bang alisin ang iyong Super User access? Maaring mawala lahat ang iyong permiso at access sa lahat ng websites at ikaw ay malala log-out sa Piwik.",
- "ConfirmProhibitOtherUsersSuperUserAccess": "Gusto mo ba talagang alisin ang Super User access mula kay '%s'? Ang user na ito ay mawawala ang lahat ng permiso at access sa lahat ng websites. Tiyakin na i-set ang mga permiso sa mga website na kailagan at kung itoy kinakailangan.",
"DeleteConfirm": "Sigurado ka bang gusto mong tanggalin ang user %s?",
"Email": "Email",
"EmailYourAdministrator": "%1$s I-e-mail sa iyong administrator tungkol sa problemang ito %2$s.",
@@ -24,7 +22,6 @@
"ExceptionEmailExists": "Ang email na '%s' para sa user na ito ay may iba nang gumagamit.",
"ExceptionInvalidEmail": "Ang e-mail ay walang wastong format.",
"ExceptionInvalidPassword": "Ang haba ng password ay dapat nasa pagitan ng %1$s at %2$s na character.",
- "ExceptionLoginExists": "Meron ng tulad nitong login '%s'.",
"ExceptionPasswordMD5HashExpected": "Ang UserManager.get Token Auth ay kinikilala lamang ang MD5-hashed password (32 chars long string). Mangyaring gamitin ang md5() function sa password bago gamitin ang method na ito.",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "Ang pag-alis sa Super User access mula sa user '%s' ay hindi posible.",
"ExceptionSuperUserAccess": "Ang user na ito ay mayroong Super User access at meroong permiso na e-access at magbago sa lahat ng website na nasa Piwik. Maari mong alisin ang Super User access mula sa user na ito at subukang muli.",
@@ -35,7 +32,6 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Kung nais mong baguhin ang iyong passoword mag type ng bago. Kung hindi man iwan itong blangko.",
"InjectedHostCannotChangePwd": "Ikaw ay kasalukuyang bumibisita sa isang hindi kilalang host (%1$s). Hindi mo maaaring baguhin ang iyong password hanggat hindi naayos ang problemang ito.",
"LastSeen": "Huling nakita",
- "MainDescription": "Magpasya kung aling mga gumagamit ay may na Piwik access sa iyong mga website. Maaari mong e-set ang mga permiso sa lahat ng website ng sabay-sabay.",
"ManageAccess": "Pamahalaan ang access",
"MenuAnonymousUserSettings": "Mga settings ng anonymous na user",
"MenuUsers": "Users",
@@ -58,7 +54,7 @@
"UsersManagementMainDescription": "Lumikha ng mga bagong user o i-update ang mga mayroon nang user. Pagkatapos ay maaari mong itakda ang kanilang mga permiso sa itaas.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Kung ang gumagamit ay hindi naka log-in at bumisita sa Piwik kailangan nilang mag-access",
"YourUsernameCannotBeChanged": "Hindi maaaring mabago ang iyong username.",
- "YourVisitsAreIgnoredOnDomain": "%s Ang iyong bisita ay hindi na-ignore ng Piwik %s %s (ang Piwik ignore cookie ay hindi nakita sa iyong browser).",
- "YourVisitsAreNotIgnored": "%s Ang iyong bisita ay hindi na-ignore ng Piwik%s (ang Piwik ignore cookie ay hindi nakita sa iyong browser)."
+ "YourVisitsAreIgnoredOnDomain": "%1$s Ang iyong bisita ay hindi na-ignore ng Piwik %2$s %3$s (ang Piwik ignore cookie ay hindi nakita sa iyong browser).",
+ "YourVisitsAreNotIgnored": "%1$s Ang iyong bisita ay hindi na-ignore ng Piwik%2$s (ang Piwik ignore cookie ay hindi nakita sa iyong browser)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/tr.json b/plugins/UsersManager/lang/tr.json
index 3342bbbde774fe8a05217ce25c31980a344b3cf9..aa3fab8c00e64018e42b77571fa020b93e7aaec4 100644
--- a/plugins/UsersManager/lang/tr.json
+++ b/plugins/UsersManager/lang/tr.json
@@ -4,7 +4,6 @@
"Alias": "DiÄŸer Ad",
"AllWebsites": "Tüm Websiteler",
"ApplyToAllWebsites": "Tüm websitelere uygula",
- "ChangeAllConfirm": "Tüm websitelerin '%s' izinlerini değiştirmektesiniz, emin misiniz?",
"ClickHereToDeleteTheCookie": "Çerezleri silmek ve sizin ziyaretlerinizi takip etmek için burayi tıklayınız",
"DeleteConfirm": "%s kullanıcısını silmekten emin misiniz?",
"Email": "Eposta",
@@ -30,7 +29,7 @@
"UsersManagement": "Kullanıcı Yönetimleri",
"UsersManagementMainDescription": "Yeni kullanıcı yaratın yada var olan kullanıcıyı güncelleyin. Yukaridaki izinleri ayarlayabilirsiniz.",
"YourUsernameCannotBeChanged": "Kullanıcı adınız değiştirilemez.",
- "YourVisitsAreIgnoredOnDomain": "%sSizin ziyaretleriniz Piwik tarafından %s hariç tutulmuyor%s (Piwik tarayınızdaki çerezleri bulamamiştir. O nedenle hariç tutulmuyorsunuz).",
- "YourVisitsAreNotIgnored": "%sSizin ziyaretleriniz Piwik tarafından hariç tutulmuyor%s (Piwik tarayınızdaki çerezleri bulamamiştir. O nedenle hariç tutulmuyorsunuz)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sSizin ziyaretleriniz Piwik tarafından %2$s hariç tutulmuyor%3$s (Piwik tarayınızdaki çerezleri bulamamiştir. O nedenle hariç tutulmuyorsunuz).",
+ "YourVisitsAreNotIgnored": "%1$sSizin ziyaretleriniz Piwik tarafından hariç tutulmuyor%2$s (Piwik tarayınızdaki çerezleri bulamamiştir. O nedenle hariç tutulmuyorsunuz)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/uk.json b/plugins/UsersManager/lang/uk.json
index 52b3b72acd7ae0b113a29fb31c31279ae926d5f2..e429bb4983d29c4d66e21395c07bb2d91a0cdb6b 100644
--- a/plugins/UsersManager/lang/uk.json
+++ b/plugins/UsersManager/lang/uk.json
@@ -4,7 +4,6 @@
"Alias": "ПÑевдонім",
"AllWebsites": "Ð’ÑÑ– веб-Ñайти",
"ApplyToAllWebsites": "ЗаÑтоÑувати до вÑÑ–Ñ… веб-Ñайтів",
- "ChangeAllConfirm": "Змінити права \"%s\" Ð´Ð»Ñ Ð²ÑÑ–Ñ… вебÑайтів?",
"ClickHereToDeleteTheCookie": "Клацніть щоб видалити cookie та дозволити Piwik відÑлідковувати ваші візити",
"ClickHereToSetTheCookieOnDomain": "Клацніть щоб вÑтановити cookie Ñкий Ñлугуватиме вказівкою Ð´Ð»Ñ Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¸Ñ… візитів при відÑлідковуванні на веб-Ñайті %s",
"DeleteConfirm": "Видалити кориÑтувача %s?",
@@ -15,14 +14,11 @@
"ExceptionEditAnonymous": "Ðнонімний кориÑтувач не може бути відредагований або видалений. Цей тип кориÑтувачів Piwik заÑтоÑовує Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувачів, Ñкі не предÑтавилиÑÑŒ ÑиÑтемі. Ðаприклад, Ви можете зробити Вашу ÑтатиÑтику публічною надаючи права \"переглÑду\" анонімномим кориÑтувачам.",
"ExceptionEmailExists": "КориÑтувач з адреÑою e-mail \"%s\" вже Ñ–Ñнує.",
"ExceptionInvalidEmail": "Ðевірний e-mail.",
- "ExceptionInvalidLoginFormat": "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача повинно бути довжиною від %1$s до %2$s Ñимволів та міÑтити тільки букви, цифри, Ñимволи \"_\", \"-\" та \".\"",
- "ExceptionLoginExists": "Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача \"%s\" вже Ñ–Ñнує.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth приймає на вхід пароль хешований MD5 (Ñтрічку довжиною в 32 Ñимволи). Викличте функцію md5() перед визовом даного методу.",
"ExceptionUserDoesNotExist": "КориÑтувач \"%s\" не Ñ–Ñнує.",
"ExcludeVisitsViaCookie": "Виключити ваші Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñтовуючи cookie",
"ForAnonymousUsersReportDateToLoadByDefault": "Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ñ–Ð¼Ð½Ð¸Ñ… кориÑтувачів повідомлÑти дату Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð° замовчуваннÑ",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Якщо необхідно змінити пароль, введіть новий Ñюди. Ð’ іншому випадку залиште поле незаповненим.",
- "MainDescription": "Ð’Ñтановіть Ñкий рівень Piwik доÑтупу має кожен кориÑтувач на ваших веб-Ñайтах.",
"ManageAccess": "Ð£Ð¿Ñ€Ð°Ð²Ð»Ñ–Ð½Ð½Ñ Ð´Ð¾Ñтупом",
"MenuAnonymousUserSettings": "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ð½Ð¾Ð½Ñ–Ð¼Ð½Ð¾Ð³Ð¾ кориÑтувача",
"MenuUsers": "КориÑтувачі",
@@ -39,7 +35,7 @@
"UsersManagementMainDescription": "Створіть нових кориÑтувачів або редагуйте Ñ–Ñнуючих. Також нижче можна задати права доÑтупу Ð´Ð»Ñ Ð½Ð¸Ñ….",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Якщо кориÑтувачі не увійшли в ÑиÑтему Ñ– відвідують Piwik, то овни повинні мати можливіÑÑ‚ÑŒ отримати доÑтуп",
"YourUsernameCannotBeChanged": "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача не можу бути змінене.",
- "YourVisitsAreIgnoredOnDomain": "%sВаші Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñ–Ð³Ð½Ð¾Ñ€ÑƒÑŽÑ‚ÑŒÑÑ ÑиÑтемою Piwik в %s %s (Piwik знашов cookie у вашому браузері з вказівкою ігнорувати).",
- "YourVisitsAreNotIgnored": "%sВаші Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´ÑлідковуютьÑÑ ÑиÑтемою Piwik %s (Piwik не знашов cookie у вашому браузері)."
+ "YourVisitsAreIgnoredOnDomain": "%1$sВаші Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñ–Ð³Ð½Ð¾Ñ€ÑƒÑŽÑ‚ÑŒÑÑ ÑиÑтемою Piwik в %2$s %3$s (Piwik знашов cookie у вашому браузері з вказівкою ігнорувати).",
+ "YourVisitsAreNotIgnored": "%1$sВаші Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´ÑлідковуютьÑÑ ÑиÑтемою Piwik %2$s (Piwik не знашов cookie у вашому браузері)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/vi.json b/plugins/UsersManager/lang/vi.json
index 817096758047b1d5761dffef50dcf82d674e4bb2..33b12cb8747e239425ed8addd01e76896a29d1d6 100644
--- a/plugins/UsersManager/lang/vi.json
+++ b/plugins/UsersManager/lang/vi.json
@@ -6,7 +6,6 @@
"AnonymousUserHasViewAccess": "LÆ°u ý: NgÆ°á»i dùng %1$s có truy cáºp %2$s đến website nà y.",
"AnonymousUserHasViewAccess2": "Các báo cáo phân tÃch của bạn và thông tin các khách truy cáºp của bạn là công khai có thể xem được.",
"ApplyToAllWebsites": "Ãp dụng cho tất cả các website",
- "ChangeAllConfirm": "Bạn có chắc chắn bạn muốn thay đổi '%s' quyá»n truy cáºp trên tất cả các trang web?",
"ChangePasswordConfirm": "Thay đổi máºt khẩu cÅ©ng sẽ thay đổi token_auth của ngÆ°á»i dùng. Bạn có thá»±c sá»± muốn tiếp tục?",
"ClickHereToDeleteTheCookie": "Click và o đây để xóa các cookie và đã Piwik theo dõi truy cáºp của bạn",
"ClickHereToSetTheCookieOnDomain": "Click và o đây để thiết láºp má»™t cookie sẽ loại trừ các lượt truy cáºp của bạn trên các trang web được theo dõi bởi Piwik trên %s",
@@ -19,16 +18,13 @@
"ExceptionEditAnonymous": "NgÆ°á»i dùng ẩn danh không thể chỉnh sá»a hoặc xóa. Nó được sá» dụng bởi Piwik để xác định má»™t ngÆ°á»i dùng đã không đăng nháºp lúc nà y. Và dụ, bạn có thể là m cho số liệu thống kê công cá»™ng(public) của bạn bằng cách cho phép truy cáºp \"xem\" đến ngÆ°á»i dùng 'ẩn danh'.",
"ExceptionEmailExists": "NgÆ°á»i dùng vá»›i email '%s' đã tồn tại.",
"ExceptionInvalidEmail": "Email không có một định dạng hợp lệ.",
- "ExceptionInvalidLoginFormat": "Äăng nháºp phải từ %1$s và %2$s character long and chỉ chứa chữ cái, số, hoặc các ký tá»± '_' hoặc '-' hoặc '.' hoặc '@' hoặc '+'",
"ExceptionInvalidPassword": "Äá»™ dà i máºt khẩu phải từ %1$s và %2$s ký tá»±.",
- "ExceptionLoginExists": "Äăng nháºp '%s' đã tồn tại.",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth là yêu cầu má»™t máºt khẩu băm MD5 (chuá»—i 32 char long). Xin vui lòng gá»i hà m md5() trên máºt khẩu trÆ°á»›c khi gá»i phÆ°Æ¡ng thức nà y.",
"ExceptionUserDoesNotExist": "NgÆ°á»i dùng '%s' không tồn tại.",
"ExcludeVisitsViaCookie": "Loại bá» các truy cáºp của bạn sá» dụng má»™t cookie",
"ForAnonymousUsersReportDateToLoadByDefault": "Äối vá»›i ngÆ°á»i dùng ẩn danh, báo cáo thep ngà y nạp theo mặc định",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "Nếu bạn muốn thay đổi các loại máºt khẩu thà nh má»™t cái má»›i. Nếu không thì để trống.",
"InjectedHostCannotChangePwd": "Bạn Ä‘ang truy cáºp vá»›i má»™t máy chủ không xác định (%1$s). Bạn không thể thay đổi máºt khẩu của bạn cho đến khi vấn Ä‘á» nà y được xá» lý.",
- "MainDescription": "Quyết định ngÆ°á»i dùng nà o đó có truy cáºp Piwik nà o đó trên trang web của bạn. Bạn cÅ©ng có thể thiết láºp quyá»n truy cáºp trên tất cả các trang web cùng má»™t lúc.",
"ManageAccess": "Quản lý truy cáºp",
"MenuAnonymousUserSettings": "Thiết láºp ngÆ°á»i dùng ẩn danh",
"MenuUsers": "Các ngÆ°á»i dùng",
@@ -47,7 +43,7 @@
"UsersManagementMainDescription": "Tạo ngÆ°á»i dùng má»›i hoặc cáºp nháºt các ngÆ°á»i dùng hiện tại. Sau đó bạn có thể thiết láºp quyá»n của há».",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Khi ngÆ°á»i dùng không đăng nháºp và thăm Piwik, há» nên truy cáºp",
"YourUsernameCannotBeChanged": "Tên đăng nháºp của bạn không thể thay đổi.",
- "YourVisitsAreIgnoredOnDomain": "%s lượt truy cáºp của bạn sẽ được bá» qua bởi Piwik trên %s %s (cookie Piwik bá» qua đã được tìm thấy trong trình duyệt của bạn).",
- "YourVisitsAreNotIgnored": "%s lượt truy cáºp của bạn không được bá» qua bởi Piwik %s (cookie Piwik bá» qua đã không tìm thấy trong trình duyệt của bạn)."
+ "YourVisitsAreIgnoredOnDomain": "%1$s lượt truy cáºp của bạn sẽ được bá» qua bởi Piwik trên %2$s %3$s (cookie Piwik bá» qua đã được tìm thấy trong trình duyệt của bạn).",
+ "YourVisitsAreNotIgnored": "%1$s lượt truy cáºp của bạn không được bá» qua bởi Piwik %2$s (cookie Piwik bá» qua đã không tìm thấy trong trình duyệt của bạn)."
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/zh-cn.json b/plugins/UsersManager/lang/zh-cn.json
index 2fbd74e8dad95978a9ec04c878c9a96f5de385ec..50bb92f4beb420c69b2b034a93b7723bd83273a3 100644
--- a/plugins/UsersManager/lang/zh-cn.json
+++ b/plugins/UsersManager/lang/zh-cn.json
@@ -6,7 +6,6 @@
"AnonymousUserHasViewAccess": "æ示: 用户 %1$s å¯ä»¥ %2$s 这个网站。",
"AnonymousUserHasViewAccess2": "您的分æžæŠ¥è¡¨å’Œè®¿å®¢ä¿¡æ¯æ˜¯å…¬å¼€çš„。",
"ApplyToAllWebsites": "应用至所有网站",
- "ChangeAllConfirm": "您确定è¦åœ¨æ‰€æœ‰ç½‘站上修改 '%s' çš„æƒé™å—？",
"ChangePasswordConfirm": "修改密ç åŒæ—¶ä¹Ÿä¼šä¿®æ”¹ç”¨æˆ·çš„授æƒå· token_auth，è¦ç»§ç»å—?",
"ClickHereToDeleteTheCookie": "点击这里刪除 cookie 并让 Piwik 跟踪您的访问记录",
"ClickHereToSetTheCookieOnDomain": "点击这里设定一个 cookie 让 %s 的 Piwik 排除您的访问记录",
@@ -19,16 +18,13 @@
"ExceptionEditAnonymous": "anonymous 用户ä¸èƒ½è¢«ä¿®æ”¹æˆ–åˆ é™¤ï¼Œå› ä¸ºä»–æ˜¯è¢« Piwik 使用æ¥å®šä¹‰ä¸€ä¸ªè¿˜æœªç™»å…¥çš„用户ï¼ä¾‹å¦‚，您å¯ä»¥æŠŠ '查看' æƒé™æŽˆäºˆ 'anonymous' 用户以公开您的统计资料ï¼",
"ExceptionEmailExists": "使用邮箱 '%s' 的用户已å˜åœ¨ï¼",
"ExceptionInvalidEmail": "é‚®ç®±æ ¼å¼ä¸æ£ç¡®ï¼",
- "ExceptionInvalidLoginFormat": "登录å¸å·çš„长度必须介于 %1$s 至 %2$s 个å—符之间，并且åªèƒ½åŒ…å«å—æ¯ã€æ•°å—或å—符 '_' 或 '-' 或 '.' 。",
"ExceptionInvalidPassword": "密ç 长度必须介于 %1$s å’Œ %2$s 个å—符之间。",
- "ExceptionLoginExists": "登录å¸å· '%s' å·²å˜åœ¨ï¼",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth 是以MD5åŠ å¯†çš„å¯†ç (32 个å—符)。使用æ¤æ–¹æ³•è¯·è¯·å…ˆè°ƒç”¨ md5()函数。",
"ExceptionUserDoesNotExist": "用户 '%s' ä¸å˜åœ¨ï¼",
"ExcludeVisitsViaCookie": "用 cookie 排除您自己的访问记录",
"ForAnonymousUsersReportDateToLoadByDefault": "匿åè®¿å®¢é»˜è®¤åŠ è½½çš„æŠ¥è¡¨æ—¥æœŸ",
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "如果您è¦ä¿®æ”¹å¯†ç ，请输入新的密ç ，å¦åˆ™ç•™ç©ºã€‚",
"InjectedHostCannotChangePwd": "您æ£åœ¨è®¿é—®çš„主机å (%1$s) 未知，修å¤è¿™ä¸ªé—®é¢˜åŽæ‰èƒ½ä¿®æ”¹å¯†ç 。",
- "MainDescription": "设置在您网站上的哪个用户具有哪些 Piwik æƒé™ã€‚ 您也å¯ä»¥ä¸€æ¬¡è®¾å®šæ‰€æœ‰ç½‘站的æƒé™ã€‚",
"ManageAccess": "æƒé™ç®¡ç†",
"MenuAnonymousUserSettings": "匿å用户å‚æ•°",
"MenuUsers": "用户管ç†",
@@ -47,7 +43,7 @@
"UsersManagementMainDescription": "æ·»åŠ ç”¨æˆ·æˆ–ä¿®æ”¹ç”¨æˆ·ï¼Œç„¶åŽåœ¨ä¸Šé¢è®¾å®šæƒé™ã€‚",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "如果访客没有登录，访问 Piwik 时打开",
"YourUsernameCannotBeChanged": "ä¸èƒ½ä¿®æ”¹ç”¨æˆ·å。",
- "YourVisitsAreIgnoredOnDomain": "%s您的访问记录已在 %s %s 被 Piwik 忽略(在您的æµè§ˆå™¨æ‰¾åˆ° Piwik æ‹’ç» cookie)",
- "YourVisitsAreNotIgnored": "%s您的访问记录沒有被 Piwik 忽略%s (您的æµè§ˆå™¨ä¸æ²¡æœ‰ Piwik 忽略 cookie)"
+ "YourVisitsAreIgnoredOnDomain": "%1$s您的访问记录已在 %2$s %3$s 被 Piwik 忽略(在您的æµè§ˆå™¨æ‰¾åˆ° Piwik æ‹’ç» cookie)",
+ "YourVisitsAreNotIgnored": "%1$s您的访问记录沒有被 Piwik 忽略%2$s (您的æµè§ˆå™¨ä¸æ²¡æœ‰ Piwik 忽略 cookie)"
}
}
\ No newline at end of file
diff --git a/plugins/UsersManager/lang/zh-tw.json b/plugins/UsersManager/lang/zh-tw.json
index 32d24cf10ab61391fb75d6b191dd78ff923c54f2..db5f835832ccb33b1b9450df30709aa092b65057 100644
--- a/plugins/UsersManager/lang/zh-tw.json
+++ b/plugins/UsersManager/lang/zh-tw.json
@@ -7,13 +7,11 @@
"AnonymousUserHasViewAccess": "注æ„：這個 %1$s 使用者有 %2$s 訪å•è©²ç¶²ç«™ã€‚",
"AnonymousUserHasViewAccess2": "您的分æžå ±å‘Šè·Ÿä½ 的訪客信æ¯æ˜¯å…¬é–‹å¯æŸ¥çœ‹ã€‚",
"ApplyToAllWebsites": "套用至所有網站",
- "ChangeAllConfirm": "ä½ ç¢ºå®šè¦åœ¨æ‰€æœ‰ç¶²ç«™ä¸Šè®Šæ›´ '%s' 的權é™å—Žï¼Ÿ",
"ChangePasswordConfirm": "變更密碼也會更改用戶的token_authã€‚ä½ çœŸçš„è¦ç¹¼çºŒå—Žï¼Ÿ",
"ClickHereToDeleteTheCookie": "點擊這裡刪除 cookie 並讓 Piwik è¿½è¹¤ä½ çš„è¨ªå•ç´€éŒ„",
"ClickHereToSetTheCookieOnDomain": "點擊這裡è¨å®šä¸€å€‹ cookie 讓 %s çš„ Piwik æŽ’é™¤ä½ çš„è¨ªå•ç´€éŒ„",
"ConfirmGrantSuperUserAccess": "ä½ çœŸçš„è¦æŽˆäºˆ '%s' 超級用戶訪å•æ¬Šé™ï¼Ÿè¦å‘Šï¼šè©²ç”¨æˆ¶å°‡æœ‰æ¬Šè¨ªå•æ‰€æœ‰çš„ç¶²ç«™ï¼Œä¸¦èƒ½å¤ åŸ·è¡Œç®¡ç†ä»»å‹™ã€‚",
"ConfirmProhibitMySuperUserAccess": "%sï¼Œä½ çœŸçš„è¦åˆªé™¤è‡ªå·±çš„超級用戶訪å•æ¬Šé™ï¼Ÿä½ 將失去所有的權é™å’Œè¨ªå•æ‰€æœ‰ç¶²ç«™ï¼Œä¸¦æœƒå¾žPiwik註銷。",
- "ConfirmProhibitOtherUsersSuperUserAccess": "ä½ çœŸçš„è¦åˆªé™¤ '%s' 的超級用戶訪å•æ¬Šé™ï¼Ÿç”¨æˆ¶å°‡å¤±åŽ»æ‰€æœ‰çš„權é™å’Œè¨ªå•æ‰€æœ‰ç¶²ç«™ã€‚請確ä¿åœ¨åšé€™æ¨£çš„動作之å‰å·²ç¶“è¨ç½®äº†å¿…è¦çš„權é™ã€‚",
"DeleteConfirm": "ä½ ç¢ºå®šè¦åˆªé™¤ä½¿ç”¨è€… %s 嗎？",
"Email": "E-mail",
"EmailYourAdministrator": "%1$s 郵寄給您的系統管ç†å“¡ä¸¦é‡å°é€™å€‹å•é¡Œ %2$s。",
@@ -24,9 +22,7 @@
"ExceptionEditAnonymous": "匿å用戶ä¸èƒ½ä¿®æ”¹æˆ–åˆªé™¤ã€‚å› ç‚º Piwik ç”¨ä¾†å®šç¾©ä¸€å€‹é‚„æœªç™»å…¥çš„ä½¿ç”¨è€…ã€‚èˆ‰ä¾‹ä¾†èªªï¼Œä½ å¯ä»¥æŠŠ'檢視'權é™çµ¦åŒ¿åç”¨æˆ¶ä¾†å…¬é–‹ä½ çš„çµ±è¨ˆè³‡æ–™ã€‚",
"ExceptionEmailExists": "使用 '%s' E-mail 的使用者已經å˜åœ¨ã€‚",
"ExceptionInvalidEmail": "æ¤ E-mail 地å€æ ¼å¼ç„¡æ•ˆã€‚",
- "ExceptionInvalidLoginFormat": "ç™»å…¥å¸³è™Ÿçš„é•·åº¦å¿…é ˆä»‹æ–¼ %1$s 至 %2$s å—元之間，並且åªèƒ½åŒ…å«å—æ¯ã€æ•¸å—或å—å…ƒ '_' 或 '-' 或 '.' 。",
"ExceptionInvalidPassword": "å¯†ç¢¼é•·åº¦å¿…é ˆæ˜¯ä»‹æ–¼ %1$s è·Ÿ %2$s å—符之間。",
- "ExceptionLoginExists": "登入帳號 '%s' 已經å˜åœ¨ã€‚",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth 是以MD5åŠ å¯†çš„å¯†ç¢¼ï¼ˆ32個å—å…ƒå—串）。在使用æ¤æ–¹æ³•å‰è«‹å…ˆå‘¼å« md5() 函å¼ã€‚",
"ExceptionRemoveSuperUserAccessOnlySuperUser": "刪除用戶 '%s' 的超級用戶訪å•æ¬Šé™æ˜¯ä¸å¯èƒ½çš„。",
"ExceptionSuperUserAccess": "該用戶æ“有超級用戶訪å•æ¬Šé™ï¼Œä¸¦ä¸”已有權é™è¨ªå•å’Œä¿®æ”¹çš„所有網站的Piwik。您å¯ä»¥åˆªé™¤è©²ç”¨æˆ¶çš„超級用戶訪å•æ¬Šé™ï¼Œç„¶å¾Œå†è©¦ä¸€æ¬¡ã€‚",
@@ -37,7 +33,6 @@
"IfYouWouldLikeToChangeThePasswordTypeANewOne": "å¦‚æžœä½ è¦è®Šæ›´å¯†ç¢¼æ™‚請輸入新的密碼。å¦å‰‡ç•™ç©ºã€‚",
"InjectedHostCannotChangePwd": "當å‰æ£è™•æ–¼ä¸€å€‹æœªçŸ¥çš„主機 (%1$s)。您ä¸èƒ½æ›´æ”¹æ‚¨çš„密碼直到這個å•é¡Œå¾—到解決。",
"LastSeen": "最近看到",
- "MainDescription": "æ±ºå®šåœ¨ä½ ç¶²ç«™ä¸Šçš„å“ªå€‹ä½¿ç”¨è€…å…·æœ‰ä½•ç¨® Piwik å˜å–權。 ä½ ä¹Ÿå¯ä»¥ä¸€æ¬¡è¨å®šæ‰€æœ‰ç¶²ç«™çš„權é™ã€‚",
"ManageAccess": "管ç†æ¬Šé™",
"MenuAnonymousUserSettings": "匿å用戶è¨å®š",
"MenuUsers": "使用者",
@@ -46,7 +41,6 @@
"PersonalSettings": "個人化è¨å®š",
"NoteNoAnonymousUserAccessSettingsWontBeUsed2": "注æ„：您ä¸èƒ½æ›´æ”¹é€™äº›è¨ç½®åœ¨æœ¬å€å¡Šä¸ï¼Œå› ç‚ºä½ æ²’æœ‰å¯ä»¥ç”±åŒ¿å用戶訪å•çš„任何網站。",
"NoUsersExist": "還沒有用戶呢。",
- "PluginDescription": "用戶管ç†å¯è®“æ‚¨æ·»åŠ æ–°ç”¨æˆ¶ï¼Œç·¨è¼¯ç¾æœ‰ç”¨æˆ¶ä¸¦ç‚ºå…¶æŒ‡å®šæ¬Šé™æŸ¥çœ‹æˆ–管ç†çš„網站。",
"PrivAdmin": "管ç†å“¡",
"PrivNone": "ç„¡å˜å–權é™",
"PrivView": "檢視",
@@ -63,7 +57,7 @@
"UsersManagementMainDescription": "建立新使用者或更新ç¾å˜çš„ä½¿ç”¨è€…ã€‚ç„¶å¾Œä½ å°±å¯ä»¥å°‡ä»–們è¨å®šç‚ºä»¥ä¸Šæ¬Šé™ã€‚",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "ç•¶ä½¿ç”¨è€…æœªç™»å…¥ä¸”è¨ªå• Piwik 時，他們應該å‰å¾€",
"YourUsernameCannotBeChanged": "ä½ çš„ä½¿ç”¨è€…å稱無法變更。",
- "YourVisitsAreIgnoredOnDomain": "%sä½ çš„è¨ªå•ç´€éŒ„已在 %s %s 被 Piwik å¿½ç•¥ï¼ˆåœ¨ä½ çš„ç€è¦½å™¨æ‰¾åˆ° Piwik 拒絕 cookie）",
- "YourVisitsAreNotIgnored": "%sä½ çš„è¨ªå•ç´€éŒ„沒有被 Piwik 忽略%sï¼ˆåœ¨ä½ çš„ç€è¦½å™¨æ‰¾ä¸åˆ° Piwik 拒絕 cookie）"
+ "YourVisitsAreIgnoredOnDomain": "%1$sä½ çš„è¨ªå•ç´€éŒ„已在 %2$s %3$s 被 Piwik å¿½ç•¥ï¼ˆåœ¨ä½ çš„ç€è¦½å™¨æ‰¾åˆ° Piwik 拒絕 cookie）",
+ "YourVisitsAreNotIgnored": "%1$sä½ çš„è¨ªå•ç´€éŒ„沒有被 Piwik 忽略%2$sï¼ˆåœ¨ä½ çš„ç€è¦½å™¨æ‰¾ä¸åˆ° Piwik 拒絕 cookie）"
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/be.json b/plugins/VisitTime/lang/be.json
index 9eaf161f2b250286285eb6b20fcd3f60f14cbe19..aec8bf6ed2aefba5ae9b665b0b91fc333ce3e498 100644
--- a/plugins/VisitTime/lang/be.json
+++ b/plugins/VisitTime/lang/be.json
@@ -7,8 +7,8 @@
"ServerTime": "ÐаведваннÑÑž па Ñерверным чаÑе",
"SubmenuTimes": "Па чаÑе",
"WidgetLocalTime": "ÐаведваннÑÑž па мÑÑцовым чаÑе",
- "WidgetLocalTimeDocumentation": "ГÑÑ‚Ñ‹ графік паказвае, Ñкі %s Ñ‡Ð°Ñ Ð±Ñ‹Ñž у наведвальніка %s пад Ñ‡Ð°Ñ Ð½Ð°Ð²ÐµÐ´Ð²Ð°Ð½Ð½Ñ Ð²ÐµÐ±-Ñайту.",
+ "WidgetLocalTimeDocumentation": "ГÑÑ‚Ñ‹ графік паказвае, Ñкі %1$s Ñ‡Ð°Ñ Ð±Ñ‹Ñž у наведвальніка %2$s пад Ñ‡Ð°Ñ Ð½Ð°Ð²ÐµÐ´Ð²Ð°Ð½Ð½Ñ Ð²ÐµÐ±-Ñайту.",
"WidgetServerTime": "ÐаведваннÑÑž па Ñерверным чаÑе",
- "WidgetServerTimeDocumentation": "ГÑÑ‚Ñ‹ графік паказвае, Ñкі %s Ñ‡Ð°Ñ Ð±Ñ‹Ñž на Ñерверы %s пад Ñ‡Ð°Ñ Ð½Ð°Ð²ÐµÐ´Ð²Ð°Ð½Ð½Ñ Ð²ÐµÐ±-Ñайту."
+ "WidgetServerTimeDocumentation": "ГÑÑ‚Ñ‹ графік паказвае, Ñкі %1$s Ñ‡Ð°Ñ Ð±Ñ‹Ñž на Ñерверы %2$s пад Ñ‡Ð°Ñ Ð½Ð°Ð²ÐµÐ´Ð²Ð°Ð½Ð½Ñ Ð²ÐµÐ±-Ñайту."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/bg.json b/plugins/VisitTime/lang/bg.json
index 31f10e4014e345c4667712582033758cb5637b9a..bceb1102a19d8ad387469a94fafb4b605f1e3392 100644
--- a/plugins/VisitTime/lang/bg.json
+++ b/plugins/VisitTime/lang/bg.json
@@ -10,8 +10,8 @@
"VisitsByDayOfWeek": "ПоÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ ден от Ñедмицата",
"WidgetByDayOfWeekDocumentation": "Графиката показва поÑещениÑта за вÑеки ден от Ñедмицата.",
"WidgetLocalTime": "ПоÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ локално време",
- "WidgetLocalTimeDocumentation": "Тази графика показва колко е бил чаÑÑŠÑ‚ в %s чаÑÐ¾Ð²Ð¸Ñ Ð¿Ð¾ÑÑ Ð½Ð° потребителите %s по време на поÑещениÑта им.",
+ "WidgetLocalTimeDocumentation": "Тази графика показва колко е бил чаÑÑŠÑ‚ в %1$s чаÑÐ¾Ð²Ð¸Ñ Ð¿Ð¾ÑÑ Ð½Ð° потребителите %2$s по време на поÑещениÑта им.",
"WidgetServerTime": "ПоÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñървърно време",
- "WidgetServerTimeDocumentation": "Тази графика показва колко е бил чаÑÑŠÑ‚ в %s чаÑÐ¾Ð²Ð¸Ñ Ð¿Ð¾ÑÑ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½ от Ñървъра %s по време на поÑещениÑта."
+ "WidgetServerTimeDocumentation": "Тази графика показва колко е бил чаÑÑŠÑ‚ в %1$s чаÑÐ¾Ð²Ð¸Ñ Ð¿Ð¾ÑÑ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½ от Ñървъра %2$s по време на поÑещениÑта."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/ca.json b/plugins/VisitTime/lang/ca.json
index 39fdd4e8fbcdd215cab872db340b9d0fe4c5eb7d..4a6042a101b04e7692a06faa3582f32072714d1a 100644
--- a/plugins/VisitTime/lang/ca.json
+++ b/plugins/VisitTime/lang/ca.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "Visites per dÃa de la setmana",
"WidgetByDayOfWeekDocumentation": "Aquest grà fic mostre el nombre de visites que ha rebut el vostre lloc web cada dia de la setmana.",
"WidgetLocalTime": "Visites segons l'hora local",
- "WidgetLocalTimeDocumentation": "Aquest grà fic mostra a quina hora era a %s la zona horà ria del visitant %s durant la seva visita.",
+ "WidgetLocalTimeDocumentation": "Aquest grà fic mostra a quina hora era a %1$s la zona horà ria del visitant %2$s durant la seva visita.",
"WidgetServerTime": "Visites segons l'hora del servidor",
- "WidgetServerTimeDocumentation": "Aquest grà fic quina hora era a la %s zona horà ria del servidor %s durant la visita."
+ "WidgetServerTimeDocumentation": "Aquest grà fic quina hora era a la %1$s zona horà ria del servidor %2$s durant la visita."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/cs.json b/plugins/VisitTime/lang/cs.json
index c49f2bc6a6a74e93560ee19f5a3ada6d58b4efb5..061bcda4ea78c70574a95dd4c31852ffc5027a76 100644
--- a/plugins/VisitTime/lang/cs.json
+++ b/plugins/VisitTime/lang/cs.json
@@ -1,7 +1,7 @@
{
"VisitTime": {
"ColumnLocalTime": "Lokálnà Äas",
- "ColumnServerTime": "Serverový Äas",
+ "ColumnServerTime": "ÄŒas serveru",
"DayOfWeek": "Dny v týdnu",
"LocalTime": "NávÅ¡tÄ›vy podle lokálnÃho Äasu",
"NHour": "%sh",
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "Návštěvy podle dnů v týdnu",
"WidgetByDayOfWeekDocumentation": "Tento graf zobrazuje, kolik návštěv obdržela vaše stránka každý den v týdnu.",
"WidgetLocalTime": "NávÅ¡tÄ›vy podle lokálnÃho Äasu",
- "WidgetLocalTimeDocumentation": "Tento graf ukazuje Äas v %s návÅ¡tÄ›vnÃkovo Äasové zónÄ› %s bÄ›hem jÄ›ho návÅ¡tÄ›vy.",
+ "WidgetLocalTimeDocumentation": "Tento graf ukazuje Äas v %1$s návÅ¡tÄ›vnÃkovo Äasové zónÄ› %2$s bÄ›hem jÄ›ho návÅ¡tÄ›vy.",
"WidgetServerTime": "NávÅ¡tÄ›vy podle Äasu na serveru",
- "WidgetServerTimeDocumentation": "Tento graf ukazuje jaký Äas byl na %s serveru Äasové zóny %s bÄ›hem návstÄ›vy."
+ "WidgetServerTimeDocumentation": "Tento graf ukazuje jaký Äas byl na %1$s serveru Äasové zóny %2$s bÄ›hem návstÄ›vy."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/da.json b/plugins/VisitTime/lang/da.json
index 3101f2eedf6579ff811497697a998f49061d0a70..679d6109166dd0fbdc87b60524fd39ebd0feebce 100644
--- a/plugins/VisitTime/lang/da.json
+++ b/plugins/VisitTime/lang/da.json
@@ -10,8 +10,8 @@
"VisitsByDayOfWeek": "Besøg efter ugedag",
"WidgetByDayOfWeekDocumentation": "Denne graf viser antallet af besøg hjemmesiden har modtaget på hver dag i ugen.",
"WidgetLocalTime": "Besøg (lokaltid)",
- "WidgetLocalTimeDocumentation": "Diagrammet viser, hvad klokken var i %s besøgendes tidszone %s under deres besøg.",
+ "WidgetLocalTimeDocumentation": "Diagrammet viser, hvad klokken var i %1$s besøgendes tidszone %2$s under deres besøg.",
"WidgetServerTime": "Besøg (servertid)",
- "WidgetServerTimeDocumentation": "Diagrammet viser, hvad klokken var i %s serverens tidszone %s under besøgene."
+ "WidgetServerTimeDocumentation": "Diagrammet viser, hvad klokken var i %1$s serverens tidszone %2$s under besøgene."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/de.json b/plugins/VisitTime/lang/de.json
index cdce77f1dd6b1b5bd9d9d8dd3f636dbd062a4788..27d38c5ff121f1ba43a194618218a482a150c3b0 100644
--- a/plugins/VisitTime/lang/de.json
+++ b/plugins/VisitTime/lang/de.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "Besuche nach Wochentagen",
"WidgetByDayOfWeekDocumentation": "Dieser Graph zeigt die Anzahl der Besuche Ihrer Website nach Wochentagen.",
"WidgetLocalTime": "Besuche nach lokaler Zeit",
- "WidgetLocalTimeDocumentation": "Dieser Graph zeigt, wie viel Uhr es %s in der Zeitzone des Besuchers %s war, als er die Seite besuchte.",
+ "WidgetLocalTimeDocumentation": "Dieser Graph zeigt, wie viel Uhr es %1$s in der Zeitzone des Besuchers %2$s war, als er die Seite besuchte.",
"WidgetServerTime": "Besuche nach Server-Zeit",
- "WidgetServerTimeDocumentation": "Dieser Graph zeigt, wie viel Uhr es %s in der Zeitzone des Servers %s war, als die Seite besucht wurde."
+ "WidgetServerTimeDocumentation": "Dieser Graph zeigt, wie viel Uhr es %1$s in der Zeitzone des Servers %2$s war, als die Seite besucht wurde."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/el.json b/plugins/VisitTime/lang/el.json
index 7a7b502c5f19e1bb85e2b40448b2c7536ec7565b..3a0ab4b1569f4a22a7803d2b0e316b560a87ebcc 100644
--- a/plugins/VisitTime/lang/el.json
+++ b/plugins/VisitTime/lang/el.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "ΕπισκÎψεις ανά ΗμÎÏα της Εβδομάδας",
"WidgetByDayOfWeekDocumentation": "Αυτό το διάγÏαμμα δείχνει τον αÏιθμό των επισκÎψεων που είχε η ιστοσελίδα σας κάθε ημÎÏα της εβδομάδας.",
"WidgetLocalTime": "ΕπισκÎψεις ανά τοπική ÏŽÏα",
- "WidgetLocalTimeDocumentation": "Αυτό το διάγÏαμμα δείχνει τι ÏŽÏα ήταν στη %sζώνη ÏŽÏας των επισκεπτών%s κατά τις επισκÎψεις τους.",
+ "WidgetLocalTimeDocumentation": "Το γÏάφημα δείχνει την ακÏιβή ÏŽÏα στην %1$s ÏŽÏα ζώνης των επισκεπτών %2$s κατά την διάÏκεια της επίσκεψής τους.",
"WidgetServerTime": "ΕπισκÎψεις ανά ÏŽÏα διακομιστή",
- "WidgetServerTimeDocumentation": "Αυτό το διάγÏαμμα δείχνει τι ÏŽÏα ήταν στη %sζώνη ÏŽÏας του διακομιστή%s κατά τις επισκÎψεις τους."
+ "WidgetServerTimeDocumentation": "Το γÏάφημα δείχνει την ακÏιβή ÏŽÏα στην %1$s ÏŽÏα ζώνης του διακομιστή %2$s κατά την διάÏκεια των επισκÎψεων."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/en.json b/plugins/VisitTime/lang/en.json
index df2f6b67346cdff4d1987e66897c6522ea5e1a9c..15fb00915c48a159ef136d9aa35ba1905efa9485 100644
--- a/plugins/VisitTime/lang/en.json
+++ b/plugins/VisitTime/lang/en.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "Visits by Day of Week",
"WidgetByDayOfWeekDocumentation": "This graph shows the number of visits your website received on each day of the week.",
"WidgetLocalTime": "Visits by Local Time",
- "WidgetLocalTimeDocumentation": "This graph shows what time it was in the %s visitors' time zones %s during their visits.",
+ "WidgetLocalTimeDocumentation": "This graph shows what time it was in the %1$s visitors' time zones %2$s during their visits.",
"WidgetServerTime": "Visits by Server Time",
- "WidgetServerTimeDocumentation": "This graph shows what time it was in the %s server's time zone %s during the visits."
+ "WidgetServerTimeDocumentation": "This graph shows what time it was in the %1$s server's time zone %2$s during the visits."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/es.json b/plugins/VisitTime/lang/es.json
index 34f58c4898b85a2bcdea7b823bd06f6efa640cc2..ab312e358befa72ec39d3a77ef7cf25983b3e492 100644
--- a/plugins/VisitTime/lang/es.json
+++ b/plugins/VisitTime/lang/es.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "Visitas por dÃa de la semana",
"WidgetByDayOfWeekDocumentation": "Este gráfico muestra el número de visitas que su sitio de internet recibió en cada dÃa de la semana.",
"WidgetLocalTime": "Visitas por hora local",
- "WidgetLocalTimeDocumentation": "Este gráfico muestra que horario fue %sen las zonas horarias de los visitantes %s durante sus visitas.",
+ "WidgetLocalTimeDocumentation": "Este gráfico muestra que horario fue %1$sen las zonas horarias de los visitantes %2$s durante sus visitas.",
"WidgetServerTime": "Visitas por hora del servidor",
- "WidgetServerTimeDocumentation": "Este gráfico muestra cual fue el horario en la %s zona horaria del servidor %s durante las visitas."
+ "WidgetServerTimeDocumentation": "Este gráfico muestra cual fue el horario en la %1$s zona horaria del servidor %2$s durante las visitas."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/fi.json b/plugins/VisitTime/lang/fi.json
index 70569fb1f3b472738b4ed0a5718e72b287d8f0f2..14e8b8856b00dedcf269308679cd4297d6878cd0 100644
--- a/plugins/VisitTime/lang/fi.json
+++ b/plugins/VisitTime/lang/fi.json
@@ -10,8 +10,8 @@
"VisitsByDayOfWeek": "Käynnit viikonpäivän mukaan",
"WidgetByDayOfWeekDocumentation": "Tämä kuvaaja näyttää käyntien määrän sivuilla viikonpäivien mukaan",
"WidgetLocalTime": "Käyntejä (paikallinen aika)",
- "WidgetLocalTimeDocumentation": "Tämä kuvaaja näyttää, mikä aika oli %s kävijöiden aikavyöhykkeellä %s käyntien aikana.",
+ "WidgetLocalTimeDocumentation": "Tämä kuvaaja näyttää, mikä aika oli %1$s kävijöiden aikavyöhykkeellä %2$s käyntien aikana.",
"WidgetServerTime": "Käyntejä (palvelimen aika)",
- "WidgetServerTimeDocumentation": "Tämä kuvaaja näyttää, mikä aika oli %s palvelimen aikavyöhykkeellä %s käyntien aikana."
+ "WidgetServerTimeDocumentation": "Tämä kuvaaja näyttää, mikä aika oli %1$s palvelimen aikavyöhykkeellä %2$s käyntien aikana."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/fr.json b/plugins/VisitTime/lang/fr.json
index 6b5e0768bd8d50fc93116334a8fe9bf5ffd0a302..17dcea648a120f89a4634a872efc0bf676d7caf9 100644
--- a/plugins/VisitTime/lang/fr.json
+++ b/plugins/VisitTime/lang/fr.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "Visites par Jour de la Semaine",
"WidgetByDayOfWeekDocumentation": "Ce graphique affiche le nombre de visites que votre site web a reçu durant chaque jour de la semaine.",
"WidgetLocalTime": "Visites par fuseau horaire local",
- "WidgetLocalTimeDocumentation": "Ce graphique affiche la répartition horaire basée sur le %s fuseau horaire du visiteur %s.",
+ "WidgetLocalTimeDocumentation": "Ce graphique affiche la répartition horaire basée sur le %1$s fuseau horaire du visiteur %2$s.",
"WidgetServerTime": "Visites par fuseau horaire du serveur",
- "WidgetServerTimeDocumentation": "Ce graphique affiche la répartition horaire basée sur le %s fuseau horaire du serveur %s."
+ "WidgetServerTimeDocumentation": "Ce graphique affiche la répartition horaire basée sur le %1$s fuseau horaire du serveur %2$s."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/id.json b/plugins/VisitTime/lang/id.json
index f06dcfb3e7ea9a096657d5035048b3d6676b25a1..066fa2f0b0766b3822b73a80d15b9c6095d08fcf 100644
--- a/plugins/VisitTime/lang/id.json
+++ b/plugins/VisitTime/lang/id.json
@@ -10,8 +10,8 @@
"VisitsByDayOfWeek": "Kunjungan berdasar Hari dalam Sepekan",
"WidgetByDayOfWeekDocumentation": "Grafik ini menampilkan jumlah kunjungan yang diperoleh situs Anda dalam setiap hari dalam sepekan.",
"WidgetLocalTime": "Kunjungan berdasar waktu lokal",
- "WidgetLocalTimeDocumentation": "Grafik ini menampilkan waktu pengunjung %s saat ini dalam wilayah waktu %s selama kunjungan.",
+ "WidgetLocalTimeDocumentation": "Grafik ini menampilkan waktu pengunjung %1$s saat ini dalam wilayah waktu %2$s selama kunjungan.",
"WidgetServerTime": "Kunjungan berdasar waktu peladen",
- "WidgetServerTimeDocumentation": "Grafik ini menampilkan waktu peladen %s saat ini dalam wilayah waktu %s selama kunjungan."
+ "WidgetServerTimeDocumentation": "Grafik ini menampilkan waktu peladen %1$s saat ini dalam wilayah waktu %2$s selama kunjungan."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/it.json b/plugins/VisitTime/lang/it.json
index 2671412557be745d06fc4a302a08a770394e91fe..c458a1aeba1d0f4da2843ed8ad119a2ff30b9770 100644
--- a/plugins/VisitTime/lang/it.json
+++ b/plugins/VisitTime/lang/it.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "Visite per giorno della settimana",
"WidgetByDayOfWeekDocumentation": "Il grafico mostra il numero di visite che il tuo sito ha ricevuto in ciascun giorno della settimana.",
"WidgetLocalTime": "Visite per ora locale",
- "WidgetLocalTimeDocumentation": "Questo grafico mostra che ora era nei %sfusi orari dei visitatori%s durante le loro visite.",
+ "WidgetLocalTimeDocumentation": "Questo grafico mostra che ora era nei %1$sfusi orari dei visitatori%2$s durante le loro visite.",
"WidgetServerTime": "Visite per ora del server",
- "WidgetServerTimeDocumentation": "Questo grafico mostra che ora era nel %sfuso orario del server%s durante le visite."
+ "WidgetServerTimeDocumentation": "Questo grafico mostra che ora era nel %1$s fuso orario del server %2$s durante le visite."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/ja.json b/plugins/VisitTime/lang/ja.json
index 57c3356e39ae993486fa3e21602cf8b4c8bb0d26..a690e2b9b8d4f97c952044a32aab1650f6e0a845 100644
--- a/plugins/VisitTime/lang/ja.json
+++ b/plugins/VisitTime/lang/ja.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "曜日別訪å•æ•°",
"WidgetByDayOfWeekDocumentation": "ã“ã®ã‚°ãƒ©ãƒ•ã¯ã€æ›œæ—¥ã”ã¨ã®ã‚¦ã‚§ãƒ–サイト訪å•æ•°ã‚’表示ã—ã¾ã™",
"WidgetLocalTime": "ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ å˜ä½ã®ãƒ“ジット",
- "WidgetLocalTimeDocumentation": "ã“ã®ã‚°ãƒ©ãƒ•ã¯ã€è¨ªå•ä¸ã® %s ビジターã®æ™‚間帯 %s を表示ã—ã¾ã™ã€‚",
+ "WidgetLocalTimeDocumentation": "ã“ã®ã‚°ãƒ©ãƒ•ã¯ã€è¨ªå•ä¸ã® %1$s ビジターã®æ™‚間帯 %2$s を表示ã—ã¾ã™ã€‚",
"WidgetServerTime": "サーãƒã‚¿ã‚¤ãƒ å˜ä½ã®ãƒ“ジット",
- "WidgetServerTimeDocumentation": "ã“ã®ã‚°ãƒ©ãƒ•ã¯ã€è¨ªå•ä¸ã® %s サーãƒãƒ¼æ™‚間帯 %s を表示ã—ã¾ã™ã€‚"
+ "WidgetServerTimeDocumentation": "ã“ã®ã‚°ãƒ©ãƒ•ã¯ã€è¨ªå•ä¸ã® %1$s サーãƒãƒ¼æ™‚間帯 %2$s を表示ã—ã¾ã™ã€‚"
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/ko.json b/plugins/VisitTime/lang/ko.json
index 216933c951c4e0c767667cbfca22214ecb40358b..01b8577e1dda0e6797e6a1cd732da88fe56a402a 100644
--- a/plugins/VisitTime/lang/ko.json
+++ b/plugins/VisitTime/lang/ko.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "ìš”ì¼ë³„ 방문수",
"WidgetByDayOfWeekDocumentation": "ì´ ê·¸ëž˜í”„ëŠ” ê° ìš”ì¼ë³„ë¡œ 웹사ì´íŠ¸ì— 방문한 수를 ë³´ì—¬ì¤ë‹ˆë‹¤.",
"WidgetLocalTime": "현지 시간 기준 방문 수",
- "WidgetLocalTimeDocumentation": "ì´ ê·¸ëž˜í”„ëŠ” %s현지 시간대%sì— ê¸°ì¤€í•˜ì—¬ 시간별 방문수를 ë³´ì—¬ì¤ë‹ˆë‹¤.",
+ "WidgetLocalTimeDocumentation": "ì´ ê·¸ëž˜í”„ëŠ” %1$s현지 시간대%2$sì— ê¸°ì¤€í•˜ì—¬ 시간별 방문수를 ë³´ì—¬ì¤ë‹ˆë‹¤.",
"WidgetServerTime": "서버 시간 기준 방문 수",
- "WidgetServerTimeDocumentation": "ì´ ê·¸ëž˜í”„ëŠ” %s서버 시간대%sì— ê¸°ì¤€í•˜ì—¬ 시간별 방문수를 ë³´ì—¬ì¤ë‹ˆë‹¤."
+ "WidgetServerTimeDocumentation": "ì´ ê·¸ëž˜í”„ëŠ” %1$s서버 시간대%2$sì— ê¸°ì¤€í•˜ì—¬ 시간별 방문수를 ë³´ì—¬ì¤ë‹ˆë‹¤."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/nb.json b/plugins/VisitTime/lang/nb.json
index 3a3aa77d30b98c845f5e78cecc59c0d8f7462d10..e00af2d20113d6de00e0611629874720f8f33b0b 100644
--- a/plugins/VisitTime/lang/nb.json
+++ b/plugins/VisitTime/lang/nb.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "Besøk etter ukedag",
"WidgetByDayOfWeekDocumentation": "Denne grafen viser antall besøk nettstedet ditt mottatt på de ulike dagene i uken.",
"WidgetLocalTime": "Besøk etter lokaltid",
- "WidgetLocalTimeDocumentation": "Denne grafen viser hvilken tid det var i %s besøkeres tidssoner %s da besøkene skjedde.",
+ "WidgetLocalTimeDocumentation": "Denne grafen viser hvilken tid det var i %1$s besøkeres tidssoner %2$s da besøkene skjedde.",
"WidgetServerTime": "Besøk etter servertid",
- "WidgetServerTimeDocumentation": "Denne grafen viser hvilken tid det var i %s serverens tidssone %s da besøkene skjedde."
+ "WidgetServerTimeDocumentation": "Denne grafen viser hvilken tid det var i %1$s serverens tidssone %2$s da besøkene skjedde."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/nl.json b/plugins/VisitTime/lang/nl.json
index 6695cbfe51f73df512f5326478709398e8c472f9..618df9944f0855b0c6a9a920f7557fbbc7e3c541 100644
--- a/plugins/VisitTime/lang/nl.json
+++ b/plugins/VisitTime/lang/nl.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "Bezoeken per dag van de week",
"WidgetByDayOfWeekDocumentation": "Deze grafiek toont het aantal bezoeken op elke dag van de week.",
"WidgetLocalTime": "Uur van de dag (tijdzone bezoeker)",
- "WidgetLocalTimeDocumentation": "Deze grafiek laat zien hoe laat het was in bezoekers 'de %s tijdzones%s tijdens hun bezoeken.",
+ "WidgetLocalTimeDocumentation": "Deze grafiek laat zien hoe laat het was in bezoekers 'de %1$s tijdzones%2$s tijdens hun bezoeken.",
"WidgetServerTime": "Uur van de dag (tijdzone server)",
- "WidgetServerTimeDocumentation": "Deze grafiek laat zien hoe laat het was in de tijd van de%s server zone%s tijdens de bezoeken."
+ "WidgetServerTimeDocumentation": "Deze grafiek laat zien hoe laat het was in de tijd van de%1$s server zone%2$s tijdens de bezoeken."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/pl.json b/plugins/VisitTime/lang/pl.json
index 03afb0a4c4b120dea14f0f31b55d52e47da6dadd..fe764cd36b79e063a524462c186f2857c2541cc6 100644
--- a/plugins/VisitTime/lang/pl.json
+++ b/plugins/VisitTime/lang/pl.json
@@ -10,8 +10,8 @@
"VisitsByDayOfWeek": "Odwiedziny w poszczególnych dniach tygodnia",
"WidgetByDayOfWeekDocumentation": "Ten wykres pokazuje liczbe odwiedzin twojej stony otrzymanych każdego dnia tygodnia",
"WidgetLocalTime": "Odwiedziny według lokalnego czasu",
- "WidgetLocalTimeDocumentation": "Ten wykres pokazuje jaki czas był %s w strefie czasowej odwiedzających %s podczas ich wizyty.",
+ "WidgetLocalTimeDocumentation": "Ten wykres pokazuje jaki czas był %1$s w strefie czasowej odwiedzających %2$s podczas ich wizyty.",
"WidgetServerTime": "Odwiedziny według czasu serwera",
- "WidgetServerTimeDocumentation": "Ten wykres pokazuje jaki czas był w %s strefie czasowej serwera %s podczas odwiedzin."
+ "WidgetServerTimeDocumentation": "Ten wykres pokazuje jaki czas był w %1$s strefie czasowej serwera %2$s podczas odwiedzin."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/pt-br.json b/plugins/VisitTime/lang/pt-br.json
index 6f1aadd7fd088648cd6657f714d50a4ef64be0d1..8f48889cba6e811c22fc0cc42bd026f7f290e8ef 100644
--- a/plugins/VisitTime/lang/pt-br.json
+++ b/plugins/VisitTime/lang/pt-br.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "Visitas por dia da semana",
"WidgetByDayOfWeekDocumentation": "Este gráfico mostra o número de visitas que seu site recebeu, em cada dia da semana.",
"WidgetLocalTime": "Visitas pelo horário local",
- "WidgetLocalTimeDocumentation": "Este gráfico mostra o tempo que estava no %s fuso horário dos visitantes %s durante suas visitas.",
+ "WidgetLocalTimeDocumentation": "Este gráfico mostra o tempo que estava no %1$s fuso horário dos visitantes %2$s durante suas visitas.",
"WidgetServerTime": "Visitas pelo horário do servidor",
- "WidgetServerTimeDocumentation": "Este gráfico mostra o tempo que estava no %s fuso horário do servidor %s durante as visitas."
+ "WidgetServerTimeDocumentation": "Este gráfico mostra o tempo que estava no %1$s fuso horário do servidor %2$s durante as visitas."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/pt.json b/plugins/VisitTime/lang/pt.json
index eab254997d333ee9d18a9a7ff32a500804f8a74e..d8e9918edf63c704963fbc493f3b3ba889ee8737 100644
--- a/plugins/VisitTime/lang/pt.json
+++ b/plugins/VisitTime/lang/pt.json
@@ -7,8 +7,8 @@
"ServerTime": "Vistas por hora do servidor",
"SubmenuTimes": "Horas",
"WidgetLocalTime": "Visitas pela hora local",
- "WidgetLocalTimeDocumentation": "Este gráfico mostra que horas eram no %s fuso horário dos visitantes %s durante suas visitas.",
+ "WidgetLocalTimeDocumentation": "Este gráfico mostra que horas eram no %1$s fuso horário dos visitantes %2$s durante suas visitas.",
"WidgetServerTime": "Vistas pela hora do servidor",
- "WidgetServerTimeDocumentation": "Este gráfico mostra que horas eram no %s fuso horário do servidor %s durante suas visitas."
+ "WidgetServerTimeDocumentation": "Este gráfico mostra que horas eram no %1$s fuso horário do servidor %2$s durante suas visitas."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/ro.json b/plugins/VisitTime/lang/ro.json
index d20d7335a36a7cca44acba1ee29b594c6f5f504a..58e2a25c1b2d6ed47bc70a04229994253f9ef271 100644
--- a/plugins/VisitTime/lang/ro.json
+++ b/plugins/VisitTime/lang/ro.json
@@ -10,8 +10,8 @@
"VisitsByDayOfWeek": "Vizite ordonate după ziua săptămânii",
"WidgetByDayOfWeekDocumentation": "Acest grafic arată numărul de vizite primite de site-ul dvs. în fiecare zi a săptămânii.",
"WidgetLocalTime": "Vizite dupa timpul local",
- "WidgetLocalTimeDocumentation": "Acest grafic arată ce timp a fost în zonele %s vizitatorilor' \"fus orar %s în timpul vizitei lor.",
+ "WidgetLocalTimeDocumentation": "Acest grafic arată ce timp a fost în zonele %1$s vizitatorilor' \"fus orar %2$s în timpul vizitei lor.",
"WidgetServerTime": "Vizite dupa timpul serverului",
- "WidgetServerTimeDocumentation": "Acest grafic arată ce ora a fost în zona de %s server %s în timpul vizitelor."
+ "WidgetServerTimeDocumentation": "Acest grafic arată ce ora a fost în zona de %1$s server %2$s în timpul vizitelor."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/ru.json b/plugins/VisitTime/lang/ru.json
index be8e2e0e7c1d375278a56d01e07e575d044f4418..491e67d2995fa5eb44d754c33f068e58ea8d8701 100644
--- a/plugins/VisitTime/lang/ru.json
+++ b/plugins/VisitTime/lang/ru.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "ПоÑÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ днÑм недели",
"WidgetByDayOfWeekDocumentation": "Ðтот график показывает чиÑло поÑещений по каждому дню в неделе.",
"WidgetLocalTime": "ПоÑещений по меÑтному времени",
- "WidgetLocalTimeDocumentation": "Ðтот график показывает, какое Ð²Ñ€ÐµÐ¼Ñ Ð±Ñ‹Ð»Ð¾ у %s поÑÐµÑ‚Ð¸Ñ‚ÐµÐ»Ñ Ð² его временной зоне %s во Ð²Ñ€ÐµÐ¼Ñ ÐµÐ³Ð¾ поÑещениÑ.",
+ "WidgetLocalTimeDocumentation": "Ðтот график показывает, какое Ð²Ñ€ÐµÐ¼Ñ Ð±Ñ‹Ð»Ð¾ у %1$s поÑÐµÑ‚Ð¸Ñ‚ÐµÐ»Ñ Ð² его временной зоне %2$s во Ð²Ñ€ÐµÐ¼Ñ ÐµÐ³Ð¾ поÑещениÑ.",
"WidgetServerTime": "ПоÑещений по времени на Ñервере",
- "WidgetServerTimeDocumentation": "Ðтот график показывает, какое Ð²Ñ€ÐµÐ¼Ñ Ð±Ñ‹Ð»Ð¾ на %s Ñервере в его временной зоне %s во Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾ÑÐµÑ‰ÐµÐ½Ð¸Ñ Ñайта."
+ "WidgetServerTimeDocumentation": "Ðтот график показывает, какое Ð²Ñ€ÐµÐ¼Ñ Ð±Ñ‹Ð»Ð¾ на %1$s Ñервере в его временной зоне %2$s во Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾ÑÐµÑ‰ÐµÐ½Ð¸Ñ Ñайта."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/sk.json b/plugins/VisitTime/lang/sk.json
index a32c959d1fd7420a2a0e3af68a4ff86e840bce5b..5feae5c1080165dfd7e38f18474fc1ab8f709875 100644
--- a/plugins/VisitTime/lang/sk.json
+++ b/plugins/VisitTime/lang/sk.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "Návštevy podľa dňa v týždni",
"WidgetByDayOfWeekDocumentation": "Tento graf zobrazuje množstvo návštev, ktoré vaša web stránka prijala v každom dni týždňa.",
"WidgetLocalTime": "NávÅ¡tevnÃci podľa lokálneho Äasu",
- "WidgetLocalTimeDocumentation": "Tento graf zobrazuje koľko hodÃn bolo %s podľa Äasového pásma návÅ¡tevnÃka %s poÄas návÅ¡tevy.",
+ "WidgetLocalTimeDocumentation": "Tento graf zobrazuje koľko hodÃn bolo %1$s podľa Äasového pásma návÅ¡tevnÃka %2$s poÄas návÅ¡tevy.",
"WidgetServerTime": "NávÅ¡tevnÃci podľa serverového Äasu",
- "WidgetServerTimeDocumentation": "Tento graf zobrazuje koľko hodÃn bolo %s podľa Äasového pásma servera %s poÄas návÅ¡tevy."
+ "WidgetServerTimeDocumentation": "Tento graf zobrazuje koľko hodÃn bolo %1$s podľa Äasového pásma servera %2$s poÄas návÅ¡tevy."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/sq.json b/plugins/VisitTime/lang/sq.json
index 60bf55d2399af335753de8fe4dfc1548a8c95656..cfe9e5b6736c7121cd6bc0e33474c48db73c971d 100644
--- a/plugins/VisitTime/lang/sq.json
+++ b/plugins/VisitTime/lang/sq.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "Vizita sipas Ditëve të Javës",
"WidgetByDayOfWeekDocumentation": "Ky grafik shfaq numrin e vizitave që pati sajti juaj në çdo ditë të javës.",
"WidgetLocalTime": "Vizita sipas kohës vendore",
- "WidgetLocalTimeDocumentation": "Ky grafik shfaq kohën sipas %s zonës kohore të vizitorit %s kur ka ndodhur një vizitë.",
+ "WidgetLocalTimeDocumentation": "Ky grafik shfaq kohën sipas %1$s zonës kohore të vizitorit %2$s kur ka ndodhur një vizitë.",
"WidgetServerTime": "Vizita sipas Kohës së Shërbyesit",
- "WidgetServerTimeDocumentation": "Ky grafik shfaq kohën sipas %s zonës kohore të shërbyesit %s kur ka ndodhur një vizitë."
+ "WidgetServerTimeDocumentation": "Ky grafik shfaq kohën sipas %1$s zonës kohore të shërbyesit %2$s kur ka ndodhur një vizitë."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/sr.json b/plugins/VisitTime/lang/sr.json
index 82c4442cf2a237e9b43d90d2a9e0035b4d581209..c98402334aa9a15d29bfb96b805996e9d2a7b397 100644
--- a/plugins/VisitTime/lang/sr.json
+++ b/plugins/VisitTime/lang/sr.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "Posete po danu u nedelji",
"WidgetByDayOfWeekDocumentation": "Ovaj grafikon prikazuje broj poseta po danu u nedelji",
"WidgetLocalTime": "Broj poseta po lokalnom vremenu",
- "WidgetLocalTimeDocumentation": "Ovaj grafikon prikazuje vreme u %s vremenskoj zoni posetilaca %s za vreme njihovih poseta",
+ "WidgetLocalTimeDocumentation": "Ovaj grafikon prikazuje vreme u %1$s vremenskoj zoni posetilaca %2$s za vreme njihovih poseta",
"WidgetServerTime": "Broj poseta po serverskom vremenu",
- "WidgetServerTimeDocumentation": "Ovaj grafikon prikazuje vreme u %s vremenskoj zoni servera %s za vreme poseta"
+ "WidgetServerTimeDocumentation": "Ovaj grafikon prikazuje vreme u %1$s vremenskoj zoni servera %2$s za vreme poseta"
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/sv.json b/plugins/VisitTime/lang/sv.json
index c7e751baa6c1fba6af352b9d521c6599e908efcb..6a6d7e4d807771929ff631c045e05510971afd1d 100644
--- a/plugins/VisitTime/lang/sv.json
+++ b/plugins/VisitTime/lang/sv.json
@@ -10,8 +10,8 @@
"VisitsByDayOfWeek": "Besök efter veckodag",
"WidgetByDayOfWeekDocumentation": "Den här grafen visar antalet besök din webbplats fått per veckodag.",
"WidgetLocalTime": "Besök efter lokal tid",
- "WidgetLocalTimeDocumentation": "Denna graf visar vad klockan var i %s besökarens tidszon %s vid deras besök.",
+ "WidgetLocalTimeDocumentation": "Denna graf visar vad klockan var i %1$s besökarens tidszon %2$s vid deras besök.",
"WidgetServerTime": "Besök efter servertid",
- "WidgetServerTimeDocumentation": "Denna graf visar vad klockan var i %s serverns tidszon %s vid besöket."
+ "WidgetServerTimeDocumentation": "Denna graf visar vad klockan var i %1$s serverns tidszon %2$s vid besöket."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/tl.json b/plugins/VisitTime/lang/tl.json
index 76f7fd23ed4e11f809e29fb11003ba8139bdb56a..0ef4d9e41532f600dab6dfac4525710fc3dbf874 100644
--- a/plugins/VisitTime/lang/tl.json
+++ b/plugins/VisitTime/lang/tl.json
@@ -10,8 +10,8 @@
"VisitsByDayOfWeek": "Mga pagbisita araw-araw",
"WidgetByDayOfWeekDocumentation": "Ipinapakita ng graph na ito ang bilang ng mga pagbisita na natanggap ng iyong website sa bawat araw sa loob ng isang linggo.",
"WidgetLocalTime": "Mga pagbisita sa pamamagitan ng Lokal na Oras",
- "WidgetLocalTimeDocumentation": "Ang graph na ito ay nagpapakita kung anong oras sa lugar ng iyong %s bisita %s habang sila ay nasa iyong website.",
+ "WidgetLocalTimeDocumentation": "Ang graph na ito ay nagpapakita kung anong oras sa lugar ng iyong %1$s bisita %2$s habang sila ay nasa iyong website.",
"WidgetServerTime": "Mga pagbisita ng may oras na mula sa Server",
- "WidgetServerTimeDocumentation": "Ang graph na ito ay nagpapakita kung anong oras ito sa %s server time zone %s habang bumibisita."
+ "WidgetServerTimeDocumentation": "Ang graph na ito ay nagpapakita kung anong oras ito sa %1$s server time zone %2$s habang bumibisita."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/vi.json b/plugins/VisitTime/lang/vi.json
index 7f5a275f38990b7938fffd91425386c85c9de23c..aec3afada4a4e8a35a4fdb9bd8eeb5f60f997409 100644
--- a/plugins/VisitTime/lang/vi.json
+++ b/plugins/VisitTime/lang/vi.json
@@ -10,8 +10,8 @@
"VisitsByDayOfWeek": "Các lượt truy cáºp theo ngà y trong tuần",
"WidgetByDayOfWeekDocumentation": "Äồ thị nà y cho thấy số lần truy cáºp mà trang web của bạn nháºn được má»—i ngà y trong tuần.",
"WidgetLocalTime": "Các lượt truy cáºp theo giỠđịa phÆ°Æ¡ng (Local)",
- "WidgetLocalTimeDocumentation": "Äồ thị nà y cho thấy thá»i Ä‘iểm nà o nó đã ở trong %s múi giá» của khách truy cáºp %s trong các lượt truy cáºp của há».",
+ "WidgetLocalTimeDocumentation": "Äồ thị nà y cho thấy thá»i Ä‘iểm nà o nó đã ở trong %1$s múi giá» của khách truy cáºp %2$s trong các lượt truy cáºp của há».",
"WidgetServerTime": "Các lượt truy cáºp bởi giá» Server",
- "WidgetServerTimeDocumentation": "Äồ thị nà y cho thấy thá»i Ä‘iểm nà o nó đã ở trong %s múi giá» của Server %s trong các lượt truy cáºp."
+ "WidgetServerTimeDocumentation": "Äồ thị nà y cho thấy thá»i Ä‘iểm nà o nó đã ở trong %1$s múi giá» của Server %2$s trong các lượt truy cáºp."
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/lang/zh-cn.json b/plugins/VisitTime/lang/zh-cn.json
index 96f998405e9f8bc6cc958678b3aef42615f0900b..cb14c83155ba02a45864f4a1b434c1bf933bdb23 100644
--- a/plugins/VisitTime/lang/zh-cn.json
+++ b/plugins/VisitTime/lang/zh-cn.json
@@ -11,8 +11,8 @@
"VisitsByDayOfWeek": "周报表",
"WidgetByDayOfWeekDocumentation": "本图形显示一周内网站æ¯å¤©çš„访问次数。",
"WidgetLocalTime": "ä¾å®¢æˆ·ç«¯æ—¶é—´è®°å½•çš„访问",
- "WidgetLocalTimeDocumentation": "æœ¬æŠ¥è¡¨æ˜¾ç¤ºæ ¹æ®%s 访客所在时区 %s的时间的统计。",
+ "WidgetLocalTimeDocumentation": "æœ¬æŠ¥è¡¨æ˜¾ç¤ºæ ¹æ®%1$s 访客所在时区 %2$s的时间的统计。",
"WidgetServerTime": "ä¾æœåŠ¡å™¨æ—¶é—´è®°å½•çš„访问次数",
- "WidgetServerTimeDocumentation": "æœ¬æŠ¥è¡¨æ˜¾ç¤ºæ ¹æ®%s æœåŠ¡å™¨çš„时区 %s的时间的统计。"
+ "WidgetServerTimeDocumentation": "æœ¬æŠ¥è¡¨æ˜¾ç¤ºæ ¹æ®%1$s æœåŠ¡å™¨çš„时区 %2$s的时间的统计。"
}
}
\ No newline at end of file
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
index c3abd090cf8a89894ce427b56312920f794e6125..4c18db6600e189a691d48693a1238f7806b9d705 160000
--- a/plugins/VisitorGenerator
+++ b/plugins/VisitorGenerator
@@ -1 +1 @@
-Subproject commit c3abd090cf8a89894ce427b56312920f794e6125
+Subproject commit 4c18db6600e189a691d48693a1238f7806b9d705
diff --git a/plugins/VisitorInterest/lang/nb.json b/plugins/VisitorInterest/lang/nb.json
index 19c38738f5b34f3d7689a48427cb3bc30e97c8d3..a9ffa046572ab2ac037d91e454eacb5c8a84dc5f 100644
--- a/plugins/VisitorInterest/lang/nb.json
+++ b/plugins/VisitorInterest/lang/nb.json
@@ -1,15 +1,24 @@
{
"VisitorInterest": {
"BetweenXYMinutes": "%1$s – %2$s min",
- "BetweenXYSeconds": "%1$s-%2$ss",
- "ColumnPagesPerVisit": "Sider pr. besøk",
+ "BetweenXYSeconds": "%1$s–%2$ss",
+ "ColumnPagesPerVisit": "Sider per besøk",
"ColumnVisitDuration": "Besøksvarighet",
"Engagement": "Engasjement",
"NPages": "%s sider",
"OnePage": "1 side",
- "VisitsPerDuration": "Besøk pr. besøksvarighet",
- "VisitsPerNbOfPages": "Besøk pr. antall sider",
+ "PluginDescription": "Rapporter om besøkeres interesse: antall sider som ble vist, tid brukt på nettstedet, dager siden siste besøk, og mer.",
+ "VisitNum": "Besøksnummer",
+ "VisitsByDaysSinceLast": "Besøk etter dager siden siste besøk",
+ "visitsByVisitCount": "Besøk etter besøksnummer",
+ "VisitsPerDuration": "Besøk per besøksvarighet",
+ "VisitsPerNbOfPages": "Besøk per antall sider",
"WidgetLengths": "Besøkslengde",
- "WidgetPages": "Sider pr. besøk"
+ "WidgetLengthsDocumentation": "I denne rapporten kan du se hvor mange besøk som hadde en bestemt totallengde. I utgangspunktet vises rapporten som en stikkordsky, hvor mer vanlige lengder vises med større skrift.",
+ "WidgetPages": "Sider per besøk",
+ "WidgetPagesDocumentation": "I denne rapporten kan du se hvor mange besøk som involverte et bestemt antall sidevisninger. I utgangspunktet vises rapporten som en stikkordsky, hvor mer vanlige antall sidevisninger vises med større skrift.",
+ "WidgetVisitsByDaysSinceLast": "Besøk etter dager siden siste besøk",
+ "WidgetVisitsByDaysSinceLastDocumentation": "I denne rapporten kan du se hvor mange besøk som kom fra besøkere som var på nettstedet for et visst antall dager siden.",
+ "WidgetVisitsByNumDocumentation": "I denne rapporten kan du se antallet besøk som var det N-te besøket, altså besøkere som besøkte ditt nettsted minst N ganger."
}
}
\ No newline at end of file
diff --git a/plugins/VisitsSummary/lang/th.json b/plugins/VisitsSummary/lang/th.json
index e5e89bed6814ba31744b413226e6013c99165e3c..9c423dd6011f4b233c959bb559c21c681d37b1f9 100644
--- a/plugins/VisitsSummary/lang/th.json
+++ b/plugins/VisitsSummary/lang/th.json
@@ -1,5 +1,6 @@
{
"VisitsSummary": {
+ "AverageGenerationTime": "%s เวลาเฉลี่ยในà¸à¸²à¸£à¸œà¸¥à¸´à¸•",
"AverageVisitDuration": "เฉลี่ยระยะเวลาà¸à¸²à¸£à¹€à¸‚้าชม %s",
"GenerateQueries": "%s à¸à¸²à¸£à¸„้นหา",
"GenerateTime": "%s วินาทีที่ใช้",
@@ -7,8 +8,10 @@
"NbActionsDescription": "%s ดำเนินà¸à¸²à¸£(เข้าชม ดาวน์โหลดà¹à¸¥à¸°à¸¥à¸´à¸‡à¸„์à¸à¸à¸)",
"NbActionsPerVisit": "%s ดำเนินต่à¸à¹€à¸‚้าชม",
"NbDownloadsDescription": "%s ดาวน์โหลด",
+ "NbKeywordsDescription": "%s คีย์เวิร์ดที่ไม่ซ้ำà¸à¸±à¸™",
"NbOutlinksDescription": "%s ลิงค์ที่à¸à¸à¸",
"NbPageviewsDescription": "%s จำนวนหน้าที่มีà¸à¸²à¸£à¹€à¸›à¸´à¸”",
+ "NbSearchesDescription": "รวมผลà¸à¸²à¸£à¸„้นหาทั้งหมด %s รายà¸à¸²à¸£ ในเว็บไซต์ขà¸à¸‡à¸„ุณ",
"NbUniqueDownloadsDescription": "%s จำนวนดาวน์โหลดที่ไม่ซ้ำà¸à¸±à¸™à¸™",
"NbUniqueOutlinksDescription": "%s จำนวนลิงค์ที่à¸à¸à¸à¹‚ดยไม่ซ้ำà¸à¸±à¸™",
"NbUniquePageviewsDescription": "%s จำนวนหน้าที่มีà¸à¸²à¸£à¹€à¸›à¸´à¸”ที่ไม่ซ้ำà¸à¸±à¸™",
diff --git a/plugins/WebsiteMeasurable/lang/cs.json b/plugins/WebsiteMeasurable/lang/cs.json
index abc772a6da6a375dff49d6774c9cb4179a4d7304..a6f744a3b8526fd001249178939ae8775f9c63c3 100644
--- a/plugins/WebsiteMeasurable/lang/cs.json
+++ b/plugins/WebsiteMeasurable/lang/cs.json
@@ -1,7 +1,7 @@
{
"WebsiteMeasurable": {
- "Website": "Webová stránka",
- "Websites": "Webové stránky",
- "WebsiteDescription": "Webová stránka se skládá ze stránek, vÄ›tÅ¡inou umÃstÄ›ných na jedné doménÄ›."
+ "Website": "Web",
+ "Websites": "Weby",
+ "WebsiteDescription": "Web se skládá ze stránek zpravidla umÃstÄ›ných na jedné doménÄ›."
}
}
\ No newline at end of file
diff --git a/plugins/WebsiteMeasurable/lang/en.json b/plugins/WebsiteMeasurable/lang/en.json
index 05414e3b1d180a90fafff3ff2ca68e61382d9516..65cee928598bb754cf519900406b6c870641277e 100644
--- a/plugins/WebsiteMeasurable/lang/en.json
+++ b/plugins/WebsiteMeasurable/lang/en.json
@@ -1,7 +1,7 @@
{
- "WebsiteMeasurable": {
- "Website": "Website",
- "Websites": "Websites",
- "WebsiteDescription": "A website consists of web pages typically served from a single web domain."
- }
+ "WebsiteMeasurable": {
+ "Website": "Website",
+ "Websites": "Websites",
+ "WebsiteDescription": "A website consists of web pages typically served from a single web domain."
+ }
}
\ No newline at end of file
diff --git a/plugins/WebsiteMeasurable/lang/lt.json b/plugins/WebsiteMeasurable/lang/lt.json
new file mode 100644
index 0000000000000000000000000000000000000000..d81aeffc69030e0f4a2a6fc4d1d0b676981fb932
--- /dev/null
+++ b/plugins/WebsiteMeasurable/lang/lt.json
@@ -0,0 +1,5 @@
+{
+ "WebsiteMeasurable": {
+ "Website": "SvetainÄ—"
+ }
+}
\ No newline at end of file
diff --git a/plugins/Widgetize/tests/System/WidgetTest.php b/plugins/Widgetize/tests/System/WidgetTest.php
index 005491630aa17f7ed62f0a769d0037ca94b0c6d5..72861e6faf42851b2c5f5e11ff4ec8418f96c5ac 100644
--- a/plugins/Widgetize/tests/System/WidgetTest.php
+++ b/plugins/Widgetize/tests/System/WidgetTest.php
@@ -1264,10 +1264,108 @@ class WidgetTest extends SystemTestCase
'action' => 'widgetGoalReport',
'idGoal' => 'ecommerceOrder',
),
- )
+ ),
+ array (
+ 'name' => 'Ecommerce Log',
+ 'uniqueId' => 'widgetEcommercegetEcommerceLog',
+ 'parameters' =>
+ array (
+ 'module' => 'Ecommerce',
+ 'action' => 'getEcommerceLog',
+ ),
+ ),
+ array (
+ 'name' => 'Insights Overview',
+ 'uniqueId' => 'widgetInsightsgetInsightsOverview',
+ 'parameters' =>
+ array (
+ 'module' => 'Insights',
+ 'action' => 'getInsightsOverview',
+ ),
+ ),
+ array (
+ 'name' => 'Movers and Shakers',
+ 'uniqueId' => 'widgetInsightsgetOverallMoversAndShakers',
+ 'parameters' =>
+ array (
+ 'module' => 'Insights',
+ 'action' => 'getOverallMoversAndShakers',
+ ),
+ ),
+ array (
+ 'name' => 'Top Keywords for Page URL',
+ 'uniqueId' => 'widgetReferrersgetKeywordsForPage',
+ 'parameters' =>
+ array (
+ 'module' => 'Referrers',
+ 'action' => 'getKeywordsForPage',
+ ),
+ ),
+ array (
+ 'name' => 'SEO Rankings',
+ 'uniqueId' => 'widgetSEOgetRank',
+ 'parameters' =>
+ array (
+ 'module' => 'SEO',
+ 'action' => 'getRank',
+ ),
+ ),
+ array (
+ 'name' => 'Support Piwik!',
+ 'uniqueId' => 'widgetCoreHomegetDonateForm',
+ 'parameters' =>
+ array (
+ 'module' => 'CoreHome',
+ 'action' => 'getDonateForm',
+ ),
+ ),
+ array (
+ 'name' => 'Welcome!',
+ 'uniqueId' => 'widgetCoreHomegetPromoVideo',
+ 'parameters' =>
+ array (
+ 'module' => 'CoreHome',
+ 'action' => 'getPromoVideo',
+ ),
+ ),
+ array (
+ 'name' => 'Piwik.org Blog',
+ 'uniqueId' => 'widgetExampleRssWidgetrssPiwik',
+ 'parameters' =>
+ array (
+ 'module' => 'ExampleRssWidget',
+ 'action' => 'rssPiwik',
+ ),
+ ),
+ array (
+ 'name' => 'Piwik Changelog',
+ 'uniqueId' => 'widgetExampleRssWidgetrssChangelog',
+ 'parameters' =>
+ array (
+ 'module' => 'ExampleRssWidget',
+ 'action' => 'rssChangelog',
+ ),
+ ),
+ array (
+ 'name' => 'Piwik PRO Blog',
+ 'uniqueId' => 'widgetPiwikProrssPiwikPro',
+ 'parameters' =>
+ array (
+ 'module' => 'PiwikPro',
+ 'action' => 'rssPiwikPro',
+ ),
+ ),
+ array (
+ 'name' => 'Piwik PRO: Advanced Analytics & Services',
+ 'uniqueId' => 'widgetPiwikPropromoPiwikProPiwikPro',
+ 'parameters' =>
+ array (
+ 'module' => 'PiwikPro',
+ 'action' => 'promoPiwikPro',
+ ),
+ )
);
}
-
}
diff --git a/tests/PHPUnit/Fixtures/InvalidVisits.php b/tests/PHPUnit/Fixtures/InvalidVisits.php
index 5518a7a163f3689f0d595f1346fdbb4d27221588..da1038eba2e5133568d74b9665d1c4080ba18cd7 100644
--- a/tests/PHPUnit/Fixtures/InvalidVisits.php
+++ b/tests/PHPUnit/Fixtures/InvalidVisits.php
@@ -112,6 +112,12 @@ class InvalidVisits extends Fixture
$t->setUrl("http://their.stuff.com/back/to/the/future");
$t->doTrackPageView("ignored, not from my.stuff.com");
+ // undo exclude unknown urls change (important when multiple fixtures are setup together, as is done in OmniFixture)
+ API::getInstance()->updateSite($idSite, $siteName = null, $urls, $ecommerce = null, $siteSearch = null,
+ $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null, $excludedQueryParams = null,
+ $timezone = null, $currency = null, $group = null, $startDate = null, $excludedUserAgents = null,
+ $keepUrlFragments = null, $type = null, $settings = null, $excludeUnknownUrls = 0);
+
try {
@$t->setAttributionInfo(array());
self::fail();
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
index ce454b38d238199dc3093ff22a9221bc301961f9..8fb67f261af731663627eff05db70b43ca155045 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
@@ -41,6 +41,17 @@ class ManyVisitsWithGeoIP extends Fixture
'103.29.196.229', // in Indonesia (Bali), (only Indonesia will show up)
);
+ public $userAgents = array(
+ 'Mozilla/5.0 (Linux; Android 4.4.2; Nexus 4 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.136 Mobile Safari/537.36',
+ 'Mozilla/5.0 (Linux; U; Android 2.3.7; fr-fr; HTC Desire Build/GRI40; MildWild CM-8.0 JG Stable) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
+ 'Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.76 Safari/537.36',
+ 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0; GTB6.3; Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; SLCC1; .NET CLR 2.0.50727; Media Center PC 5.0; .NET CLR 3.5.30729; .NET CLR 3.0.30729; OfficeLiveConnector.1.4; OfficeLivePatch.1.3)',
+ 'Mozilla/5.0 (Windows NT 6.1; Trident/7.0; MDDSJS; rv:11.0) like Gecko',
+ 'Mozilla/5.0 (Linux; Android 4.1.1; SGPT13 Build/TJDS0170) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Safari/537.36',
+ 'Mozilla/5.0 (Linux; U; Android 4.3; zh-cn; SM-N9006 Build/JSS15J) AppleWebKit/537.36 (KHTML, like Gecko)Version/4.0 MQQBrowser/5.0 Mobile Safari/537.36',
+ 'Mozilla/5.0 (X11; U; Linux i686; ru; rv:1.9.0.14) Gecko/2009090216 Ubuntu/9.04 (jaunty) Firefox/3.0.14'
+ );
+
protected $idGoal;
protected $idGoal2;
@@ -107,6 +118,8 @@ class ManyVisitsWithGeoIP extends Fixture
$t->setVisitorId( substr(md5($i + $calledCounter * 1000), 0, $t::LENGTH_VISITOR_ID));
if ($setIp) {
$t->setIp(current($this->ips));
+ $t->setUserAgent(current($this->userAgents));
+ next($this->userAgents);
next($this->ips);
} else {
$t->setIp("1.2.4.$i");
diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php
index cd6fc0fb3423143ffb86e3f5496480f69992f451..e37afea8dbf4ca4a74506b86dfb5b973657ef45b 100644
--- a/tests/PHPUnit/Fixtures/OmniFixture.php
+++ b/tests/PHPUnit/Fixtures/OmniFixture.php
@@ -7,13 +7,12 @@
*/
namespace Piwik\Tests\Fixtures;
+use Piwik\API\Request;
use Piwik\Date;
-use Piwik\Access;
use Piwik\Option;
use ReflectionClass;
-use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI;
+use Piwik\Plugins\SitesManager\API as SitesManagerAPI;
use Piwik\Tests\Framework\Fixture;
-use Piwik\Tests\Framework\OverrideLogin;
/**
* This fixture is the combination of every other fixture defined by Piwik. Should be used
@@ -21,15 +20,24 @@ use Piwik\Tests\Framework\OverrideLogin;
*/
class OmniFixture extends Fixture
{
+ const DEFAULT_SEGMENT = "browserCode==FF";
+
public $month = '2012-01';
public $idSite = 'all';
public $dateTime = '2012-02-01';
+
+ /**
+ * @var Date
+ */
public $now = null;
- public $segment = "browserCode==FF";
+ public $segment = self::DEFAULT_SEGMENT;
// Visitor profile screenshot test needs visitor id
public $visitorIdDeterministic = null;
+ /**
+ * @var Fixture[]
+ */
public $fixtures = array();
private function requireAllFixtures()
@@ -114,18 +122,18 @@ class OmniFixture extends Fixture
public function setUp()
{
+ $firstFixture = array_shift($this->fixtures);
+ $this->setUpFixture($firstFixture);
+
+ $initialSitesProperties = SitesManagerAPI::getInstance()->getAllSites();
+
foreach ($this->fixtures as $fixture) {
- echo "Setting up " . get_class($fixture) . "...\n";
+ $this->restoreSitesProperties($initialSitesProperties);
- $fixture->setUp();
+ $this->setUpFixture($fixture);
}
Option::set("Tests.forcedNowTimestamp", $this->now->getTimestamp());
-
- // launch archiving so tests don't run out of time
- $date = Date::factory($this->dateTime)->toString();
- VisitsSummaryAPI::getInstance()->get($this->idSite, 'year', $date);
- VisitsSummaryAPI::getInstance()->get($this->idSite, 'year', $date, urlencode($this->segment));
}
public function tearDown()
@@ -136,4 +144,34 @@ class OmniFixture extends Fixture
$fixture->tearDown();
}
}
+
+ private function setUpFixture(Fixture $fixture)
+ {
+ echo "Setting up " . get_class($fixture) . "...\n";
+ $fixture->setUp();
+ }
+
+ private function restoreSitesProperties($initialSitesProperties)
+ {
+ foreach ($initialSitesProperties as $idSite => $properties) {
+ Request::processRequest('SitesManager.updateSite', array(
+ 'idSite' => $idSite,
+ 'siteName' => $properties['name'],
+ 'ecommerce' => $properties['ecommerce'],
+ 'siteSearch' => $properties['sitesearch'],
+ 'searchKeywordParameters' => $properties['sitesearch_keyword_parameters'],
+ 'searchCategoryParameters' => $properties['sitesearch_category_parameters'],
+ 'excludedIps' => $properties['excluded_ips'],
+ 'excludedQueryParameters' => $properties['excluded_parameters'],
+ 'timezone' => $properties['timezone'],
+ 'currency' => $properties['currency'],
+ 'group' => $properties['group'],
+ 'startDate' => $properties['ts_created'],
+ 'excludedUserAgents' => $properties['excluded_user_agents'],
+ 'keepURLFragments' => $properties['keep_url_fragment'],
+ 'type' => $properties['type'],
+ 'excludeUnknownUrls' => $properties['exclude_unknown_urls']
+ ));
+ }
+ }
}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
index a32129c93b6919707d093ff3a1986505a1f395e8..03cb78f9da22073a93ab9d2df5ea703dd7fb8bcc 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
@@ -10,6 +10,7 @@ namespace Piwik\Tests\Fixtures;
use Piwik\Date;
use Piwik\Plugins\Goals\API;
use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\TestingEnvironmentVariables;
use PiwikTracker;
/**
@@ -36,7 +37,7 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
private function setPiwikEnvironmentOverrides()
{
- $env = $this->getTestEnvironment();
+ $env = new TestingEnvironmentVariables();
$env->overrideConfig('Tracker', 'create_new_visit_when_website_referrer_changes', 1);
$env->save();
}
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
index ed0647f64cd83a4d2e6eeb45eb602ed55147787e..3a91bf6a91e6ae6b1448f022d54cae81ac0be676 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
@@ -9,6 +9,7 @@ namespace Piwik\Tests\Fixtures;
use Piwik\Date;
use Piwik\Tests\Framework\Fixture;
+use PiwikTracker;
/**
* Adds one site and tracks a couple visits with many pageviews. The
diff --git a/tests/PHPUnit/Fixtures/SqlDump.php b/tests/PHPUnit/Fixtures/SqlDump.php
index b360d162b31d2f6830256df1b9e1f10fa2c01f54..f5ebc7b364bcfb3792a8e9c03d47cb239d365a98 100644
--- a/tests/PHPUnit/Fixtures/SqlDump.php
+++ b/tests/PHPUnit/Fixtures/SqlDump.php
@@ -13,6 +13,7 @@ use Piwik\Config;
use Piwik\Db;
use Piwik\Tests\Framework\Fixture;
use Exception;
+use Piwik\Tests\Framework\TestingEnvironmentVariables;
/**
* Reusable fixture. Loads a SQL dump into the DB.
@@ -74,12 +75,13 @@ class SqlDump extends Fixture
// reload access
Access::getInstance()->reloadAccess();
- $this->getTestEnvironment()->configOverride = array(
+ $testVars = new TestingEnvironmentVariables();
+ $testVars->configOverride = array(
'database' => array(
'tables_prefix' => $this->tablesPrefix
)
);
- $this->getTestEnvironment()->save();
+ $testVars->save();
}
/**
diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php
index 623e7e388d94b57cf638d7c41b20fe2e34c0080a..0792a4e448a64336f866155a90f3371e2f49ee99 100644
--- a/tests/PHPUnit/Fixtures/UITestFixture.php
+++ b/tests/PHPUnit/Fixtures/UITestFixture.php
@@ -69,13 +69,14 @@ class UITestFixture extends SqlDump
// create non super user
UsersManagerAPI::getInstance()->addUser('oliverqueen', 'smartypants', 'oli@queenindustries.com');
UsersManagerAPI::getInstance()->setUserAccess('oliverqueen', 'view', array(1));
-
- // launch archiving so UI test requests don't launch it
- VisitsSummaryAPI::getInstance()->get('all', 'year', '2012-08-09');
}
public function performSetUp($setupEnvironmentOnly = false)
{
+ $this->extraTestEnvVars = array(
+ 'loadRealTranslations' => 1,
+ );
+
parent::performSetUp($setupEnvironmentOnly);
$this->createSegments();
@@ -96,6 +97,12 @@ class UITestFixture extends SqlDump
$this->testEnvironment->forcedNowTimestamp = $forcedNowTimestamp;
$this->testEnvironment->save();
+
+ // launch archiving so tests don't run out of time
+ print("Archiving in fixture set up...");
+ VisitsSummaryAPI::getInstance()->get('all', 'year', '2012-08-09');
+ VisitsSummaryAPI::getInstance()->get('all', 'year', '2012-08-09', urlencode(OmniFixture::DEFAULT_SEGMENT));
+ print("Done.");
}
private function addOverlayVisits()
@@ -245,6 +252,7 @@ class UITestFixture extends SqlDump
|| $widget['uniqueId'] == 'widgetReferrersgetKeywordsForPage'
|| $widget['uniqueId'] == 'widgetLivegetVisitorProfilePopup'
|| $widget['uniqueId'] == 'widgetActionsgetPageTitles'
+ || $widget['uniqueId'] == 'widgetPiwikProrssPiwikPro'
|| strpos($widget['uniqueId'], 'widgetExample') === 0
) {
continue;
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index f421ba56583e87c1450355aced28f40f0bdcf70e..9ef26bbb6795c41cd6a57a494de61f9f0c9aead9 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -199,6 +199,7 @@ class Fixture extends \PHPUnit_Framework_Assert
}
$testEnv = $this->getTestEnvironment();
+ $testEnv->delete();
$testEnv->testCaseClass = $this->testCaseClass;
$testEnv->fixtureClass = get_class($this);
$testEnv->dbName = $this->dbName;
@@ -303,11 +304,16 @@ class Fixture extends \PHPUnit_Framework_Assert
}
}
+ /**
+ * NOTE: This method should not be used to get a TestingEnvironmentVariables instance.
+ * Instead just create a new instance.
+ *
+ * @return null|\Piwik\Tests\Framework\TestingEnvironmentVariables
+ */
public function getTestEnvironment()
{
if ($this->testEnvironment === null) {
$this->testEnvironment = new TestingEnvironmentVariables();
- $this->testEnvironment->delete();
if (getenv('PIWIK_USE_XHPROF') == 1) {
$this->testEnvironment->useXhprof = true;
@@ -606,6 +612,7 @@ class Fixture extends \PHPUnit_Framework_Assert
self::assertEquals($expectedResponse, $response, "Expected GIF beacon, got: <br/>\n"
. var_export($response, true)
. "\n If you are stuck, you can enable [Tracker] debug=1; in config.ini.php to get more debug info."
+ . "\n\n Also, please try to restart your webserver, and run the test again, this may help!"
. base64_encode($response)
. $url
);
diff --git a/tests/PHPUnit/Framework/Mock/FakeConfig.php b/tests/PHPUnit/Framework/Mock/FakeConfig.php
new file mode 100644
index 0000000000000000000000000000000000000000..cab4955a13c317e3ff97d6730bbadacc9365bb92
--- /dev/null
+++ b/tests/PHPUnit/Framework/Mock/FakeConfig.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Piwik\Tests\Framework\Mock;
+
+use Piwik\Config;
+
+class FakeConfig extends Config
+{
+ private $configValues = array();
+
+ public function __construct($configValues = array())
+ {
+ $this->configValues = $configValues;
+ }
+
+ public function &__get($name)
+ {
+ if (isset($this->configValues[$name])) {
+ return $this->configValues[$name];
+ }
+ }
+
+ public function __set($name, $value)
+ {
+ $this->configValues[$name] = $value;
+ }
+
+}
diff --git a/tests/PHPUnit/Framework/Mock/PiwikPro/Advertising.php b/tests/PHPUnit/Framework/Mock/PiwikPro/Advertising.php
new file mode 100644
index 0000000000000000000000000000000000000000..b1de8c4899c75f6c635ce9405a25ec6dbb76287b
--- /dev/null
+++ b/tests/PHPUnit/Framework/Mock/PiwikPro/Advertising.php
@@ -0,0 +1,20 @@
+<?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\Tests\Framework\Mock\PiwikPro;
+
+class Advertising extends \Piwik\PiwikPro\Advertising
+{
+ public function __construct()
+ {
+ }
+
+ public function arePiwikProAdsEnabled()
+ {
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Framework/Mock/Plugin/Manager.php b/tests/PHPUnit/Framework/Mock/Plugin/Manager.php
new file mode 100644
index 0000000000000000000000000000000000000000..3cfbd5320aaa5877d41216545b25ca75d1a4b757
--- /dev/null
+++ b/tests/PHPUnit/Framework/Mock/Plugin/Manager.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Piwik\Tests\Framework\Mock\Plugin;
+
+class Manager extends \Piwik\Plugin\Manager
+{
+ private $pluginsToActivate = array();
+
+ public function __construct()
+ {
+ }
+
+ public function setActivatedPlugins($pluginsList)
+ {
+ $this->pluginsToActivate = $pluginsList;
+ }
+
+ public function isPluginActivated($pluginName)
+ {
+ return in_array($pluginName, $this->pluginsToActivate);
+ }
+
+}
diff --git a/tests/PHPUnit/Integration/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/ArchiveProcessingTest.php
index 42e95d4b436a2fcfdb598b901eb02d69dbcd448e..358528270f3b80963f2c6465f8f9ba4ee086750f 100644
--- a/tests/PHPUnit/Integration/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Integration/ArchiveProcessingTest.php
@@ -17,6 +17,7 @@ use Piwik\DataAccess\ArchiveTableCreator;
use Piwik\Date;
use Piwik\Db;
use Piwik\Db\BatchInsert;
+use Piwik\DbHelper;
use Piwik\Period;
use Piwik\Piwik;
use Piwik\Plugins\SitesManager\API;
@@ -306,11 +307,12 @@ class ArchiveProcessingTest extends IntegrationTestCase
$didWeUseBulk = BatchInsert::tableInsertBatch($table,
array('idsite', 'url'),
$data,
- $throwException = true);
+ $throwException = true, 'utf8');
} catch (Exception $e) {
$didWeUseBulk = $e->getMessage();
}
+
$this->_checkLoadDataInFileWasUsed($didWeUseBulk);
if ($didWeUseBulk === true) {
@@ -377,7 +379,7 @@ class ArchiveProcessingTest extends IntegrationTestCase
$didWeUseBulk = BatchInsert::tableInsertBatch($table,
array('idarchive', 'name', 'idsite', 'date1', 'date2', 'period', 'ts_archived', 'value'),
$data,
- $throwException = true);
+ $throwException = true, $charset = 'latin1');
} catch (Exception $e) {
$didWeUseBulk = $e->getMessage();
}
@@ -388,7 +390,7 @@ class ArchiveProcessingTest extends IntegrationTestCase
$this->_checkTableIsExpectedBlob($table, $data);
}
// INSERT again the bulk. Because we use keyword LOCAL the data will be REPLACED automatically (see mysql doc)
- $didWeUseBulk = BatchInsert::tableInsertBatch($table, array('idarchive', 'name', 'idsite', 'date1', 'date2', 'period', 'ts_archived', 'value'), $data);
+ $didWeUseBulk = BatchInsert::tableInsertBatch($table, array('idarchive', 'name', 'idsite', 'date1', 'date2', 'period', 'ts_archived', 'value'), $data, $throw = false, $charset = 'latin1');
if ($didWeUseBulk === true) {
$this->_checkTableIsExpectedBlob($table, $data);
}
@@ -421,9 +423,10 @@ class ArchiveProcessingTest extends IntegrationTestCase
protected function _checkTableIsExpected($table, $data)
{
$fetched = Db::fetchAll('SELECT * FROM ' . $table);
+
foreach ($data as $id => $row) {
- $this->assertEquals($fetched[$id]['idsite'], $data[$id][0], "record $id is not {$data[$id][0]}");
- $this->assertEquals($fetched[$id]['url'], $data[$id][1], "Record $id bug, not {$data[$id][1]} BUT {$fetched[$id]['url']}");
+ $this->assertEquals($data[$id][0], $fetched[$id]['idsite'], "record $id is not {$data[$id][0]}");
+ $this->assertEquals($data[$id][1], $fetched[$id]['url'], "Record $id bug, not {$data[$id][1]} BUT {$fetched[$id]['url']}");
}
}
@@ -484,6 +487,7 @@ class ArchiveProcessingTest extends IntegrationTestCase
for ($i = 0; $i < 256; $i++) {
$str .= chr($i);
}
+
$array[] = array(1, 'bytes 0-255', 1, '2011-03-31', '2011-03-31', Piwik::$idPeriods['day'], $ts, $str);
$array[] = array(2, 'compressed string', 1, '2011-03-31', '2011-03-31', Piwik::$idPeriods['day'], $ts, gzcompress(" \n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942\n \r \t teste eigaj oegheao geaoh guoea98742983 2 342942"));
diff --git a/tests/PHPUnit/Integration/CronArchiveTest.php b/tests/PHPUnit/Integration/CronArchiveTest.php
index c64f0c3e625d270c144300dfaa808ec10c41a903..c8f97754fc0ef2f5e09eaec98dc0099070c24597 100644
--- a/tests/PHPUnit/Integration/CronArchiveTest.php
+++ b/tests/PHPUnit/Integration/CronArchiveTest.php
@@ -8,7 +8,6 @@
namespace Piwik\Tests\Integration;
-use Piwik\Archiver\Request;
use Piwik\CliMulti;
use Piwik\Container\StaticContainer;
use Piwik\CronArchive;
diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
index c0b9baf4382a450b7b5d2d4d99abe2404d7784ae..27433058321e87b2f8ad66b71ce4f653f82ee04e 100644
--- a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
+++ b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
@@ -284,8 +284,7 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
/**
* @dataProvider getTestDataForMarkArchivesAsInvalidated
*/
- public function test_markArchivesAsInvalidated_MarksCorrectArchivesAsInvalidated($idSites, $dates, $period, $segment, $cascadeDown,
- $expectedIdArchives)
+ public function test_markArchivesAsInvalidated_MarksCorrectArchivesAsInvalidated($idSites, $dates, $period, $segment, $cascadeDown, $expectedIdArchives)
{
$dates = array_map(array('Piwik\Date', 'factory'), $dates);
@@ -302,11 +301,17 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
$this->assertEquals($dates, $result->processedDates);
$idArchives = $this->getInvalidatedArchives();
+
+ // Remove empty values (some new empty entries may be added each month)
+ $idArchives = array_filter($idArchives);
+ $expectedIdArchives = array_filter($expectedIdArchives);
+
$this->assertEquals($expectedIdArchives, $idArchives);
}
public function getTestDataForMarkArchivesAsInvalidated()
{
+ // $idSites, $dates, $period, $segment, $cascadeDown, $expectedIdArchives
return array(
// day period, multiple sites, multiple dates across tables, cascade = true
array(
@@ -316,8 +321,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
null,
true,
array(
- '2014_01' => array(),
- '2015_03' => array(),
'2015_04' => array(
'1.2015-04-30.2015-04-30.1.done3736b708e4d20cfc10610e816a1b2341.UserCountry',
'2.2015-04-30.2015-04-30.1.done5447835b0a861475918e79e932abdfd8',
@@ -326,7 +329,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
'1.2015-04-01.2015-04-30.3.done3736b708e4d20cfc10610e816a1b2341.UserCountry',
'2.2015-04-01.2015-04-30.3.done5447835b0a861475918e79e932abdfd8',
),
- '2014_12' => array(),
'2015_01' => array(
'1.2015-01-01.2015-01-01.1.done3736b708e4d20cfc10610e816a1b2341',
'2.2015-01-01.2015-01-01.1.done.VisitsSummary',
@@ -344,9 +346,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
'1.2015-02-01.2015-02-28.3.done.VisitsSummary',
'2.2015-02-01.2015-02-28.3.done3736b708e4d20cfc10610e816a1b2341.UserCountry',
),
- '2015_05' => array(),
- '2015_06' => array(),
- '2015_07' => array(),
),
),
@@ -358,18 +357,10 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
null,
false,
array(
- '2014_01' => array(),
- '2014_12' => array(),
'2015_01' => array(
'1.2015-01-01.2015-01-31.3.done3736b708e4d20cfc10610e816a1b2341',
'1.2015-01-01.2015-12-31.4.done5447835b0a861475918e79e932abdfd8',
),
- '2015_02' => array(),
- '2015_03' => array(),
- '2015_04' => array(),
- '2015_05' => array(),
- '2015_06' => array(),
- '2015_07' => array(),
),
),
@@ -381,7 +372,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
null,
true,
array(
- '2014_01' => array(),
'2014_12' => array(
'1.2014-12-29.2015-01-04.2.done3736b708e4d20cfc10610e816a1b2341',
@@ -429,12 +419,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
'1.2015-01-01.2015-12-31.4.done5447835b0a861475918e79e932abdfd8',
'1.2015-01-01.2015-01-10.5.done.VisitsSummary',
),
- '2015_02' => array(),
- '2015_03' => array(),
- '2015_04' => array(),
- '2015_05' => array(),
- '2015_06' => array(),
- '2015_07' => array(),
),
),
@@ -446,7 +430,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
null,
true,
array(
- '2014_01' => array(),
'2014_12' => array(
'1.2014-12-29.2014-12-29.1.done',
'1.2014-12-30.2014-12-30.1.done3736b708e4d20cfc10610e816a1b2341.UserCountry',
@@ -475,11 +458,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
'1.2015-02-01.2015-02-01.1.done3736b708e4d20cfc10610e816a1b2341',
'1.2015-02-01.2015-02-28.3.done.VisitsSummary',
),
- '2015_03' => array(),
- '2015_04' => array(),
- '2015_05' => array(),
- '2015_06' => array(),
- '2015_07' => array(),
),
),
@@ -491,20 +469,13 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
null,
true,
array(
- '2014_01' => array(),
- '2014_12' => array(),
'2015_01' => array(
'1.2015-01-01.2015-01-10.5.done.VisitsSummary',
),
- '2015_02' => array(),
'2015_03' => array(
'1.2015-03-04.2015-03-05.5.done.VisitsSummary',
'1.2015-03-05.2015-03-10.5.done3736b708e4d20cfc10610e816a1b2341.UserCountry',
),
- '2015_04' => array(),
- '2015_05' => array(),
- '2015_06' => array(),
- '2015_07' => array(),
),
),
@@ -516,7 +487,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
self::TEST_SEGMENT_1,
true,
array(
- '2014_01' => array(),
'2014_12' => array(
'1.2014-12-29.2015-01-04.2.done3736b708e4d20cfc10610e816a1b2341',
),
@@ -537,12 +507,6 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
'1.2015-01-26.2015-02-01.2.done3736b708e4d20cfc10610e816a1b2341.UserCountry',
'1.2015-01-01.2015-01-31.3.done3736b708e4d20cfc10610e816a1b2341',
),
- '2015_02' => array(),
- '2015_03' => array(),
- '2015_04' => array(),
- '2015_05' => array(),
- '2015_06' => array(),
- '2015_07' => array(),
),
),
@@ -554,21 +518,14 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
null,
false,
array(
- '2014_01' => array(),
- '2014_12' => array(),
'2015_01' => array(
'1.2015-01-01.2015-12-31.4.done5447835b0a861475918e79e932abdfd8',
),
- '2015_02' => array(),
- '2015_03' => array(),
- '2015_04' => array(),
'2015_05' => array(
'1.2015-05-05.2015-05-05.1.done3736b708e4d20cfc10610e816a1b2341.UserCountry',
'1.2015-05-04.2015-05-10.2.done5447835b0a861475918e79e932abdfd8',
'1.2015-05-01.2015-05-31.3.done3736b708e4d20cfc10610e816a1b2341',
),
- '2015_06' => array(),
- '2015_07' => array(),
),
),
);
diff --git a/tests/PHPUnit/Integration/Http/Post.php b/tests/PHPUnit/Integration/Http/Post.php
new file mode 100644
index 0000000000000000000000000000000000000000..8745bcebfe8944f7c2245e75d7417701e2461ae9
--- /dev/null
+++ b/tests/PHPUnit/Integration/Http/Post.php
@@ -0,0 +1,29 @@
+<?php
+
+// used in integration tests to see if POST method works.
+// for security reasons we allow max 3 post vars, each key and value is only allowed to have max 6 hex characters
+
+function accept($key)
+{
+ if (ctype_xdigit($key) && strlen($key) <= 6) {
+ return $key;
+ }
+}
+
+if (count($_POST) > 4) {
+ exit;
+}
+
+$values = array();
+foreach ($_POST as $key => $value) {
+ if (accept($key) && accept($value)) {
+ $values[$key] = $value;
+ }
+}
+
+if (!empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) === 'post') {
+ $values['method'] = 'post';
+}
+
+echo json_encode($values);
+exit;
diff --git a/tests/PHPUnit/Integration/HttpTest.php b/tests/PHPUnit/Integration/HttpTest.php
index 1f2ff373bb2d6193589e5ac48631ce9ebfeb4d54..417a98599d24c1b58e427a9fa6e26d5c57a9fa89 100644
--- a/tests/PHPUnit/Integration/HttpTest.php
+++ b/tests/PHPUnit/Integration/HttpTest.php
@@ -167,6 +167,58 @@ class HttpTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(401, $result['status']);
}
+ /**
+ * @dataProvider getMethodsToTest
+ */
+ public function testHttpPost_ViaString($method)
+ {
+ $result = Http::sendHttpRequestBy(
+ $method,
+ Fixture::getRootUrl() . 'tests/PHPUnit/Integration/Http/Post.php',
+ 30,
+ $userAgent = null,
+ $destinationPath = null,
+ $file = null,
+ $followDepth = 0,
+ $acceptLanguage = false,
+ $acceptInvalidSslCertificate = false,
+ $byteRange = false,
+ $getExtendedInfo = false,
+ $httpMethod = 'POST',
+ $httpUsername = '',
+ $httpPassword = '',
+ 'abc12=43&abfec=abcdef'
+ );
+
+ $this->assertEquals('{"abc12":"43","abfec":"abcdef","method":"post"}', $result);
+ }
+
+ /**
+ * @dataProvider getMethodsToTest
+ */
+ public function testHttpPost_ViaArray($method)
+ {
+ $result = Http::sendHttpRequestBy(
+ $method,
+ Fixture::getRootUrl() . 'tests/PHPUnit/Integration/Http/Post.php',
+ 30,
+ $userAgent = null,
+ $destinationPath = null,
+ $file = null,
+ $followDepth = 0,
+ $acceptLanguage = false,
+ $acceptInvalidSslCertificate = false,
+ $byteRange = false,
+ $getExtendedInfo = false,
+ $httpMethod = 'POST',
+ $httpUsername = '',
+ $httpPassword = '',
+ array('adf2' => '44', 'afc23' => 'ab12')
+ );
+
+ $this->assertEquals('{"adf2":"44","afc23":"ab12","method":"post"}', $result);
+ }
+
/**
* @dataProvider getMethodsToTest
*/
diff --git a/tests/PHPUnit/Integration/MailTest.php b/tests/PHPUnit/Integration/MailTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..876804c52f69d13dc4b3d7db259195d589290473
--- /dev/null
+++ b/tests/PHPUnit/Integration/MailTest.php
@@ -0,0 +1,32 @@
+<?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\Tests\Integration;
+
+use Piwik\Mail;
+
+class MailTest extends \PHPUnit_Framework_TestCase
+{
+
+ public function getEmailFilenames()
+ {
+ return array(
+ array('January 3 – 9, 2010', 'January 3 - 9, 2010'),
+ array('Report <The><< ’s Coves - week January 18 – 24, 2016', 'Report <The><< \'s Coves - week January 18 - 24, 2016'),
+ );
+ }
+
+ /**
+ * @dataProvider getEmailFilenames
+ */
+ public function test_EmailFilenamesAreSanitised($raw, $expected)
+ {
+ $mail = new Mail;
+ $this->assertEquals($expected, $mail->sanitiseString($raw));
+ }
+}
diff --git a/tests/PHPUnit/Integration/PiwikPro/AdvertisingTest.php b/tests/PHPUnit/Integration/PiwikPro/AdvertisingTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..5d3c9c27d0f39c6749ec58e9b516755ab44ac4de
--- /dev/null
+++ b/tests/PHPUnit/Integration/PiwikPro/AdvertisingTest.php
@@ -0,0 +1,149 @@
+<?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\Tests\Integration\PiwikPro;
+
+use Piwik\Config;
+use Piwik\PiwikPro\Advertising;
+use Piwik\Plugin;
+use Piwik\Tests\Framework\Mock\FakeConfig;
+use Piwik\Tests\Framework\Mock\Plugin\Manager;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+
+/**
+ * @group PiwikPro
+ * @group Advertising
+ * @group Integration
+ */
+class AdvertisingTest extends IntegrationTestCase
+{
+ /**
+ * @var Advertising
+ */
+ private $advertising;
+
+ /**
+ * @var Config
+ */
+ private $config;
+
+ /**
+ * @var Manager
+ */
+ private $pluginManager;
+
+ private $exampleUrl = 'https://piwik.pro/test';
+
+ public function setUp()
+ {
+ $this->config = new FakeConfig(array('General' => array('piwik_pro_ads_enabled' => '1')));
+ $this->pluginManager = new Manager();
+
+ $this->advertising = $this->buildAdvertising($this->config);
+ }
+
+ public function test_arePiwikProAdsEnabled_ActuallyEnabled()
+ {
+ $enabled = $this->advertising->arePiwikProAdsEnabled();
+
+ $this->assertTrue($enabled);
+ }
+
+ public function test_arePiwikProAdsEnabled_Disabled()
+ {
+ $this->config->General = array('piwik_pro_ads_enabled' => '0');
+
+ $enabled = $this->advertising->arePiwikProAdsEnabled();
+
+ $this->assertFalse($enabled);
+ }
+
+ public function test_arePiwikProAdsEnabled_shouldBeDisabledWhenCloudPluginIsInstalled()
+ {
+ $enabled = $this->advertising->arePiwikProAdsEnabled();
+ $this->assertTrue($enabled);
+
+ $this->pluginManager->setActivatedPlugins(array('CloudAdmin'));
+
+ $enabled = $this->advertising->arePiwikProAdsEnabled();
+ $this->assertFalse($enabled);
+ }
+
+ public function test_arePiwikProAdsEnabled_shouldBeDisabledWhenEnterprisePluginIsInstalled()
+ {
+ $enabled = $this->advertising->arePiwikProAdsEnabled();
+ $this->assertTrue($enabled);
+
+ $this->pluginManager->setActivatedPlugins(array('EnterpriseAdmin'));
+
+ $enabled = $this->advertising->arePiwikProAdsEnabled();
+ $this->assertFalse($enabled);
+ }
+
+ public function test_shouldBeEnabledByDefault()
+ {
+ $enabled = $this->buildAdvertising(Config::getInstance());
+
+ $this->assertTrue($enabled->arePiwikProAdsEnabled());
+ }
+
+ public function test_getPromoUrlForOnPremises_WithoutContent()
+ {
+ $link = $this->advertising->getPromoUrlForOnPremises('Installation_End');
+
+ $this->assertSame('https://piwik.pro/c/upgrade/?pk_campaign=Upgrade_to_Pro&pk_medium=Installation_End&pk_source=Piwik_App', $link);
+ }
+
+ public function test_getPromoUrlForOnPremises_WithContent()
+ {
+ $link = $this->advertising->getPromoUrlForOnPremises('Installation_End', 'TestContent');
+
+ $this->assertSame('https://piwik.pro/c/upgrade/?pk_campaign=Upgrade_to_Pro&pk_medium=Installation_End&pk_source=Piwik_App&pk_content=TestContent', $link);
+ }
+
+ public function test_getPromoUrlForCloud_WithoutContent()
+ {
+ $link = $this->advertising->getPromoUrlForCloud('Installation_End');
+
+ $this->assertSame('https://piwik.pro/cloud/?pk_campaign=Upgrade_to_Cloud&pk_medium=Installation_End&pk_source=Piwik_App', $link);
+ }
+
+ public function test_getPromoUrlForCloud_WithContent()
+ {
+ $link = $this->advertising->getPromoUrlForCloud('Installation_End', 'TestContent');
+
+ $this->assertSame('https://piwik.pro/cloud/?pk_campaign=Upgrade_to_Cloud&pk_medium=Installation_End&pk_source=Piwik_App&pk_content=TestContent', $link);
+ }
+
+ public function test_addPromoCampaignParametersToUrl_withoutContentWithoutQuery()
+ {
+ $link = $this->advertising->addPromoCampaignParametersToUrl($this->exampleUrl, 'MyName', 'Installation_Start');
+
+ $this->assertSame($this->exampleUrl . '?pk_campaign=MyName&pk_medium=Installation_Start&pk_source=Piwik_App', $link);
+ }
+
+ public function test_addPromoCampaignParametersToUrl_withContentWithoutQuery()
+ {
+ $link = $this->advertising->addPromoCampaignParametersToUrl($this->exampleUrl, 'MyName', 'Installation_Start', 'MyContent');
+
+ $this->assertSame($this->exampleUrl . '?pk_campaign=MyName&pk_medium=Installation_Start&pk_source=Piwik_App&pk_content=MyContent', $link);
+ }
+
+ public function test_addPromoCampaignParametersToUrl_withQuery()
+ {
+ $url = $this->exampleUrl . '?foo=bar';
+ $link = $this->advertising->addPromoCampaignParametersToUrl($url, 'MyName', 'Installation_Start');
+
+ $this->assertSame($url . '&pk_campaign=MyName&pk_medium=Installation_Start&pk_source=Piwik_App', $link);
+ }
+
+ private function buildAdvertising($config)
+ {
+ return new Advertising($this->pluginManager, $config);
+ }
+}
diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
index 58970199f078e8815fc627dbded0faa80f010900..fcda0177be565bbf311546c81fda1411bf0352c2 100644
--- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
@@ -184,6 +184,30 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
}
}
+ public function test_jsfilesDoNotContainFakeSpaces()
+ {
+ $js = Filesystem::globr(PIWIK_INCLUDE_PATH, '*.js');
+ $this->checkFilesDoNotHaveWeirdSpaces($js);
+ }
+
+ public function test_phpfilesDoNotContainFakeSpaces()
+ {
+ $js = Filesystem::globr(PIWIK_INCLUDE_PATH, '*.php');
+ $this->checkFilesDoNotHaveWeirdSpaces($js);
+ }
+
+ public function test_twigfilesDoNotContainFakeSpaces()
+ {
+ $js = Filesystem::globr(PIWIK_INCLUDE_PATH, '*.twig');
+ $this->checkFilesDoNotHaveWeirdSpaces($js);
+ }
+
+ public function test_htmlfilesDoNotContainFakeSpaces()
+ {
+ $js = Filesystem::globr(PIWIK_INCLUDE_PATH, '*.html');
+ $this->checkFilesDoNotHaveWeirdSpaces($js);
+ }
+
public function test_directoriesShouldBeChmod755()
{
$pluginsPath = realpath(PIWIK_INCLUDE_PATH . '/plugins/');
@@ -422,7 +446,7 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
}
// in build-package.sh we have: `find ./ -iname 'tests' -type d -prune -exec rm -rf {} \;`
- if(stripos($file, "/tests/") !== false) {
+ if($this->isFileBelongToTests($file)) {
return false;
}
if(strpos($file, PIWIK_INCLUDE_PATH . "/tmp/") !== false) {
@@ -586,4 +610,52 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
}
return $filesizes;
}
+
+ /**
+ * @param $files
+ * @throws Exception
+ */
+ protected function checkFilesDoNotHaveWeirdSpaces($files)
+ {
+ $weirdSpace = 'Â ';
+ $this->assertEquals('c2a0', bin2hex($weirdSpace), "Checking that this test file was not tampered with");
+ $this->assertEquals('20', bin2hex(' '), "Checking that this test file was not tampered with");
+
+ $errors = array();
+ $countFileChecked = 0;
+ foreach ($files as $file) {
+
+ if($this->isFileBelongToTests($file)) {
+ continue;
+ }
+
+ if(strpos($file, 'vendor/php-di/php-di/website/') !== false) {
+ continue;
+ }
+
+ $content = file_get_contents($file);
+ $posWeirdSpace = strpos($content, $weirdSpace);
+ if ($posWeirdSpace !== false) {
+ $around = substr($content, $posWeirdSpace - 20, 40);
+ $around = trim($around);
+ $errors[] = "File $file contains an unusual space character, please remove it from here: ...$around...";
+ }
+
+ $countFileChecked++;
+ }
+ $this->assertTrue($countFileChecked > 100, "expected to test at least 100 files, but tested only " . $countFileChecked);
+
+ if (!empty($errors)) {
+ throw new Exception(implode(",\n\n ", $errors));
+ }
+ }
+
+ /**
+ * @param $file
+ * @return bool
+ */
+ private function isFileBelongToTests($file)
+ {
+ return stripos($file, "/tests/") !== false;
+ }
}
diff --git a/tests/PHPUnit/Integration/Settings/SystemSettingTest.php b/tests/PHPUnit/Integration/Settings/SystemSettingTest.php
index ecc694cc883c5deed4e569be145a7333271f514a..f3655ed9191d3cde237b4f35f41e3b775f304197 100644
--- a/tests/PHPUnit/Integration/Settings/SystemSettingTest.php
+++ b/tests/PHPUnit/Integration/Settings/SystemSettingTest.php
@@ -8,7 +8,9 @@
namespace Piwik\Tests\Integration\Settings;
+use Piwik\Config;
use Piwik\Db;
+use Piwik\Plugin\Settings;
use Piwik\Settings\SystemSetting;
/**
@@ -19,6 +21,12 @@ use Piwik\Settings\SystemSetting;
class SystemSettingTest extends IntegrationTestCase
{
+ public function tearDown()
+ {
+ Config::getInstance()->MyPluginName = array();
+ parent::tearDown();
+ }
+
public function test_constructor_shouldNotEstablishADatabaseConnection()
{
$this->assertNotDbConnectionCreated();
@@ -113,6 +121,74 @@ class SystemSettingTest extends IntegrationTestCase
$this->assertEquals('', $setting->getValue());
}
+ public function test_getSettingValue_fromConfig_IfOneIsConfiguredInsteadOfTheValueFromDatabase()
+ {
+ $this->setSuperUser();
+ $setting = $this->addSystemSetting('myusersetting', 'mytitle');
+ $setting->setPluginName('MyPluginName');
+ $setting->setValue('test');
+ $this->assertEquals('test', $setting->getValue());
+
+ Config::getInstance()->MyPluginName = array('myusersetting' => 'mynewvalue');
+ $value = $setting->getValue();
+ $this->assertEquals('mynewvalue', $value);
+ }
+
+ public function test_getSettingValue_fromConfig_ShouldConvertToTheSpecifiedType()
+ {
+ $this->setSuperUser();
+ $setting = $this->addSystemSetting('myusersetting', 'mytitle');
+ $setting->setPluginName('MyPluginName');
+
+ Config::getInstance()->MyPluginName = array('myusersetting' => '1');
+
+ $this->assertSame('1', $setting->getValue());
+
+ $setting->type = Settings::TYPE_BOOL;
+ $this->assertTrue($setting->getValue());
+ }
+
+ public function test_getSettingValue_fromConfig_isCaseSensitive()
+ {
+ $this->setSuperUser();
+ $setting = $this->addSystemSetting('myUsersetting', 'mytitle');
+ $setting->setPluginName('MyPluginName');
+
+ Config::getInstance()->MyPluginName = array('myusersetting' => '1');
+
+ $this->assertNull($setting->getValue());
+
+ Config::getInstance()->MyPluginName = array('myUsersetting' => '1');
+
+ $this->assertSame('1', $setting->getValue());
+ }
+
+ public function test_getSettingsValue_fromConfig_ShouldSetObjectToNotWritableAsSoonAsAValueIsConfigured()
+ {
+ $this->setSuperUser();
+ $setting = $this->addSystemSetting('myusersetting', 'mytitle');
+ $setting->setPluginName('MyPluginName');
+
+ $this->assertTrue($setting->isWritableByCurrentUser());
+
+ Config::getInstance()->MyPluginName = array('myusersetting' => '0');
+ $this->assertFalse($setting->isWritableByCurrentUser());
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage CoreAdminHome_PluginSettingChangeNotAllowed
+ */
+ public function test_setSettingsValue_shouldNotBePossible_AsSoonAsAConfigValueIsConfigured()
+ {
+ $this->setSuperUser();
+ $setting = $this->addSystemSetting('myusersetting', 'mytitle');
+ $setting->setPluginName('MyPluginName');
+
+ Config::getInstance()->MyPluginName = array('myusersetting' => '0');
+ $setting->setValue('test');
+ }
+
/**
* @expectedException \Exception
* @expectedExceptionMessage CoreAdminHome_PluginSettingChangeNotAllowed
diff --git a/tests/PHPUnit/Integration/Tracker/PingRequestTest.php b/tests/PHPUnit/Integration/Tracker/PingRequestTest.php
index 75e8c10c1a8b5a57c01f538fa4f799472a87a700..586283d9bf2d37ac7ad852eb8fc4b51fa525278c 100644
--- a/tests/PHPUnit/Integration/Tracker/PingRequestTest.php
+++ b/tests/PHPUnit/Integration/Tracker/PingRequestTest.php
@@ -47,7 +47,7 @@ class PingRequestTest extends IntegrationTestCase
$pingTime = '2012-01-05 00:20:00';
$this->doPingRequest($tracker, $pingTime, $setNewDimensionValues = false);
- $this->assertInitialVisitIsExtended($pingTime, self::FIRST_VISIT_TIME, $checkModifiedDimensions = false);
+ $this->assertInitialVisitIsNotExtended(self::FIRST_VISIT_TIME, $checkModifiedDimensions = false, 1201);
}
public function test_PingWithinThirtyMinutes_AndChangedDimensionValues_ExtendsExistingVisit_AndChangesAppropriateDimensions()
@@ -63,7 +63,7 @@ class PingRequestTest extends IntegrationTestCase
$pingTime = '2012-01-05 00:20:00';
$this->doPingRequest($tracker, $pingTime, $setNewDimensionValues = true);
- $this->assertInitialVisitIsExtended($pingTime, self::FIRST_VISIT_TIME, $checkModifiedDimensions = true);
+ $this->assertInitialVisitIsNotExtended(self::FIRST_VISIT_TIME, $checkModifiedDimensions = true, 1201);
}
public function test_PingWithinThirtyMinutes_DoesNotTriggerGoalConversion()
@@ -82,7 +82,7 @@ class PingRequestTest extends IntegrationTestCase
$tracker->setDebugStringAppend('&idgoal=1');
$this->doPingRequest($tracker, $pingTime, $setNewDimensionValues = true);
- $this->assertInitialVisitIsExtended($pingTime, self::FIRST_VISIT_TIME, $checkModifiedDimensions = true);
+ $this->assertInitialVisitIsNotExtended(self::FIRST_VISIT_TIME, $checkModifiedDimensions = true, 1201);
$this->assertGoalConversionCount(1);
}
@@ -163,11 +163,17 @@ class PingRequestTest extends IntegrationTestCase
return Db::fetchOne("SELECT MAX(server_time) FROM " . Common::prefixTable('log_link_visit_action') . " WHERE idvisit = ?", array($idVisit));
}
+ private function getVisitTotalTime($idVisit)
+ {
+ return Db::fetchOne("SELECT MAX(visit_total_time) FROM " . Common::prefixTable('log_visit') . " WHERE idvisit = ?", array($idVisit));
+ }
+
private function assertInitialVisitIsCorrect()
{
$this->assertVisitCount(1);
$this->assertActionCount(1);
$this->assertGoalConversionCount(1);
+ $this->assertEquals(0, $this->getVisitTotalTime($idVisit= 1));
$this->assertVisitPropertiesAreUnchanged($idVisit = 1);
}
@@ -192,17 +198,20 @@ class PingRequestTest extends IntegrationTestCase
return $response;
}
- private function assertInitialVisitIsExtended($newEndTime, $lastActionTime, $checkPropertiesModified)
+ private function assertInitialVisitIsNotExtended($firstActionTime, $checkPropertiesModified, $expectedTotalTime)
{
$this->assertVisitCount(1);
$this->assertActionCount(1);
$this->assertGoalConversionCount(1);
$visitEndTime = $this->getVisitLastActionTime($idVisit = 1);
- $this->assertEquals($newEndTime, $visitEndTime);
+ $this->assertEquals($firstActionTime, $visitEndTime);
$actionTime = $this->getLatestActionTime($idVisit = 1);
- $this->assertEquals($lastActionTime, $actionTime);
+ $this->assertEquals($firstActionTime, $actionTime);
+
+ $visitTotalTime = $this->getVisitTotalTime($idVisit = 1);
+ $this->assertEquals($expectedTotalTime, $visitTotalTime);
if ($checkPropertiesModified) {
$this->assertVisitPropertiesAreChanged($idVisit = 1, $checkUnchangeable = false);
diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php
index 4ca355ffe5d5ef78ed4da7a4c2c7af1a2d3917c1..8af1095b98e97c9f9110a2bc794c5cf53d0887f7 100644
--- a/tests/PHPUnit/Integration/WidgetsListTest.php
+++ b/tests/PHPUnit/Integration/WidgetsListTest.php
@@ -44,15 +44,14 @@ class WidgetsListTest extends IntegrationTestCase
'Dashboard_Dashboard' => 1,
'General_Actions' => 15,
'General_Visitors' => 34,
- 'Example Widgets' => 5,
'SEO' => 2,
'Goals_Goals' => 3,
'Live!' => 2,
'Insights_WidgetCategory' => 2,
'ExampleUI_UiFramework' => 8,
'Referrers_Referrers' => 9,
+ 'About Piwik' => 7,
);
-
// number of main categories
$this->assertEquals(count($numberOfWidgets), count($widgetsPerCategory));
diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
index 482b0d12d820ee115f2c95d6b6eb85f53d4b8bfc..f2b8e2e6327ff42b7a3f95f1a88e8000c3896c53 100755
--- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
+++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
@@ -73,6 +73,11 @@ class TwoVisitsWithCustomVariablesSegmentMatchNONETest extends SystemTestCase
if ($segment == 'deviceType') {
$matchNone = $segment . '==car%20browser';
}
+
+ if ($segment == 'deviceBrand') {
+ $matchNone = $segment . '==Yarvik';
+ }
+
$segmentExpression[] = $matchNone;
}
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
index 51252ac498dd6c82fe23e44363ba083d69f91be9..e36e5d53df7fd96c7c995f4656c05f321b09878e 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
<results>
<result idSite="1">
<nb_uniq_visitors>28</nb_uniq_visitors>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<nb_visits>28</nb_visits>
<nb_actions>31</nb_actions>
<nb_visits_converted>26</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
index 22528b0939bcc2956db4d5cf0a4643a9fd45e2c5..f1ce3d1ac179204096912d7d33946ca14822105d 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
@@ -2,7 +2,7 @@
<results>
<result idSite="1">
<nb_uniq_visitors>26</nb_uniq_visitors>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<nb_visits>26</nb_visits>
<nb_actions>29</nb_actions>
<nb_visits_converted>24</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml
index 744ab64e8e5434c152747988c11989ab30e1e2f7..d7fbf8c040ad4ac280852a13fdf47b5283f94b93 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
<results>
<result idSite="1">
<nb_uniq_visitors>27</nb_uniq_visitors>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<nb_visits>27</nb_visits>
<nb_actions>30</nb_actions>
<nb_visits_converted>25</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml
index 22528b0939bcc2956db4d5cf0a4643a9fd45e2c5..f1ce3d1ac179204096912d7d33946ca14822105d 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml
@@ -2,7 +2,7 @@
<results>
<result idSite="1">
<nb_uniq_visitors>26</nb_uniq_visitors>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<nb_visits>26</nb_visits>
<nb_actions>29</nb_actions>
<nb_visits_converted>24</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml
index 744ab64e8e5434c152747988c11989ab30e1e2f7..d7fbf8c040ad4ac280852a13fdf47b5283f94b93 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
<results>
<result idSite="1">
<nb_uniq_visitors>27</nb_uniq_visitors>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<nb_visits>27</nb_visits>
<nb_actions>30</nb_actions>
<nb_visits_converted>25</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml
index 22528b0939bcc2956db4d5cf0a4643a9fd45e2c5..f1ce3d1ac179204096912d7d33946ca14822105d 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml
@@ -2,7 +2,7 @@
<results>
<result idSite="1">
<nb_uniq_visitors>26</nb_uniq_visitors>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<nb_visits>26</nb_visits>
<nb_actions>29</nb_actions>
<nb_visits_converted>24</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
index 5ffae0691ebe1530488a0886c6a44e2ca7056249..2479501ff3bf252819bc12f7c3f569bd8ab66a39 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
@@ -2,5 +2,10 @@
<result>
<row>FF</row>
<row>UNK</row>
+ <row>CM</row>
+ <row>QQ</row>
+ <row>AN</row>
+ <row>CH</row>
+ <row>IE</row>
<row>SF</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
index 602805c283644c20c3c90cfe63e1b5e7dca9acf8..e7e79a42229880b7d77921431ee773c1ba86d097 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>27</nb_visits>
- <nb_actions>73</nb_actions>
- <nb_visits_converted>27</nb_visits_converted>
- <bounce_count>14</bounce_count>
- <sum_visit_length>21073</sum_visit_length>
+ <nb_visits>20</nb_visits>
+ <nb_actions>55</nb_actions>
+ <nb_visits_converted>20</nb_visits_converted>
+ <bounce_count>10</bounce_count>
+ <sum_visit_length>16210</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>52%</bounce_rate>
- <nb_actions_per_visit>2.7</nb_actions_per_visit>
- <avg_time_on_site>780</avg_time_on_site>
+ <bounce_rate>50%</bounce_rate>
+ <nb_actions_per_visit>2.8</nb_actions_per_visit>
+ <avg_time_on_site>811</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
index dfa3a2062361e1f2127a84e9e33202e73a513ee2..c0631c362b447e951baf446afb4620ab02bd670a 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>0</sum_visit_length>
- <max_actions>1</max_actions>
- <bounce_rate>100%</bounce_rate>
- <nb_actions_per_visit>1</nb_actions_per_visit>
- <avg_time_on_site>0</avg_time_on_site>
+ <nb_visits>5</nb_visits>
+ <nb_actions>12</nb_actions>
+ <nb_visits_converted>5</nb_visits_converted>
+ <bounce_count>3</bounce_count>
+ <sum_visit_length>3242</sum_visit_length>
+ <max_actions>5</max_actions>
+ <bounce_rate>60%</bounce_rate>
+ <nb_actions_per_visit>2.4</nb_actions_per_visit>
+ <avg_time_on_site>648</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml
index abcc43c819b46d6e20bfd3579c8fc7577b89026d..c3c7ec0152b9cc9004daa8bac4f91ef90f226b85 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml
@@ -1,4 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>3.6</row>
+ <row>33</row>
+ <row>5</row>
+ <row>3</row>
+ <row>32</row>
+ <row>34</row>
+ <row>11</row>
+ <row>8</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
index 602805c283644c20c3c90cfe63e1b5e7dca9acf8..780ddda63ad8afd8654941840b0fa11a99b9da96 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>27</nb_visits>
- <nb_actions>73</nb_actions>
- <nb_visits_converted>27</nb_visits_converted>
- <bounce_count>14</bounce_count>
- <sum_visit_length>21073</sum_visit_length>
+ <nb_visits>18</nb_visits>
+ <nb_actions>50</nb_actions>
+ <nb_visits_converted>18</nb_visits_converted>
+ <bounce_count>9</bounce_count>
+ <sum_visit_length>14589</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>52%</bounce_rate>
- <nb_actions_per_visit>2.7</nb_actions_per_visit>
- <avg_time_on_site>780</avg_time_on_site>
+ <bounce_rate>50%</bounce_rate>
+ <nb_actions_per_visit>2.8</nb_actions_per_visit>
+ <avg_time_on_site>811</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e421ad0903d9c5a549ccb3bc50f4b884b89be805
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>Unknown</row>
+ <row>HTC</row>
+ <row>Samsung</row>
+ <row>Google</row>
+ <row>Dell</row>
+ <row>Sony</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml
new file mode 100644
index 0000000000000000000000000000000000000000..828ec1e21b199470a6981e4eadfa7f71971ecafc
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <nb_visits>27</nb_visits>
+ <nb_actions>76</nb_actions>
+ <nb_visits_converted>27</nb_visits_converted>
+ <bounce_count>13</bounce_count>
+ <sum_visit_length>22694</sum_visit_length>
+ <max_actions>5</max_actions>
+ <bounce_rate>48%</bounce_rate>
+ <nb_actions_per_visit>2.8</nb_actions_per_visit>
+ <avg_time_on_site>841</avg_time_on_site>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
index 4f5796903aae99350a23ae51e46f084dad733256..7b9c37df18ead14b1d151aa0fe8699634cff7417 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>Desktop</row>
+ <row>Smartphone</row>
+ <row>Phablet</row>
+ <row>Tablet</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
index f32d4c4dc16555283f9e165c95721357b0827303..90e7df368bd28d18a60b21f997a49cfa85751362 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>WIN</row>
+ <row>AND</row>
<row>UNK</row>
+ <row>UBT</row>
+ <row>MLD</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
index 3ce6d98183f615b3f214d2a249576bc24f6e93d5..fc9d2e2c5a2d6bdad6161a8d748817c351d23cd3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>28</nb_visits>
- <nb_actions>74</nb_actions>
- <nb_visits_converted>28</nb_visits_converted>
- <bounce_count>15</bounce_count>
- <sum_visit_length>21073</sum_visit_length>
+ <nb_visits>22</nb_visits>
+ <nb_actions>54</nb_actions>
+ <nb_visits_converted>22</nb_visits_converted>
+ <bounce_count>13</bounce_count>
+ <sum_visit_length>14589</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>54%</bounce_rate>
- <nb_actions_per_visit>2.6</nb_actions_per_visit>
- <avg_time_on_site>753</avg_time_on_site>
+ <bounce_rate>59%</bounce_rate>
+ <nb_actions_per_visit>2.5</nb_actions_per_visit>
+ <avg_time_on_site>663</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml
index 0abf9e424600d3d211424e56cee7ddd568c21d67..efcc22ca7052db47bd6535105f475ba0ee74c650 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml
@@ -2,4 +2,12 @@
<result>
<row>XP</row>
<row>UNK</row>
+ <row>4.4</row>
+ <row>4.3</row>
+ <row>9.04</row>
+ <row>8</row>
+ <row>8.1</row>
+ <row>4.1</row>
+ <row>7</row>
+ <row>Vista</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
index 3ce6d98183f615b3f214d2a249576bc24f6e93d5..abb563f02374b13e00a1b45cb04f50d22db98acf 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>28</nb_visits>
- <nb_actions>74</nb_actions>
- <nb_visits_converted>28</nb_visits_converted>
- <bounce_count>15</bounce_count>
- <sum_visit_length>21073</sum_visit_length>
+ <nb_visits>19</nb_visits>
+ <nb_actions>51</nb_actions>
+ <nb_visits_converted>19</nb_visits_converted>
+ <bounce_count>10</bounce_count>
+ <sum_visit_length>14589</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>54%</bounce_rate>
- <nb_actions_per_visit>2.6</nb_actions_per_visit>
- <avg_time_on_site>753</avg_time_on_site>
+ <bounce_rate>53%</bounce_rate>
+ <nb_actions_per_visit>2.7</nb_actions_per_visit>
+ <avg_time_on_site>768</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
index 2bb1a15667be75fe10013689f0821846e6001870..798759bceac94b2be04f8107e34af54c7cee914e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
@@ -761,6 +761,48 @@
<url>http://piwik.net/to-an-error</url>
<segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
</row>
+ <row>
+ <label>api</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <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>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/fútbol-user-agent</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <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>1</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_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>download</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
index d1c53283d0d2fb6b70133be9390a1d842782ac1d..ed79501504aa6d0cebb7be65f50346a2d0a24875 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
@@ -13,7 +13,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>8</entry_bounce_count>
<exit_nb_visits>8</exit_nb_visits>
- <avg_time_on_page>17</avg_time_on_page>
+ <avg_time_on_page>13</avg_time_on_page>
<bounce_rate>89%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.389</avg_time_generation>
@@ -31,7 +31,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>5</entry_bounce_count>
<exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>24</avg_time_on_page>
+ <avg_time_on_page>17</avg_time_on_page>
<bounce_rate>83%</bounce_rate>
<exit_rate>71%</exit_rate>
<avg_time_generation>0.443</avg_time_generation>
@@ -49,7 +49,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>4</exit_nb_visits>
- <avg_time_on_page>30</avg_time_on_page>
+ <avg_time_on_page>22</avg_time_on_page>
<bounce_rate>80%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -70,7 +70,7 @@
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>30</avg_time_on_page>
+ <avg_time_on_page>22</avg_time_on_page>
<bounce_rate>80%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -91,7 +91,7 @@
<entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>1</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>8</avg_time_on_page>
+ <avg_time_on_page>5</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>50%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -112,7 +112,7 @@
<sum_daily_nb_uniq_visitors>2</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_time_on_page>8</avg_time_on_page>
+ <avg_time_on_page>5</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>50%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -542,7 +542,7 @@
<entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>10</avg_time_on_page>
+ <avg_time_on_page>7</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -563,7 +563,7 @@
<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>17</avg_time_on_page>
+ <avg_time_on_page>10</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -1122,6 +1122,48 @@
<url>http://piwik.net/to-an-error</url>
<segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
</row>
+ <row>
+ <label>api</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <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>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/fútbol-user-agent</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <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>1</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_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>changelog</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
index 05350333b8dedad534b5d0023d02f308de2dd989..edf1ae59e6317e8cd43395e067c0eeecf1ce242f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
@@ -755,6 +755,48 @@
<url>http://piwik.net/to-an-error</url>
<segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
</row>
+ <row>
+ <label>api</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <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>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/fútbol-user-agent</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <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>1</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_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>download</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
index e5240da08151c48653846dc3b5dfc4ba5db50032..7973b3e001012a3abe1a7fea60fca9b719c2d69d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
@@ -13,7 +13,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>8</entry_bounce_count>
<exit_nb_visits>8</exit_nb_visits>
- <avg_time_on_page>17</avg_time_on_page>
+ <avg_time_on_page>13</avg_time_on_page>
<bounce_rate>89%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.389</avg_time_generation>
@@ -31,7 +31,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>5</entry_bounce_count>
<exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>24</avg_time_on_page>
+ <avg_time_on_page>17</avg_time_on_page>
<bounce_rate>83%</bounce_rate>
<exit_rate>71%</exit_rate>
<avg_time_generation>0.443</avg_time_generation>
@@ -49,7 +49,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>4</exit_nb_visits>
- <avg_time_on_page>30</avg_time_on_page>
+ <avg_time_on_page>22</avg_time_on_page>
<bounce_rate>80%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -70,7 +70,7 @@
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>30</avg_time_on_page>
+ <avg_time_on_page>22</avg_time_on_page>
<bounce_rate>80%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -91,7 +91,7 @@
<entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>1</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>8</avg_time_on_page>
+ <avg_time_on_page>5</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>50%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -112,7 +112,7 @@
<sum_daily_nb_uniq_visitors>2</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_time_on_page>8</avg_time_on_page>
+ <avg_time_on_page>5</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>50%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -542,7 +542,7 @@
<entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>10</avg_time_on_page>
+ <avg_time_on_page>7</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -563,7 +563,7 @@
<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>17</avg_time_on_page>
+ <avg_time_on_page>10</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -1116,6 +1116,48 @@
<url>http://piwik.net/to-an-error</url>
<segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
</row>
+ <row>
+ <label>api</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <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>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/fútbol-user-agent</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <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>1</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_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>contact</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
index a56dd22637adeb198d1b394c3967cc8edc0ae161..4265021a1b386a663e51eef79acb7e832331f48c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
@@ -2,17 +2,17 @@
<result>
<row>
<label>Page Name not defined</label>
- <nb_visits>27</nb_visits>
- <nb_hits>28</nb_hits>
+ <nb_visits>28</nb_visits>
+ <nb_hits>29</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>6</nb_hits_with_time_generation>
+ <nb_hits_with_time_generation>7</nb_hits_with_time_generation>
<min_time_generation>0.001</min_time_generation>
<max_time_generation>0.359</max_time_generation>
- <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
- <avg_time_generation>0.156</avg_time_generation>
+ <avg_time_generation>0.135</avg_time_generation>
</row>
<row>
<label>301</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
index 9ac6ea68c28d98d43869327aad94eada4571500f..24291fc91a95fb190358a2d8bcb08f12103666c6 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
@@ -2,17 +2,17 @@
<result>
<row>
<label>Page Name not defined</label>
- <nb_visits>28</nb_visits>
- <nb_hits>38</nb_hits>
+ <nb_visits>29</nb_visits>
+ <nb_hits>39</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>16</nb_hits_with_time_generation>
+ <nb_hits_with_time_generation>17</nb_hits_with_time_generation>
<min_time_generation>0.001</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
- <avg_time_generation>0.3</avg_time_generation>
+ <avg_time_generation>0.283</avg_time_generation>
</row>
<row>
<label> Liberate Web Analytics - Analytics - Piwik</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
index ce5ec3dc7797bbebab33cd39ee3f29c701029ae9..27aff1019bf5c3bc01eaa6905619af9aae12160d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
@@ -12,7 +12,7 @@
<entry_nb_actions>10</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>83</avg_time_on_page>
+ <avg_time_on_page>33</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.443</avg_time_generation>
@@ -29,7 +29,7 @@
<entry_nb_actions>10</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>83</avg_time_on_page>
+ <avg_time_on_page>33</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.443</avg_time_generation>
@@ -42,7 +42,7 @@
<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
<min_time_generation>0.624</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <avg_time_on_page>15</avg_time_on_page>
+ <avg_time_on_page>8</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -56,7 +56,7 @@
<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
<min_time_generation>0.624</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <avg_time_on_page>15</avg_time_on_page>
+ <avg_time_on_page>8</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -76,7 +76,7 @@
<entry_nb_actions>10</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>151</avg_time_on_page>
+ <avg_time_on_page>50</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -95,7 +95,7 @@
<entry_nb_actions>10</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>151</avg_time_on_page>
+ <avg_time_on_page>50</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -161,7 +161,7 @@
<min_time_generation>0.234</min_time_generation>
<max_time_generation>0.294</max_time_generation>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>52</avg_time_on_page>
+ <avg_time_on_page>17</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -177,7 +177,7 @@
<max_time_generation>0.294</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>52</avg_time_on_page>
+ <avg_time_on_page>17</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
index cf6cb6491a08d8e1cdbd597ca167fe62f53d8fb1..5a2fb28be8787f19b7943a157b42f270c66f1e46 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
@@ -792,6 +792,48 @@
<url>http://piwik.net/to-an-error</url>
<segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
</row>
+ <row>
+ <label>api</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <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>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/fútbol-user-agent</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <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>1</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_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>download</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
index 6cad9e0d80ff8b92962cf8b871f616f615f29cae..6ed96aef32694818a87528a898b2b35d5e006683 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
@@ -13,7 +13,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>8</entry_bounce_count>
<exit_nb_visits>8</exit_nb_visits>
- <avg_time_on_page>17</avg_time_on_page>
+ <avg_time_on_page>13</avg_time_on_page>
<bounce_rate>89%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.389</avg_time_generation>
@@ -31,7 +31,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>5</entry_bounce_count>
<exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>24</avg_time_on_page>
+ <avg_time_on_page>17</avg_time_on_page>
<bounce_rate>83%</bounce_rate>
<exit_rate>71%</exit_rate>
<avg_time_generation>0.443</avg_time_generation>
@@ -49,7 +49,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>4</exit_nb_visits>
- <avg_time_on_page>30</avg_time_on_page>
+ <avg_time_on_page>22</avg_time_on_page>
<bounce_rate>80%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -70,7 +70,7 @@
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>30</avg_time_on_page>
+ <avg_time_on_page>22</avg_time_on_page>
<bounce_rate>80%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -91,7 +91,7 @@
<entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>1</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>8</avg_time_on_page>
+ <avg_time_on_page>5</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>50%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -112,7 +112,7 @@
<sum_daily_nb_uniq_visitors>2</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_time_on_page>8</avg_time_on_page>
+ <avg_time_on_page>5</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>50%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -542,7 +542,7 @@
<entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>10</avg_time_on_page>
+ <avg_time_on_page>7</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -563,7 +563,7 @@
<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>17</avg_time_on_page>
+ <avg_time_on_page>10</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -1172,6 +1172,48 @@
<url>http://piwik.net/to-an-error</url>
<segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
</row>
+ <row>
+ <label>api</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <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>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/fútbol-user-agent</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <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>1</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_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ </row>
+ </subtable>
+ </row>
<row>
<label>changelog</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
index a9f37fee8497557e441ca95f31ec463cf9850984..23f5051f83c4b02767e3f28dee44276a39660ee9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_pageviews>39</nb_pageviews>
- <nb_uniq_pageviews>38</nb_uniq_pageviews>
+ <nb_pageviews>40</nb_pageviews>
+ <nb_uniq_pageviews>39</nb_uniq_pageviews>
<nb_downloads>4</nb_downloads>
<nb_uniq_downloads>4</nb_uniq_downloads>
<nb_outlinks>0</nb_outlinks>
<nb_uniq_outlinks>0</nb_uniq_outlinks>
<nb_searches>0</nb_searches>
<nb_keywords>0</nb_keywords>
- <avg_time_generation>0.206</avg_time_generation>
+ <avg_time_generation>0.184</avg_time_generation>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
index f06074a2b3befc70f79f9189a351812010dc786c..bf02fbd84ba2cb37096955700d21f7498290cde9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_pageviews>63</nb_pageviews>
- <nb_uniq_pageviews>56</nb_uniq_pageviews>
+ <nb_pageviews>64</nb_pageviews>
+ <nb_uniq_pageviews>57</nb_uniq_pageviews>
<nb_downloads>5</nb_downloads>
<nb_uniq_downloads>5</nb_uniq_downloads>
<nb_outlinks>1</nb_outlinks>
<nb_uniq_outlinks>1</nb_uniq_outlinks>
<nb_searches>0</nb_searches>
<nb_keywords>0</nb_keywords>
- <avg_time_generation>0.273</avg_time_generation>
+ <avg_time_generation>0.264</avg_time_generation>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
index 3746937e853ac73f21d8c97343e0b3b516b677aa..5996574d1f9ba5a5d921eea7fbeb22f313a6b0f0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>HTTP-code</label>
- <nb_actions>44</nb_actions>
+ <nb_actions>45</nb_actions>
<slots>
<row>
<scope>page</scope>
@@ -17,9 +17,9 @@
<subtable>
<row>
<label>200</label>
- <nb_visits>33</nb_visits>
- <nb_actions>35</nb_actions>
- <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
+ <nb_visits>34</nb_visits>
+ <nb_actions>36</nb_actions>
+ <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>301</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
index 55ef69079d5a6706abb23785f840fead1fc3d594..190fff01c27727430ca2c2b7b74ed97f7ab38f7c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
@@ -72,7 +72,7 @@
<row>
<name>HTTP-code</name>
<nb_visits>0</nb_visits>
- <nb_actions>70</nb_actions>
+ <nb_actions>71</nb_actions>
</row>
<row>
<name>Generation Time</name>
@@ -99,7 +99,7 @@
<row>
<name>HTTP-code</name>
<nb_visits>0</nb_visits>
- <nb_actions>70</nb_actions>
+ <nb_actions>71</nb_actions>
</row>
</usages>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
index 08840cc821d11f95a99db4539a811116832578ec..0adfc71aeec60b0a2f6b92f35c115eb73028aacb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
@@ -9,8 +9,9 @@
<bounce_count>31</bounce_count>
<nb_visits_converted>31</nb_visits_converted>
<sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
+ <segment>deviceBrand==Unknown</segment>
</row>
<row>
<label>HTC</label>
@@ -23,6 +24,20 @@
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/brand/HTC.ico</logo>
+ <segment>deviceBrand==HTC</segment>
+ </row>
+ <row>
+ <label>Apple</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/brand/Apple.ico</logo>
+ <segment>deviceBrand==Apple</segment>
</row>
<row>
<label>Samsung</label>
@@ -35,5 +50,6 @@
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>1</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/brand/Samsung.ico</logo>
+ <segment>deviceBrand==Samsung</segment>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
index 4c4cb49892d5a53f6ec04ee11c8161b6abb5c473..26b425d53095aad58dd5f7c4210ed1ac53759899 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
@@ -9,7 +9,7 @@
<bounce_count>16</bounce_count>
<nb_visits_converted>17</nb_visits_converted>
<sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<segment>browserEngine==WebKit</segment>
</row>
<row>
@@ -38,13 +38,13 @@
</row>
<row>
<label>Unknown</label>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<segment>browserEngine==</segment>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
index d1231b5bb1b291003e097f0734569eb7ee2a8ddd..9ec764ffe633d214e6d0ea4b3467c85a042149a6 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
@@ -9,7 +9,7 @@
<bounce_count>9</bounce_count>
<nb_visits_converted>10</nb_visits_converted>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
@@ -50,13 +50,13 @@
</row>
<row>
<label>Unknown</label>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
index 8d82c019fcb6c67d9bb12ccbb15e86760da1730e..fb459cbb95301ee35d1b0b61a1c53fe32869b0d9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
@@ -100,7 +100,7 @@
<bounce_count>2</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<segment>browserCode==CH;browserVersion==20.0</segment>
<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
@@ -208,4 +208,17 @@
<segment>browserCode==IE;browserVersion==8.0</segment>
<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
</row>
+ <row>
+ <label>Unknown</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>browserCode==UNK;browserVersion==1.0</segment>
+ <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
index 34e9fb7630e5cf7a32f0b6994259e23673f0eec5..cce03cafcc5416c3d1f186588a690b2855e20617 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
@@ -9,7 +9,7 @@
<bounce_count>9</bounce_count>
<nb_visits_converted>10</nb_visits_converted>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
<segment>browserCode==CH</segment>
</row>
@@ -54,13 +54,13 @@
</row>
<row>
<label>Unknown</label>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
<segment>browserCode==UNK</segment>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
index f330ccb30f05ecd306ecdfa41e56ebf254656ca0..6a19338c7d3ed4eeb1d27de8a9440ca32b8ddf2d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
@@ -9,7 +9,7 @@
<bounce_count>31</bounce_count>
<nb_visits_converted>31</nb_visits_converted>
<sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
</row>
<row>
<label>HTC - Vision</label>
@@ -22,6 +22,17 @@
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
</row>
+ <row>
+ <label>Apple - iPhone</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
<row>
<label>Samsung - GALAXY S5</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
index c7234f86067e9b7efc6c87733c4500dc0dbc2dcd..9eee07e1177daa9fb13374d895c6480b657fda3b 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
@@ -21,7 +21,7 @@
<bounce_count>10</bounce_count>
<nb_visits_converted>11</nb_visits_converted>
<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
</row>
<row>
@@ -72,4 +72,16 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
</row>
+ <row>
+ <label>iOS</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/os/IOS.gif</logo>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
index 8ff1d6faeebf15bd75ccd8005f6e04bdfc1bc7f6..f20b32cd47f5917a357549a734adb6606d801baf 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
@@ -22,7 +22,7 @@
<bounce_count>7</bounce_count>
<nb_visits_converted>7</nb_visits_converted>
<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<segment>operatingSystemCode==WIN;operatingSystemVersion==7</segment>
<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
</row>
@@ -117,6 +117,19 @@
<segment>operatingSystemCode==BOT;operatingSystemVersion==UNK</segment>
<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
</row>
+ <row>
+ <label>iOS 7.1</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>operatingSystemCode==IOS;operatingSystemVersion==7.1</segment>
+ <logo>plugins/DevicesDetection/images/os/IOS.gif</logo>
+ </row>
<row>
<label>Mac</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
index 875400f57895cbe5e94c6fc34d3f8d00c0a3849e..921588630042ab44bbd0a82eaa7c7158f7d7df44 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
@@ -9,10 +9,23 @@
<bounce_count>27</bounce_count>
<nb_visits_converted>30</nb_visits_converted>
<sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<segment>deviceType==desktop</segment>
<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
</row>
+ <row>
+ <label>Smartphone</label>
+ <nb_visits>4</nb_visits>
+ <nb_actions>6</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>2</sum_visit_length>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>4</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <segment>deviceType==smartphone</segment>
+ <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
+ </row>
<row>
<label>Unknown</label>
<nb_visits>4</nb_visits>
@@ -25,19 +38,6 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
</row>
- <row>
- <label>Smartphone</label>
- <nb_visits>3</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>2</sum_visit_length>
- <bounce_count>2</bounce_count>
- <nb_visits_converted>3</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
- <segment>deviceType==smartphone</segment>
- <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
- </row>
<row>
<label>Camera</label>
<nb_visits>0</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
index d6f76b939eeb5b0149302e362fb6f39a713ddfee..b4efda313802d1819ab5e3324cdfc3c0655ec891 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0 days</label>
- <nb_conversions>33</nb_conversions>
+ <nb_conversions>34</nb_conversions>
</row>
<row>
<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
index d97c3eb0d0017c9e54acceaf589adf87e8acb285..603f6746151a1dc0035c7ffde9ca839533146e4b 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_conversions>34</nb_conversions>
- <nb_visits_converted>34</nb_visits_converted>
- <revenue>170</revenue>
- <conversion_rate>89.47%</conversion_rate>
+ <nb_conversions>35</nb_conversions>
+ <nb_visits_converted>35</nb_visits_converted>
+ <revenue>175</revenue>
+ <conversion_rate>89.74%</conversion_rate>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
index fcd1e7c56b36fe33f760c87422644d4e2262fdd9..c25b8275f08aebb7f7fa970ac4438504b41011a0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_conversions>34</nb_conversions>
+ <nb_conversions>35</nb_conversions>
</row>
<row>
<label>2 visits</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
index 73154bb53f913631d5f98ca988bb220c2958c854..9c8f8990b0536bf6b8824fff21aff82b8322c62e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_conversions>34</nb_conversions>
- <nb_visits_converted>34</nb_visits_converted>
- <revenue>170</revenue>
- <conversion_rate>89.47%</conversion_rate>
- <nb_conversions_new_visit>31</nb_conversions_new_visit>
- <nb_visits_converted_new_visit>31</nb_visits_converted_new_visit>
- <revenue_new_visit>155</revenue_new_visit>
- <conversion_rate_new_visit>88.57%</conversion_rate_new_visit>
+ <nb_conversions>35</nb_conversions>
+ <nb_visits_converted>35</nb_visits_converted>
+ <revenue>175</revenue>
+ <conversion_rate>89.74%</conversion_rate>
+ <nb_conversions_new_visit>32</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>32</nb_visits_converted_new_visit>
+ <revenue_new_visit>160</revenue_new_visit>
+ <conversion_rate_new_visit>88.89%</conversion_rate_new_visit>
<nb_conversions_returning_visit>3</nb_conversions_returning_visit>
<nb_visits_converted_returning_visit>3</nb_visits_converted_returning_visit>
<revenue_returning_visit>15</revenue_returning_visit>
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 84ba4e506dcabcf297d6297ae1e8d3a8b8f3ed0b..2087b56cee09f0565215fc9add35ab883447f297 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -2114,7 +2114,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>67</idVisit>
+ <idVisit>68</idVisit>
<visitIp>173.5.0.0</visitIp>
<actionDetails>
@@ -2123,7 +2123,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>93</goalPageId>
+ <goalPageId>94</goalPageId>
<url>http://hello.example.com/hello/from/another/world/6,681965</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -2135,7 +2135,7 @@
<pageTitle />
<pageIdAction>61</pageIdAction>
- <pageId>93</pageId>
+ <pageId>94</pageId>
<customVariables>
<row>
<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -2293,7 +2293,7 @@
<pageTitle />
<pageIdAction>56</pageIdAction>
- <pageId>90</pageId>
+ <pageId>91</pageId>
<customVariables>
<row>
<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -2512,7 +2512,7 @@
<pageTitle>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</pageTitle>
<pageIdAction>60</pageIdAction>
- <pageId>92</pageId>
+ <pageId>93</pageId>
<customVariables>
<row>
<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -2638,7 +2638,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>66</idVisit>
+ <idVisit>67</idVisit>
<visitIp>70.95.32.0</visitIp>
<actionDetails>
@@ -2647,7 +2647,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>91</goalPageId>
+ <goalPageId>92</goalPageId>
<url>http://example.hello.com/Topic/hw43061</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -2659,7 +2659,7 @@
<pageTitle>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</pageTitle>
<pageIdAction>58</pageIdAction>
- <pageId>91</pageId>
+ <pageId>92</pageId>
<customVariables>
<row>
<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -3130,6 +3130,115 @@
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>66</idVisit>
+ <visitIp>73.77.55.45</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>90</goalPageId>
+
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ <pageTitle />
+ <pageIdAction>71</pageIdAction>
+
+ <pageId>90</pageId>
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>200</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <generationTime>0.009s</generationTime>
+ <icon />
+
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <languageCode />
+ <language>Unknown</language>
+ <deviceType>Smartphone</deviceType>
+ <deviceTypeIcon>plugins/DevicesDetection/images/screens/smartphone.png</deviceTypeIcon>
+ <deviceBrand>Apple</deviceBrand>
+ <deviceModel>iPhone</deviceModel>
+ <operatingSystem>iOS 7.1</operatingSystem>
+ <operatingSystemName>iOS</operatingSystemName>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/IOS.gif</operatingSystemIcon>
+ <operatingSystemCode>IOS</operatingSystemCode>
+ <operatingSystemVersion>7.1</operatingSystemVersion>
+ <browserFamily />
+ <browserFamilyDescription>Unknown</browserFamilyDescription>
+ <browser>Unknown</browser>
+ <browserName>Unknown</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+ <browserCode>UNK</browserCode>
+ <browserVersion>1.0</browserVersion>
+ <events>0</events>
+ <continent>North America</continent>
+ <continentCode>amn</continentCode>
+ <country>United States</country>
+ <countryCode>us</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+ <region>New Jersey</region>
+ <regionCode>NJ</regionCode>
+ <city>Mount Laurel</city>
+ <location>Mount Laurel, New Jersey, United States</location>
+ <latitude>39.957001</latitude>
+ <longitude>-74.916000</longitude>
+ <visitLocalTime>12:20:31</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <customVariables>
+ </customVariables>
+ <resolution>unknown</resolution>
+ <plugins />
+ <pluginsIcons />
+
+
+
+
+
</row>
<row>
<idSite>1</idSite>
@@ -4409,7 +4518,7 @@
- <userId />
+ <userId>commonuser</userId>
<visitorType>new</visitorType>
<visitorTypeIcon />
<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
index 8485ac465cecc5099e1281ed39f4b3ba1a7c4fab..fd2d4e58ad4dcc5f42b3489e64984994703421e8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
@@ -2,10 +2,10 @@
<result>
<row>
<label>Piwik test</label>
- <nb_visits>38</nb_visits>
- <nb_actions>45</nb_actions>
- <nb_pageviews>39</nb_pageviews>
- <revenue>170</revenue>
+ <nb_visits>39</nb_visits>
+ <nb_actions>46</nb_actions>
+ <nb_pageviews>40</nb_pageviews>
+ <revenue>175</revenue>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
index 9b9cc1efd7945745fb0a0f637afe4efbc79fe907..5adcb351b840be3377e2e0d84beb0db3b86471ba 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>38</nb_visits>
- <nb_actions>45</nb_actions>
+ <nb_visits>39</nb_visits>
+ <nb_actions>46</nb_actions>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>100%</revenue_evolution>
- <nb_pageviews>39</nb_pageviews>
- <revenue>170</revenue>
+ <nb_pageviews>40</nb_pageviews>
+ <revenue>175</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
index a1e8fd0e9d0eb5776943c8af2cf918b32f2dd998..81319449879f284bf949ef73f3855e4089755309 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
@@ -2,23 +2,24 @@
<result>
<row>
<label>Direct Entry</label>
- <nb_visits>34</nb_visits>
- <nb_actions>39</nb_actions>
+ <nb_visits>35</nb_visits>
+ <nb_actions>40</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>549</sum_visit_length>
- <bounce_count>30</bounce_count>
+ <bounce_count>31</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>30</nb_conversions>
- <nb_visits_converted>30</nb_visits_converted>
- <revenue>150</revenue>
+ <nb_conversions>31</nb_conversions>
+ <nb_visits_converted>31</nb_visits_converted>
+ <revenue>155</revenue>
</row>
</goals>
- <nb_conversions>30</nb_conversions>
- <revenue>150</revenue>
- <sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
+ <nb_conversions>31</nb_conversions>
+ <revenue>155</revenue>
+ <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==direct</segment>
</row>
<row>
<label>Websites</label>
@@ -38,6 +39,7 @@
<revenue>20</revenue>
<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>1</sum_daily_nb_users>
+ <segment>referrerType==website</segment>
<subtable>
<row>
<label>example.com</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
index 55471df8f7ff77eff206d8ee76a3a99c2751a173..06ad7df1f990efd17fad0cd38414ac059f40a878 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
@@ -64,7 +64,7 @@
<bounce_count>3</bounce_count>
<nb_visits_converted>3</nb_visits_converted>
<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
</row>
<row>
<label>Android / Android Browser / unknown</label>
@@ -110,6 +110,17 @@
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
</row>
+ <row>
+ <label>iOS / Unknown / unknown</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
<row>
<label>GNU/Linux / Chrome / unknown</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
index 2dd3a3f0ff0df9842cf152638cf4c4f1a9bcf777..d8f74a118c3dc7af9f3d2f8fb76ef4d2e8792ce1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
@@ -2,14 +2,14 @@
<result>
<row>
<label>unknown</label>
- <nb_visits>36</nb_visits>
- <nb_actions>43</nb_actions>
+ <nb_visits>37</nb_visits>
+ <nb_actions>44</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>551</sum_visit_length>
- <bounce_count>31</bounce_count>
- <nb_visits_converted>32</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>2</sum_daily_nb_users>
+ <bounce_count>32</bounce_count>
+ <nb_visits_converted>33</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>3</sum_daily_nb_users>
<segment>resolution==unknown</segment>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
index fa5433509b3a765ed143c95ad306fc29b729be11..4c6a424157119d8bc745bbd598ab0050aebd5265 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -17,7 +17,7 @@
<nb_conversions>27</nb_conversions>
<revenue>135</revenue>
<sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>2</sum_daily_nb_users>
+ <sum_daily_nb_users>3</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
<city_name>Unknown</city_name>
<city>xx</city>
@@ -83,6 +83,34 @@
<region_name>Nunavut</region_name>
<logo>plugins/UserCountry/images/flags/ca.png</logo>
</row>
+ <row>
+ <label>Mount Laurel, New Jersey, United States</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</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>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <lat>39.957</lat>
+ <long>-74.916</long>
+ <segment>city==Mount+Laurel;regionCode==NJ;countryCode==us</segment>
+ <city_name>Mount Laurel</city_name>
+ <region>NJ</region>
+ <country>us</country>
+ <country_name>United States</country_name>
+ <region_name>New Jersey</region_name>
+ <logo>plugins/UserCountry/images/flags/us.png</logo>
+ </row>
<row>
<label>Seoul, Seoul-t&#039;ukpyolsi, South Korea</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
index 054cf2e1d3d81dabf2dc9754a2f518db78d80268..4d15ccdb89c8a4c1386e456380771962a78d0969 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
@@ -22,21 +22,21 @@
</row>
<row>
<label>North America</label>
- <nb_visits>11</nb_visits>
- <nb_actions>14</nb_actions>
+ <nb_visits>12</nb_visits>
+ <nb_actions>15</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>4</sum_visit_length>
- <bounce_count>9</bounce_count>
+ <bounce_count>10</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>11</nb_conversions>
- <nb_visits_converted>11</nb_visits_converted>
- <revenue>55</revenue>
+ <nb_conversions>12</nb_conversions>
+ <nb_visits_converted>12</nb_visits_converted>
+ <revenue>60</revenue>
</row>
</goals>
- <nb_conversions>11</nb_conversions>
- <revenue>55</revenue>
- <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+ <nb_conversions>12</nb_conversions>
+ <revenue>60</revenue>
+ <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>2</sum_daily_nb_users>
<code>North America</code>
</row>
@@ -57,7 +57,7 @@
<nb_conversions>9</nb_conversions>
<revenue>45</revenue>
<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
<code>Unknown</code>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
index 98deda9945e0b57ac0affcb80e49731b9e4d03de..70da83f4e901f7d12ee6355c58cbdd907df25ba4 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
@@ -24,6 +24,30 @@
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
</row>
+ <row>
+ <label>United States</label>
+ <nb_visits>11</nb_visits>
+ <nb_actions>14</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>4</sum_visit_length>
+ <bounce_count>9</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>11</nb_conversions>
+ <nb_visits_converted>11</nb_visits_converted>
+ <revenue>55</revenue>
+ </row>
+ </goals>
+ <nb_conversions>11</nb_conversions>
+ <revenue>55</revenue>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
+ <code>us</code>
+ <logo>plugins/UserCountry/images/flags/us.png</logo>
+ <segment>countryCode==us</segment>
+ <logoWidth>16</logoWidth>
+ <logoHeight>11</logoHeight>
+ </row>
<row>
<label>Unknown</label>
<nb_visits>11</nb_visits>
@@ -41,7 +65,7 @@
<nb_conversions>9</nb_conversions>
<revenue>45</revenue>
<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
<code>xx</code>
<logo>plugins/UserCountry/images/flags/xx.png</logo>
@@ -49,30 +73,6 @@
<logoWidth>16</logoWidth>
<logoHeight>11</logoHeight>
</row>
- <row>
- <label>United States</label>
- <nb_visits>10</nb_visits>
- <nb_actions>13</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>8</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>10</nb_conversions>
- <nb_visits_converted>10</nb_visits_converted>
- <revenue>50</revenue>
- </row>
- </goals>
- <nb_conversions>10</nb_conversions>
- <revenue>50</revenue>
- <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>2</sum_daily_nb_users>
- <code>us</code>
- <logo>plugins/UserCountry/images/flags/us.png</logo>
- <segment>countryCode==us</segment>
- <logoWidth>16</logoWidth>
- <logoHeight>11</logoHeight>
- </row>
<row>
<label>Brazil</label>
<nb_visits>3</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
index bdcfaeca3c2b9114de98d1e60005933232d98b91..b9f8ff9295c009f0b42598c86c60f0f6c8baf0ae 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -17,7 +17,7 @@
<nb_conversions>27</nb_conversions>
<revenue>135</revenue>
<sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>2</sum_daily_nb_users>
+ <sum_daily_nb_users>3</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
<region>xx</region>
<country>xx</country>
@@ -50,6 +50,31 @@
<region_name>Virginia</region_name>
<logo>plugins/UserCountry/images/flags/us.png</logo>
</row>
+ <row>
+ <label>New Jersey, United States</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</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>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>regionCode==NJ;countryCode==us</segment>
+ <region>NJ</region>
+ <country>us</country>
+ <country_name>United States</country_name>
+ <region_name>New Jersey</region_name>
+ <logo>plugins/UserCountry/images/flags/us.png</logo>
+ </row>
<row>
<label>Nunavut, Canada</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
index da22c13a835d69fe2d94a5b649dfa1cf4d638001..029f2ea4a7edc46f6e9552727d3c5ec0b34202e8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
@@ -2,14 +2,14 @@
<result>
<row>
<label>Unknown (xx)</label>
- <nb_visits>38</nb_visits>
- <nb_actions>45</nb_actions>
+ <nb_visits>39</nb_visits>
+ <nb_actions>46</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>551</sum_visit_length>
- <bounce_count>33</bounce_count>
- <nb_visits_converted>34</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>2</sum_daily_nb_users>
+ <bounce_count>34</bounce_count>
+ <nb_visits_converted>35</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>37</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>3</sum_daily_nb_users>
<segment>languageCode==xx</segment>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
index d2c34aab1aa5604dd51e6100ae8323a62ff9963c..5a86d88387c7ada39de93c23bd10765040491523 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
@@ -2,14 +2,14 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>38</nb_visits>
- <nb_actions>45</nb_actions>
+ <nb_visits>39</nb_visits>
+ <nb_actions>46</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>551</sum_visit_length>
- <bounce_count>33</bounce_count>
- <nb_visits_converted>34</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>2</sum_daily_nb_users>
+ <bounce_count>34</bounce_count>
+ <nb_visits_converted>35</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>37</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>3</sum_daily_nb_users>
<segment>languageCode==xx</segment>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
index b381de56d649df2b144aa1a742cb745af2ee956e..cc47ebdc6eff3be8d8e216bc780895d1457ded46 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Monday</label>
- <nb_visits>1</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_actions>1</nb_actions>
+ <nb_visits>2</nb_visits>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_actions>2</nb_actions>
<nb_users>0</nb_users>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
<day_of_week>1</day_of_week>
</row>
<row>
@@ -54,7 +54,7 @@
<nb_visits>11</nb_visits>
<nb_uniq_visitors>11</nb_uniq_visitors>
<nb_actions>14</nb_actions>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<sum_visit_length>305</sum_visit_length>
<bounce_count>9</bounce_count>
<nb_visits_converted>9</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
index e4f045cd9f842fe0d47d4c2700c0a9e5ba1f64a0..46f45bc7b393e8bd42b0a3d6acc5fe187f384559 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
@@ -146,13 +146,13 @@
</row>
<row>
<label>12h</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
+ <nb_visits>3</nb_visits>
+ <nb_actions>3</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>3</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<segment>visitLocalHour==12</segment>
</row>
@@ -189,7 +189,7 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<segment>visitLocalHour==15</segment>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
index fcc08ecee4caa54b5edf7ab52961e31b075221b9..09be75ee7402a244d091f2556496b7db777b6acd 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
@@ -191,23 +191,23 @@
</row>
<row>
<label>12h</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
+ <bounce_count>2</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<goals>
<row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>5</revenue>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>10</revenue>
</row>
</goals>
- <nb_conversions>1</nb_conversions>
- <revenue>5</revenue>
+ <nb_conversions>2</nb_conversions>
+ <revenue>10</revenue>
<segment>visitServerHour==12</segment>
</row>
<row>
@@ -252,7 +252,7 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index 43027f77b01cabd41894fdba1b772872b932611e..c39484f83daf7bb60cc4453b6467c9a343f00e41 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>New visits</label>
- <nb_visits>35</nb_visits>
+ <nb_visits>36</nb_visits>
</row>
<row>
<label>0 days</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
index a879d261b3f9c45197eacdfa628ca607e1280cea..adb58e2a56dafe112582bbd3b5081e4de796ab54 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>New visits</label>
- <nb_visits>39</nb_visits>
+ <nb_visits>40</nb_visits>
</row>
<row>
<label>0 days</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
index 221a29c2b50747d755f896fbad8f64c397b1ad6b..4eb8fddf6540b09be85e040dab6f135da5df337d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_visits>38</nb_visits>
+ <nb_visits>39</nb_visits>
<nb_visits_percentage>100%</nb_visits_percentage>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
index 11fd85a144e14da330b9012d468b90fec02fbb54..f02d54dcf50bf813109ca20ce304ac9b44ce8776 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
@@ -2,8 +2,8 @@
<result>
<row>
<label>1 visit</label>
- <nb_visits>44</nb_visits>
- <nb_visits_percentage>86%</nb_visits_percentage>
+ <nb_visits>45</nb_visits>
+ <nb_visits_percentage>87%</nb_visits_percentage>
</row>
<row>
<label>2 visits</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
index 0ca3284b5b90ebd274acce799c3d87ad6bfbce07..174a8d90d0685e2b99f3dbebd2293494a931f253 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 page</label>
- <nb_visits>33</nb_visits>
+ <nb_visits>34</nb_visits>
</row>
<row>
<label>2 pages</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
index 51ed7da2eb81af49e4d9cc3f31287f438d884535..d771a07bc9b8ecaa69171fd5a36ce98583b4ec30 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 page</label>
- <nb_visits>42</nb_visits>
+ <nb_visits>43</nb_visits>
</row>
<row>
<label>2 pages</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
index f3e2effb18aae0989254d008fb5ea64ea1988502..5809c92de9012546ac7ea714a3f89729d80759ca 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0-10s</label>
- <nb_visits>35</nb_visits>
+ <nb_visits>36</nb_visits>
</row>
<row>
<label>11-30s</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
index b62b79979b0ac4c0ccd05d1c70e11e884f094d8b..6f5a23aa2a6814e204530b9d1fc00f55ca3f367b 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0-10s</label>
- <nb_visits>45</nb_visits>
+ <nb_visits>46</nb_visits>
</row>
<row>
<label>11-30s</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
index 05473b60f6d7494e9b2ac79af579bb3a877ed99e..0e7e4e3d09acd87fee84b679b962e412779dfd0c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>45</result>
\ No newline at end of file
+<result>46</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
index 95aa700980ff79932259dbf63a2ada418cf165b8..5c61a821373deec98f78930e39ce94f861fa30e2 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>33</result>
\ No newline at end of file
+<result>34</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
index 8af80c337fce212214b9dcfe62d5beb85a63d248..51a0bb84729fdb92da5bb75688557a9e186f4c1d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>36</result>
\ No newline at end of file
+<result>37</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
index 13002b20179a7f01ad26b5afab050d0539adedf7..15ef03fb49cfea4767aa035a031e96c3b348bc93 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>2</result>
\ No newline at end of file
+<result>3</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
index 5c61a821373deec98f78930e39ce94f861fa30e2..8e4b837a6265c3a8607e7c11d3e4f394488f9fce 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>34</result>
\ No newline at end of file
+<result>35</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
index 962fbe983a7375f1b4809fc754f60711606c4f28..f24432d1a4c6e343519ab3c4a9e5e8687a0fc805 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>38</result>
\ No newline at end of file
+<result>39</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
index a71746a977d7cb65e3f8262eb0863404ab8dd3d8..94dde51493a55cd0962172b9e22d848219858501 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_uniq_visitors>36</nb_uniq_visitors>
- <nb_users>2</nb_users>
- <nb_visits>38</nb_visits>
- <nb_actions>45</nb_actions>
- <nb_visits_converted>34</nb_visits_converted>
- <bounce_count>33</bounce_count>
+ <nb_uniq_visitors>37</nb_uniq_visitors>
+ <nb_users>3</nb_users>
+ <nb_visits>39</nb_visits>
+ <nb_actions>46</nb_actions>
+ <nb_visits_converted>35</nb_visits_converted>
+ <bounce_count>34</bounce_count>
<sum_visit_length>551</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>87%</bounce_rate>
<nb_actions_per_visit>1.2</nb_actions_per_visit>
- <avg_time_on_site>15</avg_time_on_site>
+ <avg_time_on_site>14</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
index 4e4c5a220b9997563c8967db554377b6bc950ea8..94b54bf27a6b2ec2e78f92534404fcff433f576e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
@@ -3,11 +3,11 @@
<result date="2012-08">
<row>
<label>Piwik test</label>
- <nb_visits>38</nb_visits>
- <nb_actions>45</nb_actions>
- <nb_pageviews>39</nb_pageviews>
- <revenue>170</revenue>
- <nb_conversions>34</nb_conversions>
+ <nb_visits>39</nb_visits>
+ <nb_actions>46</nb_actions>
+ <nb_pageviews>40</nb_pageviews>
+ <revenue>175</revenue>
+ <nb_conversions>35</nb_conversions>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
@@ -59,8 +59,8 @@
<revenue>5</revenue>
<nb_conversions>1</nb_conversions>
<visits_evolution>-97.4%</visits_evolution>
- <actions_evolution>-77.8%</actions_evolution>
- <pageviews_evolution>-74.4%</pageviews_evolution>
+ <actions_evolution>-78.3%</actions_evolution>
+ <pageviews_evolution>-75%</pageviews_evolution>
<revenue_evolution>-97.1%</revenue_evolution>
<nb_conversions_evolution>-97.1%</nb_conversions_evolution>
<idsite>1</idsite>
diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
index 411d2a2eb9cf57186f4930b2d3269b513442a711..086e95965fa57de54e736907b3385a0f972585e7 100644
--- a/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
@@ -10,6 +10,7 @@
<sum_visit_length>1441</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerName==Google;referrerType==search;referrerKeyword==%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</segment>
<url>http://google.com/search?q=%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</url>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
index afffc60a48240da5d0c60b72e9442bce17f3c314..79f1fd371ff58c959a3d7b1c1de866edbd6462d8 100644
--- a/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
@@ -14,7 +14,7 @@
<entry_nb_actions>9</entry_nb_actions>
<entry_sum_visit_length>1441</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>1116</avg_time_on_page>
+ <avg_time_on_page>279</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.626</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml
index 008d9e87fbaf34a69b1132acbae1592defa17709..8b29b241d3812253b23519f8682a57d982be3abe 100644
--- a/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml
@@ -9,7 +9,7 @@
<nb_hits_following_search>2</nb_hits_following_search>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml
index 8b154c93349f97b58ebe46db91b448bbe8a4e9fe..4cf37854e33da56206057435c1741bdd562679e1 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml
@@ -10,5 +10,6 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
+ <segment>deviceBrand==Unknown</segment>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml
index deb88da799d7840a0a78116d88379f03b47df360..fd2de07373859363120505395f96c9ca22bf53ee 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml
@@ -17,6 +17,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1</revenue>
+ <segment>referrerType==search</segment>
<subtable>
<row>
<label>purchase</label>
@@ -55,6 +56,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>42</revenue>
+ <segment>referrerType==website</segment>
<subtable>
<row>
<label>referrer.com</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml
index 8ff05bc8ffcc0453c94a2dce16d098510397cb0c..a6ccba6e7451f0e28415fa291476d948ecbac7fd 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml
@@ -11,5 +11,6 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
+ <segment>deviceBrand==Unknown</segment>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml
index 2225e62fa0559dd3a2bc1a923a213ec57f4e166c..e4b6ce2e005bbf94bda1a6cf1841c65cd0c1f88f 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml
@@ -18,6 +18,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1</revenue>
+ <segment>referrerType==search</segment>
<subtable>
<row>
<label>purchase</label>
@@ -58,6 +59,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>42</revenue>
+ <segment>referrerType==website</segment>
<subtable>
<row>
<label>referrer.com</label>
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 e00992d683a09fa362817af837d4a5e567390dda..8d118edb9a1c5c75f5a99da879c1c400d1bc3d0f 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
@@ -113,8 +113,8 @@
<pageIdAction>2</pageIdAction>
<pageId>1</pageId>
- <timeSpent>1080</timeSpent>
- <timeSpentPretty>18 min 0s</timeSpentPretty>
+ <timeSpent>1084</timeSpent>
+ <timeSpentPretty>18 min 4s</timeSpentPretty>
<icon />
</row>
diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml
index 3b8bde90651c6e3d13acab2a91164510d46c001d..34447b169add6dbc11842f8e5b1ffaa00e7b2fc1 100644
--- a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml
@@ -249,7 +249,7 @@
<change>-100%</change>
</nb_visits_1>
<nb_visits_2>
- <name>Google - justice )(&^#%$ not &#039;" corruption! (Visits)</name>
+ <name>Google - justice )(&^#%$ not &#039;" corruption! (Visits)</name>
<min>0</min>
<max>1</max>
</nb_visits_2>
diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
index d97e75695cbe99d309f2c44f9c4668cd5f862896..a0555e1b4ac45dbe4b33c6577f9da9e760cb6f21 100644
--- a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
@@ -14,7 +14,7 @@
<logo>plugins/Referrers/images/searchEngines/google.com.png</logo>
</row>
<row>
- <label>Google - justice )(&^#%$ not &#039;" corruption!</label>
+ <label>Google - justice )(&^#%$ not &#039;" corruption!</label>
<nb_visits>8</nb_visits>
<nb_actions>8</nb_actions>
<max_actions>1</max_actions>
diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml
index 5730859763b7c7400f5ca150f7aafed36e714969..10f622eddabae0db3740f467c266e6cb8a1ecede 100644
--- a/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml
@@ -33,7 +33,7 @@
<change>-100%</change>
</nb_visits_0>
<nb_visits_1>
- <name>justice )(&^#%$ not &#039;" corruption! (Visits)</name>
+ <name>justice )(&^#%$ not &#039;" corruption! (Visits)</name>
<min>0</min>
<max>8</max>
<change>-100%</change>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
index 4d574d9da9ed47cdb3215989c26018b36341e33c..3808a4f5b5ed5958c2119cfa5c02b7209480fff3 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
@@ -75,7 +75,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:03:36</avg_time_on_page>
+ <avg_time_on_page>00:01:48</avg_time_on_page>
<exit_rate>0%</exit_rate>
</row>
</result>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
index 2c17c634526416ce82b9bbf0bba0f46e5bc55f4d..f88c7b0657fd726f5862b8686258b49f73721014 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
@@ -75,7 +75,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:03:36</avg_time_on_page>
+ <avg_time_on_page>00:01:48</avg_time_on_page>
<exit_rate>0%</exit_rate>
</row>
</result>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
index e500a0aeef433edab3fa63d773b2be7e0c3453dd..9987853e36507a788d03f06b41a82dbb04632fd0 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
@@ -63,7 +63,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:03:36</avg_time_on_page>
+ <avg_time_on_page>00:01:48</avg_time_on_page>
<exit_rate>0%</exit_rate>
</row>
</result>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
index 0db09dbb26d457f7f784a42eca05ed77a48c4953..062f55e0fd63c646fcad7f2f00570321822433d0 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
@@ -63,7 +63,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:03:36</avg_time_on_page>
+ <avg_time_on_page>00:01:48</avg_time_on_page>
<exit_rate>0%</exit_rate>
</row>
</result>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
index 7ea5167dfd336321ad12a7418407a3a98cee1070..fe61ab5004c86b81826461ff05031e96f758a050 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
@@ -20,7 +20,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
index 86ae401b608af7e8f4273b331039bdd9d1322496..e49e07c8a2c06548b4f22c32cba9fde91d11c3dd 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
@@ -20,7 +20,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
index 9dc49472a772529aca11429710c8a7a84079396b..5bc8b63f86ae46fca0eabcb6b74af0cf86f1c1cf 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
@@ -32,7 +32,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
index d9462f0f36479c39c41ead37ca2a8bc88326be43..c4d37d733ed50d7855e7ba9f59c6448c28f7b1aa 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
@@ -32,7 +32,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
index 74ece58337ed89f8d879d432f2d2c2896e835468..8cdba28f3b87f4e977807a718566e10b2b0fc326 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
@@ -21,7 +21,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
index 1c66040802fc6f6c1c76575063e5ce8e3b7400f0..2dda15648dfc63e09381c1420293ad00ec5629c0 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
@@ -21,7 +21,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
index b001f1be2967ee669808e0632c32215f0ed6c891..2939c4da2be0225c4e9df75801dcd716380dbb86 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
@@ -36,7 +36,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
index ddae944352cf89a264c621dc5468741575ab7e89..5c9107743f9e5305886a95499e376e6e3535b0ee 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
@@ -36,7 +36,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
index 4798b08e6e9a62ecdc4adde6ef9174ac7eb468e1..4567e228f77c69a4917e3fba2c4487681c858502 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
@@ -8,7 +8,7 @@
<nb_hits>6</nb_hits>
<sum_time_spent>468</sum_time_spent>
<nb_pages_per_search>3</nb_pages_per_search>
- <avg_time_on_page>234</avg_time_on_page>
+ <avg_time_on_page>78</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
@@ -52,7 +52,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>54</sum_time_spent>
<nb_pages_per_search>2</nb_pages_per_search>
- <avg_time_on_page>54</avg_time_on_page>
+ <avg_time_on_page>27</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
index 5b6e7c4828f14d3f4d17e7e4a210d943794bc03f..26e6e57fdf533af6b3d105df5813da290c171490 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
@@ -18,7 +18,7 @@
<nb_hits>6</nb_hits>
<sum_time_spent>468</sum_time_spent>
<nb_pages_per_search>3</nb_pages_per_search>
- <avg_time_on_page>234</avg_time_on_page>
+ <avg_time_on_page>78</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
@@ -50,7 +50,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>54</sum_time_spent>
<nb_pages_per_search>2</nb_pages_per_search>
- <avg_time_on_page>54</avg_time_on_page>
+ <avg_time_on_page>27</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
index 66f8e8a41db4c36a912c53cec42590d8b3206d0a..b28a8b9c15306a079b02c84c980c1bdbcb4b5638 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
@@ -18,7 +18,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
index 450ab9b87a21e5bd586e842e68267c7cd39a89f1..6bcdb7bac8f6284c15cc1909d013233cd0bfb209 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
@@ -18,7 +18,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
index 200b1c35651a2b4e5bcf851369347c7dd0b0f432..68d4794fb7cc74bfcbd59a7de2e628e04a7e3577 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
@@ -30,7 +30,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
index 3adcd2fca870261603fdaf572c1ec1b378a3b7af..5b7c76e1607c2e92e380e9d96ec319c828297198 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
@@ -30,7 +30,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
index 3fbf138c64b5d42c21c5dc2af4768bd689113ee2..be73f3d714d7a5ea0faefbc3eb1180b74bf52d29 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
@@ -19,7 +19,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
index 77a97cfa0b5827d7997506e9a7faa0f4f67954c0..336ef8382f07680629d5b913aef9a6777ecf4aed 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
@@ -19,7 +19,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
index 5617717b0d76d9db4d92a595c27ecdd844d6eba2..0c49416b27e1958ffe395abf01d5ca07193ac761 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
@@ -34,7 +34,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
index 12b4aea3adbc7f600114d9a8ced5c03524bcad09..cd21527e109e01d526e599613a70c513c5086a2f 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
@@ -34,7 +34,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml
index 588feafeea9df820d64cef1d9d3dc09af3f503db..7059d2638a2106287414c1dffe778b13c46c4112 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml
@@ -6,7 +6,7 @@
<nb_hits>6</nb_hits>
<sum_time_spent>468</sum_time_spent>
<nb_pages_per_search>3</nb_pages_per_search>
- <avg_time_on_page>234</avg_time_on_page>
+ <avg_time_on_page>78</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
index 3e1015bd31a00b8b590eb85947281aee7053acd4..6cd43051cbe696ad264b71fbd23527255dc47dd4 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
@@ -16,7 +16,7 @@
<nb_hits>6</nb_hits>
<sum_time_spent>468</sum_time_spent>
<nb_pages_per_search>3</nb_pages_per_search>
- <avg_time_on_page>234</avg_time_on_page>
+ <avg_time_on_page>78</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
@@ -48,7 +48,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>54</sum_time_spent>
<nb_pages_per_search>2</nb_pages_per_search>
- <avg_time_on_page>54</avg_time_on_page>
+ <avg_time_on_page>27</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
index a5ea296b53e458e50795bcd828bce9fd766373ac..207e2159fcf85ea7006e939526f8e3162cc2bf52 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
@@ -89,7 +89,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:06:00</avg_time_on_page>
+ <avg_time_on_page>00:03:00</avg_time_on_page>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.31s</avg_time_generation>
</row>
@@ -118,7 +118,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:06:00</avg_time_on_page>
+ <avg_time_on_page>00:03:00</avg_time_on_page>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.31s</avg_time_generation>
</row>
@@ -147,7 +147,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:06:00</avg_time_on_page>
+ <avg_time_on_page>00:03:00</avg_time_on_page>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.31s</avg_time_generation>
</row>
@@ -176,7 +176,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:06:00</avg_time_on_page>
+ <avg_time_on_page>00:03:00</avg_time_on_page>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.31s</avg_time_generation>
</row>
@@ -205,7 +205,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:06:00</avg_time_on_page>
+ <avg_time_on_page>00:03:00</avg_time_on_page>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.31s</avg_time_generation>
</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
index c67d91399b7fccf73275dcee14a4ce79e01a4be0..57f0b1452f0bb9fa6fc8fa10d565bbfb48f02efc 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
@@ -99,7 +99,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -155,7 +155,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -211,7 +211,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -267,7 +267,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -323,7 +323,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
index 08d1c90f9a2bed38146a0468f1933e10e8d5f542..de92713eae586dfc6db9467e73c643aeb6c7d4a8 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
@@ -51,7 +51,7 @@
<exit_nb_visits>8</exit_nb_visits>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
index fc853136906fe72192eba7edb642dede09d1fc8b..e7008c40ff7a20830a2e258171ff140ec60615e9 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
@@ -97,7 +97,7 @@
<exit_nb_visits>6</exit_nb_visits>
<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>6</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -138,7 +138,7 @@
<exit_nb_visits>2</exit_nb_visits>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
index 0d0f6aaca81a2a450e6fb66e4a03abe48aa3d2c7..9cb3a82c02d0909811519dfdd2a82f61893dcccf 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
@@ -51,7 +51,7 @@
<exit_nb_visits>8</exit_nb_visits>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
index 4087b624e23560b55f9eda1228fdc9060bb6a340..f7e7161700997315d8ba5db108f38138d0b2789f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
@@ -98,7 +98,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -154,7 +154,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -210,7 +210,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -266,7 +266,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -322,7 +322,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
index 6e13a1e872cf5c2b92cf4a2becbc65bf47c76cd6..e68d67ec347379b9f893e9bfac2de76c6bdd9bc1 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
@@ -50,7 +50,7 @@
<exit_nb_visits>8</exit_nb_visits>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
index 8366107a19cafdf73b3be8a9ffb025b0e7a9f90e..6f28680dc3fce94d27124acdbb5674a6558edc44 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
@@ -96,7 +96,7 @@
<exit_nb_visits>6</exit_nb_visits>
<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>6</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -137,7 +137,7 @@
<exit_nb_visits>2</exit_nb_visits>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
index fb02cf8629176711dffadd1ce1c7a3c2ca736595..266832e5907e14988a205f4bb42bf45bbae5e2d4 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
@@ -50,7 +50,7 @@
<exit_nb_visits>8</exit_nb_visits>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
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 f0e58ae957ecb313d5b2de2d785c29accbf0267a..94a3e0f6fb6ae4f89e6aa6c0a437842450c509e5 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
@@ -236,7 +236,7 @@ Page URLs
label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation
/index.htm,9,9,11%,00:05:20,11%,0.3s
Page URL not defined,9,17,0%,00:00:00,0%,0.22s
-/thankyou,8,16,0%,00:06:00,100%,0.31s
+/thankyou,8,16,0%,00:03:00,100%,0.31s
/products,1,1,100%,00:00:00,100%,0.15s
Entry pages
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 fe254e07939250ea8f3dacc63bea85905d10e887..95c67bf1c7f17ea8d7010cdb06a3f09bb67d97ea 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
@@ -4099,7 +4099,7 @@
8
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:06:00
+ 00:03:00
</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_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml
index 667ec31507e9e3aa21de1f07ccc1dccc8566ec49..275f1a4987b3b9f56318290a15395caf628d2fd3 100644
--- a/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml
@@ -10,7 +10,7 @@
<entry_sum_visit_length>2161</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>630</avg_time_on_page>
+ <avg_time_on_page>420</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>25%</exit_rate>
<subtable>
@@ -25,7 +25,7 @@
<entry_nb_actions>8</entry_nb_actions>
<entry_sum_visit_length>2161</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>1080</avg_time_on_page>
+ <avg_time_on_page>540</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/foo/bar.html</url>
@@ -36,7 +36,7 @@
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
<sum_time_spent>720</sum_time_spent>
- <avg_time_on_page>720</avg_time_on_page>
+ <avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>https://www.example.org/foo/bar2.html</url>
diff --git a/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml
index 2d5f40e9cba817e15656940c5c932c10ec1dee20..1dd8c3190c4a47cfb38f87fbf6eb69d9d4cc25d6 100644
--- a/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml
@@ -5,7 +5,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<sum_time_spent>360</sum_time_spent>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<subtable>
@@ -15,7 +15,7 @@
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
<sum_time_spent>360</sum_time_spent>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>https://www.example.org/foo/bar2.html</url>
diff --git a/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml
index 0549176cb67d03dcb0607d4b67203c2fd7a763cf..504018b6cd2124a07f076888cff3c6e1184cc466 100644
--- a/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml
@@ -89,7 +89,7 @@
<sum_time_spent>720</sum_time_spent>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>720</avg_time_on_page>
+ <avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml
index 667ec31507e9e3aa21de1f07ccc1dccc8566ec49..275f1a4987b3b9f56318290a15395caf628d2fd3 100644
--- a/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml
@@ -10,7 +10,7 @@
<entry_sum_visit_length>2161</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>630</avg_time_on_page>
+ <avg_time_on_page>420</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>25%</exit_rate>
<subtable>
@@ -25,7 +25,7 @@
<entry_nb_actions>8</entry_nb_actions>
<entry_sum_visit_length>2161</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>1080</avg_time_on_page>
+ <avg_time_on_page>540</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/foo/bar.html</url>
@@ -36,7 +36,7 @@
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
<sum_time_spent>720</sum_time_spent>
- <avg_time_on_page>720</avg_time_on_page>
+ <avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>https://www.example.org/foo/bar2.html</url>
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 b83a3d071dca1b71f038f9c788871ca8b02fa37a..ed2500e1255dbe39c177bbdd72f87cefa446e9ed 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
@@ -154,8 +154,8 @@
<pageIdAction>10</pageIdAction>
<serverTimePretty>Mar 6, 2010 16:28:33</serverTimePretty>
<pageId>9</pageId>
- <timeSpent>720</timeSpent>
- <timeSpentPretty>12 min 0s</timeSpentPretty>
+ <timeSpent>721</timeSpent>
+ <timeSpentPretty>12 min 1s</timeSpentPretty>
<icon />
<timestamp>1267892913</timestamp>
</row>
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml
index cd12df23f8e2c107790067bd80fe6691b9591654..4201ab7dd31b9183a1c8bf1ff411c50e7070c0f1 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml
@@ -11,7 +11,7 @@
<entry_sum_visit_length>361</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>120</avg_time_on_page>
+ <avg_time_on_page>72</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>33%</exit_rate>
<subtable>
@@ -50,7 +50,7 @@
<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_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<url>http://example.org/category/Pageyy</url>
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
index cd12df23f8e2c107790067bd80fe6691b9591654..4201ab7dd31b9183a1c8bf1ff411c50e7070c0f1 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
@@ -11,7 +11,7 @@
<entry_sum_visit_length>361</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>120</avg_time_on_page>
+ <avg_time_on_page>72</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>33%</exit_rate>
<subtable>
@@ -50,7 +50,7 @@
<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_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<url>http://example.org/category/Pageyy</url>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
index 1a9ff120e6dfa161edabdd654dde4fc08b7240a7..9ba63305645b963d29d5da773a5492a602b5004c 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
@@ -66,13 +66,6 @@
<acceptedValues>13.54.122.1. </code>Select IP ranges with notation: <code>visitIp>13.54.122.0;visitIp<13.54.122.255</acceptedValues>
<permission>1</permission>
</row>
- <row>
- <type>metric</type>
- <category>Actions</category>
- <name>Action Type</name>
- <segment>actionType</segment>
- <acceptedValues>A type of action, such as: pageviews, contents, sitesearches, events, outlinks, downloads</acceptedValues>
- </row>
<row>
<type>dimension</type>
<category>Visit Location</category>
@@ -144,6 +137,13 @@
<segment>browserVersion</segment>
<acceptedValues>1.0, 8.0, etc.</acceptedValues>
</row>
+ <row>
+ <type>dimension</type>
+ <category>Visit</category>
+ <name>Device brand</name>
+ <segment>deviceBrand</segment>
+ <acceptedValues>3Q, Acer, Ainol, Airness, Alcatel, Allview, Altech UEC, Arnova, Amazon, Amoi, Apple, Archos, ARRIS, Airties, Asus, Avvio, Audiovox, Axxion, BBK, Becker, Bird, Beetel, Bmobile, Barnes & Noble, BangOlufsen, BenQ, BenQ-Siemens, Blu, Boway, bq, Brondi, Bush, CUBOT, Carrefour, Captiva, Casio, Cat, Celkon, ConCorde, Changhong, Cherry Mobile, Cricket, Crosscall, Compal, CnM, Crius Mea, CreNova, Capitel, Compaq, Coolpad, Cowon, Cube, Coby Kyros, Danew, Datang, Denver, Desay, Dbtel, DoCoMo, Dicam, Dell, DMM, Doogee, Doov, Dopod, Dune HD, E-Boda, EBEST, Ericsson, ECS, Ezio, Elephone, Easypix, Energy Sistem, Ericy, Eton, eTouch, Evertek, Ezze, Fly, Foxconn, Fujitsu, Garmin-Asus, Gateway, Gemini, Gionee, Gigabyte, Gigaset, GOCLEVER, Goly, Google, Gradiente, Grundig, Haier, Hasee, Hisense, Hi-Level, Hosin, HP, HTC, Huawei, Humax, Hyrican, Hyundai, Ikea, iBall, i-Joy, iBerry, iKoMo, i-mate, iOcean, Infinix, Innostream, Inkti, Intex, i-mobile, INQ, Intek, Inverto, iTel, Jiayu, Jolla, Karbonn, KDDI, Kingsun, Konka, Komu, Koobee, K-Touch, KT-Tech, KOPO, Koridy, Kumai, Kyocera, Kazam, Lava, Lanix, LCT, Lenovo, Lenco, Le Pan, LG, Lingwin, Loewe, Logicom, Lexibook, Majestic, Manta Multimedia, Mobistel, Mecer, Medion, MEEG, Meizu, Metz, MEU, MicroMax, Mediacom, MediaTek, Mio, Mpman, Mofut, Motorola, Microsoft, MSI, Memup, Mitsubishi, MLLED, M.T.T., MyPhone, NEC, Netgear, NGM, Nintendo, Noain, Nokia, Nomi, Nikon, Newgen, Nexian, NextBook, Onda, OnePlus, OPPO, Orange, O2, Ouki, OUYA, Opsson, Panasonic, PEAQ, Philips, Polaroid, Palm, phoneOne, Pantech, Point of View, PolyPad, Pomp, Positivo, Prestigio, ProScan, PULID, Qilive, Qtek, QMobile, Quechua, Overmax, Oysters, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Roku, Rover, Samsung, Sega, Sony Ericsson, Sencor, Softbank, SFR, Sagem, Sharp, Siemens, Sendo, Skyworth, Smartfren, Sony, Spice, SuperSonic, Selevision, Sanyo, Symphony, Smart, Star, Storex, Stonex, SunVan, Sumvision, Tesla, TCL, Telit, ThL, TiPhone, Tecno Mobile, Tesco, TIANYU, Telefunken, Telenor, T-Mobile, Thomson, Tolino, Toplux, Toshiba, TechnoTrend, Trevi, Tunisie Telecom, Turbo-X, TVC, TechniSat, teXet, Unowhy, Uniscope, UTStarcom, Vastking, Videocon, Vertu, Vitelcom, VK Mobile, ViewSonic, Vestel, Vivo, Voto, Voxtel, Vodafone, Vizio, Videoweb, Walton, Web TV, WellcoM, Wexler, Wiko, Wolder, Wonu, Woxter, Xiaomi, Xolo, Unknown, Yarvik, Yuandao, Yusun, Ytone, Zeemi, Zonda, Zopo, ZTE</acceptedValues>
+ </row>
<row>
<type>dimension</type>
<category>Visit</category>
@@ -222,7 +222,7 @@
<category>Visit</category>
<name>Visit ID</name>
<segment>visitId</segment>
- <acceptedValues>Any integer. </acceptedValues>
+ <acceptedValues>Any integer.</acceptedValues>
<permission>1</permission>
</row>
<row>
@@ -480,6 +480,13 @@
<name>Custom Variable value 5 (scope visit)</name>
<segment>customVariableValue5</segment>
</row>
+ <row>
+ <type>dimension</type>
+ <category>Actions</category>
+ <name>Action Type</name>
+ <segment>actionType</segment>
+ <acceptedValues>A type of action, such as: pageviews, contents, sitesearches, events, outlinks, downloads</acceptedValues>
+ </row>
<row>
<type>dimension</type>
<category>Actions</category>
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 f6d30fd9ba7e6569086ad54d19737a96f77ca637..5b19eea90fa7b84bede6e944afb9142585238a2a 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
@@ -226,8 +226,8 @@
<customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5>
</row>
</customVariables>
- <timeSpent>360</timeSpent>
- <timeSpentPretty>6 min 0s</timeSpentPretty>
+ <timeSpent>361</timeSpent>
+ <timeSpentPretty>6 min 1s</timeSpentPretty>
<icon />
</row>
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 730c0fc1a4449bd9c4c1e6183aa2279002611a65..d391947a564fc13c240d83463cbed1993c706b6c 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -87,8 +87,8 @@
<customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5>
</row>
</customVariables>
- <timeSpent>360</timeSpent>
- <timeSpentPretty>6 min 0s</timeSpentPretty>
+ <timeSpent>361</timeSpent>
+ <timeSpentPretty>6 min 1s</timeSpentPretty>
<icon />
</row>
@@ -430,8 +430,8 @@
<customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5>
</row>
</customVariables>
- <timeSpent>360</timeSpent>
- <timeSpentPretty>6 min 0s</timeSpentPretty>
+ <timeSpent>361</timeSpent>
+ <timeSpentPretty>6 min 1s</timeSpentPretty>
<icon />
</row>
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 50eeb9cc0e95af1d3b3eb4f64cfb52a97a4f78a8..c13ba3af2728c1d7193426c189dd01ae52097369 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
@@ -224,7 +224,7 @@ Sunday,0,0%,0,00:00:00,0%,0
Page URLs
label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate
-/index.htm,4,16,0%,00:13:30,100%
+/index.htm,4,16,0%,00:03:23,100%
Entry pages
label,entry_nb_visits,entry_bounce_count,bounce_rate
@@ -236,7 +236,7 @@ label,nb_visits,exit_nb_visits,exit_rate
Page titles
label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate
- View product left in cart,3,9,0%,00:06:00,100%
+ View product left in cart,3,9,0%,00:02:00,100%
Another Product page,1,1,0%,00:06:00,0%
Another Product page with multiple categories,1,1,0%,00:00:00,100%
Another Product page with no category,1,1,0%,00:00:00,0%
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 b2825b88eef819e3bd3937427c7ca8444b8045d7..7f70fb99c1aee5eb3ccb0b442c0a17b2b82c1d1f 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
@@ -3894,7 +3894,7 @@
4
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:13:30
+ 00:03:23
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
0%
@@ -4036,7 +4036,7 @@
3
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:06:00
+ 00:02:00
</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_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml
index 2b521b00a42a5a333427ad90286c0715ff094d55..1ed4db4a841ad86083a30688fcc9e55ba5c59b9e 100644
--- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml
@@ -10,6 +10,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ffacebook.com%2Fwhatever</segment>
<url>http://facebook.com/whatever</url>
</row>
<row>
@@ -22,6 +23,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ffb.me%2F%3Fq%3Dsdlfjs%26n%3Dslfjsd</segment>
<url>http://fb.me/?q=sdlfjs&n=slfjsd</url>
</row>
<row>
@@ -34,6 +36,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fwww.facebook.com%2Fanother%2Fpath</segment>
<url>http://www.facebook.com/another/path</url>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml
index 4649b78a18d7c3cd032319c281d5ca2436bbcce8..d85c6fa7fa4bebb3f7dcea2cac68729b06a4ad6a 100644
--- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml
@@ -11,6 +11,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ffacebook.com%2Fwhatever</segment>
<url>http://facebook.com/whatever</url>
</row>
<row>
@@ -23,6 +24,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ffb.me%2F%3Fq%3Dsdlfjs%26n%3Dslfjsd</segment>
<url>http://fb.me/?q=sdlfjs&n=slfjsd</url>
</row>
<row>
@@ -35,6 +37,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fmixi.jp</segment>
<url>http://mixi.jp</url>
</row>
<row>
@@ -47,6 +50,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fskyrock.com</segment>
<url>http://skyrock.com</url>
</row>
<row>
@@ -59,6 +63,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ft.co%2Fid%2F%3Fy%3Ddsfs</segment>
<url>http://t.co/id/?y=dsfs</url>
</row>
<row>
@@ -71,6 +76,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ftwitter.com%2Fwhatever2</segment>
<url>http://twitter.com/whatever2</url>
</row>
<row>
@@ -83,6 +89,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fwww.facebook.com%2Fanother%2Fpath</segment>
<url>http://www.facebook.com/another/path</url>
</row>
<row>
@@ -95,6 +102,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fwww.flickr.com</segment>
<url>http://www.flickr.com</url>
</row>
<row>
@@ -107,6 +115,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fwww.twitter.com%2Findex%3Fa%3D2334</segment>
<url>http://www.twitter.com/index?a=2334</url>
</row>
<row>
@@ -119,6 +128,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fxanga.com</segment>
<url>http://xanga.com</url>
</row>
</result>
@@ -133,6 +143,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ft.co%2Fid%2F%3Fy%3Ddsfs</segment>
<url>http://t.co/id/?y=dsfs</url>
</row>
<row>
@@ -145,6 +156,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ftwitter.com%2Fwhatever2</segment>
<url>http://twitter.com/whatever2</url>
</row>
<row>
@@ -157,6 +169,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fwww.facebook.com%2Fanother%2Fpath</segment>
<url>http://www.facebook.com/another/path</url>
</row>
</result>
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 ad8e93fed436865940ec64e52cb235e9b3c1a444..f15526855b8c71ef9b1b793b7ad7df92a9fe6774 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
@@ -3,7 +3,11 @@
<totalVisits>2</totalVisits>
<totalVisitDuration>361</totalVisitDuration>
<totalActions>2</totalActions>
+ <totalEvents>0</totalEvents>
+ <totalOutlinks>1</totalOutlinks>
+ <totalDownloads>0</totalDownloads>
<totalSearches>0</totalSearches>
+ <totalPageViews>1</totalPageViews>
<totalPageViewsWithTiming>0</totalPageViewsWithTiming>
<totalGoalConversions>1</totalGoalConversions>
<totalConversionsByGoal>
@@ -34,14 +38,14 @@
<firstVisit>
- <daysAgo>0</daysAgo>
+
<referrerType>campaign</referrerType>
<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
</firstVisit>
<lastVisit>
- <daysAgo>0</daysAgo>
+
<referrerType>campaign</referrerType>
<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
</lastVisit>
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 ad8e93fed436865940ec64e52cb235e9b3c1a444..f15526855b8c71ef9b1b793b7ad7df92a9fe6774 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
@@ -3,7 +3,11 @@
<totalVisits>2</totalVisits>
<totalVisitDuration>361</totalVisitDuration>
<totalActions>2</totalActions>
+ <totalEvents>0</totalEvents>
+ <totalOutlinks>1</totalOutlinks>
+ <totalDownloads>0</totalDownloads>
<totalSearches>0</totalSearches>
+ <totalPageViews>1</totalPageViews>
<totalPageViewsWithTiming>0</totalPageViewsWithTiming>
<totalGoalConversions>1</totalGoalConversions>
<totalConversionsByGoal>
@@ -34,14 +38,14 @@
<firstVisit>
- <daysAgo>0</daysAgo>
+
<referrerType>campaign</referrerType>
<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
</firstVisit>
<lastVisit>
- <daysAgo>0</daysAgo>
+
<referrerType>campaign</referrerType>
<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
</lastVisit>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
index 1cecf663959fb7850e21ec80e948bba50c591551..61f5ff50c587540cbad52e985337c951b6ac0658 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
@@ -10,6 +10,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>55</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==direct</segment>
</row>
<row>
<label>Search Engines</label>
@@ -21,6 +22,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>12</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==search</segment>
<subtable>
<row>
<label>search term 2</label>
@@ -67,6 +69,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>8</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==website</segment>
<subtable>
<row>
<label>whatever0.com</label>
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 4f21289bfd697041b1a8efac99fd2dee1b97d1a4..d8646a11f5429368c4fd8b57fe4da9624fb526aa 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
@@ -10,6 +10,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>55</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==direct</segment>
</row>
<row>
<label>Search Engines - Others</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
index 1cecf663959fb7850e21ec80e948bba50c591551..61f5ff50c587540cbad52e985337c951b6ac0658 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
@@ -10,6 +10,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>55</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==direct</segment>
</row>
<row>
<label>Search Engines</label>
@@ -21,6 +22,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>12</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==search</segment>
<subtable>
<row>
<label>search term 2</label>
@@ -67,6 +69,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>8</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==website</segment>
<subtable>
<row>
<label>whatever0.com</label>
diff --git a/tests/PHPUnit/Unit/Period/DayTest.php b/tests/PHPUnit/Unit/Period/DayTest.php
index acc4992b1d5bbe10c11ca0ded9f3900e878b40ea..806dc5365868b01af38c7f21b7d2c401fff25c7f 100644
--- a/tests/PHPUnit/Unit/Period/DayTest.php
+++ b/tests/PHPUnit/Unit/Period/DayTest.php
@@ -217,6 +217,7 @@ class DayTest extends BasePeriodTest
return array(
array('en', 'Wed, Oct 9'),
array('lt', '10-09, Tr'),
+ array('ru', 'Ср, 9 Окт.'),
array('zh-cn', '10月9日周三'),
);
}
diff --git a/tests/PHPUnit/Unit/UrlTest.php b/tests/PHPUnit/Unit/UrlTest.php
index 3153e43accfce6b53243c9b43c86109276ef21ce..6f9c50d614ff38918fa84c54cdbed6349ca133e4 100644
--- a/tests/PHPUnit/Unit/UrlTest.php
+++ b/tests/PHPUnit/Unit/UrlTest.php
@@ -13,12 +13,10 @@ use Piwik\Url;
/**
* @backupGlobals enabled
+ * @group Core
*/
class UrlTest extends \PHPUnit_Framework_TestCase
{
- /**
- * @group Core
- */
public function testAllMethods()
{
$this->assertEquals(Url::getCurrentQueryStringWithParametersModified(array()), Url::getCurrentQueryString());
@@ -63,7 +61,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider getCurrentHosts
- * @group Core
*/
public function testGetCurrentHost($description, $test)
{
@@ -131,9 +128,31 @@ class UrlTest extends \PHPUnit_Framework_TestCase
);
}
+ /**
+ * @dataProvider getIsLocalHost
+ */
+ public function test_isLocalHost($expectedIsLocal, $host)
+ {
+ $this->assertSame($expectedIsLocal, Url::isLocalHost($host));
+ }
+
+ public function getIsLocalHost()
+ {
+ return array(
+ array($isLocal = false, '127.0.0.2'),
+ array($isLocal = false, '192.168.1.1'),
+ array($isLocal = false, '10.1.1.1'),
+ array($isLocal = false, '172.30.1.1'),
+
+ array($isLocal = true, 'localhost'),
+ array($isLocal = true, '127.0.0.1'),
+ array($isLocal = true, '::1'),
+ array($isLocal = true, '[::1]'),
+ );
+ }
+
/**
* @dataProvider getLocalUrls
- * @group Core
*/
public function testIsLocalUrl($httphost, $scripturi, $requesturi, $testurl, $result)
{
@@ -161,7 +180,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider getCurrentUrlWithoutFilename
- * @group Core
*/
public function testGetCurrentUrlWithoutFilename($expected, $https, $host, $path)
{
@@ -182,9 +200,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $url);
}
- /**
- * @group Core
- */
public function test_getCurrentScriptName()
{
$this->resetGlobalVariables();
@@ -238,7 +253,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider getValidHostData
- * @group Core
*/
public function testIsValidHost($expected, $host, $trustedHosts, $description)
{
@@ -247,9 +261,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, Url::isValidHost($host), $description);
}
- /**
- * @group Core
- */
public function testGetReferrer()
{
$_SERVER['HTTP_REFERER'] = 'http://www.piwik.org';
@@ -257,8 +268,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
}
/**
- * @group Core
- *
* @dataProvider getQueryParameters
*/
public function testGetQueryStringFromParameters($params, $queryString)
@@ -281,8 +290,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
}
/**
- * @group Core
- *
* @dataProvider getHostsFromUrl
*/
public function testGetHostsFromUrl($url, $expectedHost)
@@ -304,8 +311,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
}
/**
- * @group Core
- *
* @dataProvider getIsHostInUrls
*/
public function testIsHostInUrlsl($isHost, $host, $urls)
@@ -348,7 +353,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
}
/**
- * @group Core
* @dataProvider urlProvider
*/
public function testGetCurrentUrl($url, $pathInfo = null)
@@ -372,7 +376,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
}
/**
- * @group Core
* @dataProvider urlWithoutQueryStringProvider
*/
public function testGetCurrentUrlWithoutQueryString($url, $expected, $pathInfo = null)
@@ -387,7 +390,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
* Tests a use case that was reported by some users: Nginx is not properly configured and passes
* incorrect PATH_INFO values in $_SERVER.
* @link https://github.com/piwik/piwik/issues/6491
- * @group Core
*/
public function testMisconfiguredNginxPathInfo()
{
diff --git a/tests/PHPUnit/config.ini.travis.php b/tests/PHPUnit/config.ini.travis.php
deleted file mode 100644
index 0261a631e2094b99a97f5a35cd7313a84c65d48f..0000000000000000000000000000000000000000
--- a/tests/PHPUnit/config.ini.travis.php
+++ /dev/null
@@ -1,33 +0,0 @@
-; <?php exit; ?> DO NOT REMOVE THIS LINE
-; This configuration is used for automatic integration
-; tests on Travis-CI. Do not use this in production.
-
-[database]
-host = 127.0.0.1
-username = root
-password =
-dbname = piwik_tests
-adapter = PDO\MYSQL
-; no table prefix for tests on travis
-tables_prefix =
-;charset = utf8
-
-[tests]
-request_uri = "/"
-port = 3000
-
-[database_tests]
-host = 127.0.0.1
-username = root
-password =
-dbname = piwik_tests
-adapter = PDO\MYSQL
-; no table prefix for tests on travis
-tables_prefix =
-
-[log]
-log_writers[] = file
-log_level = info
-
-; leave this empty here
-[General]
diff --git a/tests/UI/expected-ui-screenshots b/tests/UI/expected-ui-screenshots
index 8423a15f21cffe1e0023c364de02ebe10e91a6db..f52be03f1613724942f6fdc3430abd1743cd6c44 160000
--- a/tests/UI/expected-ui-screenshots
+++ b/tests/UI/expected-ui-screenshots
@@ -1 +1 @@
-Subproject commit 8423a15f21cffe1e0023c364de02ebe10e91a6db
+Subproject commit f52be03f1613724942f6fdc3430abd1743cd6c44
diff --git a/tests/UI/specs/ActionsDataTable_spec.js b/tests/UI/specs/ActionsDataTable_spec.js
index 2456e59397572fda710eed93aa5e094eec3c485d..4c149ce0c3a531bdb1d12889782058f3d3d33c69 100644
--- a/tests/UI/specs/ActionsDataTable_spec.js
+++ b/tests/UI/specs/ActionsDataTable_spec.js
@@ -28,6 +28,9 @@ describe("ActionsDataTable", function () {
expect.screenshot('subtables_loaded').to.be.capture(function (page) {
page.click('tr.subDataTable:first');
page.click('tr.subDataTable:eq(2)');
+ page.evaluate(function () {
+ $('.foldDataTableFooterDrawer').click(); // open the footer icons controls
+ });
}, done);
});
@@ -38,8 +41,7 @@ describe("ActionsDataTable", function () {
}, done);
});
- // Test is skipped as it randomly fails http://builds-artifacts.piwik.org/ui-tests.master/2433.1/screenshot-diffs/diffviewer.html
- it.skip("should exclude low population rows when exclude low population link clicked", function (done) {
+ it("should exclude low population rows when exclude low population link clicked", function (done) {
expect.screenshot('exclude_low_population').to.be.capture(function (page) {
page.mouseMove('.tableConfiguration');
page.click('.dataTableExcludeLowPopulation');
@@ -48,10 +50,6 @@ describe("ActionsDataTable", function () {
it("should load normal view when switch to view hierarchical view link is clicked", function (done) {
expect.screenshot('unflattened').to.be.capture(function (page) {
- // exclude low population (copied from exclude_low_population test above as it was 'skipped')
- page.mouseMove('.tableConfiguration');
- page.click('.dataTableExcludeLowPopulation');
-
page.mouseMove('.tableConfiguration');
page.click('.dataTableFlatten');
}, done);
@@ -59,13 +57,13 @@ describe("ActionsDataTable", function () {
it("should display pageview percentages when hovering over pageviews column", function (done) {
expect.screenshot('pageview_percentages').to.be.capture(function (page) {
- page.mouseMove('tr:eq(2) td.column:eq(1)');
+ page.mouseMove('tr:contains("thankyou") td.column:eq(1)');
}, done);
});
it("should generate a proper title for the visitor log segmented by the current row", function (done) {
expect.screenshot('segmented_visitor_log_hover').to.be.capture(function (page) {
- var row = 'tr:eq(2) ';
+ var row = 'tr:contains("thankyou") ';
page.mouseMove(row + 'td.column:first');
page.mouseMove(row + 'td.label .actionSegmentVisitorLog');
}, done);
@@ -73,7 +71,7 @@ describe("ActionsDataTable", function () {
it("should open the visitor log segmented by the current row", function (done) {
expect.screenshot('segmented_visitor_log').to.be.capture(function (page) {
- page.click('tr:eq(2) td.label .actionSegmentVisitorLog');
+ page.click('tr:contains("thankyou") td.label .actionSegmentVisitorLog');
}, done);
});
@@ -81,7 +79,7 @@ describe("ActionsDataTable", function () {
expect.screenshot('unique_pageview_percentages').to.be.capture(function (page) {
page.click('.ui-widget .ui-dialog-titlebar-close');
- page.mouseMove('tr:eq(2) td.column:eq(2)');
+ page.mouseMove('tr:contains("thankyou") td.column:eq(2)');
}, done);
});
diff --git a/tests/UI/specs/Dashboard_spec.js b/tests/UI/specs/Dashboard_spec.js
index 9607b126ac99cea5b8f159697637706406123987..94b85fcc176a22f439f30373a2e24100854476dc 100644
--- a/tests/UI/specs/Dashboard_spec.js
+++ b/tests/UI/specs/Dashboard_spec.js
@@ -200,7 +200,7 @@ describe("Dashboard", function () {
}, done);
});
- it("should not fail when default widget selection changed", function (done) {
+ it.skip("should not fail when default widget selection changed", function (done) {
expect.screenshot("default_widget_selection_changed").to.be.capture(function (page) {
page.load(url);
page.click('.dashboard-manager .title');
@@ -209,7 +209,7 @@ describe("Dashboard", function () {
}, done);
});
- it("should create new dashboard with new default widget selection when create dashboard process completed", function (done) {
+ it.skip("should create new dashboard with new default widget selection when create dashboard process completed", function (done) {
expect.screenshot("create_new").to.be.capture(function (page) {
page.click('.dashboard-manager .title');
page.click('li[data-action=createDashboard]');
diff --git a/tests/UI/specs/Installation_spec.js b/tests/UI/specs/Installation_spec.js
index 6aca4b0b78c25205e53c2b1e0e51d016824f3089..2ee77adfeccd2e0038770e2032281fb3a1542b3f 100644
--- a/tests/UI/specs/Installation_spec.js
+++ b/tests/UI/specs/Installation_spec.js
@@ -86,8 +86,19 @@ describe("Installation", function () {
}, done);
});
+ var pageUrl, pageUrlDe;
+
+ it("should show Piwik PRO GmbH when language is German", function (done) {
+ expect.screenshot("superuser_de").to.be.capture(function (page) {
+ pageUrl = page.getCurrentUrl();
+ pageUrlDe = pageUrl + '&language=de'
+ page.load(pageUrlDe);
+ }, done);
+ });
+
it("should fail when incorrect information is entered in the superuser configuration page", function (done) {
expect.screenshot("superuser_fail").to.be.capture(function (page) {
+ page.load(pageUrl);
page.click('.btn');
}, done);
});
@@ -144,4 +155,4 @@ describe("Installation", function () {
page.click('.btn');
}, done);
});
-});
\ No newline at end of file
+});
diff --git a/tests/UI/specs/PivotByDimension_spec.js b/tests/UI/specs/PivotByDimension_spec.js
index 938d298ef5b2c99a0999cf7f5d774047ee037362..86a5815d5302645ff0e20508e3e87938d2f9e23f 100644
--- a/tests/UI/specs/PivotByDimension_spec.js
+++ b/tests/UI/specs/PivotByDimension_spec.js
@@ -22,6 +22,7 @@ describe("PivotByDimension", function () {
page.click('.expandDataTableFooterDrawer');
page.mouseMove('.tableConfiguration');
page.click('.dataTablePivotBySubtable');
+ page.mouseMove({x: -15, y: -15}); // make sure nothing is highlighted
}, done);
});
@@ -35,6 +36,7 @@ describe("PivotByDimension", function () {
page.click('.expandDataTableFooterDrawer');
page.mouseMove('.tableConfiguration');
page.click('.dataTablePivotBySubtable');
+ page.mouseMove({x: -15, y: -15}); // make sure nothing is highlighted
}, done);
});
});
\ No newline at end of file
diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js
index 0849e5c8a20794a815f30d7db4863ae555de6aea..c1c43d136660ae9c8b8465ff498f8114105320e0 100644
--- a/tests/UI/specs/UIIntegration_spec.js
+++ b/tests/UI/specs/UIIntegration_spec.js
@@ -158,6 +158,9 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
page.load("?" + urlBase + "#" + generalParams + "&module=Actions&action=menuGetPageUrls");
page.mouseMove('h2[piwik-enriched-headline]');
page.click(".helpIcon");
+ page.evaluate(function () {
+ $('.helpDate:visible').hide();
+ });
}, done);
});
@@ -489,6 +492,12 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
}, done);
});
+ it('should load the config file page correctly', function (done) {
+ expect.screenshot('admin_diagnostics_configfile').to.be.captureSelector('.pageWrap', function (page) {
+ page.load("?" + generalParams + "&module=Diagnostics&action=configfile");
+ }, done);
+ });
+
it('should load the Settings > Visitor Generator admin page correctly', function (done) {
expect.screenshot('admin_visitor_generator').to.be.captureSelector('.pageWrap', function (page) {
page.load("?" + generalParams + "&module=VisitorGenerator&action=index");
diff --git a/tests/UI/specs/ViewDataTable_spec.js b/tests/UI/specs/ViewDataTable_spec.js
index 279fe010f683f95fa047a0b860e3279a64ec6a50..4dc412cad728fb694045b19a8c2ec626fd94b4e2 100644
--- a/tests/UI/specs/ViewDataTable_spec.js
+++ b/tests/UI/specs/ViewDataTable_spec.js
@@ -53,7 +53,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f
it("should load bar graph when bar graph footer icon clicked", function (done) {
expect.screenshot('6_bar_graph').to.be.capture(function (page) {
- page.mouseMove('.tableIconsGroup:nth-child(2)');
+ page.mouseMove('.tableIconsGroup:nth-child(3)');
page.click('.tableIcon[data-footer-icon-id=graphVerticalBar]');
}, done);
});
@@ -67,7 +67,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f
it("should load a tag cloud when tag cloud footer icon clicked", function (done) {
expect.screenshot('8_tag_cloud').to.be.capture(function (page) {
- page.mouseMove('.tableIconsGroup:nth-child(2)');
+ page.mouseMove('.tableIconsGroup:nth-child(3)');
page.click('.tableIcon[data-footer-icon-id=cloud]');
}, done);
});
@@ -75,6 +75,7 @@ describe("ViewDataTableTest", function () { // TODO: should remove Test suffix f
it("should load normal table when normal table footer icon clicked", function (done) {
expect.screenshot('9_normal_table').to.be.capture(function (page) {
page.click('.tableIcon[data-footer-icon-id=table]');
+ page.mouseMove({x: -10, y: -10}); // mae sure no row is highlighted
}, done);
});
diff --git a/tests/lib/screenshot-testing/support/app.js b/tests/lib/screenshot-testing/support/app.js
index 51ca56ad554b7992bbe01919bbdf8bf950d9eb9d..4617112bafca246917aa94a0ccd3103499f9be52 100644
--- a/tests/lib/screenshot-testing/support/app.js
+++ b/tests/lib/screenshot-testing/support/app.js
@@ -142,7 +142,7 @@ Application.prototype.loadTestModules = function () {
// we apply this option only if not a specific plugin or test suite was requested. Only there for travis to
// split tests into multiple jobs.
var numTestsFirstHalf = Math.round(mocha.suite.suites.length / 2);
- numTestsFirstHalf += 5; // run a few more test suits in first half as UiIntegrationTests contain many tests
+ numTestsFirstHalf += 7;
mocha.suite.suites = mocha.suite.suites.filter(function (suite, index) {
if (options['run-first-half-only'] && index < numTestsFirstHalf) {
return true;
diff --git a/tests/resources/Config/global.ini.php b/tests/resources/Config/global.ini.php
index 20271ed43daa6748ceb258ae1c8c44e672b702cc..87e1437453a311fb392d2b6c72b3c6ec596ad188 100644
--- a/tests/resources/Config/global.ini.php
+++ b/tests/resources/Config/global.ini.php
@@ -3,10 +3,14 @@ key1 = value1
key2 = value2
[CategoryOnlyInGlobalFile]
+; test comment
key3 = "value3"
+; test comment 4
key4 = value4
[TestArray]
+; test comment 2
+; with multiple lines
installed[] = plugin1
installed[] = plugin4
diff --git a/tests/resources/OmniFixture-dump.sql.gz b/tests/resources/OmniFixture-dump.sql.gz
index 5466a04b88eff16674db492483296b928196407d..80f9e7678ec293862d80c5c4ca3bc2f4bde6e5ac 100644
Binary files a/tests/resources/OmniFixture-dump.sql.gz and b/tests/resources/OmniFixture-dump.sql.gz differ
diff --git a/tests/resources/access-logs/fake_logs.log b/tests/resources/access-logs/fake_logs.log
index d901280f8816683d55747efea2d86ed73d239e8b..1fe459bda1a096e735fcca1a935a3ffbe4b3aa96 100644
--- a/tests/resources/access-logs/fake_logs.log
+++ b/tests/resources/access-logs/fake_logs.log
@@ -20,9 +20,9 @@
177.71.128.21 - - [10/Aug/2012:22:21:28 +0200] "GET /intranet-analytics/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (X11; U; Linux x86_64; fr-FR) AppleWebKit/534.7 (KHTML, like Gecko) Epiphany/2.30.6 Safari/534.7"
177.71.128.21 - - [10/Aug/2012:22:22:08 +0200] "GET /blog/2012/08/survey-your-opinion-matters/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6"
50.112.00.28 - - [11/Aug/2012:15:49:46 +0200] "GET /faq/how-to-install/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (X11; U; Linux x86_64; ca-ad) AppleWebKit/531.2+ (KHTML, like Gecko) Safari/531.2+ Epiphany/2.30.6"
-50.112.00.11 - - [11/Aug/2012:17:31:05 +0200] "GET /hosting/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6"
-50.112.00.11 - - [11/Aug/2012:17:31:56 +0200] "GET /thing.js HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6"
-50.112.00.11 - - [11/Aug/2012:17:33:01 +0200] "GET /thing.css HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6"
+50.112.00.11 - commonuser [11/Aug/2012:17:31:05 +0200] "GET /hosting/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6"
+50.112.00.11 - commonuser [11/Aug/2012:17:31:56 +0200] "GET /thing.js HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6"
+50.112.00.11 - commonuser [11/Aug/2012:17:33:01 +0200] "GET /thing.css HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6"
175.41.192.41 - - [11/Aug/2012:17:41:30 +0200] "GET /this/is/not/the/page/i/am/looking/for/ HTTP/1.1" 404 3574 "-" "Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
72.44.32.11 - - [11/Aug/2012:17:42:07 +0200] "GET /to-an-error HTTP/1.1" 500 3574 "-" "Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0"
175.41.192.43 - - [11/Aug/2012:17:43:40 +0200] "GET /moved-permanently HTTP/1.1" 301 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
diff --git a/tests/resources/access-logs/fake_logs_nginx_json.log b/tests/resources/access-logs/fake_logs_nginx_json.log
index 4cf39dfbb0d3ad5e50a44870cfd008a15cbacd0f..29d183086df11b0b726fb1b3d607875d6b7da5b1 100644
--- a/tests/resources/access-logs/fake_logs_nginx_json.log
+++ b/tests/resources/access-logs/fake_logs_nginx_json.log
@@ -1 +1,2 @@
-{"ip": "72.45.67.32","host": "piwik.net","path": "/","status": "200","referrer": "https://www.test.nl/","user_agent": "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36","length": 915,"generation_time_milli": 0.001,"date": "2012-08-13T13:20:31+01:00"}
\ No newline at end of file
+{"ip": "72.45.67.32","host": "piwik.net","path": "/","status": "200","referrer": "https://www.test.nl/","user_agent": "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36","length": 915,"generation_time_milli": 0.001,"date": "2012-08-13T13:20:31+01:00"}
+{"ip": "73.77.55.45","host": "piwik.net","path": "/api/f\xFAtbol-user-agent","status": "200","referrer": "-","user_agent": "F\xFAtbol/1.0 (iPhone; iOS 7.1; Scale/2.00)","length": 267,"generation_time_milli": 0.009,"date": "2012-08-13T13:20:31+01:00"}
\ No newline at end of file
diff --git a/tests/resources/screenshot-override/override.css b/tests/resources/screenshot-override/override.css
index f74ae3545f8f135ab9319e0f32df841f8d578a04..1e746d1d5d7f7e21a3b174970d5d39873532df79 100644
--- a/tests/resources/screenshot-override/override.css
+++ b/tests/resources/screenshot-override/override.css
@@ -6,7 +6,7 @@
display:none;
}
-.visitor-profile-important-visits>div>div>p:first-child>span {
+.visitor-profile-important-visits>div>div>p:first-child {
display:none;
}
diff --git a/tests/resources/screenshot-override/override.js b/tests/resources/screenshot-override/override.js
index 7113d0d1341e30b3b4748ea6f68f22b29f4196ae..054ff13de332910e6e2817aec9a7db2e91a56579 100644
--- a/tests/resources/screenshot-override/override.js
+++ b/tests/resources/screenshot-override/override.js
@@ -1,3 +1,5 @@
$(document).ready(function () {
$('.ui-inline-help:contains(UTC time is)').hide();
+
+ $('[notification-id=ControllerAdmin_HttpIsUsed]').hide();
});
\ No newline at end of file
diff --git a/tests/travis b/tests/travis
index 73a4b16ebb9a5db23bca53115195e8317ce6917a..3e80077f810f8ab963be85fb5be032138328201e 160000
--- a/tests/travis
+++ b/tests/travis
@@ -1 +1 @@
-Subproject commit 73a4b16ebb9a5db23bca53115195e8317ce6917a
+Subproject commit 3e80077f810f8ab963be85fb5be032138328201e